@temporalio/nyc-test-coverage 1.5.2 → 1.7.0

package/lib/globalCoverage.d.ts

@@ -0,0 +1,5 @@
+import { CoverageMapData } from 'istanbul-lib-coverage';
+declare global {
+    var __coverage__: CoverageMapData;
+}
+export {};

package/lib/globalCoverage.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=globalCoverage.js.map

package/lib/globalCoverage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"globalCoverage.js","sourceRoot":"","sources":["../src/globalCoverage.ts"],"names":[],"mappings":""}

package/lib/index.d.ts

@@ -3,7 +3,7 @@ import { InjectedSinks, BundleOptions, WorkerOptions } from '@temporalio/worker'
 import { CoverageSinks } from './sinks';
 declare type WebpackConfigType = ReturnType<NonNullable<BundleOptions['webpackConfigHook']>>;
 export declare class WorkflowCoverage {
-    coverageMap: libCoverage.CoverageMap;
+    coverageMapsData: libCoverage.CoverageMapData[];
     private hasCoverageGlobal;
     /**
      * Add all necessary coverage-specific logic to Worker config:
@@ -36,10 +36,9 @@ export declare class WorkflowCoverage {
      */
     get sinks(): InjectedSinks<CoverageSinks>;
     /**
-     * Modify the given Worker config to auto instrument Workflow
-     * code using istanbul-instrumenter-loader
+     * Modify the given Worker config to auto instrument Workflows
      */
-    addInstrumenterRule(workflowsPath: string, config: WebpackConfigType): WebpackConfigType;
+    addInstrumenterRule(config: WebpackConfigType): WebpackConfigType;
     /**
      * Merge this WorkflowCoverage's coverage map into the global coverage
      * map data `global.__coverage__`.

package/lib/index.js

@@ -22,12 +22,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkflowCoverage = void 0;
+const node_path_1 = __importDefault(require("node:path"));
 const libCoverage = __importStar(require("istanbul-lib-coverage"));
 class WorkflowCoverage {
     constructor() {
-        this.coverageMap = libCoverage.createCoverageMap();
+        this.coverageMapsData = [];
     }
     // Check if running through nyc or some other Istanbul-based tool.
     // If not, any `workflowCoverage()` tools are a no-op.
@@ -45,7 +49,6 @@ class WorkflowCoverage {
         if (!this.hasCoverageGlobal()) {
             return workerOptions;
         }
-        const workflowsPath = workerOptions.workflowsPath;
         return {
             ...workerOptions,
             interceptors: {
@@ -59,7 +62,7 @@ class WorkflowCoverage {
             bundlerOptions: {
                 ...workerOptions.bundlerOptions,
                 webpackConfigHook: (config) => {
-                    config = this.addInstrumenterRule(workflowsPath, config);
+                    config = this.addInstrumenterRule(config);
                     const existingWebpackConfigHook = workerOptions?.bundlerOptions?.webpackConfigHook;
                     if (existingWebpackConfigHook !== undefined) {
                         return existingWebpackConfigHook(config);
@@ -81,12 +84,11 @@ class WorkflowCoverage {
         if (!this.hasCoverageGlobal()) {
             return bundleOptions;
         }
-        const workflowsPath = bundleOptions.workflowsPath;
         return {
             ...bundleOptions,
             workflowInterceptorModules: [...(bundleOptions.workflowInterceptorModules || []), this.interceptorModule],
             webpackConfigHook: (config) => {
-                config = this.addInstrumenterRule(workflowsPath, config);
+                config = this.addInstrumenterRule(config);
                 const existingWebpackConfigHook = bundleOptions.webpackConfigHook;
                 if (existingWebpackConfigHook !== undefined) {
                     return existingWebpackConfigHook(config);
@@ -128,7 +130,7 @@ class WorkflowCoverage {
             coverage: {
                 merge: {
                     fn: (_workflowInfo, testCoverage) => {
-                        this.coverageMap.merge(testCoverage);
+                        this.coverageMapsData.push(testCoverage);
                     },
                     callDuringReplay: false,
                 },
@@ -136,26 +138,46 @@ class WorkflowCoverage {
         };
     }
     /**
-     * Modify the given Worker config to auto instrument Workflow
-     * code using istanbul-instrumenter-loader
+     * Modify the given Worker config to auto instrument Workflows
      */
-    addInstrumenterRule(workflowsPath, config) {
+    addInstrumenterRule(config) {
         if (!this.hasCoverageGlobal()) {
             return config;
         }
-        const newRule = {
+        const rules = config?.module?.rules || [];
+        if (Object.keys(require.cache).some((file) => file.includes('ts-node/register'))) {
+            // ts-node is currently loaded
+            // ts-node and SWC doesn't translate TypeScript code the same way, which will cause
+            // line number mismatches in generated coverage reports.
+            const tsLoaderRule = {
+                test: /\.ts$/,
+                loader: require.resolve('ts-loader'),
+                exclude: /node_modules/,
+            };
+            const swcRuleIndex = rules.findIndex((rule) => {
+                const loader = rule.use?.loader;
+                return loader && loader.indexOf('swc-loader') >= 0;
+            });
+            rules[swcRuleIndex] = tsLoaderRule;
+        }
+        rules.push({
             use: {
-                loader: require.resolve('istanbul-instrumenter-loader'),
-                options: { esModules: true },
+                loader: require.resolve('./loader'),
             },
             enforce: 'post',
-            include: workflowsPath,
-        };
+            test: /\.[tj]s$/,
+            exclude: [
+                /\/node_modules\//,
+                node_path_1.default.dirname(require.resolve('@temporalio/common')),
+                node_path_1.default.dirname(require.resolve('@temporalio/workflow')),
+                node_path_1.default.dirname(require.resolve('@temporalio/nyc-test-coverage')),
+            ],
+        });
         return {
             ...config,
             module: {
                 ...config?.module,
-                rules: [...(config?.module?.rules || []), newRule],
+                rules,
             },
         };
     }
@@ -167,16 +189,12 @@ class WorkflowCoverage {
         if (!this.hasCoverageGlobal()) {
             return;
         }
-        /* eslint-disable @typescript-eslint/ban-ts-comment */
-        // @ts-ignore
-        this.coverageMap.merge(global.__coverage__);
-        const coverageMapData = Object.keys(this.coverageMap.data).reduce((cur, path) => {
-            const fileCoverage = this.coverageMap.data[path];
-            cur[path] = fileCoverage.data;
-            return cur;
-        }, {});
-        // @ts-ignore
-        global.__coverage__ = coverageMapData;
+        const coverageMap = libCoverage.createCoverageMap();
+        this.coverageMapsData.unshift(global.__coverage__);
+        for (const data of this.coverageMapsData)
+            coverageMap.merge(data);
+        this.coverageMapsData = [];
+        global.__coverage__ = coverageMap.data;
     }
 }
 exports.WorkflowCoverage = WorkflowCoverage;

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/interceptors.js

@@ -11,8 +11,13 @@ const interceptors = () => ({
                 /* eslint-disable @typescript-eslint/ban-ts-comment */
                 // @ts-ignore
                 const globalCoverage = global.__coverage__;
-                coverage.merge(JSON.parse(JSON.stringify(globalCoverage)));
-                clearCoverage(globalCoverage);
+                if (globalCoverage) {
+                    // Send coverage data through the sink to be merged into the _real_ global coverage map
+                    // Make a deep copy first, otherwise clearCoverage may wipe out the data
+                    // before it actually get processed by the sink
+                    coverage.merge(JSON.parse(JSON.stringify(globalCoverage)));
+                    clearCoverage(globalCoverage);
+                }
                 return next(input);
             },
         },

package/lib/interceptors.js.map

@@ -1 +1 @@
-{"version":3,"file":"interceptors.js","sourceRoot":"","sources":["../src/interceptors.ts"],"names":[],"mappings":";;;AACA,mDAAwE;AAGxE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,qBAAU,GAAiB,CAAC;AAEjD,0BAA0B;AACnB,MAAM,YAAY,GAAG,GAAyB,EAAE,CAAC,CAAC;IACvD,SAAS,EAAE;QACT;YACE,kBAAkB,CAAC,KAAK,EAAE,IAAI;gBAC5B,sDAAsD;gBACtD,aAAa;gBACb,MAAM,cAAc,GAAoB,MAAM,CAAC,YAAY,CAAC;gBAE5D,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;gBAC3D,aAAa,CAAC,cAAc,CAAC,CAAC;gBAE9B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;SACF;KACF;CACF,CAAC,CAAC;AAfU,QAAA,YAAY,gBAetB;AAEH,SAAS,aAAa,CAAC,QAAyB;IAC9C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACxC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YACjD,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC7B;KACF;AACH,CAAC"}
+{"version":3,"file":"interceptors.js","sourceRoot":"","sources":["../src/interceptors.ts"],"names":[],"mappings":";;;AACA,mDAAwE;AAGxE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,qBAAU,GAAiB,CAAC;AAEjD,0BAA0B;AACnB,MAAM,YAAY,GAAG,GAAyB,EAAE,CAAC,CAAC;IACvD,SAAS,EAAE;QACT;YACE,kBAAkB,CAAC,KAAK,EAAE,IAAI;gBAC5B,sDAAsD;gBACtD,aAAa;gBACb,MAAM,cAAc,GAAoB,MAAM,CAAC,YAAY,CAAC;gBAC5D,IAAI,cAAc,EAAE;oBAClB,uFAAuF;oBACvF,wEAAwE;oBACxE,+CAA+C;oBAC/C,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;oBAC3D,aAAa,CAAC,cAAc,CAAC,CAAC;iBAC/B;gBAED,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;SACF;KACF;CACF,CAAC,CAAC;AAnBU,QAAA,YAAY,gBAmBtB;AAEH,SAAS,aAAa,CAAC,QAAyB;IAC9C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACxC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YACjD,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC7B;KACF;AACH,CAAC"}

package/lib/loader.d.ts

@@ -0,0 +1,3 @@
+import type { LoaderDefinitionFunction } from 'webpack';
+declare const instrumentWithIstanbulLoader: LoaderDefinitionFunction;
+export default instrumentWithIstanbulLoader;

package/lib/loader.js

@@ -0,0 +1,41 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const istanbul_lib_instrument_1 = require("istanbul-lib-instrument");
+const convert = __importStar(require("convert-source-map"));
+const instrumentWithIstanbulLoader = function (source, sourceMap) {
+    let srcMap = sourceMap ?? convert.fromSource(source)?.sourcemap;
+    if (typeof srcMap === 'string')
+        srcMap = JSON.parse(srcMap);
+    const instrumenter = (0, istanbul_lib_instrument_1.createInstrumenter)({
+        esModules: true,
+        produceSourceMap: true,
+    });
+    instrumenter.instrument(source, this.resourcePath, (error, instrumentedSource) => {
+        this.callback(error, instrumentedSource, instrumenter.lastSourceMap());
+    }, srcMap);
+};
+exports.default = instrumentWithIstanbulLoader;
+//# sourceMappingURL=loader.js.map

package/lib/loader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qEAA6D;AAC7D,4DAA8C;AAG9C,MAAM,4BAA4B,GAA6B,UAAU,MAAM,EAAE,SAAS;IACxF,IAAI,MAAM,GAAG,SAAS,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;IAChE,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE5D,MAAM,YAAY,GAAG,IAAA,4CAAkB,EAAC;QACtC,SAAS,EAAE,IAAI;QACf,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IAEH,YAAY,CAAC,UAAU,CACrB,MAAM,EACN,IAAI,CAAC,YAAY,EACjB,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE;QAC5B,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,EAAE,YAAY,CAAC,aAAa,EAAS,CAAC,CAAC;IAChF,CAAC,EACD,MAAa,CACd,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,4BAA4B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/nyc-test-coverage",
-  "version": "1.5.2",
+  "version": "1.7.0",
   "description": "Temporal.io SDK code coverage integration",
   "keywords": [
     "temporal",
@@ -8,10 +8,15 @@
     "testing",
     "coverage"
   ],
-  "homepage": "https://github.com/temporalio/sdk-typescript/tree/main/packages/testing",
+  "homepage": "https://github.com/temporalio/sdk-typescript/tree/main/packages/nyc=test-coverage",
   "bugs": {
     "url": "https://github.com/temporalio/sdk-typescript/issues"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/temporalio/sdk-typescript.git",
+    "directory": "packages/nyc-test-coverage"
+  },
   "license": "MIT",
   "author": "Temporal Technologies Inc. <sdk@temporal.io>",
   "main": "lib/index.js",
@@ -21,16 +26,21 @@
     "src"
   ],
   "dependencies": {
-    "@temporalio/worker": "^1.5.2",
-    "@temporalio/workflow": "^1.5.2",
-    "istanbul-instrumenter-loader": "^3.0.1",
-    "istanbul-lib-coverage": "^3.2.0"
+    "@temporalio/worker": "1.7.0",
+    "@temporalio/workflow": "1.7.0",
+    "convert-source-map": "^2.0.0",
+    "istanbul-lib-coverage": "^3.2.0",
+    "istanbul-lib-instrument": "^5.2.1",
+    "ts-loader": "^9.4.2"
   },
   "devDependencies": {
-    "@types/istanbul-lib-coverage": "^2.0.4"
+    "@types/convert-source-map": "^2.0.0",
+    "@types/istanbul-lib-coverage": "^2.0.4",
+    "@types/istanbul-lib-instrument": "^1.7.4",
+    "@types/webpack": "^5.28.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d32adfd8537661c3740767ca1a3862392ca702e2"
+  "gitHead": "2b32bac62f879b35238b487d3aaed093a1e449a7"
 }

