@everyonesoftware/common 8.0.0 → 9.0.0

package/outputs/testIndex.js

@@ -9,7 +9,7 @@ import {
   TestRunner,
   TestSkip,
   test
-} from "./chunk-FEQPKLDH.js";
+} from "./chunk-HMQKVFIP.js";
 import "./chunk-OYMWB5SX.js";
 export {
   AssertTest,

package/outputs/tests.cjs

@@ -8656,56 +8656,51 @@ var BasicTestError = class _BasicTestError {
     }
     return result;
   }
+  static getStackFrameLineMatch(line) {
+    return line.match(/^(\s*)at (.*) \((.+)\)$/) ?? line.match(/^(\s*)at (.+)$/);
+  }
+  static normalizePath(path2) {
+    return path2.replace(/\\/g, "/");
+  }
+  static getStackFrameAbsolutePath(stackFrameLocation) {
+    let result = _BasicTestError.normalizePath(stackFrameLocation);
+    if (result.startsWith("file:///")) {
+      result = _BasicTestError.normalizePath((0, import_url.fileURLToPath)(result));
+    } else if (!/^[A-Za-z]:[\\/]/.test(result) && !result.startsWith("/")) {
+      result = void 0;
+    }
+    return result;
+  }
   static removeNonProjectPaths(errorString, currentFolderPath) {
-    currentFolderPath = currentFolderPath.replaceAll("\\", "/");
+    currentFolderPath = _BasicTestError.normalizePath(currentFolderPath);
     return errorString.split("\n").filter((line) => {
-      let keepLine = false;
-      const trimmedLine = line.trim();
-      const match = trimmedLine.match(/^at .* \((.+)\)$/) ?? trimmedLine.match(/^at (.+)$/);
-      if (!match) {
-        keepLine = true;
-      } else {
-        const location = match[1];
-        try {
-          const filePath = import_path.default.resolve((0, import_url.fileURLToPath)(location)).replaceAll("\\", "/");
-          keepLine = filePath.startsWith(currentFolderPath);
-        } catch {
-        }
+      let keepLine = true;
+      const stackFrameLineMatch = _BasicTestError.getStackFrameLineMatch(line);
+      if (stackFrameLineMatch) {
+        const hasFunctionName = stackFrameLineMatch.length === 4;
+        const location = hasFunctionName ? stackFrameLineMatch[3] : stackFrameLineMatch[2];
+        const filePath = _BasicTestError.getStackFrameAbsolutePath(location);
+        keepLine = !!filePath && filePath.startsWith(currentFolderPath) && !filePath.includes("/node_modules/");
       }
       return keepLine;
     }).join("\n");
   }
   static makeFilePathsRelative(errorString, currentFolderPath) {
     return errorString.split("\n").map((line) => {
-      const match = line.match(/^(\s*)at (.+?) \((.+)\)$/) ?? line.match(/^(\s*)at (.+)$/);
-      if (match) {
-        const hasFunctionName = match.length === 4;
-        const indentation = match[1];
-        const functionName = hasFunctionName ? match[2] : void 0;
-        const location = hasFunctionName ? match[3] : match[2];
+      const stackFrameLineMatch = _BasicTestError.getStackFrameLineMatch(line);
+      if (stackFrameLineMatch) {
+        const hasFunctionName = stackFrameLineMatch.length === 4;
+        const indentation = stackFrameLineMatch[1];
+        const functionName = hasFunctionName ? stackFrameLineMatch[2] : void 0;
+        const location = hasFunctionName ? stackFrameLineMatch[3] : stackFrameLineMatch[2];
         let relativeLocation = location;
-        try {
-          const pathMatch = location.match(/^(.*?):(\d+):(\d+)$/);
-          if (pathMatch) {
-            const fullPath = pathMatch[1];
-            const lineNumber = pathMatch[2];
-            const columnNumber = pathMatch[3];
-            let absolutePath;
-            if (fullPath.startsWith("file:///")) {
-              absolutePath = (0, import_url.fileURLToPath)(fullPath);
-            } else if (/^[A-Za-z]:[\\/]/.test(fullPath) || fullPath.startsWith("/")) {
-              absolutePath = fullPath;
-            }
-            if (absolutePath) {
-              let relativePath = import_path.default.relative(
-                currentFolderPath,
-                absolutePath
-              );
-              relativePath = relativePath.replace(/\\/g, "/");
-              relativeLocation = `${relativePath}:${lineNumber}:${columnNumber}`;
-            }
+        const pathMatch = location.match(/^(.*?):(\d+):(\d+)$/);
+        if (pathMatch) {
+          const absolutePath = _BasicTestError.getStackFrameAbsolutePath(location);
+          if (absolutePath) {
+            const relativePath = import_path.default.relative(currentFolderPath, absolutePath);
+            relativeLocation = _BasicTestError.normalizePath(relativePath);
           }
-        } catch {
         }
         if (relativeLocation !== location) {
           if (functionName) {
@@ -18707,6 +18702,34 @@ function test55(runner) {
           const result = BasicTestError.removeNonProjectPaths(errorStringLines.join("\n"), currentFolderPath);
           test56.assertEqual(expectedLines, result.split("\n"));
         });
+        runner.test("with Windows file paths and 'node_modules' references in stack trace", (test56) => {
+          const errorStringLines = [
+            "AssertionError [ERR_ASSERTION]: Expected values to be strictly deep-equal:",
+            "",
+            "  1 !== 2",
+            "",
+            "      at _AssertTest.assertEqual (C:\\my\\code\\cli-typescript\\node_modules\\@everyonesoftware\\common\\tests\\assertTest.ts:76:16)",
+            "      at C:\\my\\code\\cli-typescript\\tests\\mainTests.ts:9:18",
+            "      at C:\\my\\code\\cli-typescript\\node_modules\\@everyonesoftware\\common\\tests\\consoleTestRunner.ts:498:31",
+            "      at processTicksAndRejections (node:internal/process/task_queues:104:5)",
+            "      at _TestAction.action (C:\\my\\code\\cli-typescript\\node_modules\\@everyonesoftware\\common\\tests\\consoleTestRunner.ts:178:17)",
+            "      at _ConsoleTestRunner.runAsync (C:\\my\\code\\cli-typescript\\node_modules\\@everyonesoftware\\common\\tests\\consoleTestRunner.ts:531:17)",
+            "      at C:\\my\\code\\cli-typescript\\node_modules\\@everyonesoftware\\common\\tests\\consoleTestRunner.ts:112:13",
+            "      at _CurrentProcess.run (C:\\my\\code\\cli-typescript\\node_modules\\@everyonesoftware\\common\\sources\\currentProcess.ts:39:43)",
+            "      at test2 (C:\\my\\code\\cli-typescript\\tests\\tests.ts:6:5)"
+          ];
+          const currentFolderPath = "C:/my/code/cli-typescript/";
+          const expectedLines = [
+            "AssertionError [ERR_ASSERTION]: Expected values to be strictly deep-equal:",
+            "",
+            "  1 !== 2",
+            "",
+            "      at C:\\my\\code\\cli-typescript\\tests\\mainTests.ts:9:18",
+            "      at test2 (C:\\my\\code\\cli-typescript\\tests\\tests.ts:6:5)"
+          ];
+          const result = BasicTestError.removeNonProjectPaths(errorStringLines.join("\n"), currentFolderPath);
+          test56.assertEqual(expectedLines, result.split("\n"));
+        });
       });
       runner.testFunction("makeFilePathsRelative()", () => {
         runner.test("with 'file:///' URLs and a 'node:internal' path", (test56) => {