@teamscale/javascript-instrumenter 0.0.1-beta.41 → 0.0.1-beta.42

package/README.md

@@ -39,30 +39,6 @@ or via `npx` by running
 npx @teamscale/javascript-instrumenter
 ```
 
-### Instrumenting a Single File
-
-Adds information for coverage tracking to a single file, either
-in-place (by replacing the previous content), or by producing a new file.
-
-An in-place transformation is only allowed if the given file is already
-the result of an automatic transformation process, that is, if a source-map is available.
-
-If the source-map is not provided as an explicit argument, either
-the file must contain source-map information, or the source-map file
-must be placed along with the source file in the same directory.
-
-```
-yarn instrumenter --inplace ./the/path/to/the/file.js
-```
-
-```
-yarn instrumenter --inplace ./the/path/to/the/file.js --source-map ./the/path/to/the/source.map
-```
-
-```
-yarn instrumenter ./the/path/to/the/file.js --to ./the/file/path/to/write/to.js
-```
-
 ## Limitations
 
 This tool inherits most of the limitations of IstanbulJs, including 

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@teamscale/javascript-instrumenter",
-    "version": "0.0.1-beta.41",
-    "description": "Istanbul-based coverage instrumenter with coverage forwarding via WebSockets",
+    "version": "0.0.1-beta.42",
+    "description": "JavaScript coverage instrumenter with coverage forwarding to a collector process",
     "main": "dist/src/main.js",
     "bin": "dist/src/main.js",
     "types": "dist/src/main.d.ts",
@@ -49,7 +49,7 @@
     "dependencies": {
         "@babel/generator": "^7.18.2",
         "@babel/parser": "^7.18.5",
-        "@babel/traverse": "^7.18.5",
+        "@babel/traverse": "^7.18.6",
         "@babel/types": "^7.18.4",
         "@cqse/commons": "^0.0.1-beta.1",
         "@types/micromatch": "^4.0.2",
@@ -62,7 +62,6 @@
         "istanbul-lib-instrument": "^5.2.0",
         "micromatch": "4.0.4",
         "mkdirp": "^1.0.4",
-        "nyc": "^15.1.0",
         "source-map": "0.7.3",
         "typescript-optional": "^2.0.1",
         "unload": "^2.2.0",

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;YAuGR,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,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"}

package/dist/src/instrumenter/Instrumenter.js

@@ -35,7 +35,7 @@ const fs = __importStar(require("fs"));
 const mkdirp = __importStar(require("mkdirp"));
 const path = __importStar(require("path"));
 const convertSourceMap = __importStar(require("convert-source-map"));
-const Cleaner_1 = require("./Cleaner");
+const Postprocessor_1 = require("./Postprocessor");
 const typescript_optional_1 = require("typescript-optional");
 const async_1 = __importDefault(require("async"));
 exports.IS_INSTRUMENTED_TOKEN = '/** $IS_JS_PROFILER_INSTRUMENTED=true **/';
@@ -116,7 +116,7 @@ class IstanbulInstrumenter {
                 const instrumentedSourcemap = instrumenter.lastSourceMap();
                 let instrumentedAndCleanedSource = await this.removeUnwantedInstrumentation(taskElement, instrumentedSource, configurationAlternative, sourcePattern, instrumentedSourcemap);
                 instrumentedAndCleanedSource = instrumentedAndCleanedSource
-                    .replace(/actualCoverage\s*=\s*coverage\[path\]/g, 'actualCoverage=makeCoverageInterceptor(coverage[path])')
+                    .replace(/actualCoverage\s*=\s*coverage\[path\]/g, 'actualCoverage=_$registerCoverageObject(coverage[path])')
                     .replace(/new Function\("return this"\)\(\)/g, "typeof window === 'object' ? window : this");
                 // The process also can result in a new source map that we will append in the result.
                 //
@@ -149,7 +149,7 @@ class IstanbulInstrumenter {
         }
         const removedInstrumentationFor = new Set();
         // Remove the unwanted instrumentation
-        const cleaned = (0, Cleaner_1.cleanSourceCode)(instrumentedSource, configurationAlternative.esModules, location => {
+        const cleaned = (0, Postprocessor_1.cleanSourceCode)(instrumentedSource, configurationAlternative.esModules, location => {
             const originalPosition = instrumentedSourceMapConsumer.originalPositionFor({
                 line: location.start.line,
                 column: location.start.column

package/dist/src/instrumenter/{Cleaner.d.ts → Postprocessor.d.ts}

@@ -6,4 +6,4 @@ import { SourceLocation } from '@babel/types';
  * An instrumentation is removed if the hook `makeCoverable` returns `false`.
  */
 export declare function cleanSourceCode(code: string, esModules: boolean, makeCoverable: (location: SourceLocation) => boolean): string;
-//# sourceMappingURL=Cleaner.d.ts.map
+//# sourceMappingURL=Postprocessor.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Postprocessor.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Postprocessor.ts"],"names":[],"mappings":"AAGA,OAAO,EAQN,cAAc,EAWd,MAAM,cAAc,CAAC;AA0ItB;;;;;GAKG;AACH,wBAAgB,eAAe,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,GAClD,MAAM,CAaR"}

package/dist/src/instrumenter/Postprocessor.js

@@ -0,0 +1,254 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanSourceCode = void 0;
+const parser_1 = require("@babel/parser");
+const generator_1 = __importDefault(require("@babel/generator"));
+const traverse_1 = __importDefault(require("@babel/traverse"));
+const types_1 = require("@babel/types");
+const commons_1 = require("@cqse/commons");
+const COVERAGE_OBJ_FUNCTION_NAME_PREFIX = 'cov_';
+function getIstanbulCoverageFunctionDeclarationName(node) {
+    var _a;
+    if (!(0, types_1.isFunctionDeclaration)(node)) {
+        return undefined;
+    }
+    const functionName = (_a = node.id) === null || _a === void 0 ? void 0 : _a.name;
+    if (functionName === null || functionName === void 0 ? void 0 : functionName.startsWith(COVERAGE_OBJ_FUNCTION_NAME_PREFIX)) {
+        return functionName;
+    }
+    else {
+        return undefined;
+    }
+}
+function createFileIdMappingHandler() {
+    const fileIdMap = new Map();
+    let fileIdSeq = 0;
+    return {
+        enterPath(path) {
+            var _a;
+            if (!(0, types_1.isVariableDeclaration)(path.node)) {
+                return;
+            }
+            const grandParentPath = (_a = path.parentPath) === null || _a === void 0 ? void 0 : _a.parentPath;
+            const coverageFunctionName = getIstanbulCoverageFunctionDeclarationName(grandParentPath === null || grandParentPath === void 0 ? void 0 : grandParentPath.node);
+            if (grandParentPath && coverageFunctionName) {
+                const declaration = path.node;
+                if (declaration.declarations.length === 1) {
+                    const declarator = declaration.declarations[0];
+                    if ((0, types_1.isIdentifier)(declarator.id) && declarator.id.name === 'hash') {
+                        // We take note of the hash that is stored within the `cov_*' function.
+                        const fileIdVarName = `_$fid${fileIdSeq++}`;
+                        const fileId = declarator.init.value;
+                        fileIdMap.set(coverageFunctionName, fileIdVarName);
+                        grandParentPath.insertBefore(newStringConstDeclarationNode(fileIdVarName, fileId));
+                    }
+                }
+            }
+        },
+        getFileHashForCoverageObjectId(coverageObjectId) {
+            return fileIdMap.get(coverageObjectId);
+        }
+    };
+}
+function createPartialInstrumentationHandler(fileIdMappingHandler) {
+    return {
+        enterPath(path, makeCoverable) {
+            if (!(0, types_1.isUpdateExpression)(path.node)) {
+                return;
+            }
+            const increment = extractCoverageIncrement(path.node);
+            if (!increment) {
+                return;
+            }
+            const wantCoverageIncrement = path.node.loc && makeCoverable(path.node.loc) && increment.type !== 'function';
+            // Add a new coverage instrument if desired
+            if (wantCoverageIncrement) {
+                const fileIdVarName = fileIdMappingHandler.getFileHashForCoverageObjectId(increment.coverageObjectId);
+                if (!fileIdVarName) {
+                    throw new commons_1.IllegalStateException(`File ID variable for coverage object with ID ${increment.coverageObjectId} not found!`);
+                }
+                const insertAsExpression = (0, types_1.isSequenceExpression)(path.parent);
+                insertNodeBefore(path, newCoverageIncrementNode(fileIdVarName, increment, insertAsExpression));
+            }
+            // Remove the existing coverage increment node
+            path.remove();
+        }
+    };
+}
+/**
+ * Remove IstanbulJs instrumentations based on the given
+ * hook `makeCoverable`.
+ *
+ * An instrumentation is removed if the hook `makeCoverable` returns `false`.
+ */
+function cleanSourceCode(code, esModules, makeCoverable) {
+    const ast = (0, parser_1.parse)(code, { sourceType: esModules ? 'module' : 'script' });
+    const fileIdMappingHandler = createFileIdMappingHandler();
+    const partialInstrumentationHandler = createPartialInstrumentationHandler(fileIdMappingHandler);
+    (0, traverse_1.default)(ast, {
+        enter(path) {
+            fileIdMappingHandler.enterPath(path);
+            partialInstrumentationHandler.enterPath(path, makeCoverable);
+        }
+    });
+    return (0, generator_1.default)(ast, {}, code).code;
+}
+exports.cleanSourceCode = cleanSourceCode;
+/**
+ * We cannot just run `path.insertBefore` to add a new element to an AST.
+ * See https://github.com/jamiebuilds/babel-handbook/blob/master/translations/en/plugin-handbook.md#toc-inserting-a-sibling-node .
+ *
+ * Special handling for some container nodes is needed.
+ */
+function insertNodeBefore(path, toInsert) {
+    if ((0, types_1.isSequenceExpression)(path.parent)) {
+        path.parentPath.unshiftContainer('expressions', [toInsert]);
+    }
+    else {
+        path.insertBefore(toInsert);
+    }
+}
+/**
+ * Creates a new string constant AST node.
+ */
+function newStringConstDeclarationNode(name, value) {
+    return {
+        type: 'VariableDeclaration',
+        kind: 'const',
+        declarations: [
+            {
+                type: 'VariableDeclarator',
+                id: {
+                    type: 'Identifier',
+                    name
+                },
+                init: {
+                    type: 'StringLiteral',
+                    value
+                }
+            }
+        ]
+    };
+}
+/**
+ * Creates a new coverage increment statement.
+ */
+function newCoverageIncrementNode(fileIdVarName, increment, asExpression) {
+    let expression;
+    if (increment.type === 'branch') {
+        expression = newBranchCoverageIncrementExpression(fileIdVarName, increment);
+    }
+    else if (increment.type === 'statement') {
+        expression = newStatementCoverageIncrementExpression(fileIdVarName, increment);
+    }
+    else {
+        throw new Error(`Unexpected coverage increment type: ${increment.type}`);
+    }
+    if (asExpression) {
+        return expression;
+    }
+    return {
+        type: 'ExpressionStatement',
+        expression
+    };
+}
+/**
+ * Create a branch coverage increment node.
+ */
+function newBranchCoverageIncrementExpression(fileIdVarName, increment) {
+    return {
+        type: 'CallExpression',
+        callee: { type: 'Identifier', name: '_$brCov' },
+        arguments: [
+            { type: 'Identifier', name: fileIdVarName },
+            { type: 'NumericLiteral', value: increment.branchId },
+            { type: 'NumericLiteral', value: increment.locationId }
+        ]
+    };
+}
+/**
+ * Create a statement coverage increment node.
+ */
+function newStatementCoverageIncrementExpression(fileIdVarName, increment) {
+    return {
+        type: 'CallExpression',
+        callee: { type: 'Identifier', name: '_$stmtCov' },
+        arguments: [
+            { type: 'Identifier', name: fileIdVarName },
+            { type: 'NumericLiteral', value: increment.statementId }
+        ]
+    };
+}
+/**
+ * Returns the call expression from `cov_2pvvu1hl8v().b[2][0]++;` if
+ * the given UpdateExpression is a branch coverage update expression.
+ */
+function extractBranchCoverageIncrement(expr) {
+    if (expr.operator === '++' &&
+        (0, types_1.isMemberExpression)(expr.argument) &&
+        (0, types_1.isMemberExpression)(expr.argument.object) &&
+        (0, types_1.isMemberExpression)(expr.argument.object.object) &&
+        (0, types_1.isCallExpression)(expr.argument.object.object.object) &&
+        isCoverageObjectCall(expr.argument.object.object.object)) {
+        const coverageObjectId = expr.argument.object.object.object.callee.name;
+        const branchId = expr.argument.object.property.value;
+        const locationId = expr.argument.property.value;
+        return { type: 'branch', branchId, locationId, coverageObjectId };
+    }
+    return null;
+}
+/**
+ * Returns the call expression from `cov_104fq7oo4i().s[0]++;` if
+ * the given UpdateExpression is a statement coverage update expression.
+ */
+function extractStatementCoverageIncrement(expr) {
+    if (expr.operator === '++' &&
+        (0, types_1.isMemberExpression)(expr.argument) &&
+        (0, types_1.isMemberExpression)(expr.argument.object) &&
+        (0, types_1.isCallExpression)(expr.argument.object.object) &&
+        (0, types_1.isIdentifier)(expr.argument.object.property) &&
+        expr.argument.object.property.name === 's' &&
+        isCoverageObjectCall(expr.argument.object.object)) {
+        const coverageObjectId = expr.argument.object.object.callee.name;
+        const statementId = expr.argument.property.value;
+        return { type: 'statement', statementId, coverageObjectId };
+    }
+    return null;
+}
+/**
+ * Returns the call expression from `cov_104fq7oo4i().f[0]++;` if
+ * the given UpdateExpression is a function coverage update expression.
+ */
+function extractFunctionCoverageIncrement(expr) {
+    if (expr.operator === '++' &&
+        (0, types_1.isMemberExpression)(expr.argument) &&
+        (0, types_1.isMemberExpression)(expr.argument.object) &&
+        (0, types_1.isCallExpression)(expr.argument.object.object) &&
+        (0, types_1.isIdentifier)(expr.argument.object.property) &&
+        expr.argument.object.property.name === 'f' &&
+        isCoverageObjectCall(expr.argument.object.object)) {
+        const coverageObjectId = expr.argument.object.object.callee.name;
+        const functionId = expr.argument.property.value;
+        return { type: 'function', functionId, coverageObjectId };
+    }
+    return null;
+}
+/**
+ * Given an `UpdateExpression` extract the call expression returning the coverage object.
+ */
+function extractCoverageIncrement(expr) {
+    var _a, _b;
+    return ((_b = (_a = extractBranchCoverageIncrement(expr)) !== null && _a !== void 0 ? _a : extractStatementCoverageIncrement(expr)) !== null && _b !== void 0 ? _b : extractFunctionCoverageIncrement(expr));
+}
+/**
+ * Check if the given call expression is a coverage call expression.
+ * If this is not the case return `undefined`, and the call expression itself otherwise.
+ */
+function isCoverageObjectCall(callExpression) {
+    return (callExpression !== undefined &&
+        (0, types_1.isIdentifier)(callExpression.callee) &&
+        callExpression.callee.name.startsWith(COVERAGE_OBJ_FUNCTION_NAME_PREFIX));
+}

