@salesforce/lds-runtime-mobile 1.100.2 → 1.100.4

package/dist/main.js

@@ -4344,6 +4344,44 @@ function makeStoreEval(preconditioner, objectInfoService, userId, contextProvide
     return wrapStartEndEvents(storeEval);
 }
 
+/**
+ * Copyright (c) 2022, Salesforce, Inc.,
+ * All rights reserved.
+ * For full license text, see the LICENSE.txt file
+ */
+
+class AsyncWorkerPool {
+    constructor(concurrency) {
+        this.queue = [];
+        this.activeWorkers = 0;
+        this.concurrency = concurrency;
+    }
+    push(workFn) {
+        return new Promise((resolve, reject) => {
+            this.queue.push(async () => {
+                return workFn().then(resolve).catch(reject);
+            });
+            this.work();
+        });
+    }
+    cancel() {
+        this.queue = [];
+        // TODO [W-12513105]: thread cancellation through to active workers
+    }
+    work() {
+        while (this.queue.length > 0 && this.activeWorkers < this.concurrency) {
+            this.activeWorkers += 1;
+            const next = this.queue.shift();
+            if (next) {
+                next().finally(() => {
+                    this.activeWorkers -= 1;
+                    this.work();
+                });
+            }
+        }
+    }
+}
+
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
  * All rights reserved.
