@jxsuite/studio 6.1.1 → 6.1.2

package/src/panels/quick-search.ts

@@ -31,6 +31,7 @@
  * find-replace in those two call sites.
  */
 
+import { isJsonPrimitive, isString } from "@jxsuite/schema/guards";
 import { getPlatform } from "../platform";
 import { flattenTree, nodeLabel, projectState } from "../store";
 import { documentExtensions, formatByExtension, loadFormats } from "../format/format-host";
@@ -45,7 +46,7 @@ import { activeRegistry } from "../commands/active-registry";
 import { runActiveReported, runReported } from "../commands/run-reported";
 import type { PaletteMode } from "../commands/defaults";
 import type { AnyCommand, CommandRegistry } from "../commands/registry";
-import type { JxDocument, JxMutableNode } from "@jxsuite/schema/types";
+import type { CommandArgValues } from "../commands/command-args";
 import type { SurfaceHandle } from "../ui/surface";
 import type { JxPath } from "../state";
 
@@ -123,6 +124,12 @@ export function modeSpec(mode: PaletteMode): PaletteModeSpec {
   return MODE_SPEC.get(mode) ?? PALETTE_MODES[0]!;
 }
 
+/** The mode an input resolves to, and the query left once a prefix has moved into the chip. */
+export interface ResolvedPaletteMode {
+  mode: PaletteMode;
+  query: string;
+}
+
 /**
  * The mode a raw input actually addresses.
  *
@@ -139,7 +146,7 @@ export function resolvePaletteMode(
   requested: PaletteMode,
   raw: string,
   projectOpen: boolean,
-): { mode: PaletteMode; query: string } {
+): ResolvedPaletteMode {
   const prefixed = PREFIXED_MODES.find((spec) => raw.startsWith(spec.prefix));
   if (prefixed) {
     return resolvePaletteMode(prefixed.mode, raw.slice(1), projectOpen);
@@ -220,7 +227,7 @@ export function rankBy<T>(items: readonly T[], query: string, key: (item: T) =>
 
 /** One offered value for a command's single argument. */
 export interface PaletteArgChoice {
-  value: unknown;
+  value: string | boolean;
   label: string;
 }
 
@@ -230,11 +237,6 @@ export type PaletteArgs =
   | { kind: "choice"; name: string; choices: PaletteArgChoice[] }
   | { kind: "unsupported" };
 
