@teamscale/lib-instrument 1.0.0-beta.6 → 1.0.0-beta.7

package/lib/index.d.ts

@@ -1,10 +1,5 @@
 import { Instrumenter, InstrumenterOptions } from './instrumenter';
 export type { InstrumenterOptions } from './instrumenter';
 export { programVisitor } from './visitor';
-/**
- * Creates a new coverage instrumenter.
- *
- * @param opts - instrumenter options
- */
 export declare function createInstrumenter(opts: InstrumenterOptions): Instrumenter;
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAE,mBAAmB,EAAC,MAAM,gBAAgB,CAAC;AAEjE,YAAY,EAAC,mBAAmB,EAAC,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAEzC;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,GAAG,YAAY,CAE1E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAE,mBAAmB,EAAC,MAAM,gBAAgB,CAAC;AAEjE,YAAY,EAAC,mBAAmB,EAAC,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAOzC,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,GAAG,YAAY,CAE1E"}

package/lib/index.js

@@ -5,11 +5,6 @@ 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; } });
-/**
- * Creates a new coverage instrumenter.
- *
- * @param opts - instrumenter options
- */
 function createInstrumenter(opts) {
     return new instrumenter_1.Instrumenter(opts);
 }

package/lib/instrumenter.d.ts

@@ -3,43 +3,18 @@ import { SourceLocation } from "@babel/types";
 import { ParserPlugin as PluginConfig } from '@babel/parser';
 import { RawSourceMap } from "source-map";
 import { InstrumentationOptions } from "./utils";
-/**
- * Options for configuring the coverage instrumenter.
- */
 export type InstrumenterOptions = InstrumentationOptions & Partial<{
-    /** Preserve comments in output */
     preserveComments: boolean;
-    /** Generate compact code */
     compact: boolean;
-    /** Set to true to instrument ES6 modules */
     esModules: boolean;
-    /** Set to true to allow `return` statements outside of functions */
     autoWrap: boolean;
-    /** Approach to produce a source map for the instrumented code */
     produceSourceMap: 'none' | 'inline' | 'external';
-    /** Turn debugging on */
     debug: boolean;
-    /** Set babel parser plugins */
     parserPlugins: PluginConfig[];
 }>;
-/**
- * The main class of the instrumenter.
- */
 export declare class Instrumenter {
     private readonly opts;
     constructor(opts?: Partial<InstrumenterOptions>);
-    /**
-     * Instrument the supplied code with coverage statements.
-     * To instrument EcmaScript modules, make sure to set the
-     * `esModules` option to `true` when creating the instrumenter.
-     *
-     * @param code - the code to instrument
-     * @param filename - the name of the file the code stems from.
-     * @param inputSourceMap - the source map that maps the not instrumented code back to its original
-     * @param shouldInstrumentCallback - a callback to decide if a given code fragment should be instrumented
-     *
-     * @returns the instrumented code.
-     */
     instrument(code: string, filename: string | undefined, inputSourceMap: RawSourceMap | undefined, shouldInstrumentCallback?: (path: NodePath, location: SourceLocation) => boolean): Promise<string>;
 }
 //# sourceMappingURL=instrumenter.d.ts.map

package/lib/instrumenter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrumenter.d.ts","sourceRoot":"","sources":["../src/instrumenter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,QAAQ,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAC,YAAY,IAAI,YAAY,EAAC,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,YAAY,EAAoB,MAAM,YAAY,CAAC;AAG3D,OAAO,EAAC,sBAAsB,EAAC,MAAM,SAAS,CAAC;AAE/C;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,sBAAsB,GAAG,OAAO,CAAC;IAC/D,kCAAkC;IAClC,gBAAgB,EAAE,OAAO,CAAC;IAE1B,4BAA4B;IAC5B,OAAO,EAAE,OAAO,CAAC;IAEjB,4CAA4C;IAC5C,SAAS,EAAE,OAAO,CAAC;IAEnB,oEAAoE;IACpE,QAAQ,EAAE,OAAO,CAAC;IAElB,iEAAiE;IACjE,gBAAgB,EAAE,MAAM,GAAG,QAAQ,GAAG,UAAU,CAAC;IAEjD,wBAAwB;IACxB,KAAK,EAAE,OAAO,CAAC;IAEf,+BAA+B;IAC/B,aAAa,EAAE,YAAY,EAAE,CAAC;CACjC,CAAC,CAAC;AAYH;;GAEG;AACH,qBAAa,YAAY;IAErB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAsB;gBAE/B,IAAI,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC;IAI/C;;;;;;;;;;;OAWG;IACG,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,cAAc,EAAE,YAAY,GAAG,SAAS,EACpF,wBAAwB,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,KAAK,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CA0DtH"}
+{"version":3,"file":"instrumenter.d.ts","sourceRoot":"","sources":["../src/instrumenter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,QAAQ,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAC,YAAY,IAAI,YAAY,EAAC,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,YAAY,EAAoB,MAAM,YAAY,CAAC;AAG3D,OAAO,EAAC,sBAAsB,EAAC,MAAM,SAAS,CAAC;AAK/C,MAAM,MAAM,mBAAmB,GAAG,sBAAsB,GAAG,OAAO,CAAC;IAE/D,gBAAgB,EAAE,OAAO,CAAC;IAG1B,OAAO,EAAE,OAAO,CAAC;IAGjB,SAAS,EAAE,OAAO,CAAC;IAGnB,QAAQ,EAAE,OAAO,CAAC;IAGlB,gBAAgB,EAAE,MAAM,GAAG,QAAQ,GAAG,UAAU,CAAC;IAGjD,KAAK,EAAE,OAAO,CAAC;IAGf,aAAa,EAAE,YAAY,EAAE,CAAC;CACjC,CAAC,CAAC;AAeH,qBAAa,YAAY;IAErB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAsB;gBAE/B,IAAI,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC;IAgBzC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,cAAc,EAAE,YAAY,GAAG,SAAS,EACpF,wBAAwB,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,KAAK,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CA0DtH"}

package/lib/instrumenter.js

@@ -1,10 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Instrumenter = void 0;
-/*
- Copyright 2012-2015, Yahoo Inc.
- Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
- */
 const core_1 = require("@babel/core");
 const source_map_1 = require("source-map");
 const visitor_1 = require("./visitor");
@@ -17,29 +13,15 @@ function mapSourceMapsOption(produceSourceMap) {
     }
     return produceSourceMap;
 }
-/**
- * The main class of the instrumenter.
- */
 class Instrumenter {
+    opts;
     constructor(opts) {
         this.opts = { ...opts };
     }
-    /**
-     * Instrument the supplied code with coverage statements.
-     * To instrument EcmaScript modules, make sure to set the
-     * `esModules` option to `true` when creating the instrumenter.
-     *
-     * @param code - the code to instrument
-     * @param filename - the name of the file the code stems from.
-     * @param inputSourceMap - the source map that maps the not instrumented code back to its original
-     * @param shouldInstrumentCallback - a callback to decide if a given code fragment should be instrumented
-     *
-     * @returns the instrumented code.
-     */
     async instrument(code, filename, inputSourceMap, shouldInstrumentCallback) {
-        filename = filename !== null && filename !== void 0 ? filename : String(new Date().getTime()) + '.js';
+        filename = filename ?? String(new Date().getTime()) + '.js';
         const { opts } = this;
-        const sourceMapToUse = inputSourceMap !== null && inputSourceMap !== void 0 ? inputSourceMap : opts.inputSourceMap;
+        const sourceMapToUse = inputSourceMap ?? opts.inputSourceMap;
         let inputSourceMapConsumer = undefined;
         if (sourceMapToUse) {
             inputSourceMapConsumer = await new source_map_1.SourceMapConsumer(sourceMapToUse);
@@ -69,7 +51,7 @@ class Instrumenter {
                             inputSourceMap,
                             isInstrumentedToken: opts.isInstrumentedToken,
                             codeToPrepend: opts.codeToPrepend,
-                            shouldInstrumentCallback: shouldInstrumentCallback !== null && shouldInstrumentCallback !== void 0 ? shouldInstrumentCallback : opts.shouldInstrumentCallback
+                            shouldInstrumentCallback: shouldInstrumentCallback ?? opts.shouldInstrumentCallback
                         });
                         return {
                             visitor: {

package/lib/origins.d.ts

@@ -1,32 +1,12 @@
 import { SourceLocation } from "@babel/types";
 import { SourceMapConsumer } from "source-map";
-/**
- * Generator for identifiers that are unique across files to instrument.
- * Relevant in case no Ecmascript modules are used.
- *
- * We assume that the files to be executed in a browser can
- * stem from different runs of the instrumenter. We have to decrease
- * the probability of colliding identifiers.
- */
 export declare const fileIdSeqGenerator: {
     next: () => string;
 };
-/**
- * Mapping source locations to their origins, before the last transpilation,
- * based on the source map.
- */
 export declare class SourceOrigins {
     private readonly sourceMap?;
-    /**
-     * The mapping of file ids to the file names in the transpiler origin,
-     * that is, the file names found in the source map.
-     */
     readonly originToIdMap: Map<string, string>;
     constructor(sourceMap: SourceMapConsumer | undefined);
-    /**
-     * Register source origin file and retrieve a unique identifier for it; furthermore, map
-     * the given location to the location in the origin.
-     */
     ensureKnownOrigin(loc: SourceLocation): [string, SourceLocation];
 }
 //# sourceMappingURL=origins.d.ts.map

package/lib/origins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"origins.d.ts","sourceRoot":"","sources":["../src/origins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAyB,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAErE;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,EAAE;IAAE,IAAI,EAAE,MAAM,MAAM,CAAA;CAkBjD,CAAC;AAEL;;;GAGG;AACH,qBAAa,aAAa;IAEtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAoB;IAE/C;;;OAGG;IACH,SAAgB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAEvC,SAAS,EAAE,iBAAiB,GAAG,SAAS;IAKpD;;;OAGG;IACH,iBAAiB,CAAC,GAAG,EAAE,cAAc,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC;CA6BnE"}
+{"version":3,"file":"origins.d.ts","sourceRoot":"","sources":["../src/origins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAyB,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAUrE,eAAO,MAAM,kBAAkB,EAAE;IAAE,IAAI,EAAE,MAAM,MAAM,CAAA;CAkBjD,CAAC;AAML,qBAAa,aAAa;IAEtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAoB;IAM/C,SAAgB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAEvC,SAAS,EAAE,iBAAiB,GAAG,SAAS;IASpD,iBAAiB,CAAC,GAAG,EAAE,cAAc,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC;CA6BnE"}

package/lib/origins.js

@@ -1,14 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceOrigins = exports.fileIdSeqGenerator = void 0;
-/**
- * Generator for identifiers that are unique across files to instrument.
- * Relevant in case no Ecmascript modules are used.
- *
- * We assume that the files to be executed in a browser can
- * stem from different runs of the instrumenter. We have to decrease
- * the probability of colliding identifiers.
- */
 exports.fileIdSeqGenerator = (() => {
     const instrumenterRunId = process.pid;
     let fileIdSeq = 0;
@@ -29,28 +21,21 @@ exports.fileIdSeqGenerator = (() => {
         }
     };
 })();
-/**
- * Mapping source locations to their origins, before the last transpilation,
- * based on the source map.
- */
 class SourceOrigins {
+    sourceMap;
+    originToIdMap;
     constructor(sourceMap) {
         this.originToIdMap = new Map();
         this.sourceMap = sourceMap;
     }
-    /**
-     * Register source origin file and retrieve a unique identifier for it; furthermore, map
-     * the given location to the location in the origin.
-     */
     ensureKnownOrigin(loc) {
-        var _a, _b;
         let startPos = undefined;
         let endPos = undefined;
-        let filename = (_a = loc.filename) !== null && _a !== void 0 ? _a : '';
+        let filename = loc.filename ?? '';
         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 = (_b = startPos.source) !== null && _b !== void 0 ? _b : loc.filename;
+            filename = startPos.source ?? loc.filename;
         }
         if (!startPos || !endPos) {
             startPos = { line: loc.start.line, column: loc.start.column, source: null, name: null };

package/lib/utils.d.ts

@@ -1,28 +1,15 @@
 import { SourceLocation } from "@babel/types";
 import { RawSourceMap } from "source-map";
 import { NodePath } from "@babel/core";
-/**
- * Options to configure the instrumenter.
- */
 export type InstrumentationOptions = Partial<{
-    /** Report boolean value of logical expressions */
     reportLogic: boolean;
-    /** Use an evaluated function to find coverageGlobalScope */
     coverageGlobalScopeFunc: boolean;
-    /** Names of methods to ignore by default on classes */
     ignoreClassMethods: string[];
-    /** The input source map, that maps the uninstrumented code back to the original code */
     inputSourceMap?: RawSourceMap;
-    /** Token to add in the very beginning to indicate that the instrumentation has been performed */
     isInstrumentedToken?: string;
-    /** Code to add before the instrumented input code */
     codeToPrepend?: string;
-    /** Callback for determining if a given code fragment should be instrument */
     shouldInstrumentCallback?: (path: NodePath, loc: SourceLocation) => boolean;
 }>;
-/**
- * Source code fragment within on file.
- */
 export type CodeRange = {
     start: {
         line?: number;

package/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAC,YAAY,EAAC,MAAM,YAAY,CAAC;AACxC,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AAErC;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC;IACzC,kDAAkD;IAClD,WAAW,EAAE,OAAO,CAAC;IAErB,4DAA4D;IAC5D,uBAAuB,EAAE,OAAO,CAAC;IAEjC,uDAAuD;IACvD,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAE7B,wFAAwF;IACxF,cAAc,CAAC,EAAE,YAAY,CAAC;IAE9B,iGAAiG;IACjG,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B,qDAAqD;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,6EAA6E;IAC7E,wBAAwB,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC;CAC/E,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG;IACpB,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1C,GAAG,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3C,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAC,YAAY,EAAC,MAAM,YAAY,CAAC;AACxC,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AAKrC,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC;IAEzC,WAAW,EAAE,OAAO,CAAC;IAGrB,uBAAuB,EAAE,OAAO,CAAC;IAGjC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAG7B,cAAc,CAAC,EAAE,YAAY,CAAC;IAG9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAG7B,aAAa,CAAC,EAAE,MAAM,CAAC;IAGvB,wBAAwB,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC;CAC/E,CAAC,CAAC;AAKH,MAAM,MAAM,SAAS,GAAG;IACpB,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1C,GAAG,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3C,CAAC"}

package/lib/visitor.d.ts

@@ -3,25 +3,6 @@ import { Program } from "@babel/types";
 type BabelTypes = typeof import("@babel/types");
 import { SourceMapConsumer } from "source-map";
 import { InstrumentationOptions } from "./utils";
-/**
- * `programVisitor` is a `babel` adaptor for instrumentation.
- *
- * It returns an object with two methods `enter` and `exit`.
- * These should be assigned to or called from `Program` entry and exit functions
- * in a babel visitor.
- *
- * These functions do not make assumptions about the state set by Babel and thus
- * can be used in a context other than a Babel plugin.
- *
- * The exit function returns an object that currently has the following keys:
- *
- * `fileCoverage` - the file coverage object created for the source file.
- * `sourceMappingURL` - any source mapping URL found when processing the file.
- *
- * @param types - an instance of babel-types.
- * @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): {
     enter(path: NodePath<Program>): void;
     exit(path: NodePath<Program>): void;

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;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"}
+{"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;AAwnB/C,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

@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.programVisitor = programVisitor;
 const core_1 = require("@babel/core");
 const origins_1 = require("./origins");
-// Pattern for istanbul to ignore a section
 const COMMENT_RE = /^\s*istanbul\s+ignore\s+(if|else|next)(?=\W|$)/;
-// Pattern for istanbul to ignore the whole file
 const COMMENT_FILE_RE = /^\s*istanbul\s+ignore\s+(file)(?=\W|$)/;
-/**
- * `VisitState` holds the state of the visitor, provides helper functions
- * and is the `this` for the individual coverage visitors.
- */
 class VisitState {
+    types;
+    attrs;
+    nextIgnore;
+    ignoreClassMethods;
+    reportLogic;
+    shouldInstrumentCallback;
+    origins;
     constructor(types, inputSourceMapConsumer, ignoreClassMethods = [], reportLogic = false, shouldInstrumentCallback) {
         this.attrs = {};
         this.nextIgnore = null;
@@ -21,27 +22,21 @@ class VisitState {
         this.shouldInstrumentCallback = shouldInstrumentCallback;
         this.origins = new origins_1.SourceOrigins(inputSourceMapConsumer);
     }
-    /**
-     * Use the configured callback, if available, to check if the given source
-     * location should be instrumented.
-     */
     shouldInstrument(path, loc) {
         if (this.shouldInstrumentCallback) {
             return this.shouldInstrumentCallback(path, loc);
         }
         return true;
     }
-    /** Should we ignore the node? Yes, if specifically ignoring or if the node is generated. */
     shouldIgnore(path) {
         return this.nextIgnore !== null || !path.node.loc;
     }
-    /** Extract the ignore comment hint (next|if|else) or null. */
     hintFor(node) {
         let hint = null;
         if (node.leadingComments) {
             node.leadingComments.forEach(c => {
                 const v = (c.value || '').trim();
-                const groups = v.match(COMMENT_RE);
+                const groups = COMMENT_RE.exec(v);
                 if (groups) {
                     hint = groups[1];
                 }
@@ -49,35 +44,26 @@ class VisitState {
         }
         return hint;
     }
-    /**
-     * For these expressions the statement counter needs to be hoisted, so
-     * function name inference can be preserved.
-     */
     counterNeedsHoisting(path) {
         return (path.isFunctionExpression() ||
             path.isArrowFunctionExpression() ||
             path.isClassExpression());
     }
-    /** All the generic stuff that needs to be done on enter for every node. */
     onEnter(path) {
         const n = path.node;
-        // if already ignoring, nothing more to do
         if (this.nextIgnore !== null) {
             return;
         }
-        // check hint to see if ignore should be turned on
         const hint = this.hintFor(n);
         if (hint === 'next') {
             this.nextIgnore = n;
             return;
         }
-        // else check custom node attribute set by a prior visitor
         if (this.getAttr(path.node, 'skip-all') !== null) {
             this.nextIgnore = n;
         }
-        // else check for ignored class methods
         if (path.isFunctionExpression() &&
-            this.ignoreClassMethods.some(name => path.node.id && name === path.node.id.name)) {
+            this.ignoreClassMethods.some(name => name === path.node.id?.name)) {
             this.nextIgnore = n;
             return;
         }
@@ -87,23 +73,16 @@ class VisitState {
             return;
         }
     }
-    /**
-     * All the generic stuff on exit of a node, including resetting ignores and custom node attrs.
-     */
     onExit(path) {
-        // restore ignore status, if needed
         if (path.node === this.nextIgnore) {
             this.nextIgnore = null;
         }
-        // nuke all attributes for the node
         delete path.node.__cov__;
     }
-    /** Set a node attribute for the supplied node. */
     setAttr(node, name, value) {
         node.__cov__ = node.__cov__ || {};
         node.__cov__[name] = value;
     }
-    /** Retrieve a node attribute for the supplied node or null. */
     getAttr(node, name) {
         const c = node.__cov__;
         if (!c) {
@@ -112,7 +91,6 @@ 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));
@@ -122,11 +100,9 @@ class VisitState {
         }
         else if (this.counterNeedsHoisting(path) &&
             T.isVariableDeclarator(path.parent)) {
-            // make an attempt to hoist the statement counter, so that
-            // function names are maintained.
-            const grandParentPath = (_a = path.parentPath) === null || _a === void 0 ? void 0 : _a.parentPath;
+            const grandParentPath = path.parentPath?.parentPath;
             if (grandParentPath && T.isExportNamedDeclaration(grandParentPath.parent)) {
-                (_b = grandParentPath.parentPath) === null || _b === void 0 ? void 0 : _b.insertBefore(T.expressionStatement(increment));
+                grandParentPath.parentPath?.insertBefore(T.expressionStatement(increment));
             }
             else if (grandParentPath &&
                 (T.isProgram(grandParentPath.parent) ||
@@ -145,9 +121,8 @@ class VisitState {
         }
     }
     insertFunctionCounter(path) {
-        var _a, _b, _c;
         const T = this.types;
-        if (!((_a = path.node) === null || _a === void 0 ? void 0 : _a.loc)) {
+        if (!(path.node?.loc)) {
             return;
         }
         const n = path.node;
@@ -156,23 +131,21 @@ class VisitState {
             case 'FunctionDeclaration':
             case 'FunctionExpression':
                 if (n.id) {
-                    declarationLocation = (_b = n.id.loc) !== null && _b !== void 0 ? _b : undefined;
+                    declarationLocation = n.id.loc ?? undefined;
                 }
                 break;
         }
         const body = path.get('body');
-        const loc = (_c = path.node.loc) !== null && _c !== void 0 ? _c : declarationLocation;
+        const loc = path.node.loc ?? 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.
             originPos.end = originPos.start;
             const increment = newLineCoverageExpression(originFileId, originPos);
             body.node.body.unshift(T.expressionStatement(increment));
         }
     }
     insertStatementCounter(path) {
-        var _a;
-        const loc = (_a = path.node) === null || _a === void 0 ? void 0 : _a.loc;
+        const loc = path.node?.loc;
         if (!loc) {
             return;
         }
@@ -184,7 +157,7 @@ class VisitState {
         this.insertCounter(path, increment);
     }
     insertBranchCounter(path, loc) {
-        loc = loc !== null && loc !== void 0 ? loc : path.node.loc;
+        loc = loc ?? path.node.loc;
         if (!loc) {
             return;
         }
@@ -214,16 +187,11 @@ class VisitState {
         }
     }
 }
-/**
- * Create a line coverage reporting statement node.
- */
 function newLineCoverageExpression(originFileId, range) {
     const argumentList = [
         { type: 'Identifier', name: originFileId },
         { type: 'NumericLiteral', value: range.start.line }
     ];
-    // Only pass end line argument if they are different.
-    // See also https://v8.dev/blog/adaptor-frame for performance considerations
     if (range.start.line !== range.end.line) {
         argumentList.push({ type: 'NumericLiteral', value: range.end.line });
     }
@@ -233,9 +201,6 @@ function newLineCoverageExpression(originFileId, range) {
         arguments: argumentList
     };
 }
-/**
- * Creates a new string constant AST node.
- */
 function newStringConstDeclarationNode(name, value) {
     return {
         type: 'VariableDeclaration',
@@ -255,18 +220,7 @@ function newStringConstDeclarationNode(name, value) {
         ]
     };
 }
-/**
- * Generic function that takes a set of visitor methods and
- * returns a visitor object with `enter` and `exit` properties,
- * such that:
- *
- * - standard entry processing is done
- * - the supplied visitors are called only when ignore is not in effect;
- *   it reliefs them from worrying about ignore states and generated nodes.
- * - standard exit processing is done
- */
 function entries(...enter) {
-    // the enter function
     const wrappedEntry = function (path, node) {
         this.onEnter(path);
         if (this.shouldIgnore(path)) {
@@ -311,8 +265,6 @@ function coverSequenceExpression(path) {
             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));
@@ -354,14 +306,11 @@ function convertArrowExpression(path) {
     const T = this.types;
     if (!T.isBlockStatement(node.body)) {
         const bloc = node.body.loc;
-        if (node.expression === true) {
+        if (node.expression) {
             node.expression = false;
         }
         node.body = T.blockStatement([T.returnStatement(node.body)]);
-        // restore body location
         node.body.loc = bloc;
-        // set up the location for the return statement so it gets
-        // instrumented
         node.body.body[0].loc = bloc;
     }
 }
@@ -383,8 +332,7 @@ function coverIfBranches(path) {
         this.insertBranchCounter(path.get('alternate'), undefined);
     }
 }
-function createSwitchBranch(path) {
-    // Intentionally left blank
+function createSwitchBranch() {
 }
 function coverSwitchCase(path) {
     const T = this.types;
@@ -412,7 +360,7 @@ function coverTernary(path) {
 function coverLogicalExpression(path) {
     const T = this.types;
     if (path.parentPath.node.type === 'LogicalExpression') {
-        return; // already processed
+        return;
     }
     const leaves = [];
     this.findLeaves(path.node, leaves, undefined, undefined);
@@ -442,9 +390,9 @@ function coverLogicalExpression(path) {
 const codeVisitor = {
     ArrowFunctionExpression: entries(convertArrowExpression, coverFunction),
     AssignmentPattern: entries(coverAssignmentPattern),
-    BlockStatement: entries(), // ignore processing only
-    ExportDefaultDeclaration: entries(), // ignore processing only
-    ExportNamedDeclaration: entries(), // ignore processing only
+    BlockStatement: entries(),
+    ExportDefaultDeclaration: entries(),
+    ExportNamedDeclaration: entries(),
     ClassMethod: entries(coverFunction),
     ClassDeclaration: entries(parenthesizedExpressionProp('superClass')),
     ClassProperty: entries(coverClassPropDeclarator),
@@ -457,7 +405,7 @@ const codeVisitor = {
     ReturnStatement: entries(coverStatement),
     ThrowStatement: entries(coverStatement),
     TryStatement: entries(coverStatement),
-    VariableDeclaration: entries(), // ignore processing only
+    VariableDeclaration: entries(),
     VariableDeclarator: entries(coverVariableDeclarator),
     IfStatement: entries(blockProp('consequent'), blockProp('alternate'), coverStatement, coverIfBranches),
     ForStatement: entries(blockProp('body'), coverStatement),
@@ -475,18 +423,11 @@ const codeVisitor = {
     LogicalExpression: entries(coverLogicalExpression),
     SequenceExpression: entries(coverSequenceExpression),
 };
-/**
- * The rewire plugin (and potentially other babel middleware)
- * may cause files to be instrumented twice, see:
- * https://github.com/istanbuljs/babel-plugin-istanbul/issues/94
- * we should only instrument code for coverage the first time
- * it's run through lib-instrument.
- */
 function alreadyInstrumented(path, visitState) {
     return path.scope.hasBinding(visitState.varName);
 }
 function getParentComments(path) {
-    if (!(path === null || path === void 0 ? void 0 : path.parent)) {
+    if (!path?.parent) {
         return [];
     }
     if (!('comments' in path.parent)) {
@@ -498,28 +439,8 @@ function shouldIgnoreFile(programNodePath) {
     if (!programNodePath) {
         return false;
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return getParentComments(programNodePath).some(c => COMMENT_FILE_RE.test(c.value));
 }
-/**
- * `programVisitor` is a `babel` adaptor for instrumentation.
- *
- * It returns an object with two methods `enter` and `exit`.
- * These should be assigned to or called from `Program` entry and exit functions
- * in a babel visitor.
- *
- * These functions do not make assumptions about the state set by Babel and thus
- * can be used in a context other than a Babel plugin.
- *
- * The exit function returns an object that currently has the following keys:
- *
- * `fileCoverage` - the file coverage object created for the source file.
- * `sourceMappingURL` - any source mapping URL found when processing the file.
- *
- * @param types - an instance of babel-types.
- * @param inputSourceMapConsumer - access object for the source map of the input.
- * @param opts - additional options.
- */
 function programVisitor(types, inputSourceMapConsumer, opts) {
     opts = { ...opts };
     const visitState = new VisitState(types, inputSourceMapConsumer, opts.ignoreClassMethods, opts.reportLogic, opts.shouldInstrumentCallback);
@@ -548,12 +469,10 @@ function programVisitor(types, inputSourceMapConsumer, opts) {
                     body.unshift(...codeToPrependAst.program.body);
                 }
             }
-            // Add a variable definition for each origin file on top of the file.
             for (const [originPath, originId] of originData.originToIdMap.entries()) {
                 const declaration = newStringConstDeclarationNode(originId, originPath);
                 body.unshift(declaration);
             }
-            // Add a token for signaling that the file has been instrumented.
             if (opts.isInstrumentedToken) {
                 types.addComment(path.node, 'leading', opts.isInstrumentedToken, false);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamscale/lib-instrument",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.7",
   "description": "Library for adding coverage statements to JS code; forked from istanbul-lib-coverage",
   "author": "Krishnan Anantheswaran <kananthmail-github@yahoo.com>",
   "maintainers": [
@@ -14,12 +14,12 @@
     "lib"
   ],
   "dependencies": {
-    "@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.7.3"
+    "@babel/core": "^7.28.5",
+    "@babel/parser": "^7.28.5",
+    "@babel/traverse": "^7.28.5",
+    "@types/node": "^22.18.12",
+    "source-map": "^0.7.6",
+    "typescript": "^5.8.3"
   },
   "license": "BSD-3-Clause",
   "homepage": "https://docs.teamscale.com/howto/setting-up-profiler-tga/javascript/",
@@ -29,6 +29,6 @@
   "scripts": {
     "clean": "rimraf lib tsconfig.tsbuildinfo",
     "build": "tsc",
-    "test": "pnpm build && NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=8192' jest --forceExit --coverage --silent=true --detectOpenHandles"
+    "test": "node --import tsx --test test/**/*.test.ts"
   }
 }