@salesforce/lds-runtime-mobile 1.415.0 → 1.416.1

package/dist/main.js

@@ -47,6 +47,7 @@ import { setServices } from '@conduit-client/service-provisioner/v1';
 import '@conduit-client/type-normalization/v1';
 import { Kind as Kind$2, visit as visit$2, print as print$1, resolveAndValidateGraphQLConfig } from '@conduit-client/onestore-graphql-parser/v1';
 import productConsumedSideEffects from '@salesforce/gate/com.salesforce.fieldservice.vanStockLDSBypass256';
+import reviveOnlyRequestedFields from '@salesforce/gate/lmr.reviveOnlyRequestedFields';
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -633,7 +634,7 @@ function publishDurableStoreEntries(durableRecords, put, publishMetadata) {
  * will refresh the snapshot from network, and then run the results from network
  * through L2 ingestion, returning the subsequent revived snapshot.
  */
-function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, durableStoreErrorHandler, buildL1Snapshot, revivingStore, reviveMetrics = { l2Trips: [] }) {
+function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, durableStoreErrorHandler, buildL1Snapshot, revivingStore, reviveMetrics = { l2Trips: [] }, shouldFilterFields) {
     const { recordId, select, missingLinks, seenRecords, state } = unavailableSnapshot;
     // L2 can only revive Unfulfilled snapshots that have a selector since they have the
     // info needed to revive (like missingLinks) and rebuild.  Otherwise return L1 snapshot.
@@ -660,19 +661,55 @@ function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, dura
     }
     keysToReviveSet.merge(missingLinks);
     const keysToRevive = keysToReviveSet.keysAsArray();
-    const canonicalKeys = keysToRevive.map((x) => serializeStructuredKey(baseEnvironment.storeGetCanonicalKey(x)));
     const start = Date.now();
     const { l2Trips } = reviveMetrics;
-    return durableStore.getEntries(canonicalKeys, DefaultDurableSegment).then((durableRecords) => {
+    // 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]) => {
         l2Trips.push({
             duration: Date.now() - start,
-            keysRequestedCount: canonicalKeys.length,
+            keysRequestedCount: canonicalKeys.length + filteredCanonicalKeys.length,
         });
-        const { revivedKeys, hadUnexpectedShape } = publishDurableStoreEntries(durableRecords, 
-        // TODO [W-10072584]: instead of implicitly using L1 we should take in
-        // publish and publishMetadata funcs, so callers can decide where to
-        // revive to (like they pass in how to do the buildL1Snapshot)
-        baseEnvironment.storePut.bind(baseEnvironment), baseEnvironment.publishStoreMetadata.bind(baseEnvironment));
+        // Process both normal and filtered records in a single pass
+        const revivedKeys = new StoreKeySet();
+        let hadUnexpectedShape = false;
+        // Process normal records
+        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
+        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;
+        }
         // if the data coming back from DS had an unexpected shape then just
         // return the L1 snapshot
         if (hadUnexpectedShape === true) {
@@ -707,7 +744,7 @@ function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, dura
             for (let i = 0, len = newKeys.length; i < len; i++) {
                 const newSnapshotSeenKey = newKeys[i];
                 if (!alreadyRequestedOrRevivedSet.has(newSnapshotSeenKey)) {
-                    return reviveSnapshot(baseEnvironment, durableStore, snapshot, durableStoreErrorHandler, buildL1Snapshot, revivingStore, reviveMetrics);
+                    return reviveSnapshot(baseEnvironment, durableStore, snapshot, durableStoreErrorHandler, buildL1Snapshot, revivingStore, reviveMetrics, shouldFilterFields);
                 }
             }
         }
@@ -718,6 +755,59 @@ function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, dura
         return { snapshot: unavailableSnapshot, metrics: reviveMetrics };
     });
 }