package/dist/vaccine.js

@@ -1 +1 @@
-(()=>{var L=Object.create;var p=Object.defineProperty;var D=Object.getOwnPropertyDescriptor;var H=Object.getOwnPropertyNames;var U=Object.getPrototypeOf,B=Object.prototype.hasOwnProperty;var P=e=>p(e,"__esModule",{value:!0});var E=(e,t)=>()=>(t||e((t={exports:{}}).exports,t),t.exports);var j=(e,t,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of H(t))!B.call(e,r)&&r!=="default"&&p(e,r,{get:()=>t[r],enumerable:!(n=D(t,r))||n.enumerable});return e},S=e=>j(P(p(e!=null?L(U(e)):{},"default",e&&e.__esModule&&"default"in e?{get:()=>e.default,enumerable:!0}:{value:e,enumerable:!0})),e);var O=E((re,R)=>{R.exports=!1});var $=E(()=>{});function m(e){let t=new Blob([e],{type:"text/javascript"}),n=URL.createObjectURL(t),r=new Worker(n);return URL.revokeObjectURL(n),r}function g(){return m('var a=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 E=20,v=1e3,g=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)}},c=class{constructor(e){this.socket=e,this.cachedCoveredRanges=new Map,this.numberOfCachedPositions=0,this.flushCountdown=new g(v,()=>this.flush())}addRange(e,t){let o=this.cachedCoveredRanges.get(e);o||(o=new Set,this.cachedCoveredRanges.set(e,o)),o.add(t),this.numberOfCachedPositions+=1,this.flushCountdown.restartCountdown(),this.numberOfCachedPositions>=E&&this.flush()}flush(){this.numberOfCachedPositions!==0&&(this.flushCountdown.stopCountdown(),this.cachedCoveredRanges.forEach((e,t)=>{let o=Array.from(e).map(n=>`${n.start.line}:${n.start.column}:${n.end.line}:${n.end.column}`);this.socket.send(`${"c"} ${t} ${o.join(" ")}`),e.clear()}),this.cachedCoveredRanges.clear(),this.numberOfCachedPositions=0)}};var C="s",m="b";console.log("Starting coverage forwarding worker.");var p=new a("$REPORT_TO_URL/socket"),d=new c(p),h=new Map;onmessage=s=>{let e=s.data;if(e.startsWith("s"))p.send(e);else if(e.startsWith("i")){let t=JSON.parse(e.substring(2));h.set(t.hash,t),console.info(`Received coverage mapping information for "${t.hash}".`)}else e.startsWith("u")?S(e):e==="unload"?d.flush():console.error(`No handler for message: ${e}`)};function S(s){var l;let e=s.split(" ");if(e.length<4||h===null)return;let t=e[1],o=e[2],n=h.get(t);if(!n){console.log(`No coverage mapping information for ${t} available!`);return}if(o===C){let i=e[3],r=n.statementMap[i];r&&d.addRange(t,r)}else if(o===m){let i=e[3],r=Number.parseInt(e[4]),u=(l=n.branchMap[i])==null?void 0:l.locations[r];u&&d.addRange(t,u)}}\n')}var b="s",w="b";var a;(function(o){o.MESSAGE_TYPE_SOURCEMAP="s",o.MESSAGE_TYPE_COVERAGE="c",o.ISTANBUL_COV_OBJECT="i",o.UNRESOLVED_CODE_ENTITY="u"})(a||(a={}));var k=class{constructor(t,n,r){this.worker=t;this.fileHash=n;this.path=r}get(t,n,r){let o=t[n];return o!==Object(o)?o:C(this.worker,this.fileHash,o,[...this.path,n])}set(t,n,r){let o=[...this.path,n],i=o[0];if(i===b){let s=o[1];this.worker.postMessage(`${a.UNRESOLVED_CODE_ENTITY} ${this.fileHash} ${b} ${s}`)}else if(i===w){let s=o[1],u=o[2];this.worker.postMessage(`${a.UNRESOLVED_CODE_ENTITY} ${this.fileHash} ${w} ${s} ${u}`)}return!0}};function C(e,t,n,r){return new Proxy(n,new k(e,t,r))}var T=S(O());function G(e){if(!(typeof WorkerGlobalScope=="function"&&self instanceof WorkerGlobalScope)){if(typeof window.addEventListener!="function")return;window.addEventListener("beforeunload",function(){e()},!0),window.addEventListener("unload",function(){e()},!0)}}var _={add:G};var W=S($()),V=T.default?W.default:_,c=new Set,M=!1;function Y(){M||(M=!0,V.add(J))}function x(e){if(Y(),typeof e!="function")throw new Error("Listener is no function");c.add(e);var t={remove:function(){return c.delete(e)},run:function(){return c.delete(e),e()}};return t}function J(){var e=[];return c.forEach(function(t){e.push(t()),c.delete(t)}),Promise.all(e)}function l(){return d()}function A(){return typeof window!="undefined"}function d(){return window}function v(e,t){let n=l()[e];return n||(n=t,l()[e]=n),n}var I=v("__TS_AGENT",{});function h(){return I._$BcWorker}function z(e){return I._$BcWorker=e,e}var N=new Set;l().makeCoverageInterceptor=function(e){let t=e.hash;if(N.has(t)){console.log(`Coverage interceptor added twice for ${t}. This seems to be a bug in the instrumentation.`);return}else N.add(t);if(!h()){let n=z(new g);(function(){let o=function(i){let s=d()[i];d()[i]=function(...u){if(n.postMessage("unload"),s)return s.apply(this,u)},A()&&Object.defineProperty(d(),i,{get:function(){return s},set:function(u){s=u}})};o("onunload"),o("onbeforeunload"),x(()=>n.postMessage("unload"))})()}return function(){h().postMessage(`${a.ISTANBUL_COV_OBJECT} ${JSON.stringify(e)}`);let r=v("sentMaps",new Set);e.inputSourceMap&&(r.has(e.path)||(h().postMessage(`${a.MESSAGE_TYPE_SOURCEMAP} ${t}:${JSON.stringify(e.inputSourceMap)}`),r.add(e.path)))}(),function(){let r=new Set;l()._$Bc=(o,i,s,u,y)=>{let f=`${o}:${i}:${s}:${u}:${y}`;r.has(f)||(h().postMessage(f),r.add(f))}}(),C(h(),e.hash,e,[])};})();
+(()=>{var N=Object.create;var f=Object.defineProperty;var x=Object.getOwnPropertyDescriptor;var L=Object.getOwnPropertyNames;var I=Object.getPrototypeOf,D=Object.prototype.hasOwnProperty;var U=e=>f(e,"__esModule",{value:!0});var C=(e,t)=>()=>(t||e((t={exports:{}}).exports,t),t.exports);var B=(e,t,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of L(t))!D.call(e,o)&&o!=="default"&&f(e,o,{get:()=>t[o],enumerable:!(n=x(t,o))||n.enumerable});return e},E=e=>B(U(f(e!=null?N(I(e)):{},"default",e&&e.__esModule&&"default"in e?{get:()=>e.default,enumerable:!0}:{value:e,enumerable:!0})),e);var b=C((Z,w)=>{w.exports=!1});var v=C(()=>{});function p(e){let t=new Blob([e],{type:"text/javascript"}),n=URL.createObjectURL(t),o=new Worker(n);return URL.revokeObjectURL(n),o}function m(){return p('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 E=20,v=1e3,d=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)}},a=class{constructor(e){this.socket=e,this.cachedCoveredRanges=new Map,this.numberOfCachedPositions=0,this.flushCountdown=new d(v,()=>this.flush())}addRange(e,t){let o=this.cachedCoveredRanges.get(e);o||(o=new Set,this.cachedCoveredRanges.set(e,o)),o.add(t),this.numberOfCachedPositions+=1,this.flushCountdown.restartCountdown(),this.numberOfCachedPositions>=E&&this.flush()}flush(){this.numberOfCachedPositions!==0&&(this.flushCountdown.stopCountdown(),this.cachedCoveredRanges.forEach((e,t)=>{let o=Array.from(e).map(s=>`${s.start.line}:${s.start.column}:${s.end.line}:${s.end.column}`);this.socket.send(`${"c"} ${t} ${o.join(" ")}`),e.clear()}),this.cachedCoveredRanges.clear(),this.numberOfCachedPositions=0)}};var C="s",m="b";console.log("Starting coverage forwarding worker.");var p=new i("$REPORT_TO_URL/socket"),h=new a(p),l=new Map;onmessage=n=>{let e=n.data;if(e.startsWith("s"))p.send(e);else if(e.startsWith("i")){let t=JSON.parse(e.substring(2));l.set(t.hash,t),console.info(`Received coverage mapping information for "${t.hash}".`)}else e.startsWith("u")?S(e):e==="unload"?h.flush():console.error(`No handler for message: ${e}`)};function S(n){var u;let e=n.split(" ");if(e.length<4||l===null)return;let t=e[1],o=e[2],s=l.get(t);if(!s){console.log(`No coverage mapping information for ${t} available!`);return}if(o===C){let c=e[3],r=s.statementMap[c];r&&h.addRange(t,r)}else if(o===m){let c=e[3],r=Number.parseInt(e[4]),g=(u=s.branchMap[c])==null?void 0:u.locations[r];g&&h.addRange(t,g)}}\n')}var k=E(b());function G(e){if(!(typeof WorkerGlobalScope=="function"&&self instanceof WorkerGlobalScope)){if(typeof window.addEventListener!="function")return;window.addEventListener("beforeunload",function(){e()},!0),window.addEventListener("unload",function(){e()},!0)}}var S={add:G};var R=E(v()),j=k.default?R.default:S,a=new Set,_=!1;function V(){_||(_=!0,j.add(H))}function O(e){if(V(),typeof e!="function")throw new Error("Listener is no function");a.add(e);var t={remove:function(){return a.delete(e)},run:function(){return a.delete(e),e()}};return t}function H(){var e=[];return a.forEach(function(t){e.push(t()),a.delete(t)}),Promise.all(e)}function i(){return u()}function $(){return typeof window!="undefined"}function u(){return window}function g(e,t){let n=i()[e];return n||(n=t,i()[e]=n),n}var s;(function(r){r.MESSAGE_TYPE_SOURCEMAP="s",r.MESSAGE_TYPE_COVERAGE="c",r.ISTANBUL_COV_OBJECT="i",r.UNRESOLVED_CODE_ENTITY="u"})(s||(s={}));var W="s",M="b";var T=g("__TS_AGENT",{});function d(){return T._$BcWorker}function y(e){return T._$BcWorker=e,e}var A=new Set;i()._$stmtCov=function(e,t){d().postMessage(`${s.UNRESOLVED_CODE_ENTITY} ${e} ${W} ${t}`)};i()._$brCov=function(e,t,n){d().postMessage(`${s.UNRESOLVED_CODE_ENTITY} ${e} ${M} ${t} ${n}`)};i()._$registerCoverageObject=function(e){let t=e.hash;if(A.has(t)){console.log(`Coverage interceptor added twice for ${t}. This seems to be a bug in the instrumentation.`);return}else A.add(t);if(!d()){let n=y(new m);(function(){let r=function(l){let c=u()[l];u()[l]=function(...h){if(n.postMessage("unload"),c)return c.apply(this,h)},$()&&Object.defineProperty(u(),l,{get:function(){return c},set:function(h){c=h}})};r("onunload"),r("onbeforeunload"),O(()=>n.postMessage("unload"))})()}(function(){d().postMessage(`${s.ISTANBUL_COV_OBJECT} ${JSON.stringify(e)}`);let o=g("sentMaps",new Set);e.inputSourceMap&&(o.has(e.path)||(d().postMessage(`${s.MESSAGE_TYPE_SOURCEMAP} ${t}:${JSON.stringify(e.inputSourceMap)}`),o.add(e.path)))})()};})();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@teamscale/javascript-instrumenter",
-  "version": "0.0.1-beta.41",
-  "description": "Istanbul-based coverage instrumenter with coverage forwarding via WebSockets",
+  "version": "0.0.1-beta.42",
+  "description": "JavaScript coverage instrumenter with coverage forwarding to a collector process",
   "main": "dist/src/main.js",
   "bin": "dist/src/main.js",
   "types": "dist/src/main.d.ts",
