@salesforce/lds-runtime-mobile 1.124.4 → 1.124.5

package/dist/main.js

@@ -4800,10 +4800,6 @@ function customActionHandler(executor, id, draftQueue) {
         });
         return queueOperations;
     };
-    const replaceAction = (actionId, _withActionId, _uploadingActionId, _actions) => {
-        // eslint-disable-next-line @salesforce/lds/no-error-in-production
-        throw new Error(`${actionId} does not support action replacing. You can only delete ${actionId}`);
-    };
     const getRedirectMappings = (_action) => {
         return undefined;
     };
@@ -4815,7 +4811,9 @@ function customActionHandler(executor, id, draftQueue) {
         handleAction: handle,
         buildPendingAction,
         getQueueOperationsForCompletingDrafts: getQueueOperationsForCompletingDrafts,
-        handleReplaceAction: replaceAction,
+        handleReplaceAction: () => {
+            throw Error('replaceAction not supported for custom actions');
+        },
         getRedirectMappings,
         handleActionRemoved: () => Promise.resolve(),
         handleActionCompleted: () => Promise.resolve(),
@@ -4882,13 +4880,13 @@ class DurableDraftQueue {
         this.userState = DraftQueueState.Started;
         if (this.state === DraftQueueState.Started) {
             // Do nothing if the queue state is already started
-            return Promise.resolve();
+            return;
         }
         if (this.replacingAction !== undefined) {
             // If we're replacing an action do nothing
             // replace will restart the queue for us as long as the user
             // has last set the queue to be started
-            return Promise.resolve();
+            return;
         }
         this.retryIntervalMilliseconds = 0;
         this.state = DraftQueueState.Started;
@@ -5128,92 +5126,11 @@ class DurableDraftQueue {
             await this.startQueue();
         }
     }
-    replaceAction(actionId, withActionId) {
-        // ids must be unique
-        if (actionId === withActionId) {
-            return Promise.reject('Swapped and swapping action ids cannot be the same');
-        }
-        // cannot have a replace action already in progress
-        if (this.replacingAction !== undefined) {
-            return Promise.reject('Cannot replace actions while a replace action is in progress');
-        }
-        this.stopQueueManually();
-        const replacing = this.getQueueActions().then(async (actions) => {
-            const first = actions.filter((action) => action.id === actionId)[0];
-            if (first === undefined) {
-                this.replacingAction = undefined;
-                await this.startQueueSafe();
-                return Promise.reject('No action to replace');
-            }
-            // put in a try/finally block so we don't leave this.replacingAction
-            // indefinitely set
-            let actionToReplace;
-            try {
-                const replaceResult = this.getHandler(first.handler).handleReplaceAction(actionId, withActionId, this.uploadingActionId, actions);
-                actionToReplace = replaceResult.actionToReplace;
-                // TODO [W-8873834]: Will add batching support to durable store
-                // we should use that here to remove and set both actions in one operation
-                await this.removeDraftAction(replaceResult.replacingAction.id);
-                await this.draftStore.writeAction(actionToReplace);
-                await this.notifyChangedListeners({
-                    type: DraftQueueEventType.ActionUpdated,
-                    action: actionToReplace,
-                });
-            }
-            finally {
-                this.replacingAction = undefined;
-            }
-            await this.startQueueSafe();
-            return actionToReplace;
-        });
-        this.replacingAction = replacing;
-        return replacing;
+    replaceAction(targetActionId, sourceActionId) {
+        return this.replaceOrMergeActions(targetActionId, sourceActionId, false);
     }
     mergeActions(targetActionId, sourceActionId) {
-        // ids must be unique
-        if (targetActionId === sourceActionId) {
-            return Promise.reject(new Error('targetActionId and sourceActionId cannot be the same.'));
-        }
-        // cannot have a replace action already in progress
-        if (this.replacingAction !== undefined) {
-            return Promise.reject(new Error('Cannot merge actions while a replace/merge action operation is in progress.'));
-        }
-        this.stopQueueManually();
-        const promise = this.getQueueActions().then(async (actions) => {
-            const target = actions.find((action) => action.id === targetActionId);
-            if (target === undefined) {
-                this.replacingAction = undefined;
-                await this.startQueueSafe();
-                throw Error('targetActionId not found in the draft queue.');
-            }
-            const source = actions.find((action) => action.id === sourceActionId);
-            if (source === undefined) {
-                this.replacingAction = undefined;
-                await this.startQueueSafe();
-                throw Error('sourceActionId not found in the draft queue.');
-            }
-            // put in a try/finally block so we don't leave this.replacingAction
-            // indefinitely set
-            let merged;
-            try {
-                merged = this.getHandler(target.handler).mergeActions(target, source);
-                // update the target
-                await this.draftStore.writeAction(merged);
-                await this.notifyChangedListeners({
-                    type: DraftQueueEventType.ActionUpdated,
-                    action: merged,
-                });
-                // remove the source from queue
-                await this.removeDraftAction(sourceActionId);
-            }
-            finally {
-                this.replacingAction = undefined;
-            }
-            await this.startQueueSafe();
-            return merged;
-        });
-        this.replacingAction = promise;
-        return promise;
+        return this.replaceOrMergeActions(targetActionId, sourceActionId, true);
     }
     async setMetadata(actionId, metadata) {
         const keys$1 = keys$4(metadata);
@@ -5248,6 +5165,81 @@ class DurableDraftQueue {
             }
         }, this.retryIntervalMilliseconds);
     }