+/**
+ * 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.
+ */
+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];
+            }
+            storePut(key, targetObj);
+        }
+        else {
+            // No existing record, just put the filtered data
+            storePut(key, filteredData);
+        }
+    };
+}
+/**
+ * Extracts the requested field names from the selections of a 'fields' ObjectSelection.
+ * Returns undefined if no 'fields' selection is found or if it doesn't have selections.
+ */
+function extractRequestedFieldNames(selections) {
+    if (!selections) {
+        return undefined;
+    }
+    // Find the 'fields' ObjectSelection
+    const fieldsSelection = selections.find((sel) => sel.kind === 'Object' && sel.name === 'fields');
+    if (!fieldsSelection || !fieldsSelection.selections) {
+        return undefined;
+    }
+    // Extract all field names from the fields selections
+    const fieldNames = new Set();
+    for (const fieldSel of fieldsSelection.selections) {
+        fieldNames.add(fieldSel.name);
+    }
+    return fieldNames.size > 0 ? fieldNames : undefined;
+}
 
 const TTL_DURABLE_SEGMENT = 'TTL_DURABLE_SEGMENT';
 const TTL_DEFAULT_KEY = 'TTL_DEFAULT_KEY';
@@ -1034,7 +1124,7 @@ function isUnfulfilledSnapshot$3(cachedSnapshotResult) {
  * @param durableStore A DurableStore implementation
  * @param instrumentation An instrumentation function implementation
  */
-function makeDurable(environment, { durableStore, instrumentation, useRevivingStore, shouldFlush, enableDurableMetadataRefresh = false, disableDeepFreeze = false, }) {
+function makeDurable(environment, { durableStore, instrumentation, useRevivingStore, shouldFlush, enableDurableMetadataRefresh = false, disableDeepFreeze = false, shouldFilterFieldsOnRevive, }) {
     // runtimes can choose to disable deepFreeze, e.g. headless mobile runtime
     setBypassDeepFreeze(disableDeepFreeze);
     let stagingStore = null;
@@ -1576,7 +1666,7 @@ function makeDurable(environment, { durableStore, instrumentation, useRevivingSt
             const result = buildL1Snapshot();
             stagingStore = tempStore;
             return result;
-        }, revivingStore).finally(() => {
+        }, revivingStore, { l2Trips: [] }, shouldFilterFieldsOnRevive !== null && shouldFilterFieldsOnRevive !== void 0 ? shouldFilterFieldsOnRevive : (() => false)).finally(() => {
         });
     };
     const expirePossibleStaleRecords = async function (keys$1, config, refresh) {
@@ -52140,6 +52230,27 @@ class LdsDataTable {
             }, reject);
         });
     }
+    getByKeysWithSpecificFields(keys, fields, _segment) {
+        // SQLite json_object has a max argument limit (~127 pairs = 254 args)
+        // If too many fields requested, return undefined to indicate filtering not possible
+        if (fields.size > 100) {
+            return Promise.resolve(undefined);
+        }
+        return new Promise((resolve, reject) => {
+            // Build JSON object with only the specified fields from the nested 'fields' property
+            const jsonFields = Array.from(fields)
+                .map((field) => `'${field}', json_extract(${COLUMN_NAME_DATA$2}, '$.fields.${field}')`)
+                .join(', ');
+            const filteredFieldsExpr = `json_object(${jsonFields})`;
+            // Use json_set to replace the 'fields' property in the data with the filtered version
+            const filteredDataExpr = `json_set(${COLUMN_NAME_DATA$2}, '$.fields', ${filteredFieldsExpr})`;
+            const paramList = keys.map(() => '?').join(',');
+            const getQuery = `SELECT ${COLUMN_NAME_KEY$2}, ${filteredDataExpr} as ${COLUMN_NAME_DATA$2}, ${COLUMN_NAME_METADATA$1} FROM ${this.tableName} WHERE ${COLUMN_NAME_KEY$2} IN (${paramList})`;
+            this.plugin.query(getQuery, keys, (x) => {
+                resolve(this.mapToDurableEntries(x));
+            }, reject);
+        });
+    }
     getMetadataByKeys(keys) {
         const query = selectColumnsFromTableWhereKeyIn([COLUMN_NAME_KEY$2, COLUMN_NAME_METADATA$1], this.tableName, COLUMN_NAME_KEY$2, keys);
         return new Promise((resolve, reject) => {
@@ -52246,6 +52357,30 @@ class LdsInternalDataTable {
             }, reject);
         });
     }
