@salesforce/lds-worker-api 1.368.0 → 1.370.0

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

@@ -24,7 +24,7 @@ const { create: create$a, entries: entries$5, freeze: freeze$6, keys: keys$a, va
 const { hasOwnProperty: hasOwnProperty$4 } = Object.prototype;
 const { isArray: isArray$9 } = Array;
 const { push: push$5, indexOf, slice: slice$2 } = Array.prototype;
-const { parse: parse$a, stringify: stringify$a } = JSON;
+const { parse: parse$b, stringify: stringify$b } = JSON;
 const WeakSetCtor = WeakSet;
 
 const deeplyFrozen = new WeakSetCtor();
@@ -302,7 +302,7 @@ function stableJSONStringify$4(node) {
         return isFinite(node) ? '' + node : 'null';
     }
     if (typeof node !== 'object') {
-        return stringify$a(node);
+        return stringify$b(node);
     }
     let i;
     let out;
@@ -330,7 +330,7 @@ function stableJSONStringify$4(node) {
         if (out) {
             out += ',';
         }
-        out += stringify$a(key) + ':' + value;
+        out += stringify$b(key) + ':' + value;
     }
     return '{' + out + '}';
 }
@@ -2314,7 +2314,7 @@ function formatStorageKey(name, argValues) {
         if (hasOwnProperty$4.call(argValues, _argName)) {
             var value = argValues[_argName];
             if (value !== null || value !== undefined) {
-                values.push(_argName + ':' + stringify$a(value));
+                values.push(_argName + ':' + stringify$b(value));
             }
         }
     }
@@ -2629,7 +2629,7 @@ class Reader {
     }
     // Only works for non-complex values.. No Date or Functions.
     opaqueCopy(value) {
-        return parse$a(stringify$a(value));
+        return parse$b(stringify$b(value));
     }
     deepCopy(record, data, key, visitedKeys) {
         const value = record[key];
@@ -2775,7 +2775,7 @@ class Reader {
                     this.readScalar(propertyName, source, sink);
                     return;
                 }
-                throw new Error(`Invalid Link State. Link on "${this.currentPath.fullPath}" is null but selection is not nullable: \n${stringify$a(selection, null, 2)}`);
+                throw new Error(`Invalid Link State. Link on "${this.currentPath.fullPath}" is null but selection is not nullable: \n${stringify$b(selection, null, 2)}`);
             case StoreLinkStateValues$2.Pending:
                 this.markPending();
                 return;
@@ -2897,7 +2897,7 @@ class Reader {
         }
         if ((options === null || options === void 0 ? void 0 : options.useDeepEquals) === true) {
             this.snapshotChanged =
-                stringify$a(this.currentPath.baseSnapshotValue) !== stringify$a(value);
+                stringify$b(this.currentPath.baseSnapshotValue) !== stringify$b(value);
         }
         else {
             this.snapshotChanged = this.currentPath.baseSnapshotValue !== value;
@@ -3298,7 +3298,7 @@ function normalizeNetworkAdapterError(error) {
         return error;
     }
     // anything else should get turned into an Error with the errorType set
-    const normalizedError = new Error(`NetworkAdapter rejected with non-Error object: ${typeof error === 'undefined' ? 'undefined' : stringify$a(error)}`);
+    const normalizedError = new Error(`NetworkAdapter rejected with non-Error object: ${typeof error === 'undefined' ? 'undefined' : stringify$b(error)}`);
     normalizedError.errorType = 'networkAdapterError';
     return normalizedError;
 }
@@ -4146,7 +4146,7 @@ function createResourceParamsImpl(config, configMetadata) {
     }
     return resourceParams;
 }
-// engine version: 0.158.3-41cf8514
+// engine version: 0.158.7-bafe2646
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -4274,7 +4274,7 @@ function withDefaultLuvio(callback) {
     }
     callbacks.push(callback);
 }