+    async getActionsForReplaceOrMerge(targetActionId, sourceActionId) {
+        const actions = await this.getQueueActions();
+        const target = actions.find((action) => action.id === targetActionId);
+        if (target === undefined) {
+            this.replacingAction = undefined;
+            await this.startQueueSafe();
+            throw Error(`targetActionId ${targetActionId} not found in the draft queue.`);
+        }
+        const source = actions.find((action) => action.id === sourceActionId);
+        if (source === undefined) {
+            this.replacingAction = undefined;
+            await this.startQueueSafe();
+            throw Error(`sourceActionId ${sourceActionId} not found in the draft queue.`);
+        }
+        return { target, source };
+    }
+    assertReplaceOrMergePrerequisites(target, source) {
+        // ensure actions are in a state to be replaced/merged
+        const { targetId: targetCacheKey, tag: targetTag, status: targetStatus, version: targetVersion, } = target;
+        const { targetId: sourceCacheKey, tag: sourceTag, status: sourceStatus, version: sourceVersion, } = source;
+        if (targetCacheKey !== sourceCacheKey) {
+            throw Error('Cannot replace/merge actions for different targetIds.');
+        }
+        if (targetTag !== sourceTag) {
+            throw Error('Cannot replace/merge actions for different tags.');
+        }
+        if (targetStatus === DraftActionStatus.Completed ||
+            targetStatus === DraftActionStatus.Uploading) {
+            throw Error(`Cannot replace/merge actions when targetAction is in ${targetStatus} status.`);
+        }
+        if (sourceStatus !== DraftActionStatus.Pending) {
+            throw Error(`Cannot replace/merge actions when sourceAction is in ${sourceStatus} status.`);
+        }
+        if (targetVersion !== sourceVersion) {
+            throw Error('Cannot replace/merge actions with different versions.');
+        }
+    }
+    async replaceOrMergeActions(targetActionId, sourceActionId, merge) {
+        // ids must be unique
+        if (targetActionId === sourceActionId) {
+            throw Error('targetActionId and sourceActionId cannot be the same.');
+        }
+        // cannot have a replace action already in progress
+        if (this.replacingAction !== undefined) {
+            throw Error('Cannot replace/merge actions while a replace/merge action operation is in progress.');
+        }
+        this.stopQueueManually();
+        const promise = this.getActionsForReplaceOrMerge(targetActionId, sourceActionId).then(async ({ target, source }) => {
+            // put in a try/finally block so we don't leave this.replacingAction
+            // indefinitely set
+            let updatedTarget;
+            try {
+                this.assertReplaceOrMergePrerequisites(target, source);
+                const handler = this.getHandler(target.handler);
+                updatedTarget = merge
+                    ? handler.mergeActions(target, source)
+                    : handler.handleReplaceAction(target, source);
+                // update the target
+                await this.draftStore.writeAction(updatedTarget);
+                await this.notifyChangedListeners({
+                    type: DraftQueueEventType.ActionUpdated,
+                    action: updatedTarget,
+                });
+                // remove the source from queue
+                await this.removeDraftAction(sourceActionId);
+            }
+            finally {
+                this.replacingAction = undefined;
+                await this.startQueueSafe();
+            }
+            return updatedTarget;
+        });
+        this.replacingAction = promise;
+        return promise;
+    }
 }
 
 const DRAFT_ACTION_KEY_JUNCTION = '__DraftAction__';
@@ -5681,56 +5673,53 @@ class AbstractResourceRequestActionHandler {
         }
         await this.ingestResponses(recordsToIngest, action);
     }
