@teamscale/javascript-instrumenter 0.0.1-beta.28 → 0.0.1-beta.30

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@teamscale/javascript-instrumenter",
-    "version": "0.0.1-beta.28",
+    "version": "0.0.1-beta.30",
     "description": "Istanbul-based coverage instrumenter with coverage forwarding via WebSockets",
     "main": "dist/src/main.js",
     "bin": "dist/src/main.js",
@@ -27,6 +27,7 @@
         "@babel/plugin-transform-modules-commonjs": "^7.15.4",
         "@babel/preset-env": "^7.14.1",
         "@types/async": "^3.2.6",
+        "@types/bunyan": "^1.8.8",
         "@types/convert-source-map": "^1.5.1",
         "@types/glob": "^7.1.3",
         "@types/istanbul-lib-instrument": "^1.7.4",
@@ -53,7 +54,8 @@
         "@cqse/commons": "^0.0.1-beta.1",
         "@types/micromatch": "^4.0.2",
         "argparse": "^2.0.1",
-        "async": "^3.2.0",
+        "async": "^3.2.3",
+        "bunyan": "^1.8.15",
         "convert-source-map": "^1.7.0",
         "foreground-child": "^2.0.0",
         "glob": "^7.1.7",
@@ -64,8 +66,7 @@
         "source-map": "0.7.3",
         "typescript-optional": "^2.0.1",
         "unload": "^2.2.0",
