@teamscale/javascript-instrumenter 0.0.1-beta.52 → 0.0.1-beta.54

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@teamscale/javascript-instrumenter",
-    "version": "0.0.1-beta.52",
+    "version": "0.0.1-beta.54",
     "description": "JavaScript coverage instrumenter with coverage forwarding to a collector process",
     "main": "dist/src/main.js",
     "bin": "dist/src/main.js",
@@ -23,35 +23,35 @@
         "dist/**/*"
     ],
     "devDependencies": {
-        "@babel/core": "^7.18.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.18.2",
-        "@babel/preset-env": "^7.18.2",
+        "@babel/core": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
+        "@babel/preset-env": "^7.22.5",
         "@types/async": "^3.2.6",
         "@types/bunyan": "^1.8.8",
         "@types/convert-source-map": "^1.5.1",
         "@types/glob": "^7.1.3",
         "@types/istanbul-lib-instrument": "^1.7.4",
-        "@types/jest": "^27.0.1",
+        "@types/jest": "^29.5.1",
         "@types/mkdirp": "^1.0.2",
         "@types/node": "^15.0.1",
         "@types/source-map": "^0.5.7",
         "@types/ws": "^7.4.4",
-        "babel-jest": "^27.2.0",
+        "babel-jest": "^29.5.0",
         "esbuild": "^0.13.3",
         "esbuild-plugin-inline-worker": "^0.1.1",
-        "jest": "^27.2.0",
+        "jest": "^29.5.0",
         "rimraf": "^3.0.2",
-        "ts-jest": "^27.0.5",
+        "ts-jest": "^29.1.0",
         "ts-node": "^10.2.1",
         "tslib": "^2.2.0",
         "typescript": "^4.4.3"
     },
     "dependencies": {
-        "@babel/generator": "^7.18.2",
-        "@babel/parser": "^7.18.5",
-        "@babel/traverse": "^7.18.6",
-        "@babel/types": "^7.18.4",
-        "@cqse/commons": "^0.0.1-beta.45",
+        "@babel/generator": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5",
+        "@cqse/commons": "0.0.1-beta.52",
         "@types/micromatch": "^4.0.2",
         "argparse": "^2.0.1",
         "async": "^3.2.4",
@@ -59,7 +59,7 @@
         "convert-source-map": "^1.7.0",
         "foreground-child": "^2.0.0",
         "glob": "^7.1.7",
-        "istanbul-lib-instrument": "^5.2.0",
+        "istanbul-lib-instrument": "^5.2.1",
         "micromatch": "4.0.4",
         "mkdirp": "^1.0.4",
         "source-map": "0.7.4",

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

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

package/dist/src/instrumenter/Postprocessor.js

@@ -38,6 +38,9 @@ const fileIdSeqGenerator = (() => {
         }
     };
 })();
