@teamscale/javascript-instrumenter 0.0.1-beta.9 → 0.1.0-beta.2

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

@@ -4,6 +4,30 @@ import { Optional } from 'typescript-optional';
  */
 export declare abstract class SourceMapReference {
 }
+type BaseBundle = {
+    content: string;
+    codeArguments: string[];
+};
+/**
+ * A standard JavaScript bundle. Produced, for example, with bundlers
+ * like Webpack or Vite.
+ */
+export type StandardBundle = BaseBundle & {
+    type: 'javascript';
+};
+/**
+ * A Google Web-Toolkit Js bundle file.
+ */
+export type GwtBundle = BaseBundle & {
+    type: 'gwt';
+    functionName: string;
+    fragmentId: string;
+    codeAsArrayArgument: boolean;
+};
+/**
+ * A bundle to be handled by the instrumenter.
+ */
+export type Bundle = BaseBundle & (StandardBundle | GwtBundle);
 /**
  * One element of an instrumentation task.
  * It corresponds to instrumenting a single file.
@@ -26,11 +50,9 @@ export declare class TaskElement {
  * receive the coverage information.
  */
 export declare class CollectorSpecifier {
-    /** Hostname the collector is running on */
-    readonly host: string;
-    /** Port on the host the collector listens to */
-    readonly port: number;
-    constructor(collector: string);
+    /** The URL specifying the address the collector is reachable at. */
+    readonly url: string;
+    constructor(specifier: string);
 }
 /**
  * Patterns that define which parts of a given bundle to instrument or not.
@@ -47,17 +69,40 @@ export declare class OriginSourcePattern {
      * An exclude is stronger than an include.
      */
     private readonly exclude;
-    constructor(include: string | undefined, exclude: string | undefined);
+    constructor(include: string[] | undefined, exclude: string[] | undefined);
     /**
-     * Does the given pattern require to include the given set of files?
+     * Does the given pattern require to include the given file?
      *
-     * @param originFiles - The file set to decide for include or exclude.
+     * For example, a JavaScript bundle is compiled from several (origin) source files.
+     * If one of the files in the bundle is needed, then the full bundle is needed, that is,
+     * this function is required to return `true`.
      *
-     * @returns `true` if (1) all of the given files are supposed to be excluded,
-     *   or (2) if one of the files is supposed to be included.
+     * @param originFile - The file to decide for include or exclude.
+     *
+     * @returns `false` if (1) the given file is supposed to be excluded,
+     *   or (2) `true` if the given file is supposed to be included.
+     */
+    isIncluded(originFile: string): boolean;
+    /**
+     * Variant of `isIncluded` working on a list of files to check.
+     * (Primarily, used for testing.)
      */
     isAnyIncluded(originFiles: string[]): boolean;
 }
+/**
+ * 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.
  */
