@jsenv/core 27.3.4 → 27.4.0

package/src/test/logs_file_execution.js

@@ -217,7 +217,6 @@ const formatConsoleCalls = (consoleCalls) => {
   if (consoleCalls.length === 0) {
     return ""
   }
-
   const repartition = {
     debug: 0,
     info: 0,
@@ -225,17 +224,10 @@ const formatConsoleCalls = (consoleCalls) => {
     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
   })
+  const consoleOutput = formatConsoleOutput(consoleCalls)
 
   return `${ANSI.color(
     `-------- ${formatConsoleSummary(repartition)} --------`,
@@ -245,6 +237,65 @@ ${consoleOutput}
 ${ANSI.color(`-------------------------`, ANSI.GREY)}`
 }
 
+export const formatConsoleOutput = (consoleCalls) => {
+  // inside Node.js you can do process.stdout.write()
+  // and in that case the consoleCall is not suffixed with "\n"
+  // we want to keep these calls together in the output
+  const regroupedCalls = []
+  consoleCalls.forEach((consoleCall, index) => {
+    if (index === 0) {
+      regroupedCalls.push(consoleCall)
+      return
+    }
+    const previousCall = consoleCalls[index - 1]
+    if (previousCall.type !== consoleCall.type) {
+      regroupedCalls.push(consoleCall)
+      return
+    }
+    if (previousCall.text.endsWith("\n")) {
+      regroupedCalls.push(consoleCall)
+      return
+    }
+    if (previousCall.text.endsWith("\r")) {
+      regroupedCalls.push(consoleCall)
+      return
+    }
+    const previousRegroupedCallIndex = regroupedCalls.length - 1
+    const previousRegroupedCall = regroupedCalls[previousRegroupedCallIndex]
+    previousRegroupedCall.text = `${previousRegroupedCall.text}${consoleCall.text}`
+  })
+
+  let consoleOutput = ``
+  regroupedCalls.forEach((regroupedCall, index) => {
+    const text = regroupedCall.text
+    const textFormatted = prefixFirstAndIndentRemainingLines({
+      prefix: CONSOLE_ICONS[regroupedCall.type],
+      text,
+      trimLastLine: index === regroupedCalls.length - 1,
+    })
+    consoleOutput += textFormatted
+  })
+  return consoleOutput
+}
+
+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 CONSOLE_ICONS = {
   debug: UNICODE.DEBUG,
   info: UNICODE.INFO,
@@ -274,24 +325,6 @@ const formatConsoleSummary = (repartition) => {
   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

package/src/test/logs_file_execution.test.mjs

@@ -0,0 +1,41 @@
+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 })
+}