@jsenv/test 3.5.45 → 3.6.1

package/dist/jsenv_test.js

@@ -3,8 +3,8 @@ 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, filterV8Coverage } from "./js/v8_coverage.js";
 import { readdir, chmod, stat, lstat, chmodSync, statSync, lstatSync, promises, readFile as readFile$1, unlinkSync, openSync, closeSync, readdirSync, rmdirSync, mkdirSync, readFileSync, writeFileSync as writeFileSync$1, unlink, rmdir, existsSync } from "node:fs";
+import { URL_META, filterV8Coverage } from "./js/v8_coverage.js";
 import { dirname } from "node:path";
 import crypto from "node:crypto";
 import { readGitHubWorkflowEnv, startGithubCheckRun } from "@jsenv/github-check-run";
@@ -531,24 +531,6 @@ const SIGINT_CALLBACK = {
   },
 };
 
-const createDetailedMessage = (message, details = {}) => {
-  let string = `${message}`;
-
-  Object.keys(details).forEach((key) => {
-    const value = details[key];
-    string += `
---- ${key} ---
-${
-  Array.isArray(value)
-    ? value.join(`
-`)
-    : value
-}`;
-  });
-
-  return string;
-};
-
 // From: https://github.com/sindresorhus/has-flag/blob/main/index.js
 /// function hasFlag(flag, argv = globalThis.Deno?.args ?? process.argv) {
 function hasFlag(flag, argv = globalThis.Deno ? globalThis.Deno.args : process$1.argv) {
@@ -738,6 +720,125 @@ function createSupportsColor(stream, options = {}) {
 	stderr: createSupportsColor({isTTY: tty.isatty(2)}),
 });
 
+function isUnicodeSupported() {
+	const {env} = process$1;
+	const {TERM, TERM_PROGRAM} = env;
+
+	if (process$1.platform !== 'win32') {
+		return TERM !== 'linux'; // Linux console (kernel)
+	}
+
+	return Boolean(env.WT_SESSION) // Windows Terminal
+		|| Boolean(env.TERMINUS_SUBLIME) // Terminus (<0.2.27)
+		|| env.ConEmuTask === '{cmd::Cmder}' // ConEmu and cmder
+		|| TERM_PROGRAM === 'Terminus-Sublime'
+		|| TERM_PROGRAM === 'vscode'
+		|| TERM === 'xterm-256color'
+		|| TERM === 'alacritty'
+		|| TERM === 'rxvt-unicode'
+		|| TERM === 'rxvt-unicode-256color'
+		|| env.TERMINAL_EMULATOR === 'JetBrains-JediTerm';
+}
+
+/* globals WorkerGlobalScope, DedicatedWorkerGlobalScope, SharedWorkerGlobalScope, ServiceWorkerGlobalScope */
+
+const isBrowser = globalThis.window?.document !== undefined;
+
+globalThis.process?.versions?.node !== undefined;
+
+globalThis.process?.versions?.bun !== undefined;
+
+globalThis.Deno?.version?.deno !== undefined;
+
+globalThis.process?.versions?.electron !== undefined;
+
+globalThis.navigator?.userAgent?.includes('jsdom') === true;
+
+typeof WorkerGlobalScope !== 'undefined' && globalThis instanceof WorkerGlobalScope;
+
+typeof DedicatedWorkerGlobalScope !== 'undefined' && globalThis instanceof DedicatedWorkerGlobalScope;
+
+typeof SharedWorkerGlobalScope !== 'undefined' && globalThis instanceof SharedWorkerGlobalScope;
+
+typeof ServiceWorkerGlobalScope !== 'undefined' && globalThis instanceof ServiceWorkerGlobalScope;
+
+// Note: I'm intentionally not DRYing up the other variables to keep them "lazy".
+const platform = globalThis.navigator?.userAgentData?.platform;
+
+platform === 'macOS'
+	|| globalThis.navigator?.platform === 'MacIntel' // Even on Apple silicon Macs.
+	|| globalThis.navigator?.userAgent?.includes(' Mac ') === true
+	|| globalThis.process?.platform === 'darwin';
+
+platform === 'Windows'
+	|| globalThis.navigator?.platform === 'Win32'
+	|| globalThis.process?.platform === 'win32';
+
+platform === 'Linux'
+	|| globalThis.navigator?.platform?.startsWith('Linux') === true
+	|| globalThis.navigator?.userAgent?.includes(' Linux ') === true
+	|| globalThis.process?.platform === 'linux';
+
+platform === 'Android'
+	|| globalThis.navigator?.platform === 'Android'
+	|| globalThis.navigator?.userAgent?.includes(' Android ') === true
+	|| globalThis.process?.platform === 'android';
+
+const ESC = '\u001B[';
+
+!isBrowser && process$1.env.TERM_PROGRAM === 'Apple_Terminal';
+const isWindows$3 = !isBrowser && process$1.platform === 'win32';
+
+isBrowser ? () => {
+	throw new Error('`process.cwd()` only works in Node.js, not the browser.');
+} : process$1.cwd;
+
+const cursorUp = (count = 1) => ESC + count + 'A';
+
+const cursorLeft = ESC + 'G';
+
+const eraseLines = count => {
+	let clear = '';
+
+	for (let i = 0; i < count; i++) {
+		clear += eraseLine + (i < count - 1 ? cursorUp() : '');
+	}
+
+	if (count) {
+		clear += cursorLeft;
+	}
+
+	return clear;
+};
+const eraseLine = ESC + '2K';
+const eraseScreen = ESC + '2J';
+
+const clearTerminal = isWindows$3
+	? `${eraseScreen}${ESC}0f`
+	// 1. Erases the screen (Only done in case `2` is not supported)
+	// 2. Erases the whole screen including scrollback buffer
+	// 3. Moves cursor to the top-left position
+	// More info: https://www.real-world-systems.com/docs/ANSIcode.html
+	:	`${eraseScreen}${ESC}3J${ESC}H`;
+
+const createDetailedMessage = (message, details = {}) => {
+  let string = `${message}`;
+
+  Object.keys(details).forEach((key) => {
+    const value = details[key];
+    string += `
+--- ${key} ---
+${
+  Array.isArray(value)
+    ? value.join(`
+`)
+    : value
+}`;
+  });
+
+  return string;
+};
+
 // https://github.com/Marak/colors.js/blob/master/lib/styles.js
 // https://stackoverflow.com/a/75985833/2634179
 const RESET = "\x1b[0m";