-    handleReplaceAction(actionId, withActionId, uploadingActionId, actions) {
-        // get the action to replace
-        const actionToReplace = actions.filter((action) => action.id === actionId)[0];
-        // get the replacing action
-        const replacingAction = actions.filter((action) => action.id === withActionId)[0];
-        // reject if either action is undefined
-        if (actionToReplace === undefined || replacingAction === undefined) {
-            // eslint-disable-next-line @salesforce/lds/no-error-in-production
-            throw new Error('One or both actions does not exist');
-        }
-        // reject if either action is uploading
-        if (actionToReplace.id === uploadingActionId || replacingAction.id === uploadingActionId) {
-            // eslint-disable-next-line @salesforce/lds/no-error-in-production
-            throw new Error('Cannot replace an draft action that is uploading');
-        }
-        // reject if these two draft actions aren't acting on the same target
-        if (actionToReplace.tag !== replacingAction.tag) {
-            // eslint-disable-next-line @salesforce/lds/no-error-in-production
-            throw new Error('Cannot swap actions targeting different targets');
-        }
-        // reject if the replacing action is not pending
-        if (replacingAction.status !== DraftActionStatus.Pending) {
-            // eslint-disable-next-line @salesforce/lds/no-error-in-production
-            throw new Error('Cannot replace with a non-pending action');
-        }
+    handleReplaceAction(targetAction, sourceAction) {
         //reject if the action to replace is a POST action
-        const pendingAction = actionToReplace;
+        const pendingAction = targetAction;
         if (pendingAction.data.method === 'post') {
-            // eslint-disable-next-line @salesforce/lds/no-error-in-production
-            throw new Error('Cannot replace a POST action');
+            throw Error('Cannot replace a POST action');
         }
-        if (this.isActionOfType(actionToReplace) &&
-            this.isActionOfType(replacingAction)) {
-            const actionToReplaceCopy = {
-                ...actionToReplace,
-                status: DraftActionStatus.Pending,
-            };
-            actionToReplace.status = DraftActionStatus.Pending;
-            actionToReplace.data = replacingAction.data;
-            return {
-                original: actionToReplaceCopy,
-                actionToReplace: actionToReplace,
-                replacingAction: replacingAction,
-            };
+        if (this.isActionOfType(targetAction) &&
+            this.isActionOfType(sourceAction)) {
+            targetAction.status = DraftActionStatus.Pending;
+            targetAction.data = sourceAction.data;
+            return targetAction;
         }
         else {
-            // eslint-disable-next-line @salesforce/lds/no-error-in-production
-            throw new Error('Incompatible Action types to replace one another');
+            throw Error('Incompatible Action types to replace one another');
         }
     }
+    mergeActions(targetAction, sourceAction) {
+        const { id: targetId, data: targetData, metadata: targetMetadata, timestamp: targetTimestamp, } = targetAction;
+        const { method: targetMethod, body: targetBody } = targetData;
+        const { data: sourceData, metadata: sourceMetadata } = sourceAction;
+        const { method: sourceMethod, body: sourceBody } = sourceData;
+        if (targetMethod.toLowerCase() === 'delete' || sourceMethod.toLowerCase() === 'delete') {
+            throw Error('Cannot merge DELETE actions.');
+        }
+        if (targetMethod.toLowerCase() === 'patch' && sourceMethod.toLowerCase() === 'post') {
+            // overlaying a POST over a PATCH is not supported
+            throw Error('Cannot merge a POST action over top of a PATCH action.');
+        }
+        // overlay top-level properties, maintain target's timestamp and id
+        const merged = {
+            ...targetAction,
+            ...sourceAction,
+            timestamp: targetTimestamp,
+            id: targetId,
+        };
+        // overlay data
+        // NOTE: we stick to the target's ResourceRequest properties (except body
+        // which is merged) because we don't want to overwrite a POST with a PATCH
+        // (all other cases should be fine or wouldn't have passed pre-requisites)
+        merged.data = {
+            ...targetData,
+            body: this.mergeRequestBody(targetBody, sourceBody),
+        };
+        // overlay metadata
+        merged.metadata = { ...targetMetadata, ...sourceMetadata };
+        return merged;
+    }
     shouldDeleteActionByTagOnRemoval(action) {
         return action.data.method === 'post';
     }
@@ -11581,68 +11570,17 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
     synchronousIngest(response) {
         return this.recordService.synchronousIngestRecord(response);
     }
-    mergeActions(targetAction, sourceAction) {
-        // NOTE: a lot of the logic in this method could be hoisted to the
-        // AbstractResourceRequestActionHandler, and then some new abstract mergeBody()
-        // method could be called there and implemented here.  As of right now there
-        // are no other concrete ResourceRequest handlers implementing mergeActions
-        // so to keep this simple we aren't hoisting the shared stuff yet.
-        const { id: targetId, targetId: targetCacheKey, tag: targetTag, status: targetStatus, data: targetData, metadata: targetMetadata, timestamp: targetTimestamp, version: targetVersion, } = targetAction;
-        const { method: targetMethod, body: targetBody } = targetData;
-        const { targetId: sourceCacheKey, tag: sourceTag, status: sourceStatus, data: sourceData, metadata: sourceMetadata, version: sourceVersion, } = sourceAction;
-        const { method: sourceMethod, body: sourceBody } = sourceData;
-        // pre-requisites
-        if (targetCacheKey !== sourceCacheKey) {
-            throw Error('Cannot merge actions for different targetIds.');
-        }
-        if (targetTag !== sourceTag) {
-            throw Error('Cannot merge actions for different tags.');
-        }
-        if (targetStatus === DraftActionStatus.Completed ||
-            targetStatus === DraftActionStatus.Uploading) {
-            throw Error(`Cannot merge actions when targetAction is in ${targetStatus} status.`);
-        }
-        if (sourceStatus === DraftActionStatus.Completed ||
-            sourceStatus === DraftActionStatus.Uploading) {
-            throw Error(`Cannot merge actions when sourceAction is in ${sourceStatus} status.`);
-        }
-        if (targetMethod.toLowerCase() === 'delete' || sourceMethod.toLowerCase() === 'delete') {
-            throw Error('Cannot merge DELETE actions.');
-        }
-        if (targetMethod.toLowerCase() === 'patch' && sourceMethod.toLowerCase() === 'post') {
-            // overlaying a POST over a PATCH is not supported
-            throw Error('Cannot merge a POST action over top of a PATCH action.');
-        }
-        if (targetVersion !== sourceVersion) {
-            throw Error('Cannot merge actions with different versions.');
-        }
-        // overlay top-level properties, maintain target's timestamp and id
-        const merged = {
-            ...targetAction,
-            ...sourceAction,
-            timestamp: targetTimestamp,
-            id: targetId,
-        };
-        // overlay data
+    mergeRequestBody(targetBody, sourceBody) {
         // IMPORTANT: spread operator isn't deep clone so we have to individually
         // spread nested objects (just "fields" for RecordInputReps)
-        // NOTE: we stick to the target's ResourceRequest properties (except body
-        // which is merged) because we don't want to overwrite a POST with a PATCH
-        // (all other cases should be fine or wouldn't have passed pre-requisites)
-        merged.data = {
-            ...targetData,
-            body: {
-                ...targetBody,
-                ...sourceBody,
-                fields: {
-                    ...targetBody.fields,
-                    ...sourceBody.fields,
-                },
+        return {
+            ...targetBody,
+            ...sourceBody,
+            fields: {
+                ...targetBody.fields,
+                ...sourceBody.fields,
             },
         };
-        // overlay metadata
-        merged.metadata = { ...targetMetadata, ...sourceMetadata };
-        return merged;
     }
 }
 function isField(key, data) {
@@ -12157,7 +12095,7 @@ class QuickActionExecutionRepresentationHandler extends AbstractResourceRequestA
         });
         luvio.storeIngest(key, ingestQuickActionExecutionRepresentation, response);
     }
-    mergeActions(_targetAction, _sourceAction) {
+    mergeRequestBody() {
         throw Error('mergeActions not supported for QuickActionExecutionRepresentationHandler');
     }
 }
@@ -12844,7 +12782,7 @@ class ContentDocumentCompositeRepresentationActionHandler extends AbstractResour
             this.binaryStoreUrlsToUpdate.set(fileReference.handle, versionDataUrl);
         }
     }
