alinea 2.0.0-preview.2 → 2.0.0-preview.4

package/dist/dashboard/atoms/utils.js

@@ -1,9 +1,9 @@
 import {
   unwrap
-} from "../../chunks/chunk-STAJCW4Z.js";
+} from "../../chunks/chunk-TIJTT5ZI.js";
 import {
   atom
-} from "../../chunks/chunk-Y7XOMJOC.js";
+} from "../../chunks/chunk-CFNRVI3Y.js";
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/dashboard/atoms/utils.ts

package/dist/dashboard/boot/Boot.js

@@ -48,10 +48,8 @@ async function boot(gen) {
       }
       const isLocal = worker instanceof DashboardWorker;
       if (isLocal) await worker.load(batch.revision, batch.config, batch.client);
-      if (batch.revision !== lastRevision) {
-        const db = new WorkerDB(batch.config, worker, batch.client, events);
-        root.render(/* @__PURE__ */ jsx(App, { graph: db, events, ...batch }));
-      }
+      const db = new WorkerDB(batch.config, worker, batch.client, events);
+      root.render(/* @__PURE__ */ jsx(App, { graph: db, events, ...batch }));
       lastRevision = batch.revision;
     }
   }

package/dist/dashboard/boot/DashboardWorker.js

@@ -40,15 +40,25 @@ var DashboardWorker = class extends EventTarget {
     return this.#localClient ?? this.#nextLoad.then((res) => res.client);
   }
   async sync() {
-    const db = await this.db;
-    const client = await this.#client;
-    if (this.#local.activeCount > 0 || this.#local.pendingCount > 0 || remote.activeCount > 0 || remote.pendingCount > 0)
+    const load = this.#nextLoad;
+    const loaded = await load;
+    const { db, client } = loaded;
+    return this.#local(async () => {
+      try {
+        await remote(() => this.#syncWithClient(db, client));
+      } catch (error) {
+        if (loaded.cacheFailure) {
+          throw new AggregateError(
+            [loaded.cacheFailure.error, error],
+            "Failed to load cached content and fetch remote updates"
+          );
+        }
+        throw error;
+      }
+      loaded.cacheFailure = void 0;
+      this.#startSyncing();
       return db.sha;
-    const sourceTree = await db.source.getTree();
-    if (db.index.tree.isEmpty && !sourceTree.isEmpty) await db.sync();
-    const sync = remote(() => this.#syncWithClient(db, client));
-    if (sourceTree.isEmpty) await sync;
-    return db.sha;
+    });
   }
   async sha() {
     return (await this.db).sha;
@@ -100,11 +110,7 @@ var DashboardWorker = class extends EventTarget {
     const latestFetch = this.#activities.find(
       (activity) => activity.type === "fetch"
     );
-    if (latestFetch?.status === "failed") {
-      const db = await this.db;
-      const client = await this.#client;
-      await remote(() => this.#syncWithClient(db, client));
-    }
+    if (latestFetch?.status === "failed") await this.sync();
   }
   async #retryMutations() {
     await this.#local(async () => {
@@ -257,19 +263,19 @@ var DashboardWorker = class extends EventTarget {
     return db.referencesTo(query);
   }
   async load(revision, config, client) {
-    if (this.#currentRevision === revision) {
-      await this.sync();
-      return;
-    }
+    if (this.#currentRevision === revision) return;
     this.#currentRevision = revision;
-    const db = new LocalDB(config, this.#source);
+    const nextLoad = this.#localDB ? trigger() : this.#nextLoad;
+    this.#nextLoad = nextLoad;
+    this.#localDB = void 0;
+    this.#localClient = void 0;
     try {
+      const db = new LocalDB(config, this.#source);
       if (this.#defer) this.#defer();
-      const cacheReady = await this.#syncLocalIndex(db);
-      if (!cacheReady) await remote(() => this.#syncWithClient(db, client));
+      const cacheFailure = await this.#syncLocalIndex(db);
       this.#localDB = db;
       this.#localClient = client;
-      this.#nextLoad.resolve({ db, client });
+      nextLoad.resolve({ db, client, cacheFailure });
       const listen = (event) => {
         if (event instanceof IndexEvent)
           this.dispatchEvent(new IndexEvent(event.data));
@@ -278,29 +284,28 @@ var DashboardWorker = class extends EventTarget {
       this.#defer = () => {
         db.index.removeEventListener(IndexEvent.type, listen);
       };
-      this.#startSyncing(cacheReady);
     } catch (cause) {
-      this.#nextLoad.reject(new Error("Failed to load database", { cause }));
+      this.#currentRevision = void 0;
+      this.#nextLoad = trigger();
+      nextLoad.reject(new Error("Failed to load database", { cause }));
       throw cause;
     }
   }
   async #syncLocalIndex(db) {
     const sourceTree = await db.source.getTree();
-    if (sourceTree.isEmpty) return false;
+    if (sourceTree.isEmpty) return;
     try {
       await db.sync();
-      return true;
-    } catch {
-      return false;
+    } catch (error) {
+      return { error };
     }
   }
-  #startSyncing(refreshImmediately) {
+  #startSyncing() {
     if (this.#syncInterval) return;
     const sync = () => {
       void this.sync().catch(() => {
       });
     };
-    if (refreshImmediately) sync();
     this.#syncInterval = setInterval(sync, syncInterval);
   }
 };

package/dist/dashboard/editor/UseField.js

@@ -1,8 +1,8 @@
 import {
-  useAtomValue,
+  useAtomValueRaw,
   useSetAtom
-} from "../../chunks/chunk-U4VOHNR2.js";
-import "../../chunks/chunk-Y7XOMJOC.js";
+} from "../../chunks/chunk-D6UJHBJJ.js";
+import "../../chunks/chunk-CFNRVI3Y.js";
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/dashboard/editor/UseField.ts
@@ -36,15 +36,15 @@ function useFieldKey(field) {
 }
 function useFieldOptions(field) {
   const info = useFieldInfo(field);
-  return useAtomValue(info.options);
+  return useAtomValueRaw(info.options);
 }
 function useFieldError(field) {
   const info = useFieldInfo(field);
-  return useAtomValue(info.error);
+  return useAtomValueRaw(info.error);
 }
 function useFieldValue(field) {
   const info = useFieldInfo(field);
-  return useAtomValue(info.value);
+  return useAtomValueRaw(info.value);
 }
 function useFieldMutator(field) {
   const info = useFieldInfo(field);

package/dist/dashboard/fixture/cms.d.ts

@@ -112,5 +112,17 @@ export declare const cms: import("../../adapter/core/cms.js").CoreCMS<{
             pages: import("alinea").Root<import("../../core/Root.js").ChildrenDefinition>;
             media: import("../../core/media/MediaRoot.js").MediaRoot<import("../../core/Root.js").ChildrenDefinition>;
         }>;
+        manyRoots: import("alinea").Workspace<{
+            pages: import("alinea").Root<import("../../core/Root.js").ChildrenDefinition>;
+            articles: import("alinea").Root<import("../../core/Root.js").ChildrenDefinition>;
+            documentation: import("alinea").Root<import("../../core/Root.js").ChildrenDefinition>;
+            campaigns: import("alinea").Root<import("../../core/Root.js").ChildrenDefinition>;
+            translations: import("alinea").Root<import("../../core/Root.js").ChildrenDefinition>;
+            archive: import("alinea").Root<import("../../core/Root.js").ChildrenDefinition>;
+            settings: import("alinea").Root<import("../../core/Root.js").ChildrenDefinition>;
+            brandAssets: import("alinea").Root<import("../../core/Root.js").ChildrenDefinition>;
+            nestedContent: import("alinea").Root<import("../../core/Root.js").ChildrenDefinition>;
+            media: import("../../core/media/MediaRoot.js").MediaRoot<import("../../core/Root.js").ChildrenDefinition>;
+        }>;
     };
 }>;

package/dist/dashboard/fixture/cms.js

@@ -4,10 +4,17 @@ import "../../chunks/chunk-CQ52GEHY.js";
 import { createCMS } from "alinea/core";
 import { Config, Field } from "alinea/index";
 import {
+  IcOutlineFolder,
   IcOutlineGridView,
+  IcOutlineSettings,
+  IcRoundDescription,
   IcRoundHistory,
+  IcRoundImage,
+  IcRoundLanguage,
+  IcRoundPublic,
   IcRoundTranslate,
-  MiLayers
+  MiLayers,
+  LucideFolder
 } from "../icons.js";
 var Page = Config.document("Page", {
   contains: ["Page", "Folder"],
@@ -214,6 +221,49 @@ var statuses = Config.workspace("Statuses", {
     media: Config.media()
   }
 });
+var manyRoots = Config.workspace("Many roots", {
+  source: "content/manyRoots",
+  icon: LucideFolder,
+  roots: {
+    pages: Config.root("Pages", {
+      contains: ["Page", "Folder"],
+      openByDefault: true
+    }),
+    articles: Config.root("Articles", {
+      contains: ["Page", "Folder"],
+      icon: IcRoundDescription
+    }),
+    documentation: Config.root("Documentation", {
+      contains: ["Page", "Folder"],
+      icon: IcOutlineFolder
+    }),
+    campaigns: Config.root("Campaigns", {
+      contains: ["Page", "Folder"],
+      icon: IcRoundPublic
+    }),
+    translations: Config.root("Translations", {
+      contains: ["Page", "Folder"],
+      icon: IcRoundLanguage
+    }),
+    archive: Config.root("Archive", {
+      contains: ["Page", "Folder"],
+      icon: IcRoundHistory
+    }),
+    settings: Config.root("Settings", {
+      contains: ["Page", "Folder"],
+      icon: IcOutlineSettings
+    }),
+    brandAssets: Config.root("Brand assets", {
+      contains: ["Page", "Folder"],
+      icon: IcRoundImage
+    }),
+    nestedContent: Config.root("Nested content", {
+      contains: ["Page", "Folder"],
+      icon: MiLayers
+    }),
+    media: Config.media()
+  }
+});
 var cms = createCMS({
   enableDrafts: true,
   schema: { Page, Folder },
@@ -222,7 +272,8 @@ var cms = createCMS({
     nested,
     many,
     i18n,
-    statuses
+    statuses,
+    manyRoots
   }
 });
 export {

package/dist/dashboard/hook/UseGraph.js

@@ -1,13 +1,13 @@
 import {
-  useAtomValue
-} from "../../chunks/chunk-U4VOHNR2.js";
-import "../../chunks/chunk-Y7XOMJOC.js";
+  useAtomValueRaw
+} from "../../chunks/chunk-D6UJHBJJ.js";
+import "../../chunks/chunk-CFNRVI3Y.js";
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/dashboard/hook/UseGraph.ts
 import { graphAtom } from "../atoms/core.js";
 function useGraph() {
-  return useAtomValue(graphAtom);
+  return useAtomValueRaw(graphAtom);
 }
 export {
   useGraph

package/dist/dashboard/hook/UseRoot.js

@@ -1,14 +1,14 @@
 import {
-  useAtomValue
-} from "../../chunks/chunk-U4VOHNR2.js";
-import "../../chunks/chunk-Y7XOMJOC.js";
+  useAtomValueRaw
+} from "../../chunks/chunk-D6UJHBJJ.js";
+import "../../chunks/chunk-CFNRVI3Y.js";
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/dashboard/hook/UseRoot.ts
 import { useDashboardContext } from "../hooks.js";
 function useRoot() {
   const { root } = useDashboardContext();
-  return { name: root.key, ...useAtomValue(root.data) };
+  return { name: root.key, ...useAtomValueRaw(root.data) };
 }
 export {
   useRoot

package/dist/dashboard/hooks.js

@@ -1,13 +1,13 @@
 import {
   Provider,
   useAtom,
-  useAtomValue,
+  useAtomValueRaw,
   useSetAtom
-} from "../chunks/chunk-U4VOHNR2.js";
+} from "../chunks/chunk-D6UJHBJJ.js";
 import {
   atom,
   createStore
-} from "../chunks/chunk-Y7XOMJOC.js";
+} from "../chunks/chunk-CFNRVI3Y.js";
 import "../chunks/chunk-CQ52GEHY.js";
 
 // src/dashboard/hooks.tsx
@@ -69,16 +69,16 @@ function useDashboard() {
   return dashboard;
 }
 function usePolicy() {
-  return useAtomValue(policyAtom);
+  return useAtomValueRaw(policyAtom);
 }
 function useUser() {
-  return useAtomValue(userAtom);
+  return useAtomValueRaw(userAtom);
 }
 function useGraph() {
-  return useAtomValue(graphAtom);
+  return useAtomValueRaw(graphAtom);
 }
 function usePreviewMetadata() {
-  return useAtomValue(previewMetadataAtom);
+  return useAtomValueRaw(previewMetadataAtom);
 }
 function EditorScope({
   children,
@@ -132,7 +132,7 @@ function useFieldInfo(field) {
 function useNodeEditor(node, type) {
   const parent = useContext(editorContext);
   const scope = useContext(entryContext);
-  const policy = useAtomValue(scope ? policyAtom : noPolicyAtom);
+  const policy = useAtomValueRaw(scope ? policyAtom : noPolicyAtom);
   const activeVersion = scope?.selectedEntry;
   const editor = useMemo(() => {
     return new EntryEditor(
@@ -149,17 +149,17 @@ function useNodeEditor(node, type) {
 function useFieldNode(field) {
   const key = useFieldKey(field);
   const editor = useEditor();
-  const nodes = useAtomValue(editor.node.nodes);
+  const nodes = useAtomValueRaw(editor.node.nodes);
   assert(nodes[key], `Node not found for field key: ${key}`);
   return nodes[key];
 }
 function useFieldValue(field) {
   const node = useFieldNode(field);
-  return useAtomValue(node.value);
+  return useAtomValueRaw(node.value);
 }
 function useField(field) {
   const info = useFieldInfo(field);
-  const value = useAtomValue(info.value);
+  const value = useAtomValueRaw(info.value);
   const setValue = useSetAtom(info.value);
   return [value, setValue];
 }
@@ -173,21 +173,21 @@ function useFieldKey(field) {
 }
 function useFieldOptions(field) {
   const info = useFieldInfo(field);
-  return useAtomValue(info.options);
+  return useAtomValueRaw(info.options);
 }
 function useFieldError(field) {
   const info = useFieldInfo(field);
-  return useAtomValue(info.error);
+  return useAtomValueRaw(info.error);
 }
 function useFieldView(field) {
   const info = useFieldInfo(field);
-  return useAtomValue(info.view);
+  return useAtomValueRaw(info.view);
 }
 function useSiblingFieldValue(key) {
   const editor = useEditor();
   const info = editor.field(key);
   assert(info, `Field not found: ${key}`);
-  return useAtomValue(info.value);
+  return useAtomValueRaw(info.value);
 }
 function useEntryModel() {
   return useContext(entryContext);
@@ -200,7 +200,7 @@ function useValue(node) {
   return useAtom(node.value);
 }
 function useNodes(node) {
-  return useAtomValue(node.nodes);
+  return useAtomValueRaw(node.nodes);
 }
 export {
   DashboardModelScope,

package/dist/field/check/CheckField.view.js

@@ -9,9 +9,9 @@ import { useField, useFieldError, useFieldOptions } from "alinea/dashboard/hooks
 
 // src/field/check/CheckField.module.css
 var CheckField_default = {
-  "checkline": "alinea-checkline",
   "checkline-required": "alinea-checkline-required",
-  "checklineRequired": "alinea-checkline-required"
+  "checklineRequired": "alinea-checkline-required",
+  "checkline": "alinea-checkline"
 };
 
 // src/field/check/CheckField.view.tsx

package/dist/field/code/CodeField.view.js

@@ -64,27 +64,27 @@ import { Fragment, useId } from "react";
 
 // src/field/code/CodeField.module.css
 var CodeField_default = {
-  "CodeEditorInput": "alinea-CodeEditorInput",
-  "CodeEditorInput-pre": "alinea-CodeEditorInput-pre",
-  "CodeEditorInputPre": "alinea-CodeEditorInput-pre",
-  "CodeEditorInput-keyword": "alinea-CodeEditorInput-keyword",
-  "CodeEditorInputKeyword": "alinea-CodeEditorInput-keyword",
-  "CodeEditorInput-string": "alinea-CodeEditorInput-string",
-  "CodeEditorInputString": "alinea-CodeEditorInput-string",
+  "CodeEditorInput-identifier": "alinea-CodeEditorInput-identifier",
+  "CodeEditorInputIdentifier": "alinea-CodeEditorInput-identifier",
+  "CodeEditorInput-textarea": "alinea-CodeEditorInput-textarea",
+  "CodeEditorInputTextarea": "alinea-CodeEditorInput-textarea",
   "CodeEditorInput-number": "alinea-CodeEditorInput-number",
   "CodeEditorInputNumber": "alinea-CodeEditorInput-number",
-  "CodeEditorInput-editor": "alinea-CodeEditorInput-editor",
-  "CodeEditorInputEditor": "alinea-CodeEditorInput-editor",
+  "CodeEditorInput-string": "alinea-CodeEditorInput-string",
+  "CodeEditorInputString": "alinea-CodeEditorInput-string",
   "CodeEditorInput-regex": "alinea-CodeEditorInput-regex",
   "CodeEditorInputRegex": "alinea-CodeEditorInput-regex",
-  "CodeEditorInput-punctuation": "alinea-CodeEditorInput-punctuation",
-  "CodeEditorInputPunctuation": "alinea-CodeEditorInput-punctuation",
   "CodeEditorInput-comment": "alinea-CodeEditorInput-comment",
   "CodeEditorInputComment": "alinea-CodeEditorInput-comment",
-  "CodeEditorInput-identifier": "alinea-CodeEditorInput-identifier",
-  "CodeEditorInputIdentifier": "alinea-CodeEditorInput-identifier",
-  "CodeEditorInput-textarea": "alinea-CodeEditorInput-textarea",
-  "CodeEditorInputTextarea": "alinea-CodeEditorInput-textarea"
+  "CodeEditorInput-editor": "alinea-CodeEditorInput-editor",
+  "CodeEditorInputEditor": "alinea-CodeEditorInput-editor",
+  "CodeEditorInput-pre": "alinea-CodeEditorInput-pre",
+  "CodeEditorInputPre": "alinea-CodeEditorInput-pre",
+  "CodeEditorInput-punctuation": "alinea-CodeEditorInput-punctuation",
+  "CodeEditorInputPunctuation": "alinea-CodeEditorInput-punctuation",
+  "CodeEditorInput-keyword": "alinea-CodeEditorInput-keyword",
+  "CodeEditorInputKeyword": "alinea-CodeEditorInput-keyword",
+  "CodeEditorInput": "alinea-CodeEditorInput"
 };
 
 // src/field/code/CodeField.view.tsx

package/dist/field/link/EntryLink.d.ts

@@ -30,7 +30,7 @@ export declare namespace entry {
     type EntryRow<Fields> = EntryLink<Type.Infer<Fields>> & ListRow;
     interface EntryOptions<Fields> extends LinkFieldOptions<Array<EntryReference & ListRow & InferStoredValue<Fields>>>, Omit<EntryPickerOptions<Fields>, 'label' | 'selection'> {
     }
-    export function multiple<Fields = undefined>(label: Label, options?: WithoutLabel<EntryOptions<Fields>>): import("alinea/field/link/LinkField").LinksField<EntryReference & ListRow, EntryRow<Fields>>;
+    export function multiple<Fields = undefined>(label: Label, options?: WithoutLabel<EntryOptions<Fields>>): import("alinea/field/link/LinkField").LinksField<EntryReference & ListRow & InferStoredValue<Fields>, EntryRow<Fields>>;
     export {};
 }
 export {};

package/dist/field/link/EntryLink.js

@@ -33,6 +33,7 @@ function entry(label, options = {}) {
 ((entry2) => {
   function multiple(label, options = {}) {
     return createLinks(label, {
+      allowDuplicates: false,
       ...options,
       isEntryField: true,
       pickers: {

package/dist/field/link/Link.js

@@ -27,6 +27,7 @@ function link(label, options = {}) {
 ((link2) => {
   function multiple(label, options = {}) {
     return createLinks(label, {
+      allowDuplicates: true,
       ...options,
       pickers: {
         entry: entryPicker({

package/dist/field/link/LinkField.d.ts

@@ -8,6 +8,11 @@ import { ListRow } from 'alinea/core/ListRow';
 import type { ReactNode } from 'react';
 /** Optional settings to configure a link field */
 export interface LinkFieldOptions<Value> extends FieldOptions<Value> {
+    /**
+     * Allow the same entry to be linked more than once.
+     * Defaults to false for entry fields and true for generic link fields.
+     */
+    allowDuplicates?: boolean;
     /** Width of the field in the dashboard UI (0-1) */
     width?: number;
     /** Add instructional text to a field */