Merge pull request #450 from xiemaisi/js/improve-externs-extractor-options

Approved by esben-semmle

Author: semmle-qlci

javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java

@@ -373,7 +373,7 @@ public void run() throws IOException {
 	 * externs.
 	 */
 	private void extractExterns() throws IOException {
-		ExtractorConfig config = new ExtractorConfig(true).withExterns(true);
+		ExtractorConfig config = new ExtractorConfig(false).withExterns(true);
 		FileExtractor extractor = new FileExtractor(config, outputConfig, trapCache, extractorState);
 		FileVisitor<? super Path> visitor = new SimpleFileVisitor<Path>() {
 			@Override

javascript/extractor/src/com/semmle/js/extractor/ExtractorConfig.java

@@ -162,7 +162,7 @@ public ExtractorConfig(boolean experimental) {
         this.ecmaVersion = experimental ? ECMAVersion.ECMA2019 : ECMAVersion.ECMA2018;
         this.platform = Platform.AUTO;
         this.jsx = true;
-        this.sourceType = SourceType.SCRIPT;
+        this.sourceType = SourceType.AUTO;
         this.htmlHandling = HTMLHandling.ELEMENTS;
         this.tolerateParseErrors = true;
         if (experimental) {
@@ -171,6 +171,7 @@ public ExtractorConfig(boolean experimental) {
             this.esnext = true;
             this.v8Extensions = true;
         }
+        this.typescriptMode = TypeScriptMode.NONE;
         this.defaultEncoding = StandardCharsets.UTF_8.name();
     }