+    getByKeysWithSpecificFields(keys, fields, namespace) {
+        if (namespace === undefined) {
+            throw Error('LdsInternalDataTable requires namespace');
+        }
+        // SQLite json_object has a max argument limit (~127 pairs = 254 args)
+        // If too many fields requested, return undefined to indicate filtering not possible
+        if (fields.size > 100) {
+            return Promise.resolve(undefined);
+        }
+        return new Promise((resolve, reject) => {
+            // Build JSON object with only the specified fields from the nested 'fields' property
+            const jsonFields = Array.from(fields)
+                .map((field) => `'${field}', json_extract(${COLUMN_NAME_DATA$1}, '$.fields.${field}')`)
+                .join(', ');
+            const filteredFieldsExpr = `json_object(${jsonFields})`;
+            // Use json_set to replace the 'fields' property in the data with the filtered version
+            const filteredDataExpr = `json_set(${COLUMN_NAME_DATA$1}, '$.fields', ${filteredFieldsExpr})`;
+            const paramList = keys.map(() => '?').join(',');
+            const getQuery = `SELECT ${COLUMN_NAME_KEY$1}, ${filteredDataExpr} as ${COLUMN_NAME_DATA$1}, ${COLUMN_NAME_METADATA}, ${COLUMN_NAME_NAMESPACE} FROM ${this.tableName} WHERE ${COLUMN_NAME_NAMESPACE} = ? AND ${COLUMN_NAME_KEY$1} IN (${paramList})`;
+            this.plugin.query(getQuery, [namespace].concat(keys), (x) => {
+                resolve(this.mapToDurableEntries(x));
+            }, reject);
+        });
+    }
     getMetadataByKeys(keys, namespace) {
         if (namespace === undefined) {
             throw Error('LdsInternalDataTable requires namespace');
@@ -52386,6 +52521,12 @@ class NimbusSqliteStore {
             .getByKeys(entryIds, segment)
             .finally(() => tasker.done());
     }
+    async getEntriesWithSpecificFields(entryIds, fields, segment) {
+        tasker.add();
+        return this.getTable(segment)
+            .getByKeysWithSpecificFields(entryIds, fields, segment)
+            .finally(() => tasker.done());
+    }
     async getMetadata(entryIds, segment) {
         tasker.add();
         return this.getTable(segment)
@@ -52545,6 +52686,27 @@ class AbstractKeyValueDataTable {
             }, reject);
         });
     }
+    getByKeysWithSpecificFields(keys, fields, _segment) {
+        // SQLite json_object has a max argument limit (~127 pairs = 254 args)
+        // If too many fields requested, return undefined to indicate filtering not possible
+        if (fields.size > 100) {
+            return Promise.resolve(undefined);
+        }
+        return new Promise((resolve, reject) => {
+            // Build JSON object with only the specified fields from the nested 'fields' property
+            const jsonFields = Array.from(fields)
+                .map((field) => `'${field}', json_extract(${COLUMN_NAME_DATA}, '$.fields.${field}')`)
+                .join(', ');
+            const filteredFieldsExpr = `json_object(${jsonFields})`;
+            // Use json_set to replace the 'fields' property in the data with the filtered version
+            const filteredDataExpr = `json_set(${COLUMN_NAME_DATA}, '$.fields', ${filteredFieldsExpr})`;
+            const paramList = keys.map(() => '?').join(',');
+            const getQuery = `SELECT ${COLUMN_NAME_KEY}, ${filteredDataExpr} as ${COLUMN_NAME_DATA} FROM ${this.tableName} WHERE ${COLUMN_NAME_KEY} IN (${paramList})`;
+            this.plugin.query(getQuery, keys, (x) => {
+                resolve(this.mapToDurableEntries(x));
+            }, reject);
+        });
+    }
     getMetadataByKeys(_keys) {
         // eslint-disable-next-line @salesforce/lds/no-error-in-production
         throw new Error(`There is no metadata in the ${this.tableName} table.`);
@@ -58420,7 +58582,7 @@ function buildServiceDescriptor$b(luvio) {
         },
     };
 }
