JS: Remove TypeScriptMode

Author: asgerf

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

@@ -218,7 +218,6 @@ public class AutoBuild {
   private final Set<String> xmlExtensions = new LinkedHashSet<>();
   private ProjectLayout filters;
   private final Path LGTM_SRC, SEMMLE_DIST;
-  private final TypeScriptMode typeScriptMode;
   private final String defaultEncoding;
   private ExecutorService threadPool;
   private volatile boolean seenCode = false;
@@ -236,8 +235,6 @@ public AutoBuild() {
     this.SEMMLE_DIST = Paths.get(EnvironmentVariables.getExtractorRoot());
     this.outputConfig = new ExtractorOutputConfig(LegacyLanguage.JAVASCRIPT);
     this.trapCache = ITrapCache.fromExtractorOptions();
-    this.typeScriptMode =
-        getEnumFromEnvVar("LGTM_INDEX_TYPESCRIPT", TypeScriptMode.class, TypeScriptMode.BASIC);
     this.defaultEncoding = getEnvVar("LGTM_INDEX_DEFAULT_ENCODING");
     this.installDependencies = Boolean.valueOf(getEnvVar("LGTM_INDEX_TYPESCRIPT_INSTALL_DEPS"));
     this.virtualSourceRoot = makeVirtualSourceRoot();
@@ -393,7 +390,7 @@ private void setupFilters() {
     defaultExtract.add(FileType.HTML);
     defaultExtract.add(FileType.JS);
     defaultExtract.add(FileType.YAML);
-    if (typeScriptMode != TypeScriptMode.NONE) defaultExtract.add(FileType.TYPESCRIPT);
+    defaultExtract.add(FileType.TYPESCRIPT);
     for (FileType filetype : defaultExtract)
       for (String extension : filetype.getExtensions()) patterns.add("**/*" + extension);
 
@@ -1042,7 +1039,6 @@ private Path guessPackageMainFile(Path packageJsonFile, PackageJson packageJson,
   private ExtractorConfig mkExtractorConfig() {
     ExtractorConfig config = new ExtractorConfig(true);
     config = config.withSourceType(getSourceType());
-    config = config.withTypeScriptMode(typeScriptMode);
     config = config.withVirtualSourceRoot(virtualSourceRoot);
     if (defaultEncoding != null) config = config.withDefaultEncoding(defaultEncoding);
     return config;
@@ -1135,8 +1131,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
             }
 
             // extract TypeScript projects from 'tsconfig.json'
-            if (typeScriptMode != TypeScriptMode.NONE
-                && treatAsTSConfig(file.getFileName().toString())
+            if (treatAsTSConfig(file.getFileName().toString())
                 && !excludes.contains(file)
                 && isFileIncluded(file)) {
               tsconfigFiles.add(file);

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

@@ -221,9 +221,6 @@ public Set<String> getPredefinedGlobals() {
   /** Should textual information be extracted into the lines/4 relation? */
   private boolean extractLines;
 
-  /** Should TypeScript files be extracted? */
-  private TypeScriptMode typescriptMode;
-
   /** Override amount of RAM to allocate to the TypeScript compiler. */
   private int typescriptRam;
 
@@ -245,7 +242,6 @@ public ExtractorConfig(boolean experimental) {
       this.esnext = true;
       this.v8Extensions = true;
     }
-    this.typescriptMode = TypeScriptMode.NONE;
     this.e4x = experimental;
     this.defaultEncoding = StandardCharsets.UTF_8.name();
     this.virtualSourceRoot = VirtualSourceRoot.none;
@@ -266,7 +262,6 @@ public ExtractorConfig(ExtractorConfig that) {
     this.sourceType = that.sourceType;
     this.htmlHandling = that.htmlHandling;
     this.extractLines = that.extractLines;
-    this.typescriptMode = that.typescriptMode;
     this.typescriptRam = that.typescriptRam;
     this.defaultEncoding = that.defaultEncoding;
     this.virtualSourceRoot = that.virtualSourceRoot;
@@ -416,20 +411,10 @@ public ExtractorConfig withExtractLines(boolean extractLines) {
     return res;
   }
 
-  public TypeScriptMode getTypeScriptMode() {
-    return typescriptMode;
-  }
-
   public int getTypeScriptRam() {
     return typescriptRam;
   }
 
-  public ExtractorConfig withTypeScriptMode(TypeScriptMode typescriptMode) {
-    ExtractorConfig res = new ExtractorConfig(this);
-    res.typescriptMode = typescriptMode;
-    return res;
-  }
-
   public ExtractorConfig withTypeScriptRam(int ram) {
     ExtractorConfig res = new ExtractorConfig(this);
     res.typescriptRam = ram;
@@ -490,8 +475,6 @@ public String toString() {
         + sourceType
         + ", extractLines="
         + extractLines
-        + ", typescriptMode="
-        + typescriptMode
         + ", defaultEncoding="
         + defaultEncoding
         + ", virtualSourceRoot="

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

@@ -217,8 +217,6 @@ public String toString() {
     TYPESCRIPT(".ts", ".tsx", ".mts", ".cts") {
       @Override
       protected boolean contains(File f, String lcExt, ExtractorConfig config) {
-        if (config.getTypeScriptMode() == TypeScriptMode.NONE) return false;
-
         // Read the beginning of the file to guess the file type.
         if (hasBadFileHeader(f, lcExt, config)) {
           return false;

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

@@ -77,7 +77,6 @@ public class Main {
   private PathMatcher includeMatcher, excludeMatcher;
   private FileExtractor fileExtractor;
   private ExtractorState extractorState;
-  private Set<File> projectFiles = new LinkedHashSet<>();
   private Set<File> files = new LinkedHashSet<>();
   private final Set<File> extractedFiles = new LinkedHashSet<>();
 
@@ -119,10 +118,6 @@ public void run(String[] args) {
     }
 
     // Sort files for determinism
-    projectFiles = projectFiles.stream()
-          .sorted(AutoBuild.FILE_ORDERING)
-          .collect(Collectors.toCollection(() -> new LinkedHashSet<>()));
-
     files = files.stream()
         .sorted(AutoBuild.FILE_ORDERING)
         .collect(Collectors.toCollection(() -> new LinkedHashSet<>()));
@@ -256,11 +251,8 @@ public void setupMatchers(ArgsParser ap) {
     includes.add("**/.babelrc*.json");
 
 
-    // extract TypeScript if `--typescript` or `--typescript-full` was specified
-    if (getTypeScriptMode(ap) != TypeScriptMode.NONE) {
-      addIncludesFor(includes, FileType.TYPESCRIPT);
-      includes.add("**/*tsconfig*.json");
-    }
+    addIncludesFor(includes, FileType.TYPESCRIPT);
+    includes.add("**/*tsconfig*.json");
 
     // add explicit include patterns
     for (String pattern : ap.getZeroOrMore(P_INCLUDE))
@@ -394,12 +386,6 @@ private boolean enableExperimental(ArgsParser ap) {
     return ap.has(P_EXPERIMENTAL) || ap.has(P_JSCRIPT) || ap.has(P_MOZ_EXTENSIONS);
   }
 
-  private static TypeScriptMode getTypeScriptMode(ArgsParser ap) {
-    if (ap.has(P_TYPESCRIPT_FULL)) return TypeScriptMode.FULL;
-    if (ap.has(P_TYPESCRIPT)) return TypeScriptMode.BASIC;
-    return TypeScriptMode.NONE;
-  }
-
   private Path inferSourceRoot(ArgsParser ap) {
     List<File> files = getFilesArg(ap);
     Path sourceRoot = files.iterator().next().toPath().toAbsolutePath().getParent();
@@ -430,7 +416,6 @@ private ExtractorConfig parseJSOptions(ArgsParser ap) {
             .withFileType(getFileType(ap))
             .withSourceType(ap.getEnum(P_SOURCE_TYPE, SourceType.class, SourceType.AUTO))
             .withExtractLines(ap.has(P_EXTRACT_PROGRAM_TEXT))
-            .withTypeScriptMode(getTypeScriptMode(ap))
             .withTypeScriptRam(
                 ap.has(P_TYPESCRIPT_RAM)
                     ? UnitParser.parseOpt(ap.getString(P_TYPESCRIPT_RAM), UnitParser.MEGABYTES)
@@ -494,12 +479,6 @@ private void collectFiles(File root, boolean explicit) {
           && (explicit || includeMatcher.matches(path) && !excludeMatcher.matches(path))) {
         files.add(normalizeFile(root));
       }
-
-      if (extractorConfig.getTypeScriptMode() == TypeScriptMode.FULL
-          && AutoBuild.treatAsTSConfig(root.getName())
-          && !excludeMatcher.matches(path)) {
-        projectFiles.add(root);
-      }
     }
   }