@jsenv/test 1.6.9 → 1.7.0

package/src/execution/logs_file_execution.js

@@ -19,53 +19,55 @@ export const createExecutionLog = (
     executionResult,
     startMs,
     endMs,
+    nowMs,
+    timeEllapsed,
+    memoryHeap,
+    counters,
   },
   {
     logShortForCompletedExecutions,
-    counters,
     logRuntime,
     logEachDuration,
-    timeEllapsed,
-    memoryHeap,
+    logTimeUsage,
+    logMemoryHeapUsage,
   },
 ) => {
+  const label = formatExecutionLabel(
+    {
+      executionIndex,
+      executionParams,
+      executionResult,
+      timeEllapsed,
+      memoryHeap,
+      counters,
+    },
+    {
+      logTimeUsage,
+      logMemoryHeapUsage,
+    },
+  );
+
   const { status } = executionResult;
-  const descriptionFormatter = descriptionFormatters[status];
-  const description = descriptionFormatter({
-    index: executionIndex,
-    total: counters.total,
-    executionParams,
-  });
-  const summary = createIntermediateSummary({
-    executionIndex,
-    counters,
-    timeEllapsed,
-    memoryHeap,
-  });
   let log;
   if (logShortForCompletedExecutions && status === "completed") {
-    log = `${description}${summary}`;
+    log = label;
   } else {
-    const { consoleCalls = [], errors = [] } = executionResult;
-    const consoleOutput = formatConsoleCalls(consoleCalls);
-    const errorsOutput = formatErrors(errors);
-    log = formatExecution({
-      label: `${description}${summary}`,
-      details: {
-        file: fileRelativeUrl,
-        ...(logRuntime ? { runtime: `${runtimeName}/${runtimeVersion}` } : {}),
-        ...(logEachDuration
-          ? {
-              duration:
-                status === "executing"
-                  ? msAsEllapsedTime(Date.now() - startMs)
-                  : msAsDuration(endMs - startMs),
-            }
-          : {}),
+    log = formatExecution(
+      {
+        fileRelativeUrl,
+        runtimeName,
+        runtimeVersion,
+        executionResult,
+        startMs,
+        endMs,
+        nowMs,
       },
-      consoleOutput,
-      errorsOutput,
-    });
+      {
+        label,
+        logRuntime,
+        logEachDuration,
+      },
+    );
   }
 
   const { columns = 80 } = process.stdout;
@@ -86,11 +88,96 @@ export const createExecutionLog = (
   return log;
 };
 
+export const formatExecution = (
+  {
+    fileRelativeUrl,
+    runtimeName,
+    runtimeVersion,
+    executionResult,
+    startMs,
+    endMs,
+    nowMs,
+  },
+  { label, logRuntime = true, logEachDuration = true } = {},
+) => {
+  const { status } = executionResult;
+  const { consoleCalls = [], errors = [] } = executionResult;
+  const consoleOutput = formatConsoleCalls(consoleCalls);
+  const errorsOutput = formatErrors(errors);
+
+  const details = {
+    file: fileRelativeUrl,
+    ...(logRuntime ? { runtime: `${runtimeName}/${runtimeVersion}` } : {}),
+    ...(logEachDuration
+      ? {
+          duration:
+            status === "executing"
+              ? msAsEllapsedTime((nowMs || Date.now()) - startMs)
+              : msAsDuration(endMs - startMs),
+        }
+      : {}),
+  };
+  let message = ``;
+  if (label) {
+    message += label;
+  }
+  Object.keys(details).forEach((key) => {
+    if (message.length > 0) {
+      message += "\n";
+    }
+    message += `${key}: ${details[key]}`;
+  });
+  if (consoleOutput) {
+    message += `\n${consoleOutput}`;
+  }
+  if (errorsOutput) {
+    message += `\n${errorsOutput}`;
+  }
+  return message;
+};
+
+export const formatExecutionLabel = (
+  {
+    executionIndex,
+    executionParams,
+    executionResult,
+    timeEllapsed,
+    memoryHeap,
+    counters,
+  },
+  { logTimeUsage, logMemoryHeapUsage } = {},
+) => {
+  const { status } = executionResult;
+  const descriptionFormatter = descriptionFormatters[status];
+  const description = descriptionFormatter({
+    index: executionIndex,
+    total: counters.total,
+    executionParams,
+  });
+  const intermediateSummaryText = createIntermediateSummary({
+    executionIndex,
+    counters,
+    timeEllapsed,
+    memoryHeap,
+    logTimeUsage,
+    logMemoryHeapUsage,
+  });
+  return `${description}${intermediateSummaryText}`;
+};
+
 const formatErrors = (errors) => {
   if (errors.length === 0) {
     return "";
   }
-  const formatError = (error) => error.stack || error.message || error;
+  const formatError = (error) => {
+    if (error === null || error === undefined) {
+      return String(error);
+    }
+    if (error) {
+      return error.stack || error.message || error;
+    }
+    return error;
+  };
 
   if (errors.length === 1) {
     return `${ANSI.color(`-------- error --------`, ANSI.RED)}
@@ -113,13 +200,17 @@ ${output.join(`\n`)}
 ${ANSI.color(`-------------------------`, ANSI.RED)}`;
 };
 
-export const createSummaryLog = (
+export const formatSummaryLog = (
   summary,
 ) => `-------------- summary -----------------
-${createAllExecutionsSummary(summary)}
-total duration: ${msAsDuration(summary.duration)}
+${formatSummary(summary)}
 ----------------------------------------`;
 
+export const formatSummary = (summary) => `${createAllExecutionsSummary(
+  summary,
+)}
+total duration: ${msAsDuration(summary.duration)}`;
+
 const createAllExecutionsSummary = ({ counters }) => {
   if (counters.total === 0) {
     return `no execution`;
@@ -136,6 +227,8 @@ const createIntermediateSummary = ({
   counters,
   memoryHeap,
   timeEllapsed,
+  logTimeUsage,
+  logMemoryHeapUsage,
 }) => {
   const parts = [];
   if (executionIndex > 0 || counters.done > 0) {
@@ -148,10 +241,10 @@ const createIntermediateSummary = ({
       }),
     );
   }
-  if (timeEllapsed) {
+  if (logTimeUsage && timeEllapsed) {
     parts.push(`duration: ${msAsEllapsedTime(timeEllapsed)}`);
   }
-  if (memoryHeap) {
+  if (logMemoryHeapUsage && memoryHeap) {
     parts.push(`memory heap: ${byteAsMemoryUsage(memoryHeap)}`);
   }
   if (parts.length === 0) {
@@ -404,24 +497,3 @@ const formatConsoleSummary = (repartition) => {
   }
   return `console (${parts.join(" ")})`;
 };
-
-const formatExecution = ({
-  label,
-  details = {},
-  consoleOutput,
-  errorsOutput,
-}) => {
-  let message = ``;
-  message += label;
-  Object.keys(details).forEach((key) => {
-    message += `
-${key}: ${details[key]}`;
-  });
-  if (consoleOutput) {
-    message += `\n${consoleOutput}`;
-  }
-  if (errorsOutput) {
-    message += `\n${errorsOutput}`;
-  }
-  return message;
-};

package/src/runtime_browsers/using_playwright.js

@@ -402,15 +402,9 @@ export const createRuntimeUsingPlaywright = ({
         if (executionResult.status === "failed") {
           result.status = "failed";
           if (executionResult.exception) {
-            result.errors.push({
-              ...executionResult.exception,
-              stack: executionResult.exception.text,
-            });
+            result.errors.push(executionResult.exception);
           } else {
-            result.errors.push({
-              ...executionResult.error,
-              stack: executionResult.error.stack,
-            });
+            result.errors.push(executionResult.error);
           }
         }
       });

package/src/runtime_node/node_child_process.js

@@ -15,8 +15,8 @@ import { EXIT_CODES } from "./exit_codes.js";
 import { IMPORTMAP_NODE_LOADER_FILE_URL } from "./importmap_node_loader_file_url.js";
 import { NO_EXPERIMENTAL_WARNING_FILE_URL } from "./no_experimental_warnings_file_url.js";
 
-const CONTROLLABLE_CHILD_PROCESS_URL = new URL(
-  "./controllable_child_process.mjs?entry_point",
+const CONTROLLED_CHILD_PROCESS_URL = new URL(
+  "./node_child_process_controlled.mjs?entry_point",
   import.meta.url,
 ).href;
 
@@ -103,10 +103,10 @@ export const nodeChildProcess = ({
       };
       logger[logProcessCommand ? "info" : "debug"](
         `${process.argv[0]} ${execArgv.join(" ")} ${fileURLToPath(
-          CONTROLLABLE_CHILD_PROCESS_URL,
+          CONTROLLED_CHILD_PROCESS_URL,
         )}`,
       );
-      const childProcess = fork(fileURLToPath(CONTROLLABLE_CHILD_PROCESS_URL), {
+      const childProcess = fork(fileURLToPath(CONTROLLED_CHILD_PROCESS_URL), {
         execArgv,
         // silent: true
         stdio: ["pipe", "pipe", "pipe", "ipc"],
@@ -356,8 +356,7 @@ const onceChildProcessMessage = (childProcess, type, callback) => {
   const onmessage = (message) => {
     if (message && message.jsenv && message.type === type) {
       childProcess.removeListener("message", onmessage);
-      // eslint-disable-next-line no-eval
-      callback(message.data ? eval(`(${message.data})`) : "");
+      callback(message.data ? JSON.parse(message.data) : "");
     }
   };
   childProcess.on("message", onmessage);

package/src/runtime_node/{controllable_child_process.mjs → node_child_process_controlled.mjs}

@@ -1,5 +1,4 @@
-import { uneval } from "@jsenv/uneval";
-
+import { createException } from "../execution/exception.js";
 import { executeUsingDynamicImport } from "./execute_using_dynamic_import.js";
 
 const ACTIONS_AVAILABLE = {
@@ -27,20 +26,13 @@ const ACTION_RESPONSE_STATUS_FAILED = "action-failed";
 const ACTION_RESPONSE_STATUS_COMPLETED = "action-completed";
 
 const sendActionFailed = (error) => {
-  if (error.hasOwnProperty("toString")) {
-    delete error.toString;
-  }
+  const exception = createException(error);
   sendToParent(
     ACTION_RESPONSE_EVENT_NAME,
-    // process.send algorithm does not send non enumerable values
-    // so use @jsenv/uneval
-    uneval(
-      {
-        status: ACTION_RESPONSE_STATUS_FAILED,
-        value: error,
-      },
-      { ignoreSymbols: true },
-    ),
+    JSON.stringify({
+      status: ACTION_RESPONSE_STATUS_FAILED,
+      value: exception,
+    }),
   );
 };
 

package/src/runtime_node/node_worker_thread.js

@@ -16,8 +16,8 @@ import { EXIT_CODES } from "./exit_codes.js";
 import { IMPORTMAP_NODE_LOADER_FILE_URL } from "./importmap_node_loader_file_url.js";
 import { NO_EXPERIMENTAL_WARNING_FILE_URL } from "./no_experimental_warnings_file_url.js";
 
-const CONTROLLABLE_WORKER_THREAD_URL = new URL(
-  "./controllable_worker_thread.mjs?entry_point",
+const CONTROLLED_WORKER_THREAD_URL = new URL(
+  "./node_worker_thread_controlled.mjs?entry_point",
   import.meta.url,
 ).href;
 
@@ -94,7 +94,7 @@ export const nodeWorkerThread = ({
       actionOperation.addAbortSignal(signal);
       // https://nodejs.org/api/worker_threads.html#new-workerfilename-options
       const workerThread = new Worker(
-        fileURLToPath(CONTROLLABLE_WORKER_THREAD_URL),
+        fileURLToPath(CONTROLLED_WORKER_THREAD_URL),
         {
           env: envForWorkerThread,
           execArgv: execArgvForWorkerThread,
@@ -281,8 +281,7 @@ const onceWorkerThreadMessage = (workerThread, type, callback) => {
   const onmessage = (message) => {
     if (message && message.jsenv && message.type === type) {
       workerThread.removeListener("message", onmessage);
-      // eslint-disable-next-line no-eval
-      callback(message.data ? eval(`(${message.data})`) : undefined);
+      callback(message.data ? JSON.parse(message.data) : undefined);
     }
   };
   workerThread.on("message", onmessage);

package/src/runtime_node/{controllable_worker_thread.mjs → node_worker_thread_controlled.mjs}

@@ -1,6 +1,6 @@
 import { parentPort } from "node:worker_threads";
-import { uneval } from "@jsenv/uneval";
 
+import { createException } from "../execution/exception.js";
 import { executeUsingDynamicImport } from "./execute_using_dynamic_import.js";
 
 const ACTIONS_AVAILABLE = {
@@ -12,20 +12,13 @@ const ACTION_RESPONSE_STATUS_FAILED = "action-failed";
 const ACTION_RESPONSE_STATUS_COMPLETED = "action-completed";
 
 const sendActionFailed = (error) => {
-  if (error.hasOwnProperty("toString")) {
-    delete error.toString;
-  }
+  const exception = createException(error);
   sendToParent(
     ACTION_RESPONSE_EVENT_NAME,
-    // process.send algorithm does not send non enumerable values
-    // so use @jsenv/uneval
-    uneval(
-      {
-        status: ACTION_RESPONSE_STATUS_FAILED,
-        value: error,
-      },
-      { ignoreSymbols: true },
-    ),
+    JSON.stringify({
+      status: ACTION_RESPONSE_STATUS_FAILED,
+      value: exception,
+    }),
   );
 };
 

package/src/execution/logs_file_execution.test.mjs

@@ -1,41 +0,0 @@
-import { assert } from "@jsenv/assert";
-
-import { formatConsoleOutput } from "./logs_file_execution.js";
-
-{
-  const actual = formatConsoleOutput([
-    { type: "log", text: "a\n" },
-    { type: "log", text: "b\n" },
-  ]);
-  const expected = `  a
-  b`;
-  assert({ actual, expected });
-}
-
-{
-  const actual = formatConsoleOutput([
-    { type: "log", text: "a" },
-    { type: "log", text: "b" },
-  ]);
-  const expected = `  ab`;
-  assert({ actual, expected });
-}
-
-{
-  const actual = formatConsoleOutput([
-    {
-      type: "log",
-      text: `1
-2`,
-    },
-    {
-      type: "log",
-      text: `alpha
-beta`,
-    },
-  ]);
-  const expected = `  1
-  2alpha
-  beta`;
-  assert({ actual, expected });
-}