JS: Make TypeScript aware of custom extractor extensions

Author: asgerf

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

@@ -569,7 +569,7 @@ public int compare(File f1, File f2) {
     }
   };
 
-  class FileExtractors {
+  public class FileExtractors {
     FileExtractor defaultExtractor;
     Map<String, FileExtractor> customExtractors = new LinkedHashMap<>();
 
@@ -580,6 +580,10 @@ class FileExtractors {
     public FileExtractor forFile(Path f) {
       return customExtractors.getOrDefault(FileUtil.extension(f), defaultExtractor);
     }
+    
+    public FileType fileType(Path f) {
+      return forFile(f).getFileType(f.toFile());
+    }
   }
 
   /** Extract all supported candidate files that pass the filters. */
@@ -614,11 +618,11 @@ private void extractSource() throws IOException {
     if (!tsconfigFiles.isEmpty()) {
       dependencyInstallationResult = this.preparePackagesAndDependencies(filesToExtract);
     }
+    Set<Path> extractedFiles = new LinkedHashSet<>();
 
     // extract TypeScript projects and files
-    Set<Path> extractedFiles =
-          extractTypeScript(
-              defaultExtractor, filesToExtract, tsconfigFiles, dependencyInstallationResult);
+    extractTypeScript(filesToExtract, extractedFiles,
+              extractors, tsconfigFiles, dependencyInstallationResult);
 
     boolean hasTypeScriptFiles = extractedFiles.size() > 0;
 
@@ -959,12 +963,11 @@ private ExtractorConfig mkExtractorConfig() {
   }
 
   private Set<Path> extractTypeScript(
-      FileExtractor extractor,
       Set<Path> files,
+      Set<Path> extractedFiles,
+      FileExtractors extractors,
       List<Path> tsconfig,
       DependencyInstallationResult deps) {
-    Set<Path> extractedFiles = new LinkedHashSet<>();
-
     if (hasTypeScriptFiles(files) || !tsconfig.isEmpty()) {
       ExtractorState extractorState = new ExtractorState();
       TypeScriptParser tsParser = extractorState.getTypeScriptParser();
@@ -993,7 +996,7 @@ private Set<Path> extractTypeScript(
           Path sourcePath = sourceFile.toPath();
           if (!files.contains(normalizePath(sourcePath))) continue;
           if (!project.getOwnFiles().contains(sourceFile) && explicitlyIncludedFiles.contains(sourceFile)) continue;
-          if (!FileType.TYPESCRIPT.getExtensions().contains(FileUtil.extension(sourcePath))) {
+          if (extractors.fileType(sourcePath) != FileType.TYPESCRIPT) {
             // For the time being, skip non-TypeScript files, even if the TypeScript
             // compiler can parse them for us.
             continue;
@@ -1003,7 +1006,7 @@ private Set<Path> extractTypeScript(
           }
         }
         typeScriptFiles.sort(PATH_ORDERING);
-        extractTypeScriptFiles(typeScriptFiles, extractedFiles, extractor, extractorState);
+        extractTypeScriptFiles(typeScriptFiles, extractedFiles, extractors, extractorState);
         tsParser.closeProject(projectFile);
       }
 
@@ -1017,12 +1020,12 @@ private Set<Path> extractTypeScript(
       List<Path> remainingTypeScriptFiles = new ArrayList<>();
       for (Path f : files) {
         if (!extractedFiles.contains(f)
-            && FileType.forFileExtension(f.toFile()) == FileType.TYPESCRIPT) {
+            && extractors.fileType(f) == FileType.TYPESCRIPT) {
           remainingTypeScriptFiles.add(f);
         }
       }
       if (!remainingTypeScriptFiles.isEmpty()) {
-        extractTypeScriptFiles(remainingTypeScriptFiles, extractedFiles, extractor, extractorState);
+        extractTypeScriptFiles(remainingTypeScriptFiles, extractedFiles, extractors, extractorState);
       }
 
       // The TypeScript compiler instance is no longer needed.
@@ -1108,7 +1111,7 @@ public void verifyTypeScriptInstallation(ExtractorState extractorState) {
   public void extractTypeScriptFiles(
       List<Path> files,
       Set<Path> extractedFiles,
-      FileExtractor extractor,
+      FileExtractors extractors,
       ExtractorState extractorState) {
     List<File> list = files
         .stream()
@@ -1117,7 +1120,7 @@ public void extractTypeScriptFiles(
     extractorState.getTypeScriptParser().prepareFiles(list);
     for (Path path : files) {
       extractedFiles.add(path);
-      extract(extractor, path, extractorState);
+      extract(extractors.forFile(path), path, extractorState);
     }
   }
 

javascript/extractor/src/com/semmle/js/extractor/test/AutoBuildTests.java

@@ -123,7 +123,7 @@ public void verifyTypeScriptInstallation(ExtractorState state) {}
         public void extractTypeScriptFiles(
             java.util.List<Path> files,
             java.util.Set<Path> extractedFiles,
-            FileExtractor extractor,
+            FileExtractors extractors,
             ExtractorState extractorState) {
           for (Path f : files) {
             actual.add(f.toString());