-// version: 1.415.0-caf45a5d7e
+// version: 1.416.1-c10be671f4
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -58446,7 +58608,7 @@ function buildServiceDescriptor$a(notifyRecordUpdateAvailable, getNormalizedLuvi
         },
     };
 }
-// version: 1.415.0-caf45a5d7e
+// version: 1.416.1-c10be671f4
 
 /*!
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -60960,6 +61122,12 @@ function getRuntime({ primeUser = false } = {}) {
         lazyInternalLuvio = internalLuvio;
         lazyObjectInfoService = new ObjectInfoService(getObjectInfo, getObjectInfos, getObjectInfoDirectory, lazyDurableStore);
         const baseEnv = new Environment(store, lazyNetworkAdapter);
+        const shouldFilterFieldsOnRevive = (key) => {
+            if (reviveOnlyRequestedFields.isOpen({ fallback: false })) {
+                return isStoreKeyRecordId(key);
+            }
+            return false;
+        };
         const gqlEnv = makeEnvironmentGraphqlAware(baseEnv);
         const durableEnv = makeDurable(gqlEnv, {
             durableStore: lazyDurableStore,
@@ -60967,6 +61135,7 @@ function getRuntime({ primeUser = false } = {}) {
             // disable luvio deep freeze in headless environments
             disableDeepFreeze: typeof window === 'undefined',
             shouldFlush,
+            shouldFilterFieldsOnRevive,
         });
         // draft queue
         lazyDraftQueue = buildLdsDraftQueue(lazyDurableStore);
@@ -61087,4 +61256,4 @@ register({
 });
 
 export { O11Y_NAMESPACE_LDS_MOBILE, getRuntime, ingest$1o as ingestDenormalizedRecordRepresentation, initializeOneStore, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.415.0-3636f2a7b2
+// version: 1.416.1-0ee8f9a6ba

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-mobile",
-    "version": "1.415.0",
+    "version": "1.416.1",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS runtime for mobile/hybrid environments.",
     "main": "dist/main.js",
@@ -35,11 +35,11 @@
         "@conduit-client/service-bindings-imperative": "3.9.0",
         "@conduit-client/service-bindings-lwc": "3.9.0",
         "@conduit-client/service-provisioner": "3.9.0",
-        "@salesforce/lds-adapters-uiapi": "^1.415.0",
-        "@salesforce/lds-bindings": "^1.415.0",
-        "@salesforce/lds-instrumentation": "^1.415.0",
-        "@salesforce/lds-luvio-service": "^1.415.0",
-        "@salesforce/lds-luvio-uiapi-records-service": "^1.415.0",
+        "@salesforce/lds-adapters-uiapi": "^1.416.1",
+        "@salesforce/lds-bindings": "^1.416.1",
+        "@salesforce/lds-instrumentation": "^1.416.1",
+        "@salesforce/lds-luvio-service": "^1.416.1",
+        "@salesforce/lds-luvio-uiapi-records-service": "^1.416.1",
         "@salesforce/user": "0.0.21",
         "o11y": "250.7.0",
         "o11y_schema": "256.126.0"
@@ -60,16 +60,16 @@
         "@conduit-client/service-pubsub": "3.9.0",
         "@conduit-client/service-store": "3.9.0",
         "@conduit-client/utils": "3.9.0",
-        "@salesforce/lds-adapters-graphql": "^1.415.0",
-        "@salesforce/lds-drafts": "^1.415.0",
-        "@salesforce/lds-durable-records": "^1.415.0",
-        "@salesforce/lds-network-adapter": "^1.415.0",
-        "@salesforce/lds-network-nimbus": "^1.415.0",
-        "@salesforce/lds-store-binary": "^1.415.0",
-        "@salesforce/lds-store-nimbus": "^1.415.0",
-        "@salesforce/lds-store-sql": "^1.415.0",
-        "@salesforce/lds-utils-adapters": "^1.415.0",
-        "@salesforce/nimbus-plugin-lds": "^1.415.0",
+        "@salesforce/lds-adapters-graphql": "^1.416.1",
+        "@salesforce/lds-drafts": "^1.416.1",
+        "@salesforce/lds-durable-records": "^1.416.1",
+        "@salesforce/lds-network-adapter": "^1.416.1",
+        "@salesforce/lds-network-nimbus": "^1.416.1",
+        "@salesforce/lds-store-binary": "^1.416.1",
+        "@salesforce/lds-store-nimbus": "^1.416.1",
+        "@salesforce/lds-store-sql": "^1.416.1",
+        "@salesforce/lds-utils-adapters": "^1.416.1",
+        "@salesforce/nimbus-plugin-lds": "^1.416.1",
         "babel-plugin-dynamic-import-node": "^2.3.3",
         "wait-for-expect": "^3.0.2"
     },

package/sfdc/main.js

@@ -47,6 +47,7 @@ import { setServices } from 'force/luvioServiceProvisioner1';
 import 'force/luvioTypeNormalization1';
 import { Kind as Kind$2, visit as visit$2, print as print$1, resolveAndValidateGraphQLConfig } from 'force/luvioOnestoreGraphqlParser';
 import productConsumedSideEffects from '@salesforce/gate/com.salesforce.fieldservice.vanStockLDSBypass256';
+import reviveOnlyRequestedFields from '@salesforce/gate/lmr.reviveOnlyRequestedFields';
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -633,7 +634,7 @@ function publishDurableStoreEntries(durableRecords, put, publishMetadata) {
  * will refresh the snapshot from network, and then run the results from network
  * through L2 ingestion, returning the subsequent revived snapshot.
  */