+function isCoverageFunctionDefinition(path) {
+    return (0, types_1.isFunctionDeclaration)(path.node) && getIstanbulCoverageFunctionDeclarationName(path.node) !== undefined;
+}
 function getIstanbulCoverageFunctionDeclarationName(node) {
     var _a;
     if (!(0, types_1.isFunctionDeclaration)(node)) {
@@ -55,25 +58,34 @@ function createFileIdMappingHandler() {
     const fileIdMap = new Map();
     return {
         enterPath(path) {
-            var _a;
-            if (!(0, types_1.isVariableDeclaration)(path.node)) {
+            if (!(0, types_1.isFunctionDeclaration)(path.node)) {
+                return;
+            }
+            const coverageFunctionName = getIstanbulCoverageFunctionDeclarationName(path.node);
+            if (!coverageFunctionName) {
                 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 = `_$f${fileIdSeqGenerator.next()}`;
-                        const fileId = declarator.init.value;
-                        fileIdMap.set(coverageFunctionName, fileIdVarName);
-                        grandParentPath.insertBefore(newStringConstDeclarationNode(fileIdVarName, fileId));
+            // From here onwards, we know that the path.node is a FunctionDeclaration
+            const body = path.node.body;
+            // Traverse the body of the function for VariableDeclarations
+            for (const statement of body.body) {
+                if ((0, types_1.isVariableDeclaration)(statement)) {
+                    const declaration = statement;
+                    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 = `_$f${fileIdSeqGenerator.next()}`;
+                            const fileId = declarator.init.value;
+                            fileIdMap.set(coverageFunctionName, fileIdVarName);
+                            const variableDeclaration = newStringConstDeclarationNode(fileIdVarName, fileId);
+                            path.insertBefore(variableDeclaration);
+                        }
                     }
                 }
             }
+            // Do not travers into the childs of this path.
+            path.skip();
         },
         getFileHashForCoverageObjectId(coverageObjectId) {
             return fileIdMap.get(coverageObjectId);
@@ -83,9 +95,6 @@ function createFileIdMappingHandler() {
 function createPartialInstrumentationHandler(fileIdMappingHandler) {
     return {
         enterPath(path, makeCoverable) {
-            if (!(0, types_1.isUpdateExpression)(path.node)) {
-                return;
-            }
             const increment = extractCoverageIncrement(path.node);
             if (!increment) {
                 return;
@@ -118,7 +127,13 @@ function cleanSourceCode(code, esModules, makeCoverable) {
     (0, traverse_1.default)(ast, {
         enter(path) {
             fileIdMappingHandler.enterPath(path);
-            partialInstrumentationHandler.enterPath(path, makeCoverable);
+            if (isCoverageFunctionDefinition(path)) {
+                // Do try to instrument the coverage function (and save some time).
+                path.skip();
+            }
+            else {
+                partialInstrumentationHandler.enterPath(path, makeCoverable);
+            }
         }
     });
     return (0, generator_1.default)(ast, {}, code).code;
@@ -214,61 +229,71 @@ function newStatementCoverageIncrementExpression(fileIdVarName, increment) {
  * 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 };
+    const firstMemberExpr = expr.argument;
+    const secondMemberExpr = firstMemberExpr.object;
+    const thirdMemberExpr = secondMemberExpr.object;
+    if (!(0, types_1.isMemberExpression)(thirdMemberExpr)) {
+        return null;
     }
-    return null;
+    const callExpr = thirdMemberExpr.object;
+    if (!(0, types_1.isCallExpression)(callExpr) || !isCoverageObjectCall(callExpr)) {
+        return null;
+    }
+    const coverageObjectId = callExpr.callee.name;
+    const branchId = secondMemberExpr.property.value;
+    const locationId = firstMemberExpr.property.value;
+    return { type: 'branch', branchId, locationId, coverageObjectId };
 }
 /**
  * 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 };
+    const firstMemberExpr = expr.argument;
+    const secondMemberExpr = firstMemberExpr.object;
+    const callExpr = secondMemberExpr.object;
+    const argObjProp = secondMemberExpr.property;
+    if (!(0, types_1.isCallExpression)(callExpr) ||
+        !(0, types_1.isIdentifier)(argObjProp) ||
+        argObjProp.name !== 's' ||
+        !isCoverageObjectCall(callExpr)) {
+        return null;
     }
-    return null;
+    const coverageObjectId = callExpr.callee.name;
+    const statementId = firstMemberExpr.property.value;
+    return { type: 'statement', statementId, coverageObjectId };
 }
 /**
  * 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 };
+    const firstMemberExpr = expr.argument;
+    const secondMemberExpr = firstMemberExpr.object;
+    const callExpr = secondMemberExpr.object;
+    const argObjProp = secondMemberExpr.property;
+    if (!(0, types_1.isCallExpression)(callExpr) ||
+        !(0, types_1.isIdentifier)(argObjProp) ||
+        argObjProp.name !== 'f' ||
+        !isCoverageObjectCall(callExpr)) {
+        return null;
     }
-    return null;
+    const coverageObjectId = callExpr.callee.name;
+    const functionId = firstMemberExpr.property.value;
+    return { type: 'function', functionId, coverageObjectId };
 }
 /**
- * Given an `UpdateExpression` extract the call expression returning the coverage object.
+ * Given an `IncrementExpression` extract the call expression returning the coverage object.
  */
-function extractCoverageIncrement(expr) {
+function extractCoverageIncrement(node) {
     var _a, _b;
-    return ((_b = (_a = extractBranchCoverageIncrement(expr)) !== null && _a !== void 0 ? _a : extractStatementCoverageIncrement(expr)) !== null && _b !== void 0 ? _b : extractFunctionCoverageIncrement(expr));
+    if ((0, types_1.isUpdateExpression)(node) &&
+        node.operator === '++' &&
+        (0, types_1.isMemberExpression)(node.argument) &&
+        (0, types_1.isMemberExpression)(node.argument.object)) {
+        return ((_b = (_a = extractBranchCoverageIncrement(node)) !== null && _a !== void 0 ? _a : extractStatementCoverageIncrement(node)) !== null && _b !== void 0 ? _b : extractFunctionCoverageIncrement(node));
+    }
+    return null;
 }
 /**
  * Check if the given call expression is a coverage call expression.

package/dist/src/instrumenter/Task.js

@@ -7,7 +7,6 @@ exports.SourceMapFileReference = exports.TaskResult = exports.InstrumentationTas
 const typescript_optional_1 = require("typescript-optional");
 const commons_1 = require("@cqse/commons");
 const micromatch_1 = __importDefault(require("micromatch"));
-const path_1 = __importDefault(require("path"));
 /**
  * An abstract source map type.
  */
@@ -135,10 +134,10 @@ function normalizeGlobPattern(pattern) {
     return removeTrailingCurrentWorkingDir(pattern);
 }
 function normalizePath(toNormalize) {
-    return removeTrailingCurrentWorkingDir(toNormalize);
+    return removeTrailingCurrentWorkingDir(toNormalize.replace(/\\/g, '/'));
 }
 function removeTrailingCurrentWorkingDir(removeFrom) {
-    return removePrefix('webpack:///', removePrefix('.' + path_1.default.sep, removeFrom));
+    return removePrefix('webpack:///', removePrefix('./', removeFrom));
 }
 function removePrefix(prefix, removeFrom) {
     if (removeFrom.startsWith(prefix)) {

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

@@ -1,6 +1,6 @@
 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;

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

@@ -1 +1 @@
-{"version":3,"file":"TaskBuilder.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/TaskBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,mBAAmB,EAGnB,kBAAkB,EAElB,MAAM,QAAQ,CAAC;AAMhB,2DAA2D;AAC3D,oBAAY,uBAAuB,GAAG;IACrC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAElB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,eAAe,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAkBF;;GAEG;AACH,qBAAa,WAAW;IACvB,gDAAgD;IAChD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IAEzC,6CAA6C;IAC7C,OAAO,CAAC,SAAS,CAA4B;IAE7C,+BAA+B;IAC/B,OAAO,CAAC,2BAA2B,CAAuB;IAE1D,8BAA8B;IAC9B,OAAO,CAAC,2BAA2B,CAAuB;IAE1D,8BAA8B;IAC9B,OAAO,CAAC,yBAAyB,CAAuB;IAExD,mIAAmI;IACnI,OAAO,CAAC,eAAe,CAAqB;;IAO5C,0EAA0E;IAC1E,sBAAsB,CAAC,sBAAsB,EAAE,MAAM,GAAG,IAAI;IAM5D,gHAAgH;IAChH,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAKpE,kHAAkH;IAClH,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAKpE,qHAAqH;IACrH,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAK9D,yBAAyB;IACzB,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAKlG;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,uBAAuB,GAAG,IAAI;IAoCpD;;;;;;;OAOG;IACH,OAAO,CAAC,4CAA4C;IAgCpD;;;;;;OAMG;IACH,OAAO,CAAC,0BAA0B;IASlC;;OAEG;IACI,KAAK,IAAI,mBAAmB;CASnC"}
+{"version":3,"file":"TaskBuilder.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/TaskBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,mBAAmB,EAGnB,kBAAkB,EAElB,MAAM,QAAQ,CAAC;AAMhB,2DAA2D;AAC3D,MAAM,MAAM,uBAAuB,GAAG;IACrC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAElB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,eAAe,CAAC,EAAE,MAAM,CAAC;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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamscale/javascript-instrumenter",
-  "version": "0.0.1-beta.52",
+  "version": "0.0.1-beta.54",
   "description": "JavaScript coverage instrumenter with coverage forwarding to a collector process",
   "main": "dist/src/main.js",
   "bin": "dist/src/main.js",
@@ -23,35 +23,35 @@
     "dist/**/*"
   ],
   "devDependencies": {
-    "@babel/core": "^7.18.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.18.2",
-    "@babel/preset-env": "^7.18.2",
+    "@babel/core": "^7.22.5",
+    "@babel/plugin-transform-modules-commonjs": "^7.22.5",
+    "@babel/preset-env": "^7.22.5",
     "@types/async": "^3.2.6",
     "@types/bunyan": "^1.8.8",
     "@types/convert-source-map": "^1.5.1",
     "@types/glob": "^7.1.3",
     "@types/istanbul-lib-instrument": "^1.7.4",
-    "@types/jest": "^27.0.1",
+    "@types/jest": "^29.5.1",
     "@types/mkdirp": "^1.0.2",
     "@types/node": "^15.0.1",
     "@types/source-map": "^0.5.7",
     "@types/ws": "^7.4.4",
-    "babel-jest": "^27.2.0",
+    "babel-jest": "^29.5.0",
     "esbuild": "^0.13.3",
     "esbuild-plugin-inline-worker": "^0.1.1",
-    "jest": "^27.2.0",
+    "jest": "^29.5.0",
     "rimraf": "^3.0.2",
-    "ts-jest": "^27.0.5",
+    "ts-jest": "^29.1.0",
     "ts-node": "^10.2.1",
     "tslib": "^2.2.0",
     "typescript": "^4.4.3"
   },
   "dependencies": {
-    "@babel/generator": "^7.18.2",
-    "@babel/parser": "^7.18.5",
-    "@babel/traverse": "^7.18.6",
-    "@babel/types": "^7.18.4",
-    "@cqse/commons": "^0.0.1-beta.45",
+    "@babel/generator": "^7.22.5",
+    "@babel/parser": "^7.22.5",
+    "@babel/traverse": "^7.22.5",
+    "@babel/types": "^7.22.5",
+    "@cqse/commons": "0.0.1-beta.52",
     "@types/micromatch": "^4.0.2",
     "argparse": "^2.0.1",
     "async": "^3.2.4",
@@ -59,7 +59,7 @@
     "convert-source-map": "^1.7.0",
     "foreground-child": "^2.0.0",
     "glob": "^7.1.7",
-    "istanbul-lib-instrument": "^5.2.0",
+    "istanbul-lib-instrument": "^5.2.1",
     "micromatch": "4.0.4",
     "mkdirp": "^1.0.4",
     "source-map": "0.7.4",