@teamscale/javascript-instrumenter 0.0.1-beta.45 → 0.0.1-beta.46

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@teamscale/javascript-instrumenter",
-    "version": "0.0.1-beta.45",
+    "version": "0.0.1-beta.46",
     "description": "JavaScript coverage instrumenter with coverage forwarding to a collector process",
     "main": "dist/src/main.js",
     "bin": "dist/src/main.js",
@@ -51,7 +51,7 @@
         "@babel/parser": "^7.18.5",
         "@babel/traverse": "^7.18.6",
         "@babel/types": "^7.18.4",
-        "@cqse/commons": "^0.0.1-beta.1",
+        "@cqse/commons": "^0.0.1-beta.45",
         "@types/micromatch": "^4.0.2",
         "argparse": "^2.0.1",
         "async": "^3.2.4",

package/dist/src/App.d.ts

@@ -10,6 +10,11 @@ export declare class App {
      * Parses the command line options and the instrumentation accordingly.
      */
     static run(): Promise<TaskResult>;
+    /**
+     * Sometimes we get inputs from shell environments where the strings are
+     * still quoted. We remove those here.
+     */
+    static postprocessConfig(config: ConfigurationParameters): void;
     /**
      * Build the command line argument parser.
      */

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

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

package/dist/src/App.js

@@ -54,6 +54,44 @@ class App {
         // Run the instrumenter with the given configuration.
         return this.runForConfigArguments(config, logger);
     }
+    /**
+     * Sometimes we get inputs from shell environments where the strings are
+     * still quoted. We remove those here.
+     */
+    static postprocessConfig(config) {
+        function unquoteString(originalString) {
+            if (originalString === undefined) {
+                return originalString;
+            }
+            return originalString.replace(/^["'](.+(?=["']$))["']$/, '$1');
+        }
+        function unquoteStringElements(originalArray) {
+            if (originalArray === undefined) {
+                return undefined;
+            }
+            return originalArray.map(s => {
+                if (typeof s === 'string') {
+                    return unquoteString(s);
+                }
+                else {
+                    return s;
+                }
+            });
+        }
+        for (const [property, value] of Object.entries(config)) {
+            if (value === undefined) {
+                // In case the value is 'undefined' we can ignore this.
+            }
+            else if (typeof value === 'string') {
+                // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+                config[property] = unquoteString(value);
+            }
+            else if (Array.isArray(value)) {
+                // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+                config[property] = unquoteStringElements(value);
+            }
+        }
+    }
     /**
      * Build the command line argument parser.
      */
@@ -71,7 +109,7 @@ class App {
             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.'
+            help: 'External location of source-map files to consider.',
         });
         parser.add_argument('-c', '--collector', {
             help: 'The collector (`host:port` or `wss://host:port/` or `ws://host:port/`) to send coverage information to.',
@@ -85,6 +123,10 @@ class App {
             nargs: '*',
             help: 'Glob pattern(s) of files in the source origin to produce coverage for. Multiple patterns can be separated by space.'
         });
+        parser.add_argument('-e', '--exclude-bundle', {
+            nargs: '*',
+            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'
         });
@@ -130,6 +172,7 @@ class App {
      * @param logger - The logger to use.
      */
     static runForConfigArguments(config, logger) {
+        this.postprocessConfig(config);
         const task = this.createInstrumentationTask(config);
         commons_1.Contract.require(task.elements.length > 0, 'The instrumentation task must not be empty.');
         return this.createInstrumenter(logger !== null && logger !== void 0 ? logger : this.buildDummyLogger()).instrument(task);

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

@@ -1,4 +1,4 @@
-import { CollectorSpecifier, InstrumentationTask, OriginSourcePattern, SourceMapReference, TaskElement, TaskResult } from './Task';
+import { CollectorSpecifier, FileExcludePattern, InstrumentationTask, OriginSourcePattern, SourceMapReference, TaskElement, TaskResult } from './Task';
 import { RawSourceMap, SourceMapConsumer } from 'source-map';
 import { Optional } from 'typescript-optional';
 import Logger from 'bunyan';
@@ -41,7 +41,7 @@ export declare class IstanbulInstrumenter implements IInstrumenter {
      * @param sourcePattern - A pattern to restrict the instrumentation to only a fraction of the task element.
      * @param dumpOriginsFile - A file path where all origins from the source map should be dumped in json format, or undefined if no origins should be dumped
      */
-    instrumentOne(collector: CollectorSpecifier, taskElement: TaskElement, sourcePattern: OriginSourcePattern, dumpOriginsFile: string | undefined): Promise<TaskResult>;
+    instrumentOne(collector: CollectorSpecifier, taskElement: TaskElement, excludeBundles: FileExcludePattern, sourcePattern: OriginSourcePattern, dumpOriginsFile: string | undefined): Promise<TaskResult>;
     private removeUnwantedInstrumentation;
     /**
      * Loads the vaccine from the vaccine file and adjusts some template parameters.

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,kBAAkB,EAClB,WAAW,EACX,UAAU,EACV,MAAM,QAAQ,CAAC;AAEhB,OAAO,EAAY,YAAY,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAOvE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,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;IAqBhE;;;;;;;OAOG;IACG,aAAa,CAClB,SAAS,EAAE,kBAAkB,EAC7B,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,mBAAmB,EAClC,eAAe,EAAE,MAAM,GAAG,SAAS,GACjC,OAAO,CAAC,UAAU,CAAC;YAwGR,6BAA6B;IA8C3C;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAMnB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAK3B;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IAcpC,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;AAED;;;;;;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,CAsC7G;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAGlF"}
+{"version":3,"file":"Instrumenter.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Instrumenter.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,kBAAkB,EAAE,kBAAkB,EACtC,mBAAmB,EACnB,mBAAmB,EAEnB,kBAAkB,EAClB,WAAW,EACX,UAAU,EACV,MAAM,QAAQ,CAAC;AAEhB,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAO7D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,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;IAsBhE;;;;;;;OAOG;IACG,aAAa,CAClB,SAAS,EAAE,kBAAkB,EAC7B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,kBAAkB,EAClC,aAAa,EAAE,mBAAmB,EAClC,eAAe,EAAE,MAAM,GAAG,SAAS,GACjC,OAAO,CAAC,UAAU,CAAC;YAgHR,6BAA6B;IA8C3C;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAMnB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAK3B;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IAcpC,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;AAED;;;;;;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,CAsC7G;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAGlF"}

package/dist/src/instrumenter/Instrumenter.js

@@ -57,7 +57,7 @@ class IstanbulInstrumenter {
         // 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, task.dumpOriginsFile);
+            return await this.instrumentOne(task.collector, taskElement, task.excludeFilesPattern, task.originSourcePattern, task.dumpOriginsFile);
         })
             .then(results => {
             return results.reduce((prev, curr) => {
@@ -73,7 +73,7 @@ class IstanbulInstrumenter {
      * @param sourcePattern - A pattern to restrict the instrumentation to only a fraction of the task element.
      * @param dumpOriginsFile - A file path where all origins from the source map should be dumped in json format, or undefined if no origins should be dumped
      */
-    async instrumentOne(collector, taskElement, sourcePattern, dumpOriginsFile) {
+    async instrumentOne(collector, taskElement, excludeBundles, sourcePattern, dumpOriginsFile) {
         var _a, _b;
         const inputFileSource = fs.readFileSync(taskElement.fromFile, 'utf8');
         // We skip files that we have already instrumented
@@ -83,6 +83,13 @@ class IstanbulInstrumenter {
             }
             return new Task_1.TaskResult(0, 0, 0, 1, 0, 0, 0);
         }
+        // We might want to skip the instrumentation of the file
+        if (excludeBundles.isExcluded(taskElement.fromFile)) {
+            if (!taskElement.isInPlace()) {
+                writeToFile(taskElement.toFile, inputFileSource);
+            }
+            return new Task_1.TaskResult(0, 1, 0, 0, 0, 0, 0);
+        }
         // Not all file types are supported by the instrumenter
         if (!this.isFileTypeSupported(taskElement.fromFile)) {
             return new Task_1.TaskResult(0, 0, 0, 0, 1, 0, 0);

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

@@ -46,12 +46,6 @@ export declare class OriginSourcePattern {
      */
     private readonly exclude;
     constructor(include: string[] | undefined, exclude: string[] | undefined);
-    /**
-     * Normalizes all patterns (normally either include or exclude patterns), and returns all
-     * valid normalized patterns. Returns undefined if the patterns list is undefined, or all
-     * items inside the list are undefined.
-     */
-    private normalizePatterns;
     /**
      * Does the given pattern require to include the given set of files?
      *
@@ -65,10 +59,20 @@ export declare class OriginSourcePattern {
      *   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;
+}
+/**
+ * Pattern describing files (bundles) to not instrument.
+ */
+export declare class FileExcludePattern {
+    /**
+     * Glob pattern describing a set of files to be excluded in the instrumentation process.
+     */
+    private readonly exclude;
+    constructor(exclude: string[] | undefined);
+    /**
+     * Return `true` if the given `filePath` is matched by any of the patterns in `exclude`.
+     */
+    isExcluded(filePath: string): boolean;
 }
 /**
  * The actual instrumentation task.
@@ -87,8 +91,16 @@ export declare class InstrumentationTask {
      * based on the original file names the code was transpiled from.
      */
     readonly originSourcePattern: OriginSourcePattern;
+    /**
+     * A pattern describing the set of files to not instrument but to output
+     * without adding instrumentations.
+     */
+    readonly excludeFilesPattern: FileExcludePattern;
+    /**
+     * File to write the file-origin-mapping to.
+     */
     readonly dumpOriginsFile: string | undefined;
-    constructor(collector: CollectorSpecifier, elements: TaskElement[], originSourcePattern: OriginSourcePattern, dumpOriginsFile: string | undefined);
+    constructor(collector: CollectorSpecifier, elements: TaskElement[], excludeFilesPattern: FileExcludePattern, originSourcePattern: OriginSourcePattern, dumpOriginsFile: string | undefined);
     /**
      * @returns the elements of the task.
      */

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":"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,oEAAoE;IACpE,SAAgB,GAAG,EAAE,MAAM,CAAC;gBAEhB,SAAS,EAAE,MAAM;CAW7B;AAED;;;;;;GAMG;AACH,qBAAa,mBAAmB;IAC/B,mGAAmG;IACnG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAE/C;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;gBAEnC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS;IAKxE;;;;;;;;;;;OAWG;IACI,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO;CAqBpD;AAED;;GAEG;AACH,qBAAa,kBAAkB;IAE9B;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAW;gBAEvB,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS;IAIzC;;OAEG;IACI,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;CAG5C;AA8CD;;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;IAEzD;;;OAGG;IACH,SAAgB,mBAAmB,EAAE,kBAAkB,CAAC;IAExD;;OAEG;IACH,SAAgB,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;gBAGnD,SAAS,EAAE,kBAAkB,EAC7B,QAAQ,EAAE,WAAW,EAAE,EACvB,mBAAmB,EAAE,kBAAkB,EACvC,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,MAAM,GAAG,SAAS;IASpC;;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

@@ -3,7 +3,7 @@ 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;
+exports.SourceMapFileReference = exports.TaskResult = exports.InstrumentationTask = exports.FileExcludePattern = exports.OriginSourcePattern = exports.CollectorSpecifier = exports.TaskElement = exports.SourceMapReference = void 0;
 const typescript_optional_1 = require("typescript-optional");
 const commons_1 = require("@cqse/commons");
 const micromatch_1 = __importDefault(require("micromatch"));
@@ -62,25 +62,8 @@ exports.CollectorSpecifier = CollectorSpecifier;
  */
 class OriginSourcePattern {
     constructor(include, exclude) {
-        this.include = this.normalizePatterns(include);
-        this.exclude = this.normalizePatterns(exclude);
-    }
-    /**
-     * Normalizes all patterns (normally either include or exclude patterns), and returns all
-     * valid normalized patterns. Returns undefined if the patterns list is undefined, or all
-     * items inside the list are undefined.
-     */
-    normalizePatterns(patterns) {
-        if (patterns === undefined || patterns.length === 0) {
-            return undefined;
-        }
-        const normalizedPatterns = patterns
-            .map(pattern => OriginSourcePattern.normalizeGlobPattern(pattern))
-            .filter(pattern => pattern !== undefined);
-        if (patterns.length === 0) {
-            return undefined;
-        }
-        return normalizedPatterns;
+        this.include = normalizePatterns(include);
+        this.exclude = normalizePatterns(exclude);
     }
     /**
      * Does the given pattern require to include the given set of files?
@@ -98,7 +81,7 @@ class OriginSourcePattern {
         if (originFiles.length === 0) {
             return true;
         }
-        const normalizedOriginFiles = originFiles.map(OriginSourcePattern.normalizePath);
+        const normalizedOriginFiles = originFiles.map(normalizePath);
         if (this.exclude) {
             const matchedToExclude = (0, micromatch_1.default)(normalizedOriginFiles, this.exclude);
             if (originFiles.length === matchedToExclude.length) {
@@ -111,32 +94,66 @@ class OriginSourcePattern {
         }
         return true;
     }
-    static normalizeGlobPattern(pattern) {
-        if (!pattern) {
-            return pattern;
-        }
-        return OriginSourcePattern.removeTrailingCurrentWorkingDir(pattern);
+}
+exports.OriginSourcePattern = OriginSourcePattern;
+/**
+ * Pattern describing files (bundles) to not instrument.
+ */
+class FileExcludePattern {
+    constructor(exclude) {
+        var _a;
+        this.exclude = (_a = normalizePatterns(exclude)) !== null && _a !== void 0 ? _a : [];
     }
-    static normalizePath(toNormalize) {
-        return OriginSourcePattern.removeTrailingCurrentWorkingDir(toNormalize);
+    /**
+     * Return `true` if the given `filePath` is matched by any of the patterns in `exclude`.
+     */
+    isExcluded(filePath) {
+        return (0, micromatch_1.default)([filePath], this.exclude).length === 1;
     }
-    static removeTrailingCurrentWorkingDir(removeFrom) {
-        return OriginSourcePattern.removePrefix('webpack:///', OriginSourcePattern.removePrefix('.' + path_1.default.sep, removeFrom));
+}
+exports.FileExcludePattern = FileExcludePattern;
+/**
+ * Normalizes all patterns (normally either include or exclude patterns), and returns all
+ * valid normalized patterns. Returns undefined if the patterns list is undefined, or all
+ * items inside the list are undefined.
+ */
+function normalizePatterns(patterns) {
+    if (patterns === undefined || patterns.length === 0) {
+        return undefined;
     }
-    static removePrefix(prefix, removeFrom) {
-        if (removeFrom.startsWith(prefix)) {
-            return removeFrom.substring(prefix.length);
-        }
-        return removeFrom;
+    const normalizedPatterns = patterns
+        .map(pattern => normalizeGlobPattern(pattern))
+        .filter(pattern => pattern !== undefined);
+    if (patterns.length === 0) {
+        return undefined;
     }
+    return normalizedPatterns;
+}
+function normalizeGlobPattern(pattern) {
+    if (!pattern) {
+        return pattern;
+    }
+    return removeTrailingCurrentWorkingDir(pattern);
+}
+function normalizePath(toNormalize) {
+    return removeTrailingCurrentWorkingDir(toNormalize);
+}
+function removeTrailingCurrentWorkingDir(removeFrom) {
+    return removePrefix('webpack:///', removePrefix('.' + path_1.default.sep, removeFrom));
+}
+function removePrefix(prefix, removeFrom) {
+    if (removeFrom.startsWith(prefix)) {
+        return removeFrom.substring(prefix.length);
+    }
+    return removeFrom;
 }
-exports.OriginSourcePattern = OriginSourcePattern;
 /**
  * The actual instrumentation task.
  */
 class InstrumentationTask {
-    constructor(collector, elements, originSourcePattern, dumpOriginsFile) {
+    constructor(collector, elements, excludeFilesPattern, originSourcePattern, dumpOriginsFile) {
         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;

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

@@ -9,6 +9,7 @@ export declare type ConfigurationParameters = {
     collector: string;
     include_origin?: string[];
     exclude_origin?: string[];
+    exclude_bundle?: string[];
     dump_origins_to?: string;
 };
 /**
@@ -19,19 +20,23 @@ export declare class TaskBuilder {
     private readonly elements;
     /** The collector to send the coverage to. */
     private collector;
-    /** An include pattern. */
+    /** Origin include patterns. */
     private originSourceIncludePatterns;
-    /** An exclude pattern. */
+    /** Origin exclude patters. */
     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 */
     private dumpOriginsFile;
     constructor();
     /** Set the collector by extracting the information from a given string */
     setCollectorFromString(collectorSpecification: string): this;
-    /** Set the include pattern. If multiple patterns are present, concatenates them via the OR operator.  */
+    /** Set the origin include pattern. If multiple patterns are present, concatenates them via the OR operator.  */
     setOriginSourceIncludePatterns(patterns: string[] | undefined): this;
-    /** Set the exclude pattern(s). If multiple patterns are present, concatenates them via the OR operator. */
+    /** Set the origin exclude pattern(s). If multiple patterns are present, concatenates them via the OR operator. */
     setOriginSourceExcludePatterns(patterns: string[] | undefined): this;
+    /** Sets the file bundle exclude pattern. If multiple patterns are present, concatenates them via the OR operator. */
+    setBundleExcludePatterns(patterns: string[] | undefined): this;
     /** Add a task element */
     addElement(fromFilePath: string, toFilePath: string, fromFileSourceMap?: SourceMapReference): 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,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,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,0BAA0B;IAC1B,OAAO,CAAC,2BAA2B,CAAuB;IAE1D,0BAA0B;IAC1B,OAAO,CAAC,2BAA2B,CAAuB;IAE1D,mIAAmI;IACnI,OAAO,CAAC,eAAe,CAAqB;;IAO5C,0EAA0E;IAC1E,sBAAsB,CAAC,sBAAsB,EAAE,MAAM,GAAG,IAAI;IAM5D,yGAAyG;IACzG,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAKpE,2GAA2G;IAC3G,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAKpE,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;IAmCpD;;;;;;;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,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,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"}

package/dist/src/instrumenter/TaskBuilder.js

@@ -58,16 +58,21 @@ class TaskBuilder {
         this.collector = new Task_1.CollectorSpecifier(collectorSpecification);
         return this;
     }
-    /** Set the include pattern. If multiple patterns are present, concatenates them via the OR operator.  */
+    /** Set the origin include pattern. If multiple patterns are present, concatenates them via the OR operator.  */
     setOriginSourceIncludePatterns(patterns) {
         this.originSourceIncludePatterns = patterns;
         return this;
     }
-    /** Set the exclude pattern(s). If multiple patterns are present, concatenates them via the OR operator. */
+    /** Set the origin exclude pattern(s). If multiple patterns are present, concatenates them via the OR operator. */
     setOriginSourceExcludePatterns(patterns) {
         this.originSourceExcludePatterns = patterns;
         return this;
     }
+    /** Sets the file bundle exclude pattern. If multiple patterns are present, concatenates them via the OR operator. */
+    setBundleExcludePatterns(patterns) {
+        this.bundleFileExcludePatterns = patterns;
+        return this;
+    }
     /** Add a task element */
     addElement(fromFilePath, toFilePath, fromFileSourceMap) {
         this.elements.push(new Task_1.TaskElement(fromFilePath, toFilePath, fromFileSourceMap));
@@ -88,9 +93,10 @@ class TaskBuilder {
         this.setCollectorFromString(config.collector);
         this.setOriginSourceIncludePatterns(config.include_origin);
         this.setOriginSourceExcludePatterns(config.exclude_origin);
+        this.setBundleExcludePatterns(config.exclude_bundle);
         // Handle an explicitly specified source map
         const sourceMapInfo = loadSourceMap(sourceMap);
-        // Depending on whether or not an in place instrumentation is needed
+        // If an in place instrumentation is needed
         // the task has to be built differently and different invariants
         // have to be satisfied by the passed configuration.
         if (inPlace) {
@@ -164,8 +170,7 @@ class TaskBuilder {
      * Build the instrumentation task.
      */
     build() {
-        const pattern = new Task_1.OriginSourcePattern(this.originSourceIncludePatterns, this.originSourceExcludePatterns);
-        return new Task_1.InstrumentationTask(commons_1.Contract.requireDefined(this.collector), this.elements, pattern, 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);
     }
 }
 exports.TaskBuilder = TaskBuilder;
@@ -176,7 +181,7 @@ function isPattern(text) {
     return text.includes('*') || text.includes('+') || text.includes('?') || text.includes('|');
 }
 /**
- * Expand the given Glob pattern and check whether or not files matched.
+ * Expand the given Glob pattern and check if files matched.
  * Raises an exception is the result is empty.
  *
  * @param pattern - The Glob pattern used for matching.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamscale/javascript-instrumenter",
-  "version": "0.0.1-beta.45",
+  "version": "0.0.1-beta.46",
   "description": "JavaScript coverage instrumenter with coverage forwarding to a collector process",
   "main": "dist/src/main.js",
   "bin": "dist/src/main.js",
@@ -51,7 +51,7 @@
     "@babel/parser": "^7.18.5",
     "@babel/traverse": "^7.18.6",
     "@babel/types": "^7.18.4",
-    "@cqse/commons": "^0.0.1-beta.1",
+    "@cqse/commons": "^0.0.1-beta.45",
     "@types/micromatch": "^4.0.2",
     "argparse": "^2.0.1",
     "async": "^3.2.4",