@jsenv/test 3.3.17 → 3.3.19

package/dist/jsenv_test.js

@@ -3,7 +3,7 @@ import os, { cpus, release, totalmem, availableParallelism, freemem } from "node
 import tty from "node:tty";
 import stringWidth from "string-width";
 import { pathToFileURL, fileURLToPath } from "node:url";
-import { URL_META, createException } from "./js/exception.js";
+import { URL_META, filterV8Coverage } from "./js/v8_coverage.js";
 import { readdir, chmod, stat, lstat, chmodSync, statSync, lstatSync, promises, readFile as readFile$1, readFileSync, writeFileSync as writeFileSync$1, mkdirSync, unlink, openSync, closeSync, rmdir, unlinkSync, readdirSync, rmdirSync, existsSync } from "node:fs";
 import { dirname } from "node:path";
 import crypto from "node:crypto";
@@ -12,7 +12,7 @@ import { takeCoverage } from "node:v8";
 import stripAnsi from "strip-ansi";
 import { createRequire } from "node:module";
 import { applyBabelPlugins } from "@jsenv/ast";
-import { filterV8Coverage } from "./js/v8_coverage.js";
+import { createException } from "@jsenv/exception";
 import { createServer } from "node:net";
 import { spawn, spawnSync, fork } from "node:child_process";
 import { SOURCEMAP, generateSourcemapDataUrl } from "@jsenv/sourcemap";
@@ -1675,11 +1675,12 @@ const pathnameToExtension = (pathname) => {
   return extension;
 };
 
