@teamscale/javascript-instrumenter 0.0.1-beta.3 → 0.0.1-beta.33

package/README.md

@@ -9,7 +9,7 @@ in the Teamscale Simple Coverage Format and sent to a Teamscale instance.
 The Teamscale JavaScript Profiler consists of the [Coverage Collector](https://www.npmjs.com/package/@teamscale/coverage-collector) 
 and this JavaScript Instrumenter.
 More details on using them (in combination) can be found
-on the projects' [Github page](https://github.com/cqse/teamscale-javascript-profiler/).
+in the [Teamscale Documentation](https://docs.teamscale.com/howto/recording-test-coverage-for-javascript/).
 
 The Instrumenter instruments a given (set of) JavaScript file(s) such that (1) coverage 
 information is produced and (2) forwarded to the Collector.
@@ -25,34 +25,12 @@ yarn install
 yarn build
 ```
 
-### Preparation: Source Maps
-
-Please make sure to enable the generation of source map files to ensure
-that the profiled code can be mapped back to the original.
-
-For example, when the tool Vite is used to bundle the code,
-the generation of source map information can be enabled by setting:
-
-```
-   build: {
-      sourcemap: true
-   }
-```
-
-or
-
-```
-   build: {
-      sourcemap: `inline`
-   }
-```
-
 ## Workflow Integration
 
 There are several options to run the Instrumenter. For example, via `yarn` by running
 
 ```
-yarn instrument
+yarn instrumenter
 ```
 
 or via `npx` by running
@@ -74,30 +52,19 @@ the file must contain source-map information, or the source-map file
 must be placed along with the source file in the same directory.
 
 ```
-yarn run --inplace ./the/path/to/the/file.js
+yarn instrumenter --inplace ./the/path/to/the/file.js
 ```
 
 ```
-yarn run --inplace ./the/path/to/the/file.js --source-map ./the/path/to/the/source.map
+yarn instrumenter --inplace ./the/path/to/the/file.js --source-map ./the/path/to/the/source.map
 ```
 
 ```
-yarn run ./the/path/to/the/file.js --to ./the/file/path/to/write/to.js
+yarn instrumenter ./the/path/to/the/file.js --to ./the/file/path/to/write/to.js
 ```
 
-### Instrumenting all JavaScript Files in a Folder
-
-We think that dealing with sets of files, in particular including or excluding
-files that match particular file masks should be done by other tools.
-In a UNIX environment, you should consider using `find` with corresponding
-filters and an `-exec` argument to run the instrumenter.
-
-### Integration with Testing Frameworks
-
-This is planned work: Provide a Babel plugin that provides a code transformation
-such that coverage information is collected and this information is forwarded.
-
 ## Limitations
 
 This tool inherits most of the limitations of IstanbulJs, including 
 a considerable performance impact.
+

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@teamscale/javascript-instrumenter",
-    "version": "0.0.1-beta.3",
+    "version": "0.0.1-beta.33",
     "description": "Istanbul-based coverage instrumenter with coverage forwarding via WebSockets",
     "main": "dist/src/main.js",
     "bin": "dist/src/main.js",
@@ -12,24 +12,27 @@
         "url": "https://github.com/cqse/teamscale-javascript-profiler.git"
     },
     "scripts": {
+        "prepublishOnly": "yarn clean && yarn build",
         "clean": "rimraf dist tsconfig.tsbuildinfo",
-        "build": "tsc --project tsconfig.json && node esbuild.mjs",
-        "instrument": "node dist/src/main.js",
+        "build": "tsc --project tsconfig.json && yarn buildVaccine",
+        "buildVaccine": "node esbuild.mjs",
+        "instrumenter": "node dist/src/main.js",
         "test": "yarn build && NODE_OPTIONS='--experimental-vm-modules' jest --forceExit --coverage --silent=true --detectOpenHandles"
     },
     "files": [
         "dist/**/*"
     ],
     "devDependencies": {
-        "@babel/core": "^7.14.0",
+        "@babel/core": "^7.17.5",
         "@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",
         "@types/jest": "^27.0.1",
-        "@types/mkdirp": "^1.0.1",
+        "@types/mkdirp": "^1.0.2",
         "@types/node": "^15.0.1",
         "@types/source-map": "^0.5.7",
         "@types/ws": "^7.4.4",
@@ -44,10 +47,15 @@
         "typescript": "^4.4.3"
     },
     "dependencies": {
+        "@babel/generator": "^7.17.3",
+        "@babel/parser": "^7.17.3",
+        "@babel/traverse": "^7.17.3",
+        "@babel/types": "^7.17.0",
         "@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",
@@ -55,11 +63,10 @@
         "micromatch": "4.0.4",
         "mkdirp": "^1.0.4",
         "nyc": "^15.1.0",
-        "source-map": "0.6.1",
+        "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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -29,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.
  */
@@ -59,11 +64,11 @@ class App {
         parser.add_argument('-v', '--version', { action: 'version', version: package_json_1.version });
         parser.add_argument('-i', '--in-place', {
             action: 'store_true',
-            help: 'If set, the original files to instrument are replaced (!!) by their instrumented counterparts.'
+            help: 'If set, the original files to instrument are replaced by their instrumented counterparts.'
         });
         parser.add_argument('-d', '--debug', { action: 'store_true' });
         parser.add_argument('-o', '--to', {
-            help: 'Name of the file to write the instrumented version to.'
+            help: 'Path (directory or file name) to write the instrumented version to.'
         });
         parser.add_argument('-s', '--source-map', {
             help: 'External location of source-map files to consider.'
@@ -85,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

@@ -0,0 +1,9 @@
+import { SourceLocation } from '@babel/types';
+/**
+ * Remove IstanbulJs instrumentations based on the given
+ * hook `makeCoverable`.
+ *
+ * An instrumentation is removed if the hook `makeCoverable` returns `false`.
+ */
+export declare function cleanSourceCode(code: string, esModules: boolean, makeCoverable: (location: SourceLocation) => boolean): string;
+//# sourceMappingURL=Cleaner.d.ts.map

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

@@ -0,0 +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,CAcR"}

package/dist/src/instrumenter/Cleaner.js

@@ -0,0 +1,102 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanSourceCode = void 0;
+const parser_1 = require("@babel/parser");
+const generator_1 = __importDefault(require("@babel/generator"));
+const traverse_1 = __importDefault(require("@babel/traverse"));
+const types_1 = require("@babel/types");
+/**
+ * Remove IstanbulJs instrumentations based on the given
+ * hook `makeCoverable`.
+ *
+ * An instrumentation is removed if the hook `makeCoverable` returns `false`.
+ */
+function cleanSourceCode(code, esModules, makeCoverable) {
+    const ast = (0, parser_1.parse)(code, { sourceType: esModules ? 'module' : 'script' });
+    (0, traverse_1.default)(ast, {
+        ExpressionStatement(path) {
+            if (isUnsupportedCounterTypeIncrement(path)) {
+                path.remove();
+            }
+            else if (isCoverageIncrementNode(path)) {
+                if (path.node.loc && !makeCoverable(path.node.loc)) {
+                    path.remove();
+                }
+            }
+        }
+    });
+    return (0, generator_1.default)(ast, {}, code).code;
+}
+exports.cleanSourceCode = cleanSourceCode;
+/**
+ * Checks if the given `path.node` to a statement like `cov_104fq7oo4i().f[0]++;`
+ */
+function isCoverageIncrementNode(path) {
+    const expr = path.node.expression;
+    if (!(0, types_1.isUpdateExpression)(expr)) {
+        return false;
+    }
+    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)) {
+        // 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/FileSystem.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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}.
@@ -38,7 +38,9 @@ export declare class IstanbulInstrumenter implements IInstrumenter {
      * @param taskElement - The task element to perform the instrumentation for.
      * @param sourcePattern - A pattern to restrict the instrumentation to only a fraction of the task element.
      */
-    instrumentOne(collector: CollectorSpecifier, taskElement: TaskElement, sourcePattern: OriginSourcePattern): TaskResult;
+    instrumentOne(collector: CollectorSpecifier, taskElement: TaskElement, sourcePattern: OriginSourcePattern): Promise<TaskResult>;
+    private removeUnwantedInstrumentation;
+    private loadSourceMap;
     /**
      * Loads the vaccine from the vaccine file and adjusts some template parameters.
      *
@@ -64,10 +66,11 @@ export declare class IstanbulInstrumenter implements IInstrumenter {
      */
     private configurationAlternativesFor;
     /**
-     * Given a source code file and the task element, load the corresponding sourcemap.
+     * Given a source code file, load the corresponding sourcemap.
      *
      * @param inputSource - The source code that might contain sourcemap comments.
-     * @param taskElement - The task element that can have a reference to an external sourcemap.
+     * @param taskFile - The name of the file the `inputSource` is from.
+     * @param externalSourceMapFile - An external source map file to consider.
      */
     private loadInputSourceMap;
 }

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,EAEnB,WAAW,EACX,UAAU,EACV,MAAM,QAAQ,CAAC;AAOhB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,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;IACH,UAAU,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC;IAW1D;;;;;;OAMG;IACH,aAAa,CACZ,SAAS,EAAE,kBAAkB,EAC7B,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,mBAAmB,GAChC,UAAU;IAuFb;;;;OAIG;IACH,OAAO,CAAC,WAAW;IASnB;;;;;;;OAOG;IACH,OAAO,CAAC,gCAAgC;IAQxC;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAK3B;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IAcpC;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;CAW1B"}
+{"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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -18,14 +22,22 @@ 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");
 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.
@@ -39,14 +51,16 @@ class IstanbulInstrumenter {
     /**
      * {@inheritDoc #IInstrumenter.instrument}
      */
-    instrument(task) {
-        fs.existsSync(this.vaccineFilePath);
-        // ATTENTION: Here is potential for parallelization. Maybe we can
-        // run several instrumentation workers in parallel?
-        const result = task.elements
-            .map(e => this.instrumentOne(task.collector, e, task.originSourcePattern))
-            .reduce((prev, current) => current.withIncrement(prev), Task_1.TaskResult.neutral());
-        return Promise.resolve(result);
+    async instrument(task) {
+        // 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).
@@ -55,19 +69,19 @@ class IstanbulInstrumenter {
      * @param taskElement - The task element to perform the instrumentation for.
      * @param sourcePattern - A pattern to restrict the instrumentation to only a fraction of the task element.
      */
-    instrumentOne(collector, taskElement, sourcePattern) {
-        var _a, _b, _c;
+    async instrumentOne(collector, taskElement, sourcePattern) {
+        var _a, _b;
         const inputFileSource = fs.readFileSync(taskElement.fromFile, 'utf8');
         // 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, 1, 0, 0, 0);
+            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, 1, 0, 0);
+            return new Task_1.TaskResult(0, 0, 0, 0, 1, 0, 0);
         }
         // Report progress
         this.logger.info(`Instrumenting "${path.basename(taskElement.fromFile)}"`);
@@ -77,29 +91,37 @@ class IstanbulInstrumenter {
         // alternative configurations of the instrumenter.
         const configurationAlternatives = this.configurationAlternativesFor(taskElement);
         for (let i = 0; i < configurationAlternatives.length; i++) {
+            const configurationAlternative = configurationAlternatives[i];
             let inputSourceMap;
             try {
-                const instrumenter = istanbul.createInstrumenter(configurationAlternatives[i]);
-                inputSourceMap = this.loadInputSourceMap(inputFileSource, taskElement);
+                const instrumenter = istanbul.createInstrumenter(configurationAlternative);
+                inputSourceMap = this.loadInputSourceMap(inputFileSource, taskElement.fromFile, taskElement.externalSourceMapFile);
                 // Based on the source maps of the file to instrument, we can now
                 // decide if we should NOT write an instrumented version of it
                 // and use the original code instead and write it to the target path.
                 //
-                if (this.shouldExcludeFromInstrumentation(sourcePattern, taskElement.fromFile, (_b = (_a = instrumenter.lastSourceMap()) === null || _a === void 0 ? void 0 : _a.sources) !== null && _b !== void 0 ? _b : [])) {
-                    fs.writeFileSync(taskElement.toFile, inputFileSource);
-                    return new Task_1.TaskResult(1, 0, 0, 0, 0, 0);
+                const originSourceFiles = (_a = inputSourceMap === null || inputSourceMap === void 0 ? void 0 : inputSourceMap.sources) !== null && _a !== void 0 ? _a : [];
+                if (this.shouldExcludeFromInstrumentation(sourcePattern, taskElement.fromFile, originSourceFiles)) {
+                    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:
                 instrumentedSource = instrumenter
                     .instrumentSync(inputFileSource, taskElement.fromFile, inputSourceMap)
                     .replace(/return actualCoverage/g, 'return makeCoverageInterceptor(actualCoverage)')
                     .replace(/new Function\("return this"\)\(\)/g, "typeof window === 'object' ? window : this");
-                this.logger.debug('Instrumentation source maps to:', (_c = instrumenter.lastSourceMap()) === null || _c === void 0 ? void 0 : _c.sources);
+                this.logger.debug('Instrumentation source maps to:', (_b = instrumenter.lastSourceMap()) === null || _b === void 0 ? void 0 : _b.sources);
+                // In case of a bundle, the initial instrumentation step might have added
+                // too much and undesired instrumentations. Remove them now.
+                instrumentedSource = await this.removeUnwantedInstrumentation(taskElement, instrumentedSource, configurationAlternative, sourcePattern);
                 // The process also can result in a new source map that we will append in the result.
                 //
                 // `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,
@@ -108,16 +130,41 @@ 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);
+        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
+        const instrumentedSourceMapConsumer = await this.loadSourceMap(instrumentedSource, taskElement.fromFile);
+        // Without a source map, excludes/includes do not work.
+        if (!instrumentedSourceMapConsumer) {
+            return instrumentedSource;
+        }
+        // Remove the unwanted instrumentation
+        const cleaned = (0, Cleaner_1.cleanSourceCode)(instrumentedSource, configurationAlternative.esModules, location => {
+            const originalPosition = instrumentedSourceMapConsumer.originalPositionFor({
+                line: location.start.line,
+                column: location.start.column
+            });
+            if (!originalPosition.source) {
+                return true;
+            }
+            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());
+        if (instrumentedSourceMap) {
+            return await new source_map_1.SourceMapConsumer(instrumentedSourceMap);
+        }
+        return undefined;
     }
     /**
      * Loads the vaccine from the vaccine file and adjusts some template parameters.
@@ -125,7 +172,7 @@ class IstanbulInstrumenter {
      * @param collector - The collector to send coverage information to.
      */
     loadVaccine(collector) {
-        // We first replace some of the parameters in the file with the
+        // We first replace parameters in the file with the
         // actual values, for example, the collector to send the coverage information to.
         return fs
             .readFileSync(this.vaccineFilePath, 'utf8')
@@ -166,21 +213,22 @@ class IstanbulInstrumenter {
         ];
     }
     /**
-     * Given a source code file and the task element, load the corresponding sourcemap.
+     * Given a source code file, load the corresponding sourcemap.
      *
      * @param inputSource - The source code that might contain sourcemap comments.
-     * @param taskElement - The task element that can have a reference to an external sourcemap.
+     * @param taskFile - The name of the file the `inputSource` is from.
+     * @param externalSourceMapFile - An external source map file to consider.
      */
-    loadInputSourceMap(inputSource, taskElement) {
-        if (taskElement.externalSourceMapFile.isPresent()) {
-            const sourceMapOrigin = taskElement.externalSourceMapFile.get();
+    loadInputSourceMap(inputSourceCode, taskFile, externalSourceMapFile) {
+        if (externalSourceMapFile.isPresent()) {
+            const sourceMapOrigin = externalSourceMapFile.get();
             if (!(sourceMapOrigin instanceof Task_1.SourceMapFileReference)) {
                 throw new commons_1.IllegalArgumentException('Type of source map not yet supported!');
             }
             return sourceMapFromMapFile(sourceMapOrigin.sourceMapFilePath);
         }
         else {
-            return sourceMapFromCodeComment(inputSource, taskElement.fromFile);
+            return sourceMapFromCodeComment(inputSourceCode, taskFile);
         }
     }
 }
@@ -239,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/Task.d.ts

@@ -51,12 +51,20 @@ export declare class OriginSourcePattern {
     /**
      * Does the given pattern require to include the given set of files?
      *
+     * For example, a JavaScript bundle is compiled from several (origin) source files.
+     * If one of the files in the bundle is needed, then the full bundle is needed, that is,
+     * this function is required to return `true`.
+     *
      * @param originFiles - The file set to decide for include or exclude.
      *
-     * @returns `true` if (1) all of the given files are supposed to be excluded,
-     *   or (2) if one of the files is supposed to be included.
+     * @returns `false` if (1) all given files are supposed to be excluded,
+     *   or (2) `true` if at least one of the files is supposed to be included.
      */
     isAnyIncluded(originFiles: string[]): boolean;
+    private static normalizeGlobPattern;
+    private static normalizePath;
+    private static removeTrailingCurrentWorkingDir;
+    private static removePrefix;
 }
 /**
  * The actual instrumentation task.
@@ -87,6 +95,8 @@ export declare class InstrumentationTask {
 export declare class TaskResult {
     /** Number of task elements that were performed (instrumented) */
     readonly translated: number;
+    /** Number of task elements that were excluded because of corresponding include/exclude patterns. */
+    readonly excluded: number;
     /** Number of instrumentations that were taken from a cache */
     readonly translatedFromCache: number;
     /** Number of skips due to a present instrumentation */
@@ -97,7 +107,7 @@ export declare class TaskResult {
     readonly failed: number;
     /** Number of warnings that were produced during the instrumentation process */
     readonly warnings: number;
-    constructor(translated: number, translatedFromCache: number, alreadyInstrumented: number, unsupported: number, failed: number, warnings: number);
+    constructor(translated: number, excluded: number, translatedFromCache: number, alreadyInstrumented: number, unsupported: number, failed: number, warnings: number);
     /**
      * Returns the sum of the present task results and the given one.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"Task.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAI/C;;GAEG;AACH,8BAAsB,kBAAkB;CAAG;AAE3C;;;GAGG;AACH,qBAAa,WAAW;IACvB,sBAAsB;IACtB,SAAgB,QAAQ,EAAE,MAAM,CAAC;IAEjC,2BAA2B;IAC3B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,gEAAgE;IAChE,SAAgB,qBAAqB,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAC;gBAExD,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,kBAAkB;IAMpF;;OAEG;IACI,SAAS,IAAI,OAAO;CAK3B;AAED;;;GAGG;AACH,qBAAa,kBAAkB;IAC9B,2CAA2C;IAC3C,SAAgB,IAAI,EAAE,MAAM,CAAC;IAE7B,gDAAgD;IAChD,SAAgB,IAAI,EAAE,MAAM,CAAC;gBAEjB,SAAS,EAAE,MAAM;CAK7B;AAED;;;;;;GAMG;AACH,qBAAa,mBAAmB;IAC/B,mGAAmG;IACnG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAE7C;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;gBAEjC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS;IAKpE;;;;;;;OAOG;IACI,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO;CAepD;AAED;;GAEG;AACH,qBAAa,mBAAmB;IAC/B;;OAEG;IACH,SAAgB,SAAS,EAAE,kBAAkB,CAAC;IAE9C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;IAE1C;;;OAGG;IACH,SAAgB,mBAAmB,EAAE,mBAAmB,CAAC;gBAE7C,SAAS,EAAE,kBAAkB,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,mBAAmB,EAAE,mBAAmB;IAM5G;;OAEG;IACH,IAAI,QAAQ,IAAI,WAAW,EAAE,CAI5B;CACD;AAED;;GAEG;AACH,qBAAa,UAAU;IACtB,iEAAiE;IACjE,SAAgB,UAAU,EAAE,MAAM,CAAC;IAEnC,8DAA8D;IAC9D,SAAgB,mBAAmB,EAAE,MAAM,CAAC;IAE5C,uDAAuD;IACvD,SAAgB,mBAAmB,EAAE,MAAM,CAAC;IAE5C,sDAAsD;IACtD,SAAgB,WAAW,EAAE,MAAM,CAAC;IAEpC,6DAA6D;IAC7D,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,+EAA+E;IAC/E,SAAgB,QAAQ,EAAE,MAAM,CAAC;gBAGhC,UAAU,EAAE,MAAM,EAClB,mBAAmB,EAAE,MAAM,EAC3B,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM;IAgBjB;;;;OAIG;IACI,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU;IAWnD;;OAEG;WACW,OAAO,IAAI,UAAU;IAInC;;;;OAIG;WACW,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG,UAAU;IAKzC;;;;OAIG;WACW,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU;CAI9C;AAED;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,kBAAkB;IAC7D,2CAA2C;IAC3C,SAAgB,iBAAiB,EAAE,MAAM,CAAC;gBAE9B,iBAAiB,EAAE,MAAM;CAIrC"}
+{"version":3,"file":"Task.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAK/C;;GAEG;AACH,8BAAsB,kBAAkB;CAAG;AAE3C;;;GAGG;AACH,qBAAa,WAAW;IACvB,sBAAsB;IACtB,SAAgB,QAAQ,EAAE,MAAM,CAAC;IAEjC,2BAA2B;IAC3B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,gEAAgE;IAChE,SAAgB,qBAAqB,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAC;gBAExD,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,kBAAkB;IAMpF;;OAEG;IACI,SAAS,IAAI,OAAO;CAK3B;AAED;;;GAGG;AACH,qBAAa,kBAAkB;IAC9B,2CAA2C;IAC3C,SAAgB,IAAI,EAAE,MAAM,CAAC;IAE7B,gDAAgD;IAChD,SAAgB,IAAI,EAAE,MAAM,CAAC;gBAEjB,SAAS,EAAE,MAAM;CAK7B;AAED;;;;;;GAMG;AACH,qBAAa,mBAAmB;IAC/B,mGAAmG;IACnG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAE7C;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;gBAEjC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS;IAKpE;;;;;;;;;;;OAWG;IACI,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO;IAqBpD,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAQnC,OAAO,CAAC,MAAM,CAAC,aAAa;IAI5B,OAAO,CAAC,MAAM,CAAC,+BAA+B;IAO9C,OAAO,CAAC,MAAM,CAAC,YAAY;CAO3B;AAED;;GAEG;AACH,qBAAa,mBAAmB;IAC/B;;OAEG;IACH,SAAgB,SAAS,EAAE,kBAAkB,CAAC;IAE9C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;IAE1C;;;OAGG;IACH,SAAgB,mBAAmB,EAAE,mBAAmB,CAAC;gBAE7C,SAAS,EAAE,kBAAkB,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,mBAAmB,EAAE,mBAAmB;IAM5G;;OAEG;IACH,IAAI,QAAQ,IAAI,WAAW,EAAE,CAI5B;CACD;AAED;;GAEG;AACH,qBAAa,UAAU;IACtB,iEAAiE;IACjE,SAAgB,UAAU,EAAE,MAAM,CAAC;IAEnC,oGAAoG;IACpG,SAAgB,QAAQ,EAAE,MAAM,CAAC;IAEjC,8DAA8D;IAC9D,SAAgB,mBAAmB,EAAE,MAAM,CAAC;IAE5C,uDAAuD;IACvD,SAAgB,mBAAmB,EAAE,MAAM,CAAC;IAE5C,sDAAsD;IACtD,SAAgB,WAAW,EAAE,MAAM,CAAC;IAEpC,6DAA6D;IAC7D,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,+EAA+E;IAC/E,SAAgB,QAAQ,EAAE,MAAM,CAAC;gBAGhC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,mBAAmB,EAAE,MAAM,EAC3B,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM;IAkBjB;;;;OAIG;IACI,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU;IAYnD;;OAEG;WACW,OAAO,IAAI,UAAU;IAInC;;;;OAIG;WACW,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG,UAAU;IAKzC;;;;OAIG;WACW,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU;CAI9C;AAED;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,kBAAkB;IAC7D,2CAA2C;IAC3C,SAAgB,iBAAiB,EAAE,MAAM,CAAC;gBAE9B,iBAAiB,EAAE,MAAM;CAIrC"}

package/dist/src/instrumenter/Task.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -18,11 +22,15 @@ 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.SourceMapFileReference = exports.TaskResult = exports.InstrumentationTask = exports.OriginSourcePattern = exports.CollectorSpecifier = exports.TaskElement = exports.SourceMapReference = void 0;
 const typescript_optional_1 = require("typescript-optional");
 const commons_1 = require("@cqse/commons");
 const matching = __importStar(require("micromatch"));
+const path_1 = __importDefault(require("path"));
 /**
  * An abstract source map type.
  */
@@ -70,31 +78,57 @@ exports.CollectorSpecifier = CollectorSpecifier;
  */
 class OriginSourcePattern {
     constructor(include, exclude) {
-        this.include = include;
-        this.exclude = exclude;
+        this.include = OriginSourcePattern.normalizeGlobPattern(include);
+        this.exclude = OriginSourcePattern.normalizeGlobPattern(exclude);
     }
     /**
      * Does the given pattern require to include the given set of files?
      *
+     * For example, a JavaScript bundle is compiled from several (origin) source files.
+     * If one of the files in the bundle is needed, then the full bundle is needed, that is,
+     * this function is required to return `true`.
+     *
      * @param originFiles - The file set to decide for include or exclude.
      *
-     * @returns `true` if (1) all of the given files are supposed to be excluded,
-     *   or (2) if one of the files is supposed to be included.
+     * @returns `false` if (1) all given files are supposed to be excluded,
+     *   or (2) `true` if at least one of the files is supposed to be included.
      */
     isAnyIncluded(originFiles) {
         var _a;
+        if (originFiles.length === 0) {
+            return true;
+        }
+        const normalizedOriginFiles = originFiles.map(OriginSourcePattern.normalizePath);
         if (this.exclude) {
-            const matchedToExclude = matching.match(originFiles, this.exclude);
+            const matchedToExclude = matching.match(normalizedOriginFiles, this.exclude);
             if (originFiles.length === matchedToExclude.length) {
                 return false;
             }
         }
         if (this.include) {
-            const matchedToInclude = matching.match(originFiles, (_a = this.include) !== null && _a !== void 0 ? _a : '**');
+            const matchedToInclude = matching.match(normalizedOriginFiles, (_a = this.include) !== null && _a !== void 0 ? _a : '**');
             return matchedToInclude.length > 0;
         }
         return true;
     }
+    static normalizeGlobPattern(pattern) {
+        if (!pattern) {
+            return pattern;
+        }
+        return OriginSourcePattern.removeTrailingCurrentWorkingDir(pattern);
+    }
+    static normalizePath(toNormalize) {
+        return OriginSourcePattern.removeTrailingCurrentWorkingDir(toNormalize);
+    }
+    static removeTrailingCurrentWorkingDir(removeFrom) {
+        return OriginSourcePattern.removePrefix('webpack:///', OriginSourcePattern.removePrefix('.' + path_1.default.sep, removeFrom));
+    }
+    static removePrefix(prefix, removeFrom) {
+        if (removeFrom.startsWith(prefix)) {
+            return removeFrom.substring(prefix.length);
+        }
+        return removeFrom;
+    }
 }
 exports.OriginSourcePattern = OriginSourcePattern;
 /**
@@ -120,14 +154,16 @@ exports.InstrumentationTask = InstrumentationTask;
  * A summary of executing the instrumentation task.
  */
 class TaskResult {
-    constructor(translated, translatedFromCache, alreadyInstrumented, unsupported, failed, warnings) {
+    constructor(translated, excluded, translatedFromCache, alreadyInstrumented, unsupported, failed, warnings) {
         commons_1.Contract.require(translated > -1);
+        commons_1.Contract.require(excluded > -1);
         commons_1.Contract.require(translatedFromCache > -1);
         commons_1.Contract.require(alreadyInstrumented > -1);
         commons_1.Contract.require(unsupported > -1);
         commons_1.Contract.require(failed > -1);
         commons_1.Contract.require(warnings > -1);
         this.translated = translated;
+        this.excluded = excluded;
         this.translatedFromCache = translatedFromCache;
         this.alreadyInstrumented = alreadyInstrumented;
         this.unsupported = unsupported;
@@ -140,13 +176,13 @@ class TaskResult {
      * @param incBy - The task result to add (as delta).
      */
     withIncrement(incBy) {
-        return new TaskResult(this.translated + incBy.translated, this.translatedFromCache + incBy.translatedFromCache, this.alreadyInstrumented + incBy.alreadyInstrumented, this.unsupported + incBy.unsupported, this.failed + incBy.failed, this.warnings + incBy.warnings);
+        return new TaskResult(this.translated + incBy.translated, this.excluded + incBy.excluded, this.translatedFromCache + incBy.translatedFromCache, this.alreadyInstrumented + incBy.alreadyInstrumented, this.unsupported + incBy.unsupported, this.failed + incBy.failed, this.warnings + incBy.warnings);
     }
     /**
      * @returns the neutral task element (adding it with {@code withIncrement} does not change the result).
      */
     static neutral() {
-        return new TaskResult(0, 0, 0, 0, 0, 0);
+        return new TaskResult(0, 0, 0, 0, 0, 0, 0);
     }
     /**
      * @returns a task result signaling one error.
@@ -155,7 +191,7 @@ class TaskResult {
      */
     static error(e) {
         console.error(e);
-        return new TaskResult(0, 0, 0, 0, 1, 0);
+        return new TaskResult(0, 0, 0, 0, 0, 1, 0);
     }
     /**
      * @returns a task result signaling one warning.
@@ -164,7 +200,7 @@ class TaskResult {
      */
     static warning(msg) {
         console.warn(msg);
-        return new TaskResult(0, 0, 0, 0, 0, 1);
+        return new TaskResult(0, 0, 0, 0, 0, 0, 1);
     }
 }
 exports.TaskResult = TaskResult;

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -128,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/dist/src/main.js

@@ -7,6 +7,7 @@ App_1.App.run()
     .then(result => {
     console.log('Instrumentation finished.');
     console.log(`\tInstrumented: ${result.translated}`);
+    console.log(`\tExcluded: ${result.excluded}`);
     console.log(`\tInstrumented from cache: ${result.translatedFromCache}`);
     console.log(`\tAlready instrumented: ${result.alreadyInstrumented}`);
     console.log(`\tUnsupported: ${result.unsupported}`);

package/dist/vaccine.js

@@ -1,221 +1 @@
-(() => {
-  var __create = Object.create;
-  var __defProp = Object.defineProperty;
-  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-  var __getOwnPropNames = Object.getOwnPropertyNames;
-  var __getProtoOf = Object.getPrototypeOf;
-  var __hasOwnProp = Object.prototype.hasOwnProperty;
-  var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-  var __commonJS = (cb, mod) => function __require() {
-    return mod || (0, cb[Object.keys(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-  };
-  var __reExport = (target, module, desc) => {
-    if (module && typeof module === "object" || typeof module === "function") {
-      for (let key of __getOwnPropNames(module))
-        if (!__hasOwnProp.call(target, key) && key !== "default")
-          __defProp(target, key, { get: () => module[key], enumerable: !(desc = __getOwnPropDesc(module, key)) || desc.enumerable });
-    }
-    return target;
-  };
-  var __toModule = (module) => {
-    return __reExport(__markAsModule(__defProp(module != null ? __create(__getProtoOf(module)) : {}, "default", module && module.__esModule && "default" in module ? { get: () => module.default, enumerable: true } : { value: module, enumerable: true })), module);
-  };
-
-  // ../../node_modules/detect-node/browser.js
-  var require_browser = __commonJS({
-    "../../node_modules/detect-node/browser.js"(exports, module) {
-      module.exports = false;
-    }
-  });
-
-  // (disabled):../../node_modules/unload/dist/es/node.js
-  var require_node = __commonJS({
-    "(disabled):../../node_modules/unload/dist/es/node.js"() {
-    }
-  });
-
-  // inline-worker:__inline-worker
-  function inlineWorker(scriptText) {
-    let blob = new Blob([scriptText], { type: "text/javascript" });
-    let url = URL.createObjectURL(blob);
-    let worker = new Worker(url);
-    URL.revokeObjectURL(url);
-    return worker;
-  }
-
-  // src/vaccine/worker/vaccine.worker.ts
-  function Worker2() {
-    return inlineWorker('var n=class{constructor(t){this.cachedMessages=[];this.url=t,this.socket=this.createSocket()}createSocket(){let t=new WebSocket(this.url);return t.onopen=()=>this.onopen(),t.onclose=()=>this.onclose(),t}onclose(){this.socket=this.createSocket()}onopen(){this.cachedMessages.forEach(t=>this.socket.send(t)),this.cachedMessages=[]}send(t){this.socket.readyState===WebSocket.OPEN?this.socket.send(t):this.cachedMessages.push(t)}};var o;(function(e){e.MESSAGE_TYPE_SOURCEMAP="s",e.MESSAGE_TYPE_COVERAGE="c"})(o||(o={}));var C=20,p=1e3,a=class{constructor(t,e){this.milliseconds=t;this.onCountedToZero=e;this.timerHandle=null}restartCountdown(){this.stopCountdown(),this.timerHandle=self.setTimeout(()=>{this.stopCountdown(),this.onCountedToZero()},this.milliseconds)}stopCountdown(){this.timerHandle!==null&&(self.clearTimeout(this.timerHandle),this.timerHandle=null)}},r=class{constructor(t){this.socket=t,this.cachedCoveredPositions=new Map,this.numberOfCachedPositions=0,this.flushCountdown=new a(p,()=>this.flush())}add(t){let e=t.split(":");if(e.length!==3)return;let[c,u,l]=e,i=this.cachedCoveredPositions.get(c);i||(i=new Set,this.cachedCoveredPositions.set(c,i)),i.add(`${u}:${l}`),this.numberOfCachedPositions+=1,this.flushCountdown.restartCountdown(),this.numberOfCachedPositions>=C&&this.flush()}flush(){this.numberOfCachedPositions!==0&&(this.flushCountdown.stopCountdown(),this.cachedCoveredPositions.forEach((t,e)=>{this.socket.send(`${o.MESSAGE_TYPE_COVERAGE} ${e} ${Array.from(t).join(" ")}`)}),this.cachedCoveredPositions=new Map,this.numberOfCachedPositions=0)}};console.log("Starting coverage forwarding worker.");var h=new n("ws://$REPORT_TO_HOST:$REPORT_TO_PORT/socket"),d=new r(h);onmessage=s=>{let t=s.data;t.startsWith(o.MESSAGE_TYPE_SOURCEMAP)?h.send(t):t==="unload"?d.flush():d.add(t)};\n');
-  }
-
-  // src/vaccine/utils.ts
-  function universe() {
-    return getWindow();
-  }
-  function hasWindow() {
-    return typeof window !== "undefined";
-  }
-  function getWindow() {
-    return window;
-  }
-  function universeAttribute(attributeName, defaultValue) {
-    let result = universe()[attributeName];
-    if (!result) {
-      result = defaultValue;
-      universe()[attributeName] = result;
-    }
-    return result;
-  }
-
-  // src/vaccine/Interceptor.ts
-  var STATEMENT_COVERAGE_ID = "s";
-  var Interceptor = class {
-    constructor(coverageObj, path) {
-      this.coverageObj = coverageObj;
-      this.path = path;
-    }
-    get(target, prop, receiver) {
-      const value = target[prop];
-      if (value !== Object(value)) {
-        return value;
-      }
-      return makeProxy(this.coverageObj, value, [...this.path, prop]);
-    }
-    set(obj, prop, value) {
-      const fullPath = [...this.path, prop];
-      if (fullPath[0] === STATEMENT_COVERAGE_ID) {
-        const fileId = this.coverageObj.hash;
-        const start = this.coverageObj.statementMap[fullPath[1]].start;
-        universe()._$Bc(fileId, start.line, start.column);
-      }
-      return true;
-    }
-  };
-  function makeProxy(coverage, target, path) {
-    return new Proxy(target, new Interceptor(coverage, path));
-  }
-
-  // ../../node_modules/unload/dist/es/index.js
-  var import_detect_node = __toModule(require_browser());
-
-  // ../../node_modules/unload/dist/es/browser.js
-  function add(fn) {
-    if (typeof WorkerGlobalScope === "function" && self instanceof WorkerGlobalScope) {
-    } else {
-      if (typeof window.addEventListener !== "function")
-        return;
-      window.addEventListener("beforeunload", function() {
-        fn();
-      }, true);
-      window.addEventListener("unload", function() {
-        fn();
-      }, true);
-    }
-  }
-  var browser_default = {
-    add
-  };
-
-  // ../../node_modules/unload/dist/es/index.js
-  var import_node = __toModule(require_node());
-  var USE_METHOD = import_detect_node.default ? import_node.default : browser_default;
-  var LISTENERS = new Set();
-  var startedListening = false;
-  function startListening() {
-    if (startedListening)
-      return;
-    startedListening = true;
-    USE_METHOD.add(runAll);
-  }
-  function add2(fn) {
-    startListening();
-    if (typeof fn !== "function")
-      throw new Error("Listener is no function");
-    LISTENERS.add(fn);
-    var addReturn = {
-      remove: function remove() {
-        return LISTENERS["delete"](fn);
-      },
-      run: function run() {
-        LISTENERS["delete"](fn);
-        return fn();
-      }
-    };
-    return addReturn;
-  }
-  function runAll() {
-    var promises = [];
-    LISTENERS.forEach(function(fn) {
-      promises.push(fn());
-      LISTENERS["delete"](fn);
-    });
-    return Promise.all(promises);
-  }
-
-  // src/vaccine/protocol.ts
-  var ProtocolMessageTypes;
-  (function(ProtocolMessageTypes2) {
-    ProtocolMessageTypes2["MESSAGE_TYPE_SOURCEMAP"] = "s";
-    ProtocolMessageTypes2["MESSAGE_TYPE_COVERAGE"] = "c";
-  })(ProtocolMessageTypes || (ProtocolMessageTypes = {}));
-
-  // src/vaccine/main.ts
-  var globalAgentObject = universeAttribute("__TS_AGENT", {});
-  function getWorker() {
-    return globalAgentObject._$BcWorker;
-  }
-  function setWorker(worker) {
-    globalAgentObject._$BcWorker = worker;
-    return worker;
-  }
-  universe().makeCoverageInterceptor = function(coverage) {
-    const fileId = coverage.hash;
-    if (!getWorker()) {
-      const worker = setWorker(new Worker2());
-      (function handleUnloading() {
-        const protectWindowEvent = function(name) {
-          let wrappedHandler = getWindow()[name];
-          getWindow()[name] = function(...args) {
-            worker.postMessage("unload");
-            if (wrappedHandler) {
-              return wrappedHandler.apply(this, args);
-            }
-          };
-          if (hasWindow()) {
-            Object.defineProperty(getWindow(), name, {
-              get: function() {
-                return wrappedHandler;
-              },
-              set: function(newHandler) {
-                wrappedHandler = newHandler;
-              }
-            });
-          }
-        };
-        protectWindowEvent("onunload");
-        protectWindowEvent("onbeforeunload");
-        add2(() => worker.postMessage("unload"));
-      })();
-    }
-    (function sendSourceMaps() {
-      const sentMaps = universeAttribute("sentMaps", new Set());
-      if (coverage.inputSourceMap) {
-        if (!sentMaps.has(coverage.path)) {
-          getWorker().postMessage(`${ProtocolMessageTypes.MESSAGE_TYPE_SOURCEMAP} ${fileId}:${JSON.stringify(coverage.inputSourceMap)}`);
-          sentMaps.add(coverage.path);
-        }
-      }
-    })();
-    (function registerCoverageReporter() {
-      const reported = new Set();
-      universe()._$Bc = (fileId2, coveredLine, coveredColumn) => {
-        const coverageMessage = `${fileId2}:${coveredLine}:${coveredColumn}`;
-        if (!reported.has(coverageMessage)) {
-          getWorker().postMessage(coverageMessage);
-          reported.add(coverageMessage);
-        }
-      };
-    })();
-    return makeProxy(coverage, coverage, []);
-  };
-})();
+(()=>{var R=Object.create;var h=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var $=Object.getOwnPropertyNames;var I=Object.getPrototypeOf,A=Object.prototype.hasOwnProperty;var j=e=>h(e,"__esModule",{value:!0});var v=(e,n)=>()=>(n||e((n={exports:{}}).exports,n),n.exports);var L=(e,n,t)=>{if(n&&typeof n=="object"||typeof n=="function")for(let o of $(n))!A.call(e,o)&&o!=="default"&&h(e,o,{get:()=>n[o],enumerable:!(t=y(n,o))||t.enumerable});return e},b=e=>L(j(h(e!=null?R(I(e)):{},"default",e&&e.__esModule&&"default"in e?{get:()=>e.default,enumerable:!0}:{value:e,enumerable:!0})),e);var E=v((K,C)=>{C.exports=!1});var W=v(()=>{});function f(e){let n=new Blob([e],{type:"text/javascript"}),t=URL.createObjectURL(n),o=new Worker(t);return URL.revokeObjectURL(t),o}function p(){return f('var i=class{constructor(e){this.cachedMessages=[];this.url=e,this.socket=this.createSocket()}createSocket(){let e=new WebSocket(this.url);return e.onopen=()=>this.onopen(),e.onclose=()=>this.onclose(),e}onclose(){this.socket=this.createSocket()}onopen(){this.cachedMessages.forEach(e=>this.socket.send(e)),this.cachedMessages=[]}send(e){this.socket.readyState===WebSocket.OPEN?this.socket.send(e):this.cachedMessages.push(e)}};var p=20,f=1e3,c=class{constructor(e,t){this.milliseconds=e;this.onCountedToZero=t;this.timerHandle=null}restartCountdown(){this.stopCountdown(),this.timerHandle=self.setTimeout(()=>{this.stopCountdown(),this.onCountedToZero()},this.milliseconds)}stopCountdown(){this.timerHandle!==null&&(self.clearTimeout(this.timerHandle),this.timerHandle=null)}},n=class{constructor(e){this.socket=e,this.cachedCoveredPositions=new Map,this.numberOfCachedPositions=0,this.flushCountdown=new c(f,()=>this.flush())}add(e){let t=e.split(":");if(t.length!==3)return;let[r,d,u]=t,o=this.cachedCoveredPositions.get(r);o||(o=new Set,this.cachedCoveredPositions.set(r,o)),o.add(`${d}:${u}`),this.numberOfCachedPositions+=1,this.flushCountdown.restartCountdown(),this.numberOfCachedPositions>=p&&this.flush()}flush(){this.numberOfCachedPositions!==0&&(this.flushCountdown.stopCountdown(),this.cachedCoveredPositions.forEach((e,t)=>{this.socket.send(`${"c"} ${t} ${Array.from(e).join(" ")}`)}),this.cachedCoveredPositions=new Map,this.numberOfCachedPositions=0)}};console.log("Starting coverage forwarding worker.");var h=new i("ws://$REPORT_TO_HOST:$REPORT_TO_PORT/socket"),a=new n(h);onmessage=s=>{let e=s.data;e.startsWith("s")?h.send(e):e==="unload"?a.flush():a.add(e)};\n')}function u(){return c()}function k(){return typeof window!="undefined"}function c(){return window}function m(e,n){let t=u()[e];return t||(t=n,u()[e]=t),t}var D="s",S=class{constructor(n,t){this.coverageObj=n;this.path=t}get(n,t,o){let r=n[t];return r!==Object(r)?r:w(this.coverageObj,r,[...this.path,t])}set(n,t,o){let r=[...this.path,t];if(r[0]===D){let i=this.coverageObj.hash,s=this.coverageObj.statementMap[r[1]].start;u()._$Bc(i,s.line,s.column)}return!0}};function w(e,n,t){return new Proxy(n,new S(e,t))}var M=b(E());function H(e){if(!(typeof WorkerGlobalScope=="function"&&self instanceof WorkerGlobalScope)){if(typeof window.addEventListener!="function")return;window.addEventListener("beforeunload",function(){e()},!0),window.addEventListener("unload",function(){e()},!0)}}var O={add:H};var T=b(W()),B=M.default?T.default:O,d=new Set,x=!1;function G(){x||(x=!0,B.add(U))}function P(e){if(G(),typeof e!="function")throw new Error("Listener is no function");d.add(e);var n={remove:function(){return d.delete(e)},run:function(){return d.delete(e),e()}};return n}function U(){var e=[];return d.forEach(function(n){e.push(n()),d.delete(n)}),Promise.all(e)}var l;(function(t){t.MESSAGE_TYPE_SOURCEMAP="s",t.MESSAGE_TYPE_COVERAGE="c"})(l||(l={}));var _=m("__TS_AGENT",{});function g(){return _._$BcWorker}function N(e){return _._$BcWorker=e,e}u().makeCoverageInterceptor=function(e){let n=e.hash;if(!g()){let t=N(new p);(function(){let r=function(i){let s=c()[i];c()[i]=function(...a){if(t.postMessage("unload"),s)return s.apply(this,a)},k()&&Object.defineProperty(c(),i,{get:function(){return s},set:function(a){s=a}})};r("onunload"),r("onbeforeunload"),P(()=>t.postMessage("unload"))})()}return function(){let o=m("sentMaps",new Set);e.inputSourceMap&&(o.has(e.path)||(g().postMessage(`${l.MESSAGE_TYPE_SOURCEMAP} ${n}:${JSON.stringify(e.inputSourceMap)}`),o.add(e.path)))}(),function(){let o=new Set;u()._$Bc=(r,i,s)=>{let a=`${r}:${i}:${s}`;o.has(a)||(g().postMessage(a),o.add(a))}}(),w(e,e,[])};})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamscale/javascript-instrumenter",
-  "version": "0.0.1-beta.3",
+  "version": "0.0.1-beta.33",
   "description": "Istanbul-based coverage instrumenter with coverage forwarding via WebSockets",
   "main": "dist/src/main.js",
   "bin": "dist/src/main.js",
@@ -12,24 +12,27 @@
     "url": "https://github.com/cqse/teamscale-javascript-profiler.git"
   },
   "scripts": {
+    "prepublishOnly": "yarn clean && yarn build",
     "clean": "rimraf dist tsconfig.tsbuildinfo",
-    "build": "tsc --project tsconfig.json && node esbuild.mjs",
-    "instrument": "node dist/src/main.js",
+    "build": "tsc --project tsconfig.json && yarn buildVaccine",
+    "buildVaccine": "node esbuild.mjs",
+    "instrumenter": "node dist/src/main.js",
     "test": "yarn build && NODE_OPTIONS='--experimental-vm-modules' jest --forceExit --coverage --silent=true --detectOpenHandles"
   },
   "files": [
     "dist/**/*"
   ],
   "devDependencies": {
-    "@babel/core": "^7.14.0",
+    "@babel/core": "^7.17.5",
     "@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",
     "@types/jest": "^27.0.1",
-    "@types/mkdirp": "^1.0.1",
+    "@types/mkdirp": "^1.0.2",
     "@types/node": "^15.0.1",
     "@types/source-map": "^0.5.7",
     "@types/ws": "^7.4.4",
@@ -44,10 +47,15 @@
     "typescript": "^4.4.3"
   },
   "dependencies": {
+    "@babel/generator": "^7.17.3",
+    "@babel/parser": "^7.17.3",
+    "@babel/traverse": "^7.17.3",
+    "@babel/types": "^7.17.0",
     "@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",
@@ -55,11 +63,10 @@
     "micromatch": "4.0.4",
     "mkdirp": "^1.0.4",
     "nyc": "^15.1.0",
-    "source-map": "0.6.1",
+    "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"