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

TS: Allow .js extensions in cross package imports

Browse Source
This commit is contained in:
Asger Feldthaus
2020-01-23 17:03:58 +00:00
parent 852b90a6c9
commit fc04e06456
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
View File

@@ -728,7 +728,11 @@ public class AutoBuild {
// For named packages, find the main file.
String name = getChildAsString(packageJson, "name");
if (name != null) {
Path entryPoint = guessPackageMainFile(path, packageJson);
Path entryPoint = guessPackageMainFile(path, packageJson, FileType.TYPESCRIPT.getExtensions());
if (entryPoint == null) {
// Try a TypeScript-recognized JS extension instead
entryPoint = guessPackageMainFile(path, packageJson, Arrays.asList(".js", ".jsx"));
}
if (entryPoint != null) {
System.out.println(relativePath + ": Main file set to " + sourceRoot.relativize(entryPoint));
packageMainFile.put(name, entryPoint);
@@ -788,12 +792,11 @@ public class AutoBuild {
* given package - that is, the file you get when importing the package by name
* without any path suffix.
*/
private Path guessPackageMainFile(Path packageJsonFile, JsonObject packageJson) {
private Path guessPackageMainFile(Path packageJsonFile, JsonObject packageJson, Iterable<String> extensions) {
Path packageDir = packageJsonFile.getParent();
// Try <package_dir>/index.ts.
// Do not allow JavaScript extensions at this point as it might be compiled output (will be attempted later).
Path resolved = tryResolveWithExtensions(packageDir, "index", FileType.TYPESCRIPT.getExtensions());
Path resolved = tryResolveWithExtensions(packageDir, "index", extensions);
if (resolved != null) {
return resolved;
}
@@ -828,7 +831,7 @@ public class AutoBuild {
// Strip off extensions until a file can be found
while (true) {
resolved = tryResolveTypeScriptOrJavaScriptFile(sourceDir, candidatePath.toString());
resolved = tryResolveWithExtensions(sourceDir, candidatePath.toString(), extensions);
if (resolved != null) {
return resolved;
}
@@ -838,12 +841,6 @@ public class AutoBuild {
}
}
}
// Try <package_dir>/index.js - this time allowing JS extension.
resolved = tryResolveWithExtensions(packageDir, "index", FileType.JS.getExtensions());
if (resolved != null) {
return resolved;
}
return resolved;
}