-const ensurePathnameTrailingSlash = (url) => {
+const transformUrlPathname = (url, transformer) => {
   if (typeof url === "string") {
     const urlObject = new URL(url);
     const { pathname } = urlObject;
-    if (pathname.endsWith("/")) {
+    const pathnameTransformed = transformer(pathname);
+    if (pathnameTransformed === pathname) {
       return url;
     }
     let { origin } = urlObject;
@@ -1688,15 +1689,18 @@ const ensurePathnameTrailingSlash = (url) => {
       origin = "file://";
     }
     const { search, hash } = urlObject;
-    const urlWithTrailingSlash = `${origin}${pathname}/${search}${hash}`;
-    return urlWithTrailingSlash;
-  }
-  if (url.pathname.endsWith("/")) {
-    return url;
+    const urlWithPathnameTransformed = `${origin}${pathnameTransformed}${search}${hash}`;
+    return urlWithPathnameTransformed;
   }
-  url.pathname += "/";
+  const pathnameTransformed = transformer(url.pathname);
+  url.pathname = pathnameTransformed;
   return url;
 };
+const ensurePathnameTrailingSlash = (url) => {
+  return transformUrlPathname(url, (pathname) => {
+    return pathname.endsWith("/") ? pathname : `${pathname}/`;
+  });
+};
 
 const isFileSystemPath = (value) => {
   if (typeof value !== "string") {
@@ -2816,7 +2820,6 @@ const writeDirectorySync = (
 const removeEntrySync = (
   source,
   {
-    signal = new AbortController().signal,
     allowUseless = false,
     recursive = false,
     maxRetries = 3,
@@ -2825,51 +2828,36 @@ const removeEntrySync = (
   } = {},
 ) => {
   const sourceUrl = assertAndNormalizeFileUrl(source);
-
-  const removeOperation = Abort.startOperation();
-  removeOperation.addAbortSignal(signal);
-
-  try {
-    removeOperation.throwIfAborted();
-    const sourceStats = readEntryStatSync(sourceUrl, {
-      nullIfNotFound: true,
-      followLink: false,
-    });
-    if (!sourceStats) {
-      if (allowUseless) {
-        return;
-      }
-      throw new Error(`nothing to remove at ${urlToFileSystemPath(sourceUrl)}`);
+  const sourceStats = readEntryStatSync(sourceUrl, {
+    nullIfNotFound: true,
+    followLink: false,
+  });
+  if (!sourceStats) {
+    if (allowUseless) {
+      return;
     }
+    throw new Error(`nothing to remove at ${urlToFileSystemPath(sourceUrl)}`);
+  }
 
-    // https://nodejs.org/dist/latest-v13.x/docs/api/fs.html#fs_class_fs_stats
-    // FIFO and socket are ignored, not sure what they are exactly and what to do with them
-    // other libraries ignore them, let's do the same.
-    if (
-      sourceStats.isFile() ||
-      sourceStats.isSymbolicLink() ||
-      sourceStats.isCharacterDevice() ||
-      sourceStats.isBlockDevice()
-    ) {
-      removeNonDirectory(
-        sourceUrl.endsWith("/") ? sourceUrl.slice(0, -1) : sourceUrl,
-        {
-          maxRetries,
-          retryDelay,
-        },
-      );
-    } else if (sourceStats.isDirectory()) {
-      const directoryUrl = ensurePathnameTrailingSlash(sourceUrl);
-      removeDirectorySync(directoryUrl, {
-        signal: removeOperation.signal,
-        recursive,
-        maxRetries,
-        retryDelay,
-        onlyContent,
-      });
-    }
-  } finally {
-    removeOperation.end();
+  // https://nodejs.org/dist/latest-v13.x/docs/api/fs.html#fs_class_fs_stats
+  // FIFO and socket are ignored, not sure what they are exactly and what to do with them
+  // other libraries ignore them, let's do the same.
+  if (
+    sourceStats.isFile() ||
+    sourceStats.isSymbolicLink() ||
+    sourceStats.isCharacterDevice() ||
+    sourceStats.isBlockDevice()
+  ) {
+    removeNonDirectory(
+      sourceUrl.endsWith("/") ? sourceUrl.slice(0, -1) : sourceUrl);
+  } else if (sourceStats.isDirectory()) {
+    const directoryUrl = ensurePathnameTrailingSlash(sourceUrl);
+    removeDirectorySync(directoryUrl, {
+      recursive,
+      maxRetries,
+      retryDelay,
+      onlyContent,
+    });
   }
 };
 
@@ -2904,13 +2892,9 @@ const unlinkSyncNaive = (sourcePath, { handleTemporaryError = null } = {}) => {
 
 const removeDirectorySync = (
   rootDirectoryUrl,
-  { signal, maxRetries, retryDelay, recursive, onlyContent },
+  { maxRetries, retryDelay, recursive, onlyContent },
 ) => {
-  const removeDirectoryOperation = Abort.startOperation();
-  removeDirectoryOperation.addAbortSignal(signal);
-
   const visit = (sourceUrl) => {
-    removeDirectoryOperation.throwIfAborted();
     const sourceStats = readEntryStatSync(sourceUrl, {
       nullIfNotFound: true,
       followLink: false,
@@ -2944,7 +2928,6 @@ const removeDirectorySync = (
           },
         }
       : {};
-    removeDirectoryOperation.throwIfAborted();
     removeDirectorySyncNaive(directoryPath, {
       ...optionsFromRecursive,
       // Workaround for https://github.com/joyent/node/issues/4337
@@ -2982,7 +2965,6 @@ const removeDirectorySync = (
   };
 
   const removeDirectoryContent = (directoryUrl) => {
-    removeDirectoryOperation.throwIfAborted();
     const entryNames = readdirSync(new URL(directoryUrl));
     for (const entryName of entryNames) {
       const url = resolveUrl(entryName, directoryUrl);
@@ -2998,14 +2980,10 @@ const removeDirectorySync = (
     removeNonDirectory(symbolicLinkUrl);
   };
 
-  try {
-    if (onlyContent) {
-      removeDirectoryContent(rootDirectoryUrl);
-    } else {
-      visitDirectory(rootDirectoryUrl);
-    }
-  } finally {
-    removeDirectoryOperation.end();
+  if (onlyContent) {
+    removeDirectoryContent(rootDirectoryUrl);
+  } else {
+    visitDirectory(rootDirectoryUrl);
   }
 };
 

package/dist/node_child_process_controlled.mjs

@@ -1,5 +1,5 @@
+import { createException } from "@jsenv/exception";
 import { memoryUsage } from "node:process";
-import { createException } from "./js/exception.js";
 import { executeUsingDynamicImport } from "./js/execute_using_dynamic_import.js";
 import "node:fs";
 import "node:perf_hooks";

package/dist/node_worker_thread_controlled.mjs

@@ -1,8 +1,8 @@
+import { createException } from "@jsenv/exception";
 import { memoryUsage } from "node:process";
 import { setFlagsFromString } from "node:v8";
 import { runInNewContext } from "node:vm";
 import { parentPort } from "node:worker_threads";
-import { createException } from "./js/exception.js";
 import { executeUsingDynamicImport } from "./js/execute_using_dynamic_import.js";
 import "node:fs";
 import "node:perf_hooks";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/test",
-  "version": "3.3.17",
+  "version": "3.3.19",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -38,16 +38,16 @@
   "dependencies": {
     "@c88/v8-coverage": "0.1.1",
     "@jsenv/abort": "4.3.0",
-    "@jsenv/ast": "6.2.6",
-    "@jsenv/filesystem": "4.9.2",
-    "@jsenv/github-check-run": "0.1.24",
+    "@jsenv/ast": "6.2.7",
+    "@jsenv/exception": "1.0.0",
+    "@jsenv/filesystem": "4.9.4",
+    "@jsenv/github-check-run": "0.1.26",
     "@jsenv/humanize": "1.2.5",
-    "@jsenv/plugin-supervisor": "1.5.7",
-    "@jsenv/sourcemap": "1.2.17",
+    "@jsenv/plugin-supervisor": "1.5.8",
+    "@jsenv/sourcemap": "1.2.18",
     "@jsenv/url-meta": "8.4.2",
-    "@jsenv/urls": "2.3.2",
-    "@jsenv/utils": "2.1.1",
-    "errorstacks": "2.4.1",
+    "@jsenv/urls": "2.4.0",
+    "@jsenv/utils": "2.1.2",
     "he": "1.2.0",
     "istanbul-lib-coverage": "3.2.2",
     "istanbul-lib-instrument": "6.0.3",

package/src/execution/run.js

@@ -11,11 +11,10 @@
  */
 
 import { Abort, raceCallbacks } from "@jsenv/abort";
+import { createException } from "@jsenv/exception";
 import { ensureParentDirectories } from "@jsenv/filesystem";
 import crypto from "node:crypto";
 
-import { createException } from "./exception.js";
-
 export const run = async ({
   signal = new AbortController().signal,
   logger,

package/src/runtime_node/execute_using_dynamic_import.js

@@ -1,7 +1,6 @@
+import { createException } from "@jsenv/exception";
 import { writeFileSync } from "node:fs";
 import { memoryUsage } from "node:process";
-
-import { createException } from "../execution/exception.js";
 import { startObservingPerformances } from "./node_execution_performance.js";
 import { startJsCoverage } from "./profiler_v8_coverage.js";
 

package/src/runtime_node/node_child_process_controlled.mjs

@@ -1,6 +1,5 @@
+import { createException } from "@jsenv/exception";
 import { memoryUsage } from "node:process";
-
-import { createException } from "../execution/exception.js";
 import { executeUsingDynamicImport } from "./execute_using_dynamic_import.js";
 
 let memoryHeapUsedAtStart;

package/src/runtime_node/node_worker_thread_controlled.mjs

@@ -1,9 +1,8 @@
+import { createException } from "@jsenv/exception";
 import { memoryUsage } from "node:process";
 import { setFlagsFromString } from "node:v8";
 import { runInNewContext } from "node:vm";
 import { parentPort } from "node:worker_threads";
-
-import { createException } from "../execution/exception.js";
 import { executeUsingDynamicImport } from "./execute_using_dynamic_import.js";
 
 setFlagsFromString("--expose_gc");