@@ -799,26 +900,6 @@ const ANSI = createAnsi({
     process.env.GITHUB_WORKFLOW,
 });
 
-function isUnicodeSupported() {
-	const {env} = process$1;
-	const {TERM, TERM_PROGRAM} = env;
-
-	if (process$1.platform !== 'win32') {
-		return TERM !== 'linux'; // Linux console (kernel)
-	}
-
-	return Boolean(env.WT_SESSION) // Windows Terminal
-		|| Boolean(env.TERMINUS_SUBLIME) // Terminus (<0.2.27)
-		|| env.ConEmuTask === '{cmd::Cmder}' // ConEmu and cmder
-		|| TERM_PROGRAM === 'Terminus-Sublime'
-		|| TERM_PROGRAM === 'vscode'
-		|| TERM === 'xterm-256color'
-		|| TERM === 'alacritty'
-		|| TERM === 'rxvt-unicode'
-		|| TERM === 'rxvt-unicode-256color'
-		|| env.TERMINAL_EMULATOR === 'JetBrains-JediTerm';
-}
-
 // see also https://github.com/sindresorhus/figures
 
 const createUnicode = ({ supported, ANSI }) => {
@@ -932,23 +1013,6 @@ const setDecimalsPrecision = (
   const asFloat = asInteger / coef;
   return number < 0 ? -asFloat : asFloat;
 };
-
-// https://www.codingem.com/javascript-how-to-limit-decimal-places/
-// export const roundNumber = (number, maxDecimals) => {
-//   const decimalsExp = Math.pow(10, maxDecimals)
-//   const numberRoundInt = Math.round(decimalsExp * (number + Number.EPSILON))
-//   const numberRoundFloat = numberRoundInt / decimalsExp
-//   return numberRoundFloat
-// }
-
-// export const setPrecision = (number, precision) => {
-//   if (Math.floor(number) === number) return number
-//   const [int, decimals] = number.toString().split(".")
-//   if (precision <= 0) return int
-//   const numberTruncated = `${int}.${decimals.slice(0, precision)}`
-//   return numberTruncated
-// }
-
 const unitShort = {
   year: "y",
   month: "m",
@@ -1359,87 +1423,6 @@ const error = (...args) => console.error(...args);
 
 const errorDisabled = () => {};
 
-/* globals WorkerGlobalScope, DedicatedWorkerGlobalScope, SharedWorkerGlobalScope, ServiceWorkerGlobalScope */
-
-const isBrowser = globalThis.window?.document !== undefined;
-
-globalThis.process?.versions?.node !== undefined;
-
-globalThis.process?.versions?.bun !== undefined;
-
-globalThis.Deno?.version?.deno !== undefined;
-
-globalThis.process?.versions?.electron !== undefined;
-
-globalThis.navigator?.userAgent?.includes('jsdom') === true;
-
-typeof WorkerGlobalScope !== 'undefined' && globalThis instanceof WorkerGlobalScope;
-
-typeof DedicatedWorkerGlobalScope !== 'undefined' && globalThis instanceof DedicatedWorkerGlobalScope;
-
-typeof SharedWorkerGlobalScope !== 'undefined' && globalThis instanceof SharedWorkerGlobalScope;
-
-typeof ServiceWorkerGlobalScope !== 'undefined' && globalThis instanceof ServiceWorkerGlobalScope;
-
-// Note: I'm intentionally not DRYing up the other variables to keep them "lazy".
-const platform = globalThis.navigator?.userAgentData?.platform;
-
-platform === 'macOS'
-	|| globalThis.navigator?.platform === 'MacIntel' // Even on Apple silicon Macs.
-	|| globalThis.navigator?.userAgent?.includes(' Mac ') === true
-	|| globalThis.process?.platform === 'darwin';
-
-platform === 'Windows'
-	|| globalThis.navigator?.platform === 'Win32'
-	|| globalThis.process?.platform === 'win32';
-
-platform === 'Linux'
-	|| globalThis.navigator?.platform?.startsWith('Linux') === true
-	|| globalThis.navigator?.userAgent?.includes(' Linux ') === true
-	|| globalThis.process?.platform === 'linux';
-
-platform === 'Android'
-	|| globalThis.navigator?.platform === 'Android'
-	|| globalThis.navigator?.userAgent?.includes(' Android ') === true
-	|| globalThis.process?.platform === 'android';
-
-const ESC = '\u001B[';
-
-!isBrowser && process$1.env.TERM_PROGRAM === 'Apple_Terminal';
-const isWindows$3 = !isBrowser && process$1.platform === 'win32';
-
-isBrowser ? () => {
-	throw new Error('`process.cwd()` only works in Node.js, not the browser.');
-} : process$1.cwd;
-
-const cursorUp = (count = 1) => ESC + count + 'A';
-
-const cursorLeft = ESC + 'G';
-
-const eraseLines = count => {
-	let clear = '';
-
-	for (let i = 0; i < count; i++) {
-		clear += eraseLine + (i < count - 1 ? cursorUp() : '');
-	}
-
-	if (count) {
-		clear += cursorLeft;
-	}
-
-	return clear;
-};
-const eraseLine = ESC + '2K';
-const eraseScreen = ESC + '2J';
-
-const clearTerminal = isWindows$3
-	? `${eraseScreen}${ESC}0f`
-	// 1. Erases the screen (Only done in case `2` is not supported)
-	// 2. Erases the whole screen including scrollback buffer
-	// 3. Moves cursor to the top-left position
-	// More info: https://www.real-world-systems.com/docs/ANSIcode.html
-	:	`${eraseScreen}${ESC}3J${ESC}H`;
-
 /*
  * see also https://github.com/vadimdemedes/ink
  */
@@ -1624,6 +1607,34 @@ const spyStreamOutput = (stream, callback) => {
   };
 };
 
+const pathnameToExtension = (pathname) => {
+  const slashLastIndex = pathname.lastIndexOf("/");
+  const filename =
+    slashLastIndex === -1 ? pathname : pathname.slice(slashLastIndex + 1);
+  if (filename.match(/@([0-9])+(\.[0-9]+)?(\.[0-9]+)?$/)) {
+    return "";
+  }
+  const dotLastIndex = filename.lastIndexOf(".");
+  if (dotLastIndex === -1) {
+    return "";
+  }
+  // if (dotLastIndex === pathname.length - 1) return ""
+  const extension = filename.slice(dotLastIndex);
+  return extension;
+};
+
+const resourceToPathname = (resource) => {
+  const searchSeparatorIndex = resource.indexOf("?");
+  if (searchSeparatorIndex > -1) {
+    return resource.slice(0, searchSeparatorIndex);
+  }
+  const hashIndex = resource.indexOf("#");
+  if (hashIndex > -1) {
+    return resource.slice(0, hashIndex);
+  }
+  return resource;
+};
+
 const urlToScheme = (url) => {
   const urlString = String(url);
   const colonIndex = urlString.indexOf(":");
@@ -1661,36 +1672,11 @@ const urlToPathname = (url) => {
   return pathname;
 };
 
-const resourceToPathname = (resource) => {
-  const searchSeparatorIndex = resource.indexOf("?");
-  if (searchSeparatorIndex > -1) {
-    return resource.slice(0, searchSeparatorIndex);
-  }
-  const hashIndex = resource.indexOf("#");
-  if (hashIndex > -1) {
-    return resource.slice(0, hashIndex);
-  }
-  return resource;
-};
-
 const urlToExtension = (url) => {
   const pathname = urlToPathname(url);
   return pathnameToExtension(pathname);
 };
 
-const pathnameToExtension = (pathname) => {
-  const slashLastIndex = pathname.lastIndexOf("/");
-  if (slashLastIndex !== -1) {
-    pathname = pathname.slice(slashLastIndex + 1);
-  }
-
-  const dotLastIndex = pathname.lastIndexOf(".");
-  if (dotLastIndex === -1) return "";
-  // if (dotLastIndex === pathname.length - 1) return ""
-  const extension = pathname.slice(dotLastIndex);
-  return extension;
-};
-
 const transformUrlPathname = (url, transformer) => {
   if (typeof url === "string") {
     const urlObject = new URL(url);
@@ -5879,14 +5865,23 @@ const startServerUsingCommand = async (
   }
 };
 
-const startServerUsingModuleUrl = async (webServer, params) => {
+const startServerUsingModuleUrl = async (
+  webServer,
+  { ignoreProcessExecArgv, ...params },
+) => {
   if (!existsSync(new URL(webServer.moduleUrl))) {
     throw new Error(`"${webServer.moduleUrl}" does not lead to a file`);
   }
+  let command = `node`;
+  if (!ignoreProcessExecArgv && process.execArgv.length > 0) {
+    command += ` ${process.execArgv.join(" ")}`;
+  }
+  command += ` ${fileURLToPath(webServer.moduleUrl)}`;
+
   return startServerUsingCommand(
     {
       ...webServer,
-      command: `node ${fileURLToPath(webServer.moduleUrl)}`,
+      command,
       args: ["--jsenv-test"],
     },
     params,
@@ -5926,20 +5921,20 @@ const assertAndNormalizeWebServer = async (
     teardownCallbackSet,
     logger,
   });
-  const { headers } = await basicFetch(webServer.origin, {
-    method: "GET",
-    rejectUnauthorized: false,
-    headers: {
-      "x-server-inspect": "1",
+  const serverJsonResponse = await basicFetch(
+    `${webServer.origin}/.internal/server.json`,
+    {
+      method: "GET",
+      rejectUnauthorized: false,
     },
-  });
-  if (String(headers["server"]).includes("jsenv_dev_server")) {
+  );
+  if (
+    serverJsonResponse.status === 200 &&
+    String(serverJsonResponse.headers["server"]).includes("jsenv_dev_server")
+  ) {
     webServer.isJsenvDevServer = true;
-    const { json } = await basicFetch(`${webServer.origin}/__params__.json`, {
-      rejectUnauthorized: false,
-    });
     if (webServer.rootDirectoryUrl === undefined) {
-      const jsenvDevServerParams = await json();
+      const jsenvDevServerParams = await serverJsonResponse.json();
       webServer.rootDirectoryUrl = jsenvDevServerParams.sourceDirectoryUrl;
     } else {
       webServer.rootDirectoryUrl = assertAndNormalizeDirectoryUrl(
@@ -5957,7 +5952,13 @@ const assertAndNormalizeWebServer = async (
 
 const ensureWebServerIsStarted = async (
   webServer,
-  { signal, teardownCallbackSet, logger, allocatedMs = 5_000 },
+  {
+    signal,
+    teardownCallbackSet,
+    logger,
+    allocatedMs = 5_000,
+    ignoreProcessExecArgv,
+  },
 ) => {
   const aServerIsListening = await pingServer(webServer.origin);
   if (aServerIsListening) {
@@ -5965,6 +5966,7 @@ const ensureWebServerIsStarted = async (
   }
   if (webServer.moduleUrl) {
     await startServerUsingModuleUrl(webServer, {
+      ignoreProcessExecArgv,
       signal,
       allocatedMs,
       teardownCallbackSet,
@@ -5974,6 +5976,7 @@ const ensureWebServerIsStarted = async (
   }
   if (webServer.command) {
     await startServerUsingCommand(webServer, {
+      ignoreProcessExecArgv,
       signal,
       allocatedMs,
       teardownCallbackSet,
@@ -8333,7 +8336,7 @@ const EXIT_CODES = {
 };
 
 const IMPORTMAP_NODE_LOADER_FILE_URL = new URL(
-  "./importmap_node_loader.mjs",
+  "./js/importmap_node_loader.mjs",
   import.meta.url,
 ).href;
 
@@ -8413,12 +8416,12 @@ const killProcessTree = async (
 };
 
 const NO_EXPERIMENTAL_WARNING_FILE_URL = new URL(
-  "./no_experimental_warnings.cjs",
+  "./js/no_experimental_warnings.cjs",
   import.meta.url,
 ).href;
 
 const CONTROLLED_CHILD_PROCESS_URL = new URL(
-  "./node_child_process_controlled.mjs",
+  "./js/node_child_process_controlled.mjs",
   import.meta.url,
 ).href;
 
@@ -8906,7 +8909,7 @@ const onceChildProcessEvent = (childProcess, type, callback) => {
 // https://github.com/avajs/ava/blob/576f534b345259055c95fa0c2b33bef10847a2af/lib/worker/base.js
 
 const CONTROLLED_WORKER_THREAD_URL = new URL(
-  "./node_worker_thread_controlled.mjs",
+  "./js/node_worker_thread_controlled.mjs",
   import.meta.url,
 ).href;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/test",
-  "version": "3.5.45",
+  "version": "3.6.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -36,18 +36,18 @@
   },
   "dependencies": {
     "@c88/v8-coverage": "0.1.1",
-    "@jsenv/abort": "4.3.0",
-    "@jsenv/ast": "6.5.2",
-    "@jsenv/exception": "1.1.4",
-    "@jsenv/filesystem": "4.13.5",
-    "@jsenv/github-check-run": "0.2.12",
-    "@jsenv/node-esm-resolution": "1.0.7",
-    "@jsenv/humanize": "1.2.8",
-    "@jsenv/plugin-supervisor": "1.6.6",
-    "@jsenv/sourcemap": "1.2.30",
-    "@jsenv/url-meta": "8.5.3",
-    "@jsenv/urls": "2.6.0",
-    "@jsenv/utils": "2.1.3",
+    "@jsenv/abort": "4.3.1",
+    "@jsenv/ast": "6.6.0",
+    "@jsenv/exception": "1.1.5",
+    "@jsenv/filesystem": "4.14.0",
+    "@jsenv/github-check-run": "0.2.14",
+    "@jsenv/node-esm-resolution": "1.1.0",
+    "@jsenv/humanize": "1.3.0",
+    "@jsenv/plugin-supervisor": "1.6.7",
+    "@jsenv/sourcemap": "1.3.0",
+    "@jsenv/url-meta": "8.5.4",
+    "@jsenv/urls": "2.6.1",
+    "@jsenv/utils": "2.2.0",
     "he": "1.2.0",
     "istanbul-lib-coverage": "3.2.2",
     "istanbul-lib-instrument": "6.0.3",

package/src/execution/web_server/start_using_module_url.js

@@ -3,14 +3,23 @@ import { fileURLToPath } from "node:url";
 
 import { startServerUsingCommand } from "./start_using_command.js";
 
-export const startServerUsingModuleUrl = async (webServer, params) => {
+export const startServerUsingModuleUrl = async (
+  webServer,
+  { ignoreProcessExecArgv, ...params },
+) => {
   if (!existsSync(new URL(webServer.moduleUrl))) {
     throw new Error(`"${webServer.moduleUrl}" does not lead to a file`);
   }
+  let command = `node`;
+  if (!ignoreProcessExecArgv && process.execArgv.length > 0) {
+    command += ` ${process.execArgv.join(" ")}`;
+  }
+  command += ` ${fileURLToPath(webServer.moduleUrl)}`;
+
   return startServerUsingCommand(
     {
       ...webServer,
-      command: `node ${fileURLToPath(webServer.moduleUrl)}`,
+      command,
       args: ["--jsenv-test"],
     },
     params,

package/src/execution/web_server_param.js

@@ -37,20 +37,20 @@ export const assertAndNormalizeWebServer = async (
     teardownCallbackSet,
     logger,
   });
-  const { headers } = await basicFetch(webServer.origin, {
-    method: "GET",
-    rejectUnauthorized: false,
-    headers: {
-      "x-server-inspect": "1",
+  const serverJsonResponse = await basicFetch(
+    `${webServer.origin}/.internal/server.json`,
+    {
+      method: "GET",
+      rejectUnauthorized: false,
     },
-  });
-  if (String(headers["server"]).includes("jsenv_dev_server")) {
+  );
+  if (
+    serverJsonResponse.status === 200 &&
+    String(serverJsonResponse.headers["server"]).includes("jsenv_dev_server")
+  ) {
     webServer.isJsenvDevServer = true;
-    const { json } = await basicFetch(`${webServer.origin}/__params__.json`, {
-      rejectUnauthorized: false,
-    });
     if (webServer.rootDirectoryUrl === undefined) {
-      const jsenvDevServerParams = await json();
+      const jsenvDevServerParams = await serverJsonResponse.json();
       webServer.rootDirectoryUrl = jsenvDevServerParams.sourceDirectoryUrl;
     } else {
       webServer.rootDirectoryUrl = assertAndNormalizeDirectoryUrl(
@@ -68,7 +68,13 @@ export const assertAndNormalizeWebServer = async (
 
 export const ensureWebServerIsStarted = async (
   webServer,
-  { signal, teardownCallbackSet, logger, allocatedMs = 5_000 },
+  {
+    signal,
+    teardownCallbackSet,
+    logger,
+    allocatedMs = 5_000,
+    ignoreProcessExecArgv,
+  },
 ) => {
   const aServerIsListening = await pingServer(webServer.origin);
   if (aServerIsListening) {
@@ -76,6 +82,7 @@ export const ensureWebServerIsStarted = async (
   }
   if (webServer.moduleUrl) {
     await startServerUsingModuleUrl(webServer, {
+      ignoreProcessExecArgv,
       signal,
       allocatedMs,
       teardownCallbackSet,
@@ -85,6 +92,7 @@ export const ensureWebServerIsStarted = async (
   }
   if (webServer.command) {
     await startServerUsingCommand(webServer, {
+      ignoreProcessExecArgv,
       signal,
       allocatedMs,
       teardownCallbackSet,

package/dist/importmap_node_loader.mjs

@@ -1,3 +0,0 @@
-import { register } from "node:module";
-
-register(new URL("./js/importmap_hooks.mjs", import.meta.url));