@salesforce/lds-worker-api 1.124.3 → 1.124.5

package/dist/sfdc/es/ldsWorkerApi.js

@@ -751,4 +751,4 @@ if (process.env.NODE_ENV !== 'production') {
 }
 
 export { createPrimingSession, draftManager, draftQueue, executeAdapter, executeMutatingAdapter, getImperativeAdapterNames, invokeAdapter, invokeAdapterWithDraftToReplace, invokeAdapterWithMetadata, nimbusDraftQueue, setMetadataTTL, setUiApiRecordTTL, subscribeToAdapter };
-// version: 1.124.3-cf2dbb2fa
+// version: 1.124.5-f65e6d350

package/dist/standalone/es/lds-worker-api.js

@@ -3776,7 +3776,7 @@ function withDefaultLuvio(callback) {
     }
     callbacks.push(callback);
 }
-// version: 1.124.3-cf2dbb2fa
+// version: 1.124.5-f65e6d350
 
 // TODO [TD-0081508]: once that TD is fulfilled we can probably change this file
 function instrumentAdapter$1(createFunction, _metadata) {
@@ -15200,7 +15200,7 @@ function parseAndVisit(source) {
     updateReferenceMapWithKnownKey(ast, luvioDocumentNode);
     return luvioDocumentNode;
 }
-// version: 1.124.3-cf2dbb2fa
+// version: 1.124.5-f65e6d350
 
 function unwrap(data) {
     // The lwc-luvio bindings import a function from lwc called "unwrap".
@@ -16113,7 +16113,7 @@ function createGraphQLWireAdapterConstructor(luvio, adapter, metadata, astResolv
     const { apiFamily, name } = metadata;
     return createGraphQLWireAdapterConstructor$1(adapter, `${apiFamily}.${name}`, luvio, astResolver);
 }
-// version: 1.124.3-cf2dbb2fa
+// version: 1.124.5-f65e6d350
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -44347,7 +44347,7 @@ withDefaultLuvio((luvio) => {
         dropFunction: instrumentation$2.notifyRecordUpdateAvailableDropped,
     });
 });
-// version: 1.124.3-c058f7d96
+// version: 1.124.5-bc91bd7b2
 
 var caseSensitiveUserId = '005B0000000GR4OIAW';
 
@@ -49175,10 +49175,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;
     };
@@ -49190,7 +49186,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(),
@@ -49257,13 +49255,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;
@@ -49503,92 +49501,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);
@@ -49623,6 +49540,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__';
@@ -50042,56 +50034,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';
     }
@@ -55942,68 +55931,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) {
@@ -56518,7 +56456,7 @@ class QuickActionExecutionRepresentationHandler extends AbstractResourceRequestA
         });
         luvio.storeIngest(key, ingest$x$1, response);
     }
-    mergeActions(_targetAction, _sourceAction) {
+    mergeRequestBody() {
         throw Error('mergeActions not supported for QuickActionExecutionRepresentationHandler');
     }
 }
@@ -57205,7 +57143,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) {
@@ -59902,7 +59840,7 @@ register({
     id: '@salesforce/lds-network-adapter',
     instrument: instrument$1,
 });
-// version: 1.124.3-cf2dbb2fa
+// version: 1.124.5-f65e6d350
 
 const { create: create$2, keys: keys$2 } = Object;
 const { stringify: stringify$1, parse: parse$1 } = JSON;
@@ -74167,7 +74105,7 @@ register({
     configuration: { ...configurationForGraphQLAdapters },
     instrument,
 });
-// version: 1.124.3-c058f7d96
+// version: 1.124.5-bc91bd7b2
 
 // On core the unstable adapters are re-exported with different names,
 
@@ -76296,7 +76234,7 @@ withDefaultLuvio((luvio) => {
     unstable_graphQL_imperative = createImperativeAdapter(luvio, createInstrumentedAdapter(ldsAdapter, adapterMetadata), adapterMetadata);
     graphQLImperative = ldsAdapter;
 });
-// version: 1.124.3-c058f7d96
+// version: 1.124.5-bc91bd7b2
 
 var gqlApi = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -76978,4 +76916,4 @@ const { luvio } = getRuntime();
 setDefaultLuvio({ luvio });
 
 export { createPrimingSession, draftManager, draftQueue, executeAdapter, executeMutatingAdapter, getImperativeAdapterNames, invokeAdapter, invokeAdapterWithDraftToReplace, invokeAdapterWithMetadata, nimbusDraftQueue, registerReportObserver, setMetadataTTL, setUiApiRecordTTL, subscribeToAdapter };
-// version: 1.124.3-cf2dbb2fa
+// version: 1.124.5-f65e6d350

package/dist/standalone/umd/lds-worker-api.js

@@ -3782,7 +3782,7 @@
         }
         callbacks.push(callback);
     }