-    mergeActions(_targetAction, _sourceAction) {
+    mergeRequestBody() {
         throw Error('mergeActions not supported for ContentDocumentCompositeRepresentationActionHandler');
     }
     async ingestResponses(responses, action) {
@@ -15669,4 +15607,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.124.4-f07bfc14d
+// version: 1.124.5-f65e6d350

package/dist/types/NimbusDraftQueue.d.ts

@@ -19,7 +19,7 @@ export declare class NimbusDraftQueue implements DraftQueue {
     removeDraftAction(_actionId: string): Promise<void>;
     startQueue(): Promise<void>;
     stopQueue(): Promise<void>;
-    replaceAction(_actionId: string, _withActionId: string): Promise<DraftAction<unknown, unknown>>;
+    replaceAction<Data, Response>(_actionId: string, _withActionId: string): Promise<DraftAction<Data, Response>>;
     mergeActions<Data, Response>(_targetActionId: string, _sourceActionId: string): Promise<DraftAction<Data, Response>>;
     setMetadata(_actionId: string, _metadata: DraftActionMetadata): Promise<DraftAction<unknown, unknown>>;
     addHandler(_handler: ActionHandler<unknown, unknown, unknown>): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-mobile",
-    "version": "1.124.4",
+    "version": "1.124.5",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS runtime for mobile/hybrid environments.",
     "main": "dist/main.js",

package/sfdc/main.js

@@ -4800,10 +4800,6 @@ function customActionHandler(executor, id, draftQueue) {
         });
         return queueOperations;
     };
-    const replaceAction = (actionId, _withActionId, _uploadingActionId, _actions) => {
-        // eslint-disable-next-line @salesforce/lds/no-error-in-production
-        throw new Error(`${actionId} does not support action replacing. You can only delete ${actionId}`);
-    };
     const getRedirectMappings = (_action) => {
         return undefined;
     };
@@ -4815,7 +4811,9 @@ function customActionHandler(executor, id, draftQueue) {
         handleAction: handle,
         buildPendingAction,
         getQueueOperationsForCompletingDrafts: getQueueOperationsForCompletingDrafts,
-        handleReplaceAction: replaceAction,
+        handleReplaceAction: () => {
+            throw Error('replaceAction not supported for custom actions');
+        },
         getRedirectMappings,
         handleActionRemoved: () => Promise.resolve(),
         handleActionCompleted: () => Promise.resolve(),
@@ -4882,13 +4880,13 @@ class DurableDraftQueue {
         this.userState = DraftQueueState.Started;
         if (this.state === DraftQueueState.Started) {
             // Do nothing if the queue state is already started
-            return Promise.resolve();
+            return;
         }
         if (this.replacingAction !== undefined) {
             // If we're replacing an action do nothing
             // replace will restart the queue for us as long as the user
             // has last set the queue to be started
-            return Promise.resolve();
+            return;
         }
         this.retryIntervalMilliseconds = 0;
         this.state = DraftQueueState.Started;
@@ -5128,92 +5126,11 @@ class DurableDraftQueue {
             await this.startQueue();
         }
     }
-    replaceAction(actionId, withActionId) {
-        // ids must be unique
-        if (actionId === withActionId) {
-            return Promise.reject('Swapped and swapping action ids cannot be the same');
-        }
-        // cannot have a replace action already in progress
-        if (this.replacingAction !== undefined) {
-            return Promise.reject('Cannot replace actions while a replace action is in progress');
-        }
-        this.stopQueueManually();
-        const replacing = this.getQueueActions().then(async (actions) => {
-            const first = actions.filter((action) => action.id === actionId)[0];
-            if (first === undefined) {
-                this.replacingAction = undefined;
-                await this.startQueueSafe();
-                return Promise.reject('No action to replace');
-            }
-            // put in a try/finally block so we don't leave this.replacingAction
-            // indefinitely set
-            let actionToReplace;
-            try {
-                const replaceResult = this.getHandler(first.handler).handleReplaceAction(actionId, withActionId, this.uploadingActionId, actions);
-                actionToReplace = replaceResult.actionToReplace;
-                // TODO [W-8873834]: Will add batching support to durable store
-                // we should use that here to remove and set both actions in one operation
-                await this.removeDraftAction(replaceResult.replacingAction.id);
-                await this.draftStore.writeAction(actionToReplace);
-                await this.notifyChangedListeners({
-                    type: DraftQueueEventType.ActionUpdated,
-                    action: actionToReplace,
-                });
-            }
-            finally {
-                this.replacingAction = undefined;
-            }
-            await this.startQueueSafe();
-            return actionToReplace;
-        });
-        this.replacingAction = replacing;
-        return replacing;
+    replaceAction(targetActionId, sourceActionId) {
+        return this.replaceOrMergeActions(targetActionId, sourceActionId, false);
     }
     mergeActions(targetActionId, sourceActionId) {
-        // ids must be unique
-        if (targetActionId === sourceActionId) {
-            return Promise.reject(new Error('targetActionId and sourceActionId cannot be the same.'));
-        }
-        // cannot have a replace action already in progress
-        if (this.replacingAction !== undefined) {
-            return Promise.reject(new Error('Cannot merge actions while a replace/merge action operation is in progress.'));
-        }
-        this.stopQueueManually();
-        const promise = this.getQueueActions().then(async (actions) => {
-            const target = actions.find((action) => action.id === targetActionId);
-            if (target === undefined) {
-                this.replacingAction = undefined;
-                await this.startQueueSafe();
-                throw Error('targetActionId not found in the draft queue.');
-            }
-            const source = actions.find((action) => action.id === sourceActionId);
-            if (source === undefined) {
-                this.replacingAction = undefined;
-                await this.startQueueSafe();
-                throw Error('sourceActionId not found in the draft queue.');
-            }
-            // put in a try/finally block so we don't leave this.replacingAction
-            // indefinitely set
-            let merged;
-            try {
-                merged = this.getHandler(target.handler).mergeActions(target, source);
-                // update the target
-                await this.draftStore.writeAction(merged);
-                await this.notifyChangedListeners({
-                    type: DraftQueueEventType.ActionUpdated,
-                    action: merged,
-                });
-                // remove the source from queue
-                await this.removeDraftAction(sourceActionId);
-            }
-            finally {
-                this.replacingAction = undefined;
-            }
-            await this.startQueueSafe();
-            return merged;
-        });
-        this.replacingAction = promise;
-        return promise;
+        return this.replaceOrMergeActions(targetActionId, sourceActionId, true);
     }
     async setMetadata(actionId, metadata) {
         const keys$1 = keys$4(metadata);
@@ -5248,6 +5165,81 @@ class DurableDraftQueue {
             }
         }, this.retryIntervalMilliseconds);
     }
+    async getActionsForReplaceOrMerge(targetActionId, sourceActionId) {
+        const actions = await this.getQueueActions();
+        const target = actions.find((action) => action.id === targetActionId);
+        if (target === undefined) {
+            this.replacingAction = undefined;
+            await this.startQueueSafe();
+            throw Error(`targetActionId ${targetActionId} not found in the draft queue.`);
+        }
+        const source = actions.find((action) => action.id === sourceActionId);
+        if (source === undefined) {
+            this.replacingAction = undefined;
+            await this.startQueueSafe();
+            throw Error(`sourceActionId ${sourceActionId} not found in the draft queue.`);
+        }
+        return { target, source };
+    }
+    assertReplaceOrMergePrerequisites(target, source) {
+        // ensure actions are in a state to be replaced/merged
+        const { targetId: targetCacheKey, tag: targetTag, status: targetStatus, version: targetVersion, } = target;
+        const { targetId: sourceCacheKey, tag: sourceTag, status: sourceStatus, version: sourceVersion, } = source;
+        if (targetCacheKey !== sourceCacheKey) {
+            throw Error('Cannot replace/merge actions for different targetIds.');
+        }
+        if (targetTag !== sourceTag) {
+            throw Error('Cannot replace/merge actions for different tags.');
+        }
+        if (targetStatus === DraftActionStatus.Completed ||
+            targetStatus === DraftActionStatus.Uploading) {
+            throw Error(`Cannot replace/merge actions when targetAction is in ${targetStatus} status.`);
+        }
+        if (sourceStatus !== DraftActionStatus.Pending) {
+            throw Error(`Cannot replace/merge actions when sourceAction is in ${sourceStatus} status.`);
+        }
+        if (targetVersion !== sourceVersion) {
+            throw Error('Cannot replace/merge actions with different versions.');
+        }
+    }
+    async replaceOrMergeActions(targetActionId, sourceActionId, merge) {
+        // ids must be unique
+        if (targetActionId === sourceActionId) {
+            throw Error('targetActionId and sourceActionId cannot be the same.');
+        }
+        // cannot have a replace action already in progress
+        if (this.replacingAction !== undefined) {
+            throw Error('Cannot replace/merge actions while a replace/merge action operation is in progress.');
+        }
+        this.stopQueueManually();
+        const promise = this.getActionsForReplaceOrMerge(targetActionId, sourceActionId).then(async ({ target, source }) => {
+            // put in a try/finally block so we don't leave this.replacingAction
+            // indefinitely set
+            let updatedTarget;
+            try {
+                this.assertReplaceOrMergePrerequisites(target, source);
+                const handler = this.getHandler(target.handler);
+                updatedTarget = merge
+                    ? handler.mergeActions(target, source)
+                    : handler.handleReplaceAction(target, source);
+                // update the target
+                await this.draftStore.writeAction(updatedTarget);
+                await this.notifyChangedListeners({
+                    type: DraftQueueEventType.ActionUpdated,
+                    action: updatedTarget,
+                });
+                // remove the source from queue
+                await this.removeDraftAction(sourceActionId);
+            }
+            finally {
+                this.replacingAction = undefined;
+                await this.startQueueSafe();
+            }
+            return updatedTarget;
+        });
+        this.replacingAction = promise;
+        return promise;
+    }
 }
 
 const DRAFT_ACTION_KEY_JUNCTION = '__DraftAction__';