-function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, durableStoreErrorHandler, buildL1Snapshot, revivingStore, reviveMetrics = { l2Trips: [] }) {
+function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, durableStoreErrorHandler, buildL1Snapshot, revivingStore, reviveMetrics = { l2Trips: [] }, shouldFilterFields) {
     const { recordId, select, missingLinks, seenRecords, state } = unavailableSnapshot;
     // L2 can only revive Unfulfilled snapshots that have a selector since they have the
     // info needed to revive (like missingLinks) and rebuild.  Otherwise return L1 snapshot.
@@ -660,19 +661,55 @@ function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, dura
     }
     keysToReviveSet.merge(missingLinks);
     const keysToRevive = keysToReviveSet.keysAsArray();
-    const canonicalKeys = keysToRevive.map((x) => serializeStructuredKey(baseEnvironment.storeGetCanonicalKey(x)));
     const start = Date.now();
     const { l2Trips } = reviveMetrics;
-    return durableStore.getEntries(canonicalKeys, DefaultDurableSegment).then((durableRecords) => {
+    // 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]) => {
         l2Trips.push({
             duration: Date.now() - start,
-            keysRequestedCount: canonicalKeys.length,
+            keysRequestedCount: canonicalKeys.length + filteredCanonicalKeys.length,
         });
-        const { revivedKeys, hadUnexpectedShape } = publishDurableStoreEntries(durableRecords, 
-        // TODO [W-10072584]: instead of implicitly using L1 we should take in
-        // publish and publishMetadata funcs, so callers can decide where to
-        // revive to (like they pass in how to do the buildL1Snapshot)
-        baseEnvironment.storePut.bind(baseEnvironment), baseEnvironment.publishStoreMetadata.bind(baseEnvironment));
+        // Process both normal and filtered records in a single pass
+        const revivedKeys = new StoreKeySet();
+        let hadUnexpectedShape = false;
+        // Process normal records
+        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
+        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;
+        }
         // if the data coming back from DS had an unexpected shape then just
         // return the L1 snapshot
         if (hadUnexpectedShape === true) {
@@ -707,7 +744,7 @@ function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, dura
             for (let i = 0, len = newKeys.length; i < len; i++) {
                 const newSnapshotSeenKey = newKeys[i];
                 if (!alreadyRequestedOrRevivedSet.has(newSnapshotSeenKey)) {
-                    return reviveSnapshot(baseEnvironment, durableStore, snapshot, durableStoreErrorHandler, buildL1Snapshot, revivingStore, reviveMetrics);
+                    return reviveSnapshot(baseEnvironment, durableStore, snapshot, durableStoreErrorHandler, buildL1Snapshot, revivingStore, reviveMetrics, shouldFilterFields);
                 }
             }
         }
@@ -718,6 +755,59 @@ function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, dura
         return { snapshot: unavailableSnapshot, metrics: reviveMetrics };
     });
 }
