@elytracms/studio 0.0.72 → 0.0.74

package/dist/components/cms/cms-store.js

@@ -4,12 +4,12 @@ import { createCollectionRegistry, createDocumentStore, documentKey, documentSch
 import { translate } from '@elytracms/studio/lib/i18n';
 import { configureStudioLocales, useStudioLocale } from '@elytracms/studio/lib/locale';
 import { studioManifestLookup } from '@elytracms/studio/lib/registry';
-import { resolveDeploymentCollections } from '@elytracms/studio/lib/workspace';
+import { resolveDeploymentCollections, resolveDeploymentRoutes } from '@elytracms/studio/lib/workspace';
 import { validateComposition, validateRichTextEmbeds } from './cms-composition-validators.js';
 import { matchesRef, removeDoc, replaceDoc, upsertDoc } from './document-ref-utils.js';
 import { createRequiredContext } from '@elytracms/studio/lib/required-context';
 import { createCmsPersister, getStudioOperations } from '@elytracms/studio/lib/operations';
-import { ALL_VIEW_ID, canonicalViewState, configViewIssues, configViewsFor, defaultConfigViewId, defaultViewState, viewStatesEqual, } from '@elytracms/studio/lib/cms-views';
+import { ALL_VIEW_ID, DEFAULT_VIEW_OVERRIDE_ID, canonicalViewState, configViewIssues, defaultConfigViewId, defaultViewState, deprecatedDefaultFlagViewIds, hasDefaultViewOverride, pseudoColumns, resolveCollectionViews, viewStatesEqual, } from '@elytracms/studio/lib/cms-views';
 import { useOptionalAssets } from '../assets/assets-store.js';
 import { consumeStagedDocuments } from './document-staging.js';
 import { applyCellValue, commitCellEdit } from './cell-edit.js';
@@ -65,11 +65,11 @@ export function hasDocumentFor(docs, collectionId) {
     return docs.some((d) => d.collection === collectionId);
 }
 /**
- * Surface a duplicate `default: true` across a collection's config views (EC-343) as
- * a visible, one-time console warning — never a silent swallow. This is a developer
- * config mistake (editors can't fix config-as-code), so it takes the same warn-once
- * console channel the i18n runtime uses for config problems, not an editor banner;
- * the first-declared default still seeds deterministically. Deduped per collection id.
+ * Surface a duplicate `initial: true` across a collection's config views (EC-343/
+ * EC-444) as a visible, one-time console warning — never a silent swallow. This is a
+ * developer config mistake (editors can't fix config-as-code), so it takes the same
+ * warn-once console channel the i18n runtime uses for config problems, not an editor
+ * banner; the first-declared still seeds deterministically. Deduped per collection id.
  */
 const warnedDuplicateDefaultCollections = new Set();
 function warnDuplicateDefaultViews(collection) {
@@ -82,13 +82,31 @@ function warnDuplicateDefaultViews(collection) {
     if (typeof console !== 'undefined')
         console.warn(`[views] ${issues[0].message}`);
 }
+/**
+ * Surface the DEPRECATED `default: true` view flag (EC-444) as a one-time console
+ * warning per collection — never silent. `default` (the view flag) is renamed to
+ * `initial`; it is read as an alias for one release and removed next release. Same
+ * warn-once channel as the duplicate check; deduped per collection id.
+ */
+const warnedDeprecatedDefaultCollections = new Set();
+function warnDeprecatedDefaultFlag(collection) {
+    if (warnedDeprecatedDefaultCollections.has(collection.id))
+        return;
+    const ids = deprecatedDefaultFlagViewIds(collection);
+    if (ids.length === 0)
+        return;
+    warnedDeprecatedDefaultCollections.add(collection.id);
+    if (typeof console !== 'undefined') {
+        console.warn(`[views] Collection "${collection.id}" uses the deprecated view flag \`default\` on ${ids.join(', ')}; rename it to \`initial\` (EC-444 — \`default\` is removed next release).`);
+    }
+}
 /** The unnamed built-in view: no filters, no sort, every field visible. */
-function defaultView(collection) {
+function defaultView(collection, pseudo = []) {
     return {
         id: ALL_VIEW_ID,
         name: translate('cms.list.view.all'),
         state: collection
-            ? defaultViewState(collection)
+            ? defaultViewState(collection, pseudo)
             : { filters: [], sort: null, columns: [], hidden: [] },
     };
 }
@@ -99,7 +117,7 @@ function defaultView(collection) {
  * layer (`documents.*` / `schema.*` commands) through {@link createCmsPersister}.
  * Failed/denied commands surface as {@link CmsStore.persistError}.
  */
-export function CmsProvider({ children, projectId, initialCollections, initialDocuments, initialPublishedKeys, initialLocaleConfig, }) {
+export function CmsProvider({ children, projectId, initialCollections, initialDocuments, initialPublishedKeys, initialTimestamps, initialLocaleConfig, }) {
     const [documents, setDocuments] = useState(() => {
         const seeded = (initialDocuments ?? sampleDocuments).map((d) => structuredClone(d));
         // EC-320 (0.0.44 follow-up): merge any documents STAGED by the
@@ -121,6 +139,33 @@ export function CmsProvider({ children, projectId, initialCollections, initialDo
             return new Set(initialPublishedKeys);
         return new Set(initialDocuments ? [] : samplePublishedKeys);
     });
+    // EC-445: per-document last-write timestamps behind the `$updatedAt` column.
+    // Seeded from hydration (connected: the persisted `cmsDocuments.updatedAt`), then
+    // re-stamped on the common edit paths. A seeded document with no hydrated timestamp
+    // (the playground fixtures / a kit) gets a session-start stamp so the column is
+    // never a wall of blanks; a fresh draft is stamped when it is created.
+    const [updatedAtByKey, setUpdatedAtByKey] = useState(() => {
+        const now = new Date().toISOString();
+        const map = new Map();
+        if (initialTimestamps) {
+            for (const [key, value] of Object.entries(initialTimestamps))
+                map.set(key, value);
+        }
+        for (const doc of initialDocuments ?? sampleDocuments) {
+            const key = documentKey(doc);
+            if (!map.has(key))
+                map.set(key, now);
+        }
+        return map;
+    });
+    const stampUpdatedAt = useCallback((ref, iso = new Date().toISOString()) => {
+        setUpdatedAtByKey((prev) => {
+            const next = new Map(prev);
+            next.set(documentKey(ref), iso);
+            return next;
+        });
+    }, []);
+    const documentUpdatedAt = useCallback((ref) => updatedAtByKey.get(documentKey(ref)), [updatedAtByKey]);
     const [activeViews, setActiveViews] = useState({});
     // The live table state per collection where it diverges from the active
     // view; absent key = exactly the active view's state (not dirty).
@@ -211,8 +256,9 @@ export function CmsProvider({ children, projectId, initialCollections, initialDo
         // Replace-or-append (upsert): a brand-new document must still land even
         // though nothing in the session matches its ref yet.
         setDocuments((prev) => upsertDoc(prev, doc));
+        stampUpdatedAt(doc); // EC-445: a save bumps the $updatedAt column
         persisterRef.current?.upsertDocument(doc);
-    }, []);
+    }, [stampUpdatedAt]);
     const commitFieldEdit = useCallback((input) => {
         // Pure map-replace: an edit always targets a document already open in
         // the session, so a miss (already gone) is a no-op, never an append.
@@ -222,7 +268,12 @@ export function CmsProvider({ children, projectId, initialCollections, initialDo
             registry,
             documents: documentsRef.current,
             localeConfig,
-            applySession: replaceWith,
+            // EC-445: the optimistic apply bumps the $updatedAt column (a rollback
+            // leaves it — it self-corrects on the next hydration).
+            applySession: (doc) => {
+                replaceWith(doc);
+                stampUpdatedAt(doc);
+            },
             rollbackSession: replaceWith,
             ...(persister && projectId !== undefined
                 ? {
@@ -236,7 +287,7 @@ export function CmsProvider({ children, projectId, initialCollections, initialDo
                 }
                 : {}),
         }, input);
-    }, [registry, localeConfig, projectId]);
+    }, [registry, localeConfig, projectId, stampUpdatedAt]);
     // Shared insert sequence (EC-326): existingIds/mint/seedDefaults (via
     // `buildNewDocument`) + optimistic append + persist, consumed by both
     // `createDocument` (always inserts) and `ensureSingletonDocument`'s empty
@@ -248,9 +299,10 @@ export function CmsProvider({ children, projectId, initialCollections, initialDo
     const insertNewDocument = useCallback((collectionId, options) => {
         const doc = buildNewDocument(collectionId, registry, seq, documentsRef.current);
         setDocuments((prev) => options?.guardExisting && hasDocumentFor(prev, collectionId) ? prev : [...prev, doc]);
+        stampUpdatedAt(doc); // EC-445: a fresh draft's $updatedAt starts at creation time
         persisterRef.current?.upsertDocument(doc);
         return doc;
-    }, [registry]);
+    }, [registry, stampUpdatedAt]);
     const createDocument = useCallback((collectionId) => {
         const doc = insertNewDocument(collectionId);
         return { collection: collectionId, id: doc.id };
@@ -321,9 +373,14 @@ export function CmsProvider({ children, projectId, initialCollections, initialDo
             return;
         const { operations } = await getStudioOperations();
         const record = await operations.documents.get({ projectId, ref });
-        if (record.ok)
+        if (record.ok) {
             setPublished(ref, record.value.publishedVersion !== undefined);
-    }, [projectId, setPublished]);
+            // EC-445: publish/unpublish patches `updatedAt` — adopt the authoritative
+            // value so the $updatedAt column reflects the actual write, not a guess.
+            if (record.value.updatedAt)
+                stampUpdatedAt(ref, record.value.updatedAt);
+        }
+    }, [projectId, setPublished, stampUpdatedAt]);
     const publishDocument = useCallback(async (ref) => {
         setPublished(ref, true); // optimistic
         // EC-273: no clearing here — the draft is already free of conditionally-hidden
@@ -447,36 +504,57 @@ export function CmsProvider({ children, projectId, initialCollections, initialDo
     }, [registry, documents, localeConfig, assetExists]);
     const isFieldReadOnly = useCallback((field) => field.form?.readOnly === true, []);
     // --- Views (EC-246b: config-as-code) --------------------------------------
+    // EC-445: the reserved pseudo-columns a CMS collection's list surfaces. Every
+    // `cmsDocuments` collection has a publish lifecycle + materialized timestamps
+    // ($state + $updatedAt always apply); $url applies only where the deployment
+    // resolves a delivery route for it (mirrors the live-URL column's own guard).
+    const pseudoColumnsFor = useCallback((collectionId) => {
+        const collection = registry.get(collectionId);
+        if (!collection)
+            return [];
+        const routable = resolveDeploymentRoutes().some((route) => route.document?.collection === collectionId);
+        return pseudoColumns(collection, { publishing: true, timestamps: true, routable });
+    }, [registry]);
     const viewsOf = useCallback((collectionId) => {
-        // The built-in default plus the collection's config-declared views (EC-246b).
+        // The baseline view plus the collection's config-declared views (EC-246b/EC-444).
         // Views are PRESENTATION, read live from elytra.config.ts (AD-11) — not the
         // persisted content schema the session booted from — so they reflect code
         // immediately without a re-seed (the persisted schema is only baselined on
         // first run). The EC-169 DB saved-view store is retired: shared views are
         // code, editors keep only transient in-session tweaks + Reset.
+        //
+        // EC-444: a config view with the reserved `id: 'default'` REPLACES the
+        // synthesized "All entries" baseline verbatim (first tab); absent one, the
+        // synthesized baseline leads. `resolveCollectionViews` owns that selection.
+        const pseudo = pseudoColumnsFor(collectionId);
+        const baseline = defaultView(registry.get(collectionId), pseudo);
         const configCollection = resolveDeploymentCollections().find((c) => c.id === collectionId);
-        return [
-            defaultView(registry.get(collectionId)),
-            ...(configCollection ? configViewsFor(configCollection) : []),
-        ];
-    }, [registry]);
-    // The INITIAL active view for a collection (EC-343): a config view flagged
-    // `default: true` seeds the first-load lens; else the built-in "All" default. Only
+        if (!configCollection)
+            return [baseline];
+        return resolveCollectionViews(configCollection, baseline, pseudo);
+    }, [registry, pseudoColumnsFor]);
+    // The INITIAL active view for a collection (EC-343/EC-444): a config view flagged
+    // `initial: true` seeds the first-load lens; else the baseline — the `id: 'default'`
+    // override when present, else the synthesized "All entries" (`ALL_VIEW_ID`). Only
     // consulted before the editor has picked a view (`activeViews[id]` wins once set),
-    // so transient switching + Reset are unaffected. A duplicate `default` is warned
-    // once (never silent) and the first-declared default seeds deterministically.
+    // so transient switching + Reset are unaffected. A duplicate `initial` and any
+    // deprecated `default` flag are each warned once (never silent).
     const initialViewId = useCallback((collectionId) => {
         const configCollection = resolveDeploymentCollections().find((c) => c.id === collectionId);
         if (!configCollection)
             return ALL_VIEW_ID;
         warnDuplicateDefaultViews(configCollection);
-        return defaultConfigViewId(configCollection) ?? ALL_VIEW_ID;
+        warnDeprecatedDefaultFlag(configCollection);
+        const initial = defaultConfigViewId(configCollection);
+        if (initial)
+            return initial;
+        return hasDefaultViewOverride(configCollection) ? DEFAULT_VIEW_OVERRIDE_ID : ALL_VIEW_ID;
     }, []);
     const activeViewOf = useCallback((collectionId) => {
         const id = activeViews[collectionId] ?? initialViewId(collectionId);
         return (viewsOf(collectionId).find((view) => view.id === id) ??
-            defaultView(registry.get(collectionId)));
-    }, [activeViews, initialViewId, viewsOf, registry]);
+            defaultView(registry.get(collectionId), pseudoColumnsFor(collectionId)));
+    }, [activeViews, initialViewId, viewsOf, registry, pseudoColumnsFor]);
     const tableStateOf = useCallback((collectionId) => tableStates[collectionId] ?? activeViewOf(collectionId).state, [tableStates, activeViewOf]);
     const dropTableState = useCallback((collectionId) => {
         setTableStates((prev) => {
@@ -606,6 +684,7 @@ export function CmsProvider({ children, projectId, initialCollections, initialDo
         ensureSingletonDocument,
         deleteDocument,
         isPublished,
+        documentUpdatedAt,
         publishDocument,
         unpublishDocument,
         loadDocumentVersions,
@@ -631,8 +710,10 @@ export function CmsProvider({ children, projectId, initialCollections, initialDo
             if (collection === undefined)
                 return !viewStatesEqual(working, active);
             // Compare schema-resolved forms (EC-213): a column-order reconciliation
-            // or a stale `hidden` entry must not read as an unsaved edit.
-            return !viewStatesEqual(canonicalViewState(collection, working), canonicalViewState(collection, active));
+            // or a stale `hidden` entry must not read as an unsaved edit. EC-445: the
+            // pseudo-column universe must match so a reserved column never reads as a diff.
+            const pseudo = pseudoColumnsFor(collectionId);
+            return !viewStatesEqual(canonicalViewState(collection, working, pseudo), canonicalViewState(collection, active, pseudo));
         },
         resetTableState: dropTableState,
         runBulk,
@@ -656,6 +737,7 @@ export function CmsProvider({ children, projectId, initialCollections, initialDo
         ensureSingletonDocument,
         deleteDocument,
         isPublished,
+        documentUpdatedAt,
         publishDocument,
         unpublishDocument,
         loadDocumentVersions,
@@ -673,6 +755,7 @@ export function CmsProvider({ children, projectId, initialCollections, initialDo
         dropTableState,
         runBulk,
         registry,
+        pseudoColumnsFor,
         persistError,
     ]);
     return _jsx(CmsContext.Provider, { value: store$, children: children });