@@ -5681,56 +5673,53 @@ class AbstractResourceRequestActionHandler {
         }
         await this.ingestResponses(recordsToIngest, action);
     }
-    handleReplaceAction(actionId, withActionId, uploadingActionId, actions) {
-        // get the action to replace
-        const actionToReplace = actions.filter((action) => action.id === actionId)[0];
-        // get the replacing action
-        const replacingAction = actions.filter((action) => action.id === withActionId)[0];
-        // reject if either action is undefined
-        if (actionToReplace === undefined || replacingAction === undefined) {
-            // eslint-disable-next-line @salesforce/lds/no-error-in-production
-            throw new Error('One or both actions does not exist');
-        }
-        // reject if either action is uploading
-        if (actionToReplace.id === uploadingActionId || replacingAction.id === uploadingActionId) {
-            // eslint-disable-next-line @salesforce/lds/no-error-in-production
-            throw new Error('Cannot replace an draft action that is uploading');
-        }
-        // reject if these two draft actions aren't acting on the same target
-        if (actionToReplace.tag !== replacingAction.tag) {
-            // eslint-disable-next-line @salesforce/lds/no-error-in-production
-            throw new Error('Cannot swap actions targeting different targets');
-        }
-        // reject if the replacing action is not pending
-        if (replacingAction.status !== DraftActionStatus.Pending) {
-            // eslint-disable-next-line @salesforce/lds/no-error-in-production
-            throw new Error('Cannot replace with a non-pending action');
-        }
+    handleReplaceAction(targetAction, sourceAction) {
         //reject if the action to replace is a POST action
-        const pendingAction = actionToReplace;
+        const pendingAction = targetAction;
         if (pendingAction.data.method === 'post') {
-            // eslint-disable-next-line @salesforce/lds/no-error-in-production
-            throw new Error('Cannot replace a POST action');
+            throw Error('Cannot replace a POST action');
         }
-        if (this.isActionOfType(actionToReplace) &&
-            this.isActionOfType(replacingAction)) {
-            const actionToReplaceCopy = {
-                ...actionToReplace,
-                status: DraftActionStatus.Pending,
-            };
-            actionToReplace.status = DraftActionStatus.Pending;
-            actionToReplace.data = replacingAction.data;
-            return {
-                original: actionToReplaceCopy,
-                actionToReplace: actionToReplace,
-                replacingAction: replacingAction,
-            };
+        if (this.isActionOfType(targetAction) &&
+            this.isActionOfType(sourceAction)) {
+            targetAction.status = DraftActionStatus.Pending;
+            targetAction.data = sourceAction.data;
+            return targetAction;
         }
         else {
-            // eslint-disable-next-line @salesforce/lds/no-error-in-production
-            throw new Error('Incompatible Action types to replace one another');
+            throw Error('Incompatible Action types to replace one another');
         }
     }
+    mergeActions(targetAction, sourceAction) {
+        const { id: targetId, data: targetData, metadata: targetMetadata, timestamp: targetTimestamp, } = targetAction;
+        const { method: targetMethod, body: targetBody } = targetData;
+        const { data: sourceData, metadata: sourceMetadata } = sourceAction;
+        const { method: sourceMethod, body: sourceBody } = sourceData;
+        if (targetMethod.toLowerCase() === 'delete' || sourceMethod.toLowerCase() === 'delete') {
+            throw Error('Cannot merge DELETE actions.');
+        }
+        if (targetMethod.toLowerCase() === 'patch' && sourceMethod.toLowerCase() === 'post') {
+            // overlaying a POST over a PATCH is not supported
+            throw Error('Cannot merge a POST action over top of a PATCH action.');
+        }
+        // overlay top-level properties, maintain target's timestamp and id
+        const merged = {
+            ...targetAction,
+            ...sourceAction,
+            timestamp: targetTimestamp,
+            id: targetId,
+        };
+        // overlay data
+        // NOTE: we stick to the target's ResourceRequest properties (except body
+        // which is merged) because we don't want to overwrite a POST with a PATCH
+        // (all other cases should be fine or wouldn't have passed pre-requisites)
+        merged.data = {
+            ...targetData,
+            body: this.mergeRequestBody(targetBody, sourceBody),
+        };
+        // overlay metadata
+        merged.metadata = { ...targetMetadata, ...sourceMetadata };
+        return merged;
+    }
     shouldDeleteActionByTagOnRemoval(action) {
         return action.data.method === 'post';
     }
@@ -11581,68 +11570,17 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
     synchronousIngest(response) {
         return this.recordService.synchronousIngestRecord(response);
     }
-    mergeActions(targetAction, sourceAction) {
-        // NOTE: a lot of the logic in this method could be hoisted to the
-        // AbstractResourceRequestActionHandler, and then some new abstract mergeBody()
-        // method could be called there and implemented here.  As of right now there
-        // are no other concrete ResourceRequest handlers implementing mergeActions
-        // so to keep this simple we aren't hoisting the shared stuff yet.
-        const { id: targetId, targetId: targetCacheKey, tag: targetTag, status: targetStatus, data: targetData, metadata: targetMetadata, timestamp: targetTimestamp, version: targetVersion, } = targetAction;
-        const { method: targetMethod, body: targetBody } = targetData;
-        const { targetId: sourceCacheKey, tag: sourceTag, status: sourceStatus, data: sourceData, metadata: sourceMetadata, version: sourceVersion, } = sourceAction;
-        const { method: sourceMethod, body: sourceBody } = sourceData;
-        // pre-requisites
-        if (targetCacheKey !== sourceCacheKey) {
-            throw Error('Cannot merge actions for different targetIds.');
-        }
-        if (targetTag !== sourceTag) {
-            throw Error('Cannot merge actions for different tags.');
-        }
-        if (targetStatus === DraftActionStatus.Completed ||
-            targetStatus === DraftActionStatus.Uploading) {
-            throw Error(`Cannot merge actions when targetAction is in ${targetStatus} status.`);
-        }
-        if (sourceStatus === DraftActionStatus.Completed ||
-            sourceStatus === DraftActionStatus.Uploading) {
-            throw Error(`Cannot merge actions when sourceAction is in ${sourceStatus} status.`);
-        }
-        if (targetMethod.toLowerCase() === 'delete' || sourceMethod.toLowerCase() === 'delete') {
-            throw Error('Cannot merge DELETE actions.');
-        }
-        if (targetMethod.toLowerCase() === 'patch' && sourceMethod.toLowerCase() === 'post') {
-            // overlaying a POST over a PATCH is not supported
-            throw Error('Cannot merge a POST action over top of a PATCH action.');
-        }
-        if (targetVersion !== sourceVersion) {
-            throw Error('Cannot merge actions with different versions.');
-        }
-        // overlay top-level properties, maintain target's timestamp and id
-        const merged = {
-            ...targetAction,
-            ...sourceAction,
-            timestamp: targetTimestamp,
-            id: targetId,
-        };
-        // overlay data
+    mergeRequestBody(targetBody, sourceBody) {
         // IMPORTANT: spread operator isn't deep clone so we have to individually
         // spread nested objects (just "fields" for RecordInputReps)
-        // NOTE: we stick to the target's ResourceRequest properties (except body
-        // which is merged) because we don't want to overwrite a POST with a PATCH
-        // (all other cases should be fine or wouldn't have passed pre-requisites)
-        merged.data = {
-            ...targetData,
-            body: {
-                ...targetBody,
-                ...sourceBody,
-                fields: {
-                    ...targetBody.fields,
-                    ...sourceBody.fields,
-                },
+        return {
+            ...targetBody,
+            ...sourceBody,
+            fields: {
+                ...targetBody.fields,
+                ...sourceBody.fields,
             },
         };
-        // overlay metadata
-        merged.metadata = { ...targetMetadata, ...sourceMetadata };
-        return merged;
     }
 }
 function isField(key, data) {
@@ -12157,7 +12095,7 @@ class QuickActionExecutionRepresentationHandler extends AbstractResourceRequestA
         });
         luvio.storeIngest(key, ingestQuickActionExecutionRepresentation, response);
     }
-    mergeActions(_targetAction, _sourceAction) {
+    mergeRequestBody() {
         throw Error('mergeActions not supported for QuickActionExecutionRepresentationHandler');
     }
 }
@@ -12844,7 +12782,7 @@ class ContentDocumentCompositeRepresentationActionHandler extends AbstractResour
             this.binaryStoreUrlsToUpdate.set(fileReference.handle, versionDataUrl);
         }
     }
-    mergeActions(_targetAction, _sourceAction) {
+    mergeRequestBody() {
         throw Error('mergeActions not supported for ContentDocumentCompositeRepresentationActionHandler');
     }
     async ingestResponses(responses, action) {
@@ -15669,4 +15607,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.124.4-f07bfc14d
+// version: 1.124.5-f65e6d350

package/sfdc/types/NimbusDraftQueue.d.ts

@@ -19,7 +19,7 @@ export declare class NimbusDraftQueue implements DraftQueue {
     removeDraftAction(_actionId: string): Promise<void>;
     startQueue(): Promise<void>;
     stopQueue(): Promise<void>;
-    replaceAction(_actionId: string, _withActionId: string): Promise<DraftAction<unknown, unknown>>;
+    replaceAction<Data, Response>(_actionId: string, _withActionId: string): Promise<DraftAction<Data, Response>>;
     mergeActions<Data, Response>(_targetActionId: string, _sourceActionId: string): Promise<DraftAction<Data, Response>>;
     setMetadata(_actionId: string, _metadata: DraftActionMetadata): Promise<DraftAction<unknown, unknown>>;
     addHandler(_handler: ActionHandler<unknown, unknown, unknown>): Promise<void>;