TS: Simplify debugging

asger-semmle · asger-semmle · commit 23f8d274476a · 2019-11-21T15:39:37.000Z
diff --git a/javascript/extractor/lib/typescript/package.json b/javascript/extractor/lib/typescript/package.json
@@ -8,7 +8,8 @@
         "build": "tsc --project tsconfig.json",
         "check": "tsc --noEmit --project . && tslint --project .",
         "lint": "tslint --project .",
-        "lint-fix": "tslint --project . --fix"
+        "lint-fix": "tslint --project . --fix",
+        "watch": "tsc -p . -w --sourceMap"
     },
     "devDependencies": {
         "@types/node": "12.7.11",
diff --git a/javascript/extractor/src/com/semmle/js/parser/TypeScriptParser.java b/javascript/extractor/src/com/semmle/js/parser/TypeScriptParser.java
@@ -291,10 +291,10 @@ private File getParserWrapper() {
     LogbackUtils.getLogger(AbstractProcessBuilder.class).setLevel(Level.INFO);
     String explicitPath = Env.systemEnv().get(PARSER_WRAPPER_PATH_ENV_VAR);
     String semmleDistVar = Env.systemEnv().get(Env.Var.SEMMLE_DIST.name());
-    if (semmleDistVar != null && !semmleDistVar.isEmpty()) {
-      parserWrapper = new File(semmleDistVar, "tools/typescript-parser-wrapper/main.js");
-    } else if (explicitPath != null) {
+    if (explicitPath != null) {
       parserWrapper = new File(explicitPath);
+    } else if (semmleDistVar != null && !semmleDistVar.isEmpty()) {
+      parserWrapper = new File(semmleDistVar, "tools/typescript-parser-wrapper/main.js");
     } else {
       throw new CatastrophicError(
           "Could not find TypeScript parser: " + Env.Var.SEMMLE_DIST.name() + " is not set.");
