@jxsuite/studio 5.0.0 → 5.1.0

package/src/surfaces/statusbar.ts

@@ -53,6 +53,7 @@ import { effect, effectScope, reactive } from "../reactivity";
 import { activeTab } from "../workspace/workspace";
 import { EDITOR_KIND_LABELS } from "../commands/context";
 import { activeRegistry } from "../commands/active-registry";
+import { runReported } from "../commands/run-reported";
 import { deployStatusItem } from "../publish/deploy-checklist";
 import { collabState } from "../collab/collab-state";
 import { problemCount, problems } from "../services/notify";
@@ -378,7 +379,7 @@ function state(): StatusbarScope {
       const item = _state?.fields.flatMap((field) => field.items).find((i) => i.key === key);
       const registry = activeRegistry();
       if (item?.command && registry) {
-        void registry.run(item.command, item.args as never);
+        void runReported(registry, item.command, item.args as never, "Status Bar");
       }
     },
   }) as StatusbarScope;

package/src/tabs/project-config.ts

@@ -48,12 +48,15 @@
  * write, and therefore with an empty diff.
  *
  * **A real edit is a one-line diff.** The file's layout — which objects sit on one line, where a
- * blank line falls — is read once per binding ({@link seedCommitted}) and every serialisation here
- * honours it, so what changes on disk is the field that changed.
+ * blank line falls — is read once per binding ({@link seedCommitted}), replaced by the record of
+ * whatever bytes reached the file another way ({@link adoptProjectConfig}), and every serialisation
+ * here honours it, so what changes on disk is the field that changed.
  *
  * **Collaboration.** `project.json` is out of collab replication; the gate is in
  * `collab/collab-session.ts`'s `ensureCollab`, which is what would otherwise register the Yjs
  * history delegate over this tab.
+ *
+ * @docs studio/projects/settings
  */
 
 import { errorMessage } from "@jxsuite/schema/parse";
@@ -64,7 +67,7 @@ import { requireProjectState, setProjectState } from "../state";
 import { setWorkspaceProject, workspace } from "../workspace/workspace";
 import { PROJECT_CONFIG_PATH, createTab, disposeTab } from "./tab";
 import { transactDoc } from "./transact";
-import { parseJsonDocument, serializeJson } from "../files/json-layout";
+import { deriveJsonLayout, parseJsonDocument, serializeJson } from "../files/json-layout";
 import type { JsonLayout } from "../files/json-layout";
 
 import type { Tab } from "./tab";
@@ -114,8 +117,9 @@ let _detached: Tab | null = null;
 let _committed: string | null = null;
 
 /**
- * The layout the file was read in ({@link seedCommitted}), for a binding with no open tab to carry
- * it. Reset with the binding: a different project is a different file.
+ * The layout the file was read in ({@link seedCommitted}) or last written in ({@link
+ * adoptProjectConfig}), for a binding with no open tab to carry it. Reset with the binding: a
+ * different project is a different file.
  */
 let _layout: JsonLayout | null = null;
 
@@ -241,16 +245,28 @@ function liveConfig(): ProjectConfig | null {
 }
 
 /**
- * Make `target` hold exactly `source`'s keys — assignment alone would leave the removals behind.
+ * Make `target` hold exactly `source`'s keys, in `source`'s ORDER.
+ *
+ * Every key goes, the ones `source` keeps included, before `source` is assigned over the empty
+ * object. Assignment alone would leave the removals behind; deleting only the removals would leave
+ * the ORDER behind, because a key that survives keeps the position it had and only a new one takes
+ * `source`'s. Key order is what the serializer writes the file in, so a document holding the
+ * assistant's configuration in the previous file's order re-lays the file the assistant just wrote
+ * on the next commit — even a no-op one, which then disagrees with {@link _committed} (issue 331).
+ * The rival handover in {@link commitProjectConfig} is the same case from the other side: the
+ * object of record is the source, and its order is the file's.
+ *
+ * The transient — an observer of a single key would see it gone and back within the transaction —
+ * is one the removals already had, and nothing observes the configuration document key by key: the
+ * settings surfaces render from `projectState` and mutate it in place, and every reader of the
+ * document follows the root reference {@link transactDoc} replaces when the transaction ends.
  *
  * @param {Record<string, unknown>} target
  * @param {ProjectConfig} source
  */
 function replaceContents(target: Record<string, unknown>, source: ProjectConfig): void {
   for (const key of Object.keys(target)) {
-    if (!Object.hasOwn(source, key)) {
-      delete target[key];
-    }
+    delete target[key];
   }
   Object.assign(target, source);
 }
