@byline/host-tanstack-start 4.19.0 → 5.0.0

package/dist/admin-shell/singletons/view.js

@@ -2,7 +2,7 @@
 import { jsx } from "react/jsx-runtime";
 import { useRouter } from "@tanstack/react-router";
 import { FormRenderer } from "@byline/admin/react";
-import { ErrorCodes, getDefaultStatus, getWorkflow, getWorkflowStatuses, validateStatusTransition } from "@byline/core";
+import { getDefaultStatus, getWorkflow, getWorkflowStatuses, validateStatusTransition } from "@byline/core";
 import { useTranslation } from "@byline/i18n/react";
 import { Container, Section, useToastManager } from "@byline/ui/react";
 import { getAdminRoutePath } from "../../routes/admin-path.js";
@@ -10,11 +10,11 @@ import { hasCommittedDocumentHookFailure } from "../../server-fns/collections/in
 import { cancelSingletonScheduledPublish, changeSingletonStatus, confirmSingletonScheduledPublish, copySingletonToLocale, scheduleSingletonPublish, unpublishSingleton, updateSingleton } from "../../server-fns/singletons/index.js";
 import { useNavigate } from "../chrome/loose-router.js";
 import { useTanStackNavigationGuard } from "../collections/tanstack-navigation-guard.js";
+import { useDocumentMutationState } from "../document-mutation-state.js";
 import { SingletonViewMenu } from "./view-menu.js";
