disable import resolution on type-only import specifiers

erik-krogh · erik-krogh · commit d1a7feebc4a2 · 2021-11-29T13:49:10.000+01:00
diff --git a/javascript/ql/lib/semmle/javascript/DefUse.qll b/javascript/ql/lib/semmle/javascript/DefUse.qll
@@ -42,7 +42,7 @@ private predicate defn(ControlFlowNode def, Expr lhs, AST::ValueNode rhs) {
     lhs = i.getIdentifier() and rhs = i.getImportedEntity()
   )
   or
-  exists(ImportSpecifier i | def = i | lhs = i.getLocal() and rhs = i)
+  exists(ImportSpecifier i | def = i and not i.isTypeOnly() | lhs = i.getLocal() and rhs = i)
   or
   exists(EnumMember member | def = member.getIdentifier() |
     lhs = def and rhs = member.getInitializer()
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll b/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
@@ -881,6 +881,7 @@ module DataFlow {
 
     ImportSpecifierAsPropRead() {
       astNode = imprt.getASpecifier() and
+      not astNode.isTypeOnly() and
       exists(astNode.getImportedName())
     }
 
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll
@@ -15,7 +15,11 @@ private import AbstractPropertiesImpl
 private class AnalyzedImportSpecifier extends AnalyzedVarDef, @import_specifier {
   ImportDeclaration id;
 
-  AnalyzedImportSpecifier() { this = id.getASpecifier() and exists(id.resolveImportedPath()) }
+  AnalyzedImportSpecifier() {
+    this = id.getASpecifier() and
+    exists(id.resolveImportedPath()) and
+    not this.(ImportSpecifier).isTypeOnly()
+  }
 
   override DataFlow::AnalyzedNode getRhs() { result.(AnalyzedImport).getImportSpecifier() = this }
 
@@ -135,10 +139,12 @@ private predicate incompleteExport(ES2015Module m, string y) {
  */
 private class AnalyzedImport extends AnalyzedPropertyRead, DataFlow::ValueNode {
   Module imported;
+  override ImportSpecifier astNode;
 
   AnalyzedImport() {
     exists(ImportDeclaration id |
       astNode = id.getASpecifier() and
+      not astNode.isTypeOnly() and
       imported = id.getImportedModule()
     )
   }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ private predicate defn(ControlFlowNode def, Expr lhs, AST::ValueNode rhs) {`
`42`	`42`	`lhs = i.getIdentifier() and rhs = i.getImportedEntity()`
`43`	`43`	`)`
`44`	`44`	`or`
`45`		`- exists(ImportSpecifier i \| def = i \| lhs = i.getLocal() and rhs = i)`
	`45`	`+ exists(ImportSpecifier i \| def = i and not i.isTypeOnly() \| lhs = i.getLocal() and rhs = i)`
`46`	`46`	`or`
`47`	`47`	`exists(EnumMember member \| def = member.getIdentifier() \|`
`48`	`48`	`lhs = def and rhs = member.getInitializer()`
Original file line number	Diff line number	Diff line change
`@@ -881,6 +881,7 @@ module DataFlow {`
`881`	`881`
`882`	`882`	`ImportSpecifierAsPropRead() {`
`883`	`883`	`astNode = imprt.getASpecifier() and`
	`884`	`+ not astNode.isTypeOnly() and`
`884`	`885`	`exists(astNode.getImportedName())`
`885`	`886`	`}`
`886`	`887`