JS: Use rewritePathSegment when resolving package main

asgerf · asgerf · commit f2aa399351ea · 2025-04-25T10:09:16.000+02:00
diff --git a/javascript/ql/lib/semmle/javascript/internal/paths/PackageJsonEx.qll b/javascript/ql/lib/semmle/javascript/internal/paths/PackageJsonEx.qll
@@ -103,6 +103,9 @@ private module ResolverConfig implements Folder::ResolveSig {
   predicate getAnAdditionalChild = JSPaths::getAnAdditionalChild/2;
 
   predicate isOptionalPathComponent(string segment) { segment = ["cjs", "mjs", "js"] }
+
+  bindingset[segment]
+  string rewritePathSegment(string segment) { result = segment.regexpReplaceAll("\\..*", "") }
 }
 
 private module Resolver = Folder::Resolve<ResolverConfig>;

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,9 @@ private module ResolverConfig implements Folder::ResolveSig {`
`103`	`103`	`predicate getAnAdditionalChild = JSPaths::getAnAdditionalChild/2;`
`104`	`104`
`105`	`105`	`predicate isOptionalPathComponent(string segment) { segment = ["cjs", "mjs", "js"] }`
	`106`	`+`
	`107`	`+ bindingset[segment]`
	`108`	`+ string rewritePathSegment(string segment) { result = segment.regexpReplaceAll("\\..*", "") }`
`106`	`109`	`}`
`107`	`110`
`108`	`111`	`private module Resolver = Folder::Resolve<ResolverConfig>;`