Merge pull request #18550 from asgerf/js/vue-ts-notsconfig

JS: Avoid inconsistent DB when embedded TS has no associated tsconfig.json

Author: asgerf

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

@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -41,7 +42,7 @@ public class Main {
    * A version identifier that should be updated every time the extractor changes in such a way that
    * it may produce different tuples for the same file under the same {@link ExtractorConfig}.
    */
-  public static final String EXTRACTOR_VERSION = "2025-01-09";
+  public static final String EXTRACTOR_VERSION = "2025-01-21";
 
   public static final Pattern NEWLINE = Pattern.compile("\n");
 
@@ -179,6 +180,12 @@ public void run(String[] args) {
         remainingTypescriptFiles.add(f);
       }
     }
+    for (Map.Entry<Path, FileSnippet> entry : extractorState.getSnippets().entrySet()) {
+      if (!extractedFiles.contains(entry.getKey().toFile())
+          && FileType.forFileExtension(entry.getKey().toFile()) == FileType.TYPESCRIPT) {
+        remainingTypescriptFiles.add(entry.getKey().toFile());
+      }
+    }
     if (!remainingTypescriptFiles.isEmpty()) {
       tsParser.prepareFiles(remainingTypescriptFiles);
       for (File f : remainingTypescriptFiles) {

javascript/ql/src/change-notes/2025-01-21-vue-ts-notsconfig.md

@@ -0,0 +1,6 @@
+---
+category: fix
+---
+* Fixed a bug that would occur when TypeScript code was found in an HTML-like file, such as a `.vue` file,
+  but where it could not be associated with any `tsconfig.json` file. Previously the embedded code was not
+  extracted in this case, but should now be extracted properly.

javascript/ql/test/library-tests/TypeScript/RegressionTests/EmbeddedTypeScriptNoTSConfig/embedded-typescript.vue

@@ -0,0 +1,7 @@
+<template>
+  <p v-html="input" />
+</template>
+<script setup lang="ts">
+console.log("hello");
+</script>
+<style></style>

javascript/ql/test/library-tests/TypeScript/RegressionTests/EmbeddedTypeScriptNoTSConfig/test.expected

@@ -0,0 +1,2 @@
+| embedded-typescript.vue:5:1:6:0 | <toplevel> |
+| test.js:1:1:2:0 | <toplevel> |

javascript/ql/test/library-tests/TypeScript/RegressionTests/EmbeddedTypeScriptNoTSConfig/test.js

@@ -0,0 +1 @@
+console.log("hello");

javascript/ql/test/library-tests/TypeScript/RegressionTests/EmbeddedTypeScriptNoTSConfig/test.ql

@@ -0,0 +1,3 @@
+import javascript
+
+query predicate toplevels(TopLevel top) { any() }