@nice-code/action 0.2.14 → 0.2.15

package/build/devtools/browser/index.js

@@ -128,7 +128,7 @@ class ActionDevtoolsCore {
   }
 }
 // src/devtools/browser/NiceActionDevtools.tsx
-import { useCallback, useEffect as useEffect2, useMemo as useMemo2, useRef as useRef2, useState as useState6 } from "react";
+import { useCallback, useEffect as useEffect3, useMemo as useMemo2, useRef as useRef2, useState as useState6 } from "react";
 
 // src/devtools/browser/components/ActionDetailPanel.tsx
 import { useMemo, useState as useState5 } from "react";
@@ -825,7 +825,65 @@ function RoutingSection({
 }
 
 // src/devtools/browser/components/StackTraceSection.tsx
-import { useState as useState4 } from "react";
+import { useEffect as useEffect2, useState as useState4 } from "react";
+
+// src/devtools/browser/components/sourceMapResolver.ts
+import { SourceMapConsumer } from "source-map-js";
+var consumerCache = new Map;
+async function loadConsumer(fileUrl) {
+  try {
+    if (!fileUrl.startsWith("http://") && !fileUrl.startsWith("https://"))
+      return null;
+    const resp = await fetch(fileUrl);
+    if (!resp.ok)
+      return null;
+    const text = await resp.text();
+    const match = text.match(/\/\/[#@] sourceMappingURL=(\S+)/);
+    if (match == null)
+      return null;
+    const mapRef = match[1];
+    let mapJson;
+    if (mapRef.startsWith("data:")) {
+      const commaIdx = mapRef.indexOf(",");
+      if (commaIdx === -1)
+        return null;
+      const header = mapRef.slice(5, commaIdx);
+      const payload = mapRef.slice(commaIdx + 1);
+      mapJson = header.includes("base64") ? atob(payload) : decodeURIComponent(payload);
+    } else {
+      const mapUrl = new URL(mapRef, fileUrl).href;
+      const mapResp = await fetch(mapUrl);
+      if (!mapResp.ok)
+        return null;
+      mapJson = await mapResp.text();
+    }
+    return new SourceMapConsumer(JSON.parse(mapJson));
+  } catch {
+    return null;
+  }
+}
+function getConsumer(fileUrl) {
+  const key = fileUrl.split("?")[0] ?? fileUrl;
+  if (!consumerCache.has(key)) {
+    consumerCache.set(key, loadConsumer(fileUrl));
+  }
+  return consumerCache.get(key);
+}
+async function resolveCompiledPosition(fileUrl, line, col) {
+  try {
+    const consumer = await getConsumer(fileUrl);
+    if (consumer == null)
+      return null;
+    const pos = consumer.originalPositionFor({ line, column: col });
+    if (pos.source == null || pos.line == null)
+      return null;
+    return { file: pos.source, line: pos.line, col: pos.column ?? 0 };
+  } catch {
+    return null;
+  }
+}
+
+// src/devtools/browser/components/StackTraceSection.tsx
 import { jsxDEV as jsxDEV10 } from "react/jsx-dev-runtime";
 var INTERNAL_PATTERNS = [
   "/nice-action/",
@@ -846,16 +904,39 @@ function parseStackFrames(stack) {
     const matchFn = raw.match(/^at (.+?) \((.+):(\d+):(\d+)\)$/);
     if (matchFn != null) {
       const file = matchFn[2];
-      return { fn: matchFn[1], file, raw, isInternal: isInternalFrame(file) };
+      return {
+        fn: matchFn[1],
+        file,
+        line: parseInt(matchFn[3], 10),
+        col: parseInt(matchFn[4], 10),
+        raw,
+        isInternal: isInternalFrame(file)
+      };
     }
     const matchUrl = raw.match(/^at (.+):(\d+):(\d+)$/);
     if (matchUrl != null) {
       const file = matchUrl[1];
-      return { file, raw, isInternal: isInternalFrame(file) };
+      return {
+        file,
+        line: parseInt(matchUrl[2], 10),
+        col: parseInt(matchUrl[3], 10),
+        raw,
+        isInternal: isInternalFrame(file)
+      };
     }
     return { raw, isInternal: true };
   }).filter((f) => f != null);
 }
+async function resolveSourceMapPositions(frames) {
+  return Promise.all(frames.map(async (frame) => {
+    if (frame.isInternal || frame.file == null || frame.line == null)
+      return frame;
+    const resolved = await resolveCompiledPosition(frame.file, frame.line, frame.col ?? 0);
+    if (resolved == null)
+      return frame;
+    return { ...frame, file: resolved.file, line: resolved.line, col: resolved.col };
+  }));
+}
 function formatFrameFile(file) {
   if (file == null)
     return "?";
@@ -877,9 +958,24 @@ function StackTraceSection({
   color = "#60a5fa"
 }) {
   const [showAll, setShowAll] = useState4(false);
+  const [resolvedFrames, setResolvedFrames] = useState4(null);
+  useEffect2(() => {
+    if (stack == null)
+      return;
+    setResolvedFrames(null);
+    const parsed = parseStackFrames(stack);
+    let cancelled = false;
+    resolveSourceMapPositions(parsed).then((frames) => {
+      if (!cancelled)
+        setResolvedFrames(frames);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [stack]);
   if (stack == null)
     return null;
-  const allFrames = parseStackFrames(stack);
+  const allFrames = resolvedFrames ?? parseStackFrames(stack);
   const userFrames = allFrames.filter((f) => !f.isInternal);
   const hasInternalFrames = allFrames.length > userFrames.length;
   const displayFrames = showAll ? allFrames : userFrames;
@@ -985,13 +1081,26 @@ function StackTraceSection({
                           flexShrink: 0
                         },
                         children: bareFilename
-                      }, undefined, false, undefined, this)
+                      }, undefined, false, undefined, this),
+                      frame.line != null && /* @__PURE__ */ jsxDEV10("span", {
+                        style: {
+                          color: isUser ? "#4a7fa8" : "#2d4a63",
+                          fontSize: "10px",
+                          whiteSpace: "nowrap",
+                          flexShrink: 0,
+                          fontVariantNumeric: "tabular-nums"
+                        },
+                        children: [
+                          ":",
+                          frame.line
+                        ]
+                      }, undefined, true, undefined, this)
                     ]
                   }, undefined, true, undefined, this)
                 ]
               }, undefined, true, undefined, this)
             ]
