@byline/host-tanstack-start 4.19.0 → 5.1.0

package/dist/server-fns/collections/scheduled-publication.js

@@ -3,6 +3,8 @@ import { getAdminBylineClient, getAdminRequestContext } from "@byline/client/ser
 import { ERR_NOT_FOUND, ERR_VALIDATION, isSingleton } from "@byline/core";
 import { listDocumentPublishSchedules } from "@byline/core/services";
 import { bylineCore } from "../../integrations/byline-core.js";
+import { adminSessionMiddleware } from "../../integrations/session-middleware.js";
+import { withDocumentMutationErrors } from "../document-mutation-errors.js";
 import { omitScheduleExecutionState } from "./scheduled-publication-response.js";
 import { serialise } from "./utils.js";
 const TASK_NAME = 'documents.publish-scheduled';
@@ -52,44 +54,66 @@ async function scheduledPublicationRuntime() {
 }
 const getScheduledPublicationRuntime = createServerFn({
     method: 'GET'
-}).handler(async ()=>{
+}).middleware([
+    adminSessionMiddleware
+]).handler(withDocumentMutationErrors(async ()=>{
     await getAdminRequestContext();
     return scheduledPublicationRuntime();
-});
+}));
 const scheduleCollectionDocumentPublish = createServerFn({
     method: 'POST'
-}).validator((input)=>input).handler(async ({ data })=>{
+}).middleware([
+    adminSessionMiddleware
+]).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data })=>{
     assertFeatureEnabled();
     const schedule = await getAdminBylineClient().collection(data.collection).schedulePublish(data.id, {
         publishAt: data.publishAt,
+        expectedRevision: data.expectedRevision,
         expectedVersionId: data.expectedVersionId
     });
-    return serializeSchedule(schedule);
-});
+    return {
+        ...serializeSchedule(schedule),
+        revision: schedule.revision
+    };
+}));
 const confirmCollectionDocumentScheduledPublish = createServerFn({
     method: 'POST'
-}).validator((input)=>input).handler(async ({ data })=>{
+}).middleware([
+    adminSessionMiddleware
+]).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data })=>{
     assertFeatureEnabled();
     const schedule = await getAdminBylineClient().collection(data.collection).confirmScheduledPublish(data.id, {
+        expectedRevision: data.expectedRevision,
         expectedVersionId: data.expectedVersionId
     });
-    return serializeSchedule(schedule);
-});
+    return {
+        ...serializeSchedule(schedule),
+        revision: schedule.revision
+    };
+}));
 const cancelCollectionDocumentScheduledPublish = createServerFn({
     method: 'POST'
-}).validator((input)=>input).handler(async ({ data })=>{
+}).middleware([
+    adminSessionMiddleware
+]).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data })=>{
     assertFeatureEnabled();
-    const schedule = await getAdminBylineClient().collection(data.collection).cancelScheduledPublish(data.id);
-    return null == schedule ? {
-        status: 'not_found'
+    const schedule = await getAdminBylineClient().collection(data.collection).cancelScheduledPublish(data.id, {
+        expectedRevision: data.expectedRevision
+    });
+    return null == schedule.schedule ? {
+        status: 'not_found',
+        revision: schedule.revision
     } : {
         status: 'cancelled',
-        schedule: serializeSchedule(schedule)
+        schedule: serializeSchedule(schedule.schedule),
+        revision: schedule.revision
     };
-});
+}));
 const listScheduledPublications = createServerFn({
     method: 'GET'
-}).validator((input)=>input).handler(async ({ data })=>{
+}).middleware([
+    adminSessionMiddleware
+]).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data })=>{
     assertFeatureEnabled();
     if (data.states?.some((state)=>'armed' !== state && 'needs_reconfirm' !== state) === true) throw ERR_VALIDATION({
         message: 'state must be armed or needs_reconfirm'
@@ -131,15 +155,12 @@ const listScheduledPublications = createServerFn({
     }
     const schedules = await Promise.all(result.schedules.map(async (schedule)=>{
         const definition = collections.get(schedule.collectionId);
-        const documentPath = await core.db.queries.documents.getCurrentPath({
-            collection_id: schedule.collectionId,
-            document_id: schedule.documentId
-        });
         return {
             ...serializeSchedule(schedule),
             collectionPath: definition?.path ?? schedule.collectionId,
             collectionLabel: null == definition ? schedule.collectionId : isSingleton(definition) ? definition.label : definition.labels.plural,
-            documentPath,
+            documentPath: schedule.documentPath,
+            revision: schedule.revision,
             lastAuthorizedByName: null == schedule.lastAuthorizedBy ? null : authorizerNames.get(schedule.lastAuthorizedBy) ?? null
         };
     }));
@@ -153,5 +174,5 @@ const listScheduledPublications = createServerFn({
         },
         runtime: await scheduledPublicationRuntime()
     };
-});
+}));
 export { cancelCollectionDocumentScheduledPublish, confirmCollectionDocumentScheduledPublish, getScheduledPublicationRuntime, listScheduledPublications, scheduleCollectionDocumentPublish };

