Merge pull request #69 from asger-semmle/ts-typescript2.9

Max Schaefer · web-flow · commit a27a14d0d3ff · 2018-08-20T08:15:41.000+01:00
TypeScript: support for v2.9 features
diff --git a/change-notes/1.18/analysis-javascript.md b/change-notes/1.18/analysis-javascript.md
@@ -98,7 +98,8 @@
 
 ## Changes to QL libraries
 
+* HTTP and HTTPS requests made using the Node.js `http.request` and `https.request` APIs and the Electron `Electron.net.request` and `Electron.ClientRequest` APIs are modeled as `RemoteFlowSources`.
 * HTTP header names are now always normalized to lower case to reflect the fact that they are case insensitive. In particular, the result of `HeaderDefinition.getAHeaderName`, and the first parameter of `HeaderDefinition.defines`, `ExplicitHeaderDefinition.definesExplicitly` and `RouteHandler.getAResponseHeader` is now always a lower-case string.
+* New AST nodes for TypeScript 2.9 features have been added.
 * The class `JsonParseCall` has been deprecated. Use `JsonParserCall` instead.
 * The handling of spread arguments in the data flow library has been changed: `DataFlow::InvokeNode.getArgument(i)` is now only defined when there is no spread argument at or before argument position `i`, and similarly `InvokeNode.getNumArgument` is only defined for invocations without spread arguments.
-* HTTP and HTTPS requests made using the Node.js `http.request` and `https.request` APIs and the Electron `Electron.net.request` and `Electron.ClientRequest` APIs are modeled as `RemoteFlowSources`.
diff --git a/javascript/ql/src/semmle/javascript/TypeScript.qll b/javascript/ql/src/semmle/javascript/TypeScript.qll
@@ -1396,6 +1396,58 @@ class QualifiedNamespaceAccess extends NamespaceAccess, @qualifiednamespaceacces
   override Identifier getIdentifier() { result = getChildTypeExpr(1) }
 }
 