-          }, `${frame.fn ?? "anon"}@${frame.file ?? "unknown"}`, true, undefined, this);
+          }, frame.raw, true, undefined, this);
         })
       }, undefined, false, undefined, this)
     ]
@@ -1702,7 +1811,7 @@ function NiceActionDevtools_Panel({
   const showDomainTooltip = useCallback((rect, allDomains) => setDomainTooltip({ rect, allDomains }), []);
   const hideDomainTooltip = useCallback(() => setDomainTooltip(null), []);
   const domainTooltipCtx = useMemo2(() => ({ show: showDomainTooltip, hide: hideDomainTooltip }), [showDomainTooltip, hideDomainTooltip]);
-  useEffect2(() => core.subscribe(setEntries), [core]);
+  useEffect3(() => core.subscribe(setEntries), [core]);
   const groups = useMemo2(() => {
     const byCuid = new Map(entries.map((e) => [e.cuid, e]));
     const roots = entries.filter((e) => e.status !== "running" && (e.parentCuid == null || !byCuid.has(e.parentCuid)));
@@ -1754,7 +1863,7 @@ function NiceActionDevtools_Panel({
   const dockedSize = isHorizDock ? dockedHeight : dockedWidth;
   const selectedEntry = selectedCuid != null ? entries.find((e) => e.cuid === selectedCuid) : null;
   const runningCount = entries.filter((e) => e.status === "running").length;
-  useEffect2(() => {
+  useEffect3(() => {
     const sides = ["top", "bottom", "left", "right"];
     const clearAll = () => {
       sides.forEach((s) => {
@@ -2021,7 +2130,7 @@ function ActionList({
     return result;
   }, [groups, expandedGroupCuids, selectedCuid]);
   const prevSelectedRef = useRef2(selectedCuid);
-  useEffect2(() => {
+  useEffect3(() => {
     if (selectedCuid === prevSelectedRef.current)
       return;
     prevSelectedRef.current = selectedCuid;

package/build/index.js

@@ -311,7 +311,9 @@ class ActionPayload_Request extends ActionPayload {
     return value.waitForResultPayload();
   }
   async run(options) {
-    this._callSite = new Error().stack;
+    if (this._callSite == null) {
+      this._callSite = new Error().stack;
+    }
     return this._domain.runAction(this, options);
   }
 }

package/build/react-query/index.js

@@ -13,6 +13,7 @@ function useActionMutation(action, options) {
 import {
   useQuery
 } from "@tanstack/react-query";
+import { useRef } from "react";
 function actionQueryKey(action, input) {
   if (input === undefined) {
     return ["nice-action", action.domain, action.allDomains, action.id];
@@ -29,9 +30,14 @@ function useActionQuery(action, ...args) {
     [options] = args;
   }
   const { enabled, ...queryOptions } = options ?? {};
+  const callSiteRef = useRef(new Error().stack);
   return useQuery({
     queryKey: input != null ? actionQueryKey(action, input) : actionQueryKey(action),
-    queryFn: () => action.request(input).runToOutput(),
+    queryFn: () => {
+      const req = action.request(input);
+      req._callSite = callSiteRef.current;
+      return req.runToOutput();
+    },
     enabled: hasInputSchema ? input != null && (enabled ?? true) : enabled ?? true,
     ...queryOptions
   });

package/build/types/devtools/browser/components/sourceMapResolver.d.ts

@@ -0,0 +1,6 @@
+export interface IResolvedSourcePosition {
+    file: string;
+    line: number;
+    col: number;
+}
+export declare function resolveCompiledPosition(fileUrl: string, line: number, col: number): Promise<IResolvedSourcePosition | null>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nice-code/action",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "private": false,
   "type": "module",
   "exports": {
@@ -44,12 +44,13 @@
     "build-types": "tsc --project tsconfig.build.json"
   },
   "dependencies": {
-    "@nice-code/common-errors": "0.2.14",
-    "@nice-code/error": "0.2.14",
+    "@nice-code/common-errors": "0.2.15",
+    "@nice-code/error": "0.2.15",
     "@standard-schema/spec": "^1.1.0",
     "@tanstack/react-virtual": "^3.13.26",
     "http-status-codes": "^2.3.0",
     "nanoid": "^5.1.9",
+    "source-map-js": "^1.2.1",
     "std-env": "^4.1.0"
   },
   "devDependencies": {