+/**
+ * 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.
+ */
+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];
+            }
+            storePut(key, targetObj);
+        }
+        else {
+            // No existing record, just put the filtered data
+            storePut(key, filteredData);
+        }
+    };
+}
+/**
+ * Extracts the requested field names from the selections of a 'fields' ObjectSelection.
+ * Returns undefined if no 'fields' selection is found or if it doesn't have selections.
+ */
+function extractRequestedFieldNames(selections) {
+    if (!selections) {
+        return undefined;
+    }
+    // Find the 'fields' ObjectSelection
+    const fieldsSelection = selections.find((sel) => sel.kind === 'Object' && sel.name === 'fields');
+    if (!fieldsSelection || !fieldsSelection.selections) {
+        return undefined;
+    }
+    // Extract all field names from the fields selections
+    const fieldNames = new Set();
+    for (const fieldSel of fieldsSelection.selections) {
+        fieldNames.add(fieldSel.name);
+    }
+    return fieldNames.size > 0 ? fieldNames : undefined;
+}
 
 const TTL_DURABLE_SEGMENT = 'TTL_DURABLE_SEGMENT';
 const TTL_DEFAULT_KEY = 'TTL_DEFAULT_KEY';
@@ -1034,7 +1124,7 @@ function isUnfulfilledSnapshot$3(cachedSnapshotResult) {
  * @param durableStore A DurableStore implementation
  * @param instrumentation An instrumentation function implementation
  */
-function makeDurable(environment, { durableStore, instrumentation, useRevivingStore, shouldFlush, enableDurableMetadataRefresh = false, disableDeepFreeze = false, }) {
+function makeDurable(environment, { durableStore, instrumentation, useRevivingStore, shouldFlush, enableDurableMetadataRefresh = false, disableDeepFreeze = false, shouldFilterFieldsOnRevive, }) {
     // runtimes can choose to disable deepFreeze, e.g. headless mobile runtime
     setBypassDeepFreeze(disableDeepFreeze);
     let stagingStore = null;
@@ -1576,7 +1666,7 @@ function makeDurable(environment, { durableStore, instrumentation, useRevivingSt
             const result = buildL1Snapshot();
             stagingStore = tempStore;
             return result;
-        }, revivingStore).finally(() => {
+        }, revivingStore, { l2Trips: [] }, shouldFilterFieldsOnRevive !== null && shouldFilterFieldsOnRevive !== void 0 ? shouldFilterFieldsOnRevive : (() => false)).finally(() => {
         });
     };
     const expirePossibleStaleRecords = async function (keys$1, config, refresh) {
@@ -52140,6 +52230,27 @@ class LdsDataTable {
             }, reject);
         });
     }
