Merge pull request #5862 from asgerf/js/has-underlying-type

codeql-ci · web-flow · commit af0d31695ab7 · 2021-05-14T04:10:43.000-07:00
Approved by erik-krogh, max-schaefer
diff --git a/javascript/ql/src/semmle/javascript/TypeScript.qll b/javascript/ql/src/semmle/javascript/TypeScript.qll
@@ -725,7 +725,7 @@ class TypeAccess extends @typeaccess, TypeExpr, TypeRef {
       spec.getImportedName() = exportedName and
       this = spec.getLocal().(TypeDecl).getLocalTypeName().getAnAccess()
       or
-      spec instanceof ImportNamespaceSpecifier and
+      (spec instanceof ImportNamespaceSpecifier or spec instanceof ImportDefaultSpecifier) and
       this =
         spec.getLocal().(LocalNamespaceDecl).getLocalNamespaceName().getAMemberAccess(exportedName)
     )
diff --git a/javascript/ql/src/semmle/javascript/dataflow/DataFlow.qll b/javascript/ql/src/semmle/javascript/dataflow/DataFlow.qll
@@ -239,7 +239,6 @@ module DataFlow {
     private TypeAnnotation getFallbackTypeAnnotation() {
       exists(BindingPattern pattern |
         this = valueNode(pattern) and
-        not ast_node_type(pattern, _) and
         result = pattern.getTypeAnnotation()
       )
       or
diff --git a/javascript/ql/test/library-tests/TypeScript/HasUnderlyingType/HasUnderlyingType.expected b/javascript/ql/test/library-tests/TypeScript/HasUnderlyingType/HasUnderlyingType.expected
@@ -1,2 +1,6 @@
+underlyingTypeNode
+| foo | Bar | foo.ts:3:1:5:1 | use (instance (member Bar (member exports (module foo)))) |
+| foo | Bar | foo.ts:3:12:3:12 | use (instance (member Bar (member exports (module foo)))) |
+#select
 | tst.ts:8:14:8:16 | arg | Base in global scope |
 | tst.ts:8:14:8:16 | arg | Sub in global scope |
diff --git a/javascript/ql/test/library-tests/TypeScript/HasUnderlyingType/HasUnderlyingType.ql b/javascript/ql/test/library-tests/TypeScript/HasUnderlyingType/HasUnderlyingType.ql
@@ -3,3 +3,7 @@ import javascript
 from Expr e, TypeName typeName
 where e.getType().hasUnderlyingTypeName(typeName)
 select e, typeName
+
+query API::Node underlyingTypeNode(string mod, string name) {
+  result = API::Node::ofType(mod, name)
+}
diff --git a/javascript/ql/test/library-tests/TypeScript/HasUnderlyingType/foo.ts b/javascript/ql/test/library-tests/TypeScript/HasUnderlyingType/foo.ts
@@ -0,0 +1,5 @@
+import foo from "foo";
+
+function f(x: foo.Bar) {
+  return x;
+}

Original file line number	Diff line number	Diff line change
`@@ -725,7 +725,7 @@ class TypeAccess extends @typeaccess, TypeExpr, TypeRef {`
`725`	`725`	`spec.getImportedName() = exportedName and`
`726`	`726`	`this = spec.getLocal().(TypeDecl).getLocalTypeName().getAnAccess()`
`727`	`727`	`or`
`728`		`- spec instanceof ImportNamespaceSpecifier and`
	`728`	`+ (spec instanceof ImportNamespaceSpecifier or spec instanceof ImportDefaultSpecifier) and`
`729`	`729`	`this =`
`730`	`730`	`spec.getLocal().(LocalNamespaceDecl).getLocalNamespaceName().getAMemberAccess(exportedName)`
`731`	`731`	`)`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,6 @@ module DataFlow {`
`239`	`239`	`private TypeAnnotation getFallbackTypeAnnotation() {`
`240`	`240`	`exists(BindingPattern pattern \|`
`241`	`241`	`this = valueNode(pattern) and`
`242`		`- not ast_node_type(pattern, _) and`
`243`	`242`	`result = pattern.getTypeAnnotation()`
`244`	`243`	`)`
`245`	`244`	`or`