-        "web-worker": "^1.0.0",
-        "winston": "^3.3.3"
+        "web-worker": "^1.0.0"
     },
     "publishConfig": {
         "access": "public"

package/dist/src/App.d.ts

@@ -1,6 +1,6 @@
 import { TaskResult } from './instrumenter/Task';
 import { ConfigurationParameters } from './instrumenter/TaskBuilder';
-import { Logger } from 'winston';
+import Logger from "bunyan";
 /**
  * Entry points of the instrumenter, including command line argument parsing.
  */

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;AAGlF,OAAgB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAG1C;;GAEG;AACH,qBAAa,GAAG;IACf;;;OAGG;WACiB,GAAG,IAAI,OAAO,CAAC,UAAU,CAAC;IAa9C;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IAgC1B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IAa1B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAS/B;;;;;OAKG;WACW,qBAAqB,CAAC,MAAM,EAAE,uBAAuB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAO1G,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;IAa9C;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IAgC1B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IA0B1B;;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;IAO1G,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAIxC,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAajC"}

package/dist/src/App.js

@@ -33,8 +33,9 @@ const commons_1 = require("@cqse/commons");
 const TaskBuilder_1 = require("./instrumenter/TaskBuilder");
 const path = __importStar(require("path"));
 const package_json_1 = require("../package.json");
-const winston_1 = __importDefault(require("winston"));
 const fs_1 = require("fs");
+const mkdirp_1 = __importDefault(require("mkdirp"));
+const bunyan_1 = __importDefault(require("bunyan"));
 /**
  * Entry points of the instrumenter, including command line argument parsing.
  */
@@ -89,27 +90,31 @@ class App {
      * Construct the logger.
      */
     static buildLogger(config) {
-        return winston_1.default.createLogger({
-            level: config.debug ? 'debug' : 'info',
-            format: winston_1.default.format.json(),
-            defaultMeta: {},
-            transports: [
-                new winston_1.default.transports.File({ filename: 'logs/instrumenter-error.log', level: 'error' }),
-                new winston_1.default.transports.File({ filename: 'logs/instrumenter-combined.log' }),
-                new winston_1.default.transports.Console({ format: winston_1.default.format.simple(), level: 'info' })
-            ]
-        });
+        const logfilePath = 'logs/instrumenter.log';
+        mkdirp_1.default.sync(path.dirname(logfilePath));
+        const logLevel = config.debug ? 'debug' : 'error';
+        return bunyan_1.default.createLogger({ name: "Instrumenter",
+            streams: [
+                {
+                    level: logLevel,
+                    stream: {
+                        write: (rec) => {
+                            console.log('[%s] %s: %s', rec.time.toISOString(), bunyan_1.default.nameFromLevel[rec.level], rec.msg);
+                        }
+                    },
+                    type: 'raw'
+                },
+                {
+                    level: logLevel,
+                    path: logfilePath
+                }
+            ] });
     }
     /**
      * A logger for testing.
      */
     static buildDummyLogger() {
-        return winston_1.default.createLogger({
-            level: 'info',
-            format: winston_1.default.format.json(),
-            defaultMeta: {},
-            transports: [new winston_1.default.transports.Console({ format: winston_1.default.format.simple(), level: 'info' })]
-        });
+        return bunyan_1.default.createLogger({ name: "Instrumenter" });
     }
     /**
      * The instrumenter can also be started by providing the configuration dictionary explicitly.

package/dist/src/instrumenter/Cleaner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Cleaner.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Cleaner.ts"],"names":[],"mappings":"AAGA,OAAO,EAON,cAAc,EACd,MAAM,cAAc,CAAC;AAEtB;;;;;GAKG;AACH,wBAAgB,eAAe,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,GAClD,MAAM,CAYR"}
+{"version":3,"file":"Cleaner.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Cleaner.ts"],"names":[],"mappings":"AAGA,OAAO,EAON,cAAc,EACd,MAAM,cAAc,CAAC;AAEtB;;;;;GAKG;AACH,wBAAgB,eAAe,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,GAClD,MAAM,CAcR"}

package/dist/src/instrumenter/Cleaner.js

@@ -18,7 +18,10 @@ function cleanSourceCode(code, esModules, makeCoverable) {
     const ast = (0, parser_1.parse)(code, { sourceType: esModules ? 'module' : 'script' });
     (0, traverse_1.default)(ast, {
         ExpressionStatement(path) {
-            if (isCoverageIncrementNode(path)) {
+            if (isUnsupportedCounterTypeIncrement(path)) {
+                path.remove();
+            }
+            else if (isCoverageIncrementNode(path)) {
                 if (path.node.loc && !makeCoverable(path.node.loc)) {
                     path.remove();
                 }
@@ -36,11 +39,64 @@ function isCoverageIncrementNode(path) {
     if (!(0, types_1.isUpdateExpression)(expr)) {
         return false;
     }
-    return (expr.operator === '++' &&
+    return extractCoverageCallExpression(expr) !== undefined;
+}
+/**
+ * Is the given expression statement a coverage increment that
+ * is not supported by our approach?
+ *
+ * For example, branch coverage is not supported.
+ */
+function isUnsupportedCounterTypeIncrement(path) {
+    if (!(0, types_1.isUpdateExpression)(path.node.expression)) {
+        return false;
+    }
+    return extractBranchCounterExpression(path.node.expression) !== undefined;
+}
+/**
+ * Returns the call expression from `cov_2pvvu1hl8v().b[2][0]++;` if
+ * the given UpdateExpression is a branch coverage update expression.
+ */
+function extractBranchCounterExpression(expr) {
+    if (expr.operator === '++' &&
+        (0, types_1.isMemberExpression)(expr.argument) &&
+        (0, types_1.isMemberExpression)(expr.argument.object) &&
+        (0, types_1.isMemberExpression)(expr.argument.object.object) &&
+        (0, types_1.isCallExpression)(expr.argument.object.object.object)) {
+        // Branch counter
+        return extractCoverageObjectCall(expr.argument.object.object.object);
+    }
+    return undefined;
+}
+/**
+ * Returns the call expression from `cov_104fq7oo4i().f[0]++;` if
+ * the given UpdateExpression is a function or statement coverage update expression.
+ */
+function extractFunctionOrStatementCounterExpression(expr) {
+    if (expr.operator === '++' &&
         (0, types_1.isMemberExpression)(expr.argument) &&
         (0, types_1.isMemberExpression)(expr.argument.object) &&
-        (0, types_1.isCallExpression)(expr.argument.object.object) &&
-        (0, types_1.isIdentifier)(expr.argument.object.object.callee) &&
-        expr.argument.object.object.callee.name.startsWith('cov_') &&
-        (0, types_1.isNumericLiteral)(expr.argument.property));
+        (0, types_1.isCallExpression)(expr.argument.object.object)) {
+        // Function and statement counter
+        return extractCoverageObjectCall(expr.argument.object.object);
+    }
+    return undefined;
+}
+/**
+ * Given an `UpdateExpression` extract the call expression returning the coverage object.
+ */
+function extractCoverageCallExpression(expr) {
+    var _a;
+    return (_a = extractBranchCounterExpression(expr)) !== null && _a !== void 0 ? _a : extractFunctionOrStatementCounterExpression(expr);
+}
+/**
+ * Check if the given call expression is a coverage call expression.
+ * If this is not the case return `undefined`, and the call expression itself otherwise.
+ */
+function extractCoverageObjectCall(callExpression) {
+    if (callExpression && (0, types_1.isIdentifier)(callExpression.callee)
+        && callExpression.callee.name.startsWith('cov_')) {
+        return callExpression;
+    }
+    return undefined;
 }

package/dist/src/instrumenter/Instrumenter.d.ts

@@ -1,5 +1,5 @@
 import { CollectorSpecifier, InstrumentationTask, OriginSourcePattern, TaskElement, TaskResult } from './Task';
-import { Logger } from 'winston';
+import Logger from "bunyan";
 export declare const IS_INSTRUMENTED_TOKEN = "/** $IS_JS_PROFILER_INSTRUMENTED=true **/";
 /**
  * An instrumenter that can conduct a {@code InstrumentationTask}.

package/dist/src/instrumenter/Instrumenter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Instrumenter.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Instrumenter.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EAGnB,WAAW,EACX,UAAU,EACV,MAAM,QAAQ,CAAC;AAOhB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAIjC,eAAO,MAAM,qBAAqB,8CAA8C,CAAC;AAEjF;;GAEG;AACH,MAAM,WAAW,aAAa;IAC7B;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAC3D;AAED;;GAEG;AACH,qBAAa,oBAAqB,YAAW,aAAa;IACzD;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IAEzC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAS;gBAEX,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IASnD;;OAEG;IACG,UAAU,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC;IAehE;;;;;;OAMG;IACG,aAAa,CAClB,SAAS,EAAE,kBAAkB,EAC7B,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,mBAAmB,GAChC,OAAO,CAAC,UAAU,CAAC;YAqGR,6BAA6B;YA6B7B,aAAa;IAe3B;;;;OAIG;IACH,OAAO,CAAC,WAAW;IASnB;;;;;;;OAOG;IACH,OAAO,CAAC,gCAAgC;IAQxC;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAK3B;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IAcpC;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;CAe1B"}
+{"version":3,"file":"Instrumenter.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Instrumenter.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EAGnB,WAAW,EACX,UAAU,EACV,MAAM,QAAQ,CAAC;AAUhB,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,eAAO,MAAM,qBAAqB,8CAA8C,CAAC;AAEjF;;GAEG;AACH,MAAM,WAAW,aAAa;IAC7B;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAC3D;AAED;;GAEG;AACH,qBAAa,oBAAqB,YAAW,aAAa;IACzD;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IAEzC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAS;gBAEX,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IASnD;;OAEG;IACG,UAAU,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC;IAYhE;;;;;;OAMG;IACG,aAAa,CAClB,SAAS,EAAE,kBAAkB,EAC7B,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,mBAAmB,GAChC,OAAO,CAAC,UAAU,CAAC;YAoGR,6BAA6B;YAkC7B,aAAa;IAe3B;;;;OAIG;IACH,OAAO,CAAC,WAAW;IASnB;;;;;;;OAOG;IACH,OAAO,CAAC,gCAAgC;IAQxC;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAK3B;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IAcpC;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;CAe1B"}

package/dist/src/instrumenter/Instrumenter.js

@@ -22,6 +22,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IstanbulInstrumenter = exports.IS_INSTRUMENTED_TOKEN = void 0;
 const Task_1 = require("./Task");
@@ -29,10 +32,12 @@ const commons_1 = require("@cqse/commons");
 const source_map_1 = require("source-map");
 const istanbul = __importStar(require("istanbul-lib-instrument"));
 const fs = __importStar(require("fs"));
+const mkdirp = __importStar(require("mkdirp"));
 const path = __importStar(require("path"));
 const convertSourceMap = __importStar(require("convert-source-map"));
 const Cleaner_1 = require("./Cleaner");
 const typescript_optional_1 = require("typescript-optional");
+const async_1 = __importDefault(require("async"));
 exports.IS_INSTRUMENTED_TOKEN = '/** $IS_JS_PROFILER_INSTRUMENTED=true **/';
 /**
  * An instrumenter based on the IstanbulJs instrumentation and coverage framework.
@@ -47,11 +52,15 @@ class IstanbulInstrumenter {
      * {@inheritDoc #IInstrumenter.instrument}
      */
     async instrument(task) {
-        fs.existsSync(this.vaccineFilePath);
-        const resolved = await Promise.all(task.elements.map((taskElement) => {
-            return this.instrumentOne(task.collector, taskElement, task.originSourcePattern);
-        }));
-        return resolved.reduce((aggregatedResult, taskResult) => aggregatedResult.withIncrement(taskResult), Task_1.TaskResult.neutral());
+        // We limit the number of instrumentations in parallel to one to
+        // not overuse memory (NodeJS has only limited mem to use).
+        return async_1.default.mapLimit(task.elements, 1, async (taskElement) => {
+            return await this.instrumentOne(task.collector, taskElement, task.originSourcePattern);
+        }).then((results) => {
+            return results.reduce((prev, curr) => {
+                return prev.withIncrement(curr);
+            }, Task_1.TaskResult.neutral());
+        });
     }
     /**
      * Perform the instrumentation for one given task element (file to instrument).
@@ -66,7 +75,7 @@ class IstanbulInstrumenter {
         // We skip files that we have already instrumented
         if (inputFileSource.startsWith(exports.IS_INSTRUMENTED_TOKEN)) {
             if (!taskElement.isInPlace()) {
-                fs.writeFileSync(taskElement.toFile, inputFileSource);
+                writeToFile(taskElement.toFile, inputFileSource);
             }
             return new Task_1.TaskResult(0, 0, 0, 1, 0, 0, 0);
         }
@@ -93,7 +102,7 @@ class IstanbulInstrumenter {
                 //
                 const originSourceFiles = (_a = inputSourceMap === null || inputSourceMap === void 0 ? void 0 : inputSourceMap.sources) !== null && _a !== void 0 ? _a : [];
                 if (this.shouldExcludeFromInstrumentation(sourcePattern, taskElement.fromFile, originSourceFiles)) {
-                    fs.writeFileSync(taskElement.toFile, inputFileSource);
+                    writeToFile(taskElement.toFile, inputFileSource);
                     return new Task_1.TaskResult(0, 1, 0, 0, 0, 0, 0);
                 }
                 // The main instrumentation (adding coverage statements) is performed now:
@@ -109,7 +118,10 @@ class IstanbulInstrumenter {
                 //
                 // `lastSourceMap` === Sourcemap for the last file that was instrumented.
                 finalSourceMap = convertSourceMap.fromObject(instrumenter.lastSourceMap()).toComment();
-                break;
+                // We now can glue together the final version of the instrumented file.
+                const vaccineSource = this.loadVaccine(collector);
+                writeToFile(taskElement.toFile, `${exports.IS_INSTRUMENTED_TOKEN} ${vaccineSource} ${instrumentedSource} \n${finalSourceMap}`);
+                return new Task_1.TaskResult(1, 0, 0, 0, 0, 0, 0);
             }
             catch (e) {
                 // If also the last configuration alternative failed,
@@ -118,16 +130,12 @@ class IstanbulInstrumenter {
                     if (!inputSourceMap) {
                         return Task_1.TaskResult.warning(`Failed loading input source map for ${taskElement.fromFile}: ${e.message}`);
                     }
-                    fs.writeFileSync(taskElement.toFile, inputFileSource);
+                    writeToFile(taskElement.toFile, inputFileSource);
                     return Task_1.TaskResult.error(e);
                 }
             }
         }
-        // We now can glue together the final version of the instrumented file.
-        //
-        const vaccineSource = this.loadVaccine(collector);
-        fs.writeFileSync(taskElement.toFile, `${exports.IS_INSTRUMENTED_TOKEN} ${vaccineSource} ${instrumentedSource} \n${finalSourceMap}`);
-        return new Task_1.TaskResult(1, 0, 0, 0, 0, 0, 0);
+        return new Task_1.TaskResult(0, 0, 0, 0, 0, 1, 0);
     }
     async removeUnwantedInstrumentation(taskElement, instrumentedSource, configurationAlternative, sourcePattern) {
         // Read the source map from the instrumented file
@@ -137,7 +145,7 @@ class IstanbulInstrumenter {
             return instrumentedSource;
         }
         // Remove the unwanted instrumentation
-        return (0, Cleaner_1.cleanSourceCode)(instrumentedSource, configurationAlternative.esModules, location => {
+        const cleaned = (0, Cleaner_1.cleanSourceCode)(instrumentedSource, configurationAlternative.esModules, location => {
             const originalPosition = instrumentedSourceMapConsumer.originalPositionFor({
                 line: location.start.line,
                 column: location.start.column
@@ -147,6 +155,9 @@ class IstanbulInstrumenter {
             }
             return sourcePattern.isAnyIncluded([originalPosition.source]);
         });
+        // Explicitly free the source map to avoid memory leaks
+        instrumentedSourceMapConsumer.destroy();
+        return cleaned;
     }
     async loadSourceMap(instrumentedSource, instrumentedSourceFileName) {
         const instrumentedSourceMap = this.loadInputSourceMap(instrumentedSource, instrumentedSourceFileName, typescript_optional_1.Optional.empty());
@@ -276,3 +287,7 @@ function sourceMapFromMapFile(mapFilePath) {
     const content = fs.readFileSync(mapFilePath, 'utf8');
     return JSON.parse(content);
 }
+function writeToFile(filePath, fileContent) {
+    mkdirp.sync(path.dirname(filePath));
+    fs.writeFileSync(filePath, fileContent);
+}

package/dist/src/instrumenter/TaskBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TaskBuilder.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/TaskBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,mBAAmB,EAGnB,kBAAkB,EAElB,MAAM,QAAQ,CAAC;AAMhB,2DAA2D;AAC3D,oBAAY,uBAAuB,GAAG;IACrC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAElB,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,cAAc,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAkBF;;GAEG;AACH,qBAAa,WAAW;IACvB,gDAAgD;IAChD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IAEzC,6CAA6C;IAC7C,OAAO,CAAC,SAAS,CAA4B;IAE7C,0BAA0B;IAC1B,OAAO,CAAC,0BAA0B,CAAqB;IAEvD,0BAA0B;IAC1B,OAAO,CAAC,0BAA0B,CAAqB;;IAOvD,0EAA0E;IAC1E,sBAAsB,CAAC,sBAAsB,EAAE,MAAM,GAAG,IAAI;IAM5D,8BAA8B;IAC9B,6BAA6B,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAKhE,6BAA6B;IAC7B,6BAA6B,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAKhE,yBAAyB;IACzB,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAKlG;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,uBAAuB,GAAG,IAAI;IAkCpD;;;;;;;OAOG;IACH,OAAO,CAAC,4CAA4C;IA8BpD;;;;;;OAMG;IACH,OAAO,CAAC,0BAA0B;IASlC;;OAEG;IACI,KAAK,IAAI,mBAAmB;CAInC"}
+{"version":3,"file":"TaskBuilder.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/TaskBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,mBAAmB,EAGnB,kBAAkB,EAElB,MAAM,QAAQ,CAAC;AAMhB,2DAA2D;AAC3D,oBAAY,uBAAuB,GAAG;IACrC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAElB,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,cAAc,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAkBF;;GAEG;AACH,qBAAa,WAAW;IACvB,gDAAgD;IAChD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IAEzC,6CAA6C;IAC7C,OAAO,CAAC,SAAS,CAA4B;IAE7C,0BAA0B;IAC1B,OAAO,CAAC,0BAA0B,CAAqB;IAEvD,0BAA0B;IAC1B,OAAO,CAAC,0BAA0B,CAAqB;;IAOvD,0EAA0E;IAC1E,sBAAsB,CAAC,sBAAsB,EAAE,MAAM,GAAG,IAAI;IAM5D,8BAA8B;IAC9B,6BAA6B,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAKhE,6BAA6B;IAC7B,6BAA6B,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAKhE,yBAAyB;IACzB,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAKlG;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,uBAAuB,GAAG,IAAI;IAkCpD;;;;;;;OAOG;IACH,OAAO,CAAC,4CAA4C;IAgCpD;;;;;;OAMG;IACH,OAAO,CAAC,0BAA0B;IASlC;;OAEG;IACI,KAAK,IAAI,mBAAmB;CAInC"}

package/dist/src/instrumenter/TaskBuilder.js

@@ -132,7 +132,11 @@ class TaskBuilder {
                     inputFiles.forEach(f => this.addElement(f, path.join(target, path.basename(f)), sourceMapInfo));
                 }
                 else {
-                    inputFiles.forEach(f => this.addElement(f, path.join(target, path.relative(input, path.basename(f))), sourceMapInfo));
+                    inputFiles.forEach(f => {
+                        const pathRelativeToInputDir = path.relative(input, f);
+                        const targetFileName = path.join(target, pathRelativeToInputDir);
+                        this.addElement(f, targetFileName, sourceMapInfo);
+                    });
                 }
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamscale/javascript-instrumenter",
-  "version": "0.0.1-beta.28",
+  "version": "0.0.1-beta.30",
   "description": "Istanbul-based coverage instrumenter with coverage forwarding via WebSockets",
   "main": "dist/src/main.js",
   "bin": "dist/src/main.js",
@@ -27,6 +27,7 @@
     "@babel/plugin-transform-modules-commonjs": "^7.15.4",
     "@babel/preset-env": "^7.14.1",
     "@types/async": "^3.2.6",
+    "@types/bunyan": "^1.8.8",
     "@types/convert-source-map": "^1.5.1",
     "@types/glob": "^7.1.3",
     "@types/istanbul-lib-instrument": "^1.7.4",
@@ -53,7 +54,8 @@
     "@cqse/commons": "^0.0.1-beta.1",
     "@types/micromatch": "^4.0.2",
     "argparse": "^2.0.1",
-    "async": "^3.2.0",
+    "async": "^3.2.3",
+    "bunyan": "^1.8.15",
     "convert-source-map": "^1.7.0",
     "foreground-child": "^2.0.0",
     "glob": "^7.1.7",
@@ -64,8 +66,7 @@
     "source-map": "0.7.3",
     "typescript-optional": "^2.0.1",
     "unload": "^2.2.0",
-    "web-worker": "^1.0.0",
-    "winston": "^3.3.3"
+    "web-worker": "^1.0.0"
   },
   "publishConfig": {
     "access": "public"