hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 10:15:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

rename predicate to getStem, and update regexp

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2021-04-09 13:02:19 +02:00
parent 30ba69d991
commit 595bdedb22
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
javascript/ql/src/semmle/javascript/NodeModuleResolutionImpl.qll
View File

@@ -85,12 +85,7 @@ File tryExtensions(Folder dir, string basename, int priority) {
* Or `name`, if `name` has no file extension.
*/
bindingset[name]
private string maybeRemoveExtension(string name) {
result = name.regexpCapture("^(.+)\\.[^.]+$", 1)
or
not name.regexpMatch(".+\\..+") and
result = name
}
private string getStem(string name) { result = name.regexpCapture("(.+?)(?:\\.([^.]+))?", 1) }
/**
* Gets the main module described by `pkg` with the given `priority`.
@@ -103,9 +98,7 @@ File resolveMainModule(PackageJSON pkg, int priority) {
or
not exists(main.resolve()) and
exists(int n | n = main.getNumComponent() |
result =
tryExtensions(main.resolveUpTo(n - 1), maybeRemoveExtension(main.getComponent(n - 1)),
priority)
result = tryExtensions(main.resolveUpTo(n - 1), getStem(main.getComponent(n - 1)), priority)
)
)
or
@@ -129,8 +122,7 @@ File resolveMainModule(PackageJSON pkg, int priority) {
exists(int n | n = file.getNumComponent() |
result =
min(int i, File res |
res =
tryExtensions(file.resolveUpTo(n - 1), maybeRemoveExtension(file.getComponent(n - 1)), i)
res = tryExtensions(file.resolveUpTo(n - 1), getStem(file.getComponent(n - 1)), i)
|
res order by i
)