@jsenv/core 33.0.1 → 34.0.0

package/src/test/logs_file_execution.js

@@ -1,3 +1,4 @@
+import wrapAnsi from "wrap-ansi"
 import {
   ANSI,
   UNICODE,
@@ -41,29 +42,48 @@ export const createExecutionLog = (
     timeEllapsed,
     memoryHeap,
   })
+  let log
   if (completedExecutionLogAbbreviation && status === "completed") {
-    return `${description}${summary}`
+    log = `${description}${summary}`
+  } 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),
+            }
+          : {}),
+      },
+      consoleOutput,
+      errorsOutput,
+    })
   }
-  const { consoleCalls = [], errors = [] } = executionResult
-  const consoleOutput = formatConsoleCalls(consoleCalls)
-  const errorsOutput = formatErrors(errors)
-  return formatExecution({
-    label: `${description}${summary}`,
-    details: {
-      file: fileRelativeUrl,
-      ...(logRuntime ? { runtime: `${runtimeName}/${runtimeVersion}` } : {}),
-      ...(logEachDuration
-        ? {
-            duration:
-              status === "executing"
-                ? msAsEllapsedTime(Date.now() - startMs)
-                : msAsDuration(endMs - startMs),
-          }
-        : {}),
-    },
-    consoleOutput,
-    errorsOutput,
+
+  const { columns = 80 } = process.stdout
+  log = wrapAnsi(log, columns, {
+    trim: false,
+    hard: true,
+    wordWrap: false,
   })
+  if (endMs) {
+    if (completedExecutionLogAbbreviation) {
+      return `${log}\n`
+    }
+    if (executionIndex === counters.total - 1) {
+      return `${log}\n`
+    }
+    return `${log}\n\n`
+  }
+  return log
 }
 
 const formatErrors = (errors) => {
@@ -203,44 +223,70 @@ const createMixedDetails = ({ counters }) => {
 const descriptionFormatters = {
   executing: ({ index, total }) => {
     return ANSI.color(
-      `executing ${index + 1} of ${total}`,
+      `executing ${padNumber(index, total)} of ${total}`,
       EXECUTION_COLORS.executing,
     )
   },
   aborted: ({ index, total }) => {
     return ANSI.color(
-      `${UNICODE.FAILURE_RAW} execution ${index + 1} of ${total} aborted`,
+      `${UNICODE.FAILURE_RAW} execution ${padNumber(
+        index,
+        total,
+      )} of ${total} aborted`,
       EXECUTION_COLORS.aborted,
     )
   },
   timedout: ({ index, total, executionParams }) => {
     return ANSI.color(
-      `${UNICODE.FAILURE_RAW} execution ${
-        index + 1
-      } of ${total} timeout after ${executionParams.allocatedMs}ms`,
+      `${UNICODE.FAILURE_RAW} execution ${padNumber(
+        index,
+        total,
+      )} of ${total} timeout after ${executionParams.allocatedMs}ms`,
       EXECUTION_COLORS.timedout,
     )
   },
   failed: ({ index, total }) => {
     return ANSI.color(
-      `${UNICODE.FAILURE_RAW} execution ${index + 1} of ${total} failed`,
+      `${UNICODE.FAILURE_RAW} execution ${padNumber(
+        index,
+        total,
+      )} of ${total} failed`,
       EXECUTION_COLORS.failed,
     )
   },
   completed: ({ index, total }) => {
     return ANSI.color(
-      `${UNICODE.OK_RAW} execution ${index + 1} of ${total} completed`,
+      `${UNICODE.OK_RAW} execution ${padNumber(
+        index,
+        total,
+      )} of ${total} completed`,
       EXECUTION_COLORS.completed,
     )
   },
   cancelled: ({ index, total }) => {
     return ANSI.color(
-      `${UNICODE.FAILURE_RAW} execution ${index + 1} of ${total} cancelled`,
+      `${UNICODE.FAILURE_RAW} execution ${padNumber(
+        index,
+        total,
+      )} of ${total} cancelled`,
       EXECUTION_COLORS.cancelled,
     )
   },
 }
 
+const padNumber = (index, total) => {
+  const number = index + 1
+  const numberWidth = String(number).length
+  const totalWith = String(total).length
+  let missingWidth = totalWith - numberWidth
+  let padded = ""
+  while (missingWidth--) {
+    padded += "0"
+  }
+  padded += number
+  return padded
+}
+
 const formatConsoleCalls = (consoleCalls) => {
   if (consoleCalls.length === 0) {
     return ""

package/dist/js/script_type_module_supervisor.js

@@ -1,109 +0,0 @@
-// https://twitter.com/damienmaillard/status/1554752482273787906
-const isWebkitOrSafari = typeof window.webkitConvertPointFromNodeToPage === "function";
-const superviseScriptTypeModule = async ({
-  src,
-  async
-}) => {
-  const currentScript = document.querySelector(`script[type="module"][inlined-from-src="${src}"]`);
-  const execute = isWebkitOrSafari ? createExecuteWithDynamicImport({
-    src
-  }) : createExecuteWithScript({
-    currentScript,
-    src
-  });
-  return window.__supervisor__.addExecution({
-    src,
-    async,
-    type: "js_module",
-    execute
-  });
-};
-const createExecuteWithScript = ({
-  currentScript,
-  src
-}) => {
-  const parentNode = currentScript.parentNode;
-  let nodeToReplace;
-  let currentScriptClone;
-  return async ({
-    isReload
-  }) => {
-    const urlObject = new URL(src, window.location);
-    const loadPromise = new Promise((resolve, reject) => {
-      currentScriptClone = document.createElement("script");
-      // browsers set async by default when creating script(s)
-      // we want an exact copy to preserves how code is executed
-      currentScriptClone.async = false;
-      Array.from(currentScript.attributes).forEach(attribute => {
-        currentScriptClone.setAttribute(attribute.nodeName, attribute.nodeValue);
-      });
-      if (isReload) {
-        urlObject.searchParams.set("hmr", Date.now());
-        nodeToReplace = currentScriptClone;
-        currentScriptClone.src = urlObject.href;
-      } else {
-        currentScriptClone.removeAttribute("jsenv-cooked-by");
-        currentScriptClone.removeAttribute("jsenv-inlined-by");
-        currentScriptClone.removeAttribute("jsenv-injected-by");
-        currentScriptClone.removeAttribute("inlined-from-src");
-        currentScriptClone.removeAttribute("original-position");
-        currentScriptClone.removeAttribute("original-src-position");
-        nodeToReplace = currentScript;
-        currentScriptClone.src = src;
-      }
-      currentScriptClone.addEventListener("error", reject);
-      currentScriptClone.addEventListener("load", resolve);
-      parentNode.replaceChild(currentScriptClone, nodeToReplace);
-    });
-    try {
-      await loadPromise;
-    } catch (e) {
-      // eslint-disable-next-line no-throw-literal
-      throw {
-        message: `Failed to fetch module: ${urlObject.href}`,
-        reportedBy: "script_error_event",
-        url: urlObject.href,
-        // window.error won't be dispatched for this error
-        needsReport: true
-      };
-    }
-    try {
-      return {
-        executionPromise: import(urlObject.href)
-      };
-    } catch (e) {
-      e.reportedBy = "dynamic_import";
-      throw e;
-    }
-  };
-};
-const createExecuteWithDynamicImport = ({
-  src
-}) => {
-  return async ({
-    isReload
-  }) => {
-    const urlObject = new URL(src, window.location);
-    if (isReload) {
-      urlObject.searchParams.set("hmr", Date.now());
-    }
-    try {
-      const namespace = await import(urlObject.href);
-      return {
-        executionPromise: Promise.resolve(namespace)
-      };
-    } catch (e) {
-      e.reportedBy = "dynamic_import";
-      // dynamic import would hide the error to the browser
-      // so it must be re-reported using window.reportError
-      if (typeof window.reportError === "function") {
-        window.reportError(e);
-      } else {
-        console.error(e);
-      }
-      throw e;
-    }
-  };
-};
-
-export { superviseScriptTypeModule };

package/src/plugins/supervisor/client/script_type_module_supervisor.js

@@ -1,98 +0,0 @@
-// https://twitter.com/damienmaillard/status/1554752482273787906
-const isWebkitOrSafari =
-  typeof window.webkitConvertPointFromNodeToPage === "function"
-
-export const superviseScriptTypeModule = async ({ src, async }) => {
-  const currentScript = document.querySelector(
-    `script[type="module"][inlined-from-src="${src}"]`,
-  )
-  const execute = isWebkitOrSafari
-    ? createExecuteWithDynamicImport({ src })
-    : createExecuteWithScript({ currentScript, src })
-  return window.__supervisor__.addExecution({
-    src,
-    async,
-    type: "js_module",
-    execute,
-  })
-}
-
-const createExecuteWithScript = ({ currentScript, src }) => {
-  const parentNode = currentScript.parentNode
-  let nodeToReplace
-  let currentScriptClone
-  return async ({ isReload }) => {
-    const urlObject = new URL(src, window.location)
-    const loadPromise = new Promise((resolve, reject) => {
-      currentScriptClone = document.createElement("script")
-      // browsers set async by default when creating script(s)
-      // we want an exact copy to preserves how code is executed
-      currentScriptClone.async = false
-      Array.from(currentScript.attributes).forEach((attribute) => {
-        currentScriptClone.setAttribute(attribute.nodeName, attribute.nodeValue)
-      })
-      if (isReload) {
-        urlObject.searchParams.set("hmr", Date.now())
-        nodeToReplace = currentScriptClone
-        currentScriptClone.src = urlObject.href
-      } else {
-        currentScriptClone.removeAttribute("jsenv-cooked-by")
-        currentScriptClone.removeAttribute("jsenv-inlined-by")
-        currentScriptClone.removeAttribute("jsenv-injected-by")
-        currentScriptClone.removeAttribute("inlined-from-src")
-        currentScriptClone.removeAttribute("original-position")
-        currentScriptClone.removeAttribute("original-src-position")
-        nodeToReplace = currentScript
-        currentScriptClone.src = src
-      }
-      currentScriptClone.addEventListener("error", reject)
-      currentScriptClone.addEventListener("load", resolve)
-      parentNode.replaceChild(currentScriptClone, nodeToReplace)
-    })
-    try {
-      await loadPromise
-    } catch (e) {
-      // eslint-disable-next-line no-throw-literal
-      throw {
-        message: `Failed to fetch module: ${urlObject.href}`,
-        reportedBy: "script_error_event",
-        url: urlObject.href,
-        // window.error won't be dispatched for this error
-        needsReport: true,
-      }
-    }
-    try {
-      return {
-        executionPromise: import(urlObject.href),
-      }
-    } catch (e) {
-      e.reportedBy = "dynamic_import"
-      throw e
-    }
-  }
-}
-
-const createExecuteWithDynamicImport = ({ src }) => {
-  return async ({ isReload }) => {
-    const urlObject = new URL(src, window.location)
-    if (isReload) {
-      urlObject.searchParams.set("hmr", Date.now())
-    }
-    try {
-      const namespace = await import(urlObject.href)
-      return {
-        executionPromise: Promise.resolve(namespace),
-      }
-    } catch (e) {
-      e.reportedBy = "dynamic_import"
-      // dynamic import would hide the error to the browser
-      // so it must be re-reported using window.reportError
-      if (typeof window.reportError === "function") {
-        window.reportError(e)
-      } else {
-        console.error(e)
-      }
-      throw e
-    }
-  }
-}