Merge pull request github#3913 from erik-krogh/topmost

Approved by asgerf

Author: codeql-ci

javascript/ql/src/semmle/javascript/PackageExports.qll

@@ -13,15 +13,16 @@ bindingset[path]
 private int countSlashes(string path) { result = count(path.splitAt("/")) - 1 }
 
 /**
- * Gets the topmost package.json that appears in the project.
+ * Gets the topmost named package.json that appears in the project.
  *
  * There can be multiple results if the there exists multiple package.json that are equally deeply nested in the folder structure.
  * Results are limited to package.json files that are at most nested 2 directories deep.
  */
 PackageJSON getTopmostPackageJSON() {
   result =
     min(PackageJSON j |
-      countSlashes(j.getFile().getRelativePath()) <= 3
+      countSlashes(j.getFile().getRelativePath()) <= 3 and
+      exists(j.getPackageName())
     |
       j order by countSlashes(j.getFile().getRelativePath())
     )

javascript/ql/test/library-tests/PackageExports/tests.expected

@@ -1,7 +1,4 @@
 getTopmostPackageJSON
-| absent_main/package.json:1:1:3:1 | {\\n    " ... t.js"\\n} |
-| esmodules/package.json:1:1:3:1 | {\\n    " ... n.js"\\n} |
-| lib1/package.json:1:1:3:1 | {\\n    " ... n.js"\\n} |
 getAValueExportedBy
 | absent_main/package.json:1:1:3:1 | {\\n    " ... t.js"\\n} | absent_main/index.js:1:1:1:0 | this |
 | absent_main/package.json:1:1:3:1 | {\\n    " ... t.js"\\n} | absent_main/index.js:1:1:1:14 | module.exports |