Merge pull request #6070 from asgerf/js/script-with-tsx-lang

Approved by erik-krogh

Author: codeql-ci

javascript/change-notes/2021-06-14-script-with-tsx-lang.md

@@ -0,0 +1,3 @@
+lgtm,codescanning
+* Script tags with the `lang="tsx"` attribute are now recognized as containing TypeScript code
+  and are analyzed accordingly.

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

@@ -271,7 +271,7 @@ private String getScriptLanguage(Element script) {
 
   private boolean isTypeScriptTag(Element script) {
     String language = getScriptLanguage(script);
-    if ("ts".equals(language) || "typescript".equals(language)) return true;
+    if ("ts".equals(language) || "tsx".equals(language) || "typescript".equals(language)) return true;
     String type = getAttributeValueLC(script, "type");
     if (type != null && type.contains("typescript")) return true;
     return false;

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

@@ -43,7 +43,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 = "2021-05-31";
+  public static final String EXTRACTOR_VERSION = "2021-06-15";
 
   public static final Pattern NEWLINE = Pattern.compile("\n");
 

javascript/ql/test/library-tests/TypeScript/EmbeddedInScript/Test.expected

@@ -1,5 +1,6 @@
 classDeclaration
 | test.vue:3:18:5:3 | class M ... er;\\n  } |
+| test_tsx.vue:3:18:5:3 | class M ... er;\\n  } |
 exprType
 | htmlfile.html:4:22:4:24 | foo | () => void |
 | htmlfile.html:4:22:4:24 | foo | () => void |
@@ -10,17 +11,28 @@ exprType
 | htmlfile.html:5:26:5:42 | foo() as number[] | number[] |
 | other.ts:1:8:1:16 | Component | typeof default in library-tests/TypeScript/EmbeddedInScript/test.vue |
 | other.ts:1:23:1:34 | "./test.vue" | any |
-| other.ts:3:1:3:15 | new Component() | MyComponent |
-| other.ts:3:5:3:13 | Component | typeof default in library-tests/TypeScript/EmbeddedInScript/test.vue |
-| other.ts:5:17:5:19 | foo | () => void |
+| other.ts:2:8:2:19 | ComponentTsx | typeof default in library-tests/TypeScript/EmbeddedInScript/test_tsx.vue |
+| other.ts:2:26:2:41 | "./test_tsx.vue" | any |
+| other.ts:4:1:4:15 | new Component() | MyComponent |
+| other.ts:4:5:4:13 | Component | typeof default in library-tests/TypeScript/EmbeddedInScript/test.vue |
+| other.ts:5:1:5:18 | new ComponentTsx() | MyComponentTsx |
+| other.ts:5:5:5:16 | ComponentTsx | typeof default in library-tests/TypeScript/EmbeddedInScript/test_tsx.vue |
+| other.ts:7:17:7:19 | foo | () => void |
 | test.vue:2:15:2:19 | other | typeof library-tests/TypeScript/EmbeddedInScript/other.ts |
 | test.vue:2:26:2:34 | "./other" | any |
 | test.vue:3:24:3:34 | MyComponent | MyComponent |
 | test.vue:4:7:4:7 | x | number |
+| test_tsx.vue:2:15:2:19 | other | typeof library-tests/TypeScript/EmbeddedInScript/other.ts |
+| test_tsx.vue:2:26:2:34 | "./other" | any |
+| test_tsx.vue:3:24:3:37 | MyComponentTsx | MyComponentTsx |
+| test_tsx.vue:4:7:4:7 | x | number |
 symbols
-| other.ts:1:1:6:0 | <toplevel> | library-tests/TypeScript/EmbeddedInScript/other.ts |
+| other.ts:1:1:8:0 | <toplevel> | library-tests/TypeScript/EmbeddedInScript/other.ts |
 | test.vue:2:3:6:0 | <toplevel> | library-tests/TypeScript/EmbeddedInScript/test.vue |
+| test_tsx.vue:2:3:6:0 | <toplevel> | library-tests/TypeScript/EmbeddedInScript/test_tsx.vue |
 importTarget
-| htmlfile.html:4:13:4:42 | import  ... other"; | other.ts:1:1:6:0 | <toplevel> |
+| htmlfile.html:4:13:4:42 | import  ... other"; | other.ts:1:1:8:0 | <toplevel> |
 | other.ts:1:1:1:35 | import  ... t.vue"; | test.vue:2:3:6:0 | <toplevel> |
-| test.vue:2:3:2:35 | import  ... other"; | other.ts:1:1:6:0 | <toplevel> |
+| other.ts:2:1:2:42 | import  ... x.vue"; | test_tsx.vue:2:3:6:0 | <toplevel> |
+| test.vue:2:3:2:35 | import  ... other"; | other.ts:1:1:8:0 | <toplevel> |
+| test_tsx.vue:2:3:2:35 | import  ... other"; | other.ts:1:1:8:0 | <toplevel> |

javascript/ql/test/library-tests/TypeScript/EmbeddedInScript/other.ts

@@ -1,5 +1,7 @@
 import Component from "./test.vue";
+import ComponentTsx from "./test_tsx.vue";
 
 new Component();
+new ComponentTsx();
 
 export function foo() {};

javascript/ql/test/library-tests/TypeScript/EmbeddedInScript/test_tsx.vue

@@ -0,0 +1,6 @@
+<script lang='tsx'>
+  import * as other from "./other";
+  export default class MyComponentTsx {
+      x!: number;
+  }
+</script>