@jsenv/core 27.0.1 → 27.1.0

package/dist/main.js

@@ -332,23 +332,27 @@ const canUseUnicode = isUnicodeSupported();
 const COMMAND_RAW = canUseUnicode ? `❯` : `>`;
 const OK_RAW = canUseUnicode ? `✔` : `√`;
 const FAILURE_RAW = canUseUnicode ? `✖` : `×`;
+const DEBUG_RAW = canUseUnicode ? `◆` : `♦`;
 const INFO_RAW = canUseUnicode ? `ℹ` : `i`;
 const WARNING_RAW = canUseUnicode ? `⚠` : `‼`;
 const COMMAND = ANSI.color(COMMAND_RAW, ANSI.GREY); // ANSI_MAGENTA)
 
 const OK = ANSI.color(OK_RAW, ANSI.GREEN);
 const FAILURE = ANSI.color(FAILURE_RAW, ANSI.RED);
+const DEBUG = ANSI.color(DEBUG_RAW, ANSI.GREY);
 const INFO = ANSI.color(INFO_RAW, ANSI.BLUE);
 const WARNING = ANSI.color(WARNING_RAW, ANSI.YELLOW);
 const UNICODE = {
   COMMAND,
   OK,
   FAILURE,
+  DEBUG,
   INFO,
   WARNING,
   COMMAND_RAW,
   OK_RAW,
   FAILURE_RAW,
+  DEBUG_RAW,
   INFO_RAW,
   WARNING_RAW,
   supported: canUseUnicode
@@ -19850,7 +19854,7 @@ const rollupPluginJsenv = ({
     outputOptions: outputOptions => {
       // const sourcemapFile = buildDirectoryUrl
       Object.assign(outputOptions, {
-        format: "esm",
+        format: jsModuleUrlInfos.some(jsModuleUrlInfo => jsModuleUrlInfo.filename.endsWith(".cjs")) ? "cjs" : "esm",
         dir: fileUrlConverter.asFilePath(buildDirectoryUrl),
         sourcemap: sourcemaps === "file" || sourcemaps === "inline",
         // sourcemapFile,
@@ -21446,6 +21450,7 @@ const createUrlInfo = url => {
     content: undefined,
     sourcemap: null,
     sourcemapReference: null,
+    sourcemapIsWrong: false,
     timing: {},
     headers: {}
   };
@@ -21891,7 +21896,8 @@ const createUrlInfoTransformer = ({
       type,
       contentType,
       content,
-      sourcemap
+      sourcemap,
+      sourcemapIsWrong
     } = transformations;
 
     if (type) {
@@ -21910,7 +21916,17 @@ const createUrlInfoTransformer = ({
       const sourcemapNormalized = normalizeSourcemap(urlInfo, sourcemap);
       const finalSourcemap = await composeTwoSourcemaps(urlInfo.sourcemap, sourcemapNormalized);
       const finalSourcemapNormalized = normalizeSourcemap(urlInfo, finalSourcemap);
-      urlInfo.sourcemap = finalSourcemapNormalized;
+      urlInfo.sourcemap = finalSourcemapNormalized; // A plugin is allowed to modify url content
+      // without returning a sourcemap
+      // This is the case for preact and react plugins.
+      // They are currently generating wrong source mappings
+      // when used.
+      // Generating the correct sourcemap in this situation
+      // is a nightmare no-one could solve in years so
+      // jsenv won't emit a warning and use the following strategy:
+      // "no sourcemap is better than wrong sourcemap"
+
+      urlInfo.sourcemapIsWrong = sourcemapIsWrong;
     }
   };
 
@@ -21939,16 +21955,18 @@ const createUrlInfoTransformer = ({
 
       sourcemapUrlInfo.content = JSON.stringify(sourcemap, null, "  ");
 
-      if (sourcemaps === "inline") {
-        sourcemapReference.generatedSpecifier = generateSourcemapDataUrl(sourcemap);
-      }
+      if (!urlInfo.sourcemapIsWrong) {
+        if (sourcemaps === "inline") {
+          sourcemapReference.generatedSpecifier = generateSourcemapDataUrl(sourcemap);
+        }
 
-      if (sourcemaps === "file" || sourcemaps === "inline") {
-        urlInfo.content = SOURCEMAP.writeComment({
-          contentType: urlInfo.contentType,
-          content: urlInfo.content,
-          specifier: sourcemaps === "file" && sourcemapsRelativeSources ? urlToRelativeUrl(sourcemapReference.url, urlInfo.url) : sourcemapReference.generatedSpecifier
-        });
+        if (sourcemaps === "file" || sourcemaps === "inline") {
+          urlInfo.content = SOURCEMAP.writeComment({
+            contentType: urlInfo.contentType,
+            content: urlInfo.content,
+            specifier: sourcemaps === "file" && sourcemapsRelativeSources ? urlToRelativeUrl(sourcemapReference.url, urlInfo.url) : sourcemapReference.generatedSpecifier
+          });
+        }
       }
     } else if (urlInfo.sourcemapReference) {
       // in the end we don't use the sourcemap placeholder
@@ -24839,6 +24857,8 @@ const createExecutionLog = ({
 }, {
   completedExecutionLogAbbreviation,
   counters,
+  logRuntime,
+  logEachDuration,
   timeEllapsed,
   memoryHeap
 }) => {
@@ -24871,8 +24891,12 @@ const createExecutionLog = ({
     label: `${description}${summary}`,
     details: {
       file: fileRelativeUrl,
-      runtime: `${runtimeName}/${runtimeVersion}`,
-      duration: status === "executing" ? msAsEllapsedTime(Date.now() - startMs) : msAsDuration(endMs - startMs),
+      ...(logRuntime ? {
+        runtime: `${runtimeName}/${runtimeVersion}`
+      } : {}),
+      ...(logEachDuration ? {
+        duration: status === "executing" ? msAsEllapsedTime(Date.now() - startMs) : msAsDuration(endMs - startMs)
+      } : {}),
       ...(error ? {
         error: error.stack || error.message || error
       } : {})
@@ -25026,22 +25050,93 @@ const descriptionFormatters = {
 };
 
 const formatConsoleCalls = consoleCalls => {
-  const consoleOutput = consoleCalls.reduce((previous, {
-    text
-  }) => {
-    return `${previous}${text}`;
-  }, "");
-  const consoleOutputTrimmed = consoleOutput.trim();
-
-  if (consoleOutputTrimmed === "") {
+  if (consoleCalls.length === 0) {
     return "";
   }
 
-  return `${ANSI.color(`-------- console output --------`, ANSI.GREY)}
-${consoleOutputTrimmed}
+  const repartition = {
+    debug: 0,
+    info: 0,
+    warning: 0,
+    error: 0,
+    log: 0
+  };
+  let consoleOutput = ``;
+  consoleCalls.forEach(consoleCall => {
+    repartition[consoleCall.type]++;
+    const text = consoleCall.text;
+    const textFormatted = prefixFirstAndIndentRemainingLines({
+      prefix: CONSOLE_ICONS[consoleCall.type],
+      text,
+      trimLastLine: consoleCall === consoleCalls[consoleCalls.length - 1]
+    });
+    consoleOutput += textFormatted;
+  });
+  return `${ANSI.color(`-------- ${formatConsoleSummary(repartition)} --------`, ANSI.GREY)}
+${consoleOutput}
 ${ANSI.color(`-------------------------`, ANSI.GREY)}`;
 };
 
+const CONSOLE_ICONS = {
+  debug: UNICODE.DEBUG,
+  info: UNICODE.INFO,
+  warning: UNICODE.WARNING,
+  error: UNICODE.FAILURE,
+  log: " "
+};
+
+const formatConsoleSummary = repartition => {
+  const {
+    debug,
+    info,
+    warning,
+    error
+  } = repartition;
+  const parts = [];
+
+  if (error) {
+    parts.push(`${CONSOLE_ICONS.error} ${error}`);
+  }
+
+  if (warning) {
+    parts.push(`${CONSOLE_ICONS.warning} ${warning}`);
+  }
+
+  if (info) {
+    parts.push(`${CONSOLE_ICONS.info} ${info}`);
+  }
+
+  if (debug) {
+    parts.push(`${CONSOLE_ICONS.debug} ${debug}`);
+  }
+
+  if (parts.length === 0) {
+    return `console`;
+  }
+
+  return `console (${parts.join(" ")})`;
+};
+
+const prefixFirstAndIndentRemainingLines = ({
+  prefix,
+  text,
+  trimLastLine
+}) => {
+  const lines = text.split(/\r?\n/);
+  const firstLine = lines.shift();
+  let result = `${prefix} ${firstLine}`;
+  let i = 0;
+  const indentation = `  `;
+
+  while (i < lines.length) {
+    const line = lines[i].trim();
+    i++;
+    result += line.length ? `\n${indentation}${line}` : trimLastLine && i === lines.length ? "" : `\n`;
+  }
+
+  return result;
+};
+
 const formatExecution = ({
   label,
   details = {},
@@ -25066,6 +25161,8 @@ const executePlan = async (plan, {
   signal,
   handleSIGINT,
   logger,
+  logRuntime,
+  logEachDuration,
   logSummary,
   logTimeUsage,
   logMemoryHeapUsage,
@@ -25361,6 +25458,8 @@ const executePlan = async (plan, {
             render: () => {
               return createExecutionLog(beforeExecutionInfo, {
                 counters,
+                logRuntime,
+                logEachDuration,
                 ...(logTimeUsage ? {
                   timeEllapsed: Date.now() - startMs
                 } : {}),
@@ -25434,6 +25533,8 @@ const executePlan = async (plan, {
           let log = createExecutionLog(afterExecutionInfo, {
             completedExecutionLogAbbreviation,
             counters,
+            logRuntime,
+            logEachDuration,
             ...(logTimeUsage ? {
               timeEllapsed: Date.now() - startMs
             } : {}),
@@ -25478,6 +25579,7 @@ const executePlan = async (plan, {
     });
 
     if (!keepRunning) {
+      logger.debug("stopAfterAllSignal.notify()");
       await stopAfterAllSignal.notify();
     }
 
@@ -25639,6 +25741,8 @@ const executeTestPlan = async ({
   signal = new AbortController().signal,
   handleSIGINT = true,
   logLevel = "info",
+  logRuntime = true,
+  logEachDuration = true,
   logSummary = true,
   logTimeUsage = false,
   logMemoryHeapUsage = false,
@@ -25736,6 +25840,8 @@ const executeTestPlan = async ({
     logger,
     logLevel,
     logSummary,
+    logRuntime,
+    logEachDuration,
     logTimeUsage,
     logMemoryHeapUsage,
     logFileRelativeUrl,
@@ -25888,7 +25994,7 @@ const createRuntimeFromPlaywright = ({
 
   runtime.run = async ({
     signal = new AbortController().signal,
-    // logger,
+    logger,
     rootDirectoryUrl,
     fileRelativeUrl,
     server,
@@ -25947,10 +26053,10 @@ const createRuntimeFromPlaywright = ({
         };
 
         browser.on("disconnected", disconnectedCallback);
-      }) : Promise.resolve(); // for some reason without this 100ms timeout
+      }) : Promise.resolve(); // for some reason without this 150ms timeout
       // browser.close() never resolves (playwright does not like something)
 
-      await new Promise(resolve => setTimeout(resolve, 100));
+      await new Promise(resolve => setTimeout(resolve, 150));
 
       try {
         await browser.close();
@@ -26148,6 +26254,7 @@ const createRuntimeFromPlaywright = ({
             stopAfterAllSignal.notify = async () => {
               await notifyPrevious();
               browser.removeListener("disconnected", disconnectedCallback);
+              logger.debug(`stopAfterAllSignal notified -> closing ${browserName}`);
               await closeBrowser();
             };
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.1",
+  "version": "27.1.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -43,26 +43,26 @@
     "eslint": "npx eslint . --ext=.js,.mjs,.cjs,.html",
     "dev": "node --conditions=development ./scripts/dev/dev.mjs",
     "test": "node --conditions=development ./scripts/test/test.mjs",
-    "test-packages": "npm run test --workspaces --if-present -- --workspace",
+    "test:coverage": "npm run test -- --coverage",
     "build": "node --conditions=development ./scripts/build/build.mjs",
-    "start_file_server": "node ./scripts/dev/start_file_server.mjs",
-    "workspace-versions": "node ./scripts/publish/workspace_versions.mjs",
-    "workspace-publish": "node ./scripts/publish/workspace_publish.mjs",
+    "workspace:test": "npm run test --workspaces --if-present -- --workspace",
+    "workspace:versions": "node ./scripts/publish/workspace_versions.mjs",
+    "workspace:publish": "node ./scripts/publish/workspace_publish.mjs",
     "performances": "node --expose-gc ./scripts/performance/generate_performance_report.mjs --log --once",
     "file-size": "node ./scripts/file_size/file_size.mjs --log",
+    "start_file_server": "node ./scripts/dev/start_file_server.mjs",
     "prettier": "prettier --write .",
     "playwright-install": "npx playwright install-deps && npx playwright install",
     "certificate-install": "node ./scripts/dev/install_certificate_authority.mjs",
-    "test-with-coverage": "npm run test -- --coverage",
     "prepublishOnly": "npm run build"
   },
   "optionalDependencies": {
     "playwright": "1.x"
   },
   "dependencies": {
-    "@babel/plugin-proposal-dynamic-import": "7.16.7",
+    "@babel/plugin-proposal-dynamic-import": "7.18.6",
     "@babel/plugin-transform-modules-systemjs": "7.18.6",
-    "@babel/plugin-transform-modules-umd": "7.18.0",
+    "@babel/plugin-transform-modules-umd": "7.18.6",
     "@c88/v8-coverage": "0.1.1",
     "@financial-times/polyfill-useragent-normaliser": "2.0.1",
     "@jsenv/ast": "1.1.1",
@@ -71,13 +71,13 @@
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/node-esm-resolution": "0.1.0",
-    "@jsenv/server": "12.7.4",
+    "@jsenv/server": "12.7.5",
     "@jsenv/uneval": "1.6.0",
     "@jsenv/url-meta": "7.0.0",
     "@jsenv/urls": "1.2.6",
     "@jsenv/utils": "2.0.1",
     "@jsenv/babel-plugins": "1.0.5",
-    "@jsenv/log": "3.0.2",
+    "@jsenv/log": "3.1.0",
     "@jsenv/sourcemap": "1.0.1",
     "acorn-import-assertions": "1.8.0",
     "cuid": "2.1.8",
@@ -96,9 +96,9 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "7.18.2",
-    "@babel/plugin-syntax-import-assertions": "7.17.12",
+    "@babel/plugin-syntax-import-assertions": "7.18.6",
     "@jsenv/assert": "2.6.0",
-    "@jsenv/eslint-config": "16.0.9",
+    "@jsenv/eslint-config": "16.1.0",
     "@jsenv/file-size-impact": "13.0.1",
     "@jsenv/https-local": "2.1.0",
     "@jsenv/package-workspace": "0.4.1",

package/src/execute/runtimes/browsers/from_playwright.js

@@ -30,7 +30,7 @@ export const createRuntimeFromPlaywright = ({
   let browserAndContextPromise
   runtime.run = async ({
     signal = new AbortController().signal,
-    // logger,
+    logger,
     rootDirectoryUrl,
     fileRelativeUrl,
     server,
@@ -82,9 +82,9 @@ export const createRuntimeFromPlaywright = ({
             browser.on("disconnected", disconnectedCallback)
           })
         : Promise.resolve()
-      // for some reason without this 100ms timeout
+      // for some reason without this 150ms timeout
       // browser.close() never resolves (playwright does not like something)
-      await new Promise((resolve) => setTimeout(resolve, 100))
+      await new Promise((resolve) => setTimeout(resolve, 150))
       try {
         await browser.close()
       } catch (e) {
@@ -275,6 +275,9 @@ export const createRuntimeFromPlaywright = ({
               stopAfterAllSignal.notify = async () => {
                 await notifyPrevious()
                 browser.removeListener("disconnected", disconnectedCallback)
+                logger.debug(
+                  `stopAfterAllSignal notified -> closing ${browserName}`,
+                )
                 await closeBrowser()
               }
             }

package/src/omega/url_graph/url_info_transformations.js

@@ -117,7 +117,8 @@ export const createUrlInfoTransformer = ({
     if (!transformations) {
       return
     }
-    const { type, contentType, content, sourcemap } = transformations
+    const { type, contentType, content, sourcemap, sourcemapIsWrong } =
+      transformations
     if (type) {
       urlInfo.type = type
     }
@@ -138,6 +139,16 @@ export const createUrlInfoTransformer = ({
         finalSourcemap,
       )
       urlInfo.sourcemap = finalSourcemapNormalized
+      // A plugin is allowed to modify url content
+      // without returning a sourcemap
+      // This is the case for preact and react plugins.
+      // They are currently generating wrong source mappings
+      // when used.
+      // Generating the correct sourcemap in this situation
+      // is a nightmare no-one could solve in years so
+      // jsenv won't emit a warning and use the following strategy:
+      // "no sourcemap is better than wrong sourcemap"
+      urlInfo.sourcemapIsWrong = sourcemapIsWrong
     }
   }
 
@@ -162,19 +173,21 @@ export const createUrlInfoTransformer = ({
         })
       }
       sourcemapUrlInfo.content = JSON.stringify(sourcemap, null, "  ")
-      if (sourcemaps === "inline") {
-        sourcemapReference.generatedSpecifier =
-          generateSourcemapDataUrl(sourcemap)
-      }
-      if (sourcemaps === "file" || sourcemaps === "inline") {
-        urlInfo.content = SOURCEMAP.writeComment({
-          contentType: urlInfo.contentType,
-          content: urlInfo.content,
-          specifier:
-            sourcemaps === "file" && sourcemapsRelativeSources
-              ? urlToRelativeUrl(sourcemapReference.url, urlInfo.url)
-              : sourcemapReference.generatedSpecifier,
-        })
+      if (!urlInfo.sourcemapIsWrong) {
+        if (sourcemaps === "inline") {
+          sourcemapReference.generatedSpecifier =
+            generateSourcemapDataUrl(sourcemap)
+        }
+        if (sourcemaps === "file" || sourcemaps === "inline") {
+          urlInfo.content = SOURCEMAP.writeComment({
+            contentType: urlInfo.contentType,
+            content: urlInfo.content,
+            specifier:
+              sourcemaps === "file" && sourcemapsRelativeSources
+                ? urlToRelativeUrl(sourcemapReference.url, urlInfo.url)
+                : sourcemapReference.generatedSpecifier,
+          })
+        }
       }
     } else if (urlInfo.sourcemapReference) {
       // in the end we don't use the sourcemap placeholder

package/src/omega/url_graph.js

@@ -215,6 +215,7 @@ const createUrlInfo = (url) => {
 
     sourcemap: null,
     sourcemapReference: null,
+    sourcemapIsWrong: false,
     timing: {},
     headers: {},
   }

package/src/plugins/bundling/js_module/bundle_js_module.js

@@ -147,7 +147,11 @@ const rollupPluginJsenv = ({
     outputOptions: (outputOptions) => {
       // const sourcemapFile = buildDirectoryUrl
       Object.assign(outputOptions, {
-        format: "esm",
+        format: jsModuleUrlInfos.some((jsModuleUrlInfo) =>
+          jsModuleUrlInfo.filename.endsWith(".cjs"),
+        )
+          ? "cjs"
+          : "esm",
         dir: fileUrlConverter.asFilePath(buildDirectoryUrl),
         sourcemap: sourcemaps === "file" || sourcemaps === "inline",
         // sourcemapFile,

package/src/test/execute_plan.js

@@ -37,6 +37,8 @@ export const executePlan = async (
     signal,
     handleSIGINT,
     logger,
+    logRuntime,
+    logEachDuration,
     logSummary,
     logTimeUsage,
     logMemoryHeapUsage,
@@ -338,6 +340,8 @@ export const executePlan = async (
             render: () => {
               return createExecutionLog(beforeExecutionInfo, {
                 counters,
+                logRuntime,
+                logEachDuration,
                 ...(logTimeUsage
                   ? {
                       timeEllapsed: Date.now() - startMs,
@@ -411,6 +415,8 @@ export const executePlan = async (
           let log = createExecutionLog(afterExecutionInfo, {
             completedExecutionLogAbbreviation,
             counters,
+            logRuntime,
+            logEachDuration,
             ...(logTimeUsage
               ? {
                   timeEllapsed: Date.now() - startMs,
@@ -457,6 +463,7 @@ export const executePlan = async (
       },
     })
     if (!keepRunning) {
+      logger.debug("stopAfterAllSignal.notify()")
       await stopAfterAllSignal.notify()
     }
 

package/src/test/execute_test_plan.js

@@ -36,6 +36,8 @@ export const executeTestPlan = async ({
   signal = new AbortController().signal,
   handleSIGINT = true,
   logLevel = "info",
+  logRuntime = true,
+  logEachDuration = true,
   logSummary = true,
   logTimeUsage = false,
   logMemoryHeapUsage = false,
@@ -138,6 +140,8 @@ export const executeTestPlan = async ({
     logger,
     logLevel,
     logSummary,
+    logRuntime,
+    logEachDuration,
     logTimeUsage,
     logMemoryHeapUsage,
     logFileRelativeUrl,

package/src/test/logs_file_execution.js

@@ -19,7 +19,14 @@ export const createExecutionLog = (
     startMs,
     endMs,
   },
-  { completedExecutionLogAbbreviation, counters, timeEllapsed, memoryHeap },
+  {
+    completedExecutionLogAbbreviation,
+    counters,
+    logRuntime,
+    logEachDuration,
+    timeEllapsed,
+    memoryHeap,
+  },
 ) => {
   const { status } = executionResult
   const descriptionFormatter = descriptionFormatters[status]
@@ -43,11 +50,15 @@ export const createExecutionLog = (
     label: `${description}${summary}`,
     details: {
       file: fileRelativeUrl,
-      runtime: `${runtimeName}/${runtimeVersion}`,
-      duration:
-        status === "executing"
-          ? msAsEllapsedTime(Date.now() - startMs)
-          : msAsDuration(endMs - startMs),
+      ...(logRuntime ? { runtime: `${runtimeName}/${runtimeVersion}` } : {}),
+      ...(logEachDuration
+        ? {
+            duration:
+              status === "executing"
+                ? msAsEllapsedTime(Date.now() - startMs)
+                : msAsDuration(endMs - startMs),
+          }
+        : {}),
       ...(error ? { error: error.stack || error.message || error } : {}),
     },
     consoleOutput,
@@ -203,18 +214,84 @@ const descriptionFormatters = {
 }
 
 const formatConsoleCalls = (consoleCalls) => {
-  const consoleOutput = consoleCalls.reduce((previous, { text }) => {
-    return `${previous}${text}`
-  }, "")
-  const consoleOutputTrimmed = consoleOutput.trim()
-  if (consoleOutputTrimmed === "") {
+  if (consoleCalls.length === 0) {
     return ""
   }
-  return `${ANSI.color(`-------- console output --------`, ANSI.GREY)}
-${consoleOutputTrimmed}
+
+  const repartition = {
+    debug: 0,
+    info: 0,
+    warning: 0,
+    error: 0,
+    log: 0,
+  }
+  let consoleOutput = ``
+  consoleCalls.forEach((consoleCall) => {
+    repartition[consoleCall.type]++
+    const text = consoleCall.text
+    const textFormatted = prefixFirstAndIndentRemainingLines({
+      prefix: CONSOLE_ICONS[consoleCall.type],
+      text,
+      trimLastLine: consoleCall === consoleCalls[consoleCalls.length - 1],
+    })
+    consoleOutput += textFormatted
+  })
+
+  return `${ANSI.color(
+    `-------- ${formatConsoleSummary(repartition)} --------`,
+    ANSI.GREY,
+  )}
+${consoleOutput}
 ${ANSI.color(`-------------------------`, ANSI.GREY)}`
 }
 
+const CONSOLE_ICONS = {
+  debug: UNICODE.DEBUG,
+  info: UNICODE.INFO,
+  warning: UNICODE.WARNING,
+  error: UNICODE.FAILURE,
+  log: " ",
+}
+
+const formatConsoleSummary = (repartition) => {
+  const { debug, info, warning, error } = repartition
+  const parts = []
+  if (error) {
+    parts.push(`${CONSOLE_ICONS.error} ${error}`)
+  }
+  if (warning) {
+    parts.push(`${CONSOLE_ICONS.warning} ${warning}`)
+  }
+  if (info) {
+    parts.push(`${CONSOLE_ICONS.info} ${info}`)
+  }
+  if (debug) {
+    parts.push(`${CONSOLE_ICONS.debug} ${debug}`)
+  }
+  if (parts.length === 0) {
+    return `console`
+  }
+  return `console (${parts.join(" ")})`
+}
+
+const prefixFirstAndIndentRemainingLines = ({ prefix, text, trimLastLine }) => {
+  const lines = text.split(/\r?\n/)
+  const firstLine = lines.shift()
+  let result = `${prefix} ${firstLine}`
+  let i = 0
+  const indentation = `  `
+  while (i < lines.length) {
+    const line = lines[i].trim()
+    i++
+    result += line.length
+      ? `\n${indentation}${line}`
+      : trimLastLine && i === lines.length
+      ? ""
+      : `\n`
+  }
+  return result
+}
+
 const formatExecution = ({ label, details = {}, consoleOutput }) => {
   let message = ``
   message += label