@jsenv/test 3.7.8 → 3.7.10

package/dist/jsenv_test.js

@@ -738,6 +738,33 @@ const UNICODE = createUnicode({
   ANSI,
 });
 
+const prefixFirstAndIndentRemainingLines = (
+  text,
+  { prefix, indentation, trimLines, trimLastLine },
+) => {
+  const lines = text.split(/\r?\n/);
+  const firstLine = lines.shift();
+  if (indentation === undefined) {
+    if (prefix) {
+      indentation = "  "; // prefix + space
+    } else {
+      indentation = "";
+    }
+  }
+  let result = prefix ? `${prefix} ${firstLine}` : firstLine;
+  let i = 0;
+  while (i < lines.length) {
+    const line = trimLines ? lines[i].trim() : lines[i];
+    i++;
+    result += line.length
+      ? `\n${indentation}${line}`
+      : trimLastLine && i === lines.length
+        ? ""
+        : `\n`;
+  }
+  return result;
+};
+
 const setRoundedPrecision = (
   number,
   { decimals = 1, decimalsWhenSmall = decimals } = {},
@@ -3666,13 +3693,24 @@ const defaultLookupPackageScope = (url) => {
 };
 
 const defaultReadPackageJson = (packageUrl) => {
-  const packageJsonUrl = new URL("package.json", packageUrl);
-  const buffer = readFileSync(packageJsonUrl);
-  const string = String(buffer);
+  const packageJsonFileUrl = new URL("./package.json", packageUrl);
+  let packageJsonFileContentBuffer;
+  try {
+    packageJsonFileContentBuffer = readFileSync(packageJsonFileUrl, "utf8");
+  } catch (e) {
+    if (e.code === "ENOENT") {
+      return null;
+    }
+    throw e;
+  }
+  const packageJsonFileContentString = String(packageJsonFileContentBuffer);
   try {
-    return JSON.parse(string);
+    const packageJsonFileContentObject = JSON.parse(
+      packageJsonFileContentString,
+    );
+    return packageJsonFileContentObject;
   } catch {
-    throw new Error(`Invalid package configuration`);
+    throw new Error(`Invalid package configuration at ${packageJsonFileUrl}`);
   }
 };
 
@@ -4564,7 +4602,7 @@ const mainLegacyResolvers = {
     };
   },
   node: ({ packageJson, conditions }) => {
-    if (conditions.includes("import")) {
+    if (conditions.includes("import") && !conditions.includes("require")) {
       if (typeof packageJson.module === "string") {
         return { type: "field:module", isMain: true, path: packageJson.module };
       }
@@ -4578,6 +4616,7 @@ const mainLegacyResolvers = {
     return null;
   },
 };
+mainLegacyResolvers.require = mainLegacyResolvers.node;
 
 const comparePatternKeys = (keyA, keyB) => {
   if (!keyA.endsWith("/") && !keyA.includes("*")) {
@@ -6548,9 +6587,8 @@ const renderConsoleOutput = (consoleCalls) => {
   let index = 0;
   for (const regroupedCall of regroupedCalls) {
     const text = regroupedCall.text;
-    const textFormatted = prefixFirstAndIndentRemainingLines({
+    const textFormatted = prefixFirstAndIndentRemainingLines(text, {
       prefix: everyCallIsLog ? "" : CONSOLE_ICONS[regroupedCall.type],
-      text,
       trimLines: false,
       trimLastLine: index === regroupedCalls.length - 1,
     });
@@ -6559,35 +6597,6 @@ const renderConsoleOutput = (consoleCalls) => {
   }
   return consoleOutput;
 };
-const prefixFirstAndIndentRemainingLines = ({
-  prefix,
-  indentation,
-  text,
-  trimLines,
-  trimLastLine,
-}) => {
-  const lines = text.split(/\r?\n/);
-  const firstLine = lines.shift();
-  if (indentation === undefined) {
-    if (prefix) {
-      indentation = "  "; // prefix + space
-    } else {
-      indentation = "";
-    }
-  }
-  let result = prefix ? `${prefix} ${firstLine}` : firstLine;
-  let i = 0;
-  while (i < lines.length) {
-    const line = trimLines ? lines[i].trim() : lines[i];
-    i++;
-    result += line.length
-      ? `\n${indentation}${line}`
-      : trimLastLine && i === lines.length
-        ? ""
-        : `\n`;
-  }
-  return result;
-};
 const CONSOLE_ICONS = {
   get debug() {
     return UNICODE.DEBUG;
@@ -6626,16 +6635,18 @@ const renderErrors = (execution, logOptions) => {
   let output = [];
   errors.forEach((error) => {
     output.push(
-      prefixFirstAndIndentRemainingLines({
-        prefix: `${UNICODE.CIRCLE_CROSS} `,
-        indentation: "   ",
-        text: formatErrorForTerminal(error, {
+      prefixFirstAndIndentRemainingLines(
+        formatErrorForTerminal(error, {
           rootDirectoryUrl: execution.rootDirectoryUrl,
           mainFileRelativeUrl: execution.fileRelativeUrl,
           mockFluctuatingValues: logOptions.mockFluctuatingValues,
           tryColors: true,
         }),
-      }),
+        {
+          prefix: `${UNICODE.CIRCLE_CROSS} `,
+          indentation: "   ",
+        },
+      ),
     );
   });
   return renderSection({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/test",
-  "version": "3.7.8",
+  "version": "3.7.10",
   "repository": {
     "type": "git",
     "url": "https://github.com/jsenv/core",
@@ -35,9 +35,9 @@
   },
   "dependencies": {
     "@c88/v8-coverage": "0.1.1",
-    "@jsenv/ast": "6.7.7",
-    "@jsenv/plugin-supervisor": "1.7.4",
-    "@jsenv/sourcemap": "1.3.9",
+    "@jsenv/ast": "6.7.8",
+    "@jsenv/plugin-supervisor": "1.7.5",
+    "@jsenv/sourcemap": "1.3.10",
     "he": "1.2.0",
     "istanbul-lib-coverage": "3.2.2",
     "istanbul-lib-instrument": "6.0.3",

package/src/execution/reporters/reporter_list.js

@@ -4,6 +4,7 @@ import {
   createDynamicLog,
   humanizeDuration,
   humanizeMemory,
+  prefixFirstAndIndentRemainingLines,
   renderBigSection,
   renderDetails,
   renderSection,
@@ -702,9 +703,8 @@ const renderConsoleOutput = (consoleCalls) => {
   let index = 0;
   for (const regroupedCall of regroupedCalls) {
     const text = regroupedCall.text;
-    const textFormatted = prefixFirstAndIndentRemainingLines({
+    const textFormatted = prefixFirstAndIndentRemainingLines(text, {
       prefix: everyCallIsLog ? "" : CONSOLE_ICONS[regroupedCall.type],
-      text,
       trimLines: false,
       trimLastLine: index === regroupedCalls.length - 1,
     });
@@ -713,35 +713,6 @@ const renderConsoleOutput = (consoleCalls) => {
   }
   return consoleOutput;
 };
-const prefixFirstAndIndentRemainingLines = ({
-  prefix,
-  indentation,
-  text,
-  trimLines,
-  trimLastLine,
-}) => {
-  const lines = text.split(/\r?\n/);
-  const firstLine = lines.shift();
-  if (indentation === undefined) {
-    if (prefix) {
-      indentation = "  "; // prefix + space
-    } else {
-      indentation = "";
-    }
-  }
-  let result = prefix ? `${prefix} ${firstLine}` : firstLine;
-  let i = 0;
-  while (i < lines.length) {
-    const line = trimLines ? lines[i].trim() : lines[i];
-    i++;
-    result += line.length
-      ? `\n${indentation}${line}`
-      : trimLastLine && i === lines.length
-        ? ""
-        : `\n`;
-  }
-  return result;
-};
 const CONSOLE_ICONS = {
   get debug() {
     return UNICODE.DEBUG;
@@ -780,16 +751,18 @@ const renderErrors = (execution, logOptions) => {
   let output = [];
   errors.forEach((error) => {
     output.push(
-      prefixFirstAndIndentRemainingLines({
-        prefix: `${UNICODE.CIRCLE_CROSS} `,
-        indentation: "   ",
-        text: formatErrorForTerminal(error, {
+      prefixFirstAndIndentRemainingLines(
+        formatErrorForTerminal(error, {
           rootDirectoryUrl: execution.rootDirectoryUrl,
           mainFileRelativeUrl: execution.fileRelativeUrl,
           mockFluctuatingValues: logOptions.mockFluctuatingValues,
           tryColors: true,
         }),
-      }),
+        {
+          prefix: `${UNICODE.CIRCLE_CROSS} `,
+          indentation: "   ",
+        },
+      ),
     );
   });
   return renderSection({