package/dist/server-fns/collections/set-list-view-preference.d.ts

@@ -13,6 +13,8 @@ export interface SetListViewPreferenceInput {
         desc?: boolean;
     };
 }
-export declare const setListViewPreference: import("@tanstack/react-start").RequiredFetcher<undefined, (input: SetListViewPreferenceInput) => SetListViewPreferenceInput, Promise<{
+export declare const setListViewPreference: import("@tanstack/react-start").RequiredFetcher<readonly [import("@tanstack/react-start").FunctionMiddlewareAfterServer<{}, unknown, undefined, undefined, {
+    bylineExpectedSessionId: string | null;
+}, undefined, undefined>], (input: SetListViewPreferenceInput) => SetListViewPreferenceInput, Promise<{
     ok: true;
 }>>;

package/dist/server-fns/collections/set-list-view-preference.js

@@ -4,9 +4,12 @@ import { getAdminRequestContext } from "@byline/client/server";
 import { ERR_NOT_FOUND, getLogger } from "@byline/core";
 import { ensureCollection } from "../../integrations/api-utils.js";
 import { bylineCore } from "../../integrations/byline-core.js";
+import { adminSessionMiddleware } from "../../integrations/session-middleware.js";
 const setListViewPreference = createServerFn({
     method: 'POST'
-}).validator((input)=>input).handler(async ({ data })=>{
+}).middleware([
+    adminSessionMiddleware
+]).validator((input)=>input).handler(async ({ data })=>{
     const config = await ensureCollection(data.collection);
     if (!config) throw ERR_NOT_FOUND({
         message: 'Collection not found',

package/dist/server-fns/collections/stats.js

@@ -1,9 +1,12 @@
 import { createServerFn } from "@tanstack/react-start";
 import { getAdminBylineClient } from "@byline/client/server";
 import { ensureCollection } from "../../integrations/api-utils.js";
+import { adminSessionMiddleware } from "../../integrations/session-middleware.js";
 const getCollectionStatsFn = createServerFn({
     method: 'GET'
-}).validator((input)=>input).handler(async ({ data })=>{
+}).middleware([
+    adminSessionMiddleware
+]).validator((input)=>input).handler(async ({ data })=>{
     const config = await ensureCollection(data.collection);
     if (!config) return {
         stats: []

package/dist/server-fns/collections/status.d.ts

@@ -5,26 +5,38 @@
  *
  * Copyright (c) Infonomic Company Limited
  */
-export declare const updateDocumentStatus: import("@tanstack/react-start").RequiredFetcher<undefined, (input: {
+export declare const updateDocumentStatus: import("@tanstack/react-start").RequiredFetcher<readonly [import("@tanstack/react-start").FunctionMiddlewareAfterServer<{}, unknown, undefined, undefined, {
+    bylineExpectedSessionId: string | null;
+}, undefined, undefined>], (input: {
+    expectedRevision: number;
     collection: string;
     id: string;
     status: string;
 }) => {
+    expectedRevision: number;
     collection: string;
     id: string;
     status: string;
 }, Promise<{
     status: 'ok';
+    documentId: string;
+    revision: number;
     previousStatus: string;
     newStatus: string;
 }>>;
-export declare const unpublishDocument: import("@tanstack/react-start").RequiredFetcher<undefined, (input: {
+export declare const unpublishDocument: import("@tanstack/react-start").RequiredFetcher<readonly [import("@tanstack/react-start").FunctionMiddlewareAfterServer<{}, unknown, undefined, undefined, {
+    bylineExpectedSessionId: string | null;
+}, undefined, undefined>], (input: {
+    expectedRevision: number;
     collection: string;
     id: string;
 }) => {
+    expectedRevision: number;
     collection: string;
     id: string;
 }, Promise<{
     status: 'ok';
+    documentId: string;
+    revision: number;
     archivedCount: number;
 }>>;

package/dist/server-fns/collections/status.js

@@ -3,9 +3,13 @@ import { getAdminRequestContext } from "@byline/client/server";
 import { ERR_NOT_FOUND, getLogger, getServerConfig } from "@byline/core";
 import { changeDocumentStatus, unpublishDocument } from "@byline/core/services";
 import { ensureCollection } from "../../integrations/api-utils.js";
+import { adminSessionMiddleware } from "../../integrations/session-middleware.js";
+import { withDocumentMutationErrors } from "../document-mutation-errors.js";
 const updateDocumentStatus = createServerFn({
     method: 'POST'
-}).validator((input)=>input).handler(async ({ data: input })=>{
+}).middleware([
+    adminSessionMiddleware
+]).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data: input })=>{
     const { collection: path, id, status: nextStatus } = input;
     const logger = getLogger();
     const config = await ensureCollection(path);
@@ -29,17 +33,22 @@ const updateDocumentStatus = createServerFn({
     };
     const result = await changeDocumentStatus(ctx, {
         documentId: id,
+        expectedRevision: input.expectedRevision,
         nextStatus
     });
     return {
         status: 'ok',
+        documentId: result.documentId,
+        revision: result.revision,
         previousStatus: result.previousStatus,
         newStatus: result.newStatus
     };
-});
+}));
 const status_unpublishDocument = createServerFn({
     method: 'POST'
-}).validator((input)=>input).handler(async ({ data: input })=>{
+}).middleware([
+    adminSessionMiddleware
+]).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data: input })=>{
     const { collection: path, id } = input;
     const logger = getLogger();
     const config = await ensureCollection(path);
@@ -62,18 +71,22 @@ const status_unpublishDocument = createServerFn({
         requestContext: await getAdminRequestContext()
     };
     const result = await unpublishDocument(ctx, {
-        documentId: id
+        documentId: id,
+        expectedRevision: input.expectedRevision
     });
     if (0 === result.archivedCount) throw ERR_NOT_FOUND({
         message: 'No published version found for this document',
         details: {
             documentId: id,
+            expectedRevision: input.expectedRevision,
             collectionPath: path
         }
     }).log(logger);
     return {
         status: 'ok',
+        documentId: result.documentId,
+        revision: result.revision,
         archivedCount: result.archivedCount
     };
-});
+}));
 export { status_unpublishDocument as unpublishDocument, updateDocumentStatus };

package/dist/server-fns/collections/tree-mutation.d.ts

@@ -1,10 +1,12 @@
 import type { CollectionHandle, PlaceTreeNodeOptions, RemoveFromTreeOptions } from '@byline/client';
+import { structuralReceipt } from '../structural-receipt.js';
 /** Prefer the code; the marker survives transports that reconstruct a code-less Error. */
 export declare function isTreeMutationConflict(error: unknown): boolean;
 /** Detect when tree/audit committed even if transport reconstruction dropped the code. */
 export declare function isCommittedTreeHookFailure(error: unknown): boolean;
 export type AdminTreeMoveOutcome = {
     status: 'ok';
+    receipt?: ReturnType<typeof structuralReceipt>;
 } | {
     status: 'suppressed';
 } | {
@@ -18,6 +20,7 @@ export type AdminTreeMoveOutcome = {
 } | {
     status: 'refresh-failed';
     error: unknown;
+    receipt?: ReturnType<typeof structuralReceipt>;
 };
 export interface AdminTreeMoveUiEffects {
     rollback: boolean;
@@ -38,9 +41,7 @@ export interface AdminTreeMoveController {
 }
 /** Single-flight controller shared by pointer and keyboard tree moves. */
 export declare function createAdminTreeMoveController(): AdminTreeMoveController;
-/** Admin retries reconcile post-commit tree hooks unless explicitly disabled. */
-export declare function placeAdminTreeNode(handle: Pick<CollectionHandle, 'placeTreeNode'>, documentId: string, options: PlaceTreeNodeOptions): Promise<{
-    orderKey: string;
-}>;
-/** Admin retries reconcile post-commit tree hooks unless explicitly disabled. */
-export declare function removeAdminTreeNode(handle: Pick<CollectionHandle, 'removeFromTree'>, documentId: string, options?: RemoveFromTreeOptions): Promise<void>;
+/** Request reconciliation for explicit caller actions; never retry or replace their revision. */
+export declare function placeAdminTreeNode(handle: Pick<CollectionHandle, 'placeTreeNode'>, documentId: string, options: PlaceTreeNodeOptions): ReturnType<CollectionHandle['placeTreeNode']>;
+/** Request reconciliation for explicit caller actions; never retry or replace their revision. */
+export declare function removeAdminTreeNode(handle: Pick<CollectionHandle, 'removeFromTree'>, documentId: string, options: RemoveFromTreeOptions): ReturnType<CollectionHandle['removeFromTree']>;

package/dist/server-fns/collections/tree-mutation.js

@@ -1,4 +1,5 @@
-import { ErrorCodes, TREE_HOOK_COMMITTED_MARKER, TREE_PLACEMENT_STALE_MARKER } from "@byline/core";
+import { ErrorCodes, TREE_HOOK_COMMITTED_MARKER, TREE_PLACEMENT_STALE_MARKER, getDocumentRevisionValidationDetails, getDocumentStaleDetails, getLockConflictDetails } from "@byline/core";
+import { structuralReceipt } from "../structural-receipt.js";
 function hasErrorCode(error, code) {
     return 'object' == typeof error && null != error && 'code' in error && error.code === code;
 }
@@ -47,9 +48,14 @@ function shouldSyncAdminTreeRows(rows, preservedRows, isMoving) {
     return !isMoving && rows !== preservedRows;
 }
 async function executeAdminTreeMove(mutate, refresh) {
+    let receipt;
     try {
-        await mutate();
+        receipt = structuralReceipt(await mutate());
     } catch (error) {
+        if (getDocumentStaleDetails(error) || getDocumentRevisionValidationDetails(error) || getLockConflictDetails(error) || hasErrorCode(error, ErrorCodes.NOT_FOUND)) return {
+            status: 'mutation-failed',
+            error
+        };
         const status = isCommittedTreeHookFailure(error) ? 'committed-hook-failed' : 'mutation-failed';
         try {
             await refresh();
@@ -68,12 +74,18 @@ async function executeAdminTreeMove(mutate, refresh) {
     try {
         await refresh();
         return {
-            status: 'ok'
+            status: 'ok',
+            ...receipt ? {
+                receipt
+            } : {}
         };
     } catch (error) {
         return {
             status: 'refresh-failed',
-            error
+            error,
+            ...receipt ? {
+                receipt
+            } : {}
         };
     }
 }
@@ -100,7 +112,7 @@ function placeAdminTreeNode(handle, documentId, options) {
         reconcile: options.reconcile ?? true
     });
 }
-function removeAdminTreeNode(handle, documentId, options = {}) {
+function removeAdminTreeNode(handle, documentId, options) {
     return handle.removeFromTree(documentId, {
         ...options,
         reconcile: options.reconcile ?? true

package/dist/server-fns/collections/tree.d.ts

@@ -5,7 +5,10 @@
  *
  * Copyright (c) Infonomic Company Limited
  */
-export declare const placeTreeNode: import("@tanstack/react-start").RequiredFetcher<undefined, (input: {
+export declare const placeTreeNode: import("@tanstack/react-start").RequiredFetcher<readonly [import("@tanstack/react-start").FunctionMiddlewareAfterServer<{}, unknown, undefined, undefined, {
+    bylineExpectedSessionId: string | null;
+}, undefined, undefined>], (input: {
+    expectedRevision: number;
     collection: string;
     documentId: string;
     parentDocumentId: string | null;
@@ -13,6 +16,7 @@ export declare const placeTreeNode: import("@tanstack/react-start").RequiredFetc
     afterDocumentId?: string | null;
     reconcile?: boolean;
 }) => {
+    expectedRevision: number;
     collection: string;
     documentId: string;
     parentDocumentId: string | null;
@@ -20,21 +24,35 @@ export declare const placeTreeNode: import("@tanstack/react-start").RequiredFetc
     afterDocumentId?: string | null;
     reconcile?: boolean;
 }, Promise<{
-    status: 'ok';
+    documentId: string;
+    revision: number;
+    affectedDocuments: import("@byline/core").DocumentRevisionReceipt[];
+    scheduledPublicationsNeedReconfirmation: boolean;
     orderKey: string;
+    status: 'ok';
 }>>;
-export declare const removeFromTree: import("@tanstack/react-start").RequiredFetcher<undefined, (input: {
+export declare const removeFromTree: import("@tanstack/react-start").RequiredFetcher<readonly [import("@tanstack/react-start").FunctionMiddlewareAfterServer<{}, unknown, undefined, undefined, {
+    bylineExpectedSessionId: string | null;
+}, undefined, undefined>], (input: {
+    expectedRevision: number;
     collection: string;
     documentId: string;
     reconcile?: boolean;
 }) => {
+    expectedRevision: number;
     collection: string;
     documentId: string;
     reconcile?: boolean;
 }, Promise<{
+    documentId: string;
+    revision: number;
+    affectedDocuments: import("@byline/core").DocumentRevisionReceipt[];
+    scheduledPublicationsNeedReconfirmation: boolean;
     status: 'ok';
 }>>;
-export declare const getTreeAncestors: import("@tanstack/react-start").RequiredFetcher<undefined, (input: {
+export declare const getTreeAncestors: import("@tanstack/react-start").RequiredFetcher<readonly [import("@tanstack/react-start").FunctionMiddlewareAfterServer<{}, unknown, undefined, undefined, {
+    bylineExpectedSessionId: string | null;
+}, undefined, undefined>], (input: {
     collection: string;
     documentId: string;
 }) => {
@@ -45,7 +63,9 @@ export declare const getTreeAncestors: import("@tanstack/react-start").RequiredF
     title: string;
     path: string;
 }[]>>;
-export declare const getTreeParent: import("@tanstack/react-start").RequiredFetcher<undefined, (input: {
+export declare const getTreeParent: import("@tanstack/react-start").RequiredFetcher<readonly [import("@tanstack/react-start").FunctionMiddlewareAfterServer<{}, unknown, undefined, undefined, {
+    bylineExpectedSessionId: string | null;
+}, undefined, undefined>], (input: {
     collection: string;
     documentId: string;
 }) => {
@@ -53,6 +73,7 @@ export declare const getTreeParent: import("@tanstack/react-start").RequiredFetc
     documentId: string;
 }, Promise<import("@byline/client").TreeParentResult>>;
 export interface CollectionTreeRow {
+    revision: number;
     id: string;
     /** Parent document id, or `null` for a root or unplaced node. Drives the
      * client-side tree reconstruction for drag-to-reorder / re-parent. */
@@ -65,7 +86,9 @@ export interface CollectionTreeRow {
     updatedAt: Date;
     fields: Record<string, any>;
 }
-export declare const getCollectionTree: import("@tanstack/react-start").RequiredFetcher<undefined, (input: {
+export declare const getCollectionTree: import("@tanstack/react-start").RequiredFetcher<readonly [import("@tanstack/react-start").FunctionMiddlewareAfterServer<{}, unknown, undefined, undefined, {
+    bylineExpectedSessionId: string | null;
+}, undefined, undefined>], (input: {
     collection: string;
     locale?: string;
 }) => {

package/dist/server-fns/collections/tree.js

@@ -2,11 +2,15 @@ import { createServerFn } from "@tanstack/react-start";
 import { getAdminBylineClient } from "@byline/client/server";
 import { ERR_NOT_FOUND, createReadContext, getLogger } from "@byline/core";
 import { ensureCollection } from "../../integrations/api-utils.js";
+import { adminSessionMiddleware } from "../../integrations/session-middleware.js";
+import { withDocumentMutationErrors } from "../document-mutation-errors.js";
 import { placeAdminTreeNode, removeAdminTreeNode } from "./tree-mutation.js";
-import { getAdminTreeParent, getAdminUnplacedTreeDocuments } from "./tree-read.js";
+import { getAdminTreeParent } from "./tree-read.js";
 const placeTreeNode = createServerFn({
     method: 'POST'
-}).validator((input)=>input).handler(async ({ data })=>{
+}).middleware([
+    adminSessionMiddleware
+]).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data })=>{
     const { collection: path, documentId } = data;
     const config = await ensureCollection(path);
     if (!config) throw ERR_NOT_FOUND({
@@ -17,6 +21,7 @@ const placeTreeNode = createServerFn({
     }).log(getLogger());
     const handle = getAdminBylineClient().collection(path);
     const result = await placeAdminTreeNode(handle, documentId, {
+        expectedRevision: data.expectedRevision,
         parentDocumentId: data.parentDocumentId,
         beforeDocumentId: data.beforeDocumentId ?? null,
         afterDocumentId: data.afterDocumentId ?? null,
@@ -24,12 +29,14 @@ const placeTreeNode = createServerFn({
     });
     return {
         status: 'ok',
-        orderKey: result.orderKey
+        ...result
     };
-});
+}));
 const removeFromTree = createServerFn({
     method: 'POST'
-}).validator((input)=>input).handler(async ({ data })=>{
+}).middleware([
+    adminSessionMiddleware
+]).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data })=>{
     const { collection: path, documentId } = data;
     const config = await ensureCollection(path);
     if (!config) throw ERR_NOT_FOUND({
@@ -38,16 +45,20 @@ const removeFromTree = createServerFn({
             collectionPath: path
         }
     }).log(getLogger());
-    await removeAdminTreeNode(getAdminBylineClient().collection(path), documentId, {
+    const result = await removeAdminTreeNode(getAdminBylineClient().collection(path), documentId, {
+        expectedRevision: data.expectedRevision,
         reconcile: data.reconcile
     });
     return {
-        status: 'ok'
+        status: 'ok',
+        ...result
     };
-});
+}));
 const getTreeAncestors = createServerFn({
     method: 'GET'
-}).validator((input)=>input).handler(async ({ data })=>{
+}).middleware([
+    adminSessionMiddleware
+]).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data })=>{
     const { collection: path, documentId } = data;
     const config = await ensureCollection(path);
     if (!config) throw ERR_NOT_FOUND({
@@ -69,10 +80,12 @@ const getTreeAncestors = createServerFn({
             path: doc.path
         };
     });
-});
+}));
 const getTreeParent = createServerFn({
     method: 'GET'
-}).validator((input)=>input).handler(async ({ data })=>{
+}).middleware([
+    adminSessionMiddleware
+]).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data })=>{
     const { collection: path, documentId } = data;
     const config = await ensureCollection(path);
     if (!config) throw ERR_NOT_FOUND({
@@ -82,10 +95,12 @@ const getTreeParent = createServerFn({
         }
     }).log(getLogger());
     return getAdminTreeParent(getAdminBylineClient().collection(path), documentId);
-});
+}));
 const getCollectionTree = createServerFn({
     method: 'GET'
-}).validator((input)=>input).handler(async ({ data })=>{
+}).middleware([
+    adminSessionMiddleware
+]).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data })=>{
     const { collection: path } = data;
     const config = await ensureCollection(path);
     if (!config) throw ERR_NOT_FOUND({
@@ -96,8 +111,7 @@ const getCollectionTree = createServerFn({
     }).log(getLogger());
     const handle = getAdminBylineClient().collection(path);
     const readContext = createReadContext();
-    const forest = await handle.getSubtree({
-        status: 'any',
+    const { forest, unplaced } = await handle.getTreeForEdit({
         locale: data.locale,
         _readContext: readContext
     });
@@ -108,6 +122,7 @@ const getCollectionTree = createServerFn({
             const doc = node.document;
             rows.push({
                 id: doc.id,
+                revision: doc.revision,
                 parentId,
                 depth,
                 unplaced: false,
@@ -122,9 +137,9 @@ const getCollectionTree = createServerFn({
         }
     };
     walk(forest, 0, null);
-    const unplaced = await getAdminUnplacedTreeDocuments(handle, placed, readContext, data.locale);
     for (const doc of unplaced)rows.push({
         id: doc.id,
+        revision: doc.revision,
         parentId: null,
         depth: 0,
         unplaced: true,
@@ -143,5 +158,5 @@ const getCollectionTree = createServerFn({
             }
         }
     };
-});
+}));
 export { getCollectionTree, getTreeAncestors, getTreeParent, placeTreeNode, removeFromTree };

package/dist/server-fns/collections/update.d.ts

@@ -6,26 +6,36 @@
  * Copyright (c) Infonomic Company Limited
  */
 import type { DocumentPatch } from '@byline/core/patches';
-export declare const updateCollectionDocumentWithPatches: import("@tanstack/react-start").RequiredFetcher<undefined, (input: {
+export declare const updateCollectionDocumentWithPatches: import("@tanstack/react-start").RequiredFetcher<readonly [import("@tanstack/react-start").FunctionMiddlewareAfterServer<{}, unknown, undefined, undefined, {
+    bylineExpectedSessionId: string | null;
+}, undefined, undefined>], (input: {
     collection: string;
     id: string;
     patches: DocumentPatch[];
-    versionId?: string;
+    expectedRevision: number;
+    path?: string | null;
+    availableLocales?: string[];
     locale?: string;
 }) => {
     collection: string;
     id: string;
     patches: DocumentPatch[];
-    versionId?: string;
+    expectedRevision: number;
+    path?: string | null;
+    availableLocales?: string[];
     locale?: string;
 }, Promise<import("./save-outcome.js").CollectionDocumentCommittedHookFailureResponse | {
     status: 'ok';
     documentId: string;
-    documentVersionId: string;
+    documentVersionId?: string | undefined;
+    revision: number;
 }>>;
-export declare const updateCollectionDocumentSystemFields: import("@tanstack/react-start").RequiredFetcher<undefined, (input: {
+export declare const updateCollectionDocumentSystemFields: import("@tanstack/react-start").RequiredFetcher<readonly [import("@tanstack/react-start").FunctionMiddlewareAfterServer<{}, unknown, undefined, undefined, {
+    bylineExpectedSessionId: string | null;
+}, undefined, undefined>], (input: {
     collection: string;
     id: string;
+    expectedRevision: number;
     locale?: string;
     /** Path override; `null`/omitted means no path write. */
     path?: string | null;
@@ -34,11 +44,13 @@ export declare const updateCollectionDocumentSystemFields: import("@tanstack/rea
 }) => {
     collection: string;
     id: string;
+    expectedRevision: number;
     locale?: string;
     /** Path override; `null`/omitted means no path write. */
     path?: string | null;
     /** Editorial advertised-locale set; omitted means no advertised-locale write. */
     availableLocales?: string[];
-}, Promise<{
+}, Promise<import("./save-outcome.js").CollectionDocumentCommittedHookFailureResponse | {
     status: 'ok';
+    revision: number;
 }>>;