@jxsuite/studio 10.4.0 → 10.6.0

package/src/studio.ts

@@ -118,6 +118,7 @@ import {
   refreshFormats,
 } from "./format/format-host";
 import {
+  followOpenDocuments,
   loadProject as _loadProject,
   openProject as _openProject,
   findHomePage,
@@ -295,11 +296,12 @@ import { focusPublishHome } from "./publish/publish-workspace";
 import { registerI18nCommands } from "./i18n/i18n-commands";
 import { convertToComponent } from "./editor/convert-to-component";
 import type { GitDiffState } from "./types";
-import { PROJECT_CONFIG_PATH } from "./tabs/tab";
 import type { Tab } from "./tabs/tab";
 import type { JxDocument, ProjectConfig } from "@jxsuite/schema/types";
 import { setBundleBase } from "./services/bundle-base";
 import { mountBootFailureTree, mountShellTree } from "./shell/tree";
+import { PROJECT_FILE_NAME, isProjectConfigPath } from "@jxsuite/schema/project-file";
+import { projectConfigPath } from "./tabs/tab";
 
 // The bundler's `<link rel=modulepreload>` batching is installed on the module scope: before the
 // First lazy `import()` of any surface that runs, so the palette's first open does not pay a
@@ -403,7 +405,7 @@ function setCanvasMode(tab: Tab | null, mode: string) {
   }
   tab.session.ui.canvasMode = mode;
   // The Styles home view follows the author's own switches between Variables and Elements.
-  if (tab.documentPath === PROJECT_CONFIG_PATH) {
+  if (isProjectConfigPath(tab.documentPath)) {
     rememberStylesView(mode);
   }
 }
@@ -1152,7 +1154,7 @@ if (_projectParam) {
          */
         const named =
           _urlParams.get("file") ||
-          (siteCtx.fileRelPath && !siteCtx.fileRelPath.endsWith("project.json")
+          (siteCtx.fileRelPath && !isProjectConfigPath(siteCtx.fileRelPath)
             ? siteCtx.fileRelPath
             : null);
         if (!named) {
@@ -1168,8 +1170,8 @@ if (_projectParam) {
         fileRelPath = named ?? siteCtx.fileRelPath ?? _projectParam;
 
         // When opening project.json, default to home page instead (listing-based, no 404 probes).
-        if (fileRelPath === "project.json" || fileRelPath.endsWith("/project.json")) {
-          fileRelPath = (await findHomePage()) ?? "project.json";
+        if (isProjectConfigPath(fileRelPath) || fileRelPath.endsWith(`/${PROJECT_FILE_NAME}`)) {
+          fileRelPath = (await findHomePage()) ?? projectConfigPath();
         }
 
         const content = await platform.readFile(fileRelPath);
@@ -1205,7 +1207,7 @@ if (_projectParam) {
           if (parsedMode === "content" && activeTab.value) {
             activeTab.value.doc.mode = "content";
           }
-          if (fileRelPath === "project.json" && activeTab.value) {
+          if (isProjectConfigPath(fileRelPath) && activeTab.value) {
             activeTab.value.session.ui.canvasMode = "stylebook";
           }
 
@@ -1228,7 +1230,8 @@ if (_projectParam) {
   }
 } else {
   // Normal mode: probe for project at server root
-  void loadProject();
+  // oxlint-disable-next-line unicorn/prefer-top-level-await -- deliberate fire-and-forget: the shell renders first
+  void loadProjectAndFollowDocuments();
   render();
   ensureFsSync();
 }
@@ -1296,6 +1299,12 @@ function renderLeftPanel() {
   leftPanelMod.render();
 }
 
+/** Load what this window holds, then show what the operating system asks of it from here on. */
+async function loadProjectAndFollowDocuments() {
+  await loadProject();
+  followOpenDocuments();
+}
+
 function loadProject() {
   return _loadProject();
 }
@@ -1334,7 +1343,10 @@ async function openProject(target: ProjectOpenTarget = "thisWindow"): Promise<Pr
     if (!picked) {
       return "cancelled";
     }
-    const { focused } = await platform.openProjectInNewWindow(picked.root);
+    const { declined, focused } = await platform.openProjectInNewWindow(picked.root);
+    if (declined) {
+      return "cancelled";
+    }
     return focused ? "focused" : "newWindow";
   }
   // The SECOND destroyer, and it was ungated for as long as the first one was. `openRecentProject`
@@ -1394,8 +1406,8 @@ async function openRecentProject(root: string) {
     // Multi-window (desktop): if this window already holds a project, open the chosen one in a new
     // Window (focusing an existing window if it's already open) rather than replacing this project.
     if (projectState && platform.openProjectInNewWindow) {
-      await platform.openProjectInNewWindow(root);
-      activity.done("Opened in another window");
+      const { declined } = await platform.openProjectInNewWindow(root);
+      activity.done(declined ? "Didn't open the project" : "Opened in another window");
       return;
     }
 
@@ -1420,6 +1432,11 @@ async function openRecentProject(root: string) {
     // The project is already open in another window, that window is focused and we bail here.
     if (platform.setWindowProject) {
       const res = await platform.setWindowProject(root);
+      if (res.declined) {
+        // The user declined to run its code, and nothing has moved yet: the tabs above stay open.
+        activity.done("Kept the current project");
+        return;
+      }
       if (res.deduped) {
         activity.done("Already open in another window");
         return;
@@ -1439,7 +1456,7 @@ async function openRecentProject(root: string) {
     refreshFormats();
     void loadFormats();
     refreshExtensionUi(platform);
-    const content = await platform.readFile("project.json");
+    const content = await platform.readFile(projectConfigPath());
     /* SAFETY: This is `project.json` at the root the user chose to open, the project's own config
        file whose schema is ProjectConfig; Studio edits it in that shape and does not re-validate it
        on open, as the folder-picker path in `platforms/devserver.ts` does not either. */

package/src/style/variables-view.ts

@@ -36,7 +36,7 @@ import { projectState } from "../store";
 import { shell } from "../shell";
 import { runActiveReported } from "../commands/run-reported";
 import { projectConfigDocument } from "../tabs/project-config";
-import { PROJECT_CONFIG_PATH } from "../tabs/tab";
+import { isProjectConfigPath } from "../tabs/tab";
 import { paneRegion } from "../ui/regions";
 import { focusCssVar, focusCssVarGroup, renderCssVarsEditor } from "../settings/css-vars-editor";
 import { variablesFocus } from "./variables-focus";
@@ -126,7 +126,7 @@ function manageContexts(): void {
  * place is the tab's own. A no-op with no project, and for any other document.
  */
 function bindConfiguration(tab: Tab): void {
-  if (projectState && tab.documentPath === PROJECT_CONFIG_PATH) {
+  if (projectState && isProjectConfigPath(tab.documentPath)) {
     projectConfigDocument();
   }
 }

package/src/surfaces/collections-panel.json

@@ -130,7 +130,7 @@
     "& [part=\"entry-locale\"]:empty": {
       "display": "none"
     },
-    "& [part=\"entry-status\"][data-status=\"Draft\"]": {
+    "& [part=\"entry-status\"]:not([data-status=\"Published\"], [data-status=\"\"])": {
       "color": "var(--warning)"
     },
     "& [part=\"note\"], & [part=\"no-project\"]": {

package/src/surfaces/collections-panel.ts

@@ -42,7 +42,7 @@ export interface CollectionRow {
 export interface CollectionEntryRow {
   path: string;
   title: string;
-  /** "Draft", "Published", or "". */
+  /** A `hold` rule's label, "Published", or "". */
   status: string;
   /** Whether a thumbnail is drawn, or the document glyph. */
   art: "image" | "glyph";

package/src/surfaces/entry-editor.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://jxsuite.com/schema/v1",
   "$id": "StudioEntryEditor",
-  "$description": "The Entry editor (site-architecture.md §7.4) — one content entry's fields, in a pane, as a Jx document over the kit. The adapter (`surfaces/entry-editor.ts`) hands in a projection; `content/entry-editor.ts` decides everything in it — which collection the file belongs to, which record its fields live in, which required keys are absent and what a draft flag commits into. The FORM is an island: a schema is `ui/schema-form.ts`'s subject, so this document renders an empty `fields` node and the flow places the element that engine hands back (studio-ui-guidelines.md §9.3, §9.4). That is the whole of the difference between this and the card the lit version drew, and it is why the engine converting in batch 7 is what unblocked this one.",
+  "$description": "The Entry editor (site-architecture.md §7.4) — one content entry's fields, in a pane, as a Jx document over the kit. The adapter (`surfaces/entry-editor.ts`) hands in a projection; `content/entry-editor.ts` decides everything in it — which collection the file belongs to, which record its fields live in, which required keys are absent and what a hold switch commits into. The FORM is an island: a schema is `ui/schema-form.ts`'s subject, so this document renders an empty `fields` node and the flow places the element that engine hands back (studio-ui-guidelines.md §9.3, §9.4). That is the whole of the difference between this and the card the lit version drew, and it is why the engine converting in batch 7 is what unblocked this one.",
   "tagName": "div",
   "attributes": {
     "part": "entry",
     "data-jx-region": "${state.region}"
   },
   "style": {
-    "$description": "What `.entry-editor`, `.entry-editor-header`, `.entry-editor-collection`, `.entry-draft-switch`, `.entry-editor-fields`, `.entry-editor-note` and `.entry-editor-empty` said in `styles/overlays.css`, keyed on `part` and re-pointed at the studio token layer. This editor was the only emitter of all seven, so those rules are dead in the stylesheet from here; a central sweep removes them rather than this change, which owns no stylesheet. Every `--spectrum-font-size-*` reference is gone rather than renamed: those names resolve only inside `<sp-theme>`, and a pane editor is mounted outside it, so each would silently have taken its hard-coded fallback.",
+    "$description": "What `.entry-editor`, `.entry-editor-header`, `.entry-editor-collection`, `.entry-hold-switch`, `.entry-editor-fields`, `.entry-editor-note` and `.entry-editor-empty` said in `styles/overlays.css`, keyed on `part` and re-pointed at the studio token layer. This editor was the only emitter of all seven, so those rules are dead in the stylesheet from here; a central sweep removes them rather than this change, which owns no stylesheet. Every `--spectrum-font-size-*` reference is gone rather than renamed: those names resolve only inside `<sp-theme>`, and a pane editor is mounted outside it, so each would silently have taken its hard-coded fallback.",
     "height": "100%",
     "padding": "var(--jx-space-5)",
     "overflowY": "auto",
@@ -32,7 +32,7 @@
       "color": "var(--fg-dim)",
       "fontSize": "var(--jx-text-sm)"
     },
-    "& [part=\"draft\"]": {
+    "& [part=\"hold\"]": {
       "$description": "Pushed to the far end of the header rather than placed there: the heading and the collection chip are both content-width, so `margin-left: auto` is what keeps the switch on the right edge whatever the entry is called.",
       "marginLeft": "auto"
     },
@@ -241,27 +241,27 @@
                 {
                   "tagName": "div",
                   "attributes": {
-                    "part": "draft-slot",
+                    "part": "hold-slot",
                     "role": "none"
                   },
                   "style": {
                     "display": "contents"
                   },
                   "$switch": {
-                    "$ref": "#/state/draftAxis"
+                    "$ref": "#/state/holdSwitch"
                   },
                   "cases": {
                     "shown": {
                       "$description": "No `label`: the slotted word is on screen and carries the name, so an aria-label would be read twice. The tooltip is `hint`, which is what DRAFT_MEANING has always been.",
                       "tagName": "jx-switch",
                       "attributes": {
-                        "part": "draft"
+                        "part": "hold"
                       },
                       "$props": {
                         "checked": {
-                          "$ref": "#/state/draft"
+                          "$ref": "#/state/holdOn"
                         },
-                        "hint": "${state.draftHint}",
+                        "hint": "${state.holdHint}",
                         "size": "sm"
                       },
                       "onchange": {
@@ -270,7 +270,7 @@
                           {
                             "operator": "call",
                             "target": {
-                              "$ref": "#/state/setDraft"
+                              "$ref": "#/state/setHold"
                             },
                             "value": [
                               {
@@ -283,7 +283,7 @@
                       "children": [
                         {
                           "tagName": "span",
-                          "textContent": "Draft"
+                          "textContent": "${state.holdLabel}"
                         }
                       ]
                     }

package/src/surfaces/entry-editor.ts

@@ -4,9 +4,8 @@
  *
  * This is the adapter. `content/entry-editor.ts` keeps the editor — which pane holds which tab,
  * which collection a path belongs to, which record the fields live in, which required keys the
- * entry does not HAVE, and what the draft switch commits into — and hands this module one
- * projection whose every field is already a string or a flag. The document draws it and decides
- * nothing.
+ * entry does not HAVE, and what the hold switch commits into — and hands this module one projection
+ * whose every field is already a string or a flag. The document draws it and decides nothing.
  *
  * **The form is an ISLAND, and that is the whole shape of this conversion.** A form built from a
  * JSON Schema is `ui/schema-form.ts`'s surface rather than this one's, and that engine hands back a
@@ -53,13 +52,15 @@ export interface EntryEditorView {
   name: string;
   /** The collection's name, in the chip beside it. */
   collection: string;
-  /** Whether this collection has a draft workflow at all; with none, neither state is drawn. */
-  draftAxis: "hidden" | "shown";
-  /** Whether the entry is marked a draft. */
-  draft: boolean;
-  /** The switch's tooltip: what a draft IS, in `content/draft-state.ts`'s one sentence. */
-  draftHint: string;
-  /** Whether the sentence under the header is drawn — only while the entry IS a draft. */
+  /** Whether the collection's rules offer a switch: one boolean field. */
+  holdSwitch: "hidden" | "shown";
+  /** Whether the switch is on. */
+  holdOn: boolean;
+  /** The word beside the switch: its rule's label. */
+  holdLabel: string;
+  /** The switch's tooltip: what being held does, in `content/hold-state.ts`'s one sentence. */
+  holdHint: string;
+  /** Whether the sentence under the header is drawn — only while a rule holds the entry. */
   noteState: "hidden" | "shown";
   note: string;
   /** The `empty` stage's first sentence, naming the document it is about. */
@@ -74,8 +75,8 @@ export interface EntryEditorView {
 
 /** What the reader can do here. Both are decisions the editor owns. */
 export interface EntryEditorActions {
-  /** The draft switch moved. A setter, never a toggle. */
-  setDraft: (draft: boolean) => void;
+  /** The hold switch moved. A setter, never a toggle. */
+  setHold: (on: boolean) => void;
   /** Open Project Settings › Content types — the door out of the `empty` stage. */
   openContentTypes: () => void;
   /** A record: show the file's previous record, its next one, or the whole file in its grid. */
@@ -109,9 +110,10 @@ function project(scope: EntryEditorScope, view: EntryEditorView): void {
   scope.stage = view.stage;
   scope.name = view.name;
   scope.collection = view.collection;
-  scope.draftAxis = view.draftAxis;
-  scope.draft = view.draft;
-  scope.draftHint = view.draftHint;
+  scope.holdSwitch = view.holdSwitch;
+  scope.holdOn = view.holdOn;
+  scope.holdLabel = view.holdLabel;
+  scope.holdHint = view.holdHint;
   scope.noteState = view.noteState;
   scope.note = view.note;
   scope.emptyLine = view.emptyLine;
@@ -149,9 +151,10 @@ export function mountEntryEditorSurface(
   host.replaceChildren();
   const scope: EntryEditorScope = reactive<EntryEditorScope>({
     collection: "",
-    draft: false,
-    draftAxis: "hidden",
-    draftHint: "",
+    holdHint: "",
+    holdLabel: "",
+    holdOn: false,
+    holdSwitch: "hidden",
     emptyLine: "",
     fieldsRegion: "",
     name: "",
@@ -164,7 +167,7 @@ export function mountEntryEditorSurface(
     previousDisabled: true,
     recordNav: "hidden",
     region: "",
-    setDraft: actions.setDraft,
+    setHold: actions.setHold,
     showNext: actions.showNext,
     showPrevious: actions.showPrevious,
     stage: "empty",

package/src/surfaces/entry-inspector.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://jxsuite.com/schema/v1",
   "$id": "StudioEntryInspector",
-  "$description": "The Inspector's Entry tab (specs/studio.md §6, §22.5): one collection entry's own settings while it is written on the canvas, the Content-Entry board's sidebar. Its status (draft or published), its fields as the collection's schema types them, the URL its collection page publishes it at, and the file it is stored in. `content/entry-inspector.ts` keeps every decision; the field form is an island it fills, `ui/schema-form.ts`'s, the same form the form-only entry editor draws.",
+  "$description": "The Inspector's Entry tab (specs/studio.md §6, §22.5): one collection entry's own settings while it is written on the canvas, the Content-Entry board's sidebar. Its status (a hold rule's label, or Published), its fields as the collection's schema types them, the URL its collection page publishes it at, and the file it is stored in. `content/entry-inspector.ts` keeps every decision; the field form is an island it fills, `ui/schema-form.ts`'s, the same form the form-only entry editor draws.",
   "tagName": "div",
   "attributes": {
     "part": "entry",
@@ -42,7 +42,7 @@
       "fontSize": "var(--jx-text-sm)",
       "color": "var(--fg-dim)"
     },
-    "& [part=\"status\"][data-draft=\"true\"]": {
+    "& [part=\"status\"][data-held=\"true\"]": {
       "color": "var(--warning)"
     },
     "& [part=\"note\"]": {
@@ -94,7 +94,7 @@
               "tagName": "span",
               "attributes": {
                 "part": "status",
-                "data-draft": "${state.draft ? 'true' : 'false'}"
+                "data-held": "${state.held ? 'true' : 'false'}"
               },
               "textContent": "${state.status}"
             }
@@ -110,27 +110,27 @@
         {
           "tagName": "div",
           "attributes": {
-            "part": "draft-slot",
+            "part": "hold-slot",
             "role": "none"
           },
           "style": {
             "display": "contents"
           },
           "$switch": {
-            "$ref": "#/state/draftAxis"
+            "$ref": "#/state/holdSwitch"
           },
           "cases": {
             "shown": {
-              "$description": "The entry's draft state, the one field every collection with a draft workflow shares (site-architecture.md §7.6). A setter: the switch names the state it reaches.",
+              "$description": "The entry's hold switch, on a collection whose rules offer one: the one field every such collection has in common. The state this shares (site-architecture.md §7.6). A setter: the switch names the state it reaches.",
               "tagName": "jx-switch",
               "attributes": {
-                "part": "draft"
+                "part": "hold"
               },
               "$props": {
                 "checked": {
-                  "$ref": "#/state/draft"
+                  "$ref": "#/state/holdOn"
                 },
-                "hint": "${state.draftHint}",
+                "hint": "${state.holdHint}",
                 "size": "sm"
               },
               "onchange": {
@@ -139,7 +139,7 @@
                   {
                     "operator": "call",
                     "target": {
-                      "$ref": "#/state/setDraft"
+                      "$ref": "#/state/setHold"
                     },
                     "value": [
                       {
@@ -152,7 +152,7 @@
               "children": [
                 {
                   "tagName": "span",
-                  "textContent": "Draft"
+                  "textContent": "${state.holdLabel}"
                 }
               ]
             }

package/src/surfaces/entry-inspector.ts

@@ -25,12 +25,17 @@ export interface EntryInspectorView {
   region: string;
   /** What the entry is, said in the singular: "Post". */
   kind: string;
-  /** "Draft", "Published", or "" for a collection with no draft workflow. */
+  /** A `hold` rule's label, "Published", or "" for a collection with no rules. */
   status: string;
-  /** Whether the collection has a draft workflow at all. */
-  draftAxis: "hidden" | "shown";
-  draft: boolean;
-  draftHint: string;
+  /** Whether the collection's rules offer a switch: one boolean field. */
+  holdSwitch: "hidden" | "shown";
+  /** Whether a rule holds the entry, whichever it is. */
+  held: boolean;
+  /** Whether the switch is on. */
+  holdOn: boolean;
+  /** The word beside the switch: its rule's label. */
+  holdLabel: string;
+  holdHint: string;
   /** `form` draws the field form's host; `none` says the collection declares no fields. */
   fieldsState: "form" | "none";
   /**
@@ -47,8 +52,8 @@ export interface EntryInspectorView {
 
 /** What the tab's controls do. */
 export interface EntryInspectorActions {
-  /** The draft switch moved. A setter, never a toggle. */
-  setDraft: (draft: boolean) => void;
+  /** The hold switch moved. A setter, never a toggle. */
+  setHold: (on: boolean) => void;
   /** **Edit** opens Project Settings › Content types on this collection. */
   openFields: () => void;
   /** **Search appearance…** runs `document.openSeo` over this entry, as the Page tab's does. */
@@ -76,9 +81,11 @@ function project(scope: EntryInspectorScope, view: EntryInspectorView): void {
   scope.region = view.region;
   scope.kind = view.kind;
   scope.status = view.status;
-  scope.draftAxis = view.draftAxis;
-  scope.draft = view.draft;
-  scope.draftHint = view.draftHint;
+  scope.holdSwitch = view.holdSwitch;
+  scope.holdOn = view.holdOn;
+  scope.holdLabel = view.holdLabel;
+  scope.holdHint = view.holdHint;
+  scope.held = view.held;
   scope.fieldsState = view.fieldsState;
   scope.urlState = view.urlState;
   scope.url = view.url;