@joycostudio/studio 0.1.4 → 0.1.5

package/dist/client.d.ts

@@ -15,7 +15,7 @@ type ToolHandle<TConfig extends object = any> = {
     readonly definition: ToolDefinition<TConfig>;
     /** The live config. Writes sync to same-origin pages and, when connected, the runtime. */
     readonly config: TConfig;
-    /** Runtime-owned state; null until the runtime answers (always null without one). */
+    /** Runtime-owned state; null while no runtime is connected or until it answers. */
     readonly state: ToolState<TConfig> | null;
     /** Bumps on every config change. Handy as a React snapshot. */
     readonly version: number;
@@ -25,7 +25,7 @@ type ToolHandle<TConfig extends object = any> = {
     controls(): DebugSchema;
     /** Xyz `Debuggable`: `debugManager.register(handle)` mounts this tool in the app's floating pane. */
     debug(): DebugFolder;
-    /** The config on disk: the runtime's saved value or, until one answers, the bundled `initial`. */
+    /** The config on disk: the runtime's last reported saved value or, until one answers, the bundled `initial`. */
     readonly saved: TConfig;
     /** Dotted paths where the draft differs from `saved`. Tracked locally, so it works without a runtime too. */
     readonly changes: string[];
@@ -47,10 +47,15 @@ type ToolHandle<TConfig extends object = any> = {
      */
     undo(): boolean;
     redo(): boolean;
+    /** Persist the draft. Needs a connected runtime. */
     save(options?: {
         force?: boolean;
     }): Promise<Result<ToolState<TConfig>>>;
-    discard(): Promise<Result<ToolState<TConfig>>>;
+    /**
+     * Reset the draft to `saved`, with or without a runtime, then sync it like any other edit.
+     * Undoable as its own step. Returns false when there is nothing to discard.
+     */
+    discard(): boolean;
 };
 type Studio = {
     /** Every registered tool in order, including preview-only ones. */

package/dist/client.js

@@ -2,7 +2,7 @@ import {
   createStudio,
   everyFrame,
   postCompare
-} from "./chunk-2RGQF5X5.js";
+} from "./chunk-ZH3NEN4V.js";
 import "./chunk-DEJYGBPJ.js";
 export {
   createStudio,

package/dist/next.js

@@ -1,6 +1,6 @@
 import {
   createStudio
-} from "./chunk-2RGQF5X5.js";
+} from "./chunk-ZH3NEN4V.js";
 import "./chunk-DEJYGBPJ.js";
 
 // src/next.ts

package/dist/react.d.ts

@@ -93,7 +93,7 @@ type ToolHandle<TConfig extends object = any> = {
     readonly definition: ToolDefinition<TConfig>;
     /** The live config. Writes sync to same-origin pages and, when connected, the runtime. */
     readonly config: TConfig;
-    /** Runtime-owned state; null until the runtime answers (always null without one). */
+    /** Runtime-owned state; null while no runtime is connected or until it answers. */
     readonly state: ToolState<TConfig> | null;
     /** Bumps on every config change. Handy as a React snapshot. */
     readonly version: number;
@@ -103,7 +103,7 @@ type ToolHandle<TConfig extends object = any> = {
     controls(): DebugSchema;
     /** Xyz `Debuggable`: `debugManager.register(handle)` mounts this tool in the app's floating pane. */
     debug(): DebugFolder;
-    /** The config on disk: the runtime's saved value or, until one answers, the bundled `initial`. */
+    /** The config on disk: the runtime's last reported saved value or, until one answers, the bundled `initial`. */
     readonly saved: TConfig;
     /** Dotted paths where the draft differs from `saved`. Tracked locally, so it works without a runtime too. */
     readonly changes: string[];
@@ -125,10 +125,15 @@ type ToolHandle<TConfig extends object = any> = {
      */
     undo(): boolean;
     redo(): boolean;
+    /** Persist the draft. Needs a connected runtime. */
     save(options?: {
         force?: boolean;
     }): Promise<Result<ToolState<TConfig>>>;
-    discard(): Promise<Result<ToolState<TConfig>>>;
+    /**
+     * Reset the draft to `saved`, with or without a runtime, then sync it like any other edit.
+     * Undoable as its own step. Returns false when there is nothing to discard.
+     */
+    discard(): boolean;
 };
 type Studio$1 = {
     /** Every registered tool in order, including preview-only ones. */

package/dist/react.js

@@ -14,7 +14,7 @@ import {
 import { useEffect as useEffect5, useRef as useRef3, useState as useState9 } from "react";
 
 // package.json
-var version = "0.1.4";
+var version = "0.1.5";
 
 // src/client/studio.ts
 import {
@@ -409,7 +409,7 @@ function describe(studio, handle) {
   if (studio.connection.phase !== "connected") return { tone: "text-faint", text: "Not persisting" };
   if (!state) return { tone: "text-destructive", text: "Restart studio dev" };
   if (state.conflict) return { tone: "text-destructive", text: "Changed on disk" };
-  if (state.dirty) return { tone: "text-warning", text: "Unsaved" };
+  if (handle.dirty) return { tone: "text-warning", text: "Unsaved" };
   return { tone: "text-success", text: state.saved.hash ? "Saved" : "Not on disk yet" };
 }
 function adoptTweakpaneStyles(container) {
@@ -429,8 +429,10 @@ function Inspector({
   const container = useRef(null);
   const pane = useRef(null);
   const [failure, setFailure] = useState2(null);
-  const run = (action) => void action.then((result) => setFailure(result.ok ? null : result.message ?? result.error));
-  const save = (force = false) => run(handle.save({ force }));
+  const { definition, state } = handle;
+  const canDiscard = handle.dirty && !handle.comparing;
+  const canSave = canDiscard && !!state;
+  const save = (force = false) => void handle.save({ force }).then((result) => setFailure(result.ok ? null : result.message ?? result.error));
   useEffect(() => {
     let disposed = false;
     let teardown = () => {
@@ -461,7 +463,7 @@ function Inspector({
     const onKeyDown = (event) => {
       if (event.key !== "s" || !(event.metaKey || event.ctrlKey)) return;
       event.preventDefault();
-      if (handle.state?.dirty) save();
+      if (canSave) save();
     };
     addEventListener("keydown", onKeyDown);
     return () => removeEventListener("keydown", onKeyDown);
@@ -469,10 +471,8 @@ function Inspector({
   useEffect(() => {
     if (pane.current) pane.current.disabled = handle.comparing;
   });
-  const { definition, state } = handle;
   const ConfigFile = fileHref ? "a" : "span";
   const status = describe(studio, handle);
-  const editable2 = studio.connection.phase === "connected" && !!state?.dirty && !handle.comparing;
   const changes = handle.changes.map(
     (path) => path.split(".").map((key) => key.charAt(0).toUpperCase() + key.slice(1)).join(" \u203A ")
   );
@@ -549,12 +549,15 @@ function Inspector({
             variant: "secondary",
             size: "sm",
             className: "flex-1",
-            disabled: !editable2,
-            onClick: () => run(handle.discard()),
+            disabled: !canDiscard,
+            onClick: () => {
+              setFailure(null);
+              handle.discard();
+            },
             children: "Discard"
           }
         ),
-        state?.conflict ? /* @__PURE__ */ jsx8(Button, { variant: "destructive", size: "sm", className: "flex-1", onClick: () => save(true), children: "Overwrite file" }) : /* @__PURE__ */ jsxs2(Button, { size: "sm", className: "flex-1", disabled: !editable2, onClick: () => save(), children: [
+        state?.conflict ? /* @__PURE__ */ jsx8(Button, { variant: "destructive", size: "sm", className: "flex-1", onClick: () => save(true), children: "Overwrite file" }) : /* @__PURE__ */ jsxs2(Button, { size: "sm", className: "flex-1", disabled: !canSave, onClick: () => save(), children: [
           "Save",
           /* @__PURE__ */ jsxs2(KbdGroup, { children: [
             /* @__PURE__ */ jsx8(Kbd, { children: "\u2318" }),