@@ -49,7 +49,7 @@
   "dependencies": {
     "@babel/generator": "^7.18.2",
     "@babel/parser": "^7.18.5",
-    "@babel/traverse": "^7.18.5",
+    "@babel/traverse": "^7.18.6",
     "@babel/types": "^7.18.4",
     "@cqse/commons": "^0.0.1-beta.1",
     "@types/micromatch": "^4.0.2",
@@ -62,7 +62,6 @@
     "istanbul-lib-instrument": "^5.2.0",
     "micromatch": "4.0.4",
     "mkdirp": "^1.0.4",
-    "nyc": "^15.1.0",
     "source-map": "0.7.3",
     "typescript-optional": "^2.0.1",
     "unload": "^2.2.0",

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

@@ -1 +0,0 @@
-{"version":3,"file":"Cleaner.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Cleaner.ts"],"names":[],"mappings":"AAGA,OAAO,EAKN,cAAc,EAEd,MAAM,cAAc,CAAC;AAMtB;;;;;GAKG;AACH,wBAAgB,eAAe,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,GAClD,MAAM,CAcR"}

package/dist/src/instrumenter/Cleaner.js

@@ -1,87 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanSourceCode = void 0;
-const parser_1 = require("@babel/parser");
-const generator_1 = __importDefault(require("@babel/generator"));
-const traverse_1 = __importDefault(require("@babel/traverse"));
-const types_1 = require("@babel/types");
-function isUpdateExpressionPath(path) {
-    return path.node.type === 'UpdateExpression';
-}
-/**
- * Remove IstanbulJs instrumentations based on the given
- * hook `makeCoverable`.
- *
- * An instrumentation is removed if the hook `makeCoverable` returns `false`.
- */
-function cleanSourceCode(code, esModules, makeCoverable) {
-    const ast = (0, parser_1.parse)(code, { sourceType: esModules ? 'module' : 'script' });
-    (0, traverse_1.default)(ast, {
-        enter(path) {
-            if (isUpdateExpressionPath(path)) {
-                if (isCoverageIncrementNode(path)) {
-                    if (path.node.loc && !makeCoverable(path.node.loc)) {
-                        path.remove();
-                    }
-                }
-            }
-        }
-    });
-    return (0, generator_1.default)(ast, {}, code).code;
-}
-exports.cleanSourceCode = cleanSourceCode;
-/**
- * Checks if the given `path.node` to a statement like `cov_104fq7oo4i().f[0]++;`
- */
-function isCoverageIncrementNode(path) {
-    return extractCoverageCallExpression(path.node) !== undefined;
-}
-/**
- * Returns the call expression from `cov_2pvvu1hl8v().b[2][0]++;` if
- * the given UpdateExpression is a branch coverage update expression.
- */
-function extractBranchCounterExpression(expr) {
-    if (expr.operator === '++' &&
-        (0, types_1.isMemberExpression)(expr.argument) &&
-        (0, types_1.isMemberExpression)(expr.argument.object) &&
-        (0, types_1.isMemberExpression)(expr.argument.object.object) &&
-        (0, types_1.isCallExpression)(expr.argument.object.object.object)) {
-        // Branch counter
-        return extractCoverageObjectCall(expr.argument.object.object.object);
-    }
-    return undefined;
-}
-/**
- * Returns the call expression from `cov_104fq7oo4i().f[0]++;` if
- * the given UpdateExpression is a function or statement coverage update expression.
- */
-function extractFunctionOrStatementCounterExpression(expr) {
-    if (expr.operator === '++' &&
-        (0, types_1.isMemberExpression)(expr.argument) &&
-        (0, types_1.isMemberExpression)(expr.argument.object) &&
-        (0, types_1.isCallExpression)(expr.argument.object.object)) {
-        // Function and statement counter
-        return extractCoverageObjectCall(expr.argument.object.object);
-    }
-    return undefined;
-}
-/**
- * Given an `UpdateExpression` extract the call expression returning the coverage object.
- */
-function extractCoverageCallExpression(expr) {
-    var _a;
-    return (_a = extractBranchCounterExpression(expr)) !== null && _a !== void 0 ? _a : extractFunctionOrStatementCounterExpression(expr);
-}
-/**
- * Check if the given call expression is a coverage call expression.
- * If this is not the case return `undefined`, and the call expression itself otherwise.
- */
-function extractCoverageObjectCall(callExpression) {
-    if (callExpression && (0, types_1.isIdentifier)(callExpression.callee) && callExpression.callee.name.startsWith('cov_')) {
-        return callExpression;
-    }
-    return undefined;
-}