@teamscale/javascript-instrumenter 0.0.1-beta.49 → 0.0.1-beta.50

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@teamscale/javascript-instrumenter",
-    "version": "0.0.1-beta.49",
+    "version": "0.0.1-beta.50",
     "description": "JavaScript coverage instrumenter with coverage forwarding to a collector process",
     "main": "dist/src/main.js",
     "bin": "dist/src/main.js",

package/dist/src/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/App.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGtE,OAAO,EAAE,uBAAuB,EAAe,MAAM,4BAA4B,CAAC;AAKlF,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B;;GAEG;AACH,qBAAa,GAAG;IACf;;;OAGG;WACiB,GAAG,IAAI,OAAO,CAAC,UAAU,CAAC;IAa9C;;;OAGG;WACW,iBAAiB,CAAC,MAAM,EAAE,uBAAuB,GAAG,IAAI;IAoCtE;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IAyC1B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IA8B1B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAI/B;;;;;OAKG;WACW,qBAAqB,CAAC,MAAM,EAAE,uBAAuB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAS1G,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAIxC,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAajC"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/App.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGtE,OAAO,EAAE,uBAAuB,EAAe,MAAM,4BAA4B,CAAC;AAKlF,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B;;GAEG;AACH,qBAAa,GAAG;IACf;;;OAGG;WACiB,GAAG,IAAI,OAAO,CAAC,UAAU,CAAC;IAe9C;;;OAGG;WACW,iBAAiB,CAAC,MAAM,EAAE,uBAAuB,GAAG,IAAI;IAyCtE;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IAyC1B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IA8B1B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAI/B;;;;;OAKG;WACW,qBAAqB,CAAC,MAAM,EAAE,uBAAuB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAS1G,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAIxC,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAajC"}

package/dist/src/App.js

@@ -51,6 +51,8 @@ class App {
         const config = parser.parse_args();
         // Build the logger
         const logger = this.buildLogger(config);
+        logger.debug("Retrieved arguments", process.argv);
+        logger.debug("Translated arguments to config", config);
         // Run the instrumenter with the given configuration.
         return this.runForConfigArguments(config, logger);
     }
@@ -63,7 +65,13 @@ class App {
             if (originalString === undefined) {
                 return originalString;
             }
-            return originalString.replace(/^["'](.+(?=["']$))["']$/, '$1');
+            const result = originalString.replace(/^["'](.+(?=["']$))["']$/, '$1');
+            if (result === originalString) {
+                return result;
+            }
+            else {
+                return unquoteString(result);
+            }
         }
         function unquoteStringElements(originalArray) {
             if (originalArray === undefined) {

package/dist/src/instrumenter/Instrumenter.js

@@ -83,6 +83,10 @@ class IstanbulInstrumenter {
             }
             return new Task_1.TaskResult(0, 0, 0, 1, 0, 0, 0);
         }
+        // Not all file types are supported by the instrumenter
+        if (!this.isFileTypeSupported(taskElement.fromFile)) {
+            return new Task_1.TaskResult(0, 0, 0, 0, 1, 0, 0);
+        }
         // We might want to skip the instrumentation of the file
         if (excludeBundles.isExcluded(taskElement.fromFile)) {
             if (!taskElement.isInPlace()) {
@@ -90,10 +94,6 @@ class IstanbulInstrumenter {
             }
             return new Task_1.TaskResult(0, 1, 0, 0, 0, 0, 0);
         }
-        // Not all file types are supported by the instrumenter
-        if (!this.isFileTypeSupported(taskElement.fromFile)) {
-            return new Task_1.TaskResult(0, 0, 0, 0, 1, 0, 0);
-        }
         // Report progress
         this.logger.info(`Instrumenting "${path.basename(taskElement.fromFile)}"`);
         let finalSourceMap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamscale/javascript-instrumenter",
-  "version": "0.0.1-beta.49",
+  "version": "0.0.1-beta.50",
   "description": "JavaScript coverage instrumenter with coverage forwarding to a collector process",
   "main": "dist/src/main.js",
   "bin": "dist/src/main.js",