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

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`,

package/src/plugins/transpilation/as_js_classic/client/s.js.md

@@ -1 +0,0 @@
-s.js exists to ease jsenv ability to find the file.

package/src/plugins/transpilation/fetch_original_url_info.js

@@ -1,30 +0,0 @@
-export const fetchOriginalUrlInfo = async ({
-  urlInfo,
-  context,
-  searchParam,
-  expectedType,
-}) => {
-  const urlObject = new URL(urlInfo.url)
-  const { searchParams } = urlObject
-  if (!searchParams.has(searchParam)) {
-    return null
-  }
-  searchParams.delete(searchParam)
-  const originalUrl = urlObject.href
-  const originalReference = {
-    ...(context.reference.original || context.reference),
-    expectedType,
-  }
-  originalReference.url = originalUrl
-  const originalUrlInfo = context.urlGraph.reuseOrCreateUrlInfo(
-    originalReference.url,
-  )
-  await context.fetchUrlContent({
-    reference: originalReference,
-    urlInfo: originalUrlInfo,
-  })
-  if (originalUrlInfo.dependents.size === 0) {
-    context.urlGraph.deleteUrlInfo(originalUrlInfo.url)
-  }
-  return originalUrlInfo
-}