@@ -75,7 +120,16 @@ export declare class InstrumentationTask {
      * based on the original file names the code was transpiled from.
      */
     readonly originSourcePattern: OriginSourcePattern;
-    constructor(collector: CollectorSpecifier, elements: TaskElement[], 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[], excludeFilesPattern: FileExcludePattern, originSourcePattern: OriginSourcePattern, dumpOriginsFile: string | undefined);
     /**
      * @returns the elements of the task.
      */
@@ -87,6 +141,8 @@ export declare class InstrumentationTask {
 export declare class TaskResult {
     /** Number of task elements that were performed (instrumented) */
     readonly translated: number;
+    /** Number of task elements that were excluded because of corresponding include/exclude patterns. */
+    readonly excluded: number;
     /** Number of instrumentations that were taken from a cache */
     readonly translatedFromCache: number;
     /** Number of skips due to a present instrumentation */
@@ -97,7 +153,7 @@ export declare class TaskResult {
     readonly failed: number;
     /** Number of warnings that were produced during the instrumentation process */
     readonly warnings: number;
-    constructor(translated: number, translatedFromCache: number, alreadyInstrumented: number, unsupported: number, failed: number, warnings: number);
+    constructor(translated: number, excluded: number, translatedFromCache: number, alreadyInstrumented: number, unsupported: number, failed: number, warnings: number);
     /**
      * Returns the sum of the present task results and the given one.
      *
@@ -129,4 +185,5 @@ export declare class SourceMapFileReference extends SourceMapReference {
     readonly sourceMapFilePath: string;
     constructor(sourceMapFilePath: string);
 }
+export {};
 //# sourceMappingURL=Task.d.ts.map

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

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

package/dist/src/instrumenter/Task.js

@@ -1,28 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SourceMapFileReference = exports.TaskResult = exports.InstrumentationTask = exports.OriginSourcePattern = exports.CollectorSpecifier = exports.TaskElement = exports.SourceMapReference = void 0;
+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 matching = __importStar(require("micromatch"));
+const micromatch_1 = __importDefault(require("micromatch"));
 /**
  * An abstract source map type.
  */
@@ -54,10 +38,17 @@ exports.TaskElement = TaskElement;
  * receive the coverage information.
  */
 class CollectorSpecifier {
-    constructor(collector) {
-        commons_1.Contract.requireStringPattern(collector, '.+:[0-9]+', 'Invalid collector pattern used!');
-        this.host = collector.split(':')[0];
-        this.port = Number.parseInt(collector.split(':')[1]);
+    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}`;
+        }
     }
 }
 exports.CollectorSpecifier = CollectorSpecifier;
@@ -70,41 +61,107 @@ exports.CollectorSpecifier = CollectorSpecifier;
  */
 class OriginSourcePattern {
     constructor(include, exclude) {
-        this.include = include;
-        this.exclude = exclude;
+        this.include = normalizePatterns(include);
+        this.exclude = normalizePatterns(exclude);
     }
     /**
-     * Does the given pattern require to include the given set of files?
+     * Does the given pattern require to include the given file?
      *
-     * @param originFiles - The file set to decide for include or exclude.
+     * For example, a JavaScript bundle is compiled from several (origin) source files.
+     * If one of the files in the bundle is needed, then the full bundle is needed, that is,
+     * this function is required to return `true`.
      *
-     * @returns `true` if (1) all of the given files are supposed to be excluded,
-     *   or (2) if one of the files is supposed to be included.
+     * @param originFile - The file to decide for include or exclude.
+     *
+     * @returns `false` if (1) the given file is supposed to be excluded,
+     *   or (2) `true` if the given file is supposed to be included.
      */
-    isAnyIncluded(originFiles) {
-        var _a;
+    isIncluded(originFile) {
+        if (originFile.length === 0) {
+            return true;
+        }
+        const normalizedOriginFile = normalizePath(originFile);
         if (this.exclude) {
-            const matchedToExclude = matching.match(originFiles, this.exclude);
-            if (originFiles.length === matchedToExclude.length) {
+            const matchedToExclude = (0, micromatch_1.default)([normalizedOriginFile], this.exclude);
+            if (matchedToExclude.length === 1) {
                 return false;
             }
         }
         if (this.include) {
-            const matchedToInclude = matching.match(originFiles, (_a = this.include) !== null && _a !== void 0 ? _a : '**');
-            return matchedToInclude.length > 0;
+            return micromatch_1.default.some([normalizedOriginFile], this.include || ['**']);
         }
         return true;
     }
+    /**
+     * Variant of `isIncluded` working on a list of files to check.
+     * (Primarily, used for testing.)
+     */
+    isAnyIncluded(originFiles) {
+        return originFiles.find(value => this.isIncluded(value)) !== undefined;
+    }
 }
 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 : [];
+    }
+    /**
+     * Return `true` if the given `filePath` is matched by any of the patterns in `exclude`.
+     */
+    isExcluded(filePath) {
+        return micromatch_1.default.isMatch(normalizePath(filePath), this.exclude);
+    }
+}
+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;
+    }
+    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.replace(/\\/g, '/'));
+}
+function removeTrailingCurrentWorkingDir(removeFrom) {
+    return removePrefix('webpack:///', removePrefix('./', removeFrom));
+}
+function removePrefix(prefix, removeFrom) {
+    if (removeFrom.startsWith(prefix)) {
+        return removeFrom.substring(prefix.length);
+    }
+    return removeFrom;
+}
 /**
  * The actual instrumentation task.
  */
 class InstrumentationTask {
-    constructor(collector, elements, originSourcePattern) {
+    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;
     }
     /**
      * @returns the elements of the task.
@@ -120,14 +177,16 @@ exports.InstrumentationTask = InstrumentationTask;
  * A summary of executing the instrumentation task.
  */
 class TaskResult {
-    constructor(translated, translatedFromCache, alreadyInstrumented, unsupported, failed, warnings) {
+    constructor(translated, excluded, translatedFromCache, alreadyInstrumented, unsupported, failed, warnings) {
         commons_1.Contract.require(translated > -1);
+        commons_1.Contract.require(excluded > -1);
         commons_1.Contract.require(translatedFromCache > -1);
         commons_1.Contract.require(alreadyInstrumented > -1);
         commons_1.Contract.require(unsupported > -1);
         commons_1.Contract.require(failed > -1);
         commons_1.Contract.require(warnings > -1);
         this.translated = translated;
+        this.excluded = excluded;
         this.translatedFromCache = translatedFromCache;
         this.alreadyInstrumented = alreadyInstrumented;
         this.unsupported = unsupported;
@@ -140,13 +199,13 @@ class TaskResult {
      * @param incBy - The task result to add (as delta).
      */
     withIncrement(incBy) {
-        return new TaskResult(this.translated + incBy.translated, this.translatedFromCache + incBy.translatedFromCache, this.alreadyInstrumented + incBy.alreadyInstrumented, this.unsupported + incBy.unsupported, this.failed + incBy.failed, this.warnings + incBy.warnings);
+        return new TaskResult(this.translated + incBy.translated, this.excluded + incBy.excluded, this.translatedFromCache + incBy.translatedFromCache, this.alreadyInstrumented + incBy.alreadyInstrumented, this.unsupported + incBy.unsupported, this.failed + incBy.failed, this.warnings + incBy.warnings);
     }
     /**
      * @returns the neutral task element (adding it with {@code withIncrement} does not change the result).
      */
     static neutral() {
-        return new TaskResult(0, 0, 0, 0, 0, 0);
+        return new TaskResult(0, 0, 0, 0, 0, 0, 0);
     }
     /**
      * @returns a task result signaling one error.
@@ -155,7 +214,7 @@ class TaskResult {
      */
     static error(e) {
         console.error(e);
-        return new TaskResult(0, 0, 0, 0, 1, 0);
+        return new TaskResult(0, 0, 0, 0, 0, 1, 0);
     }
     /**
      * @returns a task result signaling one warning.
@@ -164,7 +223,7 @@ class TaskResult {
      */
     static warning(msg) {
         console.warn(msg);
-        return new TaskResult(0, 0, 0, 0, 0, 1);
+        return new TaskResult(0, 0, 0, 0, 0, 0, 1);
     }
 }
 exports.TaskResult = TaskResult;

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

@@ -1,14 +1,16 @@
 import { InstrumentationTask, SourceMapReference } from './Task';
 /** The parameters the instrumenter can be configured by */
-export declare type ConfigurationParameters = {
+export type ConfigurationParameters = {
     inputs?: string[];
     in_place?: boolean;
     debug?: boolean;
     to?: string;
     source_map?: string;
     collector: string;
-    include_origin?: string;
-    exclude_origin?: string;
+    include_origin?: string[];
+    exclude_origin?: string[];
+    exclude_bundle?: string[];
+    dump_origins_to?: string;
 };
 /**
  * A builder for an instrumentation task.
@@ -18,17 +20,23 @@ export declare class TaskBuilder {
     private readonly elements;
     /** The collector to send the coverage to. */
     private collector;
-    /** An include pattern. */
-    private originSourceIncludePattern;
-    /** An exclude pattern. */
-    private originSourceExcludePattern;
+    /** Origin include patterns. */
+    private originSourceIncludePatterns;
+    /** 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 */
-    setOriginSourceIncludePattern(pattern: string | undefined): this;
-    /** Set the exclude patter */
-    setOriginSourceExcludePattern(pattern: string | undefined): 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. */
+    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,CAAC;IAExB,cAAc,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAkBF;;GAEG;AACH,qBAAa,WAAW;IACvB,gDAAgD;IAChD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IAEzC,6CAA6C;IAC7C,OAAO,CAAC,SAAS,CAA4B;IAE7C,0BAA0B;IAC1B,OAAO,CAAC,0BAA0B,CAAqB;IAEvD,0BAA0B;IAC1B,OAAO,CAAC,0BAA0B,CAAqB;;IAOvD,0EAA0E;IAC1E,sBAAsB,CAAC,sBAAsB,EAAE,MAAM,GAAG,IAAI;IAM5D,8BAA8B;IAC9B,6BAA6B,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAKhE,6BAA6B;IAC7B,6BAA6B,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAKhE,yBAAyB;IACzB,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAKlG;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,uBAAuB,GAAG,IAAI;IAkCpD;;;;;;;OAOG;IACH,OAAO,CAAC,4CAA4C;IA8BpD;;;;;;OAMG;IACH,OAAO,CAAC,0BAA0B;IASlC;;OAEG;IACI,KAAK,IAAI,mBAAmB;CAInC"}
+{"version":3,"file":"TaskBuilder.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/TaskBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,mBAAmB,EAGnB,kBAAkB,EAElB,MAAM,QAAQ,CAAC;AAMhB,2DAA2D;AAC3D,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"}

package/dist/src/instrumenter/TaskBuilder.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -54,14 +58,19 @@ class TaskBuilder {
         this.collector = new Task_1.CollectorSpecifier(collectorSpecification);
         return this;
     }
-    /** Set the include pattern */
-    setOriginSourceIncludePattern(pattern) {
-        this.originSourceIncludePattern = pattern;
+    /** 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 origin exclude pattern(s). If multiple patterns are present, concatenates them via the OR operator. */
+    setOriginSourceExcludePatterns(patterns) {
+        this.originSourceExcludePatterns = patterns;
         return this;
     }
-    /** Set the exclude patter */
-    setOriginSourceExcludePattern(pattern) {
-        this.originSourceExcludePattern = pattern;
+    /** 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 */
@@ -80,12 +89,14 @@ class TaskBuilder {
         const inPlace = (_b = config.in_place) !== null && _b !== void 0 ? _b : true;
         const target = config.to;
         const sourceMap = config.source_map;
+        this.dumpOriginsFile = config.dump_origins_to;
         this.setCollectorFromString(config.collector);
-        this.setOriginSourceIncludePattern(config.include_origin);
-        this.setOriginSourceExcludePattern(config.exclude_origin);
+        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) {
@@ -128,7 +139,11 @@ class TaskBuilder {
                     inputFiles.forEach(f => this.addElement(f, path.join(target, path.basename(f)), sourceMapInfo));
                 }
                 else {
-                    inputFiles.forEach(f => this.addElement(f, path.join(target, path.relative(input, path.basename(f))), sourceMapInfo));
+                    inputFiles.forEach(f => {
+                        const pathRelativeToInputDir = path.relative(input, f);
+                        const targetFileName = path.join(target, pathRelativeToInputDir);
+                        this.addElement(f, targetFileName, sourceMapInfo);
+                    });
                 }
             }
             else {
@@ -155,8 +170,7 @@ class TaskBuilder {
      * Build the instrumentation task.
      */
     build() {
-        const pattern = new Task_1.OriginSourcePattern(this.originSourceIncludePattern, this.originSourceExcludePattern);
-        return new Task_1.InstrumentationTask(commons_1.Contract.requireDefined(this.collector), this.elements, pattern);
+        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;
@@ -167,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/dist/src/instrumenter/WebToolkit.d.ts

@@ -0,0 +1,40 @@
+import { Bundle, GwtBundle } from './Task';
+import { RawSourceMap } from 'source-map';
+/**
+ * Information on a GWT function call, typically with code to be evaluated as arguments.
+ */
+export type GwtCallInfos = {
+    codeArguments: string[];
+    functionName: string;
+    codeAsArrayArgument: boolean;
+};
+/**
+ * There are different places where a 'symbolMaps' folder can be:
+ * (1) within the `WEB-INF` folder (`WEB-INF/deploy/<module-name>/symbolMaps`)
+ * or (2) it can be a sibling of the parent `deferredjs` folder.
+ *
+ * @param taskFile - Path to the JS bundle file to start searching from.
+ */
+export declare function determineSymbolMapsDir(taskFile: string): string[];
+/**
+ * Extract the GWT function calls from the GWT bundle. These function calls
+ * do have the actual application code as arguments.
+ *
+ * Examples of `bundleContent` (without the double quotes):
+ * 		"showcase.onScriptDownloaded(["var $wnd =  .....  __gwtModuleFunction.__moduleStartupDone($gwt.permProps);\n//# sourceURL=showcase-0.js\n"]);"
+ * 	    "$wnd.showcase.runAsyncCallback3("function bc(a){Wb((Ze(),Xe),a) ..... nZ5b(El)(3);\n//# sourceURL=showcase-3.js\n")
+ */
+export declare function extractGwtCallInfos(bundleContent: string): GwtCallInfos | null;
+/**
+ * Load the source map for the given GWT bundle.
+ */
+export declare function loadInputSourceMapsGwt(taskFile: string, bundleFile: GwtBundle): Array<RawSourceMap | undefined>;
+/**
+ * Determine the ID of the given GWT bundle file.
+ */
+export declare function determineGwtFileUid(filename: string): string | undefined;
+/**
+ * Is the given bundle a GWT bundle?
+ */
+export declare function isGwtBundle(bundle: Bundle): bundle is GwtBundle;
+//# sourceMappingURL=WebToolkit.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"WebToolkit.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/WebToolkit.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IAAE,aAAa,EAAE,MAAM,EAAE,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,mBAAmB,EAAE,OAAO,CAAA;CAAE,CAAC;AAE3G;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAqBjE;AAkBD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CA+B9E;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,GAAG,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,CAgC/G;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAOxE;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,SAAS,CAE/D"}