Merge pull request #2169 from erik-krogh/importMeta

JS: add initial support for import.meta expressions in TypeScript

Author: asger-semmle

change-notes/1.23/analysis-javascript.md

@@ -12,6 +12,9 @@
 
 * The call graph has been improved to resolve method calls in more cases. This may produce more security alerts.
 
+* TypeScript 3.6 features are supported.
+
+
 ## New queries
 
 | **Query**                                                                 | **Tags**                                                          | **Purpose**                                                                                                                                                                            |

javascript/extractor/lib/typescript/src/main.ts

@@ -162,10 +162,10 @@ function prepareNextFile() {
     }
 }
 
-function handleParseCommand(command: ParseCommand) {
+function handleParseCommand(command: ParseCommand, checkPending = true) {
     let filename = command.filename;
     let expectedFilename = state.pendingFiles[state.pendingFileIndex];
-    if (expectedFilename !== filename) {
+    if (expectedFilename !== filename && checkPending) {
         throw new Error("File requested out of order. Expected '" + expectedFilename + "' but got '" + filename + "'");
     }
     ++state.pendingFileIndex;
@@ -515,13 +515,13 @@ if (process.argv.length > 2) {
             handleParseCommand({
                 command: "parse",
                 filename: sf.fileName,
-            });
+            }, false);
         }
     } else if (pathlib.extname(argument) === ".ts" || pathlib.extname(argument) === ".tsx") {
         handleParseCommand({
             command: "parse",
             filename: argument,
-        });
+        }, false);
     } else {
         console.error("Unrecognized file or flag: " + argument);
     }

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

@@ -249,6 +249,7 @@ public Integer visit(ComprehensionBlock nd, Void q) {
               @Override
               public Integer visit(MetaProperty nd, Void c) {
                 if (nd.getMeta().getName().equals("new")) return 82; // @newtargetexpr
+                if (nd.getMeta().getName().equals("import")) return 115; // @importmetaexpr
                 return 93; // @functionsentexpr
               }
 

javascript/extractor/src/com/semmle/js/parser/TypeScriptASTConverter.java

@@ -1584,10 +1584,12 @@ private Node convertMappedType(JsonObject node, SourceLocation loc) throws Parse
 
   private Node convertMetaProperty(JsonObject node, SourceLocation loc) throws ParseError {
     Position metaStart = loc.getStart();
+    String keywordKind = syntaxKinds.get(node.getAsJsonPrimitive("keywordToken").getAsInt() + "").getAsString();
+    String identifier = keywordKind.equals("ImportKeyword") ? "import" : "new";
     Position metaEnd =
-        new Position(metaStart.getLine(), metaStart.getColumn() + 3, metaStart.getOffset() + 3);
-    SourceLocation metaLoc = new SourceLocation("new", metaStart, metaEnd);
-    Identifier meta = new Identifier(metaLoc, "new");
+        new Position(metaStart.getLine(), metaStart.getColumn() + identifier.length(), metaStart.getOffset() + identifier.length());
+    SourceLocation metaLoc = new SourceLocation(identifier, metaStart, metaEnd);
+    Identifier meta = new Identifier(metaLoc, identifier);
     return new MetaProperty(loc, meta, convertChild(node, "name"));
   }
 

javascript/ql/src/semmle/javascript/ES2015Modules.qll

@@ -641,4 +641,4 @@ class OriginalExportDeclaration extends ExportDeclaration {
     result = this.(ExportDefaultDeclaration).getSourceNode(name) or
     result = this.(ExportNamedDeclaration).getSourceNode(name)
   }
-}
+}

javascript/ql/src/semmle/javascript/Expr.qll

@@ -2645,3 +2645,15 @@ class OptionalChainRoot extends ChainElem {
    */
   OptionalUse getAnOptionalUse() { result = optionalUse }
 }
+
+/**
+ * An `import.meta` expression.
+ *
+ * Example:
+ * ```js
+ * let url = import.meta.url;
+ * ```
+ */
+class ImportMetaExpr extends @importmetaexpr, Expr {
+  override predicate isImpure() { none() }
+}

javascript/ql/src/semmle/javascript/dataflow/DataFlow.qll

@@ -1415,6 +1415,8 @@ module DataFlow {
       or
       e instanceof NewTargetExpr
       or
+      e instanceof ImportMetaExpr
+      or
       e instanceof FunctionBindExpr
       or
       e instanceof TaggedTemplateExpr

javascript/ql/src/semmle/javascript/dataflow/Sources.qll

@@ -235,7 +235,8 @@ module SourceNode {
         astNode instanceof FunctionSentExpr or
         astNode instanceof FunctionBindExpr or
         astNode instanceof DynamicImportExpr or
-        astNode instanceof ImportSpecifier
+        astNode instanceof ImportSpecifier or
+        astNode instanceof ImportMetaExpr
       )
       or
       DataFlow::parameterNode(this, _)

javascript/ql/src/semmlecode.javascript.dbscheme

@@ -349,6 +349,7 @@ case @expr.kind of
 | 112 = @e4x_xml_static_qualident
 | 113 = @e4x_xml_dynamic_qualident
 | 114 = @e4x_xml_dotdotexpr
+| 115 = @importmetaexpr
 ;
 
 @varaccess = @proper_varaccess | @export_varaccess;
@@ -1169,4 +1170,4 @@ extraction_data(
    varchar(900) cacheFile: string ref,
    boolean fromCache: boolean ref,
    int length: int ref
-)
+)

javascript/ql/src/semmlecode.javascript.dbscheme.stats

@@ -514,6 +514,10 @@
 <v>1</v>
 </e>
 <e>
+<k>@importmetaexpr</k>
+<v>1</v>
+</e>
+<e>
 <k>@namedimportspecifier</k>
 <v>4</v>
 </e>