@@ -444,14 +460,26 @@ export async function commitProjectConfig(
  * assistant's write back out of existence. Putting the bytes into the document instead keeps the
  * one-object rule true, and the state sync follows from the bind effect like every other change.
  *
+ * **The layout record travels with the write.** The assistant authored the whole file, and the text
+ * it wrote is the file now — so the record the next commit honours is derived from THAT text
+ * (`json-layout.ts`'s `deriveJsonLayout`), exactly as a reload from disk would derive it, and it
+ * replaces both the seed's record and the open tab's. Keeping the record the chokepoint read BEFORE
+ * the write is what turned the settings edit after an assistant rewrite into a whole-file diff: the
+ * file was on disk in the assistant's layout and the commit re-laid it in the previous one (issue
+ * 331). The key order travels the same way: {@link replaceContents} installs `config`'s order on
+ * the document, so a rewrite that moved a top-level key stays moved. Nothing here re-reads the file
+ * to learn any of this: the caller just produced the bytes, and a second parse of `project.json` is
+ * the rival object this door exists to prevent.
+ *
  * `skipHistory`, because this is a RELOAD and not an edit: the file already says this, and
  * `write_file` tells the model in as many words that its disk writes are not undoable. A history
  * entry here would offer ⌘Z a change it could not take back from the file.
  *
  * @param {ProjectConfig} config The configuration as written — already past the schema gate.
+ * @param {string} text The bytes that reached the file, which `config` is the parse of.
  * @returns {Promise<void>}
  */
-export async function adoptProjectConfig(config: ProjectConfig): Promise<void> {
+export async function adoptProjectConfig(config: ProjectConfig, text: string): Promise<void> {
   if (!requireProjectState()) {
     // No project state is no configuration document either ({@link projectConfigDocument} reads
     // One). The workspace copy is then the only thing there is to keep true.
@@ -466,7 +494,13 @@ export async function adoptProjectConfig(config: ProjectConfig): Promise<void> {
   );
   tab.doc.dirty = false;
   // Settle a read already in flight before saying what the file holds, or it would resolve after
-  // This line with the PREVIOUS bytes and make the next real commit look like a no-op.
+  // These lines with the PREVIOUS bytes and record, and make the next real commit look like a
+  // No-op — or re-lay the file the assistant just formatted.
   await seedCommitted();
+  // The record of the bytes just written, on the tab as well as on the seed: `configLayout`
+  // Prefers the open tab's, and the tab's is the record of the file it opened, which the write has
+  // Just replaced. The tab holds the config now; it holds the config's layout too.
+  _layout = deriveJsonLayout(text);
+  tab.doc.layout = _layout;
   _committed = serializeProjectConfig(config);
 }

package/src/ui/layers.ts

@@ -19,6 +19,7 @@ import { mountSurface, registerSurface } from "./surface";
 import toastsDoc from "../surfaces/toasts.json";
 import { dismiss, toasts } from "../services/notify";
 import { activeRegistry } from "../commands/active-registry";
+import { runReported } from "../commands/run-reported";
 import { effect, effectScope, reactive } from "../reactivity";
 import type { DialogChoiceOption, DialogSurfaceOptions } from "../surfaces/dialog";
 import type { Notification, Severity } from "../services/notify";
@@ -602,7 +603,9 @@ function toastScope(): ToastScope {
         return;
       }
       retireToast(id);
-      void registry.run(record.action, record.actionArgs);
+      // The toast is gone by the time the action refuses, so the refusal has to land somewhere the
+      // Person can still read it: Problems, through `commands/run-reported.ts`.
+      void runReported(registry, record.action, record.actionArgs, "Notifications");
     },
     toasts: [],
   }) as ToastScope;

package/src/workspace/workspace.ts

@@ -10,6 +10,7 @@ import {
   stringArg,
   stringProperty,
 } from "../commands/command-args";
+import { EDITOR_KIND_LABELS } from "../commands/context";
 import type { Tab, TabOrigin } from "../tabs/tab";
 import type { JsonLayout } from "../files/json-layout";
 
@@ -1297,6 +1298,65 @@ export function tabCommands(deps: TabCommandDeps): AnyCommand[] {
         cycleTab(-1);
       },
     },