+/**
+ * An import inside a type annotation, such as in `import("http").ServerRequest`.
+ */
+class ImportTypeExpr extends TypeExpr, @importtypeexpr {
+  /**
+   * Gets the string literal with the imported path, such as `"http"` in `import("http")`.
+   */
+  TypeExpr getPathExpr() {
+    result = getChildTypeExpr(0)
+  }
+
+  /**
+   * Gets the unresolved path string, such as `http` in `import("http")`.
+   */
+  string getPath() {
+    result = getPathExpr().(StringLiteralTypeExpr).getValue()
+  }
+
+  /** Holds if this import is used in the context of a type, such as in `let x: import("foo")`. */
+  predicate isTypeAccess() {
+    this instanceof @importtypeaccess
+  }
+
+  /** Holds if this import is used in the context of a namespace, such as in `let x: import("http").ServerRequest"`. */
+  predicate isNamespaceAccess() {
+    this instanceof @importnamespaceaccess
+  }
+
+  /** Holds if this import is used in the context of a variable type, such as `let x: typeof import("fs")`. */
+  predicate isVarTypeAccess() {
+    this instanceof @importvartypeaccess
+  }
+}
+
+/**
+ * An import used in the context of a type, such as in `let x: import("foo")`.
+ */
+class ImportTypeAccess extends TypeAccess, ImportTypeExpr, @importtypeaccess {
+}
+
+/**
+ * An import used in the context of a namespace inside a type annotation, such as in `let x: import("http").ServerRequest`.
+ */
+class ImportNamespaceAccess extends NamespaceAccess, ImportTypeExpr, @importnamespaceaccess {
+}
+
+/**
+ * An import used in the context of a variable type, such as in `let x: typeof import("fs")`.
+ */
+class ImportVarTypeAccess extends VarTypeAccess, ImportTypeExpr, @importvartypeaccess {
+}
+
 /**
  * A TypeScript enum declaration, such as the following declaration:
  * ```
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -553,15 +553,19 @@ case @typeexpr.kind of
 | 26 = @qualifiednamespaceaccess
 | 27 = @mappedtypeexpr
 | 28 = @conditionaltypeexpr
-| 29 = @infertypeexpr;
+| 29 = @infertypeexpr
+| 30 = @importtypeaccess
+| 31 = @importnamespaceaccess
+| 32 = @importvartypeaccess;
 
 @typeref = @typeaccess | @typedecl;
 @typeidentifier = @typedecl | @localtypeaccess | @typelabel | @localvartypeaccess | @localnamespaceaccess;
 @typeexpr_parent = @expr | @stmt | @property | @typeexpr;
 @literaltypeexpr = @stringliteraltypeexpr | @numberliteraltypeexpr | @booleanliteraltypeexpr;
-@typeaccess = @localtypeaccess | @qualifiedtypeaccess;
-@vartypeaccess = @localvartypeaccess | @qualifiedvartypeaccess | @thisvartypeaccess;
-@namespaceaccess = @localnamespaceaccess | @qualifiednamespaceaccess;
+@typeaccess = @localtypeaccess | @qualifiedtypeaccess | @importtypeaccess;
+@vartypeaccess = @localvartypeaccess | @qualifiedvartypeaccess | @thisvartypeaccess | @importvartypeaccess;
+@namespaceaccess = @localnamespaceaccess | @qualifiednamespaceaccess | @importnamespaceaccess;
+@importtypeexpr = @importtypeaccess | @importnamespaceaccess | @importvartypeaccess;
 
 @functiontypeexpr = @plainfunctiontypeexpr | @constructortypeexpr;
 
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -794,6 +794,18 @@
 <v>3559</v>
 </e>
 <e>
+<k>@importnamespaceaccess</k>
+<v>100</v>
+</e>
+<e>
+<k>@importtypeaccess</k>
+<v>100</v>
+</e>
+<e>
+<k>@importvartypeaccess</k>
+<v>100</v>
+</e>
+<e>
 <k>@generictypeexpr</k>
 <v>5220</v>
 </e>
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/GenericTypeExpr.expected b/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/GenericTypeExpr.expected
@@ -7,3 +7,5 @@
 | tst.ts:69:18:69:54 | ManyTyp ... oolean> | tst.ts:69:18:69:29 | ManyTypeArgs | 1 | 3 | tst.ts:69:39:69:44 | string |
 | tst.ts:69:18:69:54 | ManyTyp ... oolean> | tst.ts:69:18:69:29 | ManyTypeArgs | 2 | 3 | tst.ts:69:47:69:53 | boolean |
 | tst.ts:80:41:80:55 | Generic<Leaf[]> | tst.ts:80:41:80:47 | Generic | 0 | 1 | tst.ts:80:49:80:54 | Leaf[] |
+| tst.ts:123:26:123:47 | import( ... string> | tst.ts:123:26:123:39 | import("type") | 0 | 1 | tst.ts:123:41:123:46 | string |
+| tst.ts:125:35:125:65 | import( ... string> | tst.ts:125:55:125:57 | Foo | 0 | 1 | tst.ts:125:59:125:64 | string |
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/QualifiedTypeAccess.expected b/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/QualifiedTypeAccess.expected
@@ -3,3 +3,6 @@
 | tst.ts:66:18:66:32 | N.InnerGeneric1 | tst.ts:66:18:66:18 | N | tst.ts:66:20:66:32 | InnerGeneric1 |
 | tst.ts:67:18:67:34 | N.M.InnerGeneric2 | tst.ts:67:18:67:20 | N.M | tst.ts:67:22:67:34 | InnerGeneric2 |
 | tst.ts:68:26:68:40 | N.InnerGeneric1 | tst.ts:68:26:68:26 | N | tst.ts:68:28:68:40 | InnerGeneric1 |
+| tst.ts:124:48:124:50 | Foo | tst.ts:124:28:124:46 | import("namespace") | tst.ts:124:48:124:50 | Foo |
+| tst.ts:125:55:125:57 | Foo | tst.ts:125:35:125:53 | import("namespace") | tst.ts:125:55:125:57 | Foo |
+| tst.ts:131:4:131:6 | bar | tst.ts:128:38:130:3 | import( ... ce'\\n  ) | tst.ts:131:4:131:6 | bar |
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/TypeAccessHelpers.expected b/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/TypeAccessHelpers.expected
@@ -7,3 +7,5 @@
 | tst.ts:69:18:69:29 | ManyTypeArgs | 3 | 1 | tst.ts:69:39:69:44 | string |
 | tst.ts:69:18:69:29 | ManyTypeArgs | 3 | 2 | tst.ts:69:47:69:53 | boolean |
 | tst.ts:80:41:80:47 | Generic | 1 | 0 | tst.ts:80:49:80:54 | Leaf[] |
+| tst.ts:123:26:123:39 | import("type") | 1 | 0 | tst.ts:123:41:123:46 | string |
+| tst.ts:125:55:125:57 | Foo | 1 | 0 | tst.ts:125:59:125:64 | string |
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/TypeofTypeExpr.expected b/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/TypeofTypeExpr.expected
@@ -2,3 +2,5 @@
 | tst.ts:71:17:71:26 | typeof N.x | tst.ts:71:24:71:26 | N.x |
 | tst.ts:72:17:72:35 | typeof qualifiedVar | tst.ts:72:24:72:35 | qualifiedVar |
 | tst.ts:81:43:81:50 | typeof x | tst.ts:81:50:81:50 | x |
+| tst.ts:126:21:126:42 | typeof  ... value") | tst.ts:126:28:126:42 | import("value") |
+| tst.ts:127:30:127:53 | typeof  ... lue").x | tst.ts:127:53:127:53 | x |
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/VariableTypes.expected b/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/VariableTypes.expected
@@ -62,3 +62,10 @@
 | tst.ts:114:5:114:15 | mappedType2 | mappedType2 | tst.ts:114:18:114:41 | { [K in ... umber } |
 | tst.ts:116:35:116:35 | x | x | tst.ts:116:38:116:43 | number |
 | tst.ts:116:46:116:46 | y | y | tst.ts:116:49:116:54 | string |
+| tst.ts:122:5:122:16 | importedType | importedType | tst.ts:122:19:122:32 | import("type") |
+| tst.ts:123:5:123:23 | importedTypeGeneric | importedTypeGeneric | tst.ts:123:26:123:47 | import( ... string> |
+| tst.ts:124:5:124:25 | importe ... iedType | importedQualifiedType | tst.ts:124:48:124:50 | Foo |
+| tst.ts:125:5:125:32 | importe ... Generic | importedQualifiedTypeGeneric | tst.ts:125:35:125:65 | import( ... string> |
+| tst.ts:126:5:126:18 | importedTypeof | importedTypeof | tst.ts:126:21:126:42 | typeof  ... value") |
+| tst.ts:127:5:127:27 | importe ... dTypeof | importedQualifiedTypeof | tst.ts:127:30:127:53 | typeof  ... lue").x |
+| tst.ts:128:5:128:35 | importe ... tespace | importedQualifiedTypeWhitespace | tst.ts:131:4:131:6 | bar |
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/tst.ts b/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/tst.ts
@@ -118,3 +118,14 @@ function hasThisParam(this: void, x: number, y: string) {}
 interface InterfaceWithThisParam {
   hasThisParam(this: InterfaceWithThisParam);
 }
+
+var importedType: import("type");
+var importedTypeGeneric: import("type")<string>;
+var importedQualifiedType: import("namespace").Foo;
+var importedQualifiedTypeGeneric: import("namespace").Foo<string>;
+var importedTypeof: typeof import("value");
+var importedQualifiedTypeof: typeof import("value").x;
+var importedQualifiedTypeWhitespace: import(
+  'awkard-namespace'
+  )
+  .bar;
