JS: Update old entry point and add a test

Author: asgerf

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

@@ -1,5 +1,13 @@
 package com.semmle.js.extractor;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Pattern;
+
 import com.semmle.js.extractor.ExtractorConfig.HTMLHandling;
 import com.semmle.js.extractor.ExtractorConfig.Platform;
 import com.semmle.js.extractor.ExtractorConfig.SourceType;
@@ -23,13 +31,6 @@
 import com.semmle.util.process.ArgsParser;
 import com.semmle.util.process.ArgsParser.FileMode;
 import com.semmle.util.trap.TrapWriter;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Pattern;
 
 /** The main entry point of the JavaScript extractor. */
 public class Main {
@@ -134,7 +135,8 @@ public void run(String[] args) {
 
     TypeScriptParser tsParser = extractorState.getTypeScriptParser();
     tsParser.setTypescriptRam(extractorConfig.getTypeScriptRam());
-    if (containsTypeScriptFiles()) {
+    boolean containsTypeScriptFiles = containsTypeScriptFiles();
+    if (containsTypeScriptFiles) {
       tsParser.verifyInstallation(!ap.has(P_QUIET));
     }
     for (File projectFile : projectFiles) {
@@ -190,10 +192,29 @@ public void run(String[] args) {
 
     // Extract files that were not part of a project.
     for (File f : files) {
+      if (isFileDerivedFromTypeScriptFile(f))
+        continue;
       ensureFileIsExtracted(f, ap);
     }
   }
 
+  /**
+   * Returns true if the given path is likely the output of compiling a TypeScript file
+   * which we have already extracted.
+   */
+  private boolean isFileDerivedFromTypeScriptFile(File path) {
+    String name = path.getName();
+    if (!name.endsWith(".js"))
+      return false;
+    String stem = name.substring(0, name.length() - ".js".length());
+    for (String ext : FileType.TYPESCRIPT.getExtensions()) {
+      if (new File(path.getParent(), stem + ext).exists()) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   private void extractTypeTable(File fileHandle, TypeTable table) {
     TrapWriter trapWriter =
         extractorOutputConfig

javascript/ql/test/library-tests/TypeScript/CompiledOutput/index.js

@@ -0,0 +1 @@
+export default 45;

javascript/ql/test/library-tests/TypeScript/CompiledOutput/index.ts

@@ -0,0 +1 @@
+export default 45 as number;

javascript/ql/test/library-tests/TypeScript/CompiledOutput/test.expected

@@ -0,0 +1 @@
+| index.ts:0:0:0:0 | index.ts |

javascript/ql/test/library-tests/TypeScript/CompiledOutput/test.ql

@@ -0,0 +1,3 @@
+import javascript
+
+query File files() { any() }