-function errorCode(error) {
-    return 'string' == typeof error?.code ? error.code : null;
-}
-function SingletonView({ singletonDefinition, adminConfig, document, initialData, locale, contentLocales, defaultContentLocale }) {
+function SingletonView({ singletonDefinition, adminConfig, document: loadedDocument, initialData, locale, contentLocales, defaultContentLocale }) {
+    const mutation = useDocumentMutationState(loadedDocument);
+    const document = mutation.document ?? null;
     const router = useRouter();
     const navigate = useNavigate();
     const toastManager = useToastManager();
@@ -55,14 +55,20 @@ function SingletonView({ singletonDefinition, adminConfig, document, initialData
     };
     const handleSubmit = async ({ data })=>{
         try {
+            mutation.assertWritable();
             const result = await updateSingleton({
                 data: {
                     singleton: path,
                     data,
                     locale: locale ?? defaultContentLocale,
-                    expectedVersionId: document?.versionId
+                    ...null == document ? {
+                        expectedState: 'empty'
+                    } : {
+                        expectedRevision: mutation.expectedRevision()
+                    }
                 }
             });
+            mutation.adopt(result);
             if (null != document) notifyScheduleSuspended();
             if (hasCommittedDocumentHookFailure(result)) notifyCommittedHookFailure();
             else toast(t('singletons.edit.updateTitle', {
@@ -72,8 +78,14 @@ function SingletonView({ singletonDefinition, adminConfig, document, initialData
             }), 'success');
             await reload();
         } catch (err) {
-            const code = errorCode(err);
-            const description = code === ErrorCodes.CONFLICT ? t("singletons.edit.conflictDescription") : code === ErrorCodes.NOT_FOUND ? t("singletons.edit.notConfiguredDescription") : t("singletons.edit.updateFailedDescription", {
+            const handled = mutation.report(err);
+            if ('blocked' === handled) throw err;
+            if ('committed' === handled) {
+                notifyCommittedHookFailure();
+                await reload();
+                return;
+            }
+            const description = t("singletons.edit.updateFailedDescription", {
                 label: label.toLowerCase()
             });
             toast(t('singletons.edit.updateTitle', {
@@ -84,12 +96,15 @@ function SingletonView({ singletonDefinition, adminConfig, document, initialData
     };
     const handleStatusChange = async (status)=>{
         try {
-            await changeSingletonStatus({
+            mutation.assertWritable();
+            const result = await changeSingletonStatus({
                 data: {
+                    expectedRevision: mutation.expectedRevision(),
                     singleton: path,
                     status
                 }
             });
+            mutation.adopt(result);
             toast(t('collections.edit.statusUpdateTitle', {
                 label
             }), t("collections.edit.statusChangedDescription", {
@@ -97,44 +112,64 @@ function SingletonView({ singletonDefinition, adminConfig, document, initialData
             }), 'success');
             await reload();
         } catch (err) {
+            const handled = mutation.report(err);
+            if ('blocked' === handled) throw err;
+            if ('committed' === handled) {
+                notifyCommittedHookFailure();
+                await reload();
+                return;
+            }
             toast(t('collections.edit.statusUpdateTitle', {
                 label
             }), t("collections.edit.statusChangeFailedDescription", {
-                message: err.message
+                message: t('documentConcurrency.failed')
             }), 'danger');
             throw err;
         }
     };
     const handleUnpublish = async ()=>{
         try {
-            await unpublishSingleton({
+            mutation.assertWritable();
+            const result = await unpublishSingleton({
                 data: {
+                    expectedRevision: mutation.expectedRevision(),
                     singleton: path
                 }
             });
+            mutation.adopt(result);
             toast(t('collections.edit.unpublishTitle', {
                 label
             }), t("collections.edit.unpublishedDescription"), 'success');
             await reload();
         } catch (err) {
+            const handled = mutation.report(err);
+            if ('blocked' === handled) throw err;
+            if ('committed' === handled) {
+                notifyCommittedHookFailure();
+                await reload();
+                return;
+            }
             toast(t('collections.edit.unpublishTitle', {
                 label
             }), t("collections.edit.unpublishFailedDescription", {
-                message: err.message
+                message: t('documentConcurrency.failed')
             }), 'danger');
             throw err;
         }
     };
     const handleCopyToLocale = async ({ targetLocale, overwrite })=>{
         try {
+            mutation.assertWritable();
             const result = await copySingletonToLocale({
                 data: {
+                    expectedRevision: mutation.expectedRevision(),
                     singleton: path,
                     sourceLocale: locale ?? defaultContentLocale,
                     targetLocale,
                     overwrite
                 }
             });
+            mutation.adopt(result);
             const sourceLocale = locale ?? defaultContentLocale;
             const sourceLabel = contentLocales.find((entry)=>entry.code === sourceLocale)?.label ?? sourceLocale;
             const targetLabel = contentLocales.find((entry)=>entry.code === targetLocale)?.label ?? targetLocale;
@@ -156,62 +191,106 @@ function SingletonView({ singletonDefinition, adminConfig, document, initialData
                 }
             });
         } catch (err) {
+            const handled = mutation.report(err);
+            if ('blocked' === handled) throw err;
+            if ('committed' === handled) {
+                notifyCommittedHookFailure();
+                await reload();
+                return;
+            }
             toast(t('collections.edit.copyToLocaleTitle', {
                 label
             }), t("collections.edit.copyFailedDescription", {
-                message: err.message
+                message: t('documentConcurrency.failed')
             }), 'danger');
             throw err;
         }
     };
     const handleSchedulePublication = async ({ publishAt })=>{
         try {
-            await scheduleSingletonPublish({
+            mutation.assertWritable();
+            const result = await scheduleSingletonPublish({
                 data: {
+                    expectedRevision: mutation.expectedRevision(),
                     singleton: path,
                     publishAt,
                     expectedVersionId: String(document?.versionId)
                 }
             });
+            mutation.adopt(result);
             toast(t('scheduledPublication.toast.scheduledTitle'), t("scheduledPublication.toast.scheduledDescription"), 'success');
             await reload();
         } catch (err) {
-            toast(t('scheduledPublication.toast.failedTitle'), err.message, 'danger');
+            const handled = mutation.report(err);
+            if ('blocked' === handled) throw err;
+            if ('committed' === handled) {
+                notifyCommittedHookFailure();
+                await reload();
+                return;
+            }
+            toast(t('scheduledPublication.toast.failedTitle'), t('documentConcurrency.failed'), 'danger');
             throw err;
         }
     };
     const handleConfirmScheduledPublication = async ()=>{
         try {
-            await confirmSingletonScheduledPublish({
+            mutation.assertWritable();
+            const result = await confirmSingletonScheduledPublish({
                 data: {
+                    expectedRevision: mutation.expectedRevision(),
                     singleton: path,
                     expectedVersionId: String(document?.versionId)
                 }
             });
+            mutation.adopt(result);
             toast(t('scheduledPublication.toast.confirmedTitle'), t("scheduledPublication.toast.confirmedDescription"), 'success');
             await reload();
         } catch (err) {
-            toast(t('scheduledPublication.toast.failedTitle'), err.message, 'danger');
+            const handled = mutation.report(err);
+            if ('blocked' === handled) throw err;
+            if ('committed' === handled) {
+                notifyCommittedHookFailure();
+                await reload();
+                return;
+            }
+            toast(t('scheduledPublication.toast.failedTitle'), t('documentConcurrency.failed'), 'danger');
             throw err;
         }
     };
     const handleCancelScheduledPublication = async ()=>{
         try {
-            await cancelSingletonScheduledPublish({
+            mutation.assertWritable();
+            const result = await cancelSingletonScheduledPublish({
                 data: {
+                    expectedRevision: mutation.expectedRevision(),
                     singleton: path
                 }
             });
+            mutation.adopt({
+                ...result,
+                documentId: String(document?.id)
+            });
             toast(t('scheduledPublication.toast.cancelledTitle'), t("scheduledPublication.toast.cancelledDescription"), 'success');
             await reload();
         } catch (err) {
-            toast(t('scheduledPublication.toast.failedTitle'), err.message, 'danger');
+            const handled = mutation.report(err);
+            if ('blocked' === handled) throw err;
+            if ('committed' === handled) {
+                notifyCommittedHookFailure();
+                await reload();
+                return;
+            }
+            toast(t('scheduledPublication.toast.failedTitle'), t('documentConcurrency.failed'), 'danger');
             throw err;
         }
     };
     return /*#__PURE__*/ jsx(Section, {
         children: /*#__PURE__*/ jsx(Container, {
             children: /*#__PURE__*/ jsx(FormRenderer, {
+                mutationIssue: mutation.issue,
+                mutationsBlocked: mutation.blocked,
+                observedRevision: mutation.revision,
+                onMutationError: mutation.report,
                 mode: null == document ? 'create' : 'edit',
                 fields: fields,
                 onSubmit: handleSubmit,

package/dist/integrations/byline-field-services.js

@@ -8,19 +8,12 @@ const byline_field_services_getCollectionDocuments = ({ collection, params })=>g
         }
     });
 const byline_field_services_uploadField = (collection, formData, createDocument)=>uploadField(collection, formData, createDocument);
-const byline_field_services_placeTreeNode = async (input)=>{
-    const { orderKey } = await placeTreeNode({
+const byline_field_services_placeTreeNode = async (input)=>placeTreeNode({
         data: input
     });
-    return {
-        orderKey
-    };
-};
-const byline_field_services_removeFromTree = async (input)=>{
-    await removeFromTree({
+const byline_field_services_removeFromTree = async (input)=>removeFromTree({
         data: input
     });
-};
 const byline_field_services_getTreeAncestors = (input)=>getTreeAncestors({
         data: input
     });

package/dist/routes/create-collection-edit-route.js

@@ -122,7 +122,7 @@ function createCollectionEditRoute(path) {
                         contentLocales: contentLocales,
                         defaultContentLocale: defaultContentLocale,
                         returnSearch: returnSearch
-                    })
+                    }, `${collection}/${id}/${locale}`)
                 ]
             });
         }

package/dist/routes/create-collection-list-route.d.ts

@@ -1,8 +1 @@
-/**
- * This Source Code is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) Infonomic Company Limited
- */
 export declare function createCollectionListRoute(path: string): any;

package/dist/routes/create-collection-list-route.js

@@ -1,8 +1,8 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { getCollectionAdminConfig, getWorkflowStatuses, parseDocumentRevision } from "@byline/core";
 import { useEffect, useRef } from "react";
 import { createFileRoute, notFound } from "@tanstack/react-router";
 import { applyRelationColumnFormatters } from "@byline/admin/react";
-import { getCollectionAdminConfig, getWorkflowStatuses } from "@byline/core";
 import { useTranslation } from "@byline/i18n/react";
 import { useToastManager } from "@byline/ui/react";
 import { BreadcrumbsClient } from "../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js";
@@ -124,17 +124,16 @@ function createCollectionListRoute(path) {
                         collection: collection,
                         collectionLabels: data.included.collection.labels,
                         listActions: adminConfig?.listActions,
-                        onMove: async ({ documentId, parentDocumentId, beforeDocumentId, afterDocumentId })=>{
-                            await placeTreeNode({
+                        onMove: async ({ documentId, parentDocumentId, beforeDocumentId, afterDocumentId })=>await placeTreeNode({
                                 data: {
+                                    expectedRevision: parseDocumentRevision(data.rows.find((row)=>row.id === documentId)?.revision),
                                     collection,
                                     documentId,
                                     parentDocumentId,
                                     beforeDocumentId,
                                     afterDocumentId
                                 }
-                            });
-                        }
+                            })
                     }) : CustomListView ? /*#__PURE__*/ jsx(CustomListView, {
                         data: data,
                         workflowStatuses: workflowStatuses
@@ -145,16 +144,15 @@ function createCollectionListRoute(path) {
                         useAsTitle: collectionDef.useAsTitle,
                         orderable: true === collectionDef.orderable,
                         listActions: adminConfig?.listActions,
-                        onReorder: async ({ documentId, beforeDocumentId, afterDocumentId })=>{
-                            await reorderCollectionDocument({
+                        onReorder: async ({ documentId, beforeDocumentId, afterDocumentId })=>await reorderCollectionDocument({
                                 data: {
+                                    expectedRevision: parseDocumentRevision(data.docs.find((row)=>row.id === documentId)?.revision),
                                     collection,
                                     documentId,
                                     beforeDocumentId,
                                     afterDocumentId
                                 }
-                            });
-                        }
+                            })
                     })
                 ]
             });

package/dist/routes/create-singleton-route.d.ts

@@ -20,8 +20,10 @@ export declare const getSingletonRouteDocument: import("@tanstack/react-start").
     locale?: string;
 }, Promise<{
     document: null;
+    expectedEmpty: true;
     initialData: Record<string, any>;
 } | {
+    expectedEmpty?: undefined;
     document: {
         _publishedVersion: Record<string, any> | null;
         _scheduledPublicationEnabled: boolean;

package/dist/routes/create-singleton-route.js

@@ -1,7 +1,7 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { createFileRoute, notFound } from "@tanstack/react-router";
 import { createServerFn } from "@tanstack/react-start";
-import { getAdminBylineClient, getAdminRequestContext } from "@byline/client/server";
+import { getAdminRequestContext } from "@byline/client/server";
 import { buildInitialDataFromFields, documentAbilityKey, getServerConfig, getSingletonAdminConfig } from "@byline/core";
 import { useTranslation } from "@byline/i18n/react";
 import { z } from "zod";
@@ -28,6 +28,7 @@ const getSingletonRouteDocument = createServerFn({
     });
     if (null == document) return {
         document: null,
+        expectedEmpty: true,
         initialData: serialise(await buildInitialDataFromFields(definition.fields, {
             locale: data.locale ?? getServerConfig().i18n.content.defaultLocale
         }))
@@ -54,7 +55,7 @@ const getSingletonRouteDocument = createServerFn({
     if (scheduledPublicationEnabled) {
         const actor = (await getAdminRequestContext()).actor;
         canSchedulePublication = actor?.hasAbility(documentAbilityKey(definition, 'changeStatus')) === true && actor.hasAbility(documentAbilityKey(definition, 'publish'));
-        if (canSchedulePublication) scheduledPublish = await getAdminBylineClient().singleton(data.singleton).getScheduledPublish();
+        if (canSchedulePublication) scheduledPublish = document.scheduledPublication;
     }
     const serializedSchedule = null == scheduledPublish ? null : serialise(scheduledPublish);
     return {
@@ -120,7 +121,7 @@ function createSingletonRoute(path) {
                         locale: locale,
                         contentLocales: contentLocales,
                         defaultContentLocale: defaultContentLocale
-                    })
+                    }, `${singleton}/${locale}`)
                 ]
             });
         }

package/dist/server-fns/collections/copy-to-locale.d.ts

@@ -1,10 +1,3 @@
-/**
- * This Source Code is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) Infonomic Company Limited
- */
 import type { CopyToLocaleResult } from '@byline/core/services';
 import { type CollectionDocumentCommittedHookFailureResponse } from './save-outcome.js';
 /**
@@ -17,12 +10,14 @@ import { type CollectionDocumentCommittedHookFailureResponse } from './save-outc
  * failures propagate to TanStack Start's transport layer.
  */
 export declare const copyDocumentToLocale: import("@tanstack/react-start").RequiredFetcher<undefined, (input: {
+    expectedRevision: number;
     collection: string;
     id: string;
     sourceLocale: string;
     targetLocale: string;
     overwrite: boolean;
 }) => {
+    expectedRevision: number;
     collection: string;
     id: string;
     sourceLocale: string;

package/dist/server-fns/collections/copy-to-locale.js

@@ -1,3 +1,4 @@
+import { withDocumentMutationErrors } from "../document-mutation-errors.js";
 import { createServerFn } from "@tanstack/react-start";
 import { getAdminRequestContext } from "@byline/client/server";
 import { ERR_NOT_FOUND, getLogger, getServerConfig } from "@byline/core";
@@ -6,7 +7,7 @@ import { ensureCollection } from "../../integrations/api-utils.js";
 import { toCommittedDocumentHookFailureResponse } from "./save-outcome.js";
 const copyDocumentToLocale = createServerFn({
     method: 'POST'
-}).validator((input)=>input).handler(async ({ data: input })=>{
+}).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data: input })=>{
     const { collection: path, id, sourceLocale, targetLocale, overwrite } = input;
     const logger = getLogger();
     const config = await ensureCollection(path);
@@ -31,6 +32,7 @@ const copyDocumentToLocale = createServerFn({
     try {
         return await copyToLocale(ctx, {
             documentId: id,
+            expectedRevision: input.expectedRevision,
             sourceLocale,
             targetLocale,
             overwrite
@@ -40,5 +42,5 @@ const copyDocumentToLocale = createServerFn({
         if (null != committedFailure) return committedFailure;
         throw error;
     }
-});
+}));
 export { copyDocumentToLocale };

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

@@ -1,10 +1,3 @@
-/**
- * This Source Code is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) Infonomic Company Limited
- */
 export declare const createCollectionDocument: import("@tanstack/react-start").RequiredFetcher<undefined, (input: {
     collection: string;
     data: any;
@@ -21,4 +14,5 @@ export declare const createCollectionDocument: import("@tanstack/react-start").R
     status: 'ok';
     documentId: string;
     documentVersionId: string;
+    revision: number;
 }>>;

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

@@ -1,3 +1,4 @@
+import { withDocumentMutationErrors } from "../document-mutation-errors.js";
 import { createServerFn } from "@tanstack/react-start";
 import { getAdminRequestContext } from "@byline/client/server";
 import { ERR_NOT_FOUND, getLogger, getServerConfig } from "@byline/core";
@@ -6,7 +7,7 @@ import { ensureCollection } from "../../integrations/api-utils.js";
 import { toCommittedDocumentHookFailureResponse } from "./save-outcome.js";
 const createCollectionDocument = createServerFn({
     method: 'POST'
-}).validator((input)=>input).handler(async ({ data: input })=>{
+}).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data: input })=>{
     const { collection: path, data: documentData, locale, path: explicitPath, availableLocales } = input;
     const logger = getLogger();
     const config = await ensureCollection(path);
@@ -45,7 +46,8 @@ const createCollectionDocument = createServerFn({
     return {
         status: 'ok',
         documentId: result.documentId,
-        documentVersionId: result.documentVersionId
+        documentVersionId: result.documentVersionId,
+        revision: result.revision
     };
-});
+}));
 export { createCollectionDocument };

package/dist/server-fns/collections/delete-locale.d.ts

@@ -1,10 +1,3 @@
-/**
- * This Source Code is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) Infonomic Company Limited
- */
 import type { DeleteLocaleResult } from '@byline/core/services';
 import { type CollectionDocumentCommittedHookFailureResponse } from './save-outcome.js';
 /**
@@ -18,10 +11,12 @@ import { type CollectionDocumentCommittedHookFailureResponse } from './save-outc
  * transport layer.
  */
 export declare const deleteDocumentLocale: import("@tanstack/react-start").RequiredFetcher<undefined, (input: {
+    expectedRevision: number;
     collection: string;
     id: string;
     locale: string;
 }) => {
+    expectedRevision: number;
     collection: string;
     id: string;
     locale: string;

package/dist/server-fns/collections/delete-locale.js

@@ -1,3 +1,4 @@
+import { withDocumentMutationErrors } from "../document-mutation-errors.js";
 import { createServerFn } from "@tanstack/react-start";
 import { getAdminRequestContext } from "@byline/client/server";
 import { ERR_NOT_FOUND, getLogger, getServerConfig } from "@byline/core";
@@ -6,7 +7,7 @@ import { ensureCollection } from "../../integrations/api-utils.js";
 import { toCommittedDocumentHookFailureResponse } from "./save-outcome.js";
 const deleteDocumentLocale = createServerFn({
     method: 'POST'
-}).validator((input)=>input).handler(async ({ data: input })=>{
+}).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data: input })=>{
     const { collection: path, id, locale } = input;
     const logger = getLogger();
     const config = await ensureCollection(path);
@@ -31,6 +32,7 @@ const deleteDocumentLocale = createServerFn({
     try {
         return await deleteLocale(ctx, {
             documentId: id,
+            expectedRevision: input.expectedRevision,
             locale
         });
     } catch (error) {
@@ -38,5 +40,5 @@ const deleteDocumentLocale = createServerFn({
         if (null != committedFailure) return committedFailure;
         throw error;
     }
-});
+}));
 export { deleteDocumentLocale };

package/dist/server-fns/collections/delete-outcome.d.ts

@@ -5,26 +5,30 @@
  *
  * Copyright (c) Infonomic Company Limited
  */
-import type { DeleteDocumentResult, DeleteDocumentSideEffectCode, DeleteDocumentSideEffectPhase } from '@byline/core';
+import type { DeleteDocumentResult, DeleteDocumentSideEffectCode, DeleteDocumentSideEffectPhase, StructuralMutationReceipt } from '@byline/core';
 export type DeleteDocumentPublicSideEffectPhase = DeleteDocumentSideEffectPhase | 'unknown';
 export type DeleteDocumentPublicSideEffectCode = DeleteDocumentSideEffectCode;
 export interface DeleteDocumentPublicSideEffectFailure {
     phase: DeleteDocumentPublicSideEffectPhase;
     code: DeleteDocumentPublicSideEffectCode;
 }
-export type DeleteDocumentResponse = {
+export type DeleteDocumentResponse = StructuralMutationReceipt & ({
     status: 'ok';
+    documentId: string;
+    revision: number;
     deletedVersionCount: number;
     outcome: 'committed';
     sideEffectFailures: [];
 } | {
     status: 'ok';
+    documentId: string;
+    revision: number;
     deletedVersionCount: number;
     outcome: 'committed-with-side-effect-failures';
     sideEffectFailures: [
         DeleteDocumentPublicSideEffectFailure,
         ...DeleteDocumentPublicSideEffectFailure[]
     ];
-};
+});
 export declare function toDeleteDocumentResponse(result: DeleteDocumentResult): DeleteDocumentResponse;
 export declare function hasDeleteSideEffectFailures(result: Pick<DeleteDocumentResult, 'outcome'>): boolean;

package/dist/server-fns/collections/delete-outcome.js

@@ -20,6 +20,10 @@ function toDeleteDocumentResponse(result) {
     const [firstFailure, ...remainingFailures] = result.sideEffectFailures;
     return {
         status: 'ok',
+        documentId: result.documentId,
+        revision: result.revision,
+        affectedDocuments: result.affectedDocuments,
+        scheduledPublicationsNeedReconfirmation: result.scheduledPublicationsNeedReconfirmation,
         deletedVersionCount: result.deletedVersionCount,
         outcome: result.outcome,
         sideEffectFailures: [

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

@@ -1,14 +1,9 @@
-/**
- * This Source Code is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) Infonomic Company Limited
- */
 export declare const deleteDocument: import("@tanstack/react-start").RequiredFetcher<undefined, (input: {
+    expectedRevision: number;
     collection: string;
     id: string;
 }) => {
+    expectedRevision: number;
     collection: string;
     id: string;
 }, Promise<import("./delete-outcome.js").DeleteDocumentResponse>>;

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

@@ -1,3 +1,4 @@
+import { withDocumentMutationErrors } from "../document-mutation-errors.js";
 import { createServerFn } from "@tanstack/react-start";
 import { getAdminRequestContext } from "@byline/client/server";
 import { ERR_NOT_FOUND, getLogger, getServerConfig, getUploadFields } from "@byline/core";
@@ -6,7 +7,7 @@ import { ensureCollection } from "../../integrations/api-utils.js";
 import { toDeleteDocumentResponse } from "./delete-outcome.js";
 const delete_deleteDocument = createServerFn({
     method: 'POST'
-}).validator((input)=>input).handler(async ({ data: input })=>{
+}).validator((input)=>input).handler(withDocumentMutationErrors(async ({ data: input })=>{
     const { collection: path, id } = input;
     const logger = getLogger();
     const config = await ensureCollection(path);
@@ -35,8 +36,9 @@ const delete_deleteDocument = createServerFn({
         requestContext: await getAdminRequestContext()
     };
     const result = await deleteDocument(ctx, {
-        documentId: id
+        documentId: id,
+        expectedRevision: input.expectedRevision
     });
     return toDeleteDocumentResponse(result);
-});
+}));
 export { delete_deleteDocument as deleteDocument };