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

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
-in the [Teamscale Documentation](https://docs.teamscale.com/howto/recording-test-coverage-for-javascript/).
+in the [Teamscale Documentation](https://docs.teamscale.com/howto/setting-up-profiler-tga/javascript/).
 
 The Instrumenter instruments a given (set of) JavaScript file(s) such that (1) coverage 
 information is produced and (2) forwarded to the Collector.

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@teamscale/javascript-instrumenter",
-    "version": "0.1.0-beta.4",
+    "version": "0.1.0-beta.6",
     "description": "JavaScript coverage instrumenter with coverage forwarding to a collector process",
     "main": "dist/src/main.js",
     "bin": "dist/src/main.js",
@@ -23,9 +23,9 @@
         "dist/**/*"
     ],
     "devDependencies": {
-        "@babel/core": "^7.23.7",
+        "@babel/core": "^7.23.9",
         "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-        "@babel/preset-env": "^7.23.8",
+        "@babel/preset-env": "^7.23.9",
         "@types/argparse": "^2.0.14",
         "@types/async": "^3.2.24",
         "@types/babel__generator": "^7.6.8",
@@ -34,26 +34,26 @@
         "@types/convert-source-map": "^2.0.3",
         "@types/glob": "^8.1.0",
         "@types/istanbul-lib-instrument": "^1.7.7",
-        "@types/jest": "^29.5.11",
-        "@types/node": "^20.11.0",
+        "@types/jest": "^29.5.12",
+        "@types/node": "^20.11.19",
         "@types/ws": "^8.5.10",
         "babel-jest": "^29.7.0",
-        "esbuild": "^0.19.11",
+        "esbuild": "^0.20.1",
         "esbuild-plugin-inline-worker": "^0.1.1",
         "jest": "^29.7.0",
         "rimraf": "^5.0.5",
-        "ts-jest": "^29.1.1",
+        "ts-jest": "^29.1.2",
         "ts-node": "^10.9.2",
         "tslib": "^2.6.2",
         "typescript": "^5.3.3"
     },
     "dependencies": {
-        "@cqse/commons": "0.1.0-beta.2",
+        "@cqse/commons": "0.1.0-beta.5",
         "@teamscale/lib-instrument": "workspace:../lib-instrument",
         "@babel/generator": "^7.23.6",
-        "@babel/parser": "^7.23.6",
-        "@babel/traverse": "^7.23.7",
-        "@babel/types": "^7.23.6",
+        "@babel/parser": "^7.23.9",
+        "@babel/traverse": "^7.23.9",
+        "@babel/types": "^7.23.9",
         "@types/micromatch": "^4.0.6",
         "argparse": "^2.0.1",
         "async": "^3.2.5",

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;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"}
+{"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;AAG5B;;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;IA0D1B;;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

@@ -51,8 +51,8 @@ class App {
         const config = parser.parse_args();
         // Build the logger
         const logger = this.buildLogger(config);
-        logger.debug('Retrieved arguments', process.argv);
-        logger.debug('Translated arguments to config', config);
+        logger.trace('Retrieved arguments', process.argv);
+        logger.trace('Translated arguments to config', config);
         // Run the instrumenter with the given configuration.
         return this.runForConfigArguments(config, logger);
     }
@@ -123,6 +123,19 @@ class App {
             help: 'The collector (`host:port` or `wss://host:port/` or `ws://host:port/`) to send coverage information to.',
             default: 'ws://localhost:54678'
         });
+        parser.add_argument('--relative-collector', {
+            help: 'Pattern used to determine the collector URL from the application hostname.'
+                + ' Useful for Kubernetes deployments where the collector URL is not known at instrumentation time.'
+                + ' Example: `replace-in-host:app collector,scheme:wss`.'
+                + ' This causes the first occurrence of `app` in the application hostname to be replaced with `collector`'
+                + ' and the URL scheme changed to wss.'
+                + ' Available operations:'
+                + ' `replace-in-host:SEARCH REPLACE` replaces the literal term SEARCH once in the hostname with REPLACE.'
+                + ' `port:NUMBER` changes the port to NUMBER.'
+                + ' `port:keep` keeps the port of the application (instead of using the chosen scheme\'s default port).'
+                + ' `scheme:SCHEME` changes the URL scheme to one of ws, wss, http or https.'
+                + ' `path:PATH` uses the URL path PATH (instead of no path).'
+        });
         parser.add_argument('-x', '--exclude-origin', {
             nargs: '*',
             help: 'Glob pattern(s) of files in the source origin to not produce coverage for. Multiple patterns can be separated by space.'

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

@@ -1,7 +1,8 @@
-import { CollectorSpecifier, FileExcludePattern, InstrumentationTask, OriginSourcePattern, SourceMapReference, TaskElement, TaskResult } from './Task';
+import { FileExcludePattern, InstrumentationTask, OriginSourcePattern, SourceMapReference, TaskElement, TaskResult } from './Task';
 import { RawSourceMap, SourceMapConsumer } from 'source-map';
 import { Optional } from 'typescript-optional';
 import Logger from 'bunyan';
+import { CollectorSpecifier } from '@src/vaccine/types';
 export declare const IS_INSTRUMENTED_TOKEN = "$IS_JS_PROFILER_INSTRUMENTED=true";
 /**
  * An instrumenter that can conduct a {@code InstrumentationTask}.

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

@@ -1 +1 @@
-{"version":3,"file":"Instrumenter.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Instrumenter.ts"],"names":[],"mappings":"AAAA,OAAO,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"}
+{"version":3,"file":"Instrumenter.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Instrumenter.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,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;AAO5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAExD,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

@@ -204,7 +204,7 @@ class IstanbulInstrumenter {
     loadVaccine(filePath, collector) {
         // We first replace parameters in the file with the
         // actual values, for example, the collector to send the coverage information to.
-        return fs.readFileSync(filePath, 'utf8').replace(/\$REPORT_TO_URL/g, collector.url);
+        return fs.readFileSync(filePath, 'utf8').replace(/\$COLLECTOR_SPECIFIER/g, JSON.stringify(collector));
     }
     /**
      * @returns whether the given file is supported for instrumentation.
@@ -222,7 +222,7 @@ class IstanbulInstrumenter {
      * given task element.
      */
     configurationAlternativesFor(taskElement) {
-        this.logger.debug(`Determining configuration alternatives for ${taskElement.fromFile}`);
+        this.logger.trace(`Determining configuration alternatives for ${taskElement.fromFile}`);
         const baseConfig = {
             isInstrumentedToken: exports.IS_INSTRUMENTED_TOKEN,
             produceSourceMap: 'external',

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

@@ -0,0 +1,8 @@
+import { CollectorSpecifierRelative } from "@src/vaccine/types";
+/** Parses a relative collector pattern. */
+export declare class RelativeCollectorPatternParser {
+    /** Parses the given pattern. */
+    static parse(pattern: string): CollectorSpecifierRelative;
+    private static apply;
+}
+//# sourceMappingURL=RelativeCollectorPatternParser.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RelativeCollectorPatternParser.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/RelativeCollectorPatternParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAEhE,2CAA2C;AAC3C,qBAAa,8BAA8B;IAEvC,gCAAgC;IAChC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,0BAA0B;IAkBzD,OAAO,CAAC,MAAM,CAAC,KAAK;CAgCvB"}

package/dist/src/instrumenter/RelativeCollectorPatternParser.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RelativeCollectorPatternParser = void 0;
+const commons_1 = require("@cqse/commons");
+/** Parses a relative collector pattern. */
+class RelativeCollectorPatternParser {
+    /** Parses the given pattern. */
+    static parse(pattern) {
+        const parts = pattern.split(",");
+        const specifier = {
+            type: "relative"
+        };
+        for (const part of parts) {
+            const colonIndex = part.indexOf(":");
+            commons_1.Contract.require(colonIndex > -1, `Invalid relative collector pattern ${pattern}: ${part} has no colon after the operation`);
+            const operation = part.substring(0, colonIndex);
+            const value = part.substring(colonIndex + 1);
+            RelativeCollectorPatternParser.apply(operation, value, specifier);
+        }
+        return specifier;
+    }
+    static apply(operation, value, specifier) {
+        switch (operation) {
+            case "port":
+                commons_1.Contract.requireStringPattern(value, /[0-9]+|keep/, `Invalid relative collector pattern: port must be a number: ${value}`);
+                if (value === "keep") {
+                    specifier.port = value;
+                }
+                else {
+                    specifier.port = parseInt(value);
+                }
+                break;
+            case "replace-in-host":
+                commons_1.Contract.requireStringPattern(value, /[^ ]+ [^ ]*/, `Invalid relative collector pattern: replace-in-host must contain exactly one space to separate search string and replacement: ${value}`);
+                const parts = value.split(" ");
+                specifier.hostReplace = {
+                    search: parts[0],
+                    replace: parts[1],
+                };
+                break;
+            case "path":
+                specifier.path = value;
+                break;
+            case "scheme":
+                commons_1.Contract.requireStringPattern(value, /ws|wss|http|https/i, `Invalid relative collector pattern: scheme must be one of ws, wss, http or https: ${value}`);
+                specifier.scheme = value.toLowerCase();
+                break;
+            default:
+                throw new commons_1.IllegalArgumentException(`Invalid relative collector pattern: unknown operation ${operation}`);
+        }
+    }
+}
+exports.RelativeCollectorPatternParser = RelativeCollectorPatternParser;

package/dist/src/instrumenter/RelativeCollectorPatternParser.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=RelativeCollectorPatternParser.test.d.ts.map

package/dist/src/instrumenter/RelativeCollectorPatternParser.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RelativeCollectorPatternParser.test.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/RelativeCollectorPatternParser.test.ts"],"names":[],"mappings":""}

package/dist/src/instrumenter/RelativeCollectorPatternParser.test.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const RelativeCollectorPatternParser_1 = require("./RelativeCollectorPatternParser");
+describe("SubstitutionPatternParser", () => {
+    test('empty pattern', () => {
+        expect(RelativeCollectorPatternParser_1.RelativeCollectorPatternParser.parse("")).toEqual({
+            type: "relative",
+        });
+    });
+    test('keep port', () => {
+        expect(RelativeCollectorPatternParser_1.RelativeCollectorPatternParser.parse("")).toEqual({
+            type: "relative",
+            port: "keep",
+        });
+    });
+    test('all features', () => {
+        expect(RelativeCollectorPatternParser_1.RelativeCollectorPatternParser.parse("scheme:wss,port:1234,replace-in-host:foo bar,path:path/path")).toEqual({
+            type: "relative",
+            hostReplace: {
+                search: "foo",
+                replace: "bar",
+            },
+            path: "path/path",
+            port: 1234,
+            scheme: "wss",
+        });
+    });
+});

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

@@ -1,4 +1,5 @@
 import { Optional } from 'typescript-optional';
+import { CollectorSpecifier } from '../vaccine/types';
 /**
  * An abstract source map type.
  */
@@ -46,14 +47,13 @@ export declare class TaskElement {
     isInPlace(): boolean;
 }
 /**
- * Specifies the collector that is supposed to
- * receive the coverage information.
+ * Given a command-line URL and an optional relative pattern, create a specifier for how the vaccine can
+ * locate the connector.
+ *
+ * If a relative pattern is given, it is preferred, since the command-line interface always provides a URL
+ * (the default URL in case the user didn't explicitly specify one).
  */
-export declare class CollectorSpecifier {
-    /** The URL specifying the address the collector is reachable at. */
-    readonly url: string;
-    constructor(specifier: string);
-}
+export declare function createCollectorSpecifier(commandLineUrl: string, relativePattern?: string): CollectorSpecifier;
 /**
  * Patterns that define which parts of a given bundle to instrument or not.
  *

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;AAK/C;;GAEG;AACH,8BAAsB,kBAAkB;CAAG;AAE3C,KAAK,UAAU,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAE/D;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG;IACpC,IAAI,EAAE,KAAK,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,UAAU,GAAG,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;AAE/D;;;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;AAWD;;;;;;GAMG;AACH,qBAAa,mBAAmB;IAC/B,mGAAmG;IACnG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAE/C;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAE/C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAc;IAE7C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAc;IAE7C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAc;gBAE7C,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS;IAQxE;;;;;;;;;;;OAWG;IACI,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IA4B9C;;;OAGG;IACI,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO;IAIpD;;OAEG;IACI,qBAAqB,IAAI;QAC/B,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,cAAc,EAAE,MAAM,EAAE,CAAC;QACzB,cAAc,EAAE,MAAM,EAAE,CAAC;QACzB,0BAA0B,EAAE,MAAM,EAAE,CAAA;KAAE;IAUvC;;OAEG;IACI,iBAAiB,IAAI,OAAO;CAGnC;AAED;;GAEG;AACH,qBAAa,kBAAkB;IAC9B;;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;AA2DD;;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;IAEpD;;OAEG;IACH,SAAgB,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;gBAG1D,SAAS,EAAE,kBAAkB,EAC7B,QAAQ,EAAE,WAAW,EAAE,EACvB,mBAAmB,EAAE,kBAAkB,EACvC,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,sBAAsB,EAAE,MAAM,GAAG,SAAS;IAU3C;;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;IAEjC,mEAAmE;IACnE,SAAgB,IAAI,CAAC,EAAE,mBAAmB,CAAC;gBAG1C,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,EAChB,IAAI,CAAC,EAAE,mBAAmB;IAmB3B;;;;OAIG;IACI,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU;IAanD;;OAEG;WACW,OAAO,CAAC,IAAI,CAAC,EAAE,mBAAmB,GAAG,UAAU;IAI7D;;;;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;AAG/C,OAAO,EAAE,kBAAkB,EAAqD,MAAM,kBAAkB,CAAA;AAGxG;;GAEG;AACH,8BAAsB,kBAAkB;CAAI;AAE5C,KAAK,UAAU,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAE/D;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG;IACpC,IAAI,EAAE,KAAK,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,UAAU,GAAG,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;AAE/D;;;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;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAM7G;AAgCD;;;;;;GAMG;AACH,qBAAa,mBAAmB;IAC/B,mGAAmG;IACnG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAE/C;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAE/C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAc;IAE7C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAc;IAE7C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAc;gBAE7C,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS;IAQxE;;;;;;;;;;;OAWG;IACI,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IA4B9C;;;OAGG;IACI,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO;IAIpD;;OAEG;IACI,qBAAqB,IAAI;QAC/B,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,cAAc,EAAE,MAAM,EAAE,CAAC;QACzB,cAAc,EAAE,MAAM,EAAE,CAAC;QACzB,0BAA0B,EAAE,MAAM,EAAE,CAAA;KACpC;IAUD;;OAEG;IACI,iBAAiB,IAAI,OAAO;CAGnC;AAED;;GAEG;AACH,qBAAa,kBAAkB;IAC9B;;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;AA2DD;;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;IAEpD;;OAEG;IACH,SAAgB,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;gBAG1D,SAAS,EAAE,kBAAkB,EAC7B,QAAQ,EAAE,WAAW,EAAE,EACvB,mBAAmB,EAAE,kBAAkB,EACvC,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,sBAAsB,EAAE,MAAM,GAAG,SAAS;IAU3C;;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;IAEjC,mEAAmE;IACnE,SAAgB,IAAI,CAAC,EAAE,mBAAmB,CAAC;gBAG1C,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,EAChB,IAAI,CAAC,EAAE,mBAAmB;IAmB3B;;;;OAIG;IACI,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU;IAanD;;OAEG;WACW,OAAO,CAAC,IAAI,CAAC,EAAE,mBAAmB,GAAG,UAAU;IAI7D;;;;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,10 +3,11 @@ 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.FileExcludePattern = exports.OriginSourcePattern = exports.CollectorSpecifier = exports.TaskElement = exports.SourceMapReference = void 0;
+exports.SourceMapFileReference = exports.TaskResult = exports.InstrumentationTask = exports.FileExcludePattern = exports.OriginSourcePattern = exports.createCollectorSpecifier = 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"));
+const RelativeCollectorPatternParser_1 = require("./RelativeCollectorPatternParser");
 /**
  * An abstract source map type.
  */
@@ -34,24 +35,39 @@ class TaskElement {
 }
 exports.TaskElement = TaskElement;
 /**
- * Specifies the collector that is supposed to
- * receive the coverage information.
+ * Given a command-line URL and an optional relative pattern, create a specifier for how the vaccine can
+ * locate the connector.
+ *
+ * If a relative pattern is given, it is preferred, since the command-line interface always provides a URL
+ * (the default URL in case the user didn't explicitly specify one).
  */
-class CollectorSpecifier {
-    constructor(specifier) {
-        if (specifier.indexOf('://') > 0) {
-            // A trailing slash will be removed
-            this.url = specifier.replace(/\/$/, '');
-        }
-        else {
-            commons_1.Contract.requireStringPattern(specifier, '.+:[0-9]+', 'Invalid collector pattern used!');
-            const host = specifier.split(':')[0];
-            const port = Number.parseInt(specifier.split(':')[1]);
-            this.url = `ws://${host}:${port}`;
-        }
+function createCollectorSpecifier(commandLineUrl, relativePattern) {
+    if (relativePattern !== undefined) {
+        return RelativeCollectorPatternParser_1.RelativeCollectorPatternParser.parse(relativePattern);
+    }
+    return parseCommandLineUrl(commandLineUrl);
+}
+exports.createCollectorSpecifier = createCollectorSpecifier;
+/**
+ * Parses, validates and normalizes the given URL that the user provided on the command-line.
+ */
+function parseCommandLineUrl(commandLineUrl) {
+    let url;
+    if (commandLineUrl.indexOf('://') > 0) {
+        // A trailing slash will be removed
+        url = commandLineUrl.replace(/\/$/, '');
+    }
+    else {
+        commons_1.Contract.requireStringPattern(commandLineUrl, '.+:[0-9]+', 'Invalid collector pattern used!');
+        const host = commandLineUrl.split(':')[0];
+        const port = Number.parseInt(commandLineUrl.split(':')[1]);
+        url = `ws://${host}:${port}`;
     }
+    return {
+        type: "url",
+        url,
+    };
 }
-exports.CollectorSpecifier = CollectorSpecifier;
 /**
  * Configuration used to match paths with `micromatch`.
  */

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

@@ -7,6 +7,7 @@ export type ConfigurationParameters = {
     to?: string;
     source_map?: string;
     collector: string;
+    collector_pattern?: string;
     include_origin?: string[];
     exclude_origin?: string[];
     exclude_bundle?: string[];
@@ -37,8 +38,8 @@ export declare class TaskBuilder {
      */
     private dumpMatchedOriginsFile;
     constructor();
-    /** Set the collector by extracting the information from a given string */
-    setCollectorFromString(collectorSpecification: string): this;
+    /** Set the collector specification based on the command-line arguments. */
+    setCollectorFromCommandLine(commandLineUrl: string, relativePattern?: string): this;
     /** Set the origin include pattern. If multiple patterns are present, concatenates them via the OR operator.  */
     setOriginSourceIncludePatterns(patterns: string[] | undefined): this;
     /** Set the origin exclude pattern(s). If multiple patterns are present, concatenates them via the OR operator. */

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;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"}
+{"version":3,"file":"TaskBuilder.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/TaskBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,mBAAmB,EAGnB,kBAAkB,EAGlB,MAAM,QAAQ,CAAC;AAOhB,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;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,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,2EAA2E;IAC3E,2BAA2B,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI;IAMnF,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

@@ -52,10 +52,10 @@ class TaskBuilder {
         this.elements = [];
         this.collector = null;
     }
-    /** Set the collector by extracting the information from a given string */
-    setCollectorFromString(collectorSpecification) {
-        commons_1.Contract.requireNonEmpty(collectorSpecification);
-        this.collector = new Task_1.CollectorSpecifier(collectorSpecification);
+    /** Set the collector specification based on the command-line arguments. */
+    setCollectorFromCommandLine(commandLineUrl, relativePattern) {
+        commons_1.Contract.requireNonEmpty(commandLineUrl, "The collector URL must not be empty");
+        this.collector = (0, Task_1.createCollectorSpecifier)(commandLineUrl, relativePattern);
         return this;
     }
     /** Set the origin include pattern. If multiple patterns are present, concatenates them via the OR operator.  */
@@ -91,7 +91,7 @@ class TaskBuilder {
         const sourceMap = config.source_map;
         this.dumpOriginsFile = config.dump_origins_to;
         this.dumpMatchedOriginsFile = config.dump_origin_matches_to;
-        this.setCollectorFromString(config.collector);
+        this.setCollectorFromCommandLine(config.collector, config.collector_pattern);
         this.setOriginSourceIncludePatterns(config.include_origin);
         this.setOriginSourceExcludePatterns(config.exclude_origin);
         this.setBundleExcludePatterns(config.exclude_bundle);

package/dist/src/main.js

@@ -18,7 +18,7 @@ App_1.App.run()
         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\tExclude patterns: [${stats.excludePatterns}]`);
         console.log(`\t\tInclude matches: ${stats.includeMatches.length}`);
         console.log(`\t\tExclude matches: ${stats.excludeMatches.length}`);
         console.log(`\t\tNeither matches: ${stats.neitherExcludedNorIncluded.length}`);

package/dist/src/vaccine/types.d.ts

@@ -0,0 +1,36 @@
+/**
+ * The collector URL is known at build time.
+ */
+export interface CollectorSpecifierUrl {
+    /** Type of collector specifier. */
+    type: "url";
+    /** The URL under which the collector can be reached at runtime. */
+    url: string;
+}
+/** Describes a one-time search and replace operation on a string. */
+export interface SearchReplace {
+    /** Literal string to search for. */
+    search: string;
+    /** Literal replacement string. */
+    replace: string;
+}
+/**
+ * The collector can be reached by replacing a term in location.host and optionally changing the port.
+ */
+export interface CollectorSpecifierRelative {
+    /** Type of collector specifier. */
+    type: "relative";
+    /** Literal replacement string. */
+    hostReplace?: SearchReplace;
+    /** Optional port. If no port is given, uses the protocol's default port. */
+    port?: number | "keep";
+    /** Optional URL scheme to use. If no scheme is given, uses ws. */
+    scheme?: string;
+    /** Optional path. If no path is given, uses only the hostname. */
+    path?: string;
+}
+/**
+ * Specifies how the vaccine can reach the collector.
+ */
+export type CollectorSpecifier = CollectorSpecifierUrl | CollectorSpecifierRelative;
+//# sourceMappingURL=types.d.ts.map

package/dist/src/vaccine/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/vaccine/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACrC,mCAAmC;IACnC,IAAI,EAAE,KAAK,CAAC;IACZ,mEAAmE;IACnE,GAAG,EAAE,MAAM,CAAC;CACZ;AAED,qEAAqE;AACrE,MAAM,WAAW,aAAa;IAC7B,oCAAoC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,kCAAkC;IAClC,OAAO,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IAC1C,mCAAmC;IACnC,IAAI,EAAE,UAAU,CAAC;IACjB,kCAAkC;IAClC,WAAW,CAAC,EAAE,aAAa,CAAC;IAC5B,4EAA4E;IAC5E,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,kEAAkE;IAClE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kEAAkE;IAClE,IAAI,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,qBAAqB,GAAG,0BAA0B,CAAA"}

package/dist/src/vaccine/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/vaccine.js

@@ -1 +1 @@
-"use strict";(()=>{function c(t){let n=new Blob([t],{type:"text/javascript"}),e=URL.createObjectURL(n),o=new Worker(e);return URL.revokeObjectURL(e),o}function l(){return c('var r=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(){console.log("Connection to Coverage Collector established."),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),this.cachedMessages.length%500===0&&console.log(`More than ${this.cachedMessages.length} messages are queued to be sent.`))}};var i=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)}};var d=20,l=1e3,u="c",a=class{constructor(e){this.socket=e,this.cachedCoveredRanges=new Map,this.numberOfCachedPositions=0,this.flushCountdown=new i(l,()=>this.flush())}addRanges(e,t){let s=this.cachedCoveredRanges.get(e);s||(s={lines:[]},this.cachedCoveredRanges.set(e,s)),t.lines.forEach(n=>s.lines.push(n)),this.numberOfCachedPositions+=1,this.flushCountdown.restartCountdown(),this.numberOfCachedPositions>=d&&this.flush()}arrayToLineCov(e){if(e.length%2!==0)throw new Error("Unexpected length of input data.");let t=[];for(let s=0;s<e.length;s=s+2){let n=e[s],c=e[s+1];n===c?t.push(`${n}`):t.push(`${n}-${c}`)}return t.join(";")}flush(){if(this.numberOfCachedPositions===0)return;this.flushCountdown.stopCountdown();let e=[];this.cachedCoveredRanges.forEach((t,s)=>{e.push(`@${s}`),e.push(this.arrayToLineCov(t.lines))}),this.socket.send(`${u} ${e.join(";")}`),this.cachedCoveredRanges.clear(),this.numberOfCachedPositions=0}};console.log("Starting coverage forwarding worker.");var g=new r("$REPORT_TO_URL/socket"),h=new a(g);onmessage=o=>{if(Array.isArray(o.data)){let[e,t]=o.data;h.addRanges(e,t)}else o.data==="unload"?h.flush():console.error(`No handler for message: ${o.data}`)};\n')}function u(){return h()}function h(){return window}function d(t,n){let e=u()[t];return e||(e=n,u()[t]=e),e}function f(t,n){let e=new Map;function o(r){let s=e.get(r);return s||(s={lines:[]},e.set(r,s),s)}function i(r,s,C){o(r).lines.push(s,C)}function a(){n(e),e.clear()}return setInterval(()=>a(),t),{putLineCoverage:i,flush:a}}var g=d("__TS_AGENT",{});function p(){return g._$BcWorker}function w(t){return g._$BcWorker=t,t}var v=f(250,t=>{for(let n of t.entries())p().postMessage(n)});u()._$l=v.putLineCoverage;if(!p()){let t=w(new l);(function(){let e=()=>{v.flush(),t.postMessage("unload")},o=function(a,r){r&&r.addEventListener(a,e,{capture:!0})},i=h();o("blur",i),o("unload",i),o("visibilitychange",i),o("beforeunload",i)})()}})();
+"use strict";(()=>{function u(t){let o=new Blob([t],{type:"text/javascript"}),e=URL.createObjectURL(o),r=new Worker(e);return URL.revokeObjectURL(e),r}function d(){return u('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(){console.log("Connection to Coverage Collector established."),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),this.cachedMessages.length%500===0&&console.log(`More than ${this.cachedMessages.length} messages are queued to be sent.`))}};var c=class{constructor(e,o){this.milliseconds=e;this.onCountedToZero=o;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)}};var m=20,C=1e3,v="c",a=class{constructor(e){this.socket=e,this.cachedCoveredRanges=new Map,this.numberOfCachedPositions=0,this.flushCountdown=new c(C,()=>this.flush())}addLines(e,o){let t=this.cachedCoveredRanges.get(e);t||(t=new Set,this.cachedCoveredRanges.set(e,t)),o.forEach(r=>t.add(r)),this.numberOfCachedPositions+=1,this.flushCountdown.restartCountdown(),this.numberOfCachedPositions>=m&&this.flush()}arrayToLineCov(e){let o=[];for(let t of e)o.push(`${t}`);return o.join(";")}flush(){if(this.numberOfCachedPositions===0)return;this.flushCountdown.stopCountdown();let e=[];this.cachedCoveredRanges.forEach((o,t)=>{e.push(`@${t}`),e.push(this.arrayToLineCov(o))}),this.socket.send(`${v} ${e.join(";")}`),this.cachedCoveredRanges.clear(),this.numberOfCachedPositions=0}};var l=class s{static resolve(e){switch(e.type){case"url":return e.url;case"relative":return s.resolveRelative(location.host,location.port,e)}}static resolveRelative(e,o,t){var u;let r=e;t.hostReplace&&(r=e.replace(t.hostReplace.search,t.hostReplace.replace));let g=(u=t.scheme)!=null?u:"ws",n;t.port===void 0?n="":t.port==="keep"?n=`:${o}`:n=`:${t.port}`;let h="";t.path&&(h=`/${t.path}`);let d=`${g}://${r}${n}${h}`;return console.debug(`Resolved collector URL ${d} from ${e}:${o}`),d}};console.log("Starting coverage forwarding worker.");var f=new i(`${l.resolve($COLLECTOR_SPECIFIER)}/socket`),p=new a(f);onmessage=s=>{if(Array.isArray(s.data)){let[e,o]=s.data;p.addLines(e,o)}else s.data==="unload"?p.flush():console.error(`No handler for message: ${s.data}`)};\n')}function l(){return f()}function f(){return window}function g(t,o){let e=l()[t];return e||(e=o,l()[t]=e),e}function p(t,o){let e=new Map;function r(s){let n=e.get(s);return n||(n={lines:new Set},e.set(s,n),n)}function i(s,n,b=n){let h=r(s).lines;for(let c=n;c<=b;c++)h.add(c);h.size>255&&a()}function a(){o(e),e.clear()}return setInterval(()=>a(),t),{putLineCoverage:i,flush:a}}var v=g("__TS_AGENT",{});function C(){return v._$BcWorker}function m(t){return v._$BcWorker=t,t}var w=p(250,t=>{for(let o of t.entries())C().postMessage([o[0],Array.from(o[1].lines)])});l()._$l=w.putLineCoverage;if(!C()){let t=m(new d);(function(){let e=()=>{w.flush(),t.postMessage("unload")},r=function(a,s){s&&s.addEventListener(a,e,{capture:!0})},i=f();r("blur",i),r("unload",i),r("visibilitychange",i),r("beforeunload",i)})()}})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamscale/javascript-instrumenter",
-  "version": "0.1.0-beta.4",
+  "version": "0.1.0-beta.6",
   "description": "JavaScript coverage instrumenter with coverage forwarding to a collector process",
   "main": "dist/src/main.js",
   "bin": "dist/src/main.js",
@@ -15,9 +15,9 @@
     "dist/**/*"
   ],
   "devDependencies": {
-    "@babel/core": "^7.23.7",
+    "@babel/core": "^7.23.9",
     "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-    "@babel/preset-env": "^7.23.8",
+    "@babel/preset-env": "^7.23.9",
     "@types/argparse": "^2.0.14",
     "@types/async": "^3.2.24",
     "@types/babel__generator": "^7.6.8",
@@ -26,25 +26,25 @@
     "@types/convert-source-map": "^2.0.3",
     "@types/glob": "^8.1.0",
     "@types/istanbul-lib-instrument": "^1.7.7",
-    "@types/jest": "^29.5.11",
-    "@types/node": "^20.11.0",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.11.19",
     "@types/ws": "^8.5.10",
     "babel-jest": "^29.7.0",
-    "esbuild": "^0.19.11",
+    "esbuild": "^0.20.1",
     "esbuild-plugin-inline-worker": "^0.1.1",
     "jest": "^29.7.0",
     "rimraf": "^5.0.5",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
     "tslib": "^2.6.2",
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@cqse/commons": "0.1.0-beta.2",
+    "@cqse/commons": "0.1.0-beta.5",
     "@babel/generator": "^7.23.6",
-    "@babel/parser": "^7.23.6",
-    "@babel/traverse": "^7.23.7",
-    "@babel/types": "^7.23.6",
+    "@babel/parser": "^7.23.9",
+    "@babel/traverse": "^7.23.9",
+    "@babel/types": "^7.23.9",
     "@types/micromatch": "^4.0.6",
     "argparse": "^2.0.1",
     "async": "^3.2.5",
@@ -58,7 +58,7 @@
     "typescript-optional": "^2.0.1",
     "unload": "^2.4.1",
     "web-worker": "^1.3.0",
-    "@teamscale/lib-instrument": "0.1.0-beta.4"
+    "@teamscale/lib-instrument": "0.1.0-beta.6"
   },
   "publishConfig": {
     "access": "public"