@jsenv/test 1.6.4 → 1.6.6

package/src/execution/run.js

@@ -10,7 +10,7 @@
  * - File execution result is returned, it contains status/errors/namespace/consoleCalls
  */
 
-import { createId } from "@paralleldrive/cuid2";
+import crypto from "node:crypto";
 import { Abort, raceCallbacks } from "@jsenv/abort";
 import { ensureParentDirectories } from "@jsenv/filesystem";
 
@@ -73,7 +73,7 @@ export const run = async ({
   let coverageFileUrl;
   if (coverageEnabled) {
     coverageFileUrl = new URL(
-      `./${runtime.name}/${createId()}.json`,
+      `./${runtime.name}/${crypto.randomUUID()}.json`,
       coverageTempDirectoryUrl,
     ).href;
     await ensureParentDirectories(coverageFileUrl);

package/src/runtime_node/importmap_hooks.mjs

@@ -0,0 +1,51 @@
+import { readFileSync } from "node:fs";
+import { pathToFileURL } from "node:url";
+import { normalizeImportMap, resolveImport } from "@jsenv/importmap";
+
+let importMap;
+
+const cwdUrl = `${String(pathToFileURL(process.cwd()))}/`;
+
+if (process.env.IMPORT_MAP) {
+  importMap = JSON.parse(process.env.IMPORT_MAP);
+} else if (process.env.IMPORT_MAP_PATH) {
+  const importmapFileUrl = pathToFileURL(process.env.IMPORT_MAP_PATH);
+  const importmapFileContentAsString = readFileSync(importmapFileUrl, "utf8");
+  importMap = JSON.parse(importmapFileContentAsString);
+} else {
+  const importmapFileUrl = new URL("./import_map.json", cwdUrl);
+  const importmapFileContentAsString = readFileSync(importmapFileUrl, "utf8");
+  importMap = JSON.parse(importmapFileContentAsString);
+}
+
+const importMapBaseUrl = process.env.IMPORT_MAP_BASE_URL || cwdUrl;
+importMap = normalizeImportMap(importMap, importMapBaseUrl);
+
+export const resolve = (specifier, context, nextResolve) => {
+  try {
+    let mapped;
+    const importer = context.parentURL ? String(context.parentURL) : undefined;
+    const resolved = resolveImport({
+      specifier,
+      importer,
+      importMap,
+      defaultExtension: ".js",
+      onImportMapping: () => {
+        mapped = true;
+      },
+    });
+    if (mapped) {
+      return {
+        shortCircuit: true,
+        url: resolved,
+      };
+    }
+  } catch (e) {
+    if (e.message.includes("bare specifier")) {
+      return nextResolve(specifier, context);
+    }
+    console.error(e);
+    return nextResolve(specifier, context);
+  }
+  return nextResolve(specifier, context);
+};

package/src/runtime_node/importmap_node_loader.mjs

@@ -1,51 +1,3 @@
-import { readFileSync } from "node:fs";
-import { pathToFileURL } from "node:url";
-import { normalizeImportMap, resolveImport } from "@jsenv/importmap";
+import { register } from "node:module";
 
-let importMap;
-
-const cwdUrl = `${String(pathToFileURL(process.cwd()))}/`;
-
-if (process.env.IMPORT_MAP) {
-  importMap = JSON.parse(process.env.IMPORT_MAP);
-} else if (process.env.IMPORT_MAP_PATH) {
-  const importmapFileUrl = pathToFileURL(process.env.IMPORT_MAP_PATH);
-  const importmapFileContentAsString = readFileSync(importmapFileUrl, "utf8");
-  importMap = JSON.parse(importmapFileContentAsString);
-} else {
-  const importmapFileUrl = new URL("./import_map.json", cwdUrl);
-  const importmapFileContentAsString = readFileSync(importmapFileUrl, "utf8");
-  importMap = JSON.parse(importmapFileContentAsString);
-}
-
-const importMapBaseUrl = process.env.IMPORT_MAP_BASE_URL || cwdUrl;
-importMap = normalizeImportMap(importMap, importMapBaseUrl);
-
-export const resolve = (specifier, context, nextResolve) => {
-  try {
-    let mapped;
-    const importer = context.parentURL ? String(context.parentURL) : undefined;
-    const resolved = resolveImport({
-      specifier,
-      importer,
-      importMap,
-      defaultExtension: ".js",
-      onImportMapping: () => {
-        mapped = true;
-      },
-    });
-    if (mapped) {
-      return {
-        shortCircuit: true,
-        url: resolved,
-      };
-    }
-  } catch (e) {
-    if (e.message.includes("bare specifier")) {
-      return nextResolve(specifier, context);
-    }
-    console.error(e);
-    return nextResolve(specifier, context);
-  }
-  return nextResolve(specifier, context);
-};
+register(new URL("./importmap_hooks.mjs", import.meta.url));

package/src/runtime_node/node_worker_thread.js

@@ -65,9 +65,7 @@ export const nodeWorkerThread = ({
       if (importMap) {
         env.IMPORT_MAP = JSON.stringify(importMap);
         env.IMPORT_MAP_BASE_URL = rootDirectoryUrl;
-        commandLineOptions.push(
-          `--experimental-loader=${IMPORTMAP_NODE_LOADER_FILE_URL}`,
-        );
+        commandLineOptions.push(`--import=${IMPORTMAP_NODE_LOADER_FILE_URL}`);
         commandLineOptions.push(
           `--require=${fileURLToPath(NO_EXPERIMENTAL_WARNING_FILE_URL)}`,
         );