recognize a src/index.js file as a main module for a package

erik-krogh · erik-krogh · commit c0bb169342f7 · 2021-03-18T13:41:36.000+01:00
diff --git a/javascript/ql/src/semmle/javascript/NodeModuleResolutionImpl.qll b/javascript/ql/src/semmle/javascript/NodeModuleResolutionImpl.qll
@@ -96,8 +96,11 @@ File resolveMainModule(PackageJSON pkg, int priority) {
     )
   )
   or
-  result =
-    tryExtensions(pkg.getFile().getParentContainer(), "index", priority - prioritiesPerCandidate())
+  exists(Folder folder | folder = pkg.getFile().getParentContainer() |
+    result =
+      tryExtensions([folder, folder.getChildContainer("src")], "index",
+        priority - prioritiesPerCandidate())
+  )
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,11 @@ File resolveMainModule(PackageJSON pkg, int priority) {`
`96`	`96`	`)`
`97`	`97`	`)`
`98`	`98`	`or`
`99`		`- result =`
`100`		`- tryExtensions(pkg.getFile().getParentContainer(), "index", priority - prioritiesPerCandidate())`
	`99`	`+ exists(Folder folder \| folder = pkg.getFile().getParentContainer() \|`
	`100`	`+ result =`
	`101`	`+ tryExtensions([folder, folder.getChildContainer("src")], "index",`
	`102`	`+ priority - prioritiesPerCandidate())`
	`103`	`+ )`
`101`	`104`	`}`
`102`	`105`
`103`	`106`	`/**`