@salesforce/lds-worker-api 1.100.2 → 1.100.4

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

@@ -3782,7 +3782,7 @@
         }
         callbacks.push(callback);
     }
-    // version: 1.100.2-ca56bb821
+    // version: 1.100.4-ce1be23b7
 
     // 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.100.2-ca56bb821
+    // version: 1.100.4-ce1be23b7
 
     function unwrap(data) {
         // The lwc-luvio bindings import a function from lwc called "unwrap".
@@ -16087,7 +16087,7 @@
         const { apiFamily, name } = metadata;
         return createGraphQLWireAdapterConstructor$1(adapter, `${apiFamily}.${name}`, luvio, astResolver);
     }
-    // version: 1.100.2-ca56bb821
+    // version: 1.100.4-ce1be23b7
 
     /**
      * Copyright (c) 2022, Salesforce, Inc.,
@@ -43640,7 +43640,7 @@
             dropFunction: instrumentation$2.notifyRecordUpdateAvailableDropped,
         });
     });
-    // version: 1.100.2-ca56bb821
+    // version: 1.100.4-ce1be23b7
 
     var caseSensitiveUserId = '005B0000000GR4OIAW';
 
@@ -48012,6 +48012,44 @@
         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.
@@ -48430,6 +48468,7 @@
             this.timeoutHandler = undefined;
             this.handlers = {};
             this.draftStore = draftStore;
+            this.workerPool = new AsyncWorkerPool(1);
         }
         addHandler(handler) {
             const id = handler.handlerId;
@@ -48529,20 +48568,22 @@
             });
         }
         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);
@@ -48554,27 +48595,29 @@
             };
         }
         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;
@@ -49010,6 +49053,13 @@
             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);
@@ -49077,7 +49127,8 @@
         }
         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];
@@ -49087,69 +49138,64 @@
                         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,
+                                });
                             }
                         }
                     }
@@ -49169,6 +49215,9 @@
             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,
@@ -53874,7 +53923,8 @@
         },
     ];
     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);
@@ -53885,10 +53935,12 @@
             .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;
@@ -53897,10 +53949,15 @@
         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;
     }
@@ -54942,12 +54999,18 @@
                     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;
+                                }
                             }
                         }
                     }
@@ -54955,17 +55018,24 @@
             }
             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,
@@ -58198,34 +58268,6 @@
      * 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
@@ -58774,7 +58816,7 @@
         id: '@salesforce/lds-network-adapter',
         instrument: instrument$1,
     });
-    // version: 1.100.2-ca56bb821
+    // version: 1.100.4-ce1be23b7
 
     const { create: create$2, keys: keys$2 } = Object;
     const { stringify: stringify$1, parse: parse$1 } = JSON;
@@ -76427,7 +76469,7 @@
         configuration: { ...configurationForGraphQLAdapters },
         instrument,
     });
-    // version: 1.100.2-ca56bb821
+    // version: 1.100.4-ce1be23b7
 
     // On core the unstable adapters are re-exported with different names,
 
@@ -78556,7 +78598,7 @@
         unstable_graphQL_imperative = createImperativeAdapter(luvio, createInstrumentedAdapter(ldsAdapter, adapterMetadata), adapterMetadata);
         graphQLImperative = ldsAdapter;
     });
-    // version: 1.100.2-ca56bb821
+    // version: 1.100.4-ce1be23b7
 
     var gqlApi = /*#__PURE__*/Object.freeze({
         __proto__: null,
@@ -79247,4 +79289,4 @@
     Object.defineProperty(exports, '__esModule', { value: true });
 
 }));
-// version: 1.100.2-ca56bb821
+// version: 1.100.4-ce1be23b7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-worker-api",
-    "version": "1.100.2",
+    "version": "1.100.4",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "",
     "main": "dist/standalone/umd/lds-worker-api.js",
@@ -37,15 +37,15 @@
         "@luvio/engine": "0.135.4",
         "@luvio/environments": "0.135.4",
         "@oat-sa/rollup-plugin-wildcard-external": "^0.1.0",
-        "@salesforce/lds-adapters-graphql": "^1.100.2",
-        "@salesforce/lds-adapters-uiapi": "^1.100.2",
-        "@salesforce/lds-default-luvio": "^1.100.2",
-        "@salesforce/lds-drafts": "^1.100.2",
-        "@salesforce/lds-graphql-parser": "^1.100.2",
-        "@salesforce/lds-luvio-engine": "^1.100.2",
-        "@salesforce/lds-priming": "^1.100.2",
-        "@salesforce/lds-runtime-mobile": "^1.100.2",
-        "@salesforce/nimbus-plugin-lds": "^1.100.2",
+        "@salesforce/lds-adapters-graphql": "^1.100.4",
+        "@salesforce/lds-adapters-uiapi": "^1.100.4",
+        "@salesforce/lds-default-luvio": "^1.100.4",
+        "@salesforce/lds-drafts": "^1.100.4",
+        "@salesforce/lds-graphql-parser": "^1.100.4",
+        "@salesforce/lds-luvio-engine": "^1.100.4",
+        "@salesforce/lds-priming": "^1.100.4",
+        "@salesforce/lds-runtime-mobile": "^1.100.4",
+        "@salesforce/nimbus-plugin-lds": "^1.100.4",
         "ajv": "^8.11.0",
         "glob": "^7.1.5",
         "nimbus-types": "^2.0.0-alpha1",

package/src/__tests__/data-driven-tests/fixtures/adapter-testcases/graphQL/multiple-recordquery.adapter-testcase.json

@@ -0,0 +1,28 @@
+{
+    "testCaseName": "Mutiple record queries are supported",
+    "adapters": [
+        {
+            "name": "getObjectInfo",
+            "config": { "objectApiName": "ServiceAppointment" }
+        },
+        {
+            "name": "getObjectInfo",
+            "config": { "objectApiName": "Account" }
+        },
+        {
+            "name": "graphql",
+            "config": {
+                "query": "{ uiapi { query { Account(first: 1) @category(name: \"recordQuery\") { edges { node { Id }} } ServiceAppointment(first: 1  where:{OwnerId:{eq :\"005x0000000xPQs\"}}) @category(name: \"recordQuery\") { edges { node { Id AppointmentNumber {value} } } } second: ServiceAppointment(first: 2 where:{OwnerId:{eq :\"005x0000000xPQs\"}}) @category(name: \"recordQuery\") { edges { node { Id AccountId {value} } } }}}}",
+                "variables": {}
+            },
+            "expectedToSucceed": true,
+            "expectedResult": "./adapter-testcases/graphQL/snapshotdata/multiple-recordquery.adapter-snapshot.result.json"
+        }
+    ],
+    "networkMocks": [
+        "./adapter-testcases/graphQL/objectInfos/ServiceAppointment.network-mock.json",
+        "./adapter-testcases/graphQL/objectInfos/Account.network-mock.json",
+        "./adapter-testcases/graphQL/serverresponse/multiple-recordquery.server-response.network-mock.json"
+    ],
+    "freezeTime": true
+}