@teamscale/javascript-instrumenter 0.0.1-beta.24 → 0.0.1-beta.29

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@teamscale/javascript-instrumenter",
-    "version": "0.0.1-beta.24",
+    "version": "0.0.1-beta.29",
     "description": "Istanbul-based coverage instrumenter with coverage forwarding via WebSockets",
     "main": "dist/src/main.js",
     "bin": "dist/src/main.js",

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

@@ -1 +1 @@
-{"version":3,"file":"Cleaner.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Cleaner.ts"],"names":[],"mappings":"AAGA,OAAO,EAON,cAAc,EACd,MAAM,cAAc,CAAC;AAEtB;;;;;GAKG;AACH,wBAAgB,eAAe,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,GAClD,MAAM,CAYR"}
+{"version":3,"file":"Cleaner.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Cleaner.ts"],"names":[],"mappings":"AAGA,OAAO,EAON,cAAc,EACd,MAAM,cAAc,CAAC;AAEtB;;;;;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

@@ -18,7 +18,10 @@ function cleanSourceCode(code, esModules, makeCoverable) {
     const ast = (0, parser_1.parse)(code, { sourceType: esModules ? 'module' : 'script' });
     (0, traverse_1.default)(ast, {
         ExpressionStatement(path) {
-            if (isCoverageIncrementNode(path)) {
+            if (isUnsupportedCounterTypeIncrement(path)) {
+                path.remove();
+            }
+            else if (isCoverageIncrementNode(path)) {
                 if (path.node.loc && !makeCoverable(path.node.loc)) {
                     path.remove();
                 }
@@ -36,11 +39,64 @@ function isCoverageIncrementNode(path) {
     if (!(0, types_1.isUpdateExpression)(expr)) {
         return false;
     }
-    return (expr.operator === '++' &&
+    return extractCoverageCallExpression(expr) !== undefined;
+}
+/**
+ * Is the given expression statement a coverage increment that
+ * is not supported by our approach?
+ *
+ * For example, branch coverage is not supported.
+ */
+function isUnsupportedCounterTypeIncrement(path) {
+    if (!(0, types_1.isUpdateExpression)(path.node.expression)) {
+        return false;
+    }
+    return extractBranchCounterExpression(path.node.expression) !== 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) &&
-        (0, types_1.isIdentifier)(expr.argument.object.object.callee) &&
-        expr.argument.object.object.callee.name.startsWith('cov_') &&
-        (0, types_1.isNumericLiteral)(expr.argument.property));
+        (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;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamscale/javascript-instrumenter",
-  "version": "0.0.1-beta.24",
+  "version": "0.0.1-beta.29",
   "description": "Istanbul-based coverage instrumenter with coverage forwarding via WebSockets",
   "main": "dist/src/main.js",
   "bin": "dist/src/main.js",

package/CHANGELOG.md

@@ -1,13 +0,0 @@
-We use [Semantic Versioning](https://semver.org/).
-
-# New Release
-
-- [feature] JavaScript bundles can now be instrumented partially if a source map is present.
-
-# 0.0.1-beta.21
-
-- [fix] Include/exclude pattern and the paths to match were not normalized
-
-# 0.0.1-beta.20
-
-- [feature] Automatic release now for NPM packages and Docker images