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

pass extension instead of locationManager to isAlways*Module

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2020-08-21 14:27:47 +02:00
parent 372e1a3d84
commit 3f0f2c796c
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
javascript/extractor/src/com/semmle/js/extractor/ScriptExtractor.java
View File

@@ -24,19 +24,16 @@ public class ScriptExtractor implements IExtractor {
this.config = config;
}
/** True if the file specified by `locationManager` should always be treated as a module. */
private boolean isAlwaysModule(LocationManager locationManager, String packageType) {
String extension = locationManager.getSourceFileExtension();
/** True if files with the given extension and type (from package.json) should always be treated as ES2015 modules. */
private boolean isAlwaysModule(String extension, String packageType) {
if (extension.equals(".mjs") || extension.equals(".es6") || extension.equals(".es")) {
return true;
}
return "module".equals(packageType) && extension.equals(".js");
}
/** True if the file specified by `locationManager` should always be treated as CommonJS modules. */
private boolean isAlwaysCommonJSModule(LocationManager locationManager, String packageType) {
String extension = locationManager.getSourceFileExtension();
/** True if files with the given extension and type (from package.json) should always be treated as CommonJS modules. */
private boolean isAlwaysCommonJSModule(String extension, String packageType) {
return extension.equals(".cjs") || (extension.equals(".js") && "commonjs".equals(packageType));
}
@@ -66,13 +63,14 @@ public class ScriptExtractor implements IExtractor {
}
String packageType = getPackageType(locationManager.getSourceFile().getParentFile());
String extension = locationManager.getSourceFileExtension();
// Some files are interpreted as modules by default.
if (config.getSourceType() == SourceType.AUTO) {
if (isAlwaysModule(locationManager, packageType)) {
if (isAlwaysModule(extension, packageType)) {
config = config.withSourceType(SourceType.MODULE);
}
if (isAlwaysCommonJSModule(locationManager, packageType)) {
if (isAlwaysCommonJSModule(extension, packageType)) {
config = config.withSourceType(SourceType.COMMONJS_MODULE).withPlatform(Platform.NODE);
}
}