@jsenv/test 1.2.2 → 1.2.4

package/dist/jsenv_test.js

@@ -15,7 +15,7 @@ import { applyBabelPlugins } from "@jsenv/ast";
 import { createId } from "@paralleldrive/cuid2";
 import { runInNewContext } from "node:vm";
 import wrapAnsi from "wrap-ansi";
-import { injectSupervisorIntoHTML, supervisorFileUrl } from "@jsenv/plugin-supervisor/src/html_supervisor_injection.js";
+import { injectSupervisorIntoHTML, supervisorFileUrl } from "@jsenv/plugin-supervisor";
 import { SOURCEMAP, generateSourcemapDataUrl } from "@jsenv/sourcemap";
 import { fork } from "node:child_process";
 import { findFreePort } from "@jsenv/server";
@@ -2959,10 +2959,10 @@ const babelPluginInstrument = (api, {
     name: "transform-instrument",
     visitor: {
       Program: {
-        enter(path) {
+        enter(path, state) {
           const {
             file
-          } = this;
+          } = state;
           const {
             opts
           } = file;
@@ -2973,19 +2973,23 @@ const babelPluginInstrument = (api, {
           } else {
             inputSourceMap = opts.inputSourceMap;
           }
-          this.__dv__ = programVisitor(types, opts.filenameRelative || opts.filename, {
+          const __dv__ = programVisitor(types, opts.filenameRelative || opts.filename, {
             coverageVariable: "__coverage__",
             inputSourceMap
           });
-          this.__dv__.enter(path);
+          __dv__.enter(path);
+          file.metadata.__dv__ = __dv__;
         },
-        exit(path) {
-          if (!this.__dv__) {
+        exit(path, state) {
+          const {
+            __dv__
+          } = state.file.metadata;
+          if (!__dv__) {
             return;
           }
-          const object = this.__dv__.exit(path);
+          const object = __dv__.exit(path);
           // object got two properties: fileCoverage and sourceMappingURL
-          this.file.metadata.coverage = object.fileCoverage;
+          state.file.metadata.coverage = object.fileCoverage;
         }
       }
     }
@@ -3008,10 +3012,9 @@ const relativeUrlToEmptyCoverage = async (relativeUrl, {
       metadata
     } = await applyBabelPlugins({
       babelPlugins: [babelPluginInstrument],
-      urlInfo: {
-        originalUrl: fileUrl,
-        content
-      }
+      input: content,
+      inputIsJsModule: false,
+      inputUrl: fileUrl
     });
     const {
       coverage
@@ -4597,14 +4600,12 @@ const initIstanbulMiddleware = async (page, {
     try {
       const result = await applyBabelPlugins({
         babelPlugins: [babelPluginInstrument],
-        urlInfo: {
-          originalUrl: fileUrl,
-          // jsenv server could send info to know it's a js module or js classic
-          // but in the end it's not super important
-          // - it's ok to parse js classic as js module considering it's only for istanbul instrumentation
-          type: "js_module",
-          content: originalBody
-        }
+        input: originalBody,
+        // jsenv server could send info to know it's a js module or js classic
+        // but in the end it's not super important
+        // - it's ok to parse js classic as js module considering it's only for istanbul instrumentation
+        inputIsJsModule: true,
+        inputUrl: fileUrl
       });
       let code = result.code;
       code = SOURCEMAP.writeComment({

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@jsenv/test",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/jsenv/core",
-    "directory": "packages/rest/test"
+    "directory": "packages/related/test"
   },
   "publishConfig": {
     "access": "public"
@@ -34,10 +34,10 @@
   },
   "dependencies": {
     "@jsenv/abort": "4.2.4",
-    "@jsenv/ast": "4.0.2",
+    "@jsenv/ast": "4.0.3",
     "@jsenv/filesystem": "4.2.3",
     "@jsenv/log": "3.3.5",
-    "@jsenv/plugin-supervisor": "1.0.1",
+    "@jsenv/plugin-supervisor": "1.1.0",
     "@jsenv/urls": "2.0.0",
     "@jsenv/url-meta": "8.1.0",
     "@jsenv/uneval": "1.6.0",
@@ -49,7 +49,7 @@
     "istanbul-reports": "3.1.5",
     "@paralleldrive/cuid2": "2.2.0",
     "@c88/v8-coverage": "0.1.1",
-    "strip-ansi": "7.0.1",
+    "strip-ansi": "7.1.0",
     "wrap-ansi": "8.1.0",
     "pidtree": "0.6.0"
   }

package/src/coverage/babel_plugin_instrument.js

@@ -10,8 +10,8 @@ export const babelPluginInstrument = (api, { useInlineSourceMaps = false }) => {
     name: "transform-instrument",
     visitor: {
       Program: {
-        enter(path) {
-          const { file } = this;
+        enter(path, state) {
+          const { file } = state;
           const { opts } = file;
           let inputSourceMap;
           if (useInlineSourceMaps) {
@@ -23,7 +23,7 @@ export const babelPluginInstrument = (api, { useInlineSourceMaps = false }) => {
           } else {
             inputSourceMap = opts.inputSourceMap;
           }
-          this.__dv__ = programVisitor(
+          const __dv__ = programVisitor(
             types,
             opts.filenameRelative || opts.filename,
             {
@@ -31,16 +31,18 @@ export const babelPluginInstrument = (api, { useInlineSourceMaps = false }) => {
               inputSourceMap,
             },
           );
-          this.__dv__.enter(path);
+          __dv__.enter(path);
+          file.metadata.__dv__ = __dv__;
         },
 
-        exit(path) {
-          if (!this.__dv__) {
+        exit(path, state) {
+          const { __dv__ } = state.file.metadata;
+          if (!__dv__) {
             return;
           }
-          const object = this.__dv__.exit(path);
+          const object = __dv__.exit(path);
           // object got two properties: fileCoverage and sourceMappingURL
-          this.file.metadata.coverage = object.fileCoverage;
+          state.file.metadata.coverage = object.fileCoverage;
         },
       },
     },

package/src/coverage/empty_coverage_factory.js

@@ -20,10 +20,9 @@ export const relativeUrlToEmptyCoverage = async (
     operation.throwIfAborted();
     const { metadata } = await applyBabelPlugins({
       babelPlugins: [babelPluginInstrument],
-      urlInfo: {
-        originalUrl: fileUrl,
-        content,
-      },
+      input: content,
+      inputIsJsModule: false,
+      inputUrl: fileUrl,
     });
     const { coverage } = metadata;
     if (!coverage) {

package/src/runtime_browsers/middleware_istanbul.js

@@ -30,14 +30,12 @@ export const initIstanbulMiddleware = async (
     try {
       const result = await applyBabelPlugins({
         babelPlugins: [babelPluginInstrument],
-        urlInfo: {
-          originalUrl: fileUrl,
-          // jsenv server could send info to know it's a js module or js classic
-          // but in the end it's not super important
-          // - it's ok to parse js classic as js module considering it's only for istanbul instrumentation
-          type: "js_module",
-          content: originalBody,
-        },
+        input: originalBody,
+        // jsenv server could send info to know it's a js module or js classic
+        // but in the end it's not super important
+        // - it's ok to parse js classic as js module considering it's only for istanbul instrumentation
+        inputIsJsModule: true,
+        inputUrl: fileUrl,
       });
       let code = result.code;
       code = SOURCEMAP.writeComment({

package/src/runtime_browsers/middleware_js_supervisor.js

@@ -3,7 +3,7 @@ import { urlToExtension } from "@jsenv/urls";
 import {
   injectSupervisorIntoHTML,
   supervisorFileUrl,
-} from "@jsenv/plugin-supervisor/src/html_supervisor_injection.js";
+} from "@jsenv/plugin-supervisor";
 
 export const initJsSupervisorMiddleware = async (
   page,