@salesforce/lds-drafts 1.114.0 → 1.114.2

package/dist/DraftManager.d.ts

@@ -150,7 +150,7 @@ export declare class DraftManager {
      * @param sourceActionId The draft action id to merge onto the target. This
      * action will be removed after the merge.
      */
-    mergeAction(targetActionId: string, sourceActionId: string): Promise<DraftQueueItem>;
+    mergeActions(targetActionId: string, sourceActionId: string): Promise<DraftQueueItem>;
     /**
      * Sets the metadata object of the specified action to the
      * provided metadata

package/dist/DraftQueue.d.ts

@@ -216,7 +216,7 @@ export interface DraftQueue {
      * @param sourceActionId The draft action id to merge onto the target. This
      * action will be removed after the merge.
      */
-    mergeAction<Data, Response>(targetActionId: string, sourceActionId: string): Promise<DraftAction<Data, Response>>;
+    mergeActions<Data, Response>(targetActionId: string, sourceActionId: string): Promise<DraftAction<Data, Response>>;
     /** Set the draft queue state to Started and process the next item */
     startQueue(): Promise<void>;
     /** Set the draft queue state to Stopped and don't let another item begin */

package/dist/DurableDraftQueue.d.ts

@@ -46,7 +46,7 @@ export declare class DurableDraftQueue implements DraftQueue {
     private startQueueSafe;
     removeDraftAction(actionId: string): Promise<void>;
     replaceAction(actionId: string, withActionId: string): Promise<DraftAction<unknown, unknown>>;
-    mergeAction<Data, Response>(targetActionId: string, sourceActionId: 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>>;
     private scheduleRetry;
 }

package/dist/ldsDrafts.js

@@ -712,23 +712,31 @@ class DurableDraftQueue {
                 await this.startQueueSafe();
                 return Promise.reject('No action to replace');
             }
-            const { actionToReplace, replacingAction } = this.getHandler(first.handler).handleReplaceAction(actionId, withActionId, this.uploadingActionId, actions);
-            // 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(replacingAction.id);
-            await this.draftStore.writeAction(actionToReplace);
-            await this.notifyChangedListeners({
-                type: DraftQueueEventType.ActionUpdated,
-                action: actionToReplace,
-            });
-            this.replacingAction = undefined;
+            // 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;
     }
-    mergeAction(targetActionId, sourceActionId) {
+    mergeActions(targetActionId, sourceActionId) {
         // ids must be unique
         if (targetActionId === sourceActionId) {
             return Promise.reject(new Error('target and source action ids cannot be the same'));
@@ -751,16 +759,23 @@ class DurableDraftQueue {
                 await this.startQueueSafe();
                 throw Error('No action to replace');
             }
-            const 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);
-            this.replacingAction = undefined;
+            // 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;
         });
@@ -1628,8 +1643,8 @@ class DraftManager {
      * @param sourceActionId The draft action id to merge onto the target. This
      * action will be removed after the merge.
      */
-    mergeAction(targetActionId, sourceActionId) {
-        return this.draftQueue.mergeAction(targetActionId, sourceActionId).then((merged) => {
+    mergeActions(targetActionId, sourceActionId) {
+        return this.draftQueue.mergeActions(targetActionId, sourceActionId).then((merged) => {
             return this.buildDraftQueueItem(merged);
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-drafts",
-    "version": "1.114.0",
+    "version": "1.114.2",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS Drafts",
     "main": "dist/ldsDrafts.js",
@@ -26,6 +26,6 @@
     "dependencies": {
         "@luvio/engine": "0.137.1",
         "@luvio/environments": "0.137.1",
-        "@salesforce/lds-utils-adapters": "^1.114.0"
+        "@salesforce/lds-utils-adapters": "^1.114.2"
     }
 }