fluidcad 0.0.18 → 0.0.20

package/lib/dist/index.d.ts

@@ -4,6 +4,7 @@ import { SelectSceneObject } from "./features/select.js";
 import { Sketch } from "./features/2d/sketch.js";
 import { Extrudable } from "./helpers/types.js";
 export declare function captureSourceLocation(): SourceLocation | null;
+export declare function extractSourceLocation(stack: string): SourceLocation | null;
 export type SceneParserContext = {
     addSceneObject(obj: SceneObject): void;
     addSceneObjects(objs: SceneObject[]): void;

package/lib/dist/index.js

@@ -1,30 +1,40 @@
 import { loadOC } from "./load.js";
 import { createManager, getCurrentScene } from "./scene-manager.js";
+import { parse as parseStackTrace } from "stacktrace-parser";
 export function captureSourceLocation() {
     const stack = new Error().stack;
     if (!stack) {
         return null;
     }
-    const lines = stack.split('\n');
-    for (const frame of lines) {
-        // Match the Vite live-render virtual prefix first so the path regex
-        // does not accidentally match `r:/…` inside the word `render:`.
-        const virtualMatch = frame.match(/virtual:live-render:((?:[A-Za-z]:)?\/[^\s]+?\.fluid\.js):(\d+):(\d+)/);
-        if (virtualMatch) {
-            return {
-                filePath: virtualMatch[1],
-                line: parseInt(virtualMatch[2], 10),
-                column: parseInt(virtualMatch[3], 10),
-            };
+    return extractSourceLocation(stack);
+}
+export function extractSourceLocation(stack) {
+    const frames = parseStackTrace(stack);
+    for (const frame of frames) {
+        if (!frame.file || frame.lineNumber == null) {
+            continue;
+        }
+        let filePath = frame.file;
+        const virtualPrefix = 'virtual:live-render:';
+        const virtualIdx = filePath.lastIndexOf(virtualPrefix);
+        if (virtualIdx !== -1) {
+            filePath = filePath.slice(virtualIdx + virtualPrefix.length);
         }
-        const realMatch = frame.match(/((?:[A-Za-z]:)?\/[^\s]+?\.fluid\.js):(\d+):(\d+)/);
-        if (realMatch) {
-            return {
-                filePath: realMatch[1],
-                line: parseInt(realMatch[2], 10),
-                column: parseInt(realMatch[3], 10),
-            };
+        if (filePath.startsWith('file:///')) {
+            filePath = filePath.slice('file:///'.length);
+            if (!/^[A-Za-z]:/.test(filePath)) {
+                filePath = '/' + filePath;
+            }
         }
+        if (!filePath.endsWith('.fluid.js')) {
+            continue;
+        }
+        filePath = filePath.replace(/\\/g, '/');
+        return {
+            filePath,
+            line: frame.lineNumber,
+            column: frame.column ?? 0,
+        };
     }
     return null;
 }

package/lib/dist/tests/extract-source-location.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/dist/tests/extract-source-location.test.js

@@ -0,0 +1,74 @@
+import { describe, it, expect } from "vitest";
+import { extractSourceLocation } from "../index.js";
+describe("extractSourceLocation", () => {
+    it("parses Linux virtual:live-render frame", () => {
+        const stack = `Error
+    at breakpoint (file:///home/user/node_modules/fluidcad/lib/dist/core/breakpoint.js:4:11)
+    at eval (virtual:live-render:/home/user/project/test.fluid.js:10:5)`;
+        const loc = extractSourceLocation(stack);
+        expect(loc).toEqual({
+            filePath: "/home/user/project/test.fluid.js",
+            line: 10,
+            column: 5,
+        });
+    });
+    it("parses Linux real file path", () => {
+        const stack = `Error
+    at Object.<anonymous> (/home/user/project/test.fluid.js:10:5)`;
+        const loc = extractSourceLocation(stack);
+        expect(loc).toEqual({
+            filePath: "/home/user/project/test.fluid.js",
+            line: 10,
+            column: 5,
+        });
+    });
+    it("parses Windows virtual:live-render frame with backslashes", () => {
+        const stack = `Error
+    at breakpoint (file:///C:/Users/marwan/proj/test5/node_modules/fluidcad/lib/dist/core/breakpoint.js:4:11)
+    at eval (C:\\Users\\marwan\\AppData\\Local\\Programs\\Microsoft VS Code\\virtual:live-render:C:\\Users\\marwan\\proj\\test5\\test.fluid.js:8:11)`;
+        const loc = extractSourceLocation(stack);
+        expect(loc).toEqual({
+            filePath: "C:/Users/marwan/proj/test5/test.fluid.js",
+            line: 8,
+            column: 11,
+        });
+    });
+    it("parses Windows file:/// URL with forward slashes", () => {
+        const stack = `Error
+    at Object.<anonymous> (file:///C:/Users/marwan/proj/test.fluid.js:4:11)`;
+        const loc = extractSourceLocation(stack);
+        expect(loc).toEqual({
+            filePath: "C:/Users/marwan/proj/test.fluid.js",
+            line: 4,
+            column: 11,
+        });
+    });
+    it("skips non-.fluid.js files", () => {
+        const stack = `Error
+    at breakpoint (/home/user/node_modules/fluidcad/lib/dist/core/breakpoint.js:4:11)`;
+        const loc = extractSourceLocation(stack);
+        expect(loc).toBeNull();
+    });
+    it("skips frames with no file", () => {
+        const stack = `Error
+    at Array.forEach (<anonymous>)`;
+        const loc = extractSourceLocation(stack);
+        expect(loc).toBeNull();
+    });
+    it("returns null for empty stack", () => {
+        const loc = extractSourceLocation("");
+        expect(loc).toBeNull();
+    });
+    it("skips breakpoint.js and finds the .fluid.js caller", () => {
+        const stack = `Error
+    at captureSourceLocation (/home/user/node_modules/fluidcad/lib/dist/index.js:9:15)
+    at breakpoint (/home/user/node_modules/fluidcad/lib/dist/core/breakpoint.js:4:11)
+    at Object.<anonymous> (/home/user/project/model.fluid.js:3:1)`;
+        const loc = extractSourceLocation(stack);
+        expect(loc).toEqual({
+            filePath: "/home/user/project/model.fluid.js",
+            line: 3,
+            column: 1,
+        });
+    });
+});