+    getByKeysWithSpecificFields(keys, fields, _segment) {
+        // SQLite json_object has a max argument limit (~127 pairs = 254 args)
+        // If too many fields requested, return undefined to indicate filtering not possible
+        if (fields.size > 100) {
+            return Promise.resolve(undefined);
+        }
+        return new Promise((resolve, reject) => {
+            // Build JSON object with only the specified fields from the nested 'fields' property
+            const jsonFields = Array.from(fields)
+                .map((field) => `'${field}', json_extract(${COLUMN_NAME_DATA$2}, '$.fields.${field}')`)
+                .join(', ');
+            const filteredFieldsExpr = `json_object(${jsonFields})`;
+            // Use json_set to replace the 'fields' property in the data with the filtered version
+            const filteredDataExpr = `json_set(${COLUMN_NAME_DATA$2}, '$.fields', ${filteredFieldsExpr})`;
+            const paramList = keys.map(() => '?').join(',');
+            const getQuery = `SELECT ${COLUMN_NAME_KEY$2}, ${filteredDataExpr} as ${COLUMN_NAME_DATA$2}, ${COLUMN_NAME_METADATA$1} FROM ${this.tableName} WHERE ${COLUMN_NAME_KEY$2} IN (${paramList})`;
+            this.plugin.query(getQuery, keys, (x) => {
+                resolve(this.mapToDurableEntries(x));
+            }, reject);
+        });
+    }
     getMetadataByKeys(keys) {
         const query = selectColumnsFromTableWhereKeyIn([COLUMN_NAME_KEY$2, COLUMN_NAME_METADATA$1], this.tableName, COLUMN_NAME_KEY$2, keys);
         return new Promise((resolve, reject) => {
@@ -52246,6 +52357,30 @@ class LdsInternalDataTable {
             }, reject);
         });
     }
+    getByKeysWithSpecificFields(keys, fields, namespace) {
+        if (namespace === undefined) {
+            throw Error('LdsInternalDataTable requires namespace');
+        }
+        // SQLite json_object has a max argument limit (~127 pairs = 254 args)
+        // If too many fields requested, return undefined to indicate filtering not possible
+        if (fields.size > 100) {
+            return Promise.resolve(undefined);
+        }
+        return new Promise((resolve, reject) => {
+            // Build JSON object with only the specified fields from the nested 'fields' property
+            const jsonFields = Array.from(fields)
+                .map((field) => `'${field}', json_extract(${COLUMN_NAME_DATA$1}, '$.fields.${field}')`)
+                .join(', ');
+            const filteredFieldsExpr = `json_object(${jsonFields})`;
+            // Use json_set to replace the 'fields' property in the data with the filtered version
+            const filteredDataExpr = `json_set(${COLUMN_NAME_DATA$1}, '$.fields', ${filteredFieldsExpr})`;
+            const paramList = keys.map(() => '?').join(',');
+            const getQuery = `SELECT ${COLUMN_NAME_KEY$1}, ${filteredDataExpr} as ${COLUMN_NAME_DATA$1}, ${COLUMN_NAME_METADATA}, ${COLUMN_NAME_NAMESPACE} FROM ${this.tableName} WHERE ${COLUMN_NAME_NAMESPACE} = ? AND ${COLUMN_NAME_KEY$1} IN (${paramList})`;
+            this.plugin.query(getQuery, [namespace].concat(keys), (x) => {
+                resolve(this.mapToDurableEntries(x));
+            }, reject);
+        });
+    }
     getMetadataByKeys(keys, namespace) {
         if (namespace === undefined) {
             throw Error('LdsInternalDataTable requires namespace');
@@ -52386,6 +52521,12 @@ class NimbusSqliteStore {
             .getByKeys(entryIds, segment)
             .finally(() => tasker.done());
     }
+    async getEntriesWithSpecificFields(entryIds, fields, segment) {
+        tasker.add();
+        return this.getTable(segment)
+            .getByKeysWithSpecificFields(entryIds, fields, segment)
+            .finally(() => tasker.done());
+    }
     async getMetadata(entryIds, segment) {
         tasker.add();
         return this.getTable(segment)
@@ -52545,6 +52686,27 @@ class AbstractKeyValueDataTable {
             }, reject);
         });
     }
