@salesforce/lds-worker-api 1.419.0 → 1.420.0

package/dist/sfdc/es/ldsWorkerApi.js

@@ -1371,4 +1371,4 @@ if (process.env.NODE_ENV !== 'production') {
 }
 
 export { createPrimingSession, draftManager, draftQueue, evictCacheRecordsByIds, evictExpiredCacheEntries, executeAdapter, executeMutatingAdapter, getImperativeAdapterNames, importLuvioAdapterModule, importOneStoreAdapterModule, invokeAdapter, invokeAdapterWithDraftToMerge, invokeAdapterWithDraftToReplace, invokeAdapterWithMetadata, nimbusDraftQueue, setMetadataTTL, setUiApiRecordTTL, stopEviction, subscribeToAdapter };
-// version: 1.419.0-ade430921b
+// version: 1.420.0-fc658f6118

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

@@ -2351,7 +2351,7 @@ function isDefined(value) {
 /**
  * Checks if the given variable is an object
  */
-function isObject$2(value) {
+function isObject$3(value) {
     return typeof value === 'object' && value !== null;
 }
 
@@ -2981,10 +2981,10 @@ class Reader {
         }
         if (fragment.opaque) {
             this.checkIfChanged(result.value, { useDeepEquals: true });
-            if (isObject$2(result.value) && !readerOpaqueReferenceMap.has(result.value)) {
+            if (isObject$3(result.value) && !readerOpaqueReferenceMap.has(result.value)) {
                 readerOpaqueReferenceMap.set(result.value, this.opaqueCopy(result.value));
             }
-            const opaqueValue = isObject$2(result.value)
+            const opaqueValue = isObject$3(result.value)
                 ? readerOpaqueReferenceMap.get(result.value)
                 : result.value;
             return {
@@ -4146,7 +4146,7 @@ function createResourceParamsImpl(config, configMetadata) {
     }
     return resourceParams;
 }
-// engine version: 0.160.1-e075b880
+// engine version: 0.160.3-354dc58b
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -4274,7 +4274,7 @@ function withDefaultLuvio(callback) {
     }
     callbacks.push(callback);
 }
-// version: 1.419.0-ade430921b
+// version: 1.420.0-fc658f6118
 
 // TODO [TD-0081508]: once that TD is fulfilled we can probably change this file
 function instrumentAdapter$1(createFunction, _metadata) {
@@ -5318,7 +5318,7 @@ function createGraphQLWireAdapterConstructor(luvio, adapter, metadata, astResolv
     const { apiFamily, name } = metadata;
     return createGraphQLWireAdapterConstructor$1(adapter, `${apiFamily}.${name}`, luvio, astResolver);
 }
-// version: 1.419.0-ade430921b
+// version: 1.420.0-fc658f6118
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -5417,7 +5417,7 @@ var TypeCheckShapes;
     TypeCheckShapes[TypeCheckShapes["Integer"] = 3] = "Integer";
     TypeCheckShapes[TypeCheckShapes["Unsupported"] = 4] = "Unsupported";
 })(TypeCheckShapes || (TypeCheckShapes = {}));
-// engine version: 0.160.1-e075b880
+// engine version: 0.160.3-354dc58b
 
 const { keys: ObjectKeys$4, create: ObjectCreate$4 } = Object;
 
@@ -35491,7 +35491,7 @@ withDefaultLuvio((luvio) => {
     throttle(60, 60000, setupNotifyAllListRecordUpdateAvailable(luvio));
     throttle(60, 60000, setupNotifyAllListInfoSummaryUpdateAvailable(luvio));
 });
-// version: 1.419.0-8232dcd0ab
+// version: 1.420.0-576a1ea316
 
 var allowUpdatesForNonCachedRecords = {
     isOpen: function (e) {
@@ -48922,7 +48922,7 @@ const RedirectDurableSegment$1 = 'REDIRECT_KEYS';
 const MessagingDurableSegment = 'MESSAGING';
 const MessageNotifyStoreUpdateAvailable = 'notifyStoreUpdateAvailable';
 
-const { keys: keys$5, create: create$5, assign: assign$4, freeze: freeze$2 } = Object;
+const { keys: keys$5, create: create$5, assign: assign$4, freeze: freeze$2, isFrozen: isFrozen$1$1 } = Object;
 
 //Durable store error instrumentation key
 const DURABLE_STORE_ERROR = 'durable-store-error';
@@ -49006,6 +49006,74 @@ function publishDurableStoreEntries(durableRecords, put, publishMetadata) {
     }
     return { revivedKeys, hadUnexpectedShape };
 }
+/**
+ * Extracts field filtering configuration from the selection.
+ */
+function extractFieldFilteringConfig(select, recordId, baseEnvironment) {
+    const rootRecordKey = serializeStructuredKey(baseEnvironment.storeGetCanonicalKey(recordId));
+    let topLevelFields;
+    let nestedFieldRequirements;
+    if (select &&
+        select.node.kind === 'Fragment' &&
+        'selections' in select.node &&
+        select.node.selections) {
+        topLevelFields = extractRequestedFieldNames(select.node.selections);
+        nestedFieldRequirements = extractNestedFieldRequirements(select.node.selections);
+    }
+    // Merge all nested field requirements into a single set
+    let nestedFields;
+    if (nestedFieldRequirements && nestedFieldRequirements.size > 0) {
+        nestedFields = new Set();
+        for (const fieldSet of nestedFieldRequirements.values()) {
+            for (const field of fieldSet) {
+                nestedFields.add(field);
+            }
+        }
+    }
+    return { rootRecordKey, topLevelFields, nestedFields };
+}
+/**
+ * Categorizes keys into different fetch strategies based on filtering requirements.
+ */
+function categorizeKeysForL2Fetch(keysToRevive, config, baseEnvironment, shouldFilterFields) {
+    const unfilteredKeys = [];
+    const rootKeysWithTopLevelFields = [];
+    const nestedKeysWithNestedFields = [];
+    const canFilter = config.topLevelFields !== undefined && config.topLevelFields.size > 0;
+    for (let i = 0, len = keysToRevive.length; i < len; i += 1) {
+        const canonicalKey = serializeStructuredKey(baseEnvironment.storeGetCanonicalKey(keysToRevive[i]));
+        if (!shouldFilterFields(canonicalKey) || !canFilter) {
+            unfilteredKeys.push(canonicalKey);
+            continue;
+        }
+        const isRootRecord = canonicalKey === config.rootRecordKey;
+        if (isRootRecord) {
+            rootKeysWithTopLevelFields.push(canonicalKey);
+        }
+        else if (config.nestedFields !== undefined && config.nestedFields.size > 0) {
+            nestedKeysWithNestedFields.push(canonicalKey);
+        }
+        else {
+            unfilteredKeys.push(canonicalKey);
+        }
+    }
+    return { unfilteredKeys, rootKeysWithTopLevelFields, nestedKeysWithNestedFields };
+}
+/**
+ * Builds L2 fetch promises for different key categories.
+ */
+function buildL2FetchPromises(categorizedKeys, config, durableStore) {
+    const promises = [
+        durableStore.getEntries(categorizedKeys.unfilteredKeys, DefaultDurableSegment),
+    ];
+    if (config.topLevelFields && categorizedKeys.rootKeysWithTopLevelFields.length > 0) {
+        promises.push(durableStore.getEntriesWithSpecificFields(categorizedKeys.rootKeysWithTopLevelFields, config.topLevelFields, DefaultDurableSegment));
+    }
+    if (config.nestedFields && categorizedKeys.nestedKeysWithNestedFields.length > 0) {
+        promises.push(durableStore.getEntriesWithSpecificFields(categorizedKeys.nestedKeysWithNestedFields, config.nestedFields, DefaultDurableSegment));
+    }
+    return promises;
+}
 /**
  * This method returns a Promise to a snapshot that is revived from L2 cache.  If
  * L2 does not have the entries necessary to fulfill the snapshot then this method
@@ -49041,53 +49109,41 @@ function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, dura
     const keysToRevive = keysToReviveSet.keysAsArray();
     const start = Date.now();
     const { l2Trips } = reviveMetrics;
-    // Extract requested fields first to determine if filtering is possible
-    let requestedFields;
-    if (select.node.kind === 'Fragment' && 'selections' in select.node && select.node.selections) {
-        requestedFields = extractRequestedFieldNames(select.node.selections);
-    }
-    const canonicalKeys = [];
-    const filteredCanonicalKeys = [];
-    for (let i = 0, len = keysToRevive.length; i < len; i += 1) {
-        const canonicalKey = serializeStructuredKey(baseEnvironment.storeGetCanonicalKey(keysToRevive[i]));
-        // Only filter if we have fields to filter and shouldFilterFields returns true
-        if (requestedFields !== undefined &&
-            requestedFields.size > 0 &&
-            shouldFilterFields(canonicalKey)) {
-            filteredCanonicalKeys.push(canonicalKey);
-        }
-        else {
-            canonicalKeys.push(canonicalKey);
-        }
-    }
-    const fetchPromises = [
-        durableStore.getEntries(canonicalKeys, DefaultDurableSegment),
-    ];
-    if (requestedFields !== undefined &&
-        requestedFields.size > 0 &&
-        filteredCanonicalKeys.length > 0) {
-        fetchPromises.push(durableStore.getEntriesWithSpecificFields(filteredCanonicalKeys, requestedFields, DefaultDurableSegment));
-    }
-    return Promise.all(fetchPromises).then(([durableRecords, filteredDurableRecords]) => {
+    // Extract field filtering requirements from the selection
+    const fieldFilteringConfig = extractFieldFilteringConfig(select, recordId, baseEnvironment);
+    // Categorize keys by how they should be fetched from L2
+    const categorizedKeys = categorizeKeysForL2Fetch(keysToRevive, fieldFilteringConfig, baseEnvironment, shouldFilterFields);
+    // Build fetch promises for each category
+    const fetchPromises = buildL2FetchPromises(categorizedKeys, fieldFilteringConfig, durableStore);
+    return Promise.all(fetchPromises).then(([durableRecords, filteredDurableRecords, nestedFilteredDurableRecords]) => {
+        const totalKeysRequested = categorizedKeys.unfilteredKeys.length +
+            categorizedKeys.rootKeysWithTopLevelFields.length +
+            categorizedKeys.nestedKeysWithNestedFields.length;
         l2Trips.push({
             duration: Date.now() - start,
-            keysRequestedCount: canonicalKeys.length + filteredCanonicalKeys.length,
+            keysRequestedCount: totalKeysRequested,
         });
-        // Process both normal and filtered records in a single pass
+        // Process all three categories of records
         const revivedKeys = new StoreKeySet();
         let hadUnexpectedShape = false;
-        // Process normal records
+        // Process normal records (all fields)
         if (durableRecords !== undefined) {
             const normalResult = publishDurableStoreEntries(durableRecords, baseEnvironment.storePut.bind(baseEnvironment), baseEnvironment.publishStoreMetadata.bind(baseEnvironment));
             revivedKeys.merge(normalResult.revivedKeys);
             hadUnexpectedShape = hadUnexpectedShape || normalResult.hadUnexpectedShape;
         }
-        // Process filtered records with merging
+        // Process filtered records (root with top-level fields) with merging
         if (filteredDurableRecords !== undefined) {
             const filteredResult = publishDurableStoreEntries(filteredDurableRecords, createMergeFilteredPut((key) => baseEnvironment.store.readEntry(key), baseEnvironment.storePut.bind(baseEnvironment)), baseEnvironment.publishStoreMetadata.bind(baseEnvironment));
             revivedKeys.merge(filteredResult.revivedKeys);
             hadUnexpectedShape = hadUnexpectedShape || filteredResult.hadUnexpectedShape;
         }
+        // Process nested filtered records with merging
+        if (nestedFilteredDurableRecords !== undefined) {
+            const nestedFilteredResult = publishDurableStoreEntries(nestedFilteredDurableRecords, createMergeFilteredPut((key) => baseEnvironment.store.readEntry(key), baseEnvironment.storePut.bind(baseEnvironment)), baseEnvironment.publishStoreMetadata.bind(baseEnvironment));
+            revivedKeys.merge(nestedFilteredResult.revivedKeys);
+            hadUnexpectedShape = hadUnexpectedShape || nestedFilteredResult.hadUnexpectedShape;
+        }
         // if the data coming back from DS had an unexpected shape then just
         // return the L1 snapshot
         if (hadUnexpectedShape === true) {
@@ -49133,6 +49189,54 @@ function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, dura
         return { snapshot: unavailableSnapshot, metrics: reviveMetrics };
     });
 }
+/**
+ * Filters out null fields from a fields object (null indicates field doesn't exist in L2).
+ * Returns a new object without null values, or the original if no filtering needed.
+ */
+function filterNullFields(fields) {
+    const keys$1 = keys$5(fields);
+    let hasNull = false;
+    // Check if any nulls exist before allocating new object
+    for (let i = 0, len = keys$1.length; i < len; i += 1) {
+        if (fields[keys$1[i]] === null) {
+            hasNull = true;
+            break;
+        }
+    }
+    if (!hasNull) {
+        return fields;
+    }
+    const cleaned = {};
+    for (let i = 0, len = keys$1.length; i < len; i += 1) {
+        const key = keys$1[i];
+        if (fields[key] !== null) {
+            cleaned[key] = fields[key];
+        }
+    }
+    return cleaned;
+}
+/**
+ * Merges new fields into existing fields object, skipping null values.
+ * Creates a new object to avoid mutations.
+ */
+function mergeFieldsObjects(existing, incoming) {
+    const merged = { ...existing };
+    const keys$1 = keys$5(incoming);
+    for (let i = 0, len = keys$1.length; i < len; i += 1) {
+        const key = keys$1[i];
+        // Skip null values - they indicate the field doesn't exist in L2
+        if (incoming[key] !== null) {
+            merged[key] = incoming[key];
+        }
+    }
+    return merged;
+}
+/**
+ * Type guard to check if value is a non-null object.
+ */
+function isObject$1(value) {
+    return typeof value === 'object' && value !== null;
+}
 /**
  * Creates a put function that merges filtered fields with existing L1 records instead of replacing them.
  * This is used when reviving filtered fields from L2 to preserve existing data in L1.
@@ -49140,28 +49244,36 @@ function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, dura
 function createMergeFilteredPut(readEntry, storePut) {
     return (key, filteredData) => {
         const existingRecord = readEntry(key);
-        if (existingRecord !== undefined &&
-            existingRecord !== null &&
-            typeof filteredData === 'object' &&
-            filteredData !== null &&
-            typeof existingRecord === 'object') {
-            const filteredFields = filteredData;
-            const existingObj = existingRecord;
-            // Check if object is frozen (can happen after deepFreeze)
-            // If frozen, create a shallow copy to merge fields into
-            let targetObj = existingObj;
-            if (Object.isFrozen(existingObj)) {
-                targetObj = { ...existingObj };
-            }
-            const keys = Object.keys(filteredFields);
-            for (let i = 0, len = keys.length; i < len; i += 1) {
-                const fieldKey = keys[i];
-                targetObj[fieldKey] = filteredFields[fieldKey];
+        // Merge with existing record if both are objects
+        if (isObject$1(existingRecord) && isObject$1(filteredData)) {
+            // Create target object (copy if frozen to avoid mutation errors)
+            const targetObj = isFrozen$1$1(existingRecord)
+                ? { ...existingRecord }
+                : existingRecord;
+            const keys$1 = keys$5(filteredData);
+            for (let i = 0, len = keys$1.length; i < len; i += 1) {
+                const fieldKey = keys$1[i];
+                const incomingValue = filteredData[fieldKey];
+                // Special handling for 'fields' property to merge rather than replace
+                if (fieldKey === 'fields' &&
+                    isObject$1(incomingValue) &&
+                    isObject$1(targetObj[fieldKey])) {
+                    targetObj[fieldKey] = mergeFieldsObjects(targetObj[fieldKey], incomingValue);
+                }
+                else {
+                    targetObj[fieldKey] = incomingValue;
+                }
             }
             storePut(key, targetObj);
         }
         else {
-            // No existing record, just put the filtered data
+            // No existing record - clean null fields before storing
+            if (isObject$1(filteredData) && 'fields' in filteredData) {
+                const fields = filteredData.fields;
+                if (isObject$1(fields)) {
+                    filteredData.fields = filterNullFields(fields);
+                }
+            }
             storePut(key, filteredData);
         }
     };
@@ -49175,16 +49287,101 @@ function extractRequestedFieldNames(selections) {
         return undefined;
     }
     // Find the 'fields' ObjectSelection
-    const fieldsSelection = selections.find((sel) => sel.kind === 'Object' && sel.name === 'fields');
-    if (!fieldsSelection || !fieldsSelection.selections) {
+    let fieldsSelection;
+    for (let i = 0, len = selections.length; i < len; i += 1) {
+        const sel = selections[i];
+        if (sel.kind === 'Object' && sel.name === 'fields') {
+            fieldsSelection = sel;
+            break;
+        }
+    }
+    if (!fieldsSelection ||
+        !fieldsSelection.selections ||
+        fieldsSelection.selections.length === 0) {
         return undefined;
     }
     // Extract all field names from the fields selections
+    const fieldSelections = fieldsSelection.selections;
     const fieldNames = new Set();
-    for (const fieldSel of fieldsSelection.selections) {
-        fieldNames.add(fieldSel.name);
+    for (let i = 0, len = fieldSelections.length; i < len; i += 1) {
+        fieldNames.add(fieldSelections[i].name);
+    }
+    return fieldNames;
+}
+/**
+ * Extracts nested field requirements for spanning fields.
+ * For spanning fields like Case.CreatedBy.Name, we need to extract what fields
+ * are requested from the nested record (User in this case).
+ * The structure is: fields { CreatedBy { value (Link with fragment) { fields { Name } } } }
+ */
+function extractNestedFieldRequirements(selections) {
+    if (!selections) {
+        return undefined;
+    }
+    // Find the 'fields' ObjectSelection
+    let fieldsSelection;
+    for (let i = 0, len = selections.length; i < len; i += 1) {
+        const sel = selections[i];
+        if (sel.kind === 'Object' && sel.name === 'fields') {
+            fieldsSelection = sel;
+            break;
+        }
+    }
+    if (!fieldsSelection || !fieldsSelection.selections) {
+        return undefined;
+    }
+    let nestedFieldsMap;
+    // Look for ObjectSelections within fields (these are spanning fields)
+    const fieldSelections = fieldsSelection.selections;
+    for (let i = 0, len = fieldSelections.length; i < len; i += 1) {
+        const fieldSel = fieldSelections[i];
+        if (fieldSel.kind !== 'Object') {
+            continue;
+        }
+        const objSel = fieldSel;
+        if (!objSel.selections) {
+            continue;
+        }
+        // Look for the 'value' Link selection
+        let valueLinkSelection;
+        for (let j = 0, jlen = objSel.selections.length; j < jlen; j += 1) {
+            const sel = objSel.selections[j];
+            if (sel.kind === 'Link' && sel.name === 'value') {
+                valueLinkSelection = sel;
+                break;
+            }
+        }
+        if (!valueLinkSelection || !('fragment' in valueLinkSelection)) {
+            continue;
+        }
+        const fragment = valueLinkSelection.fragment;
+        if (!fragment || !fragment.selections) {
+            continue;
+        }
+        // Look for the 'fields' selection within the fragment
+        let nestedFieldsSelection;
+        for (let j = 0, jlen = fragment.selections.length; j < jlen; j += 1) {
+            const sel = fragment.selections[j];
+            if (sel.kind === 'Object' && sel.name === 'fields') {
+                nestedFieldsSelection = sel;
+                break;
+            }
+        }
+        if (nestedFieldsSelection && nestedFieldsSelection.selections) {
+            const nestedFields = new Set();
+            for (const nestedFieldSel of nestedFieldsSelection.selections) {
+                nestedFields.add(nestedFieldSel.name);
+            }
+            if (nestedFields.size > 0) {
+                // Lazy initialize map only if we have nested fields
+                if (!nestedFieldsMap) {
+                    nestedFieldsMap = new Map();
+                }
+                nestedFieldsMap.set(fieldSel.name, nestedFields);
+            }
+        }
     }
-    return fieldNames.size > 0 ? fieldNames : undefined;
+    return nestedFieldsMap;
 }
 
 const TTL_DURABLE_SEGMENT = 'TTL_DURABLE_SEGMENT';
@@ -91328,7 +91525,7 @@ function ldsParamsToString(params) {
         else {
             returnParams[key] = `${value}`;
         }
-        if (isObject$1(value) === true && keys$2$1(value).length > 0) {
+        if (isObject$2(value) === true && keys$2$1(value).length > 0) {
             returnParams[key] = stringify$4(value);
         }
     }
@@ -91381,7 +91578,7 @@ function isStatusOk(status) {
     return status >= 200 && status <= 299;
 }
 // adapted from adapter-utils untrustedIsObject
-function isObject$1(value) {
+function isObject$2(value) {
     return typeof value === 'object' && value !== null && isArray$2$1(value) === false;
 }
 function stringifyIfPresent(value) {
@@ -98872,7 +99069,7 @@ function buildServiceDescriptor$b(luvio) {
         },
     };
 }
-// version: 1.419.0-8232dcd0ab
+// version: 1.420.0-576a1ea316
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -98898,7 +99095,7 @@ function buildServiceDescriptor$a(notifyRecordUpdateAvailable, getNormalizedLuvi
         },
     };
 }
-// version: 1.419.0-8232dcd0ab
+// version: 1.420.0-576a1ea316
 
 /*!
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -101547,7 +101744,7 @@ register$1({
     id: '@salesforce/lds-network-adapter',
     instrument: instrument$2,
 });
-// version: 1.419.0-ade430921b
+// version: 1.420.0-fc658f6118
 
 const { create: create$2, keys: keys$2 } = Object;
 const { stringify, parse } = JSON;
@@ -109089,7 +109286,7 @@ function registerCallback(cb) {
         cb(graphql_v1_import, graphql_imperative$1, graphql_imperative_legacy_v1_import, graphql_state_manager, useOneStoreGraphQL);
     }
 }
-// version: 1.419.0-8232dcd0ab
+// version: 1.420.0-576a1ea316
 
 function createFragmentMap(documentNode) {
     const fragments = {};
@@ -138314,7 +138511,7 @@ register$1({
     configuration: { ...configurationForGraphQLAdapters$1 },
     instrument: instrument$1,
 });
-// version: 1.419.0-8232dcd0ab
+// version: 1.420.0-576a1ea316
 
 // On core the unstable adapters are re-exported with different names,
 // we want to match them here.
@@ -138466,7 +138663,7 @@ withDefaultLuvio((luvio) => {
     unstable_graphQL_imperative = createImperativeAdapter(luvio, createInstrumentedAdapter(ldsAdapter, adapterMetadata), adapterMetadata);
     graphQLImperative = ldsAdapter;
 });
-// version: 1.419.0-8232dcd0ab
+// version: 1.420.0-576a1ea316
 
 var gqlApi = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -139265,7 +139462,7 @@ const callbacks$1 = [];
 function register(r) {
     callbacks$1.forEach((callback) => callback(r));
 }
-// version: 1.419.0-ade430921b
+// version: 1.420.0-fc658f6118
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -140581,4 +140778,4 @@ const { luvio } = getRuntime();
 setDefaultLuvio({ luvio });
 
 export { createPrimingSession, draftManager, draftQueue, evictCacheRecordsByIds, evictExpiredCacheEntries, executeAdapter, executeMutatingAdapter, getImperativeAdapterNames, importLuvioAdapterModule, importOneStoreAdapterModule, invokeAdapter, invokeAdapterWithDraftToMerge, invokeAdapterWithDraftToReplace, invokeAdapterWithMetadata, nimbusDraftQueue, registerReportObserver, setMetadataTTL, setUiApiRecordTTL, stopEviction, subscribeToAdapter };
-// version: 1.419.0-ade430921b
+// version: 1.420.0-fc658f6118

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

@@ -2357,7 +2357,7 @@
     /**
      * Checks if the given variable is an object
      */
-    function isObject$2(value) {
+    function isObject$3(value) {
         return typeof value === 'object' && value !== null;
     }
 
@@ -2987,10 +2987,10 @@
             }
             if (fragment.opaque) {
                 this.checkIfChanged(result.value, { useDeepEquals: true });
-                if (isObject$2(result.value) && !readerOpaqueReferenceMap.has(result.value)) {
+                if (isObject$3(result.value) && !readerOpaqueReferenceMap.has(result.value)) {
                     readerOpaqueReferenceMap.set(result.value, this.opaqueCopy(result.value));
                 }
-                const opaqueValue = isObject$2(result.value)
+                const opaqueValue = isObject$3(result.value)
                     ? readerOpaqueReferenceMap.get(result.value)
                     : result.value;
                 return {
@@ -4152,7 +4152,7 @@
         }
         return resourceParams;
     }
-    // engine version: 0.160.1-e075b880
+    // engine version: 0.160.3-354dc58b
 
     /**
      * Copyright (c) 2022, Salesforce, Inc.,
@@ -4280,7 +4280,7 @@
         }
         callbacks.push(callback);
     }
-    // version: 1.419.0-ade430921b
+    // version: 1.420.0-fc658f6118
 
     // TODO [TD-0081508]: once that TD is fulfilled we can probably change this file
     function instrumentAdapter$1(createFunction, _metadata) {
@@ -5324,7 +5324,7 @@
         const { apiFamily, name } = metadata;
         return createGraphQLWireAdapterConstructor$1(adapter, `${apiFamily}.${name}`, luvio, astResolver);
     }
-    // version: 1.419.0-ade430921b
+    // version: 1.420.0-fc658f6118
 
     /**
      * Copyright (c) 2022, Salesforce, Inc.,
@@ -5423,7 +5423,7 @@
         TypeCheckShapes[TypeCheckShapes["Integer"] = 3] = "Integer";
         TypeCheckShapes[TypeCheckShapes["Unsupported"] = 4] = "Unsupported";
     })(TypeCheckShapes || (TypeCheckShapes = {}));
-    // engine version: 0.160.1-e075b880
+    // engine version: 0.160.3-354dc58b
 
     const { keys: ObjectKeys$4, create: ObjectCreate$4 } = Object;
 
@@ -35497,7 +35497,7 @@
         throttle(60, 60000, setupNotifyAllListRecordUpdateAvailable(luvio));
         throttle(60, 60000, setupNotifyAllListInfoSummaryUpdateAvailable(luvio));
     });
-    // version: 1.419.0-8232dcd0ab
+    // version: 1.420.0-576a1ea316
 
     var allowUpdatesForNonCachedRecords = {
         isOpen: function (e) {
@@ -48928,7 +48928,7 @@
     const MessagingDurableSegment = 'MESSAGING';
     const MessageNotifyStoreUpdateAvailable = 'notifyStoreUpdateAvailable';
 
-    const { keys: keys$5, create: create$5, assign: assign$4, freeze: freeze$2 } = Object;
+    const { keys: keys$5, create: create$5, assign: assign$4, freeze: freeze$2, isFrozen: isFrozen$1$1 } = Object;
 
     //Durable store error instrumentation key
     const DURABLE_STORE_ERROR = 'durable-store-error';
@@ -49012,6 +49012,74 @@
         }
         return { revivedKeys, hadUnexpectedShape };
     }
+    /**
+     * Extracts field filtering configuration from the selection.
+     */
+    function extractFieldFilteringConfig(select, recordId, baseEnvironment) {
+        const rootRecordKey = serializeStructuredKey(baseEnvironment.storeGetCanonicalKey(recordId));
+        let topLevelFields;
+        let nestedFieldRequirements;
+        if (select &&
+            select.node.kind === 'Fragment' &&
+            'selections' in select.node &&
+            select.node.selections) {
+            topLevelFields = extractRequestedFieldNames(select.node.selections);
+            nestedFieldRequirements = extractNestedFieldRequirements(select.node.selections);
+        }
+        // Merge all nested field requirements into a single set
+        let nestedFields;
+        if (nestedFieldRequirements && nestedFieldRequirements.size > 0) {
+            nestedFields = new Set();
+            for (const fieldSet of nestedFieldRequirements.values()) {
+                for (const field of fieldSet) {
+                    nestedFields.add(field);
+                }
+            }
+        }
+        return { rootRecordKey, topLevelFields, nestedFields };
+    }
+    /**
+     * Categorizes keys into different fetch strategies based on filtering requirements.
+     */
+    function categorizeKeysForL2Fetch(keysToRevive, config, baseEnvironment, shouldFilterFields) {
+        const unfilteredKeys = [];
+        const rootKeysWithTopLevelFields = [];
+        const nestedKeysWithNestedFields = [];
+        const canFilter = config.topLevelFields !== undefined && config.topLevelFields.size > 0;
+        for (let i = 0, len = keysToRevive.length; i < len; i += 1) {
+            const canonicalKey = serializeStructuredKey(baseEnvironment.storeGetCanonicalKey(keysToRevive[i]));
+            if (!shouldFilterFields(canonicalKey) || !canFilter) {
+                unfilteredKeys.push(canonicalKey);
+                continue;
+            }
+            const isRootRecord = canonicalKey === config.rootRecordKey;
+            if (isRootRecord) {
+                rootKeysWithTopLevelFields.push(canonicalKey);
+            }
+            else if (config.nestedFields !== undefined && config.nestedFields.size > 0) {
+                nestedKeysWithNestedFields.push(canonicalKey);
+            }
+            else {
+                unfilteredKeys.push(canonicalKey);
+            }
+        }
+        return { unfilteredKeys, rootKeysWithTopLevelFields, nestedKeysWithNestedFields };
+    }
+    /**
+     * Builds L2 fetch promises for different key categories.
+     */
+    function buildL2FetchPromises(categorizedKeys, config, durableStore) {
+        const promises = [
+            durableStore.getEntries(categorizedKeys.unfilteredKeys, DefaultDurableSegment),
+        ];
+        if (config.topLevelFields && categorizedKeys.rootKeysWithTopLevelFields.length > 0) {
+            promises.push(durableStore.getEntriesWithSpecificFields(categorizedKeys.rootKeysWithTopLevelFields, config.topLevelFields, DefaultDurableSegment));
+        }
+        if (config.nestedFields && categorizedKeys.nestedKeysWithNestedFields.length > 0) {
+            promises.push(durableStore.getEntriesWithSpecificFields(categorizedKeys.nestedKeysWithNestedFields, config.nestedFields, DefaultDurableSegment));
+        }
+        return promises;
+    }
     /**
      * This method returns a Promise to a snapshot that is revived from L2 cache.  If
      * L2 does not have the entries necessary to fulfill the snapshot then this method
@@ -49047,53 +49115,41 @@
         const keysToRevive = keysToReviveSet.keysAsArray();
         const start = Date.now();
         const { l2Trips } = reviveMetrics;
-        // Extract requested fields first to determine if filtering is possible
-        let requestedFields;
-        if (select.node.kind === 'Fragment' && 'selections' in select.node && select.node.selections) {
-            requestedFields = extractRequestedFieldNames(select.node.selections);
-        }
-        const canonicalKeys = [];
-        const filteredCanonicalKeys = [];
-        for (let i = 0, len = keysToRevive.length; i < len; i += 1) {
-            const canonicalKey = serializeStructuredKey(baseEnvironment.storeGetCanonicalKey(keysToRevive[i]));
-            // Only filter if we have fields to filter and shouldFilterFields returns true
-            if (requestedFields !== undefined &&
-                requestedFields.size > 0 &&
-                shouldFilterFields(canonicalKey)) {
-                filteredCanonicalKeys.push(canonicalKey);
-            }
-            else {
-                canonicalKeys.push(canonicalKey);
-            }
-        }
-        const fetchPromises = [
-            durableStore.getEntries(canonicalKeys, DefaultDurableSegment),
-        ];
-        if (requestedFields !== undefined &&
-            requestedFields.size > 0 &&
-            filteredCanonicalKeys.length > 0) {
-            fetchPromises.push(durableStore.getEntriesWithSpecificFields(filteredCanonicalKeys, requestedFields, DefaultDurableSegment));
-        }
-        return Promise.all(fetchPromises).then(([durableRecords, filteredDurableRecords]) => {
+        // Extract field filtering requirements from the selection
+        const fieldFilteringConfig = extractFieldFilteringConfig(select, recordId, baseEnvironment);
+        // Categorize keys by how they should be fetched from L2
+        const categorizedKeys = categorizeKeysForL2Fetch(keysToRevive, fieldFilteringConfig, baseEnvironment, shouldFilterFields);
+        // Build fetch promises for each category
+        const fetchPromises = buildL2FetchPromises(categorizedKeys, fieldFilteringConfig, durableStore);
+        return Promise.all(fetchPromises).then(([durableRecords, filteredDurableRecords, nestedFilteredDurableRecords]) => {
+            const totalKeysRequested = categorizedKeys.unfilteredKeys.length +
+                categorizedKeys.rootKeysWithTopLevelFields.length +
+                categorizedKeys.nestedKeysWithNestedFields.length;
             l2Trips.push({
                 duration: Date.now() - start,
-                keysRequestedCount: canonicalKeys.length + filteredCanonicalKeys.length,
+                keysRequestedCount: totalKeysRequested,
             });
-            // Process both normal and filtered records in a single pass
+            // Process all three categories of records
             const revivedKeys = new StoreKeySet();
             let hadUnexpectedShape = false;
-            // Process normal records
+            // Process normal records (all fields)
             if (durableRecords !== undefined) {
                 const normalResult = publishDurableStoreEntries(durableRecords, baseEnvironment.storePut.bind(baseEnvironment), baseEnvironment.publishStoreMetadata.bind(baseEnvironment));
                 revivedKeys.merge(normalResult.revivedKeys);
                 hadUnexpectedShape = hadUnexpectedShape || normalResult.hadUnexpectedShape;
             }
-            // Process filtered records with merging
+            // Process filtered records (root with top-level fields) with merging
             if (filteredDurableRecords !== undefined) {
                 const filteredResult = publishDurableStoreEntries(filteredDurableRecords, createMergeFilteredPut((key) => baseEnvironment.store.readEntry(key), baseEnvironment.storePut.bind(baseEnvironment)), baseEnvironment.publishStoreMetadata.bind(baseEnvironment));
                 revivedKeys.merge(filteredResult.revivedKeys);
                 hadUnexpectedShape = hadUnexpectedShape || filteredResult.hadUnexpectedShape;
             }
+            // Process nested filtered records with merging
+            if (nestedFilteredDurableRecords !== undefined) {
+                const nestedFilteredResult = publishDurableStoreEntries(nestedFilteredDurableRecords, createMergeFilteredPut((key) => baseEnvironment.store.readEntry(key), baseEnvironment.storePut.bind(baseEnvironment)), baseEnvironment.publishStoreMetadata.bind(baseEnvironment));
+                revivedKeys.merge(nestedFilteredResult.revivedKeys);
+                hadUnexpectedShape = hadUnexpectedShape || nestedFilteredResult.hadUnexpectedShape;
+            }
             // if the data coming back from DS had an unexpected shape then just
             // return the L1 snapshot
             if (hadUnexpectedShape === true) {
@@ -49139,6 +49195,54 @@
             return { snapshot: unavailableSnapshot, metrics: reviveMetrics };
         });
     }
+    /**
+     * Filters out null fields from a fields object (null indicates field doesn't exist in L2).
+     * Returns a new object without null values, or the original if no filtering needed.
+     */
+    function filterNullFields(fields) {
+        const keys$1 = keys$5(fields);
+        let hasNull = false;
+        // Check if any nulls exist before allocating new object
+        for (let i = 0, len = keys$1.length; i < len; i += 1) {
+            if (fields[keys$1[i]] === null) {
+                hasNull = true;
+                break;
+            }
+        }
+        if (!hasNull) {
+            return fields;
+        }
+        const cleaned = {};
+        for (let i = 0, len = keys$1.length; i < len; i += 1) {
+            const key = keys$1[i];
+            if (fields[key] !== null) {
+                cleaned[key] = fields[key];
+            }
+        }
+        return cleaned;
+    }
+    /**
+     * Merges new fields into existing fields object, skipping null values.
+     * Creates a new object to avoid mutations.
+     */
+    function mergeFieldsObjects(existing, incoming) {
+        const merged = { ...existing };
+        const keys$1 = keys$5(incoming);
+        for (let i = 0, len = keys$1.length; i < len; i += 1) {
+            const key = keys$1[i];
+            // Skip null values - they indicate the field doesn't exist in L2
+            if (incoming[key] !== null) {
+                merged[key] = incoming[key];
+            }
+        }
+        return merged;
+    }
+    /**
+     * Type guard to check if value is a non-null object.
+     */
+    function isObject$1(value) {
+        return typeof value === 'object' && value !== null;
+    }
     /**
      * Creates a put function that merges filtered fields with existing L1 records instead of replacing them.
      * This is used when reviving filtered fields from L2 to preserve existing data in L1.
@@ -49146,28 +49250,36 @@
     function createMergeFilteredPut(readEntry, storePut) {
         return (key, filteredData) => {
             const existingRecord = readEntry(key);
-            if (existingRecord !== undefined &&
-                existingRecord !== null &&
-                typeof filteredData === 'object' &&
-                filteredData !== null &&
-                typeof existingRecord === 'object') {
-                const filteredFields = filteredData;
-                const existingObj = existingRecord;
-                // Check if object is frozen (can happen after deepFreeze)
-                // If frozen, create a shallow copy to merge fields into
-                let targetObj = existingObj;
-                if (Object.isFrozen(existingObj)) {
-                    targetObj = { ...existingObj };
-                }
-                const keys = Object.keys(filteredFields);
-                for (let i = 0, len = keys.length; i < len; i += 1) {
-                    const fieldKey = keys[i];
-                    targetObj[fieldKey] = filteredFields[fieldKey];
+            // Merge with existing record if both are objects
+            if (isObject$1(existingRecord) && isObject$1(filteredData)) {
+                // Create target object (copy if frozen to avoid mutation errors)
+                const targetObj = isFrozen$1$1(existingRecord)
+                    ? { ...existingRecord }
+                    : existingRecord;
+                const keys$1 = keys$5(filteredData);
+                for (let i = 0, len = keys$1.length; i < len; i += 1) {
+                    const fieldKey = keys$1[i];
+                    const incomingValue = filteredData[fieldKey];
+                    // Special handling for 'fields' property to merge rather than replace
+                    if (fieldKey === 'fields' &&
+                        isObject$1(incomingValue) &&
+                        isObject$1(targetObj[fieldKey])) {
+                        targetObj[fieldKey] = mergeFieldsObjects(targetObj[fieldKey], incomingValue);
+                    }
+                    else {
+                        targetObj[fieldKey] = incomingValue;
+                    }
                 }
                 storePut(key, targetObj);
             }
             else {
-                // No existing record, just put the filtered data
+                // No existing record - clean null fields before storing
+                if (isObject$1(filteredData) && 'fields' in filteredData) {
+                    const fields = filteredData.fields;
+                    if (isObject$1(fields)) {
+                        filteredData.fields = filterNullFields(fields);
+                    }
+                }
                 storePut(key, filteredData);
             }
         };
@@ -49181,16 +49293,101 @@
             return undefined;
         }
         // Find the 'fields' ObjectSelection
-        const fieldsSelection = selections.find((sel) => sel.kind === 'Object' && sel.name === 'fields');
-        if (!fieldsSelection || !fieldsSelection.selections) {
+        let fieldsSelection;
+        for (let i = 0, len = selections.length; i < len; i += 1) {
+            const sel = selections[i];
+            if (sel.kind === 'Object' && sel.name === 'fields') {
+                fieldsSelection = sel;
+                break;
+            }
+        }
+        if (!fieldsSelection ||
+            !fieldsSelection.selections ||
+            fieldsSelection.selections.length === 0) {
             return undefined;
         }
         // Extract all field names from the fields selections
+        const fieldSelections = fieldsSelection.selections;
         const fieldNames = new Set();
-        for (const fieldSel of fieldsSelection.selections) {
-            fieldNames.add(fieldSel.name);
+        for (let i = 0, len = fieldSelections.length; i < len; i += 1) {
+            fieldNames.add(fieldSelections[i].name);
+        }
+        return fieldNames;
+    }
+    /**
+     * Extracts nested field requirements for spanning fields.
+     * For spanning fields like Case.CreatedBy.Name, we need to extract what fields
+     * are requested from the nested record (User in this case).
+     * The structure is: fields { CreatedBy { value (Link with fragment) { fields { Name } } } }
+     */
+    function extractNestedFieldRequirements(selections) {
+        if (!selections) {
+            return undefined;
+        }
+        // Find the 'fields' ObjectSelection
+        let fieldsSelection;
+        for (let i = 0, len = selections.length; i < len; i += 1) {
+            const sel = selections[i];
+            if (sel.kind === 'Object' && sel.name === 'fields') {
+                fieldsSelection = sel;
+                break;
+            }
+        }
+        if (!fieldsSelection || !fieldsSelection.selections) {
+            return undefined;
+        }
+        let nestedFieldsMap;
+        // Look for ObjectSelections within fields (these are spanning fields)
+        const fieldSelections = fieldsSelection.selections;
+        for (let i = 0, len = fieldSelections.length; i < len; i += 1) {
+            const fieldSel = fieldSelections[i];
+            if (fieldSel.kind !== 'Object') {
+                continue;
+            }
+            const objSel = fieldSel;
+            if (!objSel.selections) {
+                continue;
+            }
+            // Look for the 'value' Link selection
+            let valueLinkSelection;
+            for (let j = 0, jlen = objSel.selections.length; j < jlen; j += 1) {
+                const sel = objSel.selections[j];
+                if (sel.kind === 'Link' && sel.name === 'value') {
+                    valueLinkSelection = sel;
+                    break;
+                }
+            }
+            if (!valueLinkSelection || !('fragment' in valueLinkSelection)) {
+                continue;
+            }
+            const fragment = valueLinkSelection.fragment;
+            if (!fragment || !fragment.selections) {
+                continue;
+            }
+            // Look for the 'fields' selection within the fragment
+            let nestedFieldsSelection;
+            for (let j = 0, jlen = fragment.selections.length; j < jlen; j += 1) {
+                const sel = fragment.selections[j];
+                if (sel.kind === 'Object' && sel.name === 'fields') {
+                    nestedFieldsSelection = sel;
+                    break;
+                }
+            }
+            if (nestedFieldsSelection && nestedFieldsSelection.selections) {
+                const nestedFields = new Set();
+                for (const nestedFieldSel of nestedFieldsSelection.selections) {
+                    nestedFields.add(nestedFieldSel.name);
+                }
+                if (nestedFields.size > 0) {
+                    // Lazy initialize map only if we have nested fields
+                    if (!nestedFieldsMap) {
+                        nestedFieldsMap = new Map();
+                    }
+                    nestedFieldsMap.set(fieldSel.name, nestedFields);
+                }
+            }
         }
-        return fieldNames.size > 0 ? fieldNames : undefined;
+        return nestedFieldsMap;
     }
 
     const TTL_DURABLE_SEGMENT = 'TTL_DURABLE_SEGMENT';
@@ -91334,7 +91531,7 @@
             else {
                 returnParams[key] = `${value}`;
             }
-            if (isObject$1(value) === true && keys$2$1(value).length > 0) {
+            if (isObject$2(value) === true && keys$2$1(value).length > 0) {
                 returnParams[key] = stringify$4(value);
             }
         }
@@ -91387,7 +91584,7 @@
         return status >= 200 && status <= 299;
     }
     // adapted from adapter-utils untrustedIsObject
-    function isObject$1(value) {
+    function isObject$2(value) {
         return typeof value === 'object' && value !== null && isArray$2$1(value) === false;
     }
     function stringifyIfPresent(value) {
@@ -98878,7 +99075,7 @@
             },
         };
     }
-    // version: 1.419.0-8232dcd0ab
+    // version: 1.420.0-576a1ea316
 
     /**
      * Copyright (c) 2022, Salesforce, Inc.,
@@ -98904,7 +99101,7 @@
             },
         };
     }
-    // version: 1.419.0-8232dcd0ab
+    // version: 1.420.0-576a1ea316
 
     /*!
      * Copyright (c) 2022, Salesforce, Inc.,
@@ -101553,7 +101750,7 @@
         id: '@salesforce/lds-network-adapter',
         instrument: instrument$2,
     });
-    // version: 1.419.0-ade430921b
+    // version: 1.420.0-fc658f6118
 
     const { create: create$2, keys: keys$2 } = Object;
     const { stringify, parse } = JSON;
@@ -109095,7 +109292,7 @@
             cb(graphql_v1_import, graphql_imperative$1, graphql_imperative_legacy_v1_import, graphql_state_manager, useOneStoreGraphQL);
         }
     }
-    // version: 1.419.0-8232dcd0ab
+    // version: 1.420.0-576a1ea316
 
     function createFragmentMap(documentNode) {
         const fragments = {};
@@ -138320,7 +138517,7 @@
         configuration: { ...configurationForGraphQLAdapters$1 },
         instrument: instrument$1,
     });
-    // version: 1.419.0-8232dcd0ab
+    // version: 1.420.0-576a1ea316
 
     // On core the unstable adapters are re-exported with different names,
     // we want to match them here.
@@ -138472,7 +138669,7 @@
         unstable_graphQL_imperative = createImperativeAdapter(luvio, createInstrumentedAdapter(ldsAdapter, adapterMetadata), adapterMetadata);
         graphQLImperative = ldsAdapter;
     });
-    // version: 1.419.0-8232dcd0ab
+    // version: 1.420.0-576a1ea316
 
     var gqlApi = /*#__PURE__*/Object.freeze({
         __proto__: null,
@@ -139271,7 +139468,7 @@
     function register(r) {
         callbacks$1.forEach((callback) => callback(r));
     }
-    // version: 1.419.0-ade430921b
+    // version: 1.420.0-fc658f6118
 
     /**
      * Copyright (c) 2022, Salesforce, Inc.,
@@ -140608,4 +140805,4 @@
     exports.subscribeToAdapter = subscribeToAdapter;
 
 }));
-// version: 1.419.0-ade430921b
+// version: 1.420.0-fc658f6118

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-worker-api",
-    "version": "1.419.0",
+    "version": "1.420.0",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "",
     "main": "dist/standalone/es/lds-worker-api.js",
@@ -35,14 +35,14 @@
     },
     "devDependencies": {
         "@oat-sa/rollup-plugin-wildcard-external": "^1.0.0",
-        "@salesforce/lds-adapters-graphql": "^1.419.0",
-        "@salesforce/lds-adapters-uiapi": "^1.419.0",
-        "@salesforce/lds-default-luvio": "^1.419.0",
-        "@salesforce/lds-drafts": "^1.419.0",
-        "@salesforce/lds-graphql-parser": "^1.419.0",
-        "@salesforce/lds-luvio-engine": "^1.419.0",
-        "@salesforce/lds-runtime-mobile": "^1.419.0",
-        "@salesforce/nimbus-plugin-lds": "^1.419.0",
+        "@salesforce/lds-adapters-graphql": "^1.420.0",
+        "@salesforce/lds-adapters-uiapi": "^1.420.0",
+        "@salesforce/lds-default-luvio": "^1.420.0",
+        "@salesforce/lds-drafts": "^1.420.0",
+        "@salesforce/lds-graphql-parser": "^1.420.0",
+        "@salesforce/lds-luvio-engine": "^1.420.0",
+        "@salesforce/lds-runtime-mobile": "^1.420.0",
+        "@salesforce/nimbus-plugin-lds": "^1.420.0",
         "ajv": "^8.11.0",
         "glob": "^7.1.5",
         "nimbus-types": "^2.0.0-alpha1",