-    // version: 1.124.3-cf2dbb2fa
+    // version: 1.124.5-f65e6d350
 
     // TODO [TD-0081508]: once that TD is fulfilled we can probably change this file
     function instrumentAdapter$1(createFunction, _metadata) {
@@ -15206,7 +15206,7 @@
         updateReferenceMapWithKnownKey(ast, luvioDocumentNode);
         return luvioDocumentNode;
     }
-    // version: 1.124.3-cf2dbb2fa
+    // version: 1.124.5-f65e6d350
 
     function unwrap(data) {
         // The lwc-luvio bindings import a function from lwc called "unwrap".
@@ -16119,7 +16119,7 @@
         const { apiFamily, name } = metadata;
         return createGraphQLWireAdapterConstructor$1(adapter, `${apiFamily}.${name}`, luvio, astResolver);
     }
-    // version: 1.124.3-cf2dbb2fa
+    // version: 1.124.5-f65e6d350
 
     /**
      * Copyright (c) 2022, Salesforce, Inc.,
@@ -44353,7 +44353,7 @@
             dropFunction: instrumentation$2.notifyRecordUpdateAvailableDropped,
         });
     });
-    // version: 1.124.3-c058f7d96
+    // version: 1.124.5-bc91bd7b2
 
     var caseSensitiveUserId = '005B0000000GR4OIAW';
 
@@ -49181,10 +49181,6 @@
             });
             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;
         };
@@ -49196,7 +49192,9 @@
             handleAction: handle,
             buildPendingAction,
             getQueueOperationsForCompletingDrafts: getQueueOperationsForCompletingDrafts,
-            handleReplaceAction: replaceAction,
+            handleReplaceAction: () => {
+                throw Error('replaceAction not supported for custom actions');
+            },
             getRedirectMappings,
             handleActionRemoved: () => Promise.resolve(),
             handleActionCompleted: () => Promise.resolve(),
@@ -49263,13 +49261,13 @@
             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;
@@ -49509,92 +49507,11 @@
                 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);
@@ -49629,6 +49546,81 @@
                 }
             }, 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__';
@@ -50048,56 +50040,53 @@
             }
             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';
         }
@@ -55948,68 +55937,17 @@
         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) {
@@ -56524,7 +56462,7 @@
             });
             luvio.storeIngest(key, ingest$x$1, response);
         }
-        mergeActions(_targetAction, _sourceAction) {
+        mergeRequestBody() {
             throw Error('mergeActions not supported for QuickActionExecutionRepresentationHandler');
         }
     }
@@ -57211,7 +57149,7 @@
                 this.binaryStoreUrlsToUpdate.set(fileReference.handle, versionDataUrl);
             }
         }
-        mergeActions(_targetAction, _sourceAction) {
+        mergeRequestBody() {
             throw Error('mergeActions not supported for ContentDocumentCompositeRepresentationActionHandler');
         }
         async ingestResponses(responses, action) {
@@ -59908,7 +59846,7 @@
         id: '@salesforce/lds-network-adapter',
         instrument: instrument$1,
     });
-    // version: 1.124.3-cf2dbb2fa
+    // version: 1.124.5-f65e6d350
 
     const { create: create$2, keys: keys$2 } = Object;
     const { stringify: stringify$1, parse: parse$1 } = JSON;
@@ -74173,7 +74111,7 @@
         configuration: { ...configurationForGraphQLAdapters },
         instrument,
     });
-    // version: 1.124.3-c058f7d96
+    // version: 1.124.5-bc91bd7b2
 
     // On core the unstable adapters are re-exported with different names,
 
@@ -76302,7 +76240,7 @@
         unstable_graphQL_imperative = createImperativeAdapter(luvio, createInstrumentedAdapter(ldsAdapter, adapterMetadata), adapterMetadata);
         graphQLImperative = ldsAdapter;
     });
-    // version: 1.124.3-c058f7d96
+    // version: 1.124.5-bc91bd7b2
 
     var gqlApi = /*#__PURE__*/Object.freeze({
         __proto__: null,
@@ -77001,4 +76939,4 @@
     Object.defineProperty(exports, '__esModule', { value: true });
 
 }));
-// version: 1.124.3-cf2dbb2fa
+// version: 1.124.5-f65e6d350

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-worker-api",
-    "version": "1.124.3",
+    "version": "1.124.5",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "",
     "main": "dist/standalone/es/lds-worker-api.js",