-interface ArgsSchemaShape {
-  properties?: Record<string, { type?: string; enum?: readonly unknown[]; description?: string }>;
-  required?: readonly string[];
-}
-
 /**
  * How a command's arguments are asked for.
  *
@@ -246,7 +248,7 @@ interface ArgsSchemaShape {
  * a command that gains an enum argument becomes promptable without anyone editing this file.
  */
 export function paletteArgs(command: AnyCommand): PaletteArgs {
-  const schema = command.args as ArgsSchemaShape | undefined;
+  const schema = command.args;
   const properties = schema?.properties;
   if (!schema || !properties) {
     return { kind: "none" };
@@ -308,7 +310,7 @@ const RECENT_COMMANDS_MAX = 6;
 export function getRecentCommands(): string[] {
   try {
     const raw: unknown = JSON.parse(localStorage.getItem(RECENT_COMMANDS_KEY) || "[]");
-    return Array.isArray(raw) ? raw.filter((id) => typeof id === "string") : [];
+    return Array.isArray(raw) ? raw.filter((id) => isString(id)) : [];
   } catch {
     return [];
   }
@@ -370,7 +372,7 @@ interface ArgRow {
   kind: "arg";
   commandId: string;
   argName: string;
-  value: unknown;
+  value: string | boolean;
   name: string;
   detail: string;
 }
@@ -437,7 +439,7 @@ export function isQuickSearchOpen(): boolean {
 
 /** The project root scoping the palette, or null when no project is open. */
 function scopeRoot(): string | null {
-  return projectState ? (projectState.projectRoot ?? null) : null;
+  return projectState ? projectState.projectRoot : null;
 }
 
 function hasProject(): boolean {
@@ -445,7 +447,7 @@ function hasProject(): boolean {
 }
 
 /** The mode and query the current input resolves to. */
-function current(): { mode: PaletteMode; query: string } {
+function current(): ResolvedPaletteMode {
   return resolvePaletteMode(_requested, _query, hasProject());
 }
 
@@ -465,6 +467,15 @@ function shortenPath(path: string) {
   return path;
 }
 
+/**
+ * What a file row reads from a search hit. `name` is optional because the cloud adapter hands back
+ * its response body unvalidated, so a hit without one falls back to the path's last segment.
+ */
+interface SearchHit {
+  path: string;
+  name?: string;
+}
+
 /**
  * Fetch the project's document set once per open.
  *
@@ -480,7 +491,7 @@ async function ensureFiles(): Promise<void> {
   renderOverlay();
   try {
     await loadFormats();
-    const hits = await getPlatform().searchFiles("", documentExtensions());
+    const hits: readonly SearchHit[] = await getPlatform().searchFiles("", documentExtensions());
     _files = hits.map((hit) => ({
       kind: "file" as const,
       path: hit.path,
@@ -566,23 +577,27 @@ function nodeRows(query: string): NodeRow[] {
   const rows: NodeRow[] = flattenTree(tab.doc.document).map((row) => ({
     kind: "node" as const,
     path: row.path,
-    name:
-      row.nodeType === "text"
-        ? String(row.node).slice(0, 60)
-        : nodeLabel(row.node as JxMutableNode),
+    // A primitive is exactly what `flattenTree` emits as a "text" row; every other row is a node.
+    name: isJsonPrimitive(row.node) ? String(row.node).slice(0, 60) : nodeLabel(row.node),
     detail: row.nodeType,
   }));
   return rankBy(rows, query.trim(), (row) => row.name);
 }
 
 function modeRows(): ModeRow[] {
-  return PALETTE_MODES.filter((spec) => spec.mode !== "picker").map((spec) => ({
-    kind: "mode" as const,
-    mode: spec.mode,
-    name: spec.chip,
-    detail: spec.description,
-    chord: spec.prefix,
-  }));
+  return PALETTE_MODES.flatMap((spec) =>
+    spec.mode === "picker"
+      ? []
+      : [
+          {
+            kind: "mode" as const,
+            mode: spec.mode,
+            name: spec.chip,
+            detail: spec.description,
+            chord: spec.prefix,
+          },
+        ],
+  );
 }
 
 function argRows(query: string): ArgRow[] {
@@ -598,8 +613,14 @@ function argRows(query: string): ArgRow[] {
   return rankBy(rows, query.trim(), (row) => row.name);
 }
 
+/** What the list draws: its rows, and whether they are a "recent" listing rather than a search. */
+interface CurrentRows {
+  rows: PaletteRow[];
+  showingRecent: boolean;
+}
+
 /** The rows for the current input, and whether they are a "recent" listing rather than a search. */
-function currentRows(): { rows: PaletteRow[]; showingRecent: boolean } {
+function currentRows(): CurrentRows {
   const { mode, query } = current();
   if (_pending) {
     return { rows: argRows(query), showingRecent: false };
@@ -669,7 +690,7 @@ function enterMode(mode: PaletteMode) {
   void ensureFiles();
 }
 
-function runCommand(command: AnyCommand, args?: Record<string, unknown>) {
+function runCommand(command: AnyCommand, args?: CommandArgValues) {
   const registry = activeRegistry();
   if (!registry) {
     return;
@@ -838,7 +859,7 @@ export interface PaletteRowProjection {
   chord: string;
 }
 
-interface PaletteScope extends Record<string, unknown> {
+interface PaletteScope {
   open: boolean;
   hasChip: boolean;
   chipLabel: string;
@@ -863,10 +884,11 @@ interface PaletteScope extends Record<string, unknown> {
   activate: () => void;
   clearMode: () => void;
   hover: (index: number) => void;
-  activateRow: (value: unknown) => void;
+  /** The `select` detail of the picked `jx-option`: its `value` attribute, a string. */
+  activateRow: (value: string) => void;
 }
 
-registerSurface("palette", paletteDoc as unknown as JxDocument);
+registerSurface("palette", paletteDoc);
 
 let _scope: PaletteScope | null = null;
 let _mount: Promise<SurfaceHandle> | null = null;
@@ -924,7 +946,7 @@ function scope(): PaletteScope {
     rows: [],
     sectionLabel: "",
     showSection: false,
-  }) as PaletteScope;
+  });
   return _scope;
 }
 

package/src/panels/right-panel.ts

@@ -27,7 +27,7 @@
  * already holds, so there is nothing to withhold.
  */
 
-import { getNodeAtPath, nodeLabel, rightPanel } from "../store";
+import { getNodeAtPath, nodeLabel, requireShellRef, rightPanel } from "../store";
 import { effect, effectScope, reactive } from "../reactivity";
 import { activeTab } from "../workspace/workspace";
 import { primarySelection } from "../tabs/selection";
@@ -74,7 +74,7 @@ let _dock: InspectorDockHandle | null = null;
  * reports whether the assistant is showing, and a plain field would leave that button lying on the
  * welcome screen — which is the whole class of bug `shell.ts` was split out to end.
  */
-const _detached = reactive({ tab: DEFAULT_INSPECTOR_TAB as InspectorTabId });
+const _detached = reactive({ tab: DEFAULT_INSPECTOR_TAB });
 
 /**
  * Hand one tab's body host to its owner, once, and never let that stop the dock.
@@ -158,7 +158,7 @@ function tabViews(selected: InspectorTabId): InspectorTabView[] {
  */
 export function mount(ctx: RightPanelCtx) {
   _dock = mountInspectorDock(
-    rightPanel,
+    requireShellRef(rightPanel, "right-panel"),
     values(),
     { selectTab: (id) => selectFromStrip(id) },
     { onBody: (tabId, host) => bindBody(ctx, tabId, host) },

package/src/panels/seo-modal.ts

@@ -32,6 +32,7 @@
  */
 
 import { activeRegistry } from "../commands/active-registry";
+import { HEAD_EDIT_DEBOUNCE } from "../ui/timing";
 import { previewAssetSrc } from "../canvas/asset-refs";
 import { getPlatform } from "../platform";
 import { layerHost } from "../ui/layers";
@@ -232,15 +233,6 @@ function writeField(
   applyMutation((doc: JxMutableNode) => upsertMeta(doc, field.attr, field.key, trimmed));
 }
 
-/**
- * How long a keystroke waits before it is written.
- *
- * Every commit is a document mutation, and the previews repaint from it, so a write per keystroke
- * would redraw the picture mid-word. A `change` — the control losing focus, or its clear button —
- * cancels the timer and commits immediately, which is why nothing is ever lost to the debounce.
- */
-const EDIT_DEBOUNCE_MS = 300;
-
 /** One timer per field key, so editing Description then Title does not cancel the first write. */
 const _pending = new Map<string, ReturnType<typeof setTimeout>>();
 
@@ -300,20 +292,24 @@ let _tab: Tab | null = null;
 /** Where each chip that leads somewhere goes, rebuilt with the view it was drawn from. */
 let _donors = new Map<string, () => void>();
 
+/** What the SEO body reads and writes for one tab: its merged head, and how an edit lands. */
+interface SeoContext {
+  headDoc: JxMutableNode;
+  head: JxHeadEntry[];
+  applyMutation: (fn: (doc: JxMutableNode) => void) => void;
+}
+
 /**
  * What the SEO body needs from a tab, resolved once.
  *
  * Both realms in one place: a markdown page keeps its head material in frontmatter and a JSON one
  * in root properties, and `buildHeadDoc` is the card's own view of that difference.
  */
-function seoContextFor(tab: Tab): {
-  headDoc: JxMutableNode;
-  head: JxHeadEntry[];
-  applyMutation: (fn: (doc: JxMutableNode) => void) => void;
-} {
+function seoContextFor(tab: Tab): SeoContext {
   const isContent = tab.doc.mode === "content";
-  const fm = (tab.doc.content?.frontmatter ?? {}) as Record<string, unknown>;
-  const headDoc = isContent ? buildHeadDoc(tab.doc.document, fm) : tab.doc.document;
+  const headDoc = isContent
+    ? buildHeadDoc(tab.doc.document, tab.doc.content.frontmatter)
+    : tab.doc.document;
   return {
     applyMutation: isContent
       ? (fn: (doc: JxMutableNode) => void) => applyContentMutation(tab, renderSeoModal, fn)
@@ -495,7 +491,7 @@ export function openSeoModal(tab: Tab): void {
           setTimeout(() => {
             _pending.delete(key);
             commitField(key, value);
-          }, EDIT_DEBOUNCE_MS),
+          }, HEAD_EDIT_DEBOUNCE),
         );
       },
       onOpenDonor: (key: string) => {

package/src/panels/settings-menu.ts

@@ -45,19 +45,15 @@ import { openMenu } from "../surfaces/menu";
 import { REGION_ATTR } from "../ui/regions";
 import { rectOf } from "../utils/geometry";
 
+import type { CommandArgValues } from "../commands/command-args";
 import type { CommandRegistry } from "../commands/registry";
 import type { Level } from "../commands/levels";
 import type { MenuHandle, MenuRowProjection } from "../surfaces/menu";
+import type { KeyedLabel } from "../ui/surface";
 
 /** The placement the rail's gear renders. One definition site for the string. */
 export const SETTINGS_MENU_PLACEMENT = "settings/menu" as const;
 
-/** One value a parent command's `section` argument accepts. */
-interface MenuSection {
-  key: string;
-  label: string;
-}
-
 let _menu: MenuHandle | null = null;
 let _unsubscribe: (() => void) | null = null;
 let _rerender: (() => void) | null = null;
@@ -73,16 +69,20 @@ let _rerender: (() => void) | null = null;
  * `settings.open` refuses anything absent from `settingsSectionKeys()` — so a submenu row can never
  * name a value its own command would refuse.
  */
-const SECTION_SOURCES: Readonly<Record<string, () => readonly MenuSection[]>> = {
-  "app.preferences": () =>
-    PREFERENCES_SECTIONS.map((section) => ({ key: section.id, label: section.title })),
-  "settings.open": () =>
-    sortedSettingsSections().map((section) => ({ key: section.key, label: section.label })),
-};
+const SECTION_SOURCES: ReadonlyMap<string, () => readonly KeyedLabel[]> = new Map([
+  [
+    "app.preferences",
+    () => PREFERENCES_SECTIONS.map((section) => ({ key: section.id, label: section.title })),
+  ],
+  [
+    "settings.open",
+    () => sortedSettingsSections().map((section) => ({ key: section.key, label: section.label })),
+  ],
+]);
 
 /** The sections a row offers, or none. */
-function menuSectionsFor(id: string): readonly MenuSection[] {
-  return SECTION_SOURCES[id]?.() ?? [];
+function menuSectionsFor(id: string): readonly KeyedLabel[] {
+  return SECTION_SOURCES.get(id)?.() ?? [];
 }
 
 // ─── Running ──────────────────────────────────────────────────────────────────
@@ -95,7 +95,7 @@ function menuSectionsFor(id: string): readonly MenuSection[] {
  * click throws BEFORE `run`, synchronously. `commands/run-reported.ts` catches both and files the
  * sentence in Problems, under this menu's name.
  */
-function runRow(id: string, args?: Record<string, unknown>): void {
+function runRow(id: string, args?: CommandArgValues): void {
   const registry = activeRegistry();
   if (!registry) {
     return;