-// version: 1.368.0-20c9e0247b
+// version: 1.370.0-3ec6ffba72
 
 // TODO [TD-0081508]: once that TD is fulfilled we can probably change this file
 function instrumentAdapter$1(createFunction, _metadata) {
@@ -4390,7 +4390,7 @@ function isPromise$1$1(value) {
 }
 
 const { isArray: isArray$8 } = Array;
-const { stringify: stringify$9 } = JSON;
+const { stringify: stringify$a } = JSON;
 
 /**
  * (Re)throws an error after adding a prefix to the message.
@@ -4403,7 +4403,7 @@ function throwAnnotatedError(error, messagePrefix) {
         error.message = `${messagePrefix}\n[${error.message}]`;
         throw error;
     }
-    throw new Error(`${messagePrefix}\n[${stringify$9(error)}]`);
+    throw new Error(`${messagePrefix}\n[${stringify$a(error)}]`);
 }
 
 class Sanitizer {
@@ -4419,7 +4419,7 @@ class Sanitizer {
     }
     sanitize() {
         const sanitizer = this;
-        stringify$9(this.obj, function (key, value) {
+        stringify$a(this.obj, function (key, value) {
             if (key === '') {
                 return value;
             }
@@ -4645,6 +4645,53 @@ function createWireAdapterConstructor$1(adapter, name, luvio) {
     return constructor;
 }
 
+/**
+ * Simple deep equality comparison for configuration objects.
+ * Handles primitives, arrays, and plain objects.
+ */
+function deepEquals$1(a, b) {
+    if (a === b) {
+        return true;
+    }
+    if (a === null || a === undefined || b === null || b === undefined) {
+        return a === b;
+    }
+    if (typeof a !== typeof b) {
+        return false;
+    }
+    if (typeof a !== 'object') {
+        return false;
+    }
+    if (Array.isArray(a) !== Array.isArray(b)) {
+        return false;
+    }
+    if (Array.isArray(a) && Array.isArray(b)) {
+        if (a.length !== b.length) {
+            return false;
+        }
+        for (let i = 0; i < a.length; i++) {
+            if (!deepEquals$1(a[i], b[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+    // Handle plain objects
+    const aKeys = Object.keys(a);
+    const bKeys = Object.keys(b);
+    if (aKeys.length !== bKeys.length) {
+        return false;
+    }
+    for (const key of aKeys) {
+        if (!bKeys.includes(key)) {
+            return false;
+        }
+        if (!deepEquals$1(a[key], b[key])) {
+            return false;
+        }
+    }
+    return true;
+}
 class LWCInfinteScrollingLuvioWireAdapter extends LWCLuvioWireAdapter {
     constructor(adapter, name, luvio, callback, sourceContext, paginationConfigParamNames) {
         super(adapter, name, luvio, callback, sourceContext);
@@ -4680,7 +4727,7 @@ class LWCInfinteScrollingLuvioWireAdapter extends LWCLuvioWireAdapter {
                 var _a;
                 // If this is not a pagination param and its value has changed
                 return (!((_a = this.paginationConfigParamNames) === null || _a === void 0 ? void 0 : _a.includes(paramName)) &&
-                    config[paramName] !== (currentConfig === null || currentConfig === void 0 ? void 0 : currentConfig[paramName]));
+                    !deepEquals$1(config[paramName], currentConfig === null || currentConfig === void 0 ? void 0 : currentConfig[paramName]));
             });
             if (hasNonPaginationParamChanged) {
                 this.connectTimestamp = Date.now();
@@ -5131,12 +5178,16 @@ function createGraphQLImperativeAdapter(luvio, adapter, metadata, astResolver) {
             callback(snapshotToTuple(snapshotOrPromise));
             return;
         }
-        snapshotOrPromise.then((snapshot) => {
+        snapshotOrPromise
+            .then((snapshot) => {
             if (snapshot === null) {
                 callback(createInvalidConfigError());
                 return;
             }
             callback(snapshotToTuple(snapshot));
+        })
+            .finally(() => {
+            luvio.storeCleanup();
         });
     };
     defineProperty(imperativeAdapterInvoke, 'name', {
@@ -5239,7 +5290,7 @@ function createGraphQLWireAdapterConstructor(luvio, adapter, metadata, astResolv
     const { apiFamily, name } = metadata;
     return createGraphQLWireAdapterConstructor$1(adapter, `${apiFamily}.${name}`, luvio, astResolver);
 }
-// version: 1.368.0-20c9e0247b
+// version: 1.370.0-3ec6ffba72
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -5338,7 +5389,7 @@ var TypeCheckShapes;
     TypeCheckShapes[TypeCheckShapes["Integer"] = 3] = "Integer";
     TypeCheckShapes[TypeCheckShapes["Unsupported"] = 4] = "Unsupported";
 })(TypeCheckShapes || (TypeCheckShapes = {}));
-// engine version: 0.158.3-41cf8514
+// engine version: 0.158.7-bafe2646
 
 const { keys: ObjectKeys$4, create: ObjectCreate$4 } = Object;
 
@@ -5401,6 +5452,14 @@ let oneStoreGetObjectInfoAdapter$3 = undefined;
  * One store enabled Get Object Infos adapter
  */
 let oneStoreGetObjectInfosAdapter$3 = undefined;
+/**
+ * One store enabled GraphQL adapter
+ */
+let oneStoreGraphQLWireAdapter$3 = undefined;
+/**
+ * One store enabled GraphQL imperative query adapter
+ */
+let oneStoreGraphQLImperativeQueryAdapter$3 = undefined;
 /**
  * Determines when to include PDL strategies for Related Lists
  */
@@ -5427,6 +5486,18 @@ const configurationForOneStoreEnabledAdapters$3 = {
     getGetObjectInfosAdapter: function () {
         return oneStoreGetObjectInfosAdapter$3;
     },
+    setGraphQLWireAdapter: function (adapter) {
+        oneStoreGraphQLWireAdapter$3 = adapter;
+    },
+    getGraphQLWireAdapter: function () {
+        return oneStoreGraphQLWireAdapter$3;
+    },
+    setGraphQLImperativeQueryAdapter: function (adapter) {
+        oneStoreGraphQLImperativeQueryAdapter$3 = adapter;
+    },
+    getGraphQLImperativeQueryAdapter: function () {
+        return oneStoreGraphQLImperativeQueryAdapter$3;
+    },
 };
 const getKeywordSearchResultsFactory$3 = new Configurable$3();
 const getListRecordsByNameFactory$3 = new Configurable$3();
@@ -5666,6 +5737,14 @@ let oneStoreGetObjectInfoAdapter$2 = undefined;
  * One store enabled Get Object Infos adapter
  */
 let oneStoreGetObjectInfosAdapter$2 = undefined;
+/**
+ * One store enabled GraphQL adapter
+ */
+let oneStoreGraphQLWireAdapter$2 = undefined;
+/**
+ * One store enabled GraphQL imperative query adapter
+ */
+let oneStoreGraphQLImperativeQueryAdapter$2 = undefined;
 /**
  * Determines when to include PDL strategies for Related Lists
  */
@@ -5692,6 +5771,18 @@ const configurationForOneStoreEnabledAdapters$2 = {
     getGetObjectInfosAdapter: function () {
         return oneStoreGetObjectInfosAdapter$2;
     },
+    setGraphQLWireAdapter: function (adapter) {
+        oneStoreGraphQLWireAdapter$2 = adapter;
+    },
+    getGraphQLWireAdapter: function () {
+        return oneStoreGraphQLWireAdapter$2;
+    },
+    setGraphQLImperativeQueryAdapter: function (adapter) {
+        oneStoreGraphQLImperativeQueryAdapter$2 = adapter;
+    },
+    getGraphQLImperativeQueryAdapter: function () {
+        return oneStoreGraphQLImperativeQueryAdapter$2;
+    },
 };
 /**
  * Helper function to return the one store adapter if it's defined, otherwise return the luvio adapter.
@@ -5699,7 +5790,7 @@ const configurationForOneStoreEnabledAdapters$2 = {
  * @param oneStoreAdapter - The one store bound adapter.
  * @returns Luvio or one store wire adapter constructor.
  */
-function getLuvioOrOneStoreAdapter(luvioAdapter, oneStoreAdapter) {
+function getLuvioOrOneStoreAdapter$1(luvioAdapter, oneStoreAdapter) {
     return oneStoreAdapter ?? luvioAdapter;
 }
 const getKeywordSearchResultsFactory$2 = new Configurable$2();
@@ -6064,7 +6155,7 @@ const { hasOwnProperty: hasOwnProperty$3 } = Object.prototype;
 const { split: split$1, endsWith: endsWith$1 } = String.prototype;
 const { isArray: isArray$7 } = Array;
 const { concat: concat$3, filter: filter$3, includes: includes$3, push: push$4, reduce: reduce$3 } = Array.prototype;
-const { parse: parse$9, stringify: stringify$8 } = JSON;
+const { parse: parse$a, stringify: stringify$9 } = JSON;
 
 function isString$3(value) {
     return typeof value === 'string';
@@ -14763,7 +14854,7 @@ function prepareRequest$5$1(luvio, config) {
 // we have to run ingest code and look at the resulting snapshot's seenRecords.
 function getCacheKeys$1(keySet, luvio, config, key, originalResponseBody) {
     const { recordIds, layoutTypes, modes } = config;
-    const responseBody = parse$9(stringify$8(originalResponseBody));
+    const responseBody = parse$a(stringify$9(originalResponseBody));
     eachLayout$1(responseBody, (apiName, recordTypeId, layout) => {
         if (layout.id === null) {
             return;
@@ -27942,7 +28033,7 @@ function equalsMetadata$1(existingMetadata, incomingMetadata) {
 }
 
 const TTL$a$1 = 30000;
-const VERSION$c$2 = "62467c27c19349b70c9db2a8d9d591d9";
+const VERSION$c$2 = "ecedd058ac9cfc9b51de0f2c00276ce8";
 const RepresentationType$d$1 = 'RelatedListRecordCollectionRepresentation';
 function keyBuilder$t$2(luvio, config) {
     return keyPrefix$3 + '::' + RepresentationType$d$1 + ':' + '[' + config.sortBy.join(',') + ']' + ':' + (config.parentRecordId === null ? '' : config.parentRecordId) + ':' + config.relatedListId + ':' + (config.where === null ? '' : config.where);
@@ -28058,6 +28149,14 @@ const dynamicSelect$4$1 = function dynamicRelatedListRecordCollectionRepresentat
             reader.enterPath('count');
             reader.readScalar('count', metadataProperties, sink);
             reader.exitPath();
+            reader.enterPath('columnLabels');
+            reader.readObject('columnLabels', {
+                name: 'columnLabels',
+                kind: 'Object',
+                // Any
+                required: false
+            }, source, sink);
+            reader.exitPath();
             reader.enterPath('fields');
             reader.readScalarPlural('fields', source, sink, true);
             reader.exitPath();
@@ -28100,6 +28199,19 @@ function equals$c$1(existing, incoming) {
     if (!(existing_currentPageToken === incoming_currentPageToken)) {
         return false;
     }
+    const existing_columnLabels = existing.columnLabels;
+    const incoming_columnLabels = incoming.columnLabels;
+    // if at least one of these optionals is defined
+    if (existing_columnLabels !== undefined || incoming_columnLabels !== undefined) {
+        // if one of these is not defined we know the other is defined and therefore
+        // not equal
+        if (existing_columnLabels === undefined || incoming_columnLabels === undefined) {
+            return false;
+        }
+        if (JSONStringify$3(incoming_columnLabels) !== JSONStringify$3(existing_columnLabels)) {
+            return false;
+        }
+    }
     const existing_currentPageUrl = existing.currentPageUrl;
     const incoming_currentPageUrl = incoming.currentPageUrl;
     if (!(existing_currentPageUrl === incoming_currentPageUrl)) {
@@ -28325,10 +28437,11 @@ function createPaginationParams$7(params) {
 }
 function keyBuilder$s$2(luvio, params) {
     return keyBuilder$t$2(luvio, {
+        includeColumnLabels: params.body.includeColumnLabels || null,
+        relatedListId: params.urlParams.relatedListId,
         sortBy: params.body.sortBy || [],
-        where: params.body.where || null,
         parentRecordId: params.urlParams.parentRecordId,
-        relatedListId: params.urlParams.relatedListId
+        where: params.body.where || null
     });
 }
 function getResponseCacheKeys$h(storeKeyMap, luvio, resourceParams, response) {
@@ -28737,6 +28850,7 @@ const getRelatedListRecords_ConfigPropertyMetadata$1 = [
     generateParamConfigMetadata$3('parentRecordId', true, 0 /* UrlParameter */, 0 /* String */, false, getRecordId18$1),
     generateParamConfigMetadata$3('relatedListId', true, 0 /* UrlParameter */, 0 /* String */),
     generateParamConfigMetadata$3('fields', false, 2 /* Body */, 0 /* String */, true),
+    generateParamConfigMetadata$3('includeColumnLabels', false, 2 /* Body */, 1 /* Boolean */),
     generateParamConfigMetadata$3('optionalFields', false, 2 /* Body */, 0 /* String */, true),
     generateParamConfigMetadata$3('pageSize', false, 2 /* Body */, 3 /* Integer */),
     generateParamConfigMetadata$3('pageToken', false, 2 /* Body */, 0 /* String */),
@@ -30445,7 +30559,7 @@ function ingestAndBroadcast(luvio, key, config, body) {
     });
 }
 function clone$2(userLayoutState) {
-    return parse$9(stringify$8(userLayoutState));
+    return parse$a(stringify$9(userLayoutState));
 }
 // Applies optimisticUpdate to layoutUserState
 // If the optimistic update can be applied, returns RecordLayoutUserStateRepresentation
@@ -30480,7 +30594,7 @@ function coerceConfigWithDefaults$2$1(untrusted, layoutUserStateInput) {
     const config = validateAdapterConfig$L(untrusted, getLayoutUserState_ConfigPropertyNames);
     if (config === null) {
         // eslint-disable-next-line @salesforce/lds/no-error-in-production
-        throw new Error(`@wire(updateLayoutUserState) invalid configuration ${stringify$8(untrusted)}`);
+        throw new Error(`@wire(updateLayoutUserState) invalid configuration ${stringify$9(untrusted)}`);
     }
     // This will throw if layoutUserStateInput is not a valid input
     validate$8(layoutUserStateInput, 'layoutUserStateInput');
@@ -33822,8 +33936,8 @@ function bindExportsTo$1(luvio) {
         updateRecord: unwrapSnapshotData(factory$2$1),
         updateRecordAvatar: unwrapSnapshotData(factory$8$1),
         // One Store Enabled Adapters
-        getObjectInfo: getLuvioOrOneStoreAdapter(createWireAdapterConstructor(luvio, getObjectInfo_ldsAdapter, getObjectInfoMetadata), configurationForOneStoreEnabledAdapters$2.getGetObjectInfoAdapter()),
-        getObjectInfos: getLuvioOrOneStoreAdapter(createWireAdapterConstructor(luvio, getObjectInfos_ldsAdapter, getObjectInfosMetadata), configurationForOneStoreEnabledAdapters$2.getGetObjectInfosAdapter()),
+        getObjectInfo: getLuvioOrOneStoreAdapter$1(createWireAdapterConstructor(luvio, getObjectInfo_ldsAdapter, getObjectInfoMetadata), configurationForOneStoreEnabledAdapters$2.getGetObjectInfoAdapter()),
+        getObjectInfos: getLuvioOrOneStoreAdapter$1(createWireAdapterConstructor(luvio, getObjectInfos_ldsAdapter, getObjectInfosMetadata), configurationForOneStoreEnabledAdapters$2.getGetObjectInfosAdapter()),
         // Imperative Adapters
         unstable_getActionOverrides_imperative: createImperativeAdapter(luvio, getActionOverrides_ldsAdapter, getActionOverridesMetadata),
         getAllApps_imperative: createImperativeAdapter(luvio, getAllApps_ldsAdapter, getAllAppsMetadata),
@@ -34052,7 +34166,7 @@ withDefaultLuvio((luvio) => {
     throttle(60, 60000, setupNotifyAllListRecordUpdateAvailable(luvio));
     throttle(60, 60000, setupNotifyAllListInfoSummaryUpdateAvailable(luvio));
 });
-// version: 1.368.0-de8cc6721e
+// version: 1.370.0-7c1df2520b
 
 function requestIdleDetectedCallback(_callback) { }
 function declareNotifierTaskSingle(_name) {
@@ -35718,7 +35832,7 @@ function isNameStart(code) {
  * Given a GraphQL source, parses it into a Document.
  * Throws GraphQLError if a syntax error is encountered.
  */
-function parse$8(source, options) {
+function parse$9(source, options) {
   var parser = new Parser(source, options);
   return parser.parseDocument();
 }
@@ -44727,7 +44841,7 @@ function buildASTSchema(documentAST, options) {
  */
 
 function buildSchema(source, options) {
-  var document = parse$8(source, {
+  var document = parse$9(source, {
     noLocation: options === null || options === void 0 ? void 0 : options.noLocation,
     allowLegacySDLEmptyFields: options === null || options === void 0 ? void 0 : options.allowLegacySDLEmptyFields,
     allowLegacySDLImplementsInterfaces: options === null || options === void 0 ? void 0 : options.allowLegacySDLImplementsInterfaces,
@@ -45278,7 +45392,7 @@ function parseDocument(inputString) {
         return cachedDoc;
     }
     // parse throws an GraphQLError in case of invalid query, should this be in try/catch?
-    const parsedDoc = parse$8(inputString, { noLocation: true });
+    const parsedDoc = parse$9(inputString, { noLocation: true });
     if (!parsedDoc || parsedDoc.kind !== 'Document') {
         return null;
     }
@@ -45536,7 +45650,7 @@ function metaschemaMapper(doc) {
  * @deprecated In favor of gql tagged template literal
  */
 function parseAndVisit(source) {
-    const ast = parse$8(source, { noLocation: true });
+    const ast = parse$9(source, { noLocation: true });
     const luvioDocumentNode = transform(ast);
     // In-place substitution of metaschema annotations
     metaschemaMapper(ast);
@@ -45635,6 +45749,15 @@ var lmrPrimingUseSoql = {
     },
 };
 
+var aggressiveTrimCountKillSwitchGate = {
+    isOpen: function (e) {
+        return e.fallback;
+    },
+    hasError: function () {
+        return !0;
+    },
+};
+
 var graphqlL2AdapterGate = {
     isOpen: function (e) {
         return e.fallback;
@@ -45733,7 +45856,7 @@ function setServices(services) {
  */
 
 
-const { parse: parse$6, stringify: stringify$6 } = JSON;
+const { parse: parse$7, stringify: stringify$7 } = JSON;
 const { join: join$1, push: push$2, unshift } = Array.prototype;
 const { isArray: isArray$5 } = Array;
 const { entries: entries$4, keys: keys$6 } = Object;
@@ -46031,10 +46154,10 @@ function getTransactionKey(req) {
     const { resourceRequest } = req;
     const { baseUri, basePath, queryParams, headers } = resourceRequest;
     const path = `${baseUri}${basePath}`;
-    const queryParamsString = queryParams ? stringify$6(queryParams) : EMPTY_STRING;
-    const headersString = stringify$6(headers);
+    const queryParamsString = queryParams ? stringify$7(queryParams) : EMPTY_STRING;
+    const headersString = stringify$7(headers);
     const bodyString = resourceRequest.body && isResourceRequestDedupable(req)
-        ? stringify$6(resourceRequest.body)
+        ? stringify$7(resourceRequest.body)
         : EMPTY_STRING;
     return `${path}${TRANSACTION_KEY_SEP}${headersString}${TRANSACTION_KEY_SEP}${queryParamsString}${bodyString}`;
 }
@@ -46100,7 +46223,7 @@ const dedupeRequest = (req) => {
         // extra clone (particularly when there's only 1 handler).
         for (let i = 1, len = handlers.length; i < len; i++) {
             const handler = handlers[i];
-            handler.resolve(parse$6(stringify$6(response)));
+            handler.resolve(parse$7(stringify$7(response)));
         }
         handlers[0].resolve(response);
     }, (error) => {
@@ -47512,7 +47635,7 @@ var QueueOperationType;
 })(QueueOperationType || (QueueOperationType = {}));
 
 const { keys: keys$4, create: create$4, assign: assign$3, values: values$2 } = Object;
-const { stringify: stringify$5, parse: parse$5 } = JSON;
+const { stringify: stringify$6, parse: parse$6 } = JSON;
 const { isArray: isArray$4 } = Array;
 
 class DraftSynthesisError extends Error {
@@ -48214,7 +48337,7 @@ class DurableDraftQueue {
 }
 
 function clone$1(obj) {
-    return parse$5(stringify$5(obj));
+    return parse$6(stringify$6(obj));
 }
 
 const DRAFT_ACTION_KEY_JUNCTION = '__DraftAction__';
@@ -48673,7 +48796,7 @@ class DraftManager {
             // We should always return an array, if the body is just a dictionary,
             // stick it in an array
             const body = isArray$4(action.error.body) ? action.error.body : [action.error.body];
-            const bodyString = stringify$5(body);
+            const bodyString = stringify$6(body);
             item.error = {
                 status: action.error.status || 0,
                 ok: action.error.ok || false,
@@ -48894,7 +49017,7 @@ const { hasOwnProperty: hasOwnProperty$1 } = Object.prototype;
 const { split, endsWith } = String.prototype;
 const { from: from$1, isArray: isArray$3$1 } = Array;
 const { concat: concat$2, filter: filter$2, includes: includes$2, push: push$1$1, reduce: reduce$2, shift, slice: slice$1 } = Array.prototype;
-const { parse: parse$4, stringify: stringify$4 } = JSON;
+const { parse: parse$5, stringify: stringify$5 } = JSON;
 
 function isString$2(value) {
     return typeof value === 'string';
@@ -55270,7 +55393,7 @@ function prepareRequest$3(luvio, config) {
 // we have to run ingest code and look at the resulting snapshot's seenRecords.
 function getCacheKeys(keySet, luvio, config, key, originalResponseBody) {
     const { recordIds, layoutTypes, modes } = config;
-    const responseBody = parse$4(stringify$4(originalResponseBody));
+    const responseBody = parse$5(stringify$5(originalResponseBody));
     eachLayout(responseBody, (apiName, recordTypeId, layout) => {
         if (layout.id === null) {
             return;
@@ -79686,7 +79809,7 @@ class AbstractResourceRequestActionHandler {
                     let updatedActionTargetId = undefined;
                     const { tag: queueActionTag, data: queueActionRequest, id: queueActionId, } = queueAction;
                     let { basePath, body } = queueActionRequest;
-                    let stringifiedBody = stringify$4(body);
+                    let stringifiedBody = stringify$5(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) {
@@ -79711,7 +79834,7 @@ class AbstractResourceRequestActionHandler {
                                 data: {
                                     ...queueActionRequest,
                                     basePath: basePath,
-                                    body: parse$4(stringifiedBody),
+                                    body: parse$5(stringifiedBody),
                                 },
                             };
                             // item needs to be replaced with a new item at the new record key
@@ -79730,7 +79853,7 @@ class AbstractResourceRequestActionHandler {
                                 data: {
                                     ...queueActionRequest,
                                     basePath: basePath,
-                                    body: parse$4(stringifiedBody),
+                                    body: parse$5(stringifiedBody),
                                 },
                             };
                             // item needs to be updated
@@ -80446,7 +80569,7 @@ function normalizeError$1(err) {
     else if (typeof err === 'string') {
         return new Error(err);
     }
-    return new Error(stringify$4(err));
+    return new Error(stringify$5(err));
 }
 // metrics
 /** GraphQL */
@@ -80482,6 +80605,10 @@ const GRAPHQL_QUERY_PARSE_ERROR = 'gql-query-parse-error';
 const GRAPHQL_SQL_EVAL_PRECONDITION_ERROR = 'gql-sql-pre-eval-error';
 const GRAPHQL_CREATE_SNAPSHOT_ERROR = 'gql-create-snapshot-error';
 const DRAFT_AWARE_CREATE_CONTENT_DOCUMENT_AND_VERSION_ERROR = 'draft-aware-create-content-document-and-version-error';
+/** Garbage Collection */
+const GARBAGE_COLLECTION_AGGRESSIVE_TRIM_COUNT = 'garbage-collection-aggressive-trim-count';
+const GARBAGE_COLLECTION_AGGRESSIVE_TRIM_RECORDS_TRIMMED = 'garbage-collection-aggressive-trim-records-trimmed';
+const GARBAGE_COLLECTION_AGGRESSIVE_TRIM_TOTAL_RECORDS_BEFORE_TRIM = 'garbage-collection-aggressive-trim-total-records-before-trim';
 const ldsMobileInstrumentation$2 = getInstrumentation();
 const nimbusLogger = typeof __nimbus !== 'undefined' &&
     __nimbus.plugins !== undefined &&
@@ -80622,6 +80749,12 @@ function reportChunkCandidateUrlLength(urlLength) {
     const buckets = [8000, 10000, 12000, 14000, 16000];
     ldsMobileInstrumentation$2.bucketValue('chunk-candidate-url-length-histogram', urlLength, buckets);
 }
+/** Garbage Collection */
+function reportAggressiveTrimTriggered(trimCount, beforeTrimRecordCount, totalRecordsTrimmed) {
+    ldsMobileInstrumentation$2.trackValue(GARBAGE_COLLECTION_AGGRESSIVE_TRIM_COUNT, trimCount);
+    ldsMobileInstrumentation$2.trackValue(GARBAGE_COLLECTION_AGGRESSIVE_TRIM_TOTAL_RECORDS_BEFORE_TRIM, beforeTrimRecordCount);
+    ldsMobileInstrumentation$2.trackValue(GARBAGE_COLLECTION_AGGRESSIVE_TRIM_RECORDS_TRIMMED, totalRecordsTrimmed);
+}
 
 const QUICK_ACTION_HANDLER = 'QUICK_ACTION_HANDLER';
 class QuickActionExecutionRepresentationHandler extends AbstractQuickActionHandler {
@@ -81549,7 +81682,7 @@ function recordLoaderFactory(query) {
             rows.forEach((row) => {
                 if (!row[0])
                     return null;
-                const record = parse$4(row[0]);
+                const record = parse$5(row[0]);
                 if (record.id === id) {
                     foundRow = record;
                 }
@@ -81908,7 +82041,7 @@ function dateTimePredicate(input, operator, field, alias) {
         return dateTimeRange(range, operator, field, alias);
     }
     // eslint-disable-next-line @salesforce/lds/no-error-in-production
-    throw new Error(`Where filter ${stringify$4(input)} is not supported`);
+    throw new Error(`Where filter ${stringify$5(input)} is not supported`);
 }
 function dateTimeRange(input, op, field, alias) {
     const dateFunction = field.dataType === 'DateTime' ? 'datetime' : 'date';
@@ -84552,14 +84685,14 @@ function isLocalCursor(maybeCursor) {
         typeof maybeCursor.i === 'number');
 }
 function encodeV1Cursor(cursor) {
-    return base64encode(stringify$4(cursor));
+    return base64encode(stringify$5(cursor));
 }
 const CURSOR_PARSE_ERROR = 'Unable to parse cursor';
 function decodeV1Cursor(base64cursor) {
     let maybeCursor;
     try {
         const cursorString = base64decode(base64cursor);
-        maybeCursor = parse$4(cursorString);
+        maybeCursor = parse$5(cursorString);
     }
     catch (error) {
         let message = CURSOR_PARSE_ERROR;
@@ -84763,7 +84896,7 @@ async function readPaginationMetadataForKeys(keys, query) {
     const results = await query(sql, keys.map((k) => k + '__pagination'));
     for (let row of results.rows) {
         let key = row[0].replace(/__pagination$/, '');
-        let metadata = parse$4(row[1]);
+        let metadata = parse$5(row[1]);
         metadataMap.set(key, metadata);
     }
     return metadataMap;
@@ -84869,8 +85002,8 @@ async function connectionResolver(obj, args, context, info) {
     //map each sql result with the ingestion timestamp to pass it down a level
     let records = results.rows.map((row, index) => {
         const recordMetadataResult = {
-            recordRepresentation: parse$4(row[0]),
-            metadata: parse$4(row[1]),
+            recordRepresentation: parse$5(row[0]),
+            metadata: parse$5(row[1]),
         };
         const { recordRepresentation, metadata } = recordMetadataResult;
         context.seenRecordIds.add(recordRepresentation.id);
@@ -85321,7 +85454,7 @@ function extendSchemaWithObjectInfos(cache, objectInfoMap) {
         return cache;
     }
     // parse extensions into DocumentNode to extend the schema
-    const extensions = parse$8(typeDefs);
+    const extensions = parse$9(typeDefs);
     const polymorphicFieldTypeNames = [
         ...polyFieldTypeNameArr,
         ...cache.getPolymorphicFieldTypeNames(),
@@ -87864,7 +87997,7 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
     const getCanonicalId = getCanonicalIdFunction(luvio);
     return async function draftAwareGraphQLAdapter(config, requestContext = {}) {
         //create a copy to not accidentally modify the AST in the astResolver map of luvio
-        const copy = parse$4(stringify$4(config.query));
+        const copy = parse$5(stringify$5(config.query));
         // the injected ast has extra fields needed for eval in it
         let injectedAST;
         // the cursor mapped ast is passed upstream so it won't reject on our local cursors
@@ -87957,7 +88090,7 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
             } = await evaluate({
                 ...config,
                 //need to create another copy of the ast for future writes
-                query: parse$4(stringify$4(injectedAST)),
+                query: parse$5(stringify$5(injectedAST)),
             }, observers, { userId }, objectInfoNeeded, store, nonEvaluatedSnapshot, graphqlSchemaCache, draftFunctions, mappedCursors));
         }
         catch (throwable) {
@@ -88083,7 +88216,7 @@ function makeGetRecordsConfig(keyMap) {
 
 function environmentAwareGraphQLBatchAdapterFactory(objectInfoService, luvio, isDraftId, buildCachedSnapshotCachePolicy, buildNetworkSnapshotCachePolicy) {
     return async function environmentAwareGraphQLBatchAdapter(config, requestContext = {}) {
-        const batchQueryCopy = config.batchQuery.map((query) => parse$4(stringify$4(query)));
+        const batchQueryCopy = config.batchQuery.map((query) => parse$5(stringify$5(query)));
         let injectedBatchQuery = [];
         const getCanonicalId = getCanonicalIdFunction(luvio);
         const draftFunctions = {
@@ -88308,7 +88441,7 @@ const recordIdGenerator = (id) => {
 
 
 const { keys: keys$2$1, create: create$2$1, assign: assign$1$1, entries: entries$2 } = Object;
-const { stringify: stringify$3, parse: parse$3 } = JSON;
+const { stringify: stringify$4, parse: parse$4 } = JSON;
 const { push: push$3, join, slice } = Array.prototype;
 const { isArray: isArray$2$1, from } = Array;
 
@@ -88332,7 +88465,7 @@ function ldsParamsToString(params) {
             returnParams[key] = `${value}`;
         }
         if (isObject(value) === true && keys$2$1(value).length > 0) {
-            returnParams[key] = stringify$3(value);
+            returnParams[key] = stringify$4(value);
         }
     }
     return returnParams;
@@ -88394,13 +88527,13 @@ function stringifyIfPresent(value) {
     if (typeof value === 'string') {
         return value;
     }
-    return stringify$3(value);
+    return stringify$4(value);
 }
 function parseIfPresent(value) {
     if (value === undefined || value === null || value === '') {
         return null;
     }
-    return parse$3(value);
+    return parse$4(value);
 }
 function buildNimbusNetworkPluginRequest(resourceRequest, resourceRequestContext) {
     const { basePath, baseUri, method, headers, queryParams, body } = resourceRequest;
@@ -88899,8 +89032,8 @@ function getMaxLengthPerChunkAllowed(request) {
     // Too much work to get exact length of the final url, so use stringified json to get the rough length.
     const roughUrlLengthWithoutFieldsAndOptionFields = request.basePath.length +
         request.baseUri.length +
-        (request.urlParams ? stringify$3(request.urlParams).length : 0) +
-        stringify$3({ ...request.queryParams, fields: {}, optionalFields: {} }).length;
+        (request.urlParams ? stringify$4(request.urlParams).length : 0) +
+        stringify$4({ ...request.queryParams, fields: {}, optionalFields: {} }).length;
     return MAX_URL_LENGTH - roughUrlLengthWithoutFieldsAndOptionFields;
 }
 // we don't have access to the host so we cannot calculate the exact length of the url
@@ -89006,10 +89139,10 @@ class NimbusDraftQueue {
         if (callProxyMethod === undefined) {
             return Promise.reject(new Error('callProxyMethod not defined on the nimbus plugin'));
         }
-        const serializedAction = stringify$4([handlerId, data]);
+        const serializedAction = stringify$5([handlerId, data]);
         return new Promise((resolve, reject) => {
             callProxyMethod('enqueue', serializedAction, (serializedActionResponse) => {
-                const response = parse$4(serializedActionResponse);
+                const response = parse$5(serializedActionResponse);
                 resolve(response);
             }, (errorMessage) => {
                 reject(new Error(errorMessage));
@@ -89030,8 +89163,8 @@ class NimbusDraftQueue {
             return Promise.reject(new Error('callProxyMethod not defined on the nimbus plugin'));
         }
         return new Promise((resolve, reject) => {
-            callProxyMethod('getQueueActions', stringify$4([]), (serializedQueue) => {
-                resolve(parse$4(serializedQueue));
+            callProxyMethod('getQueueActions', stringify$5([]), (serializedQueue) => {
+                resolve(parse$5(serializedQueue));
             }, (errorMessage) => {
                 reject(new Error(errorMessage));
             });
@@ -89042,17 +89175,17 @@ class NimbusDraftQueue {
         if (callProxyMethod === undefined) {
             return Promise.reject('callProxyMethod not defined on the nimbus plugin');
         }
-        const stringifiedArgs = stringify$4([action]);
+        const stringifiedArgs = stringify$5([action]);
         return new Promise((resolve, reject) => {
             callProxyMethod('getDataForAction', stringifiedArgs, (data) => {
                 if (data === undefined) {
                     resolve(undefined);
                 }
                 else {
-                    resolve(parse$4(data));
+                    resolve(parse$5(data));
                 }
             }, (serializedError) => {
-                reject(parse$4(serializedError));
+                reject(parse$5(serializedError));
             });
         });
     }
@@ -89534,7 +89667,7 @@ function registerReportObserver(reportObserver) {
 }
 
 const { keys: keys$1$1, create: create$1$1, assign: assign$5, entries: entries$1, values } = Object;
-const { stringify: stringify$2, parse: parse$2 } = JSON;
+const { stringify: stringify$3, parse: parse$3 } = JSON;
 
 function selectColumnsFromTableWhereKeyIn(columnNames, table, keyColumnName, whereIn) {
     const paramList = whereIn.map(() => '?').join(',');
@@ -89547,13 +89680,13 @@ function selectColumnsFromTableWhereKeyInNamespaced(columnNames, table, keyColum
 
 // These const values must be in sync with the latest
 // @salesforce/nimbus-plugin-lds/sql schema file
-const TABLE_NAME$1 = 'lds_data';
+const TABLE_NAME$1$1 = 'lds_data';
 const COLUMN_NAME_KEY$2 = 'key';
 const COLUMN_NAME_DATA$2 = 'data';
 const COLUMN_NAME_METADATA$1 = 'metadata';
 class LdsDataTable {
     constructor(plugin) {
-        this.tableName = TABLE_NAME$1;
+        this.tableName = TABLE_NAME$1$1;
         this.columnNames = [COLUMN_NAME_KEY$2, COLUMN_NAME_DATA$2, COLUMN_NAME_METADATA$1];
         this.conflictColumnNames = [COLUMN_NAME_KEY$2];
         this.getAllQuery = `SELECT ${this.columnNames.join(',')} FROM ${this.tableName}`;
@@ -89575,7 +89708,7 @@ class LdsDataTable {
                     const [key, stringifiedMetadata] = row;
                     if (stringifiedMetadata !== undefined) {
                         entries[key] = {
-                            metadata: parse$2(stringifiedMetadata),
+                            metadata: parse$3(stringifiedMetadata),
                         };
                     }
                     return entries;
@@ -89603,7 +89736,7 @@ class LdsDataTable {
             rows: keys$1$1(entries).reduce((rows, key) => {
                 const entry = entries[key];
                 const { data, metadata } = entry;
-                const row = [key, stringify$2(data), metadata ? stringify$2(metadata) : null];
+                const row = [key, stringify$3(data), metadata ? stringify$3(metadata) : null];
                 rows.push(row);
                 return rows;
             }, []),
@@ -89621,7 +89754,7 @@ class LdsDataTable {
             columns: [COLUMN_NAME_METADATA$1],
             values: keys$1$1(entries).reduce((values, key) => {
                 const { metadata } = entries[key];
-                const row = [metadata ? stringify$2(metadata) : null];
+                const row = [metadata ? stringify$3(metadata) : null];
                 values[key] = row;
                 return values;
             }, {}),
@@ -89631,10 +89764,10 @@ class LdsDataTable {
         return sqliteResult.rows.reduce((entries, row) => {
             const [key, stringifiedData, stringifiedMetadata] = row;
             const durableStoreEntry = {
-                data: parse$2(stringifiedData),
+                data: parse$3(stringifiedData),
             };
             if (stringifiedMetadata !== null) {
-                durableStoreEntry.metadata = parse$2(stringifiedMetadata);
+                durableStoreEntry.metadata = parse$3(stringifiedMetadata);
             }
             entries[key] = durableStoreEntry;
             return entries;
@@ -89684,7 +89817,7 @@ class LdsInternalDataTable {
                     const [key, stringifiedMetadata] = row;
                     if (stringifiedMetadata !== undefined) {
                         entries[key] = {
-                            metadata: parse$2(stringifiedMetadata),
+                            metadata: parse$3(stringifiedMetadata),
                         };
                     }
                     return entries;
@@ -89712,9 +89845,9 @@ class LdsInternalDataTable {
             rows: keys$1$1(entries).reduce((rows, key) => {
                 const entry = entries[key];
                 const { data, metadata } = entry;
-                const row = [key, stringify$2(data)];
+                const row = [key, stringify$3(data)];
                 if (metadata) {
-                    row.push(stringify$2(metadata));
+                    row.push(stringify$3(metadata));
                 }
                 else {
                     row.push(null);
@@ -89737,7 +89870,7 @@ class LdsInternalDataTable {
             columns: [COLUMN_NAME_METADATA],
             values: keys$1$1(entries).reduce((values, key) => {
                 const { metadata } = entries[key];
-                const row = [metadata ? stringify$2(metadata) : null];
+                const row = [metadata ? stringify$3(metadata) : null];
                 values[key] = row;
                 return values;
             }, {}),
@@ -89749,7 +89882,7 @@ class LdsInternalDataTable {
             if (metadata !== undefined) {
                 accu.push({
                     sql: `UPDATE ${this.tableName} SET ${COLUMN_NAME_METADATA} = ? WHERE (${COLUMN_NAME_KEY$1} IS ? AND ${COLUMN_NAME_NAMESPACE} IS ?)`,
-                    params: [stringify$2(metadata), key, segment],
+                    params: [stringify$3(metadata), key, segment],
                     change: {
                         ids: [key],
                         segment,
@@ -89765,10 +89898,10 @@ class LdsInternalDataTable {
         return sqliteResult.rows.reduce((entries, row) => {
             const [key, stringifiedData, stringifiedMetadata] = row;
             const durableStoreEntry = {
-                data: parse$2(stringifiedData),
+                data: parse$3(stringifiedData),
             };
             if (stringifiedMetadata !== null) {
-                durableStoreEntry.metadata = parse$2(stringifiedMetadata);
+                durableStoreEntry.metadata = parse$3(stringifiedMetadata);
             }
             entries[key] = durableStoreEntry;
             return entries;
@@ -89990,7 +90123,7 @@ class AbstractKeyValueDataTable {
             columns: this.columnNames,
             rows: keys$1$1(entries).reduce((rows, key) => {
                 const entry = entries[key];
-                rows.push([key, stringify$2(entry.data)]);
+                rows.push([key, stringify$3(entry.data)]);
                 return rows;
             }, []),
         };
@@ -90003,7 +90136,7 @@ class AbstractKeyValueDataTable {
         return sqliteResult.rows.reduce((entries, row) => {
             const [key, stringifiedData] = row;
             const durableStoreEntry = {
-                data: parse$2(stringifiedData),
+                data: parse$3(stringifiedData),
             };
             entries[key] = durableStoreEntry;
             return entries;
@@ -90013,10 +90146,10 @@ class AbstractKeyValueDataTable {
 
 // These const values must be in sync with the latest
 // @salesforce/nimbus-plugin-lds/sql schema file
-const TABLE_NAME = 'lds_env_drafts';
+const TABLE_NAME$1 = 'lds_env_drafts';
 class LdsDraftsDataTable extends AbstractKeyValueDataTable {
     constructor(plugin) {
-        super(plugin, TABLE_NAME);
+        super(plugin, TABLE_NAME$1);
     }
 }
 
@@ -91794,8 +91927,14 @@ function primingSessionFactory(config) {
     return instrumentPrimingSession(session);
 }
 
-const DEFAULT_MAX_RECORD_COUNT = 80000;
-const DEFAULT_MAX_BATCH_SIZE = 200;
+// count will get reset to 0 when the module is instantated again when bootstrapped
+let aggressiveTrimCount = 0;
+const DEFAULT_MAX_RECORD_COUNT = aggressiveTrimCountKillSwitchGate.isOpen({ fallback: false })
+    ? 10000
+    : 80000;
+const DEFAULT_MAX_BATCH_SIZE = aggressiveTrimCountKillSwitchGate.isOpen({ fallback: false })
+    ? 1000
+    : 200;
 async function aggressiveTrim(data, deallocateFn, options = {}) {
     const maxStoreRecords = options.maxStoreRecords !== undefined ? options.maxStoreRecords : DEFAULT_MAX_RECORD_COUNT;
     const batchSize = options.batchSize !== undefined ? options.batchSize : DEFAULT_MAX_BATCH_SIZE;
@@ -91827,6 +91966,9 @@ async function aggressiveTrim(data, deallocateFn, options = {}) {
         const count = await batch();
         deallocatedCount = deallocatedCount + count;
     }
+    //increment trim count and report metrics
+    aggressiveTrimCount++;
+    reportAggressiveTrimTriggered(aggressiveTrimCount, storeKeyLength, deallocatedCount);
     const trimKeysSkipped = makeSetFilteredFromDifference(pendingTrimKeys, (key) => trimKeys.has(key) === false);
     return {
         deallocatedCount,
@@ -91869,7 +92011,7 @@ function setupObserver() {
         registerReportObserver((report) => {
             __nimbus.plugins.LdsObserverPlugin.logAdapterExecution({
                 name: report.adapterName,
-                serializedConfig: stringify$4(report.config),
+                serializedConfig: stringify$5(report.config),
                 status: report.result,
                 duration: report.executionTime,
             });
@@ -91985,7 +92127,7 @@ function transformConfiguration$1$1(config) {
     // Make a copy of the config before running transform to avoid mutating the original config
     const adapterConfigCopy = {
         ...config,
-        query: parse$8(print(config.query))
+        query: parse$9(print(config.query))
     };
     return {
         ...adapterConfigCopy,
@@ -92347,7 +92489,7 @@ function transformConfiguration$2(config) {
     const batchQueryTransformed = config.batchQuery.map((singleConfig) => {
         return {
             ...singleConfig,
-            query: applyMinimumFieldsToQuery(parse$8(print(singleConfig.query))), // Stringifies and parses again to avoid mutating original. Should we just JSON.stringify to avoid the dependency on the parser?
+            query: applyMinimumFieldsToQuery(parse$9(print(singleConfig.query))), // Stringifies and parses again to avoid mutating original. Should we just JSON.stringify to avoid the dependency on the parser?
         };
     });
     return {
@@ -92812,7 +92954,7 @@ class SideEffectService {
 }
 
 function clone(obj) {
-    return parse$4(stringify$4(obj));
+    return parse$5(stringify$5(obj));
 }
 
 /* global __nimbus */
@@ -93310,7 +93452,7 @@ function createSfsSideEffectHooks(durableRecordStore) {
  */
 const { create: create$6, freeze: freeze$3, keys: keys$7, entries } = Object;
 const { isArray: isArray$1$1 } = Array;
-const { stringify: stringify$1, parse: parse$1 } = JSON;
+const { stringify: stringify$2, parse: parse$2 } = JSON;
 const LogLevelMap = {
   TRACE: 4,
   DEBUG: 3,
@@ -93347,7 +93489,7 @@ class ConsoleLogger {
     this.printer(this.formatter(level, message));
   }
 }
-let Ok$2 = class Ok {
+let Ok$1 = class Ok {
   constructor(value) {
     this.value = value;
   }
@@ -93369,7 +93511,7 @@ let Err$1 = class Err {
     return !this.isOk();
   }
 };
-const ok$2 = (value) => new Ok$2(value);
+const ok$1 = (value) => new Ok$1(value);
 const err$1 = (err2) => new Err$1(err2);
 function isSubscribableResult(x) {
   if (typeof x !== "object" || x === null) {
@@ -93432,7 +93574,7 @@ function stableJSONStringify$2(node) {
     return isFinite(node) ? "" + node : "null";
   }
   if (typeof node !== "object") {
-    return stringify$1(node);
+    return stringify$2(node);
   }
   let i;
   let out;
@@ -93460,7 +93602,7 @@ function stableJSONStringify$2(node) {
     if (out) {
       out += ",";
     }
-    out += stringify$1(key) + ":" + value;
+    out += stringify$2(key) + ":" + value;
   }
   return "{" + out + "}";
 }
@@ -93504,7 +93646,7 @@ let NetworkCommand$1 = class NetworkCommand extends BaseCommand {
         return err$1(networkResult.error);
       } else {
         const data = networkResult.value;
-        return ok$2({
+        return ok$1({
           data,
           subscribe: (cb) => {
             this.subscriptions.push(cb);
@@ -93523,10 +93665,10 @@ let NetworkCommand$1 = class NetworkCommand extends BaseCommand {
         if (isSubscribableResult(newResult)) {
           const value = newResult.value;
           this.subscriptions.forEach((cb) => {
-            cb(ok$2(value.data));
+            cb(ok$1(value.data));
           });
         }
-        return ok$2(void 0);
+        return ok$1(void 0);
       }
       return err$1(newResult.error);
     });
@@ -93534,7 +93676,7 @@ let NetworkCommand$1 = class NetworkCommand extends BaseCommand {
   async afterRequestHooks(_options) {
   }
 };
-function buildServiceDescriptor$b() {
+function buildServiceDescriptor$c() {
   return {
     type: "networkCommandBaseClass",
     version: "1.0",
@@ -93577,7 +93719,7 @@ class AuraNetworkCommand extends NetworkCommand$1 {
         this.afterRequestHooks({ statusCode: 200 });
       } catch (e) {
       }
-      return ok$2(auraReturnValue);
+      return ok$1(auraReturnValue);
     }).catch((error) => {
       if (!error || !error.getError) {
         return err$1(toError("Failed to get error from response"));
@@ -93596,7 +93738,7 @@ class AuraNetworkCommand extends NetworkCommand$1 {
       (response2) => {
         if (response2.ok) {
           return response2.json().then(
-            (json) => ok$2(json),
+            (json) => ok$1(json),
             (reason) => err$1(toError(reason))
           ).finally(() => {
             try {
@@ -93636,7 +93778,7 @@ class AuraNetworkCommand extends NetworkCommand$1 {
     return resolvedPromiseLike$3(err$1(toError("Aura/Fetch network services not found")));
   }
 }
-function buildServiceDescriptor$a() {
+function buildServiceDescriptor$b() {
   return {
     type: "auraNetworkCommandBaseClass",
     version: "1.0",
@@ -93655,7 +93797,7 @@ function buildServiceDescriptor$a() {
  * For full license text, see the LICENSE.txt file
  */
 const { isArray: isArray$6 } = Array;
-let Ok$1 = class Ok {
+class Ok {
   constructor(value) {
     this.value = value;
   }
@@ -93665,7 +93807,7 @@ let Ok$1 = class Ok {
   isErr() {
     return !this.isOk();
   }
-};
+}
 class Err {
   constructor(error) {
     this.error = error;
@@ -93677,7 +93819,7 @@ class Err {
     return !this.isOk();
   }
 }
-const ok$1 = (value) => new Ok$1(value);
+const ok = (value) => new Ok(value);
 const err = (err2) => new Err(err2);
 function resolvedPromiseLike$2(result) {
   if (isPromiseLike$2(result)) {
@@ -93768,6 +93910,38 @@ function setOverlaps(setA, setB) {
   }
   return false;
 }
+class CacheControlRequestRunner {
+  constructor(readFromCache, requestFromNetwork, writeToCache) {
+    this.readFromCacheInternal = readFromCache;
+    this.requestFromNetworkInternal = requestFromNetwork;
+    this.writeToCacheInternal = writeToCache;
+  }
+  readFromCache(cache) {
+    const resultPromise = this.readFromCacheInternal(cache);
+    return resultPromise.then((result) => {
+      if (result.isErr()) {
+        return err(result.error);
+      }
+      this.returnData = result;
+      return ok(void 0);
+    });
+  }
+  requestFromNetwork() {
+    const that = this;
+    return async function* () {
+      const result = await that.requestFromNetworkInternal();
+      if (result.isErr()) {
+        that.networkError = result;
+      } else {
+        that.networkData = result;
+      }
+      yield result;
+    }();
+  }
+  writeToCache(cache, networkResult) {
+    return this.writeToCacheInternal(cache, networkResult);
+  }
+}
 class CacheControlCommand extends BaseCommand {
   constructor(services) {
     super();
@@ -93787,57 +93961,48 @@ class CacheControlCommand extends BaseCommand {
       this.cacheControlStrategyConfig,
       overrides
     );
-    let returnData;
-    let returnError;
-    const requestRunner = {
-      readFromCache: (cache) => {
-        const resultPromise2 = this.buildResultWithSubscribe(cache);
-        return resultPromise2.then((result) => {
-          if (result.isErr()) {
-            return err(result.error);
-          }
-          returnData = result;
-          return ok$1(void 0);
-        });
-      },
-      requestFromNetwork: () => {
-        const that = this;
-        return async function* () {
-          const result = await that.requestFromNetwork();
-          if (result.isErr()) {
-            returnError = result;
-          }
-          yield result;
-        }();
-      },
-      writeToCache: (cache, networkResult) => {
-        return this.writeToCacheAndRecordKeys(cache, networkResult);
-      }
-    };
+    const requestRunner = this.buildRequestRunner();
     const resultPromise = this.services.cacheController.execute(mergedCacheControlConfig, requestRunner, {
       instrumentationAttributes: this.instrumentationAttributes
     });
     return resultPromise.then((result) => {
-      return this.publishUpdatedKeys().then(() => {
-        if (returnError) {
-          return returnError;
-        }
-        if (result.isErr()) {
-          return err(result.error);
-        }
-        if (this.subscriptions.length > 0) {
-          this.subscribeToKeysUsed();
-        }
-        if (returnData === void 0) {
-          return err(new Error("Cache miss after fetching from network"));
+      return this.handleCacheControllerResult(result, requestRunner);
+    });
+  }
+  handleCacheControllerResult(result, requestRunner) {
+    const { networkError, networkData, returnData } = requestRunner;
+    return this.publishUpdatedKeys().then(() => {
+      if (networkError) {
+        return networkError;
+      }
+      if (result.isErr()) {
+        if (networkData) {
+          return this.constructSubscribableResult(networkData.value);
         }
-        if (returnData.isOk() && this.lastEmittedData === void 0) {
-          this.lastEmittedData = returnData.value.data;
+        return err(result.error);
+      }
+      if (this.subscriptions.length > 0) {
+        this.subscribeToKeysUsed();
+      }
+      if (returnData === void 0) {
+        if (networkData) {
+          return this.constructSubscribableResult(networkData.value);
         }
-        return returnData;
-      });
+        return err(new Error("Cache miss after fetching from network"));
+      }
+      if (returnData.isOk() && this.lastEmittedData === void 0) {
+        this.lastEmittedData = returnData.value.data;
+      }
+      return returnData;
     });
   }
+  buildRequestRunner() {
+    return new CacheControlRequestRunner(
+      (cache) => this.buildResultWithSubscribe(cache),
+      () => this.requestFromNetwork(),
+      (cache, networkResult) => this.writeToCacheAndRecordKeys(cache, networkResult)
+    );
+  }
   publishUpdatedKeys() {
     if (this.services.pubSub) {
       if (this.keysUpdated !== void 0 && this.keysUpdated.size > 0) {
@@ -93888,7 +94053,7 @@ class CacheControlCommand extends BaseCommand {
       if (result.isErr()) {
         return err(result.error);
       }
-      return ok$1(void 0);
+      return ok(void 0);
     });
   }
   writeToCacheAndRecordKeys(cache, networkResult) {
@@ -93896,7 +94061,7 @@ class CacheControlCommand extends BaseCommand {
     return this.writeToCache(recordableCache, networkResult).then((result) => {
       this.instantiationTime = Date.now() / 1e3;
       this.keysUpdated = recordableCache.keysUpdated;
-      return ok$1(result);
+      return ok(result);
     });
   }
   buildResultWithSubscribe(cache) {
@@ -93908,14 +94073,18 @@ class CacheControlCommand extends BaseCommand {
       } else {
         const data = readResult.value;
         this.keysUsed = recordableCache.keysRead;
-        return ok$1({
-          data,
-          subscribe: this.buildSubscribe(),
-          refresh: () => this.refresh()
-        });
+        return this.constructSubscribableResult(data);
       }
     });
   }
+  constructSubscribableResult(data) {
+    return ok({
+      data,
+      // this cast is in case we need to return Network data as a fallback for caching errors
+      subscribe: this.buildSubscribe(),
+      refresh: () => this.refresh()
+    });
+  }
   /**
    * Builds a function that subscribes to cache changes via the pubsub service. Whenever
    * relevant cache updates occur, it re-reads the data and compares it against
@@ -93947,7 +94116,7 @@ class CacheControlCommand extends BaseCommand {
       }
       if (!this.equals(this.lastEmittedData, result.value.data)) {
         this.lastEmittedData = result.value.data;
-        this.invokeConsumerCallbacks(ok$1(result.value.data));
+        this.invokeConsumerCallbacks(ok(result.value.data));
       }
       return result;
     });
@@ -94035,7 +94204,7 @@ let AuraCacheControlCommand$1 = class AuraCacheControlCommand extends CacheContr
         this.afterRequestHooks({ statusCode: 200 });
       } catch (e) {
       }
-      return ok$2(auraReturnValue);
+      return ok$1(auraReturnValue);
     }).catch((error) => {
       if (!error || !error.getError) {
         return err$1(toError("Failed to get error from response"));
@@ -94054,7 +94223,7 @@ let AuraCacheControlCommand$1 = class AuraCacheControlCommand extends CacheContr
       (response2) => {
         if (response2.ok) {
           return response2.json().then(
-            (json) => ok$2(json),
+            (json) => ok$1(json),
             (reason) => err$1(toError(reason))
           ).finally(() => {
             try {
@@ -94086,10 +94255,10 @@ class AuraNormalizedCacheControlCommand extends AuraCacheControlCommand$1 {
     const data = this.buildResultType().query(cache, this.buildQuery());
     if (data.isErr()) {
       return resolvedPromiseLike$3(
-        err$1(new Error(`Failed to build data from type: ${stringify$1(data.error)}`))
+        err$1(new Error(`Failed to build data from type: ${stringify$2(data.error)}`))
       );
     }
-    return resolvedPromiseLike$3(ok$2(data.value));
+    return resolvedPromiseLike$3(ok$1(data.value));
   }
   writeToCache(cache, networkResult) {
     if (networkResult.isOk()) {
@@ -94101,7 +94270,7 @@ class AuraNormalizedCacheControlCommand extends AuraCacheControlCommand$1 {
     return resolvedPromiseLike$3(void 0);
   }
 }
-function buildServiceDescriptor$9() {
+function buildServiceDescriptor$a() {
   return {
     type: "auraNormalizedCacheControlCommand",
     version: "1.0",
@@ -94166,7 +94335,7 @@ class AuraCacheControlCommand extends CacheControlCommand {
         this.afterRequestHooks({ statusCode: 200 });
       } catch (e) {
       }
-      return ok$2(auraReturnValue);
+      return ok$1(auraReturnValue);
     }).catch((error) => {
       if (!error || !error.getError) {
         return err$1(toError("Failed to get error from response"));
@@ -94185,7 +94354,7 @@ class AuraCacheControlCommand extends CacheControlCommand {
       (response2) => {
         if (response2.ok) {
           return response2.json().then(
-            (json) => ok$2(json),
+            (json) => ok$1(json),
             (reason) => err$1(toError(reason))
           ).finally(() => {
             try {
@@ -94222,7 +94391,7 @@ class AuraResourceCacheControlCommand extends AuraCacheControlCommand {
     if (data === void 0) {
       return resolvedPromiseLike$3(err$1(new Error("Failed to find data in cache")));
     }
-    return resolvedPromiseLike$3(ok$2(data));
+    return resolvedPromiseLike$3(ok$1(data));
   }
   writeToCache(cache, networkResult) {
     if (networkResult.isOk()) {
@@ -94239,7 +94408,7 @@ class AuraResourceCacheControlCommand extends AuraCacheControlCommand {
     return `{"endpoint":${this.endpoint},"params":${stableJSONStringify$2(this.auraParams)}}`;
   }
 }
-function buildServiceDescriptor$8() {
+function buildServiceDescriptor$9() {
   return {
     type: "auraResourceCacheControlCommand",
     version: "1.0",
@@ -94277,7 +94446,7 @@ class NetworkCommand extends BaseCommand {
         return err$1(networkResult.error);
       } else {
         const data = networkResult.value;
-        return ok$2({
+        return ok$1({
           data,
           subscribe: (cb) => {
             this.subscriptions.push(cb);
@@ -94296,10 +94465,10 @@ class NetworkCommand extends BaseCommand {
         if (isSubscribableResult(newResult)) {
           const value = newResult.value;
           this.subscriptions.forEach((cb) => {
-            cb(ok$2(value.data));
+            cb(ok$1(value.data));
           });
         }
-        return ok$2(void 0);
+        return ok$1(void 0);
       }
       return err$1(newResult.error);
     });
@@ -94323,7 +94492,7 @@ class FetchNetworkCommand extends NetworkCommand {
       (response2) => {
         if (response2.ok) {
           return response2.json().then(
-            (json) => ok$2(json),
+            (json) => ok$1(json),
             (reason) => err$1(toError(reason))
           ).finally(() => {
             try {
@@ -94346,7 +94515,7 @@ class FetchNetworkCommand extends NetworkCommand {
     );
   }
 }
-function buildServiceDescriptor$7() {
+function buildServiceDescriptor$8() {
   return {
     type: "fetchNetworkCommandBaseClass",
     version: "1.0",
@@ -94383,7 +94552,7 @@ class HttpCacheControlCommand extends CacheControlCommand {
       (response2) => {
         if (response2.ok) {
           return response2.json().then(
-            (json) => ok$2(json),
+            (json) => ok$1(json),
             (reason) => err$1(toError(reason))
           ).finally(() => {
             try {
@@ -94415,10 +94584,10 @@ class HttpNormalizedCacheControlCommand extends HttpCacheControlCommand {
     const data = this.buildResultType().query(cache, this.buildQuery());
     if (data.isErr()) {
       return resolvedPromiseLike$3(
-        err$1(new Error(`Failed to build data from type: ${stringify$1(data.error)}`))
+        err$1(new Error(`Failed to build data from type: ${stringify$2(data.error)}`))
       );
     }
-    return resolvedPromiseLike$3(ok$2(data.value));
+    return resolvedPromiseLike$3(ok$1(data.value));
   }
   writeToCache(cache, networkResult) {
     if (networkResult.isOk()) {
@@ -94430,7 +94599,7 @@ class HttpNormalizedCacheControlCommand extends HttpCacheControlCommand {
     return resolvedPromiseLike$3(void 0);
   }
 }
-function buildServiceDescriptor$6() {
+function buildServiceDescriptor$7() {
   return {
     type: "httpNormalizedCacheControlCommand",
     version: "1.0",
@@ -94448,12 +94617,12 @@ function buildServiceDescriptor$6() {
  * All rights reserved.
  * For full license text, see the LICENSE.txt file
  */
-const { stringify: stringify$7, parse: parse$7 } = JSON;
-function deepCopy(x) {
-  const stringified = stringify$7(x);
-  return stringified ? parse$7(stringified) : void 0;
+const { stringify: stringify$1, parse: parse$1 } = JSON;
+function deepCopy$1(x) {
+  const stringified = stringify$1(x);
+  return stringified ? parse$1(stringified) : void 0;
 }
-class DefaultRecordableCache {
+let DefaultRecordableCache$1 = class DefaultRecordableCache {
   constructor(baseCache) {
     this.baseCache = baseCache;
     this.keysRead = /* @__PURE__ */ new Set();
@@ -94472,7 +94641,7 @@ class DefaultRecordableCache {
       this.missingKeysRead.add(key);
     }
     if (options == null ? void 0 : options.copy) {
-      return deepCopy(value);
+      return deepCopy$1(value);
     }
     return value;
   }
@@ -94498,13 +94667,13 @@ class DefaultRecordableCache {
     return new DefaultRecordableCache(this);
   }
   filter(predicate) {
-    return new DefaultFilteredCache(this, predicate);
+    return new DefaultFilteredCache$1(this, predicate);
   }
   buildFixedTimeWritableCache(generatedTime) {
-    return new FixedTimeWritableCache(this, generatedTime);
+    return new FixedTimeWritableCache$1(this, generatedTime);
   }
-}
-class DefaultFilteredCache {
+};
+let DefaultFilteredCache$1 = class DefaultFilteredCache {
   constructor(baseCache, predicate) {
     this.baseCache = baseCache;
     this.predicate = predicate;
@@ -94516,7 +94685,7 @@ class DefaultFilteredCache {
     const result = this.baseCache.get(key);
     if (result && this.predicate(key, result)) {
       if (options == null ? void 0 : options.copy) {
-        return deepCopy(result);
+        return deepCopy$1(result);
       }
       return result;
     }
@@ -94538,7 +94707,7 @@ class DefaultFilteredCache {
     return this.getFilteredEntries();
   }
   record() {
-    return new DefaultRecordableCache(this);
+    return new DefaultRecordableCache$1(this);
   }
   filter(predicate) {
     return new DefaultFilteredCache(this, predicate);
@@ -94558,10 +94727,10 @@ class DefaultFilteredCache {
     return filteredKeySet;
   }
   buildFixedTimeWritableCache(generatedTime) {
-    return new FixedTimeWritableCache(this, generatedTime);
+    return new FixedTimeWritableCache$1(this, generatedTime);
   }
-}
-class FixedTimeWritableCache {
+};
+let FixedTimeWritableCache$1 = class FixedTimeWritableCache {
   constructor(baseCache, generatedTime) {
     this.baseCache = baseCache;
     this.generatedTime = generatedTime;
@@ -94597,22 +94766,22 @@ class FixedTimeWritableCache {
     return this.baseCache.entries();
   }
   record() {
-    return new DefaultRecordableCache(this);
+    return new DefaultRecordableCache$1(this);
   }
   filter(predicate) {
-    return new DefaultFilteredCache(this, predicate);
+    return new DefaultFilteredCache$1(this, predicate);
   }
   buildFixedTimeWritableCache(generatedTime) {
     return new FixedTimeWritableCache(this, generatedTime);
   }
-}
-class DefaultCache {
+};
+let DefaultCache$1 = class DefaultCache {
   constructor() {
     this.data = {};
   }
   get(key, options) {
     if (options == null ? void 0 : options.copy) {
-      return deepCopy(this.data[key]);
+      return deepCopy$1(this.data[key]);
     }
     return this.data[key];
   }
@@ -94674,20 +94843,20 @@ class DefaultCache {
     return Object.entries(this.data);
   }
   record() {
-    return new DefaultRecordableCache(this);
+    return new DefaultRecordableCache$1(this);
   }
   filter(predicate) {
-    return new DefaultFilteredCache(this, predicate);
+    return new DefaultFilteredCache$1(this, predicate);
   }
   buildFixedTimeWritableCache(generatedTime) {
-    return new FixedTimeWritableCache(this, generatedTime);
+    return new FixedTimeWritableCache$1(this, generatedTime);
   }
-}
-function buildServiceDescriptor$5() {
+};
+function buildServiceDescriptor$6() {
   return {
     type: "cache",
     version: "1.0",
-    service: new DefaultCache()
+    service: new DefaultCache$1()
   };
 }
 
@@ -94720,7 +94889,7 @@ class NoCacheCacheControlStrategy extends CacheControlStrategy {
     const tempCache = this.filteredCache;
     return new Promise(async (resolve, reject) => {
       try {
-        let readResult = ok$2(void 0);
+        let readResult = ok$1(void 0);
         for await (const rfnResult of this.requestRunner.requestFromNetwork()) {
           if (rfnResult) {
             const result = await this.services.cacheInclusionPolicy.write({
@@ -94758,13 +94927,13 @@ class MaxAgeCacheControlStrategy extends CacheControlStrategy {
           startTime,
           options == null ? void 0 : options.instrumentationAttributes
         );
-        return ok$2(void 0);
+        return ok$1(void 0);
       }
       this.collectCacheMissInstrumentation(startTime, options == null ? void 0 : options.instrumentationAttributes);
       const tempCache = this.filteredCache;
       return new Promise(async (resolve, reject) => {
         try {
-          let readResult = ok$2(void 0);
+          let readResult = ok$1(void 0);
           for await (const rfnResult of this.requestRunner.requestFromNetwork()) {
             if (rfnResult) {
               const result = await this.services.cacheInclusionPolicy.write({
@@ -94780,7 +94949,7 @@ class MaxAgeCacheControlStrategy extends CacheControlStrategy {
               readFromL1: (l1) => this.requestRunner.readFromCache(l1)
             });
             if (readResult.isOk()) {
-              resolve(ok$2(void 0));
+              resolve(ok$1(void 0));
             }
           }
           return resolve(readResult);
@@ -94851,7 +95020,7 @@ class CacheController {
     yield* this.services.cacheInclusionPolicy.findAndModify(query, cacheUpdate);
   }
 }
-function buildServiceDescriptor$4(cache, cacheInclusionPolicy) {
+function buildServiceDescriptor$5(cache, cacheInclusionPolicy) {
   return {
     type: "cacheController",
     version: "1.0",
@@ -94859,193 +95028,6 @@ function buildServiceDescriptor$4(cache, cacheInclusionPolicy) {
   };
 }
 
-/*!
- * Copyright (c) 2022, Salesforce, Inc.,
- * All rights reserved.
- * For full license text, see the LICENSE.txt file
- */
-class CacheInclusionPolicyService {
-}
-/*!
- * Copyright (c) 2022, Salesforce, Inc.,
- * All rights reserved.
- * For full license text, see the LICENSE.txt file
- */
-class Ok {
-  constructor(value) {
-    this.value = value;
-  }
-  isOk() {
-    return true;
-  }
-  isErr() {
-    return !this.isOk();
-  }
-}
-const ok = (value) => new Ok(value);
-function resolvedPromiseLike$1(result) {
-  if (isPromiseLike$1(result)) {
-    return result.then((nextResult) => nextResult);
-  }
-  return {
-    then: (onFulfilled, _onRejected) => {
-      try {
-        return resolvedPromiseLike$1(onFulfilled(result));
-      } catch (e) {
-        if (onFulfilled === void 0) {
-          return resolvedPromiseLike$1(result);
-        }
-        return rejectedPromiseLike$1(e);
-      }
-    }
-  };
-}
-function rejectedPromiseLike$1(reason) {
-  if (isPromiseLike$1(reason)) {
-    return reason.then((nextResult) => nextResult);
-  }
-  return {
-    then: (_onFulfilled, onRejected) => {
-      if (typeof onRejected === "function") {
-        try {
-          return resolvedPromiseLike$1(onRejected(reason));
-        } catch (e) {
-          return rejectedPromiseLike$1(e);
-        }
-      }
-      return rejectedPromiseLike$1(reason);
-    }
-  };
-}
-function isPromiseLike$1(x) {
-  return typeof (x == null ? void 0 : x.then) === "function";
-}
-const isAndQuery = (query) => "$and" in query;
-const isOrQuery = (query) => "$or" in query;
-const isNotQuery = (query) => "$not" in query;
-const matchesMetadata = (metadataQuery, cacheControl) => {
-  if ("cacheControlType" in metadataQuery && cacheControl.type !== metadataQuery.cacheControlType.$eq) {
-    return false;
-  }
-  if ("maxAge" in metadataQuery && cacheControl.type === "max-age") {
-    const maxAge = cacheControl.maxAge ?? 0;
-    if (metadataQuery.maxAge.$gte !== void 0 && maxAge < metadataQuery.maxAge.$gte || metadataQuery.maxAge.$lte !== void 0 && maxAge > metadataQuery.maxAge.$lte) {
-      return false;
-    }
-  }
-  return true;
-};
-function queryToPredicate(query) {
-  return (key, entry) => {
-    if (!query) return false;
-    if (isAndQuery(query))
-      return query.$and.every((subQuery) => queryToPredicate(subQuery)(key, entry));
-    if (isOrQuery(query))
-      return query.$or.some((subQuery) => queryToPredicate(subQuery)(key, entry));
-    if (isNotQuery(query)) return !queryToPredicate(query.$not)(key, entry);
-    if ("key" in query) return matchesKey(query.key, key);
-    if ("metadata" in query)
-      return matchesMetadata(query.metadata, entry.metadata.cacheControl);
-    if ("value" in query) return false;
-    throw new Error("Unknown Query Operation");
-  };
-}
-function matchesKey(keyQuery, key) {
-  if ("$regex" in keyQuery) {
-    return keyQuery.$regex.test(key);
-  }
-  return false;
-}
-function buildUpdate(update, existing) {
-  switch (update.type) {
-    case "invalidate":
-      const updatedCacheControl = buildInvalidatedCacheControl(
-        existing.metadata.cacheControl
-      );
-      return updatedCacheControl !== void 0 ? { type: "metadata", metadata: updatedCacheControl } : { type: "no-op" };
-    default:
-      throw new Error(`Invalid update operation: ${update.type}`);
-  }
-}
-function buildInvalidatedCacheControl(existingCacheControl) {
-  switch (existingCacheControl.type) {
-    case "max-age":
-    case "stale-while-revalidate":
-      if (existingCacheControl.maxAge !== 0) {
-        return {
-          ...existingCacheControl,
-          maxAge: 0
-        };
-      }
-  }
-  return void 0;
-}
-class InMemoryCacheInclusionPolicy extends CacheInclusionPolicyService {
-  constructor(services) {
-    super();
-    this.services = services;
-  }
-  /**
-   * Reads data out of a single level in memory store.
-   */
-  read(options) {
-    const { l1, readFromL1 } = options;
-    return readFromL1(l1);
-  }
-  /**
-   * Writes data to a single level in memory store.
-   */
-  write(options) {
-    const { l1, writeToL1 } = options;
-    return writeToL1(l1);
-  }
-  /**
-   * Finds cache entries that match the given query.
-   * Returns an async generator that yields `[key, entry]`.
-   */
-  async *find(query) {
-    const cache = this.services.cache;
-    const predicate = queryToPredicate(query);
-    const filteredEntries = cache.filter(predicate).entries();
-    for (const entry of filteredEntries) {
-      yield entry;
-    }
-  }
-  /**
-   * Finds and modifies cache entries that match the given query.
-   * Extends `find(query)` and returns an async generator of modified keys.
-   */
-  async *findAndModify(query, cacheUpdate) {
-    const cache = this.services.cache;
-    for await (const [key, value] of this.find(query)) {
-      const update = buildUpdate(cacheUpdate, value);
-      switch (update.type) {
-        case "entry":
-          this.write({
-            l1: cache,
-            writeToL1: (l1) => resolvedPromiseLike$1(ok(l1.set(key, update.entry)))
-          });
-          yield key;
-          break;
-        case "metadata":
-          this.write({
-            l1: cache,
-            writeToL1: (l1) => resolvedPromiseLike$1(ok(l1.setMetadata(key, update.metadata)))
-          });
-          yield key;
-          break;
-      }
-    }
-  }
-}
-function buildInMemoryCacheInclusionPolicyService(cache) {
-  return {
-    service: new InMemoryCacheInclusionPolicy({ cache }),
-    type: "cacheInclusionPolicy",
-    version: "1.0"
-  };
-}
-
 /*!
  * Copyright (c) 2022, Salesforce, Inc.,
  * All rights reserved.
@@ -95084,7 +95066,7 @@ function buildInstrumentCommand(services) {
     };
   };
 }
-function buildServiceDescriptor$3(instrumentation) {
+function buildServiceDescriptor$4(instrumentation) {
   return {
     type: "instrumentCommand",
     version: "1.0",
@@ -95354,7 +95336,7 @@ class O11yInstrumentation {
     this.metrics = new O11yOTelMetricsAPI(this.services);
   }
 }
-function buildServiceDescriptor$2(logger) {
+function buildServiceDescriptor$3(logger) {
   return {
     type: "instrumentation",
     version: "1.0",
@@ -95372,41 +95354,41 @@ function buildServiceDescriptor$2(logger) {
  * All rights reserved.
  * For full license text, see the LICENSE.txt file
  */
-function resolvedPromiseLike(result) {
-  if (isPromiseLike(result)) {
+function resolvedPromiseLike$1(result) {
+  if (isPromiseLike$1(result)) {
     return result.then((nextResult) => nextResult);
   }
   return {
     then: (onFulfilled, _onRejected) => {
       try {
-        return resolvedPromiseLike(onFulfilled(result));
+        return resolvedPromiseLike$1(onFulfilled(result));
       } catch (e) {
         if (onFulfilled === void 0) {
-          return resolvedPromiseLike(result);
+          return resolvedPromiseLike$1(result);
         }
-        return rejectedPromiseLike(e);
+        return rejectedPromiseLike$1(e);
       }
     }
   };
 }
-function rejectedPromiseLike(reason) {
-  if (isPromiseLike(reason)) {
+function rejectedPromiseLike$1(reason) {
+  if (isPromiseLike$1(reason)) {
     return reason.then((nextResult) => nextResult);
   }
   return {
     then: (_onFulfilled, onRejected) => {
       if (typeof onRejected === "function") {
         try {
-          return resolvedPromiseLike(onRejected(reason));
+          return resolvedPromiseLike$1(onRejected(reason));
         } catch (e) {
-          return rejectedPromiseLike(e);
+          return rejectedPromiseLike$1(e);
         }
       }
-      return rejectedPromiseLike(reason);
+      return rejectedPromiseLike$1(reason);
     }
   };
 }
-function isPromiseLike(x) {
+function isPromiseLike$1(x) {
   return typeof (x == null ? void 0 : x.then) === "function";
 }
 const EventTypeWildcard = Symbol("EventTypeWildcard");
@@ -95436,14 +95418,14 @@ class DefaultPubSubService {
         return;
       }
       const returnVal = subscription.callback.call(subscription, event);
-      if (isPromiseLike(returnVal)) {
+      if (isPromiseLike$1(returnVal)) {
         promises.push(returnVal);
       }
     });
     if (promises.length > 0) {
       return Promise.all(promises).then(() => void 0);
     }
-    return resolvedPromiseLike(void 0);
+    return resolvedPromiseLike$1(void 0);
   }
   getSubscriptions(event) {
     const eventTypeSubscriptions = this.subscriptions.get(event.type);
@@ -95464,7 +95446,7 @@ class DefaultPubSubService {
     return matchingSubscriptions;
   }
 }
-function buildServiceDescriptor$1() {
+function buildServiceDescriptor$2() {
   return {
     type: "pubSub",
     version: "1.0",
@@ -95477,7 +95459,7 @@ function buildServiceDescriptor$1() {
  * All rights reserved.
  * For full license text, see the LICENSE.txt file
  */
-function buildServiceDescriptor(interceptors = { request: [], response: [] }) {
+function buildServiceDescriptor$1(interceptors = { request: [], response: [] }) {
   return {
     type: "fetch",
     version: "1.0",
@@ -95511,7 +95493,7 @@ function buildNimbusFetchServiceDescriptor() {
         });
     };
     return {
-        ...buildServiceDescriptor(),
+        ...buildServiceDescriptor$1(),
         service: service,
     };
 }
@@ -95560,31 +95542,550 @@ function convertFetchParamsToResourceRequest([input, init]) {
     };
 }
 
+/*!
+ * Copyright (c) 2022, Salesforce, Inc.,
+ * All rights reserved.
+ * For full license text, see the LICENSE.txt file
+ */
+class CacheInclusionPolicyService {
+}
+function setDifference(setA, setB) {
+  const differenceSet = /* @__PURE__ */ new Set();
+  for (const element of setA) {
+    if (!setB.has(element)) {
+      differenceSet.add(element);
+    }
+  }
+  return differenceSet;
+}
+function resolvedPromiseLike(result) {
+  if (isPromiseLike(result)) {
+    return result.then((nextResult) => nextResult);
+  }
+  return {
+    then: (onFulfilled, _onRejected) => {
+      try {
+        return resolvedPromiseLike(onFulfilled(result));
+      } catch (e) {
+        if (onFulfilled === void 0) {
+          return resolvedPromiseLike(result);
+        }
+        return rejectedPromiseLike(e);
+      }
+    }
+  };
+}
+function rejectedPromiseLike(reason) {
+  if (isPromiseLike(reason)) {
+    return reason.then((nextResult) => nextResult);
+  }
+  return {
+    then: (_onFulfilled, onRejected) => {
+      if (typeof onRejected === "function") {
+        try {
+          return resolvedPromiseLike(onRejected(reason));
+        } catch (e) {
+          return rejectedPromiseLike(e);
+        }
+      }
+      return rejectedPromiseLike(reason);
+    }
+  };
+}
+function isPromiseLike(x) {
+  return typeof (x == null ? void 0 : x.then) === "function";
+}
+/*!
+ * Copyright (c) 2022, Salesforce, Inc.,
+ * All rights reserved.
+ * For full license text, see the LICENSE.txt file
+ */
+/*!
+ * Copyright (c) 2022, Salesforce, Inc.,
+ * All rights reserved.
+ * For full license text, see the LICENSE.txt file
+ */
+const { stringify: stringify$8, parse: parse$8 } = JSON;
+function deepCopy(x) {
+  const stringified = stringify$8(x);
+  return stringified ? parse$8(stringified) : void 0;
+}
+class DefaultRecordableCache {
+  constructor(baseCache) {
+    this.baseCache = baseCache;
+    this.keysRead = /* @__PURE__ */ new Set();
+    this.missingKeysRead = /* @__PURE__ */ new Set();
+    this.keysUpdated = /* @__PURE__ */ new Set();
+    this.metadataKeysUpdated = /* @__PURE__ */ new Set();
+  }
+  delete(key) {
+    this.keysUpdated.add(key);
+    this.baseCache.delete(key);
+  }
+  get(key, options) {
+    this.keysRead.add(key);
+    const value = this.baseCache.get(key);
+    if (value === void 0) {
+      this.missingKeysRead.add(key);
+    }
+    if (options == null ? void 0 : options.copy) {
+      return deepCopy(value);
+    }
+    return value;
+  }
+  set(key, value) {
+    this.keysUpdated.add(key);
+    this.metadataKeysUpdated.add(key);
+    this.baseCache.set(key, value);
+  }
+  setMetadata(key, cacheControlMetadata) {
+    this.metadataKeysUpdated.add(key);
+    this.baseCache.setMetadata(key, cacheControlMetadata);
+  }
+  length() {
+    return this.baseCache.length();
+  }
+  keys() {
+    return this.baseCache.keys();
+  }
+  entries() {
+    return this.baseCache.entries();
+  }
+  record() {
+    return new DefaultRecordableCache(this);
+  }
+  filter(predicate) {
+    return new DefaultFilteredCache(this, predicate);
+  }
+  buildFixedTimeWritableCache(generatedTime) {
+    return new FixedTimeWritableCache(this, generatedTime);
+  }
+}
+class DefaultFilteredCache {
+  constructor(baseCache, predicate) {
+    this.baseCache = baseCache;
+    this.predicate = predicate;
+  }
+  delete(key) {
+    this.baseCache.delete(key);
+  }
+  get(key, options) {
+    const result = this.baseCache.get(key);
+    if (result && this.predicate(key, result)) {
+      if (options == null ? void 0 : options.copy) {
+        return deepCopy(result);
+      }
+      return result;
+    }
+    return void 0;
+  }
+  set(key, value) {
+    this.baseCache.set(key, value);
+  }
+  setMetadata(key, cacheControlMetadata) {
+    this.baseCache.setMetadata(key, cacheControlMetadata);
+  }
+  length() {
+    return this.getFilteredKeys().size;
+  }
+  keys() {
+    return this.getFilteredKeys();
+  }
+  entries() {
+    return this.getFilteredEntries();
+  }
+  record() {
+    return new DefaultRecordableCache(this);
+  }
+  filter(predicate) {
+    return new DefaultFilteredCache(this, predicate);
+  }
+  getFilteredEntries() {
+    return this.baseCache.entries().filter(([key, _value]) => {
+      return this.get(key);
+    });
+  }
+  getFilteredKeys() {
+    const filteredKeySet = /* @__PURE__ */ new Set();
+    this.baseCache.keys().forEach((key) => {
+      if (this.get(key)) {
+        filteredKeySet.add(key);
+      }
+    });
+    return filteredKeySet;
+  }
+  buildFixedTimeWritableCache(generatedTime) {
+    return new FixedTimeWritableCache(this, generatedTime);
+  }
+}
+class FixedTimeWritableCache {
+  constructor(baseCache, generatedTime) {
+    this.baseCache = baseCache;
+    this.generatedTime = generatedTime;
+  }
+  delete(key) {
+    this.baseCache.delete(key);
+  }
+  get(key, options) {
+    return this.baseCache.get(key, options);
+  }
+  set(key, value) {
+    this.baseCache.set(key, {
+      ...value,
+      metadata: {
+        ...value.metadata,
+        cacheControl: { ...value.metadata.cacheControl, generatedTime: this.generatedTime }
+      }
+    });
+  }
+  setMetadata(key, cacheControlMetadata) {
+    this.baseCache.setMetadata(key, {
+      ...cacheControlMetadata,
+      generatedTime: this.generatedTime
+    });
+  }
+  length() {
+    return this.baseCache.length();
+  }
+  keys() {
+    return this.baseCache.keys();
+  }
+  entries() {
+    return this.baseCache.entries();
+  }
+  record() {
+    return new DefaultRecordableCache(this);
+  }
+  filter(predicate) {
+    return new DefaultFilteredCache(this, predicate);
+  }
+  buildFixedTimeWritableCache(generatedTime) {
+    return new FixedTimeWritableCache(this, generatedTime);
+  }
+}
+class DefaultCache {
+  constructor() {
+    this.data = {};
+  }
+  get(key, options) {
+    if (options == null ? void 0 : options.copy) {
+      return deepCopy(this.data[key]);
+    }
+    return this.data[key];
+  }
+  /**
+   * Adds the specified key/value to the cache.
+   *
+   * @param key key at which to store value
+   * @param entry value to be stored
+   */
+  set(key, entry) {
+    if (entry.metadata.cacheControl.type === "no-store") {
+      return;
+    }
+    this.data[key] = {
+      ...entry,
+      metadata: {
+        ...entry.metadata,
+        type: entry.metadata.type || {
+          namespace: "OneStore:Internal",
+          name: "UnknownType"
+        },
+        cacheControl: {
+          generatedTime: Date.now() / 1e3,
+          ...entry.metadata.cacheControl
+        }
+      }
+    };
+  }
+  /**
+   * Removes the cache entry associated with the specified key.
+   *
+   * @param key key to be removed from the store
+   */
+  delete(key) {
+    delete this.data[key];
+  }
+  /**
+   * Sets the metadata for the specified key if the key is in cache.
+   * If the key doesn't exist, it does nothing.
+   *
+   * @param key key at which to store metadata
+   * @param cacheControlMetadata metadata to be stored
+   */
+  setMetadata(key, cacheControlMetadata) {
+    if (key in this.data) {
+      this.data[key].metadata.cacheControl = {
+        generatedTime: Date.now() / 1e3,
+        ...cacheControlMetadata
+      };
+    }
+  }
+  length() {
+    return this.keys().size;
+  }
+  keys() {
+    return new Set(Object.keys(this.data));
+  }
+  entries() {
+    return Object.entries(this.data);
+  }
+  record() {
+    return new DefaultRecordableCache(this);
+  }
+  filter(predicate) {
+    return new DefaultFilteredCache(this, predicate);
+  }
+  buildFixedTimeWritableCache(generatedTime) {
+    return new FixedTimeWritableCache(this, generatedTime);
+  }
+}
+function buildServiceDescriptor() {
+  return {
+    type: "cache",
+    version: "1.0",
+    service: new DefaultCache()
+  };
+}
+class DurableCacheInclusionPolicy extends CacheInclusionPolicyService {
+  /**
+   * Reads data out of a 2 level inclusive store.
+   */
+  read(options) {
+    const { l1, readFromL1, alreadyRevivedKeys } = options;
+    const recordableCache = l1.record();
+    return readFromL1(recordableCache).then((readResult) => {
+      if (readResult.isOk()) {
+        return readResult;
+      }
+      const keysToRevive = recordableCache.keysRead;
+      if (alreadyRevivedKeys && setDifference(keysToRevive, alreadyRevivedKeys).size === 0) {
+        return readResult;
+      }
+      return this.revive(keysToRevive, l1).then((revivedKeys) => {
+        if (setDifference(keysToRevive, revivedKeys).size > 0) {
+          return readResult;
+        }
+        return this.read({ l1, readFromL1, alreadyRevivedKeys: revivedKeys });
+      });
+    });
+  }
+  /**
+   * Writes data to a 2 level inclusive store.
+   */
+  write(options) {
+    const { l1, writeToL1 } = options;
+    const tempL1 = buildServiceDescriptor().service.record();
+    return writeToL1(tempL1).then(() => {
+      const keysToReviveRecordableCache = l1.record();
+      tempL1.keysUpdated.forEach((key) => keysToReviveRecordableCache.get(key));
+      tempL1.missingKeysRead.forEach((key) => keysToReviveRecordableCache.get(key));
+      const missingKeys = keysToReviveRecordableCache.missingKeysRead;
+      const revivePromiseLike = missingKeys.size > 0 ? this.revive(missingKeys, l1).then(() => void 0) : resolvedPromiseLike(void 0);
+      return revivePromiseLike.then(() => {
+        const recordableCache = l1.record();
+        return writeToL1(recordableCache).then((result) => {
+          this.syncToL2Cache(recordableCache.keysUpdated, l1);
+          return result;
+        });
+      });
+    });
+  }
+}
+
+class NimbusDurableCacheInclusionPolicy extends DurableCacheInclusionPolicy {
+    constructor(services, store) {
+        super();
+        this.services = services;
+        this.store = store;
+        this.registerListener();
+    }
+    revive(keys, l1) {
+        if (keys.size === 0)
+            return Promise.resolve(new Set());
+        return this.store.getEntries(keys).then((entries) => {
+            const keysRevived = new Set();
+            if (!entries)
+                return keysRevived;
+            entries.forEach(({ key, entry }) => {
+                l1.set(key, entry);
+                keysRevived.add(key);
+            });
+            return keysRevived;
+        });
+    }
+    syncToL2Cache(changedKeys, l1) {
+        if (changedKeys.size === 0)
+            return Promise.resolve();
+        const entries = [];
+        for (const key of changedKeys) {
+            const entry = l1.get(key);
+            if (entry) {
+                entries.push({ key, entry });
+            }
+        }
+        return entries.length > 0 ? this.store.setEntries(entries) : Promise.resolve();
+    }
+    find(_query) {
+        throw new Error('find not supported on the NimbusDurableCacheInclusionPolicy');
+    }
+    findAndModify(_query, _cacheUpdate) {
+        throw new Error('findAndModify not supported on the NimbusDurableCacheInclusionPolicy');
+    }
+    registerListener() {
+        this.store.registerOnChangedListener(async (changes) => {
+            changes.forEach((change) => {
+                const upsertKeys = new Set();
+                const evictKeys = new Set();
+                for (const key of change.keys) {
+                    if (change.type === 'upsert') {
+                        upsertKeys.add(key);
+                    }
+                    else {
+                        evictKeys.add(key);
+                    }
+                }
+                if (upsertKeys.size > 0) {
+                    this.store.getEntries(upsertKeys).then((entries) => {
+                        if (entries === undefined)
+                            return;
+                        entries.forEach(({ key, entry }) => {
+                            this.services.cache.set(key, entry);
+                            return resolvedPromiseLike$3(ok$1(undefined));
+                        });
+                    });
+                }
+                // TODO: onestore doesnt support cache eviction yet
+                // if (evictKeys.size > 0) {
+                //     evictKeys.forEach((key) => {
+                //         this.services.cache.evict(key);
+                //     });
+                // }
+            });
+        });
+    }
+}
+function buildNimbusDurableCacheInclusionPolicyService(cache, store) {
+    return {
+        service: new NimbusDurableCacheInclusionPolicy({ cache }, store),
+        type: 'cacheInclusionPolicy',
+        version: '1.0',
+    };
+}
+
+const TABLE_NAME = 'lds_one_store_data';
+class NimbusSqliteOneStoreCache {
+    constructor(sqlStore) {
+        this.sqlStore = sqlStore;
+    }
+    async getEntry(key) {
+        const result = await this.query(`SELECT key, data, metadata FROM ${TABLE_NAME} WHERE key = ?`, [key]);
+        if (result.rows.length === 0)
+            return undefined;
+        const [_key, data, metadata] = result.rows[0];
+        return {
+            key,
+            entry: {
+                value: JSON.parse(data),
+                metadata: metadata ? JSON.parse(metadata) : undefined,
+            },
+        };
+    }
+    async getEntries(keys) {
+        if (keys.size === 0)
+            return undefined;
+        const placeholders = Array(keys.size).fill('?').join(', ');
+        const result = await this.query(`SELECT key, data, metadata FROM ${TABLE_NAME} WHERE key IN (${placeholders})`, [...keys]);
+        if (result.rows.length === 0)
+            return undefined;
+        return result.rows.map((row) => {
+            const [key, data, metadata] = row;
+            return {
+                key: key,
+                entry: {
+                    value: JSON.parse(data),
+                    metadata: metadata ? JSON.parse(metadata) : undefined,
+                },
+            };
+        });
+    }
+    async setEntry(key, entry) {
+        return this.setEntries([{ key, entry }]);
+    }
+    async setEntries(entries) {
+        if (entries.length === 0)
+            return;
+        const rows = entries.map(({ key, entry: { value, metadata } }) => [
+            key,
+            JSON.stringify(value),
+            JSON.stringify(metadata),
+        ]);
+        const operation = {
+            type: 'upsert',
+            table: TABLE_NAME,
+            keyColumn: 'key',
+            conflictColumns: ['key'],
+            columns: ['key', 'data', 'metadata'],
+            rows,
+            context: {},
+        };
+        return this.batchQuery([operation]);
+    }
+    registerOnChangedListener(listener) {
+        let unsubscribeId = undefined;
+        this.sqlStore
+            .registerOnChangedListener((changes) => {
+            const onestoreChanges = changes.filter((change) => change.table === TABLE_NAME);
+            return listener(onestoreChanges);
+        })
+            .then((id) => {
+            unsubscribeId = id;
+        });
+        return () => {
+            if (unsubscribeId === undefined)
+                return Promise.resolve();
+            return this.sqlStore.unsubscribeOnChangedListener(unsubscribeId);
+        };
+    }
+    batchQuery(operations) {
+        return new Promise((resolve, reject) => {
+            this.sqlStore.batchOperations(operations, (error) => {
+                error ? reject(error) : resolve();
+            });
+        });
+    }
+    query(sql, params) {
+        return new Promise((resolve, reject) => {
+            this.sqlStore.query(sql, params, resolve, reject);
+        });
+    }
+}
+
 // TODO[@W-18753648]: These services depend on WebApis that aren't available in the worker.
 // import { buildServiceDescriptor as buildNdJsonServiceDescriptor } from '@luvio/command-ndjson/v1';
 // import { buildServiceDescriptor as buildStreamingCommandServiceDescriptor } from '@luvio/command-streaming/v1';
 // import { buildServiceDescriptor as buildSseCommandServiceDescriptor } from '@luvio/command-sse/v1';
-function initializeOneStore() {
+function initializeOneStore(sqliteStore) {
     if (!useOneStore.isOpen({ fallback: true })) {
         return;
     }
     const loggerService = new ConsoleLogger('ERROR');
-    const cacheServiceDescriptor = buildServiceDescriptor$5();
-    const instrumentationServiceDescriptor = buildServiceDescriptor$2(loggerService);
-    const inMemoryCacheInclusionPolicyServiceDescriptor = buildInMemoryCacheInclusionPolicyService(cacheServiceDescriptor.service);
+    const cacheServiceDescriptor = buildServiceDescriptor$6();
+    const instrumentationServiceDescriptor = buildServiceDescriptor$3(loggerService);
+    const nimbusSqliteOneStoreCacheServiceDescriptor = buildNimbusDurableCacheInclusionPolicyService(cacheServiceDescriptor.service, new NimbusSqliteOneStoreCache(sqliteStore));
     const services = [
         instrumentationServiceDescriptor,
         buildNimbusFetchServiceDescriptor(),
-        buildServiceDescriptor$3(instrumentationServiceDescriptor.service),
+        buildServiceDescriptor$4(instrumentationServiceDescriptor.service),
         // NOTE: These do not directly depend on Aura, and are necessary for HTTP fallback support.
+        buildServiceDescriptor$b(),
         buildServiceDescriptor$a(),
         buildServiceDescriptor$9(),
+        buildServiceDescriptor$5(cacheServiceDescriptor.service, nimbusSqliteOneStoreCacheServiceDescriptor.service),
         buildServiceDescriptor$8(),
-        buildServiceDescriptor$4(cacheServiceDescriptor.service, inMemoryCacheInclusionPolicyServiceDescriptor.service),
+        buildServiceDescriptor$c(),
         buildServiceDescriptor$7(),
-        buildServiceDescriptor$b(),
-        buildServiceDescriptor$6(),
-        buildServiceDescriptor$1(),
+        buildServiceDescriptor$2(),
         // TODO[@W-18753648]: See note above.
         // buildStreamingCommandServiceDescriptor(),
         // buildNdJsonServiceDescriptor(),
@@ -95763,7 +96264,7 @@ function getRuntime({ primeUser = false } = {}) {
         withRegistration('@salesforce/lds-adapters-uiapi/graphql', configureUIAPIGraphQL);
     }
     // onestore initialization
-    initializeOneStore();
+    initializeOneStore(lazyDurableStore['plugin']);
     return {
         luvio: lazyLuvio,
         internalLuvio: lazyInternalLuvio,
@@ -95795,7 +96296,7 @@ register$1({
     id: '@salesforce/lds-network-adapter',
     instrument: instrument$2,
 });
-// version: 1.368.0-20c9e0247b
+// version: 1.370.0-3ec6ffba72
 
 const { create: create$2, keys: keys$2 } = Object;
 const { stringify, parse } = JSON;
@@ -96449,6 +96950,267 @@ function buildAdapterValidationConfig$1(displayName, paramsMeta) {
 }
 const keyPrefix$1 = 'UiApi';
 
+/**
+ * Defines configuration for the module with a default value which can be overridden by the runtime environment.
+ */
+// A holder for a configurable adapter override
+let Configurable$1 = class Configurable {
+    constructor() {
+        this.getAdapter = () => {
+            return this.adapter;
+        };
+        this.setAdapter = (value) => {
+            this.adapter = value;
+        };
+        this.adapter = undefined;
+    }
+};
+// Configurable adapters that can have environmental overrides
+let configurableCreateRecordAdapter$1 = new Configurable$1();
+let configurableUpdateRecordAdapter$1 = new Configurable$1();
+let configurableDeleteRecordAdapter$1 = new Configurable$1();
+let configurablePerformQuickActionAdapter$1 = new Configurable$1();
+let configurablePerformUpdateRecordQuickActionAdapter$1 = new Configurable$1();
+let configurableCreateContentDocumentAndVersion$1 = new Configurable$1();
+let configurableCreateContentVersion$1 = new Configurable$1();
+/**
+ * Depth to which tracked fields will be added to a request that results from a cache miss.
+ * A value of 0 inhibits the addition of tracked fields, 1 will add tracked fields that can
+ * be reached by following 1 relationship from the root record, etc.
+ * @defaultValue '5', replicates the current behavior
+ */
+let trackedFieldDepthOnCacheMiss$1 = 5;
+/**
+ * Depth to which tracked fields will be added to a request that results from a merge conflict
+ * A value of 0 inhibits the addition of tracked fields, 1 will add tracked fields that can
+ * be reached by following 1 relationship from the root record, etc.
+ * @defaultValue '5', replicates the current behavior
+ */
+let trackedFieldDepthOnCacheMergeConflict$1 = 5;
+/**
+ * Depth to which tracked fields will be added to a request that results from a notify change invocation by the consumer
+ * A value of 0 inhibits the addition of tracked fields, 1 will add tracked fields that can
+ * be reached by following 1 relationship from the root record, etc.
+ * @defaultValue '5', replicates the current behavior
+ */
+let trackedFieldDepthOnNotifyChange$1 = 5;
+/**
+ * Determines if we will only fetch the 'Id' field for the leaf relationship record
+ * @defaultValue 'false', replicates the current behavior and fetches all fields in the store for the leaf relationship record
+ */
+let trackedFieldLeafNodeIdAndNameOnly$1 = false;
+/**
+ * One store enabled Get Object Info adapter
+ */
+let oneStoreGetObjectInfoAdapter$1 = undefined;
+/**
+ * One store enabled Get Object Infos adapter
+ */
+let oneStoreGetObjectInfosAdapter$1 = undefined;
+/**
+ * One store enabled GraphQL adapter
+ */
+let oneStoreGraphQLWireAdapter$1 = undefined;
+/**
+ * One store enabled GraphQL imperative query adapter
+ */
+let oneStoreGraphQLImperativeQueryAdapter$1 = undefined;
+/**
+ * Determines when to include PDL strategies for Related Lists
+ */
+let relatedListsPredictionsEnabled$1 = false;
+/**
+ * Determines whether to include additional PDL strategies for Related Lists
+ */
+let relatedListsPlusPredictionsEnabled$1 = false;
+let recordRepresentationIngestionOverride$1 = undefined;
+/**
+ * Defines the configuration API and is exposed internally as well as externally.
+ * Configuration for one store enabled REST adapters only.
+ */
+const configurationForOneStoreEnabledAdapters$1 = {
+    setGetObjectInfoAdapter: function (adapter) {
+        oneStoreGetObjectInfoAdapter$1 = adapter;
+    },
+    getGetObjectInfoAdapter: function () {
+        return oneStoreGetObjectInfoAdapter$1;
+    },
+    setGetObjectInfosAdapter: function (adapter) {
+        oneStoreGetObjectInfosAdapter$1 = adapter;
+    },
+    getGetObjectInfosAdapter: function () {
+        return oneStoreGetObjectInfosAdapter$1;
+    },
+    setGraphQLWireAdapter: function (adapter) {
+        oneStoreGraphQLWireAdapter$1 = adapter;
+    },
+    getGraphQLWireAdapter: function () {
+        return oneStoreGraphQLWireAdapter$1;
+    },
+    setGraphQLImperativeQueryAdapter: function (adapter) {
+        oneStoreGraphQLImperativeQueryAdapter$1 = adapter;
+    },
+    getGraphQLImperativeQueryAdapter: function () {
+        return oneStoreGraphQLImperativeQueryAdapter$1;
+    },
+};
+/**
+ * Helper function to return the one store adapter if it's defined, otherwise return the luvio adapter.
+ * @param luvioAdapter - The luvio bound adapter.
+ * @param oneStoreAdapter - The one store bound adapter.
+ * @returns Luvio or one store wire adapter constructor.
+ */
+function getLuvioOrOneStoreAdapter(luvioAdapter, oneStoreAdapter) {
+    return oneStoreAdapter ?? luvioAdapter;
+}
+const getKeywordSearchResultsFactory$1 = new Configurable$1();
+const getListRecordsByNameFactory$1 = new Configurable$1();
+const getListUiFactory$1 = new Configurable$1();
+const getLookupRecordsFactory$1 = new Configurable$1();
+const getQuickActionDefaultsFactory$1 = new Configurable$1();
+const getRecordCreateDefaultsFactory$1 = new Configurable$1();
+const getRecordTemplateCloneFactory$1 = new Configurable$1();
+const getRecordTemplateCreateFactory$1 = new Configurable$1();
+const getRecordUiFactory$1 = new Configurable$1();
+const getRecordFactory$1 = new Configurable$1();
+const getRecordsFactory$1 = new Configurable$1();
+const getRelatedListRecordsFactory$1 = new Configurable$1();
+const getRelatedListRecordsBatchFactory$1 = new Configurable$1();
+const getSearchResultsFactory$1 = new Configurable$1();
+// The following set of adapters all touch RecordRepresentation directly or indirectly,
+// so they need to support having a custom factory provided by the mobile environment.
+const configurationForEnvironmentFactoryOverrides$1 = {
+    getKeywordSearchResultsAdapterFactory: getKeywordSearchResultsFactory$1.getAdapter,
+    setGetKeywordSearchResultsAdapterFactory: getKeywordSearchResultsFactory$1.setAdapter,
+    getListRecordsByNameAdapterFactory: getListRecordsByNameFactory$1.getAdapter,
+    setGetListRecordsByNameAdapterFactory: getListRecordsByNameFactory$1.setAdapter,
+    getListUiAdapterFactory: getListUiFactory$1.getAdapter,
+    setGetListUiAdapterFactory: getListUiFactory$1.setAdapter,
+    getLookupRecordsAdapterFactory: getLookupRecordsFactory$1.getAdapter,
+    setGetLookupRecordsAdapterFactory: getLookupRecordsFactory$1.setAdapter,
+    getQuickActionDefaultsAdapterFactory: getQuickActionDefaultsFactory$1.getAdapter,
+    setGetQuickActionDefaultsAdapterFactory: getQuickActionDefaultsFactory$1.setAdapter,
+    getRecordCreateDefaultsAdapterFactory: getRecordCreateDefaultsFactory$1.getAdapter,
+    setGetRecordCreateDefaultsAdapterFactory: getRecordCreateDefaultsFactory$1.setAdapter,
+    getRecordTemplateCloneAdapterFactory: getRecordTemplateCloneFactory$1.getAdapter,
+    setGetRecordTemplateCloneAdapterFactory: getRecordTemplateCloneFactory$1.setAdapter,
+    getRecordTemplateCreateAdapterFactory: getRecordTemplateCreateFactory$1.getAdapter,
+    setGetRecordTemplateCreateAdapterFactory: getRecordTemplateCreateFactory$1.setAdapter,
+    getRecordUiAdapterFactory: getRecordUiFactory$1.getAdapter,
+    setGetRecordUiAdapterFactory: getRecordUiFactory$1.setAdapter,
+    getRecordAdapterFactory: getRecordFactory$1.getAdapter,
+    setGetRecordAdapterFactory: getRecordFactory$1.setAdapter,
+    getRecordsAdapterFactory: getRecordsFactory$1.getAdapter,
+    setGetRecordsAdapterFactory: getRecordsFactory$1.setAdapter,
+    getRelatedListRecordsAdapterFactory: getRelatedListRecordsFactory$1.getAdapter,
+    setGetRelatedListRecordsAdapterFactory: getRelatedListRecordsFactory$1.setAdapter,
+    getRelatedListRecordsBatchAdapterFactory: getRelatedListRecordsBatchFactory$1.getAdapter,
+    setGetRelatedListRecordsBatchAdapterFactory: getRelatedListRecordsBatchFactory$1.setAdapter,
+    getSearchResultsAdapterFactory: getSearchResultsFactory$1.getAdapter,
+    setGetSearchResultsAdapterFactory: getSearchResultsFactory$1.setAdapter,
+};
+/**
+ * Defines the configuration API and is exposed internally as well as externally.
+ * Configuration for REST adapters only.
+ */
+const configurationForRestAdapters$1 = {
+    setTrackedFieldDepthOnCacheMiss: function (trackedFieldDepthOnCacheMissParam) {
+        trackedFieldDepthOnCacheMiss$1 = trackedFieldDepthOnCacheMissParam;
+    },
+    getTrackedFieldDepthOnCacheMiss: function () {
+        return trackedFieldDepthOnCacheMiss$1;
+    },
+    setTrackedFieldDepthOnCacheMergeConflict: function (trackedFieldDepthOnCacheMergeConflictParam) {
+        trackedFieldDepthOnCacheMergeConflict$1 = trackedFieldDepthOnCacheMergeConflictParam;
+    },
+    getTrackedFieldDepthOnCacheMergeConflict: function () {
+        return trackedFieldDepthOnCacheMergeConflict$1;
+    },
+    setTrackedFieldDepthOnNotifyChange: function (trackedFieldDepthOnNotifyChangeParam) {
+        trackedFieldDepthOnNotifyChange$1 = trackedFieldDepthOnNotifyChangeParam;
+    },
+    getTrackedFieldDepthOnNotifyChange: function () {
+        return trackedFieldDepthOnNotifyChange$1;
+    },
+    setTrackedFieldLeafNodeIdAndNameOnly: function (trackedFieldLeafNodeIdAndNameOnlyParam) {
+        trackedFieldLeafNodeIdAndNameOnly$1 = trackedFieldLeafNodeIdAndNameOnlyParam;
+    },
+    getTrackedFieldLeafNodeIdAndNameOnly: function () {
+        return trackedFieldLeafNodeIdAndNameOnly$1;
+    },
+    setRelatedListsPredictionsEnabled: function (f) {
+        relatedListsPredictionsEnabled$1 = f;
+    },
+    areRelatedListsPredictionsEnabled: function () {
+        return relatedListsPredictionsEnabled$1 === true;
+    },
+    setRelatedListsPlusPredictionsEnabled: function (f) {
+        relatedListsPlusPredictionsEnabled$1 = f;
+    },
+    areRelatedListsPlusPredictionsEnabled: function () {
+        return relatedListsPlusPredictionsEnabled$1 === true;
+    },
+    setRecordRepresentationIngestionOverride: function (ingest) {
+        recordRepresentationIngestionOverride$1 = ingest;
+    },
+    getRecordRepresentationIngestionOverride: function () {
+        return recordRepresentationIngestionOverride$1;
+    },
+    // createRecord
+    getDraftAwareCreateRecordAdapter: configurableCreateRecordAdapter$1.getAdapter,
+    setDraftAwareCreateRecordAdapter: configurableCreateRecordAdapter$1.setAdapter,
+    // updateRecord
+    getDraftAwareUpdateRecordAdapter: configurableUpdateRecordAdapter$1.getAdapter,
+    setDraftAwareUpdateRecordAdapter: configurableUpdateRecordAdapter$1.setAdapter,
+    // deleteRecord
+    getDraftAwareDeleteRecordAdapter: configurableDeleteRecordAdapter$1.getAdapter,
+    setDraftAwareDeleteRecordAdapter: configurableDeleteRecordAdapter$1.setAdapter,
+    // performQuickAction
+    getDraftAwarePerformQuickActionAdapter: configurablePerformQuickActionAdapter$1.getAdapter,
+    setDraftAwarePerformQuickActionAdapter: configurablePerformQuickActionAdapter$1.setAdapter,
+    // performRecordUpdateQuickAction
+    getDraftAwarePerformUpdateRecordQuickActionAdapter: configurablePerformUpdateRecordQuickActionAdapter$1.getAdapter,
+    setDraftAwarePerformUpdateRecordQuickActionAdapter: configurablePerformUpdateRecordQuickActionAdapter$1.setAdapter,
+    // createContentDocumentAndVersion
+    getDraftAwareCreateContentDocumentAndVersionAdapter: configurableCreateContentDocumentAndVersion$1.getAdapter,
+    setDraftAwareCreateContentDocumentAndVersionAdapter: configurableCreateContentDocumentAndVersion$1.setAdapter,
+    // createContentVersion
+    getDraftAwareCreateContentVersionAdapter: configurableCreateContentVersion$1.getAdapter,
+    setDraftAwareCreateContentVersionAdapter: configurableCreateContentVersion$1.setAdapter,
+    ...configurationForOneStoreEnabledAdapters$1,
+    ...configurationForEnvironmentFactoryOverrides$1,
+};
+let configurableGraphQLAdapter$1 = new Configurable$1();
+let configurableGraphQLBatchAdapter$1 = new Configurable$1();
+/**
+ * Defines the configuration API and is exposed internally as well as externally.
+ * Configuration for GraphQL adapters only.
+ */
+const configurationForGraphQLAdapters$1 = {
+    getDraftAwareGraphQLAdapter: configurableGraphQLAdapter$1.getAdapter,
+    setDraftAwareGraphQLAdapter: configurableGraphQLAdapter$1.setAdapter,
+    getEnvironmentAwareGraphQLBatchAdapter: configurableGraphQLBatchAdapter$1.getAdapter,
+    setEnvironmentAwareGraphQLBatchAdapter: configurableGraphQLBatchAdapter$1.setAdapter,
+};
+const registrations$1 = new Set();
+/**
+ * lds-adapter-uiapi is special.  The non-SFDC bundle combines REST and GQL adapters,
+ * yet for SFDC those are separate bundles.  So non-SFDC bundle (./main.ts) registers
+ * both REST and GQL configs.  We want each SFDC bundle to register (we don't want one
+ * SFDC bundle to assume the other is being loaded and therefore the other one will
+ * take care of registration) but we don't want to double register either.
+ *
+ * So we make this function that memoizes if it's been called before and only
+ * actually registers once.
+ */
+function ensureRegisteredOnce$1(registration) {
+    const { id } = registration;
+    if (!registrations$1.has(id)) {
+        register$1(registration);
+        registrations$1.add(id);
+    }
+}
+
 const { keys: ObjectKeys, create: ObjectCreate, assign: ObjectAssign } = Object;
 function equalsObject(a, b, equalsProp) {
     const aKeys = ObjectKeys(a).sort();
@@ -120682,7 +121444,7 @@ function transformConfiguration$1(config) {
     // Make a copy of the config before running transform to avoid mutating the original config
     const adapterConfigCopy = {
         ...config,
-        query: parse$8(print(config.query))
+        query: parse$9(print(config.query))
     };
     return {
         ...adapterConfigCopy,
@@ -120745,238 +121507,6 @@ function buildCachedSnapshotCachePolicy$1(context, storeLookup) {
     return cacheSnapshot;
 }
 
-/**
- * Defines configuration for the module with a default value which can be overridden by the runtime environment.
- */
-// A holder for a configurable adapter override
-let Configurable$1 = class Configurable {
-    constructor() {
-        this.getAdapter = () => {
-            return this.adapter;
-        };
-        this.setAdapter = (value) => {
-            this.adapter = value;
-        };
-        this.adapter = undefined;
-    }
-};
-// Configurable adapters that can have environmental overrides
-let configurableCreateRecordAdapter$1 = new Configurable$1();
-let configurableUpdateRecordAdapter$1 = new Configurable$1();
-let configurableDeleteRecordAdapter$1 = new Configurable$1();
-let configurablePerformQuickActionAdapter$1 = new Configurable$1();
-let configurablePerformUpdateRecordQuickActionAdapter$1 = new Configurable$1();
-let configurableCreateContentDocumentAndVersion$1 = new Configurable$1();
-let configurableCreateContentVersion$1 = new Configurable$1();
-/**
- * Depth to which tracked fields will be added to a request that results from a cache miss.
- * A value of 0 inhibits the addition of tracked fields, 1 will add tracked fields that can
- * be reached by following 1 relationship from the root record, etc.
- * @defaultValue '5', replicates the current behavior
- */
-let trackedFieldDepthOnCacheMiss$1 = 5;
-/**
- * Depth to which tracked fields will be added to a request that results from a merge conflict
- * A value of 0 inhibits the addition of tracked fields, 1 will add tracked fields that can
- * be reached by following 1 relationship from the root record, etc.
- * @defaultValue '5', replicates the current behavior
- */
-let trackedFieldDepthOnCacheMergeConflict$1 = 5;
-/**
- * Depth to which tracked fields will be added to a request that results from a notify change invocation by the consumer
- * A value of 0 inhibits the addition of tracked fields, 1 will add tracked fields that can
- * be reached by following 1 relationship from the root record, etc.
- * @defaultValue '5', replicates the current behavior
- */
-let trackedFieldDepthOnNotifyChange$1 = 5;
-/**
- * Determines if we will only fetch the 'Id' field for the leaf relationship record
- * @defaultValue 'false', replicates the current behavior and fetches all fields in the store for the leaf relationship record
- */
-let trackedFieldLeafNodeIdAndNameOnly$1 = false;
-/**
- * One store enabled Get Object Info adapter
- */
-let oneStoreGetObjectInfoAdapter$1 = undefined;
-/**
- * One store enabled Get Object Infos adapter
- */
-let oneStoreGetObjectInfosAdapter$1 = undefined;
-/**
- * Determines when to include PDL strategies for Related Lists
- */
-let relatedListsPredictionsEnabled$1 = false;
-/**
- * Determines whether to include additional PDL strategies for Related Lists
- */
-let relatedListsPlusPredictionsEnabled$1 = false;
-let recordRepresentationIngestionOverride$1 = undefined;
-/**
- * Defines the configuration API and is exposed internally as well as externally.
- * Configuration for one store enabled REST adapters only.
- */
-const configurationForOneStoreEnabledAdapters$1 = {
-    setGetObjectInfoAdapter: function (adapter) {
-        oneStoreGetObjectInfoAdapter$1 = adapter;
-    },
-    getGetObjectInfoAdapter: function () {
-        return oneStoreGetObjectInfoAdapter$1;
-    },
-    setGetObjectInfosAdapter: function (adapter) {
-        oneStoreGetObjectInfosAdapter$1 = adapter;
-    },
-    getGetObjectInfosAdapter: function () {
-        return oneStoreGetObjectInfosAdapter$1;
-    },
-};
-const getKeywordSearchResultsFactory$1 = new Configurable$1();
-const getListRecordsByNameFactory$1 = new Configurable$1();
-const getListUiFactory$1 = new Configurable$1();
-const getLookupRecordsFactory$1 = new Configurable$1();
-const getQuickActionDefaultsFactory$1 = new Configurable$1();
-const getRecordCreateDefaultsFactory$1 = new Configurable$1();
-const getRecordTemplateCloneFactory$1 = new Configurable$1();
-const getRecordTemplateCreateFactory$1 = new Configurable$1();
-const getRecordUiFactory$1 = new Configurable$1();
-const getRecordFactory$1 = new Configurable$1();
-const getRecordsFactory$1 = new Configurable$1();
-const getRelatedListRecordsFactory$1 = new Configurable$1();
-const getRelatedListRecordsBatchFactory$1 = new Configurable$1();
-const getSearchResultsFactory$1 = new Configurable$1();
-// The following set of adapters all touch RecordRepresentation directly or indirectly,
-// so they need to support having a custom factory provided by the mobile environment.
-const configurationForEnvironmentFactoryOverrides$1 = {
-    getKeywordSearchResultsAdapterFactory: getKeywordSearchResultsFactory$1.getAdapter,
-    setGetKeywordSearchResultsAdapterFactory: getKeywordSearchResultsFactory$1.setAdapter,
-    getListRecordsByNameAdapterFactory: getListRecordsByNameFactory$1.getAdapter,
-    setGetListRecordsByNameAdapterFactory: getListRecordsByNameFactory$1.setAdapter,
-    getListUiAdapterFactory: getListUiFactory$1.getAdapter,
-    setGetListUiAdapterFactory: getListUiFactory$1.setAdapter,
-    getLookupRecordsAdapterFactory: getLookupRecordsFactory$1.getAdapter,
-    setGetLookupRecordsAdapterFactory: getLookupRecordsFactory$1.setAdapter,
-    getQuickActionDefaultsAdapterFactory: getQuickActionDefaultsFactory$1.getAdapter,
-    setGetQuickActionDefaultsAdapterFactory: getQuickActionDefaultsFactory$1.setAdapter,
-    getRecordCreateDefaultsAdapterFactory: getRecordCreateDefaultsFactory$1.getAdapter,
-    setGetRecordCreateDefaultsAdapterFactory: getRecordCreateDefaultsFactory$1.setAdapter,
-    getRecordTemplateCloneAdapterFactory: getRecordTemplateCloneFactory$1.getAdapter,
-    setGetRecordTemplateCloneAdapterFactory: getRecordTemplateCloneFactory$1.setAdapter,
-    getRecordTemplateCreateAdapterFactory: getRecordTemplateCreateFactory$1.getAdapter,
-    setGetRecordTemplateCreateAdapterFactory: getRecordTemplateCreateFactory$1.setAdapter,
-    getRecordUiAdapterFactory: getRecordUiFactory$1.getAdapter,
-    setGetRecordUiAdapterFactory: getRecordUiFactory$1.setAdapter,
-    getRecordAdapterFactory: getRecordFactory$1.getAdapter,
-    setGetRecordAdapterFactory: getRecordFactory$1.setAdapter,
-    getRecordsAdapterFactory: getRecordsFactory$1.getAdapter,
-    setGetRecordsAdapterFactory: getRecordsFactory$1.setAdapter,
-    getRelatedListRecordsAdapterFactory: getRelatedListRecordsFactory$1.getAdapter,
-    setGetRelatedListRecordsAdapterFactory: getRelatedListRecordsFactory$1.setAdapter,
-    getRelatedListRecordsBatchAdapterFactory: getRelatedListRecordsBatchFactory$1.getAdapter,
-    setGetRelatedListRecordsBatchAdapterFactory: getRelatedListRecordsBatchFactory$1.setAdapter,
-    getSearchResultsAdapterFactory: getSearchResultsFactory$1.getAdapter,
-    setGetSearchResultsAdapterFactory: getSearchResultsFactory$1.setAdapter,
-};
-/**
- * Defines the configuration API and is exposed internally as well as externally.
- * Configuration for REST adapters only.
- */
-const configurationForRestAdapters$1 = {
-    setTrackedFieldDepthOnCacheMiss: function (trackedFieldDepthOnCacheMissParam) {
-        trackedFieldDepthOnCacheMiss$1 = trackedFieldDepthOnCacheMissParam;
-    },
-    getTrackedFieldDepthOnCacheMiss: function () {
-        return trackedFieldDepthOnCacheMiss$1;
-    },
-    setTrackedFieldDepthOnCacheMergeConflict: function (trackedFieldDepthOnCacheMergeConflictParam) {
-        trackedFieldDepthOnCacheMergeConflict$1 = trackedFieldDepthOnCacheMergeConflictParam;
-    },
-    getTrackedFieldDepthOnCacheMergeConflict: function () {
-        return trackedFieldDepthOnCacheMergeConflict$1;
-    },
-    setTrackedFieldDepthOnNotifyChange: function (trackedFieldDepthOnNotifyChangeParam) {
-        trackedFieldDepthOnNotifyChange$1 = trackedFieldDepthOnNotifyChangeParam;
-    },
-    getTrackedFieldDepthOnNotifyChange: function () {
-        return trackedFieldDepthOnNotifyChange$1;
-    },
-    setTrackedFieldLeafNodeIdAndNameOnly: function (trackedFieldLeafNodeIdAndNameOnlyParam) {
-        trackedFieldLeafNodeIdAndNameOnly$1 = trackedFieldLeafNodeIdAndNameOnlyParam;
-    },
-    getTrackedFieldLeafNodeIdAndNameOnly: function () {
-        return trackedFieldLeafNodeIdAndNameOnly$1;
-    },
-    setRelatedListsPredictionsEnabled: function (f) {
-        relatedListsPredictionsEnabled$1 = f;
-    },
-    areRelatedListsPredictionsEnabled: function () {
-        return relatedListsPredictionsEnabled$1 === true;
-    },
-    setRelatedListsPlusPredictionsEnabled: function (f) {
-        relatedListsPlusPredictionsEnabled$1 = f;
-    },
-    areRelatedListsPlusPredictionsEnabled: function () {
-        return relatedListsPlusPredictionsEnabled$1 === true;
-    },
-    setRecordRepresentationIngestionOverride: function (ingest) {
-        recordRepresentationIngestionOverride$1 = ingest;
-    },
-    getRecordRepresentationIngestionOverride: function () {
-        return recordRepresentationIngestionOverride$1;
-    },
-    // createRecord
-    getDraftAwareCreateRecordAdapter: configurableCreateRecordAdapter$1.getAdapter,
-    setDraftAwareCreateRecordAdapter: configurableCreateRecordAdapter$1.setAdapter,
-    // updateRecord
-    getDraftAwareUpdateRecordAdapter: configurableUpdateRecordAdapter$1.getAdapter,
-    setDraftAwareUpdateRecordAdapter: configurableUpdateRecordAdapter$1.setAdapter,
-    // deleteRecord
-    getDraftAwareDeleteRecordAdapter: configurableDeleteRecordAdapter$1.getAdapter,
-    setDraftAwareDeleteRecordAdapter: configurableDeleteRecordAdapter$1.setAdapter,
-    // performQuickAction
-    getDraftAwarePerformQuickActionAdapter: configurablePerformQuickActionAdapter$1.getAdapter,
-    setDraftAwarePerformQuickActionAdapter: configurablePerformQuickActionAdapter$1.setAdapter,
-    // performRecordUpdateQuickAction
-    getDraftAwarePerformUpdateRecordQuickActionAdapter: configurablePerformUpdateRecordQuickActionAdapter$1.getAdapter,
-    setDraftAwarePerformUpdateRecordQuickActionAdapter: configurablePerformUpdateRecordQuickActionAdapter$1.setAdapter,
-    // createContentDocumentAndVersion
-    getDraftAwareCreateContentDocumentAndVersionAdapter: configurableCreateContentDocumentAndVersion$1.getAdapter,
-    setDraftAwareCreateContentDocumentAndVersionAdapter: configurableCreateContentDocumentAndVersion$1.setAdapter,
-    // createContentVersion
-    getDraftAwareCreateContentVersionAdapter: configurableCreateContentVersion$1.getAdapter,
-    setDraftAwareCreateContentVersionAdapter: configurableCreateContentVersion$1.setAdapter,
-    ...configurationForOneStoreEnabledAdapters$1,
-    ...configurationForEnvironmentFactoryOverrides$1,
-};
-let configurableGraphQLAdapter$1 = new Configurable$1();
-let configurableGraphQLBatchAdapter$1 = new Configurable$1();
-/**
- * Defines the configuration API and is exposed internally as well as externally.
- * Configuration for GraphQL adapters only.
- */
-const configurationForGraphQLAdapters$1 = {
-    getDraftAwareGraphQLAdapter: configurableGraphQLAdapter$1.getAdapter,
-    setDraftAwareGraphQLAdapter: configurableGraphQLAdapter$1.setAdapter,
-    getEnvironmentAwareGraphQLBatchAdapter: configurableGraphQLBatchAdapter$1.getAdapter,
-    setEnvironmentAwareGraphQLBatchAdapter: configurableGraphQLBatchAdapter$1.setAdapter,
-};
-const registrations$1 = new Set();
-/**
- * lds-adapter-uiapi is special.  The non-SFDC bundle combines REST and GQL adapters,
- * yet for SFDC those are separate bundles.  So non-SFDC bundle (./main.ts) registers
- * both REST and GQL configs.  We want each SFDC bundle to register (we don't want one
- * SFDC bundle to assume the other is being loaded and therefore the other one will
- * take care of registration) but we don't want to double register either.
- *
- * So we make this function that memoizes if it's been called before and only
- * actually registers once.
- */
-function ensureRegisteredOnce$1(registration) {
-    const { id } = registration;
-    if (!registrations$1.has(id)) {
-        register$1(registration);
-        registrations$1.add(id);
-    }
-}
-
 function validateAdapterConfig$1(untrustedConfig, _configPropertyNames) {
     if (untrustedConfig !== null && typeof untrustedConfig === 'object') {
         const operationNameIsDefinedAsUndefined = ObjectPrototypeHasOwnProperty.call(untrustedConfig, 'operationName') &&
@@ -121303,7 +121833,7 @@ function transformConfiguration(config) {
     const batchQueryTransformed = config.batchQuery.map((singleConfig) => {
         return {
             ...singleConfig,
-            query: applyMinimumFieldsToDocument(parse$8(print(singleConfig.query)), { queryTypeName: 'Query' }, getQueryTransformerForType, singleConfig.operationName), // Stringifies and parses again to avoid mutating original. Should we just JSON.stringify to avoid the dependency on the parser?
+            query: applyMinimumFieldsToDocument(parse$9(print(singleConfig.query)), { queryTypeName: 'Query' }, getQueryTransformerForType, singleConfig.operationName), // Stringifies and parses again to avoid mutating original. Should we just JSON.stringify to avoid the dependency on the parser?
         };
     });
     return {
@@ -121445,11 +121975,11 @@ function bindExportsTo(luvio) {
     const graphqlBatch_ldsAdapter = createInstrumentedAdapter(createLDSAdapter(luvio, 'graphqlBatch', factory), graphqlBatchMetadata);
     return {
         // Wire Adapters
-        graphql: createGraphQLWireAdapterConstructor(luvio, graphql_ldsAdapter, graphqlMetadata, astResolver),
         graphqlBatch: createGraphQLWireAdapterConstructor(luvio, graphqlBatch_ldsAdapter, graphqlBatchMetadata, astResolver),
         // One Store Enabled Adapters
+        graphql: getLuvioOrOneStoreAdapter(createGraphQLWireAdapterConstructor(luvio, graphql_ldsAdapter, graphqlMetadata, astResolver), configurationForOneStoreEnabledAdapters$1.getGraphQLWireAdapter()),
+        graphql_imperative: getLuvioOrOneStoreAdapter(createGraphQLImperativeAdapter(luvio, graphql_ldsAdapter, graphqlMetadata, astResolver), configurationForOneStoreEnabledAdapters$1.getGraphQLImperativeQueryAdapter()),
         // Imperative Adapters
-        graphql_imperative: createGraphQLImperativeAdapter(luvio, graphql_ldsAdapter, graphqlMetadata, astResolver),
         graphqlBatch_imperative: createGraphQLImperativeAdapter(luvio, graphqlBatch_ldsAdapter, graphqlBatchMetadata, astResolver),
     };
 }
@@ -121964,7 +122494,14 @@ register$1({
     configuration: { ...configurationForGraphQLAdapters$1 },
     instrument: instrument$1,
 });
-// version: 1.368.0-de8cc6721e
+function refreshGraphQL(data) {
+    // If OneStore data, call its refresh instead
+    if (typeof data.refresh === 'function') {
+        return data.refresh();
+    }
+    return refresh$3(data, 'refreshUiApi');
+}
+// version: 1.370.0-7c1df2520b
 
 // On core the unstable adapters are re-exported with different names,
 // we want to match them here.
@@ -121976,7 +122513,7 @@ var unstableLightningRelatedListApi = /*#__PURE__*/Object.freeze({
     gql: gql,
     get graphql () { return graphql; },
     get graphqlBatch () { return graphqlBatch; },
-    get refreshGraphQL () { return refresh$3; },
+    refreshGraphQL: refreshGraphQL,
     get unstable_getActionOverrides_imperative () { return unstable_getActionOverrides_imperative; },
     get unstable_getFlexipageFormulaOverrides_imperative () { return unstable_getFlexipageFormulaOverrides_imperative; },
     get unstable_getGlobalActions_imperative () { return unstable_getGlobalActions_imperative; },
@@ -122116,7 +122653,7 @@ withDefaultLuvio((luvio) => {
     unstable_graphQL_imperative = createImperativeAdapter(luvio, createInstrumentedAdapter(ldsAdapter, adapterMetadata), adapterMetadata);
     graphQLImperative = ldsAdapter;
 });
-// version: 1.368.0-de8cc6721e
+// version: 1.370.0-7c1df2520b
 
 var gqlApi = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -122915,7 +123452,7 @@ const callbacks$1 = [];
 function register(r) {
     callbacks$1.forEach((callback) => callback(r));
 }
-// version: 1.368.0-20c9e0247b
+// version: 1.370.0-3ec6ffba72
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -122981,6 +123518,14 @@ let oneStoreGetObjectInfoAdapter = undefined;
  * One store enabled Get Object Infos adapter
  */
 let oneStoreGetObjectInfosAdapter = undefined;
+/**
+ * One store enabled GraphQL adapter
+ */
+let oneStoreGraphQLWireAdapter = undefined;
+/**
+ * One store enabled GraphQL imperative query adapter
+ */
+let oneStoreGraphQLImperativeQueryAdapter = undefined;
 /**
  * Determines when to include PDL strategies for Related Lists
  */
@@ -123007,6 +123552,18 @@ const configurationForOneStoreEnabledAdapters = {
     getGetObjectInfosAdapter: function () {
         return oneStoreGetObjectInfosAdapter;
     },
+    setGraphQLWireAdapter: function (adapter) {
+        oneStoreGraphQLWireAdapter = adapter;
+    },
+    getGraphQLWireAdapter: function () {
+        return oneStoreGraphQLWireAdapter;
+    },
+    setGraphQLImperativeQueryAdapter: function (adapter) {
+        oneStoreGraphQLImperativeQueryAdapter = adapter;
+    },
+    getGraphQLImperativeQueryAdapter: function () {
+        return oneStoreGraphQLImperativeQueryAdapter;
+    },
 };
 const getKeywordSearchResultsFactory = new Configurable();
 const getListRecordsByNameFactory = new Configurable();
@@ -124082,4 +124639,4 @@ const { luvio } = getRuntime();
 setDefaultLuvio({ luvio });
 
 export { createPrimingSession, draftManager, draftQueue, evictCacheRecordsByIds, evictExpiredCacheEntries, executeAdapter, executeMutatingAdapter, getImperativeAdapterNames, importLuvioAdapterModule, invokeAdapter, invokeAdapterWithDraftToMerge, invokeAdapterWithDraftToReplace, invokeAdapterWithMetadata, nimbusDraftQueue, registerReportObserver, setMetadataTTL, setUiApiRecordTTL, stopEviction, subscribeToAdapter };
-// version: 1.368.0-20c9e0247b
+// version: 1.370.0-3ec6ffba72