@teamscale/javascript-instrumenter 0.1.0-beta.2 → 0.1.0-beta.4

package/README.md

@@ -27,10 +27,10 @@ pnpm build
 
 ## Workflow Integration
 
-There are several options to run the Instrumenter. For example, via `yarn` by running
+There are several options to run the Instrumenter. For example, via `pnpm` by running
 
 ```
-yarn instrumenter
+pnpm instrumenter
 ```
 
 or via `npx` by running
@@ -39,8 +39,3 @@ or via `npx` by running
 npx @teamscale/javascript-instrumenter
 ```
 
-## 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.1.0-beta.2",
+    "version": "0.1.0-beta.4",
     "description": "JavaScript coverage instrumenter with coverage forwarding to a collector process",
     "main": "dist/src/main.js",
     "bin": "dist/src/main.js",
@@ -23,40 +23,40 @@
         "dist/**/*"
     ],
     "devDependencies": {
-        "@babel/core": "^7.23.2",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.0",
-        "@babel/preset-env": "^7.23.2",
-        "@types/argparse": "^2.0.12",
-        "@types/async": "^3.2.22",
-        "@types/babel__generator": "^7.6.6",
-        "@types/babel__traverse": "^7.20.3",
-        "@types/bunyan": "^1.8.10",
-        "@types/convert-source-map": "^2.0.2",
+        "@babel/core": "^7.23.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
+        "@babel/preset-env": "^7.23.8",
+        "@types/argparse": "^2.0.14",
+        "@types/async": "^3.2.24",
+        "@types/babel__generator": "^7.6.8",
+        "@types/babel__traverse": "^7.20.5",
+        "@types/bunyan": "^1.8.11",
+        "@types/convert-source-map": "^2.0.3",
         "@types/glob": "^8.1.0",
-        "@types/istanbul-lib-instrument": "^1.7.6",
-        "@types/jest": "^29.5.6",
-        "@types/node": "^20.8.6",
-        "@types/ws": "^8.5.7",
+        "@types/istanbul-lib-instrument": "^1.7.7",
+        "@types/jest": "^29.5.11",
+        "@types/node": "^20.11.0",
+        "@types/ws": "^8.5.10",
         "babel-jest": "^29.7.0",
-        "esbuild": "^0.19.5",
+        "esbuild": "^0.19.11",
         "esbuild-plugin-inline-worker": "^0.1.1",
         "jest": "^29.7.0",
         "rimraf": "^5.0.5",
         "ts-jest": "^29.1.1",
-        "ts-node": "^10.9.1",
+        "ts-node": "^10.9.2",
         "tslib": "^2.6.2",
-        "typescript": "^5.2.2"
+        "typescript": "^5.3.3"
     },
     "dependencies": {
-        "@cqse/commons": "0.0.1-beta.59",
+        "@cqse/commons": "0.1.0-beta.2",
         "@teamscale/lib-instrument": "workspace:../lib-instrument",
-        "@babel/generator": "^7.23.0",
-        "@babel/parser": "^7.23.0",
-        "@babel/traverse": "^7.23.2",
-        "@babel/types": "^7.23.0",
-        "@types/micromatch": "^4.0.3",
+        "@babel/generator": "^7.23.6",
+        "@babel/parser": "^7.23.6",
+        "@babel/traverse": "^7.23.7",
+        "@babel/types": "^7.23.6",
+        "@types/micromatch": "^4.0.6",
         "argparse": "^2.0.1",
-        "async": "^3.2.4",
+        "async": "^3.2.5",
         "bunyan": "^1.8.15",
         "convert-source-map": "^2.0.0",
         "foreground-child": "^3.1.1",
@@ -66,7 +66,7 @@
         "source-map": "0.7.4",
         "typescript-optional": "^2.0.1",
         "unload": "^2.4.1",
-        "web-worker": "^1.2.0"
+        "web-worker": "^1.3.0"
     },
     "publishConfig": {
         "access": "public"

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

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/App.ts"],"names":[],"mappings":"AACA,OAAO,EAA0C,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAGxF,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;IAwCtE;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IAyC1B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IA+B1B;;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,EAA0C,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAGxF,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;IAwCtE;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IA4C1B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IA+B1B;;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

@@ -136,7 +136,10 @@ class App {
             help: 'Glob pattern(s) of input (bundle) files to keep unchanged (to not instrument).'
         });
         parser.add_argument('-p', '--dump-origins-to', {
-            help: 'Optional location specifying where to dump possible origins from the source map as a json file'
+            help: 'Path specifying where to dump source origins file names, based on the source maps, as a JSON file.'
+        });
+        parser.add_argument('-m', '--dump-origin-matches-to', {
+            help: 'Path specifying where to dump a JSON with the names of the files that have matched the origin include/exclude patterns.'
         });
         parser.add_argument('inputs', { nargs: '+', help: 'The input file(s) to instrument.' });
         return parser;

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

@@ -60,10 +60,10 @@ export declare class IstanbulInstrumenter implements IInstrumenter {
      * given task element.
      */
     private configurationAlternativesFor;
-    /** Appends all origins from the source map to a given file. Creates the file if it does not exist yet. */
-    private dumpOrigins;
-    /** Clears the dump origins file if it exists, such that it is now ready to be appended for every instrumented file. */
-    private clearDumpOriginsFileIfNeeded;
+    /** Deletes the file if it exists, such that it is now ready to be appended. */
+    private clearFile;
+    /** Write the contents of the given object into the given file, if provided. */
+    private dumpToJson;
 }
 /**
  * Extract the sourcemap from the given source code.

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,EAEN,kBAAkB,EAClB,kBAAkB,EAElB,mBAAmB,EACnB,mBAAmB,EAEnB,kBAAkB,EAElB,WAAW,EACX,UAAU,EACV,MAAM,QAAQ,CAAC;AAEhB,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAM7D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAQ5B,eAAO,MAAM,qBAAqB,sCAAsC,CAAC;AAEzE;;GAEG;AACH,MAAM,WAAW,aAAa;IAC7B;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAC3D;AA0BD;;GAEG;AACH,qBAAa,oBAAqB,YAAW,aAAa;IACzD;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAS;gBAEX,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,kBAAkB;IAUlF;;OAEG;IACG,UAAU,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC;IAqBhE;;;;;;;;OAQG;IACG,aAAa,CAClB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,kBAAkB,EAClC,aAAa,EAAE,mBAAmB,EAClC,eAAe,EAAE,MAAM,GAAG,SAAS,GACjC,OAAO,CAAC,UAAU,CAAC;YAsER,gBAAgB;IA8C9B,OAAO,CAAC,eAAe;IA0BvB;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAMnB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAS3B;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IAepC,0GAA0G;IAC1G,OAAO,CAAC,WAAW;IASnB,uHAAuH;IACvH,OAAO,CAAC,4BAA4B;CASpC;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAClC,kBAAkB,EAAE,MAAM,EAC1B,0BAA0B,EAAE,MAAM,GAChC,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAUxC;AAsBD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CACjC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,qBAAqB,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GACjD,YAAY,GAAG,SAAS,CAU1B;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAwC7G"}
+{"version":3,"file":"Instrumenter.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Instrumenter.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,kBAAkB,EAClB,kBAAkB,EAElB,mBAAmB,EACnB,mBAAmB,EAEnB,kBAAkB,EAElB,WAAW,EACX,UAAU,EACV,MAAM,QAAQ,CAAC;AAEhB,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAM7D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAQ5B,eAAO,MAAM,qBAAqB,sCAAsC,CAAC;AAEzE;;GAEG;AACH,MAAM,WAAW,aAAa;IAC7B;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAC3D;AA0BD;;GAEG;AACH,qBAAa,oBAAqB,YAAW,aAAa;IACzD;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAS;gBAEX,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,kBAAkB;IAUlF;;OAEG;IACG,UAAU,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC;IA2BhE;;;;;;;;OAQG;IACG,aAAa,CAClB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,kBAAkB,EAClC,aAAa,EAAE,mBAAmB,EAClC,eAAe,EAAE,MAAM,GAAG,SAAS,GACjC,OAAO,CAAC,UAAU,CAAC;YAsER,gBAAgB;IA8C9B,OAAO,CAAC,eAAe;IA0BvB;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAMnB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAS3B;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IAgBpC,+EAA+E;IAC/E,OAAO,CAAC,SAAS;IAUjB,+EAA+E;IAC/E,OAAO,CAAC,UAAU;CAYlB;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAClC,kBAAkB,EAAE,MAAM,EAC1B,0BAA0B,EAAE,MAAM,GAChC,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAUxC;AAsBD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CACjC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,qBAAqB,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GACjD,YAAY,GAAG,SAAS,CAU1B;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAwC7G"}

package/dist/src/instrumenter/Instrumenter.js

@@ -75,18 +75,22 @@ class IstanbulInstrumenter {
      * {@inheritDoc #IInstrumenter.instrument}
      */
     async instrument(task) {
-        this.clearDumpOriginsFileIfNeeded(task.dumpOriginsFile);
+        this.clearFile(task.dumpOriginsFile);
+        this.clearFile(task.dumpMatchedOriginsFile);
         // 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
+        const result = await async_1.default
             .mapLimit(task.elements, 1, async (taskElement) => {
             return await this.instrumentOne(taskElement, task.excludeFilesPattern, task.originSourcePattern, task.dumpOriginsFile);
         })
             .then(results => {
             return results.reduce((prev, curr) => {
                 return prev.withIncrement(curr);
-            }, Task_1.TaskResult.neutral());
+            }, Task_1.TaskResult.neutral(task));
         });
+        // Write the matching statistics to a JSON
+        this.dumpToJson(task.dumpMatchedOriginsFile, task.originSourcePattern.retrieveMatchingFiles());
+        return result;
     }
     /**
      * Perform the instrumentation for one given task element (file to instrument).
@@ -157,7 +161,7 @@ class IstanbulInstrumenter {
         for (const inputSourceMap of inputSourceMaps.filter(map => map)) {
             const originSourceFiles = (_a = inputSourceMap === null || inputSourceMap === void 0 ? void 0 : inputSourceMap.sources) !== null && _a !== void 0 ? _a : [];
             if (dumpOriginsFile) {
-                this.dumpOrigins(dumpOriginsFile, originSourceFiles);
+                this.dumpToJson(dumpOriginsFile, originSourceFiles);
             }
         }
         // The main instrumentation (adding coverage statements) is performed now:
@@ -222,33 +226,37 @@ class IstanbulInstrumenter {
         const baseConfig = {
             isInstrumentedToken: exports.IS_INSTRUMENTED_TOKEN,
             produceSourceMap: 'external',
-            codeToPrepend: this.vaccineSource
+            codeToPrepend: this.vaccineSource,
+            compact: false // Would lead to `code generator has deoptimised the styling of` errors otherwise
         };
         return [
             { ...baseConfig, ...{ esModules: true } },
             { ...baseConfig, ...{ esModules: false } }
         ];
     }
-    /** Appends all origins from the source map to a given file. Creates the file if it does not exist yet. */
-    dumpOrigins(dumpOriginsFile, originSourceFiles) {
-        const jsonContent = JSON.stringify(originSourceFiles, null, 2);
-        fs.writeFile(dumpOriginsFile, jsonContent + '\n', { flag: 'a' }, error => {
-            if (error) {
-                this.logger.warn('Could not dump origins file');
-            }
-        });
-    }
-    /** Clears the dump origins file if it exists, such that it is now ready to be appended for every instrumented file. */
-    clearDumpOriginsFileIfNeeded(dumpOriginsFile) {
-        if (dumpOriginsFile && fs.existsSync(dumpOriginsFile)) {
+    /** Deletes the file if it exists, such that it is now ready to be appended. */
+    clearFile(filePath) {
+        if (filePath && fs.existsSync(filePath)) {
             try {
-                fs.unlinkSync(dumpOriginsFile);
+                fs.unlinkSync(filePath);
             }
             catch (err) {
-                this.logger.warn('Could not clear origins file: ' + err);
+                this.logger.warn(`Could not clear file ${filePath}:` + err);
             }
         }
     }
+    /** Write the contents of the given object into the given file, if provided. */
+    dumpToJson(targetFilePath, toDump) {
+        if (!targetFilePath) {
+            return;
+        }
+        const jsonContent = JSON.stringify(toDump, null, 2);
+        fs.writeFile(targetFilePath, jsonContent + '\n', { flag: 'a' }, error => {
+            if (error) {
+                this.logger.warn(`Could not dump JSON to file ${targetFilePath}:` + error.message);
+            }
+        });
+    }
 }
 exports.IstanbulInstrumenter = IstanbulInstrumenter;
 /**

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

@@ -69,6 +69,18 @@ export declare class OriginSourcePattern {
      * An exclude is stronger than an include.
      */
     private readonly exclude;
+    /**
+     * Files that did match the `include` pattern.
+     */
+    private readonly includeMatches;
+    /**
+     * Files that did match the `exclude` pattern.
+     */
+    private readonly excludeMatches;
+    /**
+     * Files that did neither match the `exclude` nor the `include` pattern.
+     */
+    private readonly neitherExcludedNorIncluded;
     constructor(include: string[] | undefined, exclude: string[] | undefined);
     /**
      * Does the given pattern require to include the given file?
@@ -88,6 +100,20 @@ export declare class OriginSourcePattern {
      * (Primarily, used for testing.)
      */
     isAnyIncluded(originFiles: string[]): boolean;
+    /**
+     * Retrieve the file names that have been matching the different patterns.
+     */
+    retrieveMatchingFiles(): {
+        includePatterns: string[];
+        excludePatterns: string[];
+        excludeMatches: string[];
+        includeMatches: string[];
+        neitherExcludedNorIncluded: string[];
+    };
+    /**
+     * Returns if include/exclude patterns are specified.
+     */
+    patternsSpecified(): boolean;
 }
 /**
  * Pattern describing files (bundles) to not instrument.
@@ -129,7 +155,11 @@ export declare class InstrumentationTask {
      * File to write the file-origin-mapping to.
      */
     readonly dumpOriginsFile: string | undefined;
-    constructor(collector: CollectorSpecifier, elements: TaskElement[], excludeFilesPattern: FileExcludePattern, originSourcePattern: OriginSourcePattern, dumpOriginsFile: string | undefined);
+    /**
+     * File to write the matched files to.
+     */
+    readonly dumpMatchedOriginsFile: string | undefined;
+    constructor(collector: CollectorSpecifier, elements: TaskElement[], excludeFilesPattern: FileExcludePattern, originSourcePattern: OriginSourcePattern, dumpOriginsFile: string | undefined, dumpMatchedOriginsFile: string | undefined);
     /**
      * @returns the elements of the task.
      */
@@ -153,7 +183,9 @@ export declare class TaskResult {
     readonly failed: number;
     /** Number of warnings that were produced during the instrumentation process */
     readonly warnings: number;
-    constructor(translated: number, excluded: number, translatedFromCache: number, alreadyInstrumented: number, unsupported: number, failed: number, warnings: number);
+    /** The instrumentation task for that the results were produced. */
+    readonly task?: InstrumentationTask;
+    constructor(translated: number, excluded: number, translatedFromCache: number, alreadyInstrumented: number, unsupported: number, failed: number, warnings: number, task?: InstrumentationTask);
     /**
      * Returns the sum of the present task results and the given one.
      *
@@ -163,7 +195,7 @@ export declare class TaskResult {
     /**
      * @returns the neutral task element (adding it with {@code withIncrement} does not change the result).
      */
-    static neutral(): TaskResult;
+    static neutral(task?: InstrumentationTask): TaskResult;
     /**
      * @returns a task result signaling one error.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"Task.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Task.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Task.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Task.ts"],"names":[],"mappings":"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"}

package/dist/src/instrumenter/Task.js

@@ -52,6 +52,14 @@ class CollectorSpecifier {
     }
 }
 exports.CollectorSpecifier = CollectorSpecifier;
+/**
+ * Configuration used to match paths with `micromatch`.
+ */
+const MATCHER_OPTIONS = {
+    basename: false,
+    lookbehinds: true,
+    noglobstar: false
+};
 /**
  * Patterns that define which parts of a given bundle to instrument or not.
  *
@@ -63,6 +71,9 @@ class OriginSourcePattern {
     constructor(include, exclude) {
         this.include = normalizePatterns(include);
         this.exclude = normalizePatterns(exclude);
+        this.includeMatches = new Set();
+        this.excludeMatches = new Set();
+        this.neitherExcludedNorIncluded = new Set();
     }
     /**
      * Does the given pattern require to include the given file?
@@ -82,14 +93,23 @@ class OriginSourcePattern {
         }
         const normalizedOriginFile = normalizePath(originFile);
         if (this.exclude) {
-            const matchedToExclude = (0, micromatch_1.default)([normalizedOriginFile], this.exclude);
+            const matchedToExclude = (0, micromatch_1.default)([normalizedOriginFile], this.exclude, MATCHER_OPTIONS);
             if (matchedToExclude.length === 1) {
+                this.excludeMatches.add(normalizedOriginFile);
                 return false;
             }
         }
         if (this.include) {
-            return micromatch_1.default.some([normalizedOriginFile], this.include || ['**']);
+            const result = micromatch_1.default.some([normalizedOriginFile], this.include, MATCHER_OPTIONS);
+            if (result) {
+                this.includeMatches.add(normalizedOriginFile);
+            }
+            else {
+                this.neitherExcludedNorIncluded.add(normalizedOriginFile);
+            }
+            return result;
         }
+        this.neitherExcludedNorIncluded.add(normalizedOriginFile);
         return true;
     }
     /**
@@ -99,6 +119,25 @@ class OriginSourcePattern {
     isAnyIncluded(originFiles) {
         return originFiles.find(value => this.isIncluded(value)) !== undefined;
     }
+    /**
+     * Retrieve the file names that have been matching the different patterns.
+     */
+    retrieveMatchingFiles() {
+        var _a, _b;
+        return {
+            includePatterns: (_a = this.include) !== null && _a !== void 0 ? _a : [],
+            excludePatterns: (_b = this.exclude) !== null && _b !== void 0 ? _b : [],
+            excludeMatches: [...this.excludeMatches],
+            includeMatches: [...this.includeMatches],
+            neitherExcludedNorIncluded: [...this.neitherExcludedNorIncluded]
+        };
+    }
+    /**
+     * Returns if include/exclude patterns are specified.
+     */
+    patternsSpecified() {
+        return this.include !== undefined || this.exclude !== undefined;
+    }
 }
 exports.OriginSourcePattern = OriginSourcePattern;
 /**
@@ -138,10 +177,22 @@ function normalizeGlobPattern(pattern) {
     if (!pattern) {
         return pattern;
     }
-    return removeTrailingCurrentWorkingDir(pattern);
+    // This should be in line with the logic in `normalizePath`.
+    return removeTrailingDirectoryTraversals(removeTrailingCurrentWorkingDir(pattern));
 }
 function normalizePath(toNormalize) {
-    return removeTrailingCurrentWorkingDir(toNormalize.replace(/\\/g, '/'));
+    // This should be in line with the logic in `normalizeGlobPattern`.
+    return removeTrailingDirectoryTraversals(removeTrailingCurrentWorkingDir(toNormalize.replace(/\\/g, '/')));
+}
+/**
+ * `micromatch` cannot deal with leading `../`, so we remove those.
+ */
+function removeTrailingDirectoryTraversals(toNormalize) {
+    let result = toNormalize;
+    while (result.startsWith("../")) {
+        result = result.substring(3);
+    }
+    return result;
 }
 function removeTrailingCurrentWorkingDir(removeFrom) {
     return removePrefix('webpack:///', removePrefix('./', removeFrom));
@@ -156,12 +207,13 @@ function removePrefix(prefix, removeFrom) {
  * The actual instrumentation task.
  */
 class InstrumentationTask {
-    constructor(collector, elements, excludeFilesPattern, originSourcePattern, dumpOriginsFile) {
+    constructor(collector, elements, excludeFilesPattern, originSourcePattern, dumpOriginsFile, dumpMatchedOriginsFile) {
         this.collector = commons_1.Contract.requireDefined(collector);
         this.excludeFilesPattern = commons_1.Contract.requireDefined(excludeFilesPattern);
         this.originSourcePattern = commons_1.Contract.requireDefined(originSourcePattern);
         this._elements = commons_1.Contract.requireDefined(elements).slice();
         this.dumpOriginsFile = dumpOriginsFile;
+        this.dumpMatchedOriginsFile = dumpMatchedOriginsFile;
     }
     /**
      * @returns the elements of the task.
@@ -177,7 +229,7 @@ exports.InstrumentationTask = InstrumentationTask;
  * A summary of executing the instrumentation task.
  */
 class TaskResult {
-    constructor(translated, excluded, translatedFromCache, alreadyInstrumented, unsupported, failed, warnings) {
+    constructor(translated, excluded, translatedFromCache, alreadyInstrumented, unsupported, failed, warnings, task) {
         commons_1.Contract.require(translated > -1);
         commons_1.Contract.require(excluded > -1);
         commons_1.Contract.require(translatedFromCache > -1);
@@ -192,6 +244,7 @@ class TaskResult {
         this.unsupported = unsupported;
         this.failed = failed;
         this.warnings = warnings;
+        this.task = task;
     }
     /**
      * Returns the sum of the present task results and the given one.
@@ -199,13 +252,14 @@ class TaskResult {
      * @param incBy - The task result to add (as delta).
      */
     withIncrement(incBy) {
-        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);
+        var _a;
+        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, (_a = this.task) !== null && _a !== void 0 ? _a : incBy.task);
     }
     /**
      * @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, 0);
+    static neutral(task) {
+        return new TaskResult(0, 0, 0, 0, 0, 0, 0, task);
     }
     /**
      * @returns a task result signaling one error.

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

@@ -11,6 +11,7 @@ export type ConfigurationParameters = {
     exclude_origin?: string[];
     exclude_bundle?: string[];
     dump_origins_to?: string;
+    dump_origin_matches_to?: string;
 };
 /**
  * A builder for an instrumentation task.
@@ -26,8 +27,15 @@ export declare class TaskBuilder {
     private originSourceExcludePatterns;
     /** Bundle exclude patters. */
     private bundleFileExcludePatterns;
-    /** File path where all origins from the source map should be dumped in json format, or undefined if no origins should be dumped */
+    /**
+     * File path where all origins from the source map should be dumped in JSON format,
+     * or undefined if no origins should be dumped */
     private dumpOriginsFile;
+    /**
+     * File path where the matched origin file names are stored as JSON,
+     * `undefined` if this information should not be dumped.
+     */
+    private dumpMatchedOriginsFile;
     constructor();
     /** Set the collector by extracting the information from a given string */
     setCollectorFromString(collectorSpecification: string): this;

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,MAAM,MAAM,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,EAAE,CAAC;IAE1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,eAAe,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAkBF;;GAEG;AACH,qBAAa,WAAW;IACvB,gDAAgD;IAChD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IAEzC,6CAA6C;IAC7C,OAAO,CAAC,SAAS,CAA4B;IAE7C,+BAA+B;IAC/B,OAAO,CAAC,2BAA2B,CAAuB;IAE1D,8BAA8B;IAC9B,OAAO,CAAC,2BAA2B,CAAuB;IAE1D,8BAA8B;IAC9B,OAAO,CAAC,yBAAyB,CAAuB;IAExD,mIAAmI;IACnI,OAAO,CAAC,eAAe,CAAqB;;IAO5C,0EAA0E;IAC1E,sBAAsB,CAAC,sBAAsB,EAAE,MAAM,GAAG,IAAI;IAM5D,gHAAgH;IAChH,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAKpE,kHAAkH;IAClH,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAKpE,qHAAqH;IACrH,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAK9D,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;IAoCpD;;;;;;;OAOG;IACH,OAAO,CAAC,4CAA4C;IAgCpD;;;;;;OAMG;IACH,OAAO,CAAC,0BAA0B;IASlC;;OAEG;IACI,KAAK,IAAI,mBAAmB;CASnC"}
+{"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,MAAM,MAAM,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,EAAE,CAAC;IAE1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAkBF;;GAEG;AACH,qBAAa,WAAW;IACvB,gDAAgD;IAChD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IAEzC,6CAA6C;IAC7C,OAAO,CAAC,SAAS,CAA4B;IAE7C,+BAA+B;IAC/B,OAAO,CAAC,2BAA2B,CAAuB;IAE1D,8BAA8B;IAC9B,OAAO,CAAC,2BAA2B,CAAuB;IAE1D,8BAA8B;IAC9B,OAAO,CAAC,yBAAyB,CAAuB;IAExD;;qDAEiD;IACjD,OAAO,CAAC,eAAe,CAAqB;IAE5C;;;OAGG;IACH,OAAO,CAAC,sBAAsB,CAAqB;;IAOnD,0EAA0E;IAC1E,sBAAsB,CAAC,sBAAsB,EAAE,MAAM,GAAG,IAAI;IAM5D,gHAAgH;IAChH,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAKpE,kHAAkH;IAClH,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAKpE,qHAAqH;IACrH,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAK9D,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;IAqCpD;;;;;;;OAOG;IACH,OAAO,CAAC,4CAA4C;IAgCpD;;;;;;OAMG;IACH,OAAO,CAAC,0BAA0B;IASlC;;OAEG;IACI,KAAK,IAAI,mBAAmB;CAUnC"}

package/dist/src/instrumenter/TaskBuilder.js

@@ -90,6 +90,7 @@ class TaskBuilder {
         const target = config.to;
         const sourceMap = config.source_map;
         this.dumpOriginsFile = config.dump_origins_to;
+        this.dumpMatchedOriginsFile = config.dump_origin_matches_to;
         this.setCollectorFromString(config.collector);
         this.setOriginSourceIncludePatterns(config.include_origin);
         this.setOriginSourceExcludePatterns(config.exclude_origin);
@@ -170,7 +171,7 @@ class TaskBuilder {
      * Build the instrumentation task.
      */
     build() {
-        return new Task_1.InstrumentationTask(commons_1.Contract.requireDefined(this.collector), this.elements, new Task_1.FileExcludePattern(this.bundleFileExcludePatterns), new Task_1.OriginSourcePattern(this.originSourceIncludePatterns, this.originSourceExcludePatterns), this.dumpOriginsFile);
+        return new Task_1.InstrumentationTask(commons_1.Contract.requireDefined(this.collector), this.elements, new Task_1.FileExcludePattern(this.bundleFileExcludePatterns), new Task_1.OriginSourcePattern(this.originSourceIncludePatterns, this.originSourceExcludePatterns), this.dumpOriginsFile, this.dumpMatchedOriginsFile);
     }
 }
 exports.TaskBuilder = TaskBuilder;

package/dist/src/main.js

@@ -5,6 +5,7 @@ const App_1 = require("./App");
 // Run the instrumenter and print the results to the console.
 App_1.App.run()
     .then(result => {
+    var _a, _b;
     console.log('Instrumentation finished.');
     console.log(`\tInstrumented: ${result.translated}`);
     console.log(`\tExcluded: ${result.excluded}`);
@@ -13,6 +14,15 @@ App_1.App.run()
     console.log(`\tUnsupported: ${result.unsupported}`);
     console.log(`\tWith warning: ${result.warnings}`);
     console.log(`\tFailed: ${result.failed}`);
+    if ((_a = result.task) === null || _a === void 0 ? void 0 : _a.originSourcePattern.patternsSpecified()) {
+        const stats = (_b = result.task) === null || _b === void 0 ? void 0 : _b.originSourcePattern.retrieveMatchingFiles();
+        console.log(`\tSource origin matches`);
+        console.log(`\t\tInclude patterns: [${stats.includePatterns}]`);
+        console.log(`\t\tExclude patterns: [${stats.excludeMatches}]`);
+        console.log(`\t\tInclude matches: ${stats.includeMatches.length}`);
+        console.log(`\t\tExclude matches: ${stats.excludeMatches.length}`);
+        console.log(`\t\tNeither matches: ${stats.neitherExcludedNorIncluded.length}`);
+    }
 })
     .catch(reason => {
     console.log('Failed: ', reason);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamscale/javascript-instrumenter",
-  "version": "0.1.0-beta.2",
+  "version": "0.1.0-beta.4",
   "description": "JavaScript coverage instrumenter with coverage forwarding to a collector process",
   "main": "dist/src/main.js",
   "bin": "dist/src/main.js",
@@ -15,39 +15,39 @@
     "dist/**/*"
   ],
   "devDependencies": {
-    "@babel/core": "^7.23.2",
-    "@babel/plugin-transform-modules-commonjs": "^7.23.0",
-    "@babel/preset-env": "^7.23.2",
-    "@types/argparse": "^2.0.12",
-    "@types/async": "^3.2.22",
-    "@types/babel__generator": "^7.6.6",
-    "@types/babel__traverse": "^7.20.3",
-    "@types/bunyan": "^1.8.10",
-    "@types/convert-source-map": "^2.0.2",
+    "@babel/core": "^7.23.7",
+    "@babel/plugin-transform-modules-commonjs": "^7.23.3",
+    "@babel/preset-env": "^7.23.8",
+    "@types/argparse": "^2.0.14",
+    "@types/async": "^3.2.24",
+    "@types/babel__generator": "^7.6.8",
+    "@types/babel__traverse": "^7.20.5",
+    "@types/bunyan": "^1.8.11",
+    "@types/convert-source-map": "^2.0.3",
     "@types/glob": "^8.1.0",
-    "@types/istanbul-lib-instrument": "^1.7.6",
-    "@types/jest": "^29.5.6",
-    "@types/node": "^20.8.6",
-    "@types/ws": "^8.5.7",
+    "@types/istanbul-lib-instrument": "^1.7.7",
+    "@types/jest": "^29.5.11",
+    "@types/node": "^20.11.0",
+    "@types/ws": "^8.5.10",
     "babel-jest": "^29.7.0",
-    "esbuild": "^0.19.5",
+    "esbuild": "^0.19.11",
     "esbuild-plugin-inline-worker": "^0.1.1",
     "jest": "^29.7.0",
     "rimraf": "^5.0.5",
     "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.9.2",
     "tslib": "^2.6.2",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@cqse/commons": "0.0.1-beta.59",
-    "@babel/generator": "^7.23.0",
-    "@babel/parser": "^7.23.0",
-    "@babel/traverse": "^7.23.2",
-    "@babel/types": "^7.23.0",
-    "@types/micromatch": "^4.0.3",
+    "@cqse/commons": "0.1.0-beta.2",
+    "@babel/generator": "^7.23.6",
+    "@babel/parser": "^7.23.6",
+    "@babel/traverse": "^7.23.7",
+    "@babel/types": "^7.23.6",
+    "@types/micromatch": "^4.0.6",
     "argparse": "^2.0.1",
-    "async": "^3.2.4",
+    "async": "^3.2.5",
     "bunyan": "^1.8.15",
     "convert-source-map": "^2.0.0",
     "foreground-child": "^3.1.1",
@@ -57,8 +57,8 @@
     "source-map": "0.7.4",
     "typescript-optional": "^2.0.1",
     "unload": "^2.4.1",
-    "web-worker": "^1.2.0",
-    "@teamscale/lib-instrument": "0.1.0-beta.2"
+    "web-worker": "^1.3.0",
+    "@teamscale/lib-instrument": "0.1.0-beta.4"
   },
   "publishConfig": {
     "access": "public"