+    {
+      args: argsSchema({
+        path: stringProperty(
+          'Project-relative path of the file to open, e.g. "pages/about.json" or ' +
+            '"components/nav-bar.json". It must exist.',
+        ),
+      }),
+      id: "document.open",
+      title: "Open Document",
+      category: "Document",
+      /* PROJECT level, though the namespace says document: the level is what a record acts on, and
+         this one acts on the workspace — it adds a tab — from a state where no document is open
+         at all. A document-level record would be gated on the one thing it exists to produce. */
+      level: "project",
+      menus: ["palette"],
+      group: "1_file",
+      when: (ctx) => ctx.project.open,
+      requires: "an open project",
+      aiTool: {
+        description:
+          "Open a project file as the active document; the document tools then operate on it. " +
+          "Use it when the user should SEE the page, or for iterative visual refinement after " +
+          "creating a page or component.",
+        name: "open_document",
+        /* The person's own read: `activeTab` is what the tab strip highlights, and `editor.kind`
+           is the fact the document-tree tier is gated on. Both are named so the model learns in one
+           round whether the tree tools reach the file it opened — a `.csv` lands in the Grid, a
+           `.png` in the Media viewer, and neither is an element tree. The `.value` read is module
+           state, which a projected `report` may close over (§12.4); `after` alone cannot say WHICH
+           document is active. */
+        report: ({ after, args }) => {
+          const path = stringArg("document.open", args, "path");
+          const active = activeTab.value?.documentPath ?? null;
+          if (active !== path) {
+            return `Opened "${path}", but the active document is ${active === null ? "none" : `"${active}"`}.`;
+          }
+          const where =
+            after.editor.kind === "canvas"
+              ? "on the canvas; the document tools now operate on it"
+              : `in the ${EDITOR_KIND_LABELS[after.editor.kind]} editor, which is not an element tree the document tools can edit`;
+          return `"${path}" is the active document, ${where}.`;
+        },
+      },
+      /* Refuses by THROWING (§12.4's first review rule). `openFileInTab` reports a file it cannot
+         open as a Problem and returns normally — the right answer for a click in the Files tree,
+         where the toast is in front of the person — so the record has to look for the tab itself.
+         The hand tool this replaced read `getTab()` after the open and called whatever it found a
+         success, so a missing file left the PREVIOUS document active and reported "Switched to". */
+      run: async (_ctx, args) => {
+        const path = stringArg("document.open", args, "path");
+        await deps.openFile(path);
+        if (![...workspace.tabs.values()].some((tab) => tab.documentPath === path)) {
+          throw new RangeError(
+            `command "document.open" argument "path": "${path}" could not be opened — it does ` +
+              `not exist, or no editor claims its format. Problems has the reason.`,
+          );
+        }
+      },
+    },
     {
       id: "document.reopenClosed",
       title: "Reopen Closed Document",

package/dist/chunks/entry-commands-d6g50j7s.js

@@ -1,42 +0,0 @@
-import {
-  createEntry2,
-  registerContentCommands2
-} from "./studio-fabxk6r9.js";
-import"./studio-sgdc5pfc.js";
-import"./studio-57mf66w2.js";
-import"./studio-x3rty6tr.js";
-import"./studio-rpyah2ew.js";
-import"./studio-8jn5yhyn.js";
-import"./studio-q0a3yk4n.js";
-import"./studio-qahxvnan.js";
-import"./studio-cpvb2ed1.js";
-import"./studio-tb3ev01j.js";
-import"./studio-26d7myd1.js";
-import"./studio-81390n6f.js";
-import"./studio-rkstz940.js";
-import"./studio-25hkdrkw.js";
-import"./studio-d055c37e.js";
-import"./studio-y9zedyjn.js";
-import"./studio-vz68yn9e.js";
-import"./studio-4m0haseg.js";
-import"./studio-az3zd49t.js";
-import"./studio-q3x06vmj.js";
-import"./studio-6ewqv390.js";
-import"./studio-yxa81f45.js";
-import"./studio-esrxgwh6.js";
-import"./studio-79y5sz51.js";
-import"./studio-6nzaktvy.js";
-import"./studio-3gxv60tn.js";
-import"./studio-erdatzvp.js";
-import"./studio-1k325pwf.js";
-import"./studio-5jy81t3s.js";
-import"./studio-p1dw8wfw.js";
-import"./studio-7r42c6ca.js";
-import"./studio-tjjk7jvk.js";
-export {
-  createEntry2 as createEntry,
-  registerContentCommands2 as registerContentCommands
-};
-
-//# debugId=474288D19E3E71A764756E2164756E21
-//# sourceMappingURL=entry-commands-d6g50j7s.js.map

package/dist/chunks/layers-panel-ar2gh90g.js

@@ -1,40 +0,0 @@
-import {
-  startLayerTitleEdit2,
-  registerLayersPanel2
-} from "./studio-s6z853aq.js";
-import"./studio-3hxkd92t.js";
-import"./studio-akbww0j5.js";
-import"./studio-8qtrpzr3.js";
-import"./studio-5523bpzt.js";
-import"./studio-57mf66w2.js";
-import"./studio-q0a3yk4n.js";
-import"./studio-qahxvnan.js";
-import"./studio-26d7myd1.js";
-import"./studio-81390n6f.js";
-import"./studio-rkstz940.js";
-import"./studio-25hkdrkw.js";
-import"./studio-d055c37e.js";
-import"./studio-y9zedyjn.js";
-import"./studio-vz68yn9e.js";
-import"./studio-4m0haseg.js";
-import"./studio-az3zd49t.js";
-import"./studio-q3x06vmj.js";
-import"./studio-6ewqv390.js";
-import"./studio-yxa81f45.js";
-import"./studio-esrxgwh6.js";
-import"./studio-79y5sz51.js";
-import"./studio-6nzaktvy.js";
-import"./studio-3gxv60tn.js";
-import"./studio-erdatzvp.js";
-import"./studio-1k325pwf.js";
-import"./studio-5jy81t3s.js";
-import"./studio-p1dw8wfw.js";
-import"./studio-7r42c6ca.js";
-import"./studio-tjjk7jvk.js";
-export {
-  registerLayersPanel2 as registerLayersPanel,
-  startLayerTitleEdit2 as startLayerTitleEdit
-};
-
-//# debugId=0A17594D4CFC8C3764756E2164756E21
-//# sourceMappingURL=layers-panel-ar2gh90g.js.map

package/dist/chunks/menu-rf7n72mf.js

@@ -1,14 +0,0 @@
-import {
-  openMenu2
-} from "./studio-3gxv60tn.js";
-import"./studio-erdatzvp.js";
-import"./studio-1k325pwf.js";
-import"./studio-5jy81t3s.js";
-import"./studio-p1dw8wfw.js";
-import"./studio-7r42c6ca.js";
-export {
-  openMenu2 as openMenu
-};
-
-//# debugId=01236C6F8174726964756E2164756E21
-//# sourceMappingURL=menu-rf7n72mf.js.map

package/dist/chunks/quick-search-srzz83k2.js

@@ -1,45 +0,0 @@
-import {
-  initQuickSearch2,
-  openQuickSearch2
-} from "./studio-5rt7sqa0.js";
-import"./studio-18avnhjp.js";
-import"./studio-pm6hgy7r.js";
-import"./studio-d1ja2x9r.js";
-import"./studio-5523bpzt.js";
-import"./studio-sgdc5pfc.js";
-import"./studio-em9nw8eh.js";
-import"./studio-x3rty6tr.js";
-import"./studio-rpyah2ew.js";
-import"./studio-8jn5yhyn.js";
-import"./studio-q0a3yk4n.js";
-import"./studio-qahxvnan.js";
-import"./studio-cpvb2ed1.js";
-import"./studio-tb3ev01j.js";
-import"./studio-26d7myd1.js";
-import"./studio-81390n6f.js";
-import"./studio-rkstz940.js";
-import"./studio-25hkdrkw.js";
-import"./studio-d055c37e.js";
-import"./studio-y9zedyjn.js";
-import"./studio-vz68yn9e.js";
-import"./studio-4m0haseg.js";
-import"./studio-az3zd49t.js";
-import"./studio-q3x06vmj.js";
-import"./studio-6ewqv390.js";
-import"./studio-yxa81f45.js";
-import"./studio-esrxgwh6.js";
-import"./studio-79y5sz51.js";
-import"./studio-6nzaktvy.js";
-import"./studio-3gxv60tn.js";
-import"./studio-erdatzvp.js";
-import"./studio-1k325pwf.js";
-import"./studio-5jy81t3s.js";
-import"./studio-p1dw8wfw.js";
-import"./studio-7r42c6ca.js";
-export {
-  initQuickSearch2 as initQuickSearch,
-  openQuickSearch2 as openQuickSearch
-};
-
-//# debugId=67B6A208739F532164756E2164756E21
-//# sourceMappingURL=quick-search-srzz83k2.js.map

package/dist/chunks/right-panel-rrgx2dn3.js

@@ -1,45 +0,0 @@
-import {
-  mount2,
-  unmount2,
-  render2,
-  inspectorTab2,
-  setInspectorTab2
-} from "./studio-xsykpvsh.js";
-import"./studio-3hxkd92t.js";
-import"./studio-akbww0j5.js";
-import"./studio-8qtrpzr3.js";
-import"./studio-5523bpzt.js";
-import"./studio-57mf66w2.js";
-import"./studio-qahxvnan.js";
-import"./studio-26d7myd1.js";
-import"./studio-81390n6f.js";
-import"./studio-rkstz940.js";
-import"./studio-25hkdrkw.js";
-import"./studio-d055c37e.js";
-import"./studio-y9zedyjn.js";
-import"./studio-vz68yn9e.js";
-import"./studio-4m0haseg.js";
-import"./studio-az3zd49t.js";
-import"./studio-q3x06vmj.js";
-import"./studio-6ewqv390.js";
-import"./studio-yxa81f45.js";
-import"./studio-esrxgwh6.js";
-import"./studio-79y5sz51.js";
-import"./studio-6nzaktvy.js";
-import"./studio-3gxv60tn.js";
-import"./studio-erdatzvp.js";
-import"./studio-1k325pwf.js";
-import"./studio-5jy81t3s.js";
-import"./studio-p1dw8wfw.js";
-import"./studio-7r42c6ca.js";
-import"./studio-tjjk7jvk.js";
-export {
-  inspectorTab2 as inspectorTab,
-  mount2 as mount,
-  render2 as render,
-  setInspectorTab2 as setInspectorTab,
-  unmount2 as unmount
-};
-
-//# debugId=ACC2FC3785A3466764756E2164756E21
-//# sourceMappingURL=right-panel-rrgx2dn3.js.map

package/dist/chunks/studio-d055c37e.js

@@ -1,62 +0,0 @@
-import {
-  getPlatform2
-} from "./studio-6nzaktvy.js";
-import {
-  projectState
-} from "./studio-6ewqv390.js";
-
-// src/files/components.ts
-var componentRegistry2 = [];
-var _componentRegistryLoaded = false;
-async function loadComponentRegistry2() {
-  try {
-    const platform = getPlatform2();
-    componentRegistry2 = await platform.discoverComponents(projectState?.projectRoot || undefined);
-    _componentRegistryLoaded = true;
-  } catch {
-    _componentRegistryLoaded = true;
-  }
-}
-function buildComponentInstance2(comp) {
-  const $props = Object.fromEntries((comp.props ?? []).map((p) => [p.name, p.default !== undefined ? p.default : ""]));
-  const children = [];
-  for (const slot of comp.slots ?? []) {
-    for (const child of structuredClone(slot.fallback ?? [])) {
-      if (!slot.name) {
-        children.push(child);
-      } else if (typeof child === "object" && child !== null && typeof child.tagName === "string") {
-        child.attributes = { slot: slot.name, ...child.attributes };
-        children.push(child);
-      } else {
-        children.push({ attributes: { slot: slot.name }, children: [child], tagName: "span" });
-      }
-    }
-  }
-  return {
-    $props,
-    tagName: comp.tagName,
-    ...children.length > 0 ? { children } : {}
-  };
-}
-function computeRelativePath2(fromDocPath, toCompPath) {
-  if (!fromDocPath) {
-    return `./${toCompPath}`;
-  }
-  const from = fromDocPath.replaceAll("\\", "/");
-  const to = toCompPath.replaceAll("\\", "/");
-  const fromDir = from.includes("/") ? from.slice(0, from.lastIndexOf("/")) : "";
-  const fromParts = fromDir.split("/").filter(Boolean);
-  const toParts = to.split("/").filter(Boolean);
-  let common = 0;
-  while (common < fromParts.length && common < toParts.length && fromParts[common] === toParts[common]) {
-    common += 1;
-  }
-  const ups = fromParts.length - common;
-  const remaining = toParts.slice(common);
-  return (ups > 0 ? "../".repeat(ups) : "./") + remaining.join("/");
-}
-
-export { componentRegistry2, loadComponentRegistry2, buildComponentInstance2, computeRelativePath2 };
-
-//# debugId=771ED3632A98E38064756E2164756E21
-//# sourceMappingURL=studio-d055c37e.js.map