+    getByKeysWithSpecificFields(keys, fields, _segment) {
+        // SQLite json_object has a max argument limit (~127 pairs = 254 args)
+        // If too many fields requested, return undefined to indicate filtering not possible
+        if (fields.size > 100) {
+            return Promise.resolve(undefined);
+        }
+        return new Promise((resolve, reject) => {
+            // Build JSON object with only the specified fields from the nested 'fields' property
+            const jsonFields = Array.from(fields)
+                .map((field) => `'${field}', json_extract(${COLUMN_NAME_DATA}, '$.fields.${field}')`)
+                .join(', ');
+            const filteredFieldsExpr = `json_object(${jsonFields})`;
+            // Use json_set to replace the 'fields' property in the data with the filtered version
+            const filteredDataExpr = `json_set(${COLUMN_NAME_DATA}, '$.fields', ${filteredFieldsExpr})`;
+            const paramList = keys.map(() => '?').join(',');
+            const getQuery = `SELECT ${COLUMN_NAME_KEY}, ${filteredDataExpr} as ${COLUMN_NAME_DATA} FROM ${this.tableName} WHERE ${COLUMN_NAME_KEY} IN (${paramList})`;
+            this.plugin.query(getQuery, keys, (x) => {
+                resolve(this.mapToDurableEntries(x));
+            }, reject);
+        });
+    }
     getMetadataByKeys(_keys) {
         // eslint-disable-next-line @salesforce/lds/no-error-in-production
         throw new Error(`There is no metadata in the ${this.tableName} table.`);
@@ -58420,7 +58582,7 @@ function buildServiceDescriptor$b(luvio) {
         },
     };
 }
-// version: 1.415.0-caf45a5d7e
+// version: 1.416.1-c10be671f4
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -58446,7 +58608,7 @@ function buildServiceDescriptor$a(notifyRecordUpdateAvailable, getNormalizedLuvi
         },
     };
 }
-// version: 1.415.0-caf45a5d7e
+// version: 1.416.1-c10be671f4
 
 /*!
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -60960,6 +61122,12 @@ function getRuntime({ primeUser = false } = {}) {
         lazyInternalLuvio = internalLuvio;
         lazyObjectInfoService = new ObjectInfoService(getObjectInfo, getObjectInfos, getObjectInfoDirectory, lazyDurableStore);
         const baseEnv = new Environment(store, lazyNetworkAdapter);
+        const shouldFilterFieldsOnRevive = (key) => {
+            if (reviveOnlyRequestedFields.isOpen({ fallback: false })) {
+                return isStoreKeyRecordId(key);
+            }
+            return false;
+        };
         const gqlEnv = makeEnvironmentGraphqlAware(baseEnv);
         const durableEnv = makeDurable(gqlEnv, {
             durableStore: lazyDurableStore,
@@ -60967,6 +61135,7 @@ function getRuntime({ primeUser = false } = {}) {
             // disable luvio deep freeze in headless environments
             disableDeepFreeze: typeof window === 'undefined',
             shouldFlush,
+            shouldFilterFieldsOnRevive,
         });
         // draft queue
         lazyDraftQueue = buildLdsDraftQueue(lazyDurableStore);
@@ -61087,4 +61256,4 @@ register({
 });
 
 export { O11Y_NAMESPACE_LDS_MOBILE, getRuntime, ingest$1o as ingestDenormalizedRecordRepresentation, initializeOneStore, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.415.0-3636f2a7b2
+// version: 1.416.1-0ee8f9a6ba