@@ -4762,6 +4800,7 @@ class DurableDraftQueue {
         this.timeoutHandler = undefined;
         this.handlers = {};
         this.draftStore = draftStore;
+        this.workerPool = new AsyncWorkerPool(1);
     }
     addHandler(handler) {
         const id = handler.handlerId;
@@ -4861,20 +4900,22 @@ class DurableDraftQueue {
         });
     }
     async enqueue(handlerId, data) {
-        let queue = await this.getQueueActions();
-        const handler = this.getHandler(handlerId);
-        const pendingAction = (await handler.buildPendingAction(data, queue));
-        await this.draftStore.writeAction(pendingAction);
-        queue = await this.getQueueActions();
-        await this.notifyChangedListeners({
-            type: DraftQueueEventType.ActionAdded,
-            action: pendingAction,
+        return this.workerPool.push(async () => {
+            let queue = await this.getQueueActions();
+            const handler = this.getHandler(handlerId);
+            const pendingAction = (await handler.buildPendingAction(data, queue));
+            await this.draftStore.writeAction(pendingAction);
+            queue = await this.getQueueActions();
+            await this.notifyChangedListeners({
+                type: DraftQueueEventType.ActionAdded,
+                action: pendingAction,
+            });
+            await handler.handleActionEnqueued(pendingAction, queue);
+            if (this.state === DraftQueueState.Started) {
+                this.processNextAction();
+            }
+            return pendingAction;
         });
-        await handler.handleActionEnqueued(pendingAction, queue);
-        if (this.state === DraftQueueState.Started) {
-            this.processNextAction();
-        }
-        return pendingAction;
     }
     registerOnChangedListener(listener) {
         this.draftQueueChangedListeners.push(listener);
@@ -4886,27 +4927,29 @@ class DurableDraftQueue {
         };
     }
     async actionCompleted(action) {
-        const handler = this.getHandler(action.handler);
-        let queue = await this.getQueueActions();
-        const queueOperations = handler.getQueueOperationsForCompletingDrafts(queue, action);
-        const idAndKeyMappings = handler.getRedirectMappings(action);
-        const keyMappings = idAndKeyMappings === undefined
-            ? undefined
-            : idAndKeyMappings.map((m) => {
-                return { draftKey: m.draftKey, canonicalKey: m.canonicalKey };
+        return this.workerPool.push(async () => {
+            const handler = this.getHandler(action.handler);
+            let queue = await this.getQueueActions();
+            const queueOperations = handler.getQueueOperationsForCompletingDrafts(queue, action);
+            const idAndKeyMappings = handler.getRedirectMappings(action);
+            const keyMappings = idAndKeyMappings === undefined
+                ? undefined
+                : idAndKeyMappings.map((m) => {
+                    return { draftKey: m.draftKey, canonicalKey: m.canonicalKey };
+                });
+            await this.draftStore.completeAction(queueOperations, keyMappings);
+            queue = await this.getQueueActions();
+            this.retryIntervalMilliseconds = 0;
+            this.uploadingActionId = undefined;
+            await handler.handleActionCompleted(action, queueOperations, queue, values$1(this.handlers));
+            await this.notifyChangedListeners({
+                type: DraftQueueEventType.ActionCompleted,
+                action,
             });
-        await this.draftStore.completeAction(queueOperations, keyMappings);
-        queue = await this.getQueueActions();
-        this.retryIntervalMilliseconds = 0;
-        this.uploadingActionId = undefined;
-        await handler.handleActionCompleted(action, queueOperations, queue, values$1(this.handlers));
-        await this.notifyChangedListeners({
-            type: DraftQueueEventType.ActionCompleted,
-            action,
+            if (this.state === DraftQueueState.Started) {
+                this.processNextAction();
+            }
         });
-        if (this.state === DraftQueueState.Started) {
-            this.processNextAction();
-        }
     }
     async actionFailed(action, retry) {
         this.uploadingActionId = undefined;
@@ -5356,6 +5399,13 @@ class AbstractResourceRequestActionHandler {
         this.draftQueue = draftQueue;
         this.networkAdapter = networkAdapter;
         this.getLuvio = getLuvio;
+        // NOTE[W-12567340]: This property stores in-memory mappings between draft
+        // ids and canonical ids for the current session. Having a local copy of
+        // these mappings is necessary to avoid a race condition between publishing
+        // new mappings to the durable store and those mappings being loaded into
+        // the luvio store redirect table, during which a new draft might be enqueued
+        // which would not see a necessary mapping.
+        this.ephemeralRedirects = {};
     }
     enqueue(data) {
         return this.draftQueue.enqueue(this.handlerId, data);
@@ -5423,7 +5473,8 @@ class AbstractResourceRequestActionHandler {
     }
     getQueueOperationsForCompletingDrafts(queue, action) {
         const queueOperations = [];
-        if (action.data.method === 'post') {
+        const redirects = this.getRedirectMappings(action);
+        if (redirects !== undefined) {
             const { length } = queue;
             for (let i = 0; i < length; i++) {
                 const queueAction = queue[i];
@@ -5433,69 +5484,64 @@ class AbstractResourceRequestActionHandler {
                     continue;
                 }
                 if (isResourceRequestAction(queueAction)) {
-                    const redirects = this.getRedirectMappings(action);
-                    if (redirects !== undefined) {
-                        let queueOperationMutated = false;
-                        let updatedActionTag = undefined;
-                        let updatedActionTargetId = undefined;
-                        const { tag: queueActionTag, data: queueActionRequest, id: queueActionId, } = queueAction;
-                        let { basePath, body } = queueActionRequest;
-                        let stringifiedBody = stringify$4(body);
-                        // for each redirected ID/key we loop over the operation to see if it needs
-                        // to be updated
-                        for (const { draftId, draftKey, canonicalId, canonicalKey } of redirects) {
-                            if (basePath.search(draftId) >= 0 ||
-                                stringifiedBody.search(draftId) >= 0) {
-                                basePath = basePath.replace(draftId, canonicalId);
-                                stringifiedBody = stringifiedBody.replace(draftId, canonicalId);
-                                queueOperationMutated = true;
-                            }
-                            // if the action is performed on a previous draft id, we need to replace the action
-                            // with a new one at the updated canonical key
-                            if (queueActionTag === draftKey) {
-                                updatedActionTag = canonicalKey;
-                                updatedActionTargetId = canonicalId;
-                            }
+                    let queueOperationMutated = false;
+                    let updatedActionTag = undefined;
+                    let updatedActionTargetId = undefined;
+                    const { tag: queueActionTag, data: queueActionRequest, id: queueActionId, } = queueAction;
+                    let { basePath, body } = queueActionRequest;
+                    let stringifiedBody = stringify$4(body);
+                    // for each redirected ID/key we loop over the operation to see if it needs
+                    // to be updated
+                    for (const { draftId, draftKey, canonicalId, canonicalKey } of redirects) {
+                        if (basePath.search(draftId) >= 0 || stringifiedBody.search(draftId) >= 0) {
+                            basePath = basePath.replace(draftId, canonicalId);
+                            stringifiedBody = stringifiedBody.replace(draftId, canonicalId);
+                            queueOperationMutated = true;
                         }
-                        if (queueOperationMutated) {
-                            if (updatedActionTag !== undefined &&
-                                updatedActionTargetId !== undefined) {
-                                const updatedAction = {
-                                    ...queueAction,
-                                    tag: updatedActionTag,
-                                    targetId: updatedActionTargetId,
-                                    data: {
-                                        ...queueActionRequest,
-                                        basePath: basePath,
-                                        body: parse$4(stringifiedBody),
-                                    },
-                                };
-                                // item needs to be replaced with a new item at the new record key
-                                queueOperations.push({
-                                    type: QueueOperationType.Delete,
-                                    id: queueActionId,
-                                });
-                                queueOperations.push({
-                                    type: QueueOperationType.Add,
-                                    action: updatedAction,
-                                });
-                            }
-                            else {
-                                const updatedAction = {
-                                    ...queueAction,
-                                    data: {
-                                        ...queueActionRequest,
-                                        basePath: basePath,
-                                        body: parse$4(stringifiedBody),
-                                    },
-                                };
-                                // item needs to be updated
-                                queueOperations.push({
-                                    type: QueueOperationType.Update,
-                                    id: queueActionId,
-                                    action: updatedAction,
-                                });
-                            }
+                        // if the action is performed on a previous draft id, we need to replace the action
+                        // with a new one at the updated canonical key
+                        if (queueActionTag === draftKey) {
+                            updatedActionTag = canonicalKey;
+                            updatedActionTargetId = canonicalId;
+                        }
+                    }
+                    if (queueOperationMutated) {
+                        if (updatedActionTag !== undefined && updatedActionTargetId !== undefined) {
+                            const updatedAction = {
+                                ...queueAction,
+                                tag: updatedActionTag,
+                                targetId: updatedActionTargetId,
+                                data: {
+                                    ...queueActionRequest,
+                                    basePath: basePath,
+                                    body: parse$4(stringifiedBody),
+                                },
+                            };
+                            // item needs to be replaced with a new item at the new record key
+                            queueOperations.push({
+                                type: QueueOperationType.Delete,
+                                id: queueActionId,
+                            });
+                            queueOperations.push({
+                                type: QueueOperationType.Add,
+                                action: updatedAction,
+                            });
+                        }
+                        else {
+                            const updatedAction = {
+                                ...queueAction,
+                                data: {
+                                    ...queueActionRequest,
+                                    basePath: basePath,
+                                    body: parse$4(stringifiedBody),
+                                },
+                            };
+                            // item needs to be updated
+                            queueOperations.push({
+                                type: QueueOperationType.Update,
+                                id: queueActionId,
+                                action: updatedAction,
+                            });
                         }
                     }
                 }
@@ -5515,6 +5561,9 @@ class AbstractResourceRequestActionHandler {
         const body = action.response.body;
         const canonicalId = this.getIdFromResponseBody(body);
         const draftId = action.targetId;
+        if (draftId !== undefined && canonicalId !== undefined && draftId !== canonicalId) {
+            this.ephemeralRedirects[draftId] = canonicalId;
+        }
         return [
             {
                 draftId,
@@ -10220,7 +10269,8 @@ const assignedToMeFragmentSelections = [
     },
 ];
 function removeSyntheticFields(result, query) {
-    const connectionSelection = query.definitions
+    // It is possible that there are multiple record query.
+    const connectionSelections = query.definitions
         .filter(isOperationDefinitionNode)
         .reduce((accu, definition) => {
         return accu.concat(definition.selectionSet.selections);
@@ -10231,10 +10281,12 @@ function removeSyntheticFields(result, query) {
         .filter(isFieldNode)
         .filter(nodeIsNamed('query'))
         .reduce(extractSelections, [])
-        .filter(isFieldNode)[0];
+        .filter(isFieldNode);
     // queries that are not RecordQuery will be undefined here.
-    // we need to also check that connectionSelection is not undefined.
-    if (!connectionSelection || !connectionSelection.selectionSet) {
+    // we need to also check that connectionSelections are not undefined. If any connectionSelection has no `selectionSet` defined, that is a malformed query.
+    if (!connectionSelections ||
+        connectionSelections.length === 0 ||
+        connectionSelections.some((connection) => connection.selectionSet === undefined)) {
         return result;
     }
     const nodeJson = result.data.uiapi.query;
@@ -10243,10 +10295,15 @@ function removeSyntheticFields(result, query) {
     const output = { ...result };
     const outputApiParent = output.data.uiapi.query;
     const keys$1 = keys$3(nodeJson);
-    keys$1.forEach((apiName) => {
+    keys$1.forEach((recordName) => {
         const outputApi = {};
-        createUserJsonOutput(connectionSelection, nodeJson[apiName], outputApi);
-        outputApiParent[apiName] = outputApi;
+        // Each connectionSelection's maps its name or alias to one of returned records. The record name could be `apiName' or alias
+        const targetConnection = connectionSelections.find((connection) => connection.name.value === recordName ||
+            (connection.alias !== undefined && connection.alias.value === recordName));
+        if (targetConnection !== undefined) {
+            createUserJsonOutput(targetConnection, nodeJson[recordName], outputApi);
+            outputApiParent[recordName] = outputApi;
+        }
     });
     return output;
 }
@@ -11288,12 +11345,18 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
                 const fieldName = fieldNames[i];
                 const fieldValue = bodyFields[fieldName];
                 if (typeof fieldValue === 'string' && this.isDraftId(fieldValue)) {
-                    const draftKey = this.buildTagForTargetId(fieldValue);
-                    const canonicalKey = this.getLuvio().storeGetCanonicalKey(draftKey);
-                    if (draftKey !== canonicalKey) {
-                        const canonicalId = extractRecordIdFromStoreKey(canonicalKey);
-                        if (canonicalId !== undefined) {
-                            bodyFields[fieldName] = canonicalId;
+                    const canonicalId = this.ephemeralRedirects[fieldValue];
+                    if (canonicalId !== undefined) {
+                        bodyFields[fieldName] = canonicalId;
+                    }
+                    else {
+                        const draftKey = this.buildTagForTargetId(fieldValue);
+                        const canonicalKey = this.getLuvio().storeGetCanonicalKey(draftKey);
+                        if (draftKey !== canonicalKey) {
+                            const canonicalId = extractRecordIdFromStoreKey(canonicalKey);
+                            if (canonicalId !== undefined) {
+                                bodyFields[fieldName] = canonicalId;
+                            }
                         }
                     }
                 }
@@ -11301,17 +11364,24 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
         }
         if (request.method === 'patch' || request.method === 'delete') {
             const recordId = request.urlParams['recordId'];
-            const recordKey = this.buildTagForTargetId(recordId);
-            const canonicalKey = this.getLuvio().storeGetCanonicalKey(recordKey);
-            if (recordKey !== canonicalKey) {
-                const canonicalId = extractRecordIdFromStoreKey(canonicalKey);
-                if (canonicalId === undefined) {
-                    // could not resolve id from request -- return the request un-modified
-                    return request;
-                }
+            const canonicalId = this.ephemeralRedirects[recordId];
+            if (canonicalId !== undefined) {
                 resolvedBasePath = resolvedBasePath.replace(recordId, canonicalId);
                 resolvedUrlParams = { ...resolvedUrlParams, recordId: canonicalId };
             }
+            else {
+                const recordKey = this.buildTagForTargetId(recordId);
+                const canonicalKey = this.getLuvio().storeGetCanonicalKey(recordKey);
+                if (recordKey !== canonicalKey) {
+                    const canonicalId = extractRecordIdFromStoreKey(canonicalKey);
+                    if (canonicalId === undefined) {
+                        // could not resolve id from request -- return the request un-modified
+                        return request;
+                    }
+                    resolvedBasePath = resolvedBasePath.replace(recordId, canonicalId);
+                    resolvedUrlParams = { ...resolvedUrlParams, recordId: canonicalId };
+                }
+            }
         }
         return {
             ...request,
@@ -14659,34 +14729,6 @@ function setupInspection(luvio) {
  * For full license text, see the LICENSE.txt file
  */
 
-class AsyncWorkerPool {
-    constructor(concurrency) {
-        this.queue = [];
-        this.activeWorkers = 0;
-        this.concurrency = concurrency;
-    }
-    push(workFn) {
-        this.queue.push(workFn);
-        this.work();
-    }
-    cancel() {
-        this.queue = [];
-        // TODO [W-12513105]: thread cancellation through to active workers
-    }
-    work() {
-        while (this.queue.length > 0 && this.activeWorkers < this.concurrency) {
-            this.activeWorkers += 1;
-            const next = this.queue.shift();
-            if (next) {
-                next().finally(() => {
-                    this.activeWorkers -= 1;
-                    this.work();
-                });
-            }
-        }
-    }
-}
-
 class EventEmitter {
     constructor() {
         // @ts-ignore typescript doesn't like us setting this to an empty object for some reason
@@ -15239,4 +15281,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.100.2-ca56bb821
+// version: 1.100.4-ce1be23b7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-mobile",
-    "version": "1.100.2",
+    "version": "1.100.4",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS runtime for mobile/hybrid environments.",
     "main": "dist/main.js",
@@ -32,10 +32,10 @@
         "release:corejar": "yarn build && ../core-build/scripts/core.js --name=lds-runtime-mobile"
     },
     "dependencies": {
-        "@salesforce/lds-adapters-uiapi": "^1.100.2",
-        "@salesforce/lds-bindings": "^1.100.2",
-        "@salesforce/lds-instrumentation": "^1.100.2",
-        "@salesforce/lds-priming": "^1.100.2",
+        "@salesforce/lds-adapters-uiapi": "^1.100.4",
+        "@salesforce/lds-bindings": "^1.100.4",
+        "@salesforce/lds-instrumentation": "^1.100.4",
+        "@salesforce/lds-priming": "^1.100.4",
         "@salesforce/user": "0.0.12",
         "o11y": "244.0.0"
     },
@@ -43,16 +43,16 @@
         "@luvio/engine": "0.135.4",
         "@luvio/environments": "0.135.4",
         "@luvio/graphql-parser": "0.135.4",
-        "@salesforce/lds-adapters-graphql": "^1.100.2",
-        "@salesforce/lds-drafts": "^1.100.2",
-        "@salesforce/lds-drafts-adapters-uiapi": "^1.100.2",
-        "@salesforce/lds-graphql-eval": "^1.100.2",
-        "@salesforce/lds-network-adapter": "^1.100.2",
-        "@salesforce/lds-network-nimbus": "^1.100.2",
-        "@salesforce/lds-store-binary": "^1.100.2",
-        "@salesforce/lds-store-sql": "^1.100.2",
-        "@salesforce/lds-utils-adapters": "^1.100.2",
-        "@salesforce/nimbus-plugin-lds": "^1.100.2",
+        "@salesforce/lds-adapters-graphql": "^1.100.4",
+        "@salesforce/lds-drafts": "^1.100.4",
+        "@salesforce/lds-drafts-adapters-uiapi": "^1.100.4",
+        "@salesforce/lds-graphql-eval": "^1.100.4",
+        "@salesforce/lds-network-adapter": "^1.100.4",
+        "@salesforce/lds-network-nimbus": "^1.100.4",
+        "@salesforce/lds-store-binary": "^1.100.4",
+        "@salesforce/lds-store-sql": "^1.100.4",
+        "@salesforce/lds-utils-adapters": "^1.100.4",
+        "@salesforce/nimbus-plugin-lds": "^1.100.4",
         "babel-plugin-dynamic-import-node": "^2.3.3",
         "wait-for-expect": "^3.0.2"
     },

package/sfdc/main.js

@@ -4344,6 +4344,44 @@ function makeStoreEval(preconditioner, objectInfoService, userId, contextProvide
     return wrapStartEndEvents(storeEval);
 }
 
+/**
+ * Copyright (c) 2022, Salesforce, Inc.,
+ * All rights reserved.
+ * For full license text, see the LICENSE.txt file
+ */
+
+class AsyncWorkerPool {
+    constructor(concurrency) {
+        this.queue = [];
+        this.activeWorkers = 0;
+        this.concurrency = concurrency;
+    }
+    push(workFn) {
+        return new Promise((resolve, reject) => {
+            this.queue.push(async () => {
+                return workFn().then(resolve).catch(reject);
+            });
+            this.work();
+        });
+    }
+    cancel() {
+        this.queue = [];
+        // TODO [W-12513105]: thread cancellation through to active workers
+    }
+    work() {
+        while (this.queue.length > 0 && this.activeWorkers < this.concurrency) {
+            this.activeWorkers += 1;
+            const next = this.queue.shift();
+            if (next) {
+                next().finally(() => {
+                    this.activeWorkers -= 1;
+                    this.work();
+                });
+            }
+        }
+    }
+}
+
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
  * All rights reserved.
@@ -4762,6 +4800,7 @@ class DurableDraftQueue {
         this.timeoutHandler = undefined;
         this.handlers = {};
         this.draftStore = draftStore;
+        this.workerPool = new AsyncWorkerPool(1);
     }
     addHandler(handler) {
         const id = handler.handlerId;
@@ -4861,20 +4900,22 @@ class DurableDraftQueue {
         });
     }
     async enqueue(handlerId, data) {
-        let queue = await this.getQueueActions();
-        const handler = this.getHandler(handlerId);
-        const pendingAction = (await handler.buildPendingAction(data, queue));
-        await this.draftStore.writeAction(pendingAction);
-        queue = await this.getQueueActions();
-        await this.notifyChangedListeners({
-            type: DraftQueueEventType.ActionAdded,
-            action: pendingAction,
+        return this.workerPool.push(async () => {
+            let queue = await this.getQueueActions();
+            const handler = this.getHandler(handlerId);
+            const pendingAction = (await handler.buildPendingAction(data, queue));
+            await this.draftStore.writeAction(pendingAction);
+            queue = await this.getQueueActions();
+            await this.notifyChangedListeners({
+                type: DraftQueueEventType.ActionAdded,
+                action: pendingAction,
+            });
+            await handler.handleActionEnqueued(pendingAction, queue);
+            if (this.state === DraftQueueState.Started) {
+                this.processNextAction();
+            }
+            return pendingAction;
         });
-        await handler.handleActionEnqueued(pendingAction, queue);
-        if (this.state === DraftQueueState.Started) {
-            this.processNextAction();
-        }
-        return pendingAction;
     }
     registerOnChangedListener(listener) {
         this.draftQueueChangedListeners.push(listener);
@@ -4886,27 +4927,29 @@ class DurableDraftQueue {
         };
     }
     async actionCompleted(action) {
-        const handler = this.getHandler(action.handler);
-        let queue = await this.getQueueActions();
-        const queueOperations = handler.getQueueOperationsForCompletingDrafts(queue, action);
-        const idAndKeyMappings = handler.getRedirectMappings(action);
-        const keyMappings = idAndKeyMappings === undefined
-            ? undefined
-            : idAndKeyMappings.map((m) => {
-                return { draftKey: m.draftKey, canonicalKey: m.canonicalKey };
+        return this.workerPool.push(async () => {
+            const handler = this.getHandler(action.handler);
+            let queue = await this.getQueueActions();
+            const queueOperations = handler.getQueueOperationsForCompletingDrafts(queue, action);
+            const idAndKeyMappings = handler.getRedirectMappings(action);
+            const keyMappings = idAndKeyMappings === undefined
+                ? undefined
+                : idAndKeyMappings.map((m) => {
+                    return { draftKey: m.draftKey, canonicalKey: m.canonicalKey };
+                });
+            await this.draftStore.completeAction(queueOperations, keyMappings);
+            queue = await this.getQueueActions();
+            this.retryIntervalMilliseconds = 0;
+            this.uploadingActionId = undefined;
+            await handler.handleActionCompleted(action, queueOperations, queue, values$1(this.handlers));
+            await this.notifyChangedListeners({
+                type: DraftQueueEventType.ActionCompleted,
+                action,
             });
-        await this.draftStore.completeAction(queueOperations, keyMappings);
-        queue = await this.getQueueActions();
-        this.retryIntervalMilliseconds = 0;
-        this.uploadingActionId = undefined;
-        await handler.handleActionCompleted(action, queueOperations, queue, values$1(this.handlers));
-        await this.notifyChangedListeners({
-            type: DraftQueueEventType.ActionCompleted,
-            action,
+            if (this.state === DraftQueueState.Started) {
+                this.processNextAction();
+            }
         });
-        if (this.state === DraftQueueState.Started) {
-            this.processNextAction();
-        }
     }
     async actionFailed(action, retry) {
         this.uploadingActionId = undefined;
@@ -5356,6 +5399,13 @@ class AbstractResourceRequestActionHandler {
         this.draftQueue = draftQueue;
         this.networkAdapter = networkAdapter;
         this.getLuvio = getLuvio;
+        // NOTE[W-12567340]: This property stores in-memory mappings between draft
+        // ids and canonical ids for the current session. Having a local copy of
+        // these mappings is necessary to avoid a race condition between publishing
+        // new mappings to the durable store and those mappings being loaded into
+        // the luvio store redirect table, during which a new draft might be enqueued
+        // which would not see a necessary mapping.
+        this.ephemeralRedirects = {};
     }
     enqueue(data) {
         return this.draftQueue.enqueue(this.handlerId, data);
@@ -5423,7 +5473,8 @@ class AbstractResourceRequestActionHandler {
     }
     getQueueOperationsForCompletingDrafts(queue, action) {
         const queueOperations = [];
-        if (action.data.method === 'post') {
+        const redirects = this.getRedirectMappings(action);
+        if (redirects !== undefined) {
             const { length } = queue;
             for (let i = 0; i < length; i++) {
                 const queueAction = queue[i];
@@ -5433,69 +5484,64 @@ class AbstractResourceRequestActionHandler {
                     continue;
                 }
                 if (isResourceRequestAction(queueAction)) {
-                    const redirects = this.getRedirectMappings(action);
-                    if (redirects !== undefined) {
-                        let queueOperationMutated = false;
-                        let updatedActionTag = undefined;
-                        let updatedActionTargetId = undefined;
-                        const { tag: queueActionTag, data: queueActionRequest, id: queueActionId, } = queueAction;
-                        let { basePath, body } = queueActionRequest;
-                        let stringifiedBody = stringify$4(body);
-                        // for each redirected ID/key we loop over the operation to see if it needs
-                        // to be updated
-                        for (const { draftId, draftKey, canonicalId, canonicalKey } of redirects) {
-                            if (basePath.search(draftId) >= 0 ||
-                                stringifiedBody.search(draftId) >= 0) {
-                                basePath = basePath.replace(draftId, canonicalId);
-                                stringifiedBody = stringifiedBody.replace(draftId, canonicalId);
-                                queueOperationMutated = true;
-                            }
-                            // if the action is performed on a previous draft id, we need to replace the action
-                            // with a new one at the updated canonical key
-                            if (queueActionTag === draftKey) {
-                                updatedActionTag = canonicalKey;
-                                updatedActionTargetId = canonicalId;
-                            }
+                    let queueOperationMutated = false;
+                    let updatedActionTag = undefined;
+                    let updatedActionTargetId = undefined;
+                    const { tag: queueActionTag, data: queueActionRequest, id: queueActionId, } = queueAction;
+                    let { basePath, body } = queueActionRequest;
+                    let stringifiedBody = stringify$4(body);
+                    // for each redirected ID/key we loop over the operation to see if it needs
+                    // to be updated
+                    for (const { draftId, draftKey, canonicalId, canonicalKey } of redirects) {
+                        if (basePath.search(draftId) >= 0 || stringifiedBody.search(draftId) >= 0) {
+                            basePath = basePath.replace(draftId, canonicalId);
+                            stringifiedBody = stringifiedBody.replace(draftId, canonicalId);
+                            queueOperationMutated = true;
                         }
-                        if (queueOperationMutated) {
-                            if (updatedActionTag !== undefined &&
-                                updatedActionTargetId !== undefined) {
-                                const updatedAction = {
-                                    ...queueAction,
-                                    tag: updatedActionTag,
-                                    targetId: updatedActionTargetId,
-                                    data: {
-                                        ...queueActionRequest,
-                                        basePath: basePath,
-                                        body: parse$4(stringifiedBody),
-                                    },
-                                };
-                                // item needs to be replaced with a new item at the new record key
-                                queueOperations.push({
-                                    type: QueueOperationType.Delete,
-                                    id: queueActionId,
-                                });
-                                queueOperations.push({
-                                    type: QueueOperationType.Add,
-                                    action: updatedAction,
-                                });
-                            }
-                            else {
-                                const updatedAction = {
-                                    ...queueAction,
-                                    data: {
-                                        ...queueActionRequest,
-                                        basePath: basePath,
-                                        body: parse$4(stringifiedBody),
-                                    },
-                                };
-                                // item needs to be updated
-                                queueOperations.push({
-                                    type: QueueOperationType.Update,
-                                    id: queueActionId,
-                                    action: updatedAction,
-                                });
-                            }
+                        // if the action is performed on a previous draft id, we need to replace the action
+                        // with a new one at the updated canonical key
+                        if (queueActionTag === draftKey) {
+                            updatedActionTag = canonicalKey;
+                            updatedActionTargetId = canonicalId;
+                        }
+                    }
+                    if (queueOperationMutated) {
+                        if (updatedActionTag !== undefined && updatedActionTargetId !== undefined) {
+                            const updatedAction = {
+                                ...queueAction,
+                                tag: updatedActionTag,
+                                targetId: updatedActionTargetId,
+                                data: {
+                                    ...queueActionRequest,
+                                    basePath: basePath,
+                                    body: parse$4(stringifiedBody),
+                                },
+                            };
+                            // item needs to be replaced with a new item at the new record key
+                            queueOperations.push({
+                                type: QueueOperationType.Delete,
+                                id: queueActionId,
+                            });
+                            queueOperations.push({
+                                type: QueueOperationType.Add,
+                                action: updatedAction,
+                            });
+                        }
+                        else {
+                            const updatedAction = {
+                                ...queueAction,
+                                data: {
+                                    ...queueActionRequest,
+                                    basePath: basePath,
+                                    body: parse$4(stringifiedBody),
+                                },
+                            };
+                            // item needs to be updated
+                            queueOperations.push({
+                                type: QueueOperationType.Update,
+                                id: queueActionId,
+                                action: updatedAction,
+                            });
                         }
                     }
                 }
@@ -5515,6 +5561,9 @@ class AbstractResourceRequestActionHandler {
         const body = action.response.body;
         const canonicalId = this.getIdFromResponseBody(body);
         const draftId = action.targetId;
+        if (draftId !== undefined && canonicalId !== undefined && draftId !== canonicalId) {
+            this.ephemeralRedirects[draftId] = canonicalId;
+        }
         return [
             {
                 draftId,
@@ -10220,7 +10269,8 @@ const assignedToMeFragmentSelections = [
     },
 ];
 function removeSyntheticFields(result, query) {
-    const connectionSelection = query.definitions
+    // It is possible that there are multiple record query.
+    const connectionSelections = query.definitions
         .filter(isOperationDefinitionNode)
         .reduce((accu, definition) => {
         return accu.concat(definition.selectionSet.selections);
@@ -10231,10 +10281,12 @@ function removeSyntheticFields(result, query) {
         .filter(isFieldNode)
         .filter(nodeIsNamed('query'))
         .reduce(extractSelections, [])
-        .filter(isFieldNode)[0];
+        .filter(isFieldNode);
     // queries that are not RecordQuery will be undefined here.
-    // we need to also check that connectionSelection is not undefined.
-    if (!connectionSelection || !connectionSelection.selectionSet) {
+    // we need to also check that connectionSelections are not undefined. If any connectionSelection has no `selectionSet` defined, that is a malformed query.
+    if (!connectionSelections ||
+        connectionSelections.length === 0 ||
+        connectionSelections.some((connection) => connection.selectionSet === undefined)) {
         return result;
     }
     const nodeJson = result.data.uiapi.query;
@@ -10243,10 +10295,15 @@ function removeSyntheticFields(result, query) {
     const output = { ...result };
     const outputApiParent = output.data.uiapi.query;
     const keys$1 = keys$3(nodeJson);
-    keys$1.forEach((apiName) => {
+    keys$1.forEach((recordName) => {
         const outputApi = {};
-        createUserJsonOutput(connectionSelection, nodeJson[apiName], outputApi);
-        outputApiParent[apiName] = outputApi;
+        // Each connectionSelection's maps its name or alias to one of returned records. The record name could be `apiName' or alias
+        const targetConnection = connectionSelections.find((connection) => connection.name.value === recordName ||
+            (connection.alias !== undefined && connection.alias.value === recordName));
+        if (targetConnection !== undefined) {
+            createUserJsonOutput(targetConnection, nodeJson[recordName], outputApi);
+            outputApiParent[recordName] = outputApi;
+        }
     });
     return output;
 }
@@ -11288,12 +11345,18 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
                 const fieldName = fieldNames[i];
                 const fieldValue = bodyFields[fieldName];
                 if (typeof fieldValue === 'string' && this.isDraftId(fieldValue)) {
-                    const draftKey = this.buildTagForTargetId(fieldValue);
-                    const canonicalKey = this.getLuvio().storeGetCanonicalKey(draftKey);
-                    if (draftKey !== canonicalKey) {
-                        const canonicalId = extractRecordIdFromStoreKey(canonicalKey);
-                        if (canonicalId !== undefined) {
-                            bodyFields[fieldName] = canonicalId;
+                    const canonicalId = this.ephemeralRedirects[fieldValue];
+                    if (canonicalId !== undefined) {
+                        bodyFields[fieldName] = canonicalId;
+                    }
+                    else {
+                        const draftKey = this.buildTagForTargetId(fieldValue);
+                        const canonicalKey = this.getLuvio().storeGetCanonicalKey(draftKey);
+                        if (draftKey !== canonicalKey) {
+                            const canonicalId = extractRecordIdFromStoreKey(canonicalKey);
+                            if (canonicalId !== undefined) {
+                                bodyFields[fieldName] = canonicalId;
+                            }
                         }
                     }
                 }
@@ -11301,17 +11364,24 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
         }
         if (request.method === 'patch' || request.method === 'delete') {
             const recordId = request.urlParams['recordId'];
-            const recordKey = this.buildTagForTargetId(recordId);
-            const canonicalKey = this.getLuvio().storeGetCanonicalKey(recordKey);
-            if (recordKey !== canonicalKey) {
-                const canonicalId = extractRecordIdFromStoreKey(canonicalKey);
-                if (canonicalId === undefined) {
-                    // could not resolve id from request -- return the request un-modified
-                    return request;
-                }
+            const canonicalId = this.ephemeralRedirects[recordId];
+            if (canonicalId !== undefined) {
                 resolvedBasePath = resolvedBasePath.replace(recordId, canonicalId);
                 resolvedUrlParams = { ...resolvedUrlParams, recordId: canonicalId };
             }
+            else {
+                const recordKey = this.buildTagForTargetId(recordId);
+                const canonicalKey = this.getLuvio().storeGetCanonicalKey(recordKey);
+                if (recordKey !== canonicalKey) {
+                    const canonicalId = extractRecordIdFromStoreKey(canonicalKey);
+                    if (canonicalId === undefined) {
+                        // could not resolve id from request -- return the request un-modified
+                        return request;
+                    }
+                    resolvedBasePath = resolvedBasePath.replace(recordId, canonicalId);
+                    resolvedUrlParams = { ...resolvedUrlParams, recordId: canonicalId };
+                }
+            }
         }
         return {
             ...request,
@@ -14659,34 +14729,6 @@ function setupInspection(luvio) {
  * For full license text, see the LICENSE.txt file
  */
 
-class AsyncWorkerPool {
-    constructor(concurrency) {
-        this.queue = [];
-        this.activeWorkers = 0;
-        this.concurrency = concurrency;
-    }
-    push(workFn) {
-        this.queue.push(workFn);
-        this.work();
-    }
-    cancel() {
-        this.queue = [];
-        // TODO [W-12513105]: thread cancellation through to active workers
-    }
-    work() {
-        while (this.queue.length > 0 && this.activeWorkers < this.concurrency) {
-            this.activeWorkers += 1;
-            const next = this.queue.shift();
-            if (next) {
-                next().finally(() => {
-                    this.activeWorkers -= 1;
-                    this.work();
-                });
-            }
-        }
-    }
-}
-
 class EventEmitter {
     constructor() {
         // @ts-ignore typescript doesn't like us setting this to an empty object for some reason
@@ -15239,4 +15281,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.100.2-ca56bb821
+// version: 1.100.4-ce1be23b7