@salesforce/lds-worker-api 1.145.0 → 1.146.0

package/dist/sfdc/es/ldsWorkerApi.js

@@ -758,4 +758,4 @@ if (process.env.NODE_ENV !== 'production') {
 }
 
 export { createPrimingSession, draftManager, draftQueue, executeAdapter, executeMutatingAdapter, getImperativeAdapterNames, invokeAdapter, invokeAdapterWithDraftToReplace, invokeAdapterWithMetadata, nimbusDraftQueue, setMetadataTTL, setUiApiRecordTTL, subscribeToAdapter };
-// version: 1.145.0-a93c76713
+// version: 1.146.0-6ca270a7a

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

@@ -657,7 +657,8 @@ class StringKeyInMemoryStore {
         if (key === canonicalKey) {
             throw new Error('cannot redirect a key to itself');
         }
-        if (reverseRedirectKeys[canonicalKey] !== undefined) {
+        if (reverseRedirectKeys[canonicalKey] !== undefined &&
+            reverseRedirectKeys[canonicalKey] !== key) {
             throw new Error('cannot have multiple redirects keys point to the same canonical key');
         }
         if (redirectKeys[canonicalKey] !== undefined) {
@@ -3673,7 +3674,7 @@ class Luvio {
         return this.environment.buildStructuredKey(namespace, representationName, idValues);
     }
 }
-// engine version: 0.142.4-be29f4f3
+// engine version: 0.143.0-384dfa26
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -3800,7 +3801,7 @@ function withDefaultLuvio(callback) {
     }
     callbacks.push(callback);
 }
-// version: 1.145.0-a93c76713
+// version: 1.146.0-6ca270a7a
 
 // TODO [TD-0081508]: once that TD is fulfilled we can probably change this file
 function instrumentAdapter$1(createFunction, _metadata) {
@@ -15224,7 +15225,7 @@ function parseAndVisit(source) {
     updateReferenceMapWithKnownKey(ast, luvioDocumentNode);
     return luvioDocumentNode;
 }
-// version: 1.145.0-a93c76713
+// version: 1.146.0-6ca270a7a
 
 function unwrap(data) {
     // The lwc-luvio bindings import a function from lwc called "unwrap".
@@ -16137,7 +16138,7 @@ function createGraphQLWireAdapterConstructor(luvio, adapter, metadata, astResolv
     const { apiFamily, name } = metadata;
     return createGraphQLWireAdapterConstructor$1(adapter, `${apiFamily}.${name}`, luvio, astResolver);
 }
-// version: 1.145.0-a93c76713
+// version: 1.146.0-6ca270a7a
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -16220,7 +16221,7 @@ var FragmentReadResultState;
 ({
     state: FragmentReadResultState.Missing,
 });
-// engine version: 0.142.4-be29f4f3
+// engine version: 0.143.0-384dfa26
 
 const { keys: ObjectKeys$3, create: ObjectCreate$3 } = Object;
 
@@ -44007,7 +44008,7 @@ withDefaultLuvio((luvio) => {
         dropFunction: instrumentation$2.notifyRecordUpdateAvailableDropped,
     });
 });
-// version: 1.145.0-5ff081cdd
+// version: 1.146.0-83a1d3266
 
 var caseSensitiveUserId = '005B0000000GR4OIAW';
 
@@ -44592,6 +44593,7 @@ function isDeprecatedDurableStoreEntry(durableRecord) {
     return false;
 }
 const DefaultDurableSegment = 'DEFAULT';
+const RedirectDurableSegment = 'REDIRECT_KEYS';
 
 const { keys: keys$6, create: create$5, assign: assign$4, freeze: freeze$1$1 } = Object;
 
@@ -44832,7 +44834,7 @@ class DurableTTLStore {
     }
 }
 
-function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler, additionalDurableStoreOperations = []) {
+function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler, redirects, additionalDurableStoreOperations = []) {
     const durableRecords = create$5(null);
     const evictedRecords = create$5(null);
     const { records, metadata: storeMetadata, visitedIds, refreshedIds, } = store.fallbackStringKeyInMemoryStore;
@@ -44869,6 +44871,18 @@ function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStor
             segment: DefaultDurableSegment,
         });
     }
