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

TS: Review

Browse Source
This commit is contained in:
Asger F
2019-08-20 09:57:32 +01:00
parent ca79b083cf
commit 6f217502f9
2 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
javascript/extractor/lib/typescript/README.md
View File

@@ -11,11 +11,8 @@ Debugging
To debug the parser script:
1. Launch an extraction process with the environment variable `SEMMLE_TYPESCRIPT_ATTACH_DEBUGGER`
set to `break`.
1. Launch an extraction process with the environment variable `SEMMLE_TYPESCRIPT_NODE_FLAGS`
set to `--inspect`, or `--inspect-brk` if you wish to pause on entry.
2. Open VSCode and choose "Debug: Attach to Node process" from the command palette, and
choose the process that looks like the parser-wrapper.
If you don't wish to pause on entry, instead set `SEMMLE_TYPESCRIPT_ATTACH_DEBUGGER` to
any non-empty value.

43
javascript/extractor/src/com/semmle/js/parser/TypeScriptParser.java
View File

@@ -99,14 +99,19 @@ public class TypeScriptParser {
public static final String TYPESCRIPT_RAM_RESERVE_SUFFIX = "TYPESCRIPT_RAM_RESERVE";
/**
* An environment variable which, if set, allows a debugger to be attached to the Node.js
* process. Remote debugging will not be enabled.
* An environment variable with additional VM arguments to pass to the Node process.
* <p>
* If set to <code>break</code> the Node.js process will pause on entry waiting for the
* debugger to attach (<code>--inspect-brk</code>). If set to any other non-empty value,
* it will just enable debugging (<code>--inspect</code>).
* Only <code>--inspect</code> or <code>--inspect-brk</code> may be used at the moment.
*/
public static final String TYPESCRIPT_ATTACH_DEBUGGER = "SEMMLE_TYPESCRIPT_ATTACH_DEBUGGER";
public static final String TYPESCRIPT_NODE_FLAGS = "SEMMLE_TYPESCRIPT_NODE_FLAGS";
/**
* Flags that may be passed using {@link #TYPESCRIPT_NODE_FLAGS}
*/
private static final Set<String> allowedDebugNodeFlags = new HashSet<String>(Arrays.fromList(
"--inspect",
"--inspect-brk"
));
/** The Node.js parser wrapper process, if it has been started already. */
private Process parserWrapperProcess;
@@ -213,9 +218,7 @@ public class TypeScriptParser {
result.add(nodeJsRuntime);
result.addAll(nodeJsRuntimeExtraArgs);
for(String arg : args) {
if (arg.length() > 0) {
result.add(arg);
}
result.add(arg);
}
return result;
}
@@ -249,21 +252,15 @@ public class TypeScriptParser {
File parserWrapper = getParserWrapper();
String debuggerFlag = Env.systemEnv().get(TYPESCRIPT_ATTACH_DEBUGGER);
String inspectArg = "";
if (debuggerFlag != null && debuggerFlag.length() > 0) {
if (debuggerFlag.equalsIgnoreCase("break")) {
inspectArg = "--inspect-brk";
} else {
inspectArg = "--inspect";
}
}
String debugFlagString = Env.systemEnv().getNonEmpty(TYPESCRIPT_NODE_FLAGS);
List<String> debugFlags = debugFlagString == null ? new ArrayList<>() : debugFlagString.split(" ");
debugFlags.retainAll(allowedDebugNodeFlags);
List<String> cmd = getNodeJsRuntimeInvocation();
cmd.add("--max_old_space_size=" + (mainMemoryMb + reserveMemoryMb));
cmd.addAll(debugFlags);
cmd.add(parserWrapper.getAbsolutePath());
List<String> cmd = getNodeJsRuntimeInvocation(
"--max_old_space_size=" + (mainMemoryMb + reserveMemoryMb),
inspectArg,
parserWrapper.getAbsolutePath()
);
ProcessBuilder pb = new ProcessBuilder(cmd);
parserWrapperCommand = StringUtil.glue(" ", cmd);
pb.environment().put("SEMMLE_TYPESCRIPT_MEMORY_THRESHOLD", "" + mainMemoryMb);