@tscircuit/runframe 0.0.499 → 0.0.501

package/dist/{chunk-7ZDHMRPP.js → chunk-QNALISUL.js}

@@ -1093,7 +1093,7 @@ var RenderLogViewer = ({
 };
 
 // package.json
-var version = "0.0.498";
+var version = "0.0.500";
 
 // lib/components/CircuitJsonPreview/CircuitJsonPreview.tsx
 import { jsx as jsx16, jsxs as jsxs12 } from "react/jsx-runtime";

package/dist/preview.js

@@ -8,7 +8,7 @@ import {
   linkify,
   useOrderDialog,
   useOrderDialogCli
-} from "./chunk-7ZDHMRPP.js";
+} from "./chunk-QNALISUL.js";
 export {
   BomTable,
   CadViewer,

package/dist/runner.js

@@ -27,7 +27,7 @@ import {
   useOrderDialog,
   useOrderDialogCli,
   useRunFrameStore
-} from "./chunk-7ZDHMRPP.js";
+} from "./chunk-QNALISUL.js";
 
 // lib/components/RunFrame/RunFrame.tsx
 import { createCircuitWebWorker } from "@tscircuit/eval/worker";
@@ -107,9 +107,12 @@ import { useCallback, useRef } from "react";
 function useMutex() {
   const lockRef = useRef(Promise.resolve());
   const isLockedRef = useRef(false);
+  const currentExecutionRef = useRef(null);
   const runWithMutex = useCallback(
     async (fn) => {
       await lockRef.current;
+      const executionContext = { cancelled: false };
+      currentExecutionRef.current = executionContext;
       let releaseLock;
       const newLock = new Promise((resolve) => {
         releaseLock = resolve;
@@ -118,15 +121,27 @@ function useMutex() {
         lockRef.current = newLock;
         isLockedRef.current = true;
         return await fn();
+      } catch (error) {
+        if (!executionContext.cancelled) {
+          throw error;
+        }
       } finally {
         isLockedRef.current = false;
+        currentExecutionRef.current = null;
         releaseLock();
       }
     },
     []
   );
+  const cancel = useCallback(() => {
+    if (currentExecutionRef.current) {
+      currentExecutionRef.current.cancelled = true;
+    }
+    lockRef.current = Promise.resolve();
+    isLockedRef.current = false;
+  }, []);
   const isLocked = useCallback(() => isLockedRef.current, []);
-  return { runWithMutex, isLocked };
+  return { runWithMutex, isLocked, cancel };
 }
 
 // lib/components/RunFrame/RunFrame.tsx
@@ -139,6 +154,7 @@ var RunFrame = (props) => {
     s.setCircuitJson
   ]);
   const [error, setError] = useState(null);
+  const cancelExecutionRef = useRef2(null);
   const [autoroutingGraphics, setAutoroutingGraphics] = useState(null);
   const [runCountTrigger, incRunCountTrigger] = useReducer(
     (acc, s) => acc + 1,
@@ -203,7 +219,12 @@ var RunFrame = (props) => {
     const runWorker = async () => {
       debug("running render worker");
       setError(null);
+      setRenderLog(null);
       const renderLog2 = { progress: 0 };
+      let cancelled = false;
+      cancelExecutionRef.current = () => {
+        cancelled = true;
+      };
       let evalVersion = props.evalVersion ?? "latest";
       if (!globalThis.runFrameWorker && props.forceLatestEvalVersion) {
         try {
@@ -246,7 +267,9 @@ var RunFrame = (props) => {
         const estProgressLinear = orderedRenderPhases2.indexOf(event.phase) / numRenderPhases * 0.75 + renderLog2.eventsProcessed / 1e3 * 0.25;
         const estProgress = 1 - Math.exp(-estProgressLinear * 3);
         renderLog2.progress = estProgress;
-        setRenderLog({ ...renderLog2 });
+        if (!cancelled) {
+          setRenderLog({ ...renderLog2 });
+        }
       });
       if (activeTab === "render_log") {
         worker.on("renderable:renderLifecycle:anyEvent", (event) => {
@@ -259,7 +282,9 @@ var RunFrame = (props) => {
             );
             lastRenderLogSet = Date.now();
           }
-          setRenderLog({ ...renderLog2 });
+          if (!cancelled) {
+            setRenderLog({ ...renderLog2 });
+          }
         });
       }
       worker.on("autorouting:progress", (event) => {
@@ -309,8 +334,11 @@ var RunFrame = (props) => {
         );
       }
       renderLog2.progress = 1;
-      setRenderLog({ ...renderLog2 });
+      if (!cancelled) {
+        setRenderLog({ ...renderLog2 });
+      }
       setIsRunning(false);
+      cancelExecutionRef.current = null;
     };
     runMutex.runWithMutex(runWorker);
   }, [props.fsMap, props.entrypoint, runCountTrigger, props.evalVersion]);
@@ -394,6 +422,13 @@ var RunFrame = (props) => {
               onClick: (e) => {
                 e.stopPropagation();
                 setIsRunning(false);
+                setRenderLog(null);
+                setError(null);
+                if (cancelExecutionRef.current) {
+                  cancelExecutionRef.current();
+                  cancelExecutionRef.current = null;
+                }
+                runMutex.cancel();
                 if (globalThis.runFrameWorker) {
                   globalThis.runFrameWorker.kill();
                   globalThis.runFrameWorker = null;