@jsenv/core 27.0.0-alpha.63 → 27.0.0-alpha.66

package/src/test/execute_plan.js

@@ -25,11 +25,7 @@ import { run } from "@jsenv/core/src/execute/run.js"
 
 import { ensureGlobalGc } from "./gc.js"
 import { generateExecutionSteps } from "./execution_steps.js"
-import {
-  formatExecuting,
-  formatExecutionResult,
-  createSummaryLog,
-} from "./logs_file_execution.js"
+import { createExecutionLog, createSummaryLog } from "./logs_file_execution.js"
 
 export const executePlan = async (
   plan,
@@ -38,6 +34,7 @@ export const executePlan = async (
     handleSIGINT,
     logger,
     logSummary,
+    logTimeUsage,
     logMemoryHeapUsage,
     logFileRelativeUrl,
     completedExecutionLogMerging,
@@ -135,6 +132,7 @@ export const executePlan = async (
         urlGraph,
         scenario,
         sourcemaps,
+        runtimeCompat: runtimes,
         writeGeneratedFiles,
         plugins: [
           ...plugins,
@@ -142,6 +140,7 @@ export const executePlan = async (
             rootDirectoryUrl,
             urlGraph,
             scenario,
+            runtimeCompat: runtimes,
 
             htmlSupervisor: true,
             nodeEsmResolution,
@@ -326,17 +325,29 @@ export const executePlan = async (
           runtimeVersion,
           executionIndex,
           executionParams,
+          startMs: Date.now(),
+          executionResult: {
+            status: "executing",
+          },
         }
         let spinner
         if (executionSpinner) {
-          spinner = startSpinner({
-            log: executionLog,
-            text: formatExecuting(beforeExecutionInfo, {
+          const renderSpinnerText = () =>
+            createExecutionLog(beforeExecutionInfo, {
               counters,
+              ...(logTimeUsage
+                ? {
+                    timeEllapsed: Date.now() - startMs,
+                  }
+                : {}),
               ...(logMemoryHeapUsage
                 ? { memoryHeap: memoryUsage().heapUsed }
                 : {}),
-            }),
+            })
+          spinner = startSpinner({
+            log: executionLog,
+            text: renderSpinnerText(),
+            update: renderSpinnerText,
           })
         }
         beforeExecutionCallback(beforeExecutionInfo)
@@ -368,10 +379,15 @@ export const executePlan = async (
           }
         }
         counters.done++
-        if (fileRelativeUrl in report === false) {
-          report[fileRelativeUrl] = {}
+        const fileReport = report[fileRelativeUrl]
+        if (fileReport) {
+          fileReport[executionName] = executionResult
+        } else {
+          report[fileRelativeUrl] = {
+            [executionName]: executionResult,
+          }
         }
-        report[fileRelativeUrl][executionName] = executionResult
+
         const afterExecutionInfo = {
           ...beforeExecutionInfo,
           endMs: Date.now(),
@@ -392,9 +408,14 @@ export const executePlan = async (
           global.gc()
         }
         if (executionLogsEnabled) {
-          let log = formatExecutionResult(afterExecutionInfo, {
+          let log = createExecutionLog(afterExecutionInfo, {
             completedExecutionLogAbbreviation,
             counters,
+            ...(logTimeUsage
+              ? {
+                  timeEllapsed: Date.now() - startMs,
+                }
+              : {}),
             ...(logMemoryHeapUsage
               ? { memoryHeap: memoryUsage().heapUsed }
               : {}),

package/src/test/execute_test_plan.js

@@ -42,6 +42,7 @@ export const executeTestPlan = async ({
   handleSIGINT = true,
   logLevel = "info",
   logSummary = true,
+  logTimeUsage = false,
   logMemoryHeapUsage = false,
   logFileRelativeUrl = ".jsenv/test_plan_debug.txt",
   completedExecutionLogAbbreviation = false,
@@ -148,6 +149,7 @@ export const executeTestPlan = async ({
     logger,
     logLevel,
     logSummary,
+    logTimeUsage,
     logMemoryHeapUsage,
     logFileRelativeUrl,
     completedExecutionLogMerging,

package/src/test/logs_file_execution.js

@@ -1,29 +1,14 @@
-import { ANSI, UNICODE, msAsDuration, byteAsMemoryUsage } from "@jsenv/log"
+import {
+  ANSI,
+  UNICODE,
+  msAsEllapsedTime,
+  msAsDuration,
+  byteAsMemoryUsage,
+} from "@jsenv/log"
 
 import { EXECUTION_COLORS } from "./execution_colors.js"
 
-export const formatExecuting = (
-  { executionIndex },
-  { counters, memoryHeap },
-) => {
-  const description = ANSI.color(
-    `executing ${executionIndex + 1} of ${counters.total}`,
-    EXECUTION_COLORS.executing,
-  )
-  const summary =
-    executionIndex === 0
-      ? ""
-      : `(${createIntermediateSummary({
-          executionIndex,
-          counters,
-          memoryHeap,
-        })})`
-  return formatExecution({
-    label: `${description} ${summary}`,
-  })
-}
-
-export const formatExecutionResult = (
+export const createExecutionLog = (
   {
     executionIndex,
     fileRelativeUrl,
@@ -31,8 +16,10 @@ export const formatExecutionResult = (
     runtimeVersion,
     executionParams,
     executionResult,
+    startMs,
+    endMs,
   },
-  { completedExecutionLogAbbreviation, counters, memoryHeap },
+  { completedExecutionLogAbbreviation, counters, timeEllapsed, memoryHeap },
 ) => {
   const { status } = executionResult
   const descriptionFormatter = descriptionFormatters[status]
@@ -41,22 +28,26 @@ export const formatExecutionResult = (
     total: counters.total,
     executionParams,
   })
-  const summary = `(${createIntermediateSummary({
+  const summary = createIntermediateSummary({
     executionIndex,
     counters,
+    timeEllapsed,
     memoryHeap,
-  })})`
+  })
   if (completedExecutionLogAbbreviation && status === "completed") {
-    return `${description} ${summary}`
+    return `${description}${summary}`
   }
-  const { consoleCalls = [], error, duration } = executionResult
+  const { consoleCalls = [], error } = executionResult
   const consoleOutput = formatConsoleCalls(consoleCalls)
   return formatExecution({
-    label: `${description} ${summary}`,
+    label: `${description}${summary}`,
     details: {
       file: fileRelativeUrl,
       runtime: `${runtimeName}/${runtimeVersion}`,
-      duration: msAsDuration(duration),
+      duration:
+        status === "executing"
+          ? msAsEllapsedTime(Date.now() - startMs)
+          : msAsDuration(endMs - startMs),
       ...(error ? { error: error.stack || error.message || error } : {}),
     },
     consoleOutput,
@@ -85,17 +76,29 @@ const createIntermediateSummary = ({
   executionIndex,
   counters,
   memoryHeap,
+  timeEllapsed,
 }) => {
-  let intermediateSummary = createStatusSummary({
-    counters: {
-      ...counters,
-      total: executionIndex + 1,
-    },
-  })
+  const parts = []
+  if (executionIndex > 0 || counters.done > 0) {
+    parts.push(
+      createStatusSummary({
+        counters: {
+          ...counters,
+          total: executionIndex + 1,
+        },
+      }),
+    )
+  }
+  if (timeEllapsed) {
+    parts.push(`duration: ${msAsEllapsedTime(timeEllapsed)}`)
+  }
   if (memoryHeap) {
-    intermediateSummary += ` / memory heap: ${byteAsMemoryUsage(memoryHeap)}`
+    parts.push(`memory heap: ${byteAsMemoryUsage(memoryHeap)}`)
   }
-  return intermediateSummary
+  if (parts.length === 0) {
+    return ""
+  }
+  return ` (${parts.join(` / `)})`
 }
 
 const createStatusSummary = ({ counters }) => {
@@ -159,6 +162,12 @@ const createMixedDetails = ({ counters }) => {
 }
 
 const descriptionFormatters = {
+  executing: ({ index, total }) => {
+    return ANSI.color(
+      `executing ${index + 1} of ${total}`,
+      EXECUTION_COLORS.executing,
+    )
+  },
   aborted: ({ index, total }) => {
     return ANSI.color(
       `${UNICODE.FAILURE_RAW} execution ${index + 1} of ${total} aborted`,