+    // redirects
+    redirects.forEach((value, key) => {
+        durableStoreOperations.push({
+            type: 'setEntries',
+            entries: {
+                [key]: {
+                    data: { key, redirect: value },
+                },
+            },
+            segment: RedirectDurableSegment,
+        });
+    });
     // evicts
     const evictedKeys = keys$6(evictedRecords);
     if (evictedKeys.length > 0) {
@@ -44914,6 +44928,19 @@ function buildIngestStagingStore(environment) {
     return environment.storeBuildIngestionStagingStore();
 }
 
+async function reviveRedirects(durableStore, env) {
+    const entries = await durableStore.getAllEntries(RedirectDurableSegment);
+    if (entries) {
+        for (const durableEntry of Object.keys(entries)) {
+            const entry = entries[durableEntry];
+            const { data: { key, redirect }, } = entry;
+            if (entry) {
+                env.storeRedirect(key, redirect);
+            }
+        }
+    }
+}
+
 const AdapterContextSegment = 'ADAPTER-CONTEXT';
 const ADAPTER_CONTEXT_ID_SUFFIX = '__NAMED_CONTEXT';
 async function reviveOrCreateContext(adapterId, durableStore, durableStoreErrorHandler, contextStores, pendingContextStoreKeys, onContextLoaded) {
@@ -44977,13 +45004,18 @@ function makeDurable(environment, { durableStore, instrumentation }) {
     // event. If this instance of makeDurable caused that L2 write we can ignore that
     // on change event. This Set helps us do that.
     const pendingContextStoreKeys = new Set();
+    // redirects that need to be flushed to the durable store
+    const pendingStoreRedirects = new Map();
     const contextStores = create$5(null);
     let initializationPromise = new Promise((resolve) => {
         const finish = () => {
             resolve();
             initializationPromise = undefined;
         };
-        reviveTTLOverrides(durableTTLStore, environment).then(finish);
+        Promise.all([
+            reviveTTLOverrides(durableTTLStore, environment),
+            reviveRedirects(durableStore, environment),
+        ]).then(finish);
     });
     //instrumentation for durable store errors
     const durableStoreErrorHandler = handleDurableStoreRejection(instrumentation);
@@ -44996,6 +45028,8 @@ function makeDurable(environment, { durableStore, instrumentation }) {
     const unsubscribe = durableStore.registerOnChangedListener(async (changes) => {
         const defaultSegmentKeys = [];
         const adapterContextSegmentKeys = [];
+        const redirectSegmentKeys = [];
+        let shouldBroadcast = false;
         for (let i = 0, len = changes.length; i < len; i++) {
             const change = changes[i];
             // we only care about changes to the data which is stored in the default
@@ -45006,6 +45040,20 @@ function makeDurable(environment, { durableStore, instrumentation }) {
             else if (change.segment === AdapterContextSegment) {
                 adapterContextSegmentKeys.push(...change.ids);
             }
+            else if (change.segment === RedirectDurableSegment) {
+                redirectSegmentKeys.push(...change.ids);
+            }
+        }
+        if (redirectSegmentKeys.length > 0) {
+            const redirectEntries = await durableStore.getEntries(redirectSegmentKeys, RedirectDurableSegment);
+            if (redirectEntries !== undefined) {
+                const redirectKeys = Object.keys(redirectEntries);
+                for (const key of redirectKeys) {
+                    const redirectData = redirectEntries[key];
+                    environment.storeRedirect(redirectData.data.key, redirectData.data.redirect);
+                    shouldBroadcast = true;
+                }
+            }
         }
         // process adapter context changes
         const adapterContextKeysFromDifferentInstance = [];
@@ -45042,10 +45090,6 @@ function makeDurable(environment, { durableStore, instrumentation }) {
         if (defaultSegmentKeysLength > 0) {
             for (let i = 0; i < defaultSegmentKeysLength; i++) {
                 const key = defaultSegmentKeys[i];
-                const canonical = environment.storeGetCanonicalKey(key);
-                if (canonical !== key) {
-                    continue;
-                }
                 // TODO: W-8909393 If expiration is the only thing that changed we should not evict the data... so
                 // if we stored expiration and data at different keys (or same keys in different segments)
                 // then we could know if only the expiration has changed and we wouldn't need to evict
@@ -45053,6 +45097,9 @@ function makeDurable(environment, { durableStore, instrumentation }) {
                 // call base environment storeEvict so this evict is not tracked for durable deletion
                 environment.storeEvict(key);
             }
+            shouldBroadcast = true;
+        }
+        if (shouldBroadcast) {
             await environment.storeBroadcast(rebuildSnapshot, environment.snapshotAvailable);
         }
     });
@@ -45108,7 +45155,8 @@ function makeDurable(environment, { durableStore, instrumentation }) {
         if (ingestStagingStore === null) {
             return Promise.resolve();
         }
-        const promise = flushInMemoryStoreValuesToDurableStore(ingestStagingStore, durableStore, durableStoreErrorHandler, additionalDurableStoreOperations);
+        const promise = flushInMemoryStoreValuesToDurableStore(ingestStagingStore, durableStore, durableStoreErrorHandler, new Map(pendingStoreRedirects), additionalDurableStoreOperations);
+        pendingStoreRedirects.clear();
         ingestStagingStore = null;
         return promise;
     };
@@ -45190,6 +45238,7 @@ function makeDurable(environment, { durableStore, instrumentation }) {
     };
     const storeRedirect = function (existingKey, canonicalKey) {
         validateNotDisposed();
+        pendingStoreRedirects.set(existingKey, canonicalKey);
         // call redirect on staging store so "old" keys are removed from L2 on
         // the next publishChangesToDurableStore.  NOTE: we don't need to call
         // redirect on the base environment store because staging store and base
@@ -48901,7 +48950,6 @@ function buildLuvioOverrideForDraftAdapters(luvio, handler, extractTargetIdFromC
 }
 
 const DraftIdMappingKeyPrefix240 = 'DraftIdMapping::';
-const DraftKeyMappingKeyPrefix = 'DraftKeyMapping::V2::';
 const DRAFT_ID_MAPPINGS_SEGMENT = 'DRAFT_ID_MAPPINGS';
 function isLegacyDraftIdMapping(key, data) {
     return key.startsWith(DraftIdMappingKeyPrefix240);
@@ -48911,9 +48959,6 @@ function isLegacyDraftIdMapping(key, data) {
 function getRecordKeyForId$1(id) {
     return `UiApi::RecordRepresentation:${id}`;
 }
-function generateDraftIdMappingKey(draftIdMapping) {
-    return `${DraftKeyMappingKeyPrefix}${draftIdMapping.draftKey}::${draftIdMapping.canonicalKey}`;
-}
 /**
  *
  * @param mappingIds (optional) requested mapping ids, if undefined all will be retrieved
@@ -48947,6 +48992,15 @@ async function getDraftIdMappings(durableStore, mappingIds) {
     }
     return mappings;
 }
+async function clearDraftIdSegment(durableStore) {
+    const entries = await durableStore.getAllEntries(DRAFT_ID_MAPPINGS_SEGMENT);
+    if (entries) {
+        const keys$1 = keys$4(entries);
+        if (keys$1.length > 0) {
+            await durableStore.evictEntries(keys$1, DRAFT_ID_MAPPINGS_SEGMENT);
+        }
+    }
+}
 
 /**
  * Generates a time-ordered, unique id to associate with a DraftAction. Ensures
@@ -49037,9 +49091,6 @@ function customActionHandler(executor, id, draftQueue) {
         });
         return queueOperations;
     };
-    const getRedirectMappings = (_action) => {
-        return undefined;
-    };
     return {
         handlerId: id,
         enqueue: (data) => {
@@ -49051,7 +49102,6 @@ function customActionHandler(executor, id, draftQueue) {
         handleReplaceAction: () => {
             throw Error('replaceAction not supported for custom actions');
         },
-        getRedirectMappings,
         handleActionRemoved: () => Promise.resolve(),
         handleActionCompleted: () => Promise.resolve(),
         handleActionEnqueued: () => Promise.resolve(),
@@ -49226,17 +49276,11 @@ class DurableDraftQueue {
                 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();
+                // write the queue operations to the store prior to ingesting the result
+                await this.draftStore.completeAction(queueOperations);
+                await handler.handleActionCompleted(action, queueOperations, values$1(this.handlers));
                 this.retryIntervalMilliseconds = 0;
                 this.uploadingActionId = undefined;
-                await handler.handleActionCompleted(action, queueOperations, queue, values$1(this.handlers));
                 await this.notifyChangedListeners({
                     type: DraftQueueEventType.ActionCompleted,
                     action,
@@ -49559,7 +49603,7 @@ class DurableDraftStore {
         };
         return this.enqueueAction(deleteAction);
     }
-    completeAction(queueOperations, mappings) {
+    completeAction(queueOperations) {
         const action = () => {
             const durableStoreOperations = [];
             const { draftStore } = this;
@@ -49592,18 +49636,6 @@ class DurableDraftStore {
                     });
                 }
             }
-            if (mappings !== undefined) {
-                const entries = {};
-                for (const mapping of mappings) {
-                    const mappingKey = generateDraftIdMappingKey(mapping);
-                    entries[mappingKey] = { data: mapping };
-                }
-                durableStoreOperations.push({
-                    entries,
-                    type: 'setEntries',
-                    segment: DRAFT_ID_MAPPINGS_SEGMENT,
-                });
-            }
             return this.durableStore.batchOperations(durableStoreOperations);
         };
         return this.enqueueAction(action);
@@ -49868,7 +49900,7 @@ class AbstractResourceRequestActionHandler {
             },
         ];
     }
-    async handleActionCompleted(action, queueOperations, _queue, allHandlers) {
+    async handleActionCompleted(action, queueOperations, allHandlers) {
         const { data: request, tag } = action;
         const { method } = request;
         if (method === 'delete') {
@@ -49982,11 +50014,18 @@ class AbstractResourceRequestActionHandler {
     async ingestResponses(responses, action) {
         const luvio = this.getLuvio();
         await luvio.handleSuccessResponse(() => {
+            if (action.status === DraftActionStatus.Completed) {
+                const mappings = this.getRedirectMappings(action);
+                if (mappings) {
+                    mappings.forEach((mapping) => {
+                        luvio.storeRedirect(mapping.draftKey, mapping.canonicalKey);
+                    });
+                }
+            }
             for (const entry of responses) {
                 const { response, synchronousIngest } = entry;
                 synchronousIngest(response, action);
             }
-            // must call base broadcast
             return luvio.storeBroadcast();
         }, 
         // getTypeCacheKeysRecord uses the response, not the full path factory
@@ -50315,6 +50354,8 @@ class DraftManager {
 
 function makeEnvironmentDraftAware(luvio, env, durableStore, handlers, draftQueue) {
     const draftMetadata = {};
+    // in 246 luvio took charge of persisting redirect mappings, this needs to stick around
+    // for a couple of releases to support older environments
     // setup existing store redirects when bootstrapping the environment
     (async () => {
         const mappings = await getDraftIdMappings(durableStore);
@@ -50322,23 +50363,9 @@ function makeEnvironmentDraftAware(luvio, env, durableStore, handlers, draftQueu
             const { draftKey, canonicalKey } = mapping;
             env.storeRedirect(draftKey, canonicalKey);
         });
+        await env.storeBroadcast(env.rebuildSnapshot, env.snapshotAvailable);
+        await clearDraftIdSegment(durableStore);
     })();
-    durableStore.registerOnChangedListener(async (changes) => {
-        const draftIdMappingsIds = [];
-        for (let i = 0, len = changes.length; i < len; i++) {
-            const change = changes[i];
-            if (change.segment === DRAFT_ID_MAPPINGS_SEGMENT) {
-                draftIdMappingsIds.push(...change.ids);
-            }
-        }
-        if (draftIdMappingsIds.length > 0) {
-            const mappings = await getDraftIdMappings(durableStore, draftIdMappingsIds);
-            mappings.forEach((mapping) => {
-                const { draftKey, canonicalKey } = mapping;
-                env.storeRedirect(draftKey, canonicalKey);
-            });
-        }
-    });
     const handleSuccessResponse = async function (ingestAndBroadcastFunc, getResponseCacheKeysFunc) {
         const queue = await draftQueue.getQueueActions();
         if (queue.length === 0) {
@@ -58948,7 +58975,7 @@ class NimbusSqliteStore {
     registerOnChangedListener(listener) {
         let unsubscribeId = undefined;
         this.plugin
-            .registerOnChangedListener((changes) => {
+            .registerOnChangedListener(async (changes) => {
             const durableChanges = changes.map((c) => {
                 return {
                     type: c.type === 'upsert' ? 'setEntries' : 'evictEntries',
@@ -58957,7 +58984,7 @@ class NimbusSqliteStore {
                     segment: c.context.segment,
                 };
             });
-            listener(durableChanges);
+            await listener(durableChanges);
         })
             .then((unsub) => {
             unsubscribeId = unsub;
@@ -59894,7 +59921,7 @@ register({
     id: '@salesforce/lds-network-adapter',
     instrument: instrument$1,
 });
-// version: 1.145.0-a93c76713
+// version: 1.146.0-6ca270a7a
 
 const { create: create$2, keys: keys$2 } = Object;
 const { stringify: stringify$1, parse: parse$1 } = JSON;
@@ -80739,7 +80766,7 @@ register({
     configuration: { ...configurationForGraphQLAdapters },
     instrument,
 });
-// version: 1.145.0-5ff081cdd
+// version: 1.146.0-83a1d3266
 
 // On core the unstable adapters are re-exported with different names,
 
@@ -82977,7 +83004,7 @@ withDefaultLuvio((luvio) => {
     unstable_graphQL_imperative = createImperativeAdapter(luvio, createInstrumentedAdapter(ldsAdapter, adapterMetadata), adapterMetadata);
     graphQLImperative = ldsAdapter;
 });
-// version: 1.145.0-5ff081cdd
+// version: 1.146.0-83a1d3266
 
 var gqlApi = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -83666,4 +83693,4 @@ const { luvio } = getRuntime();
 setDefaultLuvio({ luvio });
 
 export { createPrimingSession, draftManager, draftQueue, executeAdapter, executeMutatingAdapter, getImperativeAdapterNames, invokeAdapter, invokeAdapterWithDraftToReplace, invokeAdapterWithMetadata, nimbusDraftQueue, registerReportObserver, setMetadataTTL, setUiApiRecordTTL, subscribeToAdapter };
-// version: 1.145.0-a93c76713
+// version: 1.146.0-6ca270a7a

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

@@ -665,7 +665,8 @@
             if (key === canonicalKey) {
                 throw new Error('cannot redirect a key to itself');
             }
-            if (reverseRedirectKeys[canonicalKey] !== undefined) {
+            if (reverseRedirectKeys[canonicalKey] !== undefined &&
+                reverseRedirectKeys[canonicalKey] !== key) {
                 throw new Error('cannot have multiple redirects keys point to the same canonical key');
             }
             if (redirectKeys[canonicalKey] !== undefined) {
@@ -3681,7 +3682,7 @@
             return this.environment.buildStructuredKey(namespace, representationName, idValues);
         }
     }
-    // engine version: 0.142.4-be29f4f3
+    // engine version: 0.143.0-384dfa26
 
     /**
      * Copyright (c) 2022, Salesforce, Inc.,
@@ -3808,7 +3809,7 @@
         }
         callbacks.push(callback);
     }
-    // version: 1.145.0-a93c76713
+    // version: 1.146.0-6ca270a7a
 
     // TODO [TD-0081508]: once that TD is fulfilled we can probably change this file
     function instrumentAdapter$1(createFunction, _metadata) {
@@ -15232,7 +15233,7 @@
         updateReferenceMapWithKnownKey(ast, luvioDocumentNode);
         return luvioDocumentNode;
     }
-    // version: 1.145.0-a93c76713
+    // version: 1.146.0-6ca270a7a
 
     function unwrap(data) {
         // The lwc-luvio bindings import a function from lwc called "unwrap".
@@ -16145,7 +16146,7 @@
         const { apiFamily, name } = metadata;
         return createGraphQLWireAdapterConstructor$1(adapter, `${apiFamily}.${name}`, luvio, astResolver);
     }
-    // version: 1.145.0-a93c76713
+    // version: 1.146.0-6ca270a7a
 
     /**
      * Copyright (c) 2022, Salesforce, Inc.,
@@ -16228,7 +16229,7 @@
     ({
         state: FragmentReadResultState.Missing,
     });
-    // engine version: 0.142.4-be29f4f3
+    // engine version: 0.143.0-384dfa26
 
     const { keys: ObjectKeys$3, create: ObjectCreate$3 } = Object;
 
@@ -44015,7 +44016,7 @@
             dropFunction: instrumentation$2.notifyRecordUpdateAvailableDropped,
         });
     });
-    // version: 1.145.0-5ff081cdd
+    // version: 1.146.0-83a1d3266
 
     var caseSensitiveUserId = '005B0000000GR4OIAW';
 
@@ -44600,6 +44601,7 @@
         return false;
     }
     const DefaultDurableSegment = 'DEFAULT';
+    const RedirectDurableSegment = 'REDIRECT_KEYS';
 
     const { keys: keys$6, create: create$5, assign: assign$4, freeze: freeze$1$1 } = Object;
 
@@ -44840,7 +44842,7 @@
         }
     }
 
-    function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler, additionalDurableStoreOperations = []) {
+    function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler, redirects, additionalDurableStoreOperations = []) {
         const durableRecords = create$5(null);
         const evictedRecords = create$5(null);
         const { records, metadata: storeMetadata, visitedIds, refreshedIds, } = store.fallbackStringKeyInMemoryStore;
@@ -44877,6 +44879,18 @@
                 segment: DefaultDurableSegment,
             });
         }
+        // redirects
+        redirects.forEach((value, key) => {
+            durableStoreOperations.push({
+                type: 'setEntries',
+                entries: {
+                    [key]: {
+                        data: { key, redirect: value },
+                    },
+                },
+                segment: RedirectDurableSegment,
+            });
+        });
         // evicts
         const evictedKeys = keys$6(evictedRecords);
         if (evictedKeys.length > 0) {
@@ -44922,6 +44936,19 @@
         return environment.storeBuildIngestionStagingStore();
     }
 
+    async function reviveRedirects(durableStore, env) {
+        const entries = await durableStore.getAllEntries(RedirectDurableSegment);
+        if (entries) {
+            for (const durableEntry of Object.keys(entries)) {
+                const entry = entries[durableEntry];
+                const { data: { key, redirect }, } = entry;
+                if (entry) {
+                    env.storeRedirect(key, redirect);
+                }
+            }
+        }
+    }
+
     const AdapterContextSegment = 'ADAPTER-CONTEXT';
     const ADAPTER_CONTEXT_ID_SUFFIX = '__NAMED_CONTEXT';
     async function reviveOrCreateContext(adapterId, durableStore, durableStoreErrorHandler, contextStores, pendingContextStoreKeys, onContextLoaded) {
@@ -44985,13 +45012,18 @@
         // event. If this instance of makeDurable caused that L2 write we can ignore that
         // on change event. This Set helps us do that.
         const pendingContextStoreKeys = new Set();
+        // redirects that need to be flushed to the durable store
+        const pendingStoreRedirects = new Map();
         const contextStores = create$5(null);
         let initializationPromise = new Promise((resolve) => {
             const finish = () => {
                 resolve();
                 initializationPromise = undefined;
             };
-            reviveTTLOverrides(durableTTLStore, environment).then(finish);
+            Promise.all([
+                reviveTTLOverrides(durableTTLStore, environment),
+                reviveRedirects(durableStore, environment),
+            ]).then(finish);
         });
         //instrumentation for durable store errors
         const durableStoreErrorHandler = handleDurableStoreRejection(instrumentation);
@@ -45004,6 +45036,8 @@
         const unsubscribe = durableStore.registerOnChangedListener(async (changes) => {
             const defaultSegmentKeys = [];
             const adapterContextSegmentKeys = [];
+            const redirectSegmentKeys = [];
+            let shouldBroadcast = false;
             for (let i = 0, len = changes.length; i < len; i++) {
                 const change = changes[i];
                 // we only care about changes to the data which is stored in the default
@@ -45014,6 +45048,20 @@
                 else if (change.segment === AdapterContextSegment) {
                     adapterContextSegmentKeys.push(...change.ids);
                 }
+                else if (change.segment === RedirectDurableSegment) {
+                    redirectSegmentKeys.push(...change.ids);
+                }
+            }
+            if (redirectSegmentKeys.length > 0) {
+                const redirectEntries = await durableStore.getEntries(redirectSegmentKeys, RedirectDurableSegment);
+                if (redirectEntries !== undefined) {
+                    const redirectKeys = Object.keys(redirectEntries);
+                    for (const key of redirectKeys) {
+                        const redirectData = redirectEntries[key];
+                        environment.storeRedirect(redirectData.data.key, redirectData.data.redirect);
+                        shouldBroadcast = true;
+                    }
+                }
             }
             // process adapter context changes
             const adapterContextKeysFromDifferentInstance = [];
@@ -45050,10 +45098,6 @@
             if (defaultSegmentKeysLength > 0) {
                 for (let i = 0; i < defaultSegmentKeysLength; i++) {
                     const key = defaultSegmentKeys[i];
-                    const canonical = environment.storeGetCanonicalKey(key);
-                    if (canonical !== key) {
-                        continue;
-                    }
                     // TODO: W-8909393 If expiration is the only thing that changed we should not evict the data... so
                     // if we stored expiration and data at different keys (or same keys in different segments)
                     // then we could know if only the expiration has changed and we wouldn't need to evict
@@ -45061,6 +45105,9 @@
                     // call base environment storeEvict so this evict is not tracked for durable deletion
                     environment.storeEvict(key);
                 }
+                shouldBroadcast = true;
+            }
+            if (shouldBroadcast) {
                 await environment.storeBroadcast(rebuildSnapshot, environment.snapshotAvailable);
             }
         });
@@ -45116,7 +45163,8 @@
             if (ingestStagingStore === null) {
                 return Promise.resolve();
             }
-            const promise = flushInMemoryStoreValuesToDurableStore(ingestStagingStore, durableStore, durableStoreErrorHandler, additionalDurableStoreOperations);
+            const promise = flushInMemoryStoreValuesToDurableStore(ingestStagingStore, durableStore, durableStoreErrorHandler, new Map(pendingStoreRedirects), additionalDurableStoreOperations);
+            pendingStoreRedirects.clear();
             ingestStagingStore = null;
             return promise;
         };
@@ -45198,6 +45246,7 @@
         };
         const storeRedirect = function (existingKey, canonicalKey) {
             validateNotDisposed();
+            pendingStoreRedirects.set(existingKey, canonicalKey);
             // call redirect on staging store so "old" keys are removed from L2 on
             // the next publishChangesToDurableStore.  NOTE: we don't need to call
             // redirect on the base environment store because staging store and base
@@ -48909,7 +48958,6 @@
     }
 
     const DraftIdMappingKeyPrefix240 = 'DraftIdMapping::';
-    const DraftKeyMappingKeyPrefix = 'DraftKeyMapping::V2::';
     const DRAFT_ID_MAPPINGS_SEGMENT = 'DRAFT_ID_MAPPINGS';
     function isLegacyDraftIdMapping(key, data) {
         return key.startsWith(DraftIdMappingKeyPrefix240);
@@ -48919,9 +48967,6 @@
     function getRecordKeyForId$1(id) {
         return `UiApi::RecordRepresentation:${id}`;
     }
-    function generateDraftIdMappingKey(draftIdMapping) {
-        return `${DraftKeyMappingKeyPrefix}${draftIdMapping.draftKey}::${draftIdMapping.canonicalKey}`;
-    }
     /**
      *
      * @param mappingIds (optional) requested mapping ids, if undefined all will be retrieved
@@ -48955,6 +49000,15 @@
         }
         return mappings;
     }
+    async function clearDraftIdSegment(durableStore) {
+        const entries = await durableStore.getAllEntries(DRAFT_ID_MAPPINGS_SEGMENT);
+        if (entries) {
+            const keys$1 = keys$4(entries);
+            if (keys$1.length > 0) {
+                await durableStore.evictEntries(keys$1, DRAFT_ID_MAPPINGS_SEGMENT);
+            }
+        }
+    }
 
     /**
      * Generates a time-ordered, unique id to associate with a DraftAction. Ensures
@@ -49045,9 +49099,6 @@
             });
             return queueOperations;
         };
-        const getRedirectMappings = (_action) => {
-            return undefined;
-        };
         return {
             handlerId: id,
             enqueue: (data) => {
@@ -49059,7 +49110,6 @@
             handleReplaceAction: () => {
                 throw Error('replaceAction not supported for custom actions');
             },
-            getRedirectMappings,
             handleActionRemoved: () => Promise.resolve(),
             handleActionCompleted: () => Promise.resolve(),
             handleActionEnqueued: () => Promise.resolve(),
@@ -49234,17 +49284,11 @@
                     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();
+                    // write the queue operations to the store prior to ingesting the result
+                    await this.draftStore.completeAction(queueOperations);
+                    await handler.handleActionCompleted(action, queueOperations, values$1(this.handlers));
                     this.retryIntervalMilliseconds = 0;
                     this.uploadingActionId = undefined;
-                    await handler.handleActionCompleted(action, queueOperations, queue, values$1(this.handlers));
                     await this.notifyChangedListeners({
                         type: DraftQueueEventType.ActionCompleted,
                         action,
@@ -49567,7 +49611,7 @@
             };
             return this.enqueueAction(deleteAction);
         }
-        completeAction(queueOperations, mappings) {
+        completeAction(queueOperations) {
             const action = () => {
                 const durableStoreOperations = [];
                 const { draftStore } = this;
@@ -49600,18 +49644,6 @@
                         });
                     }
                 }
-                if (mappings !== undefined) {
-                    const entries = {};
-                    for (const mapping of mappings) {
-                        const mappingKey = generateDraftIdMappingKey(mapping);
-                        entries[mappingKey] = { data: mapping };
-                    }
-                    durableStoreOperations.push({
-                        entries,
-                        type: 'setEntries',
-                        segment: DRAFT_ID_MAPPINGS_SEGMENT,
-                    });
-                }
                 return this.durableStore.batchOperations(durableStoreOperations);
             };
             return this.enqueueAction(action);
@@ -49876,7 +49908,7 @@
                 },
             ];
         }
-        async handleActionCompleted(action, queueOperations, _queue, allHandlers) {
+        async handleActionCompleted(action, queueOperations, allHandlers) {
             const { data: request, tag } = action;
             const { method } = request;
             if (method === 'delete') {
@@ -49990,11 +50022,18 @@
         async ingestResponses(responses, action) {
             const luvio = this.getLuvio();
             await luvio.handleSuccessResponse(() => {
+                if (action.status === DraftActionStatus.Completed) {
+                    const mappings = this.getRedirectMappings(action);
+                    if (mappings) {
+                        mappings.forEach((mapping) => {
+                            luvio.storeRedirect(mapping.draftKey, mapping.canonicalKey);
+                        });
+                    }
+                }
                 for (const entry of responses) {
                     const { response, synchronousIngest } = entry;
                     synchronousIngest(response, action);
                 }
-                // must call base broadcast
                 return luvio.storeBroadcast();
             }, 
             // getTypeCacheKeysRecord uses the response, not the full path factory
@@ -50323,6 +50362,8 @@
 
     function makeEnvironmentDraftAware(luvio, env, durableStore, handlers, draftQueue) {
         const draftMetadata = {};
+        // in 246 luvio took charge of persisting redirect mappings, this needs to stick around
+        // for a couple of releases to support older environments
         // setup existing store redirects when bootstrapping the environment
         (async () => {
             const mappings = await getDraftIdMappings(durableStore);
@@ -50330,23 +50371,9 @@
                 const { draftKey, canonicalKey } = mapping;
                 env.storeRedirect(draftKey, canonicalKey);
             });
+            await env.storeBroadcast(env.rebuildSnapshot, env.snapshotAvailable);
+            await clearDraftIdSegment(durableStore);
         })();
-        durableStore.registerOnChangedListener(async (changes) => {
-            const draftIdMappingsIds = [];
-            for (let i = 0, len = changes.length; i < len; i++) {
-                const change = changes[i];
-                if (change.segment === DRAFT_ID_MAPPINGS_SEGMENT) {
-                    draftIdMappingsIds.push(...change.ids);
-                }
-            }
-            if (draftIdMappingsIds.length > 0) {
-                const mappings = await getDraftIdMappings(durableStore, draftIdMappingsIds);
-                mappings.forEach((mapping) => {
-                    const { draftKey, canonicalKey } = mapping;
-                    env.storeRedirect(draftKey, canonicalKey);
-                });
-            }
-        });
         const handleSuccessResponse = async function (ingestAndBroadcastFunc, getResponseCacheKeysFunc) {
             const queue = await draftQueue.getQueueActions();
             if (queue.length === 0) {
@@ -58956,7 +58983,7 @@
         registerOnChangedListener(listener) {
             let unsubscribeId = undefined;
             this.plugin
-                .registerOnChangedListener((changes) => {
+                .registerOnChangedListener(async (changes) => {
                 const durableChanges = changes.map((c) => {
                     return {
                         type: c.type === 'upsert' ? 'setEntries' : 'evictEntries',
@@ -58965,7 +58992,7 @@
                         segment: c.context.segment,
                     };
                 });
-                listener(durableChanges);
+                await listener(durableChanges);
             })
                 .then((unsub) => {
                 unsubscribeId = unsub;
@@ -59902,7 +59929,7 @@
         id: '@salesforce/lds-network-adapter',
         instrument: instrument$1,
     });
-    // version: 1.145.0-a93c76713
+    // version: 1.146.0-6ca270a7a
 
     const { create: create$2, keys: keys$2 } = Object;
     const { stringify: stringify$1, parse: parse$1 } = JSON;
@@ -80747,7 +80774,7 @@
         configuration: { ...configurationForGraphQLAdapters },
         instrument,
     });
-    // version: 1.145.0-5ff081cdd
+    // version: 1.146.0-83a1d3266
 
     // On core the unstable adapters are re-exported with different names,
 
@@ -82985,7 +83012,7 @@
         unstable_graphQL_imperative = createImperativeAdapter(luvio, createInstrumentedAdapter(ldsAdapter, adapterMetadata), adapterMetadata);
         graphQLImperative = ldsAdapter;
     });
-    // version: 1.145.0-5ff081cdd
+    // version: 1.146.0-83a1d3266
 
     var gqlApi = /*#__PURE__*/Object.freeze({
         __proto__: null,
@@ -83691,4 +83718,4 @@
     Object.defineProperty(exports, '__esModule', { value: true });
 
 }));
-// version: 1.145.0-a93c76713
+// version: 1.146.0-6ca270a7a

package/package.json

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