@teamscale/lib-instrument 0.1.0-beta.8 → 1.0.0-beta.2

package/lib/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createInstrumenter = exports.programVisitor = void 0;
+exports.programVisitor = void 0;
+exports.createInstrumenter = createInstrumenter;
 const instrumenter_1 = require("./instrumenter");
 var visitor_1 = require("./visitor");
 Object.defineProperty(exports, "programVisitor", { enumerable: true, get: function () { return visitor_1.programVisitor; } });
@@ -12,4 +13,3 @@ Object.defineProperty(exports, "programVisitor", { enumerable: true, get: functi
 function createInstrumenter(opts) {
     return new instrumenter_1.Instrumenter(opts);
 }
-exports.createInstrumenter = createInstrumenter;

package/lib/instrumenter.js

@@ -37,9 +37,9 @@ class Instrumenter {
      * @returns the instrumented code.
      */
     async instrument(code, filename, inputSourceMap, shouldInstrumentCallback) {
-        filename = filename ?? String(new Date().getTime()) + '.js';
+        filename = filename !== null && filename !== void 0 ? filename : String(new Date().getTime()) + '.js';
         const { opts } = this;
-        const sourceMapToUse = inputSourceMap ?? opts.inputSourceMap;
+        const sourceMapToUse = inputSourceMap !== null && inputSourceMap !== void 0 ? inputSourceMap : opts.inputSourceMap;
         let inputSourceMapConsumer = undefined;
         if (sourceMapToUse) {
             inputSourceMapConsumer = await new source_map_1.SourceMapConsumer(sourceMapToUse);
@@ -69,7 +69,7 @@ class Instrumenter {
                             inputSourceMap,
                             isInstrumentedToken: opts.isInstrumentedToken,
                             codeToPrepend: opts.codeToPrepend,
-                            shouldInstrumentCallback: shouldInstrumentCallback ?? opts.shouldInstrumentCallback
+                            shouldInstrumentCallback: shouldInstrumentCallback !== null && shouldInstrumentCallback !== void 0 ? shouldInstrumentCallback : opts.shouldInstrumentCallback
                         });
                         return {
                             visitor: {

package/lib/origins.js

@@ -43,13 +43,14 @@ class SourceOrigins {
      * the given location to the location in the origin.
      */
     ensureKnownOrigin(loc) {
+        var _a, _b;
         let startPos = undefined;
         let endPos = undefined;
-        let filename = loc.filename ?? '';
+        let filename = (_a = loc.filename) !== null && _a !== void 0 ? _a : '';
         if (this.sourceMap) {
             startPos = this.sourceMap.originalPositionFor({ line: loc.start.line, column: loc.start.column });
             endPos = this.sourceMap.originalPositionFor({ line: loc.end.line, column: loc.end.column });
-            filename = startPos.source ?? loc.filename;
+            filename = (_b = startPos.source) !== null && _b !== void 0 ? _b : loc.filename;
         }
         if (!startPos || !endPos) {
             startPos = { line: loc.start.line, column: loc.start.column, source: null, name: null };

package/lib/visitor.d.ts

@@ -19,7 +19,7 @@ import { InstrumentationOptions } from "./utils";
  * `sourceMappingURL` - any source mapping URL found when processing the file.
  *
  * @param types - an instance of babel-types.
- * @param sourceFilePath - the path to source file.
+ * @param inputSourceMapConsumer - access object for the source map of the input.
  * @param opts - additional options.
  */
 export declare function programVisitor(types: BabelTypes, inputSourceMapConsumer: SourceMapConsumer | undefined, opts: InstrumentationOptions): {

package/lib/visitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../src/visitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,QAAQ,EAAQ,MAAM,aAAa,CAAC;AAElD,OAAO,EAK8C,OAAO,EAE3D,MAAM,cAAc,CAAC;AAEtB,KAAK,UAAU,GAAG,cAAc,cAAc,CAAC,CAAA;AAE/C,OAAO,EAAC,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAC,sBAAsB,EAAC,MAAM,SAAS,CAAC;AAglB/C;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,EACjB,sBAAsB,EAAE,iBAAiB,GAAG,SAAS,EACrD,IAAI,EAAE,sBAAsB;gBAYvC,SAAS,OAAO,CAAC,GAAG,IAAI;eASzB,SAAS,OAAO,CAAC;EA+BnC"}
+{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../src/visitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,QAAQ,EAAQ,MAAM,aAAa,CAAC;AAElD,OAAO,EAK8C,OAAO,EAE3D,MAAM,cAAc,CAAC;AAEtB,KAAK,UAAU,GAAG,cAAc,cAAc,CAAC,CAAA;AAE/C,OAAO,EAAC,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAC,sBAAsB,EAAC,MAAM,SAAS,CAAC;AAsmB/C;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,EACjB,sBAAsB,EAAE,iBAAiB,GAAG,SAAS,EACrD,IAAI,EAAE,sBAAsB;gBAYvC,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAI;eASzB,QAAQ,CAAC,OAAO,CAAC;EA+BnC"}

package/lib/visitor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.programVisitor = void 0;
+exports.programVisitor = programVisitor;
 const core_1 = require("@babel/core");
 const origins_1 = require("./origins");
 // Pattern for istanbul to ignore a section
@@ -112,6 +112,7 @@ class VisitState {
         return c[name];
     }
     insertCounter(path, increment) {
+        var _a, _b;
         const T = this.types;
         if (path.isBlockStatement()) {
             path.node.body.unshift(T.expressionStatement(increment));
@@ -123,9 +124,9 @@ class VisitState {
             T.isVariableDeclarator(path.parent)) {
             // make an attempt to hoist the statement counter, so that
             // function names are maintained.
-            const grandParentPath = path.parentPath?.parentPath;
+            const grandParentPath = (_a = path.parentPath) === null || _a === void 0 ? void 0 : _a.parentPath;
             if (grandParentPath && T.isExportNamedDeclaration(grandParentPath.parent)) {
-                grandParentPath.parentPath?.insertBefore(T.expressionStatement(increment));
+                (_b = grandParentPath.parentPath) === null || _b === void 0 ? void 0 : _b.insertBefore(T.expressionStatement(increment));
             }
             else if (grandParentPath &&
                 (T.isProgram(grandParentPath.parent) ||
@@ -144,8 +145,9 @@ class VisitState {
         }
     }
     insertFunctionCounter(path) {
+        var _a, _b, _c;
         const T = this.types;
-        if (!(path.node?.loc)) {
+        if (!((_a = path.node) === null || _a === void 0 ? void 0 : _a.loc)) {
             return;
         }
         const n = path.node;
@@ -154,12 +156,12 @@ class VisitState {
             case 'FunctionDeclaration':
             case 'FunctionExpression':
                 if (n.id) {
-                    declarationLocation = n.id.loc ?? undefined;
+                    declarationLocation = (_b = n.id.loc) !== null && _b !== void 0 ? _b : undefined;
                 }
                 break;
         }
         const body = path.get('body');
-        const loc = path.node.loc ?? declarationLocation;
+        const loc = (_c = path.node.loc) !== null && _c !== void 0 ? _c : declarationLocation;
         const [originFileId, originPos] = this.origins.ensureKnownOrigin(loc);
         if (body.isBlockStatement() && this.shouldInstrument(path, originPos)) {
             // For functions, we only cover the first line of its body.
@@ -169,7 +171,8 @@ class VisitState {
         }
     }
     insertStatementCounter(path) {
-        const loc = path.node?.loc;
+        var _a;
+        const loc = (_a = path.node) === null || _a === void 0 ? void 0 : _a.loc;
         if (!loc) {
             return;
         }
@@ -181,7 +184,7 @@ class VisitState {
         this.insertCounter(path, increment);
     }
     insertBranchCounter(path, loc) {
-        loc = loc ?? path.node.loc;
+        loc = loc !== null && loc !== void 0 ? loc : path.node.loc;
         if (!loc) {
             return;
         }
@@ -215,7 +218,7 @@ class VisitState {
  * Create a line coverage reporting statement node.
  */
 function newLineCoverageExpression(originFileId, range) {
-    let argumentList = [
+    const argumentList = [
         { type: 'Identifier', name: originFileId },
         { type: 'NumericLiteral', value: range.start.line }
     ];
@@ -296,12 +299,33 @@ function coverVariableDeclarator(path) {
 function coverClassPropDeclarator(path) {
     this.insertStatementCounter(path.get('value'));
 }
+function coverSequenceExpression(path) {
+    const T = this.types;
+    if (!path.isSequenceExpression()) {
+        return;
+    }
+    const newExpressions = [];
+    for (const expression of path.node.expressions) {
+        const [originFileId, originPos] = this.origins.ensureKnownOrigin(expression.loc);
+        if (this.shouldInstrument(path, originPos)) {
+            const increment = newLineCoverageExpression(originFileId, originPos);
+            newExpressions.push(increment);
+        }
+        // We must add the expression to be evaluated after the coverage increment
+        // to not change the return value of the sequence expression.
+        newExpressions.push(expression);
+    }
+    path.replaceWith(T.sequenceExpression(newExpressions));
+}
 function makeBlock(path) {
     const T = this.types;
     if (!path.node) {
         path.replaceWith(T.blockStatement([]));
     }
-    if (!path.isBlockStatement()) {
+    if (path.isSequenceExpression()) {
+        coverSequenceExpression.call(this, path);
+    }
+    else if (!path.isBlockStatement()) {
         path.replaceWith(T.blockStatement([path.node]));
         const block = path.node;
         path.node.loc = block.body[0].loc;
@@ -448,7 +472,8 @@ const codeVisitor = {
     FunctionExpression: entries(coverFunction),
     LabeledStatement: entries(coverStatement),
     ConditionalExpression: entries(coverTernary),
-    LogicalExpression: entries(coverLogicalExpression)
+    LogicalExpression: entries(coverLogicalExpression),
+    SequenceExpression: entries(coverSequenceExpression),
 };
 /**
  * The rewire plugin (and potentially other babel middleware)
@@ -461,7 +486,7 @@ function alreadyInstrumented(path, visitState) {
     return path.scope.hasBinding(visitState.varName);
 }
 function getParentComments(path) {
-    if (!path?.parent) {
+    if (!(path === null || path === void 0 ? void 0 : path.parent)) {
         return [];
     }
     if (!('comments' in path.parent)) {
@@ -492,7 +517,7 @@ function shouldIgnoreFile(programNodePath) {
  * `sourceMappingURL` - any source mapping URL found when processing the file.
  *
  * @param types - an instance of babel-types.
- * @param sourceFilePath - the path to source file.
+ * @param inputSourceMapConsumer - access object for the source map of the input.
  * @param opts - additional options.
  */
 function programVisitor(types, inputSourceMapConsumer, opts) {
@@ -535,4 +560,3 @@ function programVisitor(types, inputSourceMapConsumer, opts) {
         }
     };
 }
-exports.programVisitor = programVisitor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamscale/lib-instrument",
-  "version": "0.1.0-beta.8",
+  "version": "1.0.0-beta.2",
   "description": "Library for adding coverage statements to JS code; forked from istanbul-lib-coverage",
   "author": "Krishnan Anantheswaran <kananthmail-github@yahoo.com>",
   "maintainers": [
@@ -14,33 +14,29 @@
     "lib"
   ],
   "dependencies": {
-    "@babel/core": "^7.24.4",
-    "@babel/parser": "^7.24.4",
-    "@babel/traverse": "^7.24.1",
-    "@types/node": "^20.12.6",
+    "@babel/core": "^7.26.8",
+    "@babel/parser": "^7.26.8",
+    "@babel/traverse": "^7.26.8",
+    "@types/node": "^22.13.4",
     "source-map": "^0.7.4",
-    "typescript": "^5.4.4"
+    "typescript": "^5.7.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.24.1",
-    "@babel/types": "^7.24.0",
+    "@babel/cli": "^7.26.4",
+    "@babel/types": "^7.26.8",
     "@types/babel__core": "^7.20.5",
     "@types/clone": "^2.1.4",
     "@types/js-yaml": "^4.0.9",
-    "@types/jest": "^29.5.12",
+    "@types/jest": "^29.5.14",
     "babel-jest": "^29.7.0",
     "clone": "^2.1.2",
     "js-yaml": "^4.1.0",
-    "ts-jest": "^29.1.2",
+    "ts-jest": "^29.2.5",
     "jest": "^29.7.0",
-    "rimraf": "^5.0.5"
+    "rimraf": "^6.0.1"
   },
   "license": "BSD-3-Clause",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/cqse/teamscale-javascript-profiler.git",
-    "directory": "packages/lib-instrument"
-  },
+  "homepage": "https://docs.teamscale.com/howto/setting-up-profiler-tga/javascript/",
   "publishConfig": {
     "access": "public"
   },