package/src/globalCoverage.ts

@@ -0,0 +1,8 @@
+import { CoverageMapData } from 'istanbul-lib-coverage';
+
+declare global {
+  // eslint-disable-next-line no-var
+  var __coverage__: CoverageMapData;
+}
+
+export {};

package/src/index.ts

@@ -1,3 +1,4 @@
+import path from 'node:path';
 import * as libCoverage from 'istanbul-lib-coverage';
 import { InjectedSinks, BundleOptions, WorkerOptions } from '@temporalio/worker';
 import { CoverageSinks } from './sinks';
@@ -6,7 +7,7 @@ import { CoverageSinks } from './sinks';
 type WebpackConfigType = ReturnType<NonNullable<BundleOptions['webpackConfigHook']>>;
 
 export class WorkflowCoverage {
-  coverageMap = libCoverage.createCoverageMap();
+  coverageMapsData: libCoverage.CoverageMapData[] = [];
 
   // Check if running through nyc or some other Istanbul-based tool.
   // If not, any `workflowCoverage()` tools are a no-op.
@@ -29,8 +30,6 @@ export class WorkflowCoverage {
       return workerOptions;
     }
 
-    const workflowsPath = workerOptions.workflowsPath;
-
     return {
       ...workerOptions,
       interceptors: {
@@ -44,7 +43,7 @@ export class WorkflowCoverage {
       bundlerOptions: {
         ...workerOptions.bundlerOptions,
         webpackConfigHook: (config: WebpackConfigType) => {
-          config = this.addInstrumenterRule(workflowsPath, config);
+          config = this.addInstrumenterRule(config);
 
           const existingWebpackConfigHook = workerOptions?.bundlerOptions?.webpackConfigHook;
           if (existingWebpackConfigHook !== undefined) {
@@ -73,12 +72,11 @@ export class WorkflowCoverage {
       return bundleOptions;
     }
 
-    const workflowsPath = bundleOptions.workflowsPath;
     return {
       ...bundleOptions,
       workflowInterceptorModules: [...(bundleOptions.workflowInterceptorModules || []), this.interceptorModule],
       webpackConfigHook: (config: WebpackConfigType) => {
-        config = this.addInstrumenterRule(workflowsPath, config);
+        config = this.addInstrumenterRule(config);
 
         const existingWebpackConfigHook = bundleOptions.webpackConfigHook;
         if (existingWebpackConfigHook !== undefined) {
@@ -131,7 +129,7 @@ export class WorkflowCoverage {
       coverage: {
         merge: {
           fn: (_workflowInfo, testCoverage) => {
-            this.coverageMap.merge(testCoverage);
+            this.coverageMapsData.push(testCoverage);
           },
           callDuringReplay: false,
         },
@@ -140,28 +138,52 @@ export class WorkflowCoverage {
   }
 
   /**
-   * Modify the given Worker config to auto instrument Workflow
-   * code using istanbul-instrumenter-loader
+   * Modify the given Worker config to auto instrument Workflows
    */
-  addInstrumenterRule(workflowsPath: string, config: WebpackConfigType): WebpackConfigType {
+  addInstrumenterRule(config: WebpackConfigType): WebpackConfigType {
     if (!this.hasCoverageGlobal()) {
       return config;
     }
 
-    const newRule = {
+    const rules = config?.module?.rules || [];
+
+    if (Object.keys(require.cache).some((file) => file.includes('ts-node/register'))) {
+      // ts-node is currently loaded
+      // ts-node and SWC doesn't translate TypeScript code the same way, which will cause
+      // line number mismatches in generated coverage reports.
+      const tsLoaderRule = {
+        test: /\.ts$/,
+        loader: require.resolve('ts-loader'),
+        exclude: /node_modules/,
+      };
+
+      const swcRuleIndex = rules.findIndex((rule) => {
+        const loader = (rule as any).use?.loader;
+        return loader && loader.indexOf('swc-loader') >= 0;
+      });
+
+      rules[swcRuleIndex] = tsLoaderRule;
+    }
+
+    rules.push({
       use: {
-        loader: require.resolve('istanbul-instrumenter-loader'),
-        options: { esModules: true },
+        loader: require.resolve('./loader'),
       },
       enforce: 'post' as const,
-      include: workflowsPath,
-    };
+      test: /\.[tj]s$/,
+      exclude: [
+        /\/node_modules\//,
+        path.dirname(require.resolve('@temporalio/common')),
+        path.dirname(require.resolve('@temporalio/workflow')),
+        path.dirname(require.resolve('@temporalio/nyc-test-coverage')),
+      ],
+    });
 
     return {
       ...config,
       module: {
         ...config?.module,
-        rules: [...(config?.module?.rules || []), newRule],
+        rules,
       },
     };
   }
@@ -175,21 +197,11 @@ export class WorkflowCoverage {
       return;
     }
 
-    /* eslint-disable @typescript-eslint/ban-ts-comment */
-    // @ts-ignore
-    this.coverageMap.merge(global.__coverage__);
-
-    const coverageMapData: libCoverage.CoverageMapData = Object.keys(this.coverageMap.data).reduce(
-      (cur: libCoverage.CoverageMapData, path) => {
-        const fileCoverage = this.coverageMap.data[path] as libCoverage.FileCoverage;
-
-        cur[path] = fileCoverage.data;
-        return cur;
-      },
-      {}
-    );
+    const coverageMap = libCoverage.createCoverageMap();
+    this.coverageMapsData.unshift(global.__coverage__);
+    for (const data of this.coverageMapsData) coverageMap.merge(data);
+    this.coverageMapsData = [];
 
-    // @ts-ignore
-    global.__coverage__ = coverageMapData;
+    global.__coverage__ = coverageMap.data;
   }
 }

package/src/interceptors.ts

@@ -12,9 +12,13 @@ export const interceptors = (): WorkflowInterceptors => ({
         /* eslint-disable @typescript-eslint/ban-ts-comment */
         // @ts-ignore
         const globalCoverage: CoverageMapData = global.__coverage__;
-
-        coverage.merge(JSON.parse(JSON.stringify(globalCoverage)));
-        clearCoverage(globalCoverage);
+        if (globalCoverage) {
+          // Send coverage data through the sink to be merged into the _real_ global coverage map
+          // Make a deep copy first, otherwise clearCoverage may wipe out the data
+          // before it actually get processed by the sink
+          coverage.merge(JSON.parse(JSON.stringify(globalCoverage)));
+          clearCoverage(globalCoverage);
+        }
 
         return next(input);
       },

package/src/loader.ts

@@ -0,0 +1,24 @@
+import { createInstrumenter } from 'istanbul-lib-instrument';
+import * as convert from 'convert-source-map';
+import type { LoaderDefinitionFunction } from 'webpack';
+
+const instrumentWithIstanbulLoader: LoaderDefinitionFunction = function (source, sourceMap): void {
+  let srcMap = sourceMap ?? convert.fromSource(source)?.sourcemap;
+  if (typeof srcMap === 'string') srcMap = JSON.parse(srcMap);
+
+  const instrumenter = createInstrumenter({
+    esModules: true,
+    produceSourceMap: true,
+  });
+
+  instrumenter.instrument(
+    source,
+    this.resourcePath,
+    (error, instrumentedSource) => {
+      this.callback(error, instrumentedSource, instrumenter.lastSourceMap() as any);
+    },
+    srcMap as any
+  );
+};
+
+export default instrumentWithIstanbulLoader;