JS: Update UnresolvableImports to handle nested packages

asgerf · asgerf · commit 317e61d370e8 · 2025-05-19T12:53:19.000+02:00
diff --git a/javascript/ql/src/NodeJS/UnresolvableImport.ql b/javascript/ql/src/NodeJS/UnresolvableImport.ql
@@ -36,7 +36,7 @@ where
   not exists(r.getImportedModule()) and
   // no enclosing NPM package declares a dependency on `mod`
   forex(NpmPackage pkg, PackageJson pkgJson |
-    pkg.getAModule() = r.getTopLevel() and pkgJson = pkg.getPackageJson()
+    pkg.getAModule() = r.getTopLevel() and pkgJson = pkg.getPackageJson().getEnclosingPackage*()
   |
     not pkgJson.declaresDependency(mod, _) and
     not pkgJson.getPeerDependencies().getADependency(mod, _) and

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ where`
`36`	`36`	`not exists(r.getImportedModule()) and`
`37`	`37`	// no enclosing NPM package declares a dependency on `mod`
`38`	`38`	`forex(NpmPackage pkg, PackageJson pkgJson \|`
`39`		`- pkg.getAModule() = r.getTopLevel() and pkgJson = pkg.getPackageJson()`
	`39`	`+ pkg.getAModule() = r.getTopLevel() and pkgJson = pkg.getPackageJson().getEnclosingPackage*()`
`40`	`40`	`\|`
`41`	`41`	`not pkgJson.declaresDependency(mod, _) and`
`42`	`42`	`not pkgJson.getPeerDependencies().getADependency(mod, _) and`