hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-07-11 14:35:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

JS: Handle package.json-specified main files

Browse Source
This commit is contained in:
Asger F
2025-04-07 09:51:38 +02:00
parent 95ea1b25f4
commit 26a8e0b572
3 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
javascript/ql/lib/semmle/javascript/internal/PathResolution.qll
View File

@@ -273,9 +273,55 @@ module PathResolution {
)
}
private JsonValue getAPartOfExportsSection(PackageJson pkg, string exportedPath) {
result = pkg.getPropValue("exports") and
exportedPath = "."
or
exists(string prop, string prevPath |
result = getAPartOfExportsSection(pkg, prevPath).getPropValue(prop) and
if prop.matches(".%") then exportedPath = prop else exportedPath = prevPath
)
}
private module ResolvePackageMainConfig implements ResolvePathsSig {
additional predicate shouldResolve(
PackageJson pkg, string exportedPath, Folder base, string path
) {
base = pkg.getJsonFile().getParentContainer() and
(
path = pkg.getPropStringValue(["main", "module"]) and
exportedPath = "."
or
path = getAPartOfExportsSection(pkg, exportedPath).getStringValue()
)
}
predicate shouldResolve(Folder base, string path) { shouldResolve(_, _, base, path) }
}
private module ResolvePackageMain = ResolvePaths<ResolvePackageMainConfig>;
private Container resolvePackageMain(PackageJson pkg, string exportedPath) {
exists(Folder base, string path |
ResolvePackageMainConfig::shouldResolve(pkg, exportedPath, base, path) and
result = ResolvePackageMain::resolve(base, path)
)
}
private Container resolvePackageMain(PackageJson pkg) { result = resolvePackageMain(pkg, ".") }
private File getFileFromFolderImport(Folder folder) {
result = folder.getJavaScriptFile("index")
or
exists(PackageJson pkg |
pkg.getJsonFile().getParentContainer() = folder and
result = resolvePackageMain(pkg)
)
}
File resolvePathExpr(PathExpr expr) {
result = resolvePathExpr1(expr)
or
result = resolvePathExpr1(expr).(Folder).getJavaScriptFile("index")
result = getFileFromFolderImport(resolvePathExpr1(expr))
}
}

6
javascript/ql/test/library-tests/PathResolution/Basic/import-packages.ts
View File

@@ -1,6 +1,6 @@
import '../PackageWithMain'; // $ MISSING: importTarget=PackageWithMain/main.js
import '../PackageWithModuleMain'; // $ MISSING: importTarget=PackageWithModuleMain/main.js
import '../PackageWithExports'; // $ MISSING: importTarget=PackageWithExports/main.js
import '../PackageWithMain'; // $ importTarget=PackageWithMain/main.js
import '../PackageWithModuleMain'; // $ importTarget=PackageWithModuleMain/main.js
import '../PackageWithExports'; // $ importTarget=PackageWithExports/main.js
import '@example/package-with-main'; // $ importTarget=PackageWithMain/main.js
import '@example/package-with-module-main'; // $ importTarget=PackageWithModuleMain/main.js

8
javascript/ql/test/library-tests/PathResolution/test.expected
View File

@@ -22,8 +22,12 @@
| Basic/Subdir/sub.ts:2:1:2:13 | import '../'; | Basic/index.ts |
| Basic/Subdir/sub.ts:3:1:3:14 | import './..'; | Basic/index.ts |
| Basic/Subdir/sub.ts:4:1:4:15 | import './../'; | Basic/index.ts |
| Basic/import-packages.ts:4:1:4:36 | import ... -main'; | PackageWithMain/main.js |
| Basic/import-packages.ts:5:1:5:43 | import ... -main'; | PackageWithModuleMain/main.js |
| Basic/import-packages.ts:1:1:1:28 | import ... hMain'; | PackageWithMain/main.js |
| Basic/import-packages.ts:2:1:2:34 | import ... eMain'; | PackageWithModuleMain/main.js |
| Basic/import-packages.ts:3:1:3:31 | import ... ports'; | PackageWithExports/main.js |
| Basic/import-packages.ts:5:1:5:36 | import ... -main'; | PackageWithMain/main.js |
| Basic/import-packages.ts:6:1:6:43 | import ... -main'; | PackageWithModuleMain/main.js |
| Basic/import-packages.ts:7:1:7:39 | import ... ports'; | PackageWithExports/main.js |
| Basic/index.ts:1:1:1:22 | import ... r/sub'; | Basic/Subdir/sub.ts |
| Extended/src/main.ts:2:1:2:21 | import ... /file"; | Extended/lib/file.ts |
| Extended/src/main.ts:3:1:3:24 | import ... le.ts"; | Extended/lib/file.ts |