@salesforce/lds-runtime-mobile 1.287.0-dev14 → 1.287.0-dev16

package/dist/main.js

@@ -20,7 +20,7 @@ import { setupInstrumentation, instrumentAdapter as instrumentAdapter$1, instrum
 import { HttpStatusCode, setBypassDeepFreeze, StoreKeySet, serializeStructuredKey, StringKeyInMemoryStore, Reader, deepFreeze, emitAdapterEvent, createCustomAdapterEventEmitter, StoreKeyMap, isFileReference, Environment, Luvio, InMemoryStore } from '@luvio/engine';
 import excludeStaleRecordsGate from '@salesforce/gate/lds.graphqlEvalExcludeStaleRecords';
 import { parseAndVisit, Kind, buildSchema, isObjectType, defaultFieldResolver, visit, execute, parse as parse$7, extendSchema, isScalarType } from '@luvio/graphql-parser';
-import { RECORD_ID_PREFIX, RECORD_FIELDS_KEY_JUNCTION, isStoreKeyRecordViewEntity, getRecordId18, RECORD_REPRESENTATION_NAME, extractRecordIdFromStoreKey, keyBuilderQuickActionExecutionRepresentation, ingestQuickActionExecutionRepresentation, keyBuilderContentDocumentCompositeRepresentation, getResponseCacheKeysContentDocumentCompositeRepresentation, keyBuilderFromTypeContentDocumentCompositeRepresentation, ingestContentDocumentCompositeRepresentation, keyBuilderRecord, RECORD_VIEW_ENTITY_ID_PREFIX, getTypeCacheKeysRecord, keyBuilderFromTypeRecordRepresentation, ingestRecord, RecordRepresentationRepresentationType, ObjectInfoRepresentationType, getRecordAdapterFactory, getObjectInfoAdapterFactory, getObjectInfosAdapterFactory, getObjectInfoDirectoryAdapterFactory, UiApiNamespace, RecordRepresentationType, RecordRepresentationTTL, RecordRepresentationVersion, getRecordsAdapterFactory } from '@salesforce/lds-adapters-uiapi';
+import { RECORD_ID_PREFIX, RECORD_FIELDS_KEY_JUNCTION, isStoreKeyRecordViewEntity, getRecordId18, RECORD_REPRESENTATION_NAME, extractRecordIdFromStoreKey, keyBuilderQuickActionExecutionRepresentation, ingestQuickActionExecutionRepresentation, keyBuilderContentDocumentCompositeRepresentation, getResponseCacheKeysContentDocumentCompositeRepresentation, keyBuilderFromTypeContentDocumentCompositeRepresentation, ingestContentDocumentCompositeRepresentation, keyBuilderRecord, RECORD_VIEW_ENTITY_ID_PREFIX, getTypeCacheKeysRecord, keyBuilderFromTypeRecordRepresentation, ingestRecord, getRecordsAdapterFactory, RecordRepresentationRepresentationType, ObjectInfoRepresentationType, getRecordAdapterFactory, getObjectInfoAdapterFactory, getObjectInfosAdapterFactory, getObjectInfoDirectoryAdapterFactory, UiApiNamespace, RecordRepresentationType, RecordRepresentationTTL, RecordRepresentationVersion } from '@salesforce/lds-adapters-uiapi';
 import ldsIdempotencyWriteDisabled from '@salesforce/gate/lds.idempotencyWriteDisabled';
 import ldsBackdatingEnabled from '@salesforce/gate/lds.backdatingEnabled';
 import FIRST_DAY_OF_WEEK from '@salesforce/i18n/firstDayOfWeek';
@@ -1566,6 +1566,32 @@ function makeDurable(environment, { durableStore, instrumentation, useRevivingSt
         }, revivingStore).finally(() => {
         });
     };
+    const expirePossibleStaleRecords = async function (keys$1, config, refresh) {
+        validateNotDisposed();
+        const metadataKeys = keys$1.map(serializeStructuredKey);
+        const now = Date.now();
+        const entries = await durableStore.getMetadata(metadataKeys, DefaultDurableSegment);
+        if (entries === undefined || keys$7(entries).length === 0) {
+            return environment.expirePossibleStaleRecords(keys$1);
+        }
+        let metaDataChanged = false;
+        const metadataEntries = metadataKeys.reduce((accu, key) => {
+            const metadataEntry = entries[key];
+            if (metadataEntry.metadata !== undefined) {
+                const metadata = { ...metadataEntry.metadata, expirationTimestamp: now };
+                accu[key] = { metadata };
+                metaDataChanged = true;
+            }
+            return accu;
+        }, {});
+        if (metaDataChanged) {
+            await durableStore.setMetadata(metadataEntries, DefaultDurableSegment);
+        }
+        if (config !== undefined && refresh !== undefined) {
+            return environment.refreshPossibleStaleRecords(config, refresh);
+        }
+        return Promise.resolve();
+    };
     // set the default cache policy of the base environment
     environment.setDefaultCachePolicy({
         type: 'stale-while-revalidate',
@@ -1598,6 +1624,7 @@ function makeDurable(environment, { durableStore, instrumentation, useRevivingSt
         handleErrorResponse: { value: handleErrorResponse },
         getNotifyChangeStoreEntries: { value: getNotifyChangeStoreEntries },
         notifyStoreUpdateAvailable: { value: notifyStoreUpdateAvailable },
+        expirePossibleStaleRecords: { value: expirePossibleStaleRecords },
     });
 }
 
@@ -7230,6 +7257,7 @@ function createContext(store, objectInfos, eventEmitter, settings, snapshot, dra
         Record,
         snapshot,
         seenRecordIds: new Set(),
+        possibleStaleRecordMap: new Map(),
         draftFunctions,
     };
 }
@@ -7841,7 +7869,6 @@ function isTodayStartOfWeek() {
 
 const JSON_EXTRACT_PATH_INGESTION_TIMESTAMP = '$.ingestionTimestamp';
 const JSON_EXTRACT_PATH_INGESTION_APINAME = '$.apiName';
-const JSON_EXTRACT_PATH_DRAFTS = '$.drafts';
 
 const MultiPickListValueSeparator = ';';
 function filterToPredicates(where, recordType, alias, objectInfoMap, joins, draftFunctions) {
@@ -8371,18 +8398,11 @@ function buildQuery(config) {
     const joins = buildJoins(config);
     const predicates = buildPredicates(config);
     const orderBy = buildOrderBy(config);
-    const staleRecordsSql = excludeStaleRecordsGate.isOpen({ fallback: false })
-        ? `AND (
-            json_extract("${config.alias}".metadata, '${JSON_EXTRACT_PATH_INGESTION_TIMESTAMP}') >= ?
-            OR json_extract("${config.alias}".data, '${JSON_EXTRACT_PATH_DRAFTS}') IS NOT NULL
-          )`
-        : '';
     const sql = `
-        SELECT "${config.alias}".data
+        SELECT "${config.alias}".data, "${config.alias}".metadata
         FROM lds_data "${config.alias}" ${joins.sql}
         WHERE "${config.alias}".key like 'UiApi::RecordRepresentation:%'
           AND json_extract("${config.alias}".data, '${JSON_EXTRACT_PATH_INGESTION_APINAME}') = '${config.alias}'
-          ${staleRecordsSql}
           ${predicates.sql}
           ${orderBy.sql}
         LIMIT ?
@@ -8393,7 +8413,6 @@ function buildQuery(config) {
     const bindings = [
         // bindings from predicates on joins
         ...joins.bindings,
-        ...(excludeStaleRecordsGate.isOpen({ fallback: false }) ? [config.ingestionTimestamp] : []),
         // where clause and parent scope bindings
         ...predicates.bindings,
         // limit binding
@@ -8419,33 +8438,19 @@ function buildJoins(config) {
     if (allJoins.length === 0)
         return { sql, bindings };
     sql = allJoins.reduce((joinAccumulator, join) => {
-        let timestampAdded = false;
         const joinConditions = join.conditions.reduce((conditionAccumulator, condition) => {
             let joined_sql;
-            const joinMetadataTimestamp = excludeStaleRecordsGate.isOpen({ fallback: false })
-                ? ` AND (json_extract("${join.alias}".metadata, '${JSON_EXTRACT_PATH_INGESTION_TIMESTAMP}') >= ? OR json_extract("${join.alias}".data, '${JSON_EXTRACT_PATH_DRAFTS}') IS NOT NULL)`
-                : '';
             // predicate on a value, use the newly joined table
             if ('type' in condition) {
                 const { sql, binding } = predicateToSQL(condition, join.alias);
-                joined_sql = ` AND ${sql}${timestampAdded ? '' : joinMetadataTimestamp}`;
+                joined_sql = ` AND ${sql}`;
                 bindings.push(...binding);
-                if (excludeStaleRecordsGate.isOpen({ fallback: false }) &&
-                    timestampAdded === false) {
-                    bindings.push(config.ingestionTimestamp);
-                    timestampAdded = true;
-                }
             }
             else {
                 // predicate on a path
                 const left = ` AND json_extract("${join.to}".data, '${condition.leftPath}')`;
                 const right = `json_extract("${join.alias}".data, '${condition.rightPath}')`;
-                joined_sql = `${left} = ${right}${timestampAdded ? '' : joinMetadataTimestamp}`;
-                if (excludeStaleRecordsGate.isOpen({ fallback: false }) &&
-                    timestampAdded === false) {
-                    bindings.push(config.ingestionTimestamp);
-                    timestampAdded = true;
-                }
+                joined_sql = `${left} = ${right}`;
             }
             conditionAccumulator += joined_sql;
             return conditionAccumulator;
@@ -9390,8 +9395,7 @@ function addResolversToSchema(schema, polyFields) {
             for (const field of fields) {
                 if (field.name === 'node') {
                     field.resolve = function nodeResolver(obj, _args, { seenRecordIds }) {
-                        const { record, ingestionTimestamp } = obj;
-                        const recordRepresentation = parse$4(record);
+                        const { recordRepresentation, ingestionTimestamp } = obj;
                         seenRecordIds.add(recordRepresentation.id);
                         return { recordRepresentation, ingestionTimestamp };
                     };
@@ -9605,16 +9609,30 @@ async function connectionEdgeResolver(obj, _args, context) {
         predicates,
         orderBy: orderByToPredicate(parentArgs.orderBy, alias, alias, context.objectInfos),
         limit: parentArgs.first,
-        ingestionTimestamp,
     };
     const { sql, bindings } = buildQuery(queryConfig);
     const results = await query(sql, bindings);
     //map each sql result with the ingestion timestamp to pass it down a level
-    return results.rows
-        .map((row) => row[0])
-        .map((record) => {
+    return results.rows.map((row) => {
+        const recordMetadataResult = {
+            recordRepresentation: parse$4(row[0]),
+            metadata: parse$4(row[1]),
+        };
+        const { recordRepresentation, metadata } = recordMetadataResult;
+        context.seenRecordIds.add(recordRepresentation.id);
+        if (metadata.ingestionTimestamp < ingestionTimestamp &&
+            recordRepresentation.drafts === undefined) {
+            if (context.possibleStaleRecordMap.has(recordRepresentation.apiName) === false) {
+                context.possibleStaleRecordMap.set(recordRepresentation.apiName, []);
+            }
+            const ids = context.possibleStaleRecordMap.get(recordRepresentation.apiName);
+            if (ids !== undefined) {
+                ids.push(recordRepresentation.id);
+                context.possibleStaleRecordMap.set(recordRepresentation.apiName, ids);
+            }
+        }
         return {
-            record,
+            recordRepresentation,
             ingestionTimestamp,
         };
     });
@@ -10179,7 +10197,11 @@ async function evaluate(config, observers, settings, objectInfos, store, snapsho
                 seenRecordIds.push(queryString);
             });
         }
-        return { result, seenRecordIds };
+        return {
+            result,
+            seenRecordIds,
+            possibleStaleRecordMap: contextValue.possibleStaleRecordMap,
+        };
     }
     finally {
         eventEmitter({ type: 'graphql-eval-end' });
@@ -13922,8 +13944,13 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
             : [];
         let gqlResult;
         let seenRecordIds;
+        let possibleStaleRecordMap;
         try {
-            ({ result: gqlResult, seenRecordIds } = await evaluate({
+            ({
+                result: gqlResult,
+                seenRecordIds,
+                possibleStaleRecordMap,
+            } = await evaluate({
                 ...config,
                 //need to create another copy of the ast for future writes
                 query: parse$3(stringify$3(injectedAST)),
@@ -13953,13 +13980,18 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
         const seenRecords = createSeenRecords(seenRecordIds, nonEvaluatedSnapshot);
         const recordId = generateUniqueRecordId();
         const rebuildWithLocalEval = async (originalSnapshot) => {
-            let { result: rebuildResult, seenRecordIds } = await evaluate({
+            let { result: rebuildResult, seenRecordIds, possibleStaleRecordMap, } = await evaluate({
                 ...config,
                 query: injectedAST,
             }, observers, { userId }, objectInfoNeeded, store, originalSnapshot, graphqlSchemaCache, draftFunctions);
             if (!rebuildResult.errors) {
                 rebuildResult = removeSyntheticFields(rebuildResult, config.query);
             }
+            let snapshotState = 'Fulfilled';
+            if (possibleStaleRecordMap.size > 0) {
+                initiateStaleRecordRefresh(luvio, possibleStaleRecordMap);
+                snapshotState = 'Stale';
+            }
             if (objectsDeepEqual(rebuildResult, originalSnapshot.data)) {
                 return originalSnapshot;
             }
@@ -13968,6 +14000,7 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
                 ...originalSnapshot,
                 data: rebuildResult,
                 recordId,
+                state: snapshotState,
                 seenRecords: createSeenRecords(seenRecordIds, nonEvaluatedSnapshot),
                 rebuildWithLocalEval,
             };
@@ -14005,6 +14038,10 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
                 },
             };
         }
+        if (possibleStaleRecordMap.size > 0) {
+            initiateStaleRecordRefresh(luvio, possibleStaleRecordMap);
+            resultSnapshot.state = 'Stale';
+        }
         return resultSnapshot;
     };
 }
@@ -14065,6 +14102,24 @@ function environmentAwareGraphQLBatchAdapterFactory(objectInfoService, luvio, is
         };
     };
 }
+function initiateStaleRecordRefresh(luvio, keyMap) {
+    const staleRecordKeys = from$1(keyMap.values())
+        .flat()
+        .map((id) => `UiApi::RecordRepresentation:${id}`);
+    luvio.storeExpirePossibleStaleRecords(staleRecordKeys, makeGetRecordsConfig(keyMap), getRecordsAdapterFactory(luvio));
+}
+function makeGetRecordsConfig(keyMap) {
+    const records = [];
+    keyMap.forEach((recordIds, apiName) => {
+        records.push({
+            recordIds,
+            fields: [`${apiName}.Id`],
+        });
+    });
+    return {
+        records,
+    };
+}
 
 const CONTENT_DOCUMENT_DRAFT_ID_KEY = 'CONTENT_DOCUMENT_DRAFT_ID';
 const CONTENT_VERSION_DRAFT_ID_KEY = 'CONTENT_VERSION_DRAFT_ID';
@@ -18374,4 +18429,4 @@ register({
 });
 
 export { O11Y_NAMESPACE_LDS_MOBILE, getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.287.0-dev14-85b5de0a8f
+// version: 1.287.0-dev16-db839640ab

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-mobile",
-    "version": "1.287.0-dev14",
+    "version": "1.287.0-dev16",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS runtime for mobile/hybrid environments.",
     "main": "dist/main.js",
@@ -32,25 +32,25 @@
         "release:corejar": "yarn build && ../core-build/scripts/core.js --name=lds-runtime-mobile"
     },
     "dependencies": {
-        "@salesforce/lds-adapters-uiapi": "^1.287.0-dev14",
-        "@salesforce/lds-bindings": "^1.287.0-dev14",
-        "@salesforce/lds-instrumentation": "^1.287.0-dev14",
-        "@salesforce/lds-priming": "^1.287.0-dev14",
+        "@salesforce/lds-adapters-uiapi": "^1.287.0-dev16",
+        "@salesforce/lds-bindings": "^1.287.0-dev16",
+        "@salesforce/lds-instrumentation": "^1.287.0-dev16",
+        "@salesforce/lds-priming": "^1.287.0-dev16",
         "@salesforce/user": "0.0.21",
         "o11y": "250.7.0"
     },
     "devDependencies": {
-        "@salesforce/lds-adapters-graphql": "^1.287.0-dev14",
-        "@salesforce/lds-drafts": "^1.287.0-dev14",
-        "@salesforce/lds-drafts-adapters-uiapi": "^1.287.0-dev14",
-        "@salesforce/lds-graphql-eval": "^1.287.0-dev14",
-        "@salesforce/lds-network-adapter": "^1.287.0-dev14",
-        "@salesforce/lds-network-nimbus": "^1.287.0-dev14",
-        "@salesforce/lds-store-binary": "^1.287.0-dev14",
-        "@salesforce/lds-store-nimbus": "^1.287.0-dev14",
-        "@salesforce/lds-store-sql": "^1.287.0-dev14",
-        "@salesforce/lds-utils-adapters": "^1.287.0-dev14",
-        "@salesforce/nimbus-plugin-lds": "^1.287.0-dev14",
+        "@salesforce/lds-adapters-graphql": "^1.287.0-dev16",
+        "@salesforce/lds-drafts": "^1.287.0-dev16",
+        "@salesforce/lds-drafts-adapters-uiapi": "^1.287.0-dev16",
+        "@salesforce/lds-graphql-eval": "^1.287.0-dev16",
+        "@salesforce/lds-network-adapter": "^1.287.0-dev16",
+        "@salesforce/lds-network-nimbus": "^1.287.0-dev16",
+        "@salesforce/lds-store-binary": "^1.287.0-dev16",
+        "@salesforce/lds-store-nimbus": "^1.287.0-dev16",
+        "@salesforce/lds-store-sql": "^1.287.0-dev16",
+        "@salesforce/lds-utils-adapters": "^1.287.0-dev16",
+        "@salesforce/nimbus-plugin-lds": "^1.287.0-dev16",
         "babel-plugin-dynamic-import-node": "^2.3.3",
         "wait-for-expect": "^3.0.2"
     },

package/sfdc/main.js

@@ -20,7 +20,7 @@ import { setupInstrumentation, instrumentAdapter as instrumentAdapter$1, instrum
 import { HttpStatusCode, setBypassDeepFreeze, StoreKeySet, serializeStructuredKey, StringKeyInMemoryStore, Reader, deepFreeze, emitAdapterEvent, createCustomAdapterEventEmitter, StoreKeyMap, isFileReference, Environment, Luvio, InMemoryStore } from 'force/luvioEngine';
 import excludeStaleRecordsGate from '@salesforce/gate/lds.graphqlEvalExcludeStaleRecords';
 import { parseAndVisit, Kind, buildSchema, isObjectType, defaultFieldResolver, visit, execute, parse as parse$7, extendSchema, isScalarType } from 'force/ldsGraphqlParser';
-import { RECORD_ID_PREFIX, RECORD_FIELDS_KEY_JUNCTION, isStoreKeyRecordViewEntity, getRecordId18, RECORD_REPRESENTATION_NAME, extractRecordIdFromStoreKey, keyBuilderQuickActionExecutionRepresentation, ingestQuickActionExecutionRepresentation, keyBuilderContentDocumentCompositeRepresentation, getResponseCacheKeysContentDocumentCompositeRepresentation, keyBuilderFromTypeContentDocumentCompositeRepresentation, ingestContentDocumentCompositeRepresentation, keyBuilderRecord, RECORD_VIEW_ENTITY_ID_PREFIX, getTypeCacheKeysRecord, keyBuilderFromTypeRecordRepresentation, ingestRecord, RecordRepresentationRepresentationType, ObjectInfoRepresentationType, getRecordAdapterFactory, getObjectInfoAdapterFactory, getObjectInfosAdapterFactory, getObjectInfoDirectoryAdapterFactory, UiApiNamespace, RecordRepresentationType, RecordRepresentationTTL, RecordRepresentationVersion, getRecordsAdapterFactory } from 'force/ldsAdaptersUiapi';
+import { RECORD_ID_PREFIX, RECORD_FIELDS_KEY_JUNCTION, isStoreKeyRecordViewEntity, getRecordId18, RECORD_REPRESENTATION_NAME, extractRecordIdFromStoreKey, keyBuilderQuickActionExecutionRepresentation, ingestQuickActionExecutionRepresentation, keyBuilderContentDocumentCompositeRepresentation, getResponseCacheKeysContentDocumentCompositeRepresentation, keyBuilderFromTypeContentDocumentCompositeRepresentation, ingestContentDocumentCompositeRepresentation, keyBuilderRecord, RECORD_VIEW_ENTITY_ID_PREFIX, getTypeCacheKeysRecord, keyBuilderFromTypeRecordRepresentation, ingestRecord, getRecordsAdapterFactory, RecordRepresentationRepresentationType, ObjectInfoRepresentationType, getRecordAdapterFactory, getObjectInfoAdapterFactory, getObjectInfosAdapterFactory, getObjectInfoDirectoryAdapterFactory, UiApiNamespace, RecordRepresentationType, RecordRepresentationTTL, RecordRepresentationVersion } from 'force/ldsAdaptersUiapi';
 import ldsIdempotencyWriteDisabled from '@salesforce/gate/lds.idempotencyWriteDisabled';
 import ldsBackdatingEnabled from '@salesforce/gate/lds.backdatingEnabled';
 import FIRST_DAY_OF_WEEK from '@salesforce/i18n/firstDayOfWeek';
@@ -1566,6 +1566,32 @@ function makeDurable(environment, { durableStore, instrumentation, useRevivingSt
         }, revivingStore).finally(() => {
         });
     };
+    const expirePossibleStaleRecords = async function (keys$1, config, refresh) {
+        validateNotDisposed();
+        const metadataKeys = keys$1.map(serializeStructuredKey);
+        const now = Date.now();
+        const entries = await durableStore.getMetadata(metadataKeys, DefaultDurableSegment);
+        if (entries === undefined || keys$7(entries).length === 0) {
+            return environment.expirePossibleStaleRecords(keys$1);
+        }
+        let metaDataChanged = false;
+        const metadataEntries = metadataKeys.reduce((accu, key) => {
+            const metadataEntry = entries[key];
+            if (metadataEntry.metadata !== undefined) {
+                const metadata = { ...metadataEntry.metadata, expirationTimestamp: now };
+                accu[key] = { metadata };
+                metaDataChanged = true;
+            }
+            return accu;
+        }, {});
+        if (metaDataChanged) {
+            await durableStore.setMetadata(metadataEntries, DefaultDurableSegment);
+        }
+        if (config !== undefined && refresh !== undefined) {
+            return environment.refreshPossibleStaleRecords(config, refresh);
+        }
+        return Promise.resolve();
+    };
     // set the default cache policy of the base environment
     environment.setDefaultCachePolicy({
         type: 'stale-while-revalidate',
@@ -1598,6 +1624,7 @@ function makeDurable(environment, { durableStore, instrumentation, useRevivingSt
         handleErrorResponse: { value: handleErrorResponse },
         getNotifyChangeStoreEntries: { value: getNotifyChangeStoreEntries },
         notifyStoreUpdateAvailable: { value: notifyStoreUpdateAvailable },
+        expirePossibleStaleRecords: { value: expirePossibleStaleRecords },
     });
 }
 
@@ -7230,6 +7257,7 @@ function createContext(store, objectInfos, eventEmitter, settings, snapshot, dra
         Record,
         snapshot,
         seenRecordIds: new Set(),
+        possibleStaleRecordMap: new Map(),
         draftFunctions,
     };
 }
@@ -7841,7 +7869,6 @@ function isTodayStartOfWeek() {
 
 const JSON_EXTRACT_PATH_INGESTION_TIMESTAMP = '$.ingestionTimestamp';
 const JSON_EXTRACT_PATH_INGESTION_APINAME = '$.apiName';
-const JSON_EXTRACT_PATH_DRAFTS = '$.drafts';
 
 const MultiPickListValueSeparator = ';';
 function filterToPredicates(where, recordType, alias, objectInfoMap, joins, draftFunctions) {
@@ -8371,18 +8398,11 @@ function buildQuery(config) {
     const joins = buildJoins(config);
     const predicates = buildPredicates(config);
     const orderBy = buildOrderBy(config);
-    const staleRecordsSql = excludeStaleRecordsGate.isOpen({ fallback: false })
-        ? `AND (
-            json_extract("${config.alias}".metadata, '${JSON_EXTRACT_PATH_INGESTION_TIMESTAMP}') >= ?
-            OR json_extract("${config.alias}".data, '${JSON_EXTRACT_PATH_DRAFTS}') IS NOT NULL
-          )`
-        : '';
     const sql = `
-        SELECT "${config.alias}".data
+        SELECT "${config.alias}".data, "${config.alias}".metadata
         FROM lds_data "${config.alias}" ${joins.sql}
         WHERE "${config.alias}".key like 'UiApi::RecordRepresentation:%'
           AND json_extract("${config.alias}".data, '${JSON_EXTRACT_PATH_INGESTION_APINAME}') = '${config.alias}'
-          ${staleRecordsSql}
           ${predicates.sql}
           ${orderBy.sql}
         LIMIT ?
@@ -8393,7 +8413,6 @@ function buildQuery(config) {
     const bindings = [
         // bindings from predicates on joins
         ...joins.bindings,
-        ...(excludeStaleRecordsGate.isOpen({ fallback: false }) ? [config.ingestionTimestamp] : []),
         // where clause and parent scope bindings
         ...predicates.bindings,
         // limit binding
@@ -8419,33 +8438,19 @@ function buildJoins(config) {
     if (allJoins.length === 0)
         return { sql, bindings };
     sql = allJoins.reduce((joinAccumulator, join) => {
-        let timestampAdded = false;
         const joinConditions = join.conditions.reduce((conditionAccumulator, condition) => {
             let joined_sql;
-            const joinMetadataTimestamp = excludeStaleRecordsGate.isOpen({ fallback: false })
-                ? ` AND (json_extract("${join.alias}".metadata, '${JSON_EXTRACT_PATH_INGESTION_TIMESTAMP}') >= ? OR json_extract("${join.alias}".data, '${JSON_EXTRACT_PATH_DRAFTS}') IS NOT NULL)`
-                : '';
             // predicate on a value, use the newly joined table
             if ('type' in condition) {
                 const { sql, binding } = predicateToSQL(condition, join.alias);
-                joined_sql = ` AND ${sql}${timestampAdded ? '' : joinMetadataTimestamp}`;
+                joined_sql = ` AND ${sql}`;
                 bindings.push(...binding);
-                if (excludeStaleRecordsGate.isOpen({ fallback: false }) &&
-                    timestampAdded === false) {
-                    bindings.push(config.ingestionTimestamp);
-                    timestampAdded = true;
-                }
             }
             else {
                 // predicate on a path
                 const left = ` AND json_extract("${join.to}".data, '${condition.leftPath}')`;
                 const right = `json_extract("${join.alias}".data, '${condition.rightPath}')`;
-                joined_sql = `${left} = ${right}${timestampAdded ? '' : joinMetadataTimestamp}`;
-                if (excludeStaleRecordsGate.isOpen({ fallback: false }) &&
-                    timestampAdded === false) {
-                    bindings.push(config.ingestionTimestamp);
-                    timestampAdded = true;
-                }
+                joined_sql = `${left} = ${right}`;
             }
             conditionAccumulator += joined_sql;
             return conditionAccumulator;
@@ -9390,8 +9395,7 @@ function addResolversToSchema(schema, polyFields) {
             for (const field of fields) {
                 if (field.name === 'node') {
                     field.resolve = function nodeResolver(obj, _args, { seenRecordIds }) {
-                        const { record, ingestionTimestamp } = obj;
-                        const recordRepresentation = parse$4(record);
+                        const { recordRepresentation, ingestionTimestamp } = obj;
                         seenRecordIds.add(recordRepresentation.id);
                         return { recordRepresentation, ingestionTimestamp };
                     };
@@ -9605,16 +9609,30 @@ async function connectionEdgeResolver(obj, _args, context) {
         predicates,
         orderBy: orderByToPredicate(parentArgs.orderBy, alias, alias, context.objectInfos),
         limit: parentArgs.first,
-        ingestionTimestamp,
     };
     const { sql, bindings } = buildQuery(queryConfig);
     const results = await query(sql, bindings);
     //map each sql result with the ingestion timestamp to pass it down a level
-    return results.rows
-        .map((row) => row[0])
-        .map((record) => {
+    return results.rows.map((row) => {
+        const recordMetadataResult = {
+            recordRepresentation: parse$4(row[0]),
+            metadata: parse$4(row[1]),
+        };
+        const { recordRepresentation, metadata } = recordMetadataResult;
+        context.seenRecordIds.add(recordRepresentation.id);
+        if (metadata.ingestionTimestamp < ingestionTimestamp &&
+            recordRepresentation.drafts === undefined) {
+            if (context.possibleStaleRecordMap.has(recordRepresentation.apiName) === false) {
+                context.possibleStaleRecordMap.set(recordRepresentation.apiName, []);
+            }
+            const ids = context.possibleStaleRecordMap.get(recordRepresentation.apiName);
+            if (ids !== undefined) {
+                ids.push(recordRepresentation.id);
+                context.possibleStaleRecordMap.set(recordRepresentation.apiName, ids);
+            }
+        }
         return {
-            record,
+            recordRepresentation,
             ingestionTimestamp,
         };
     });
@@ -10179,7 +10197,11 @@ async function evaluate(config, observers, settings, objectInfos, store, snapsho
                 seenRecordIds.push(queryString);
             });
         }
-        return { result, seenRecordIds };
+        return {
+            result,
+            seenRecordIds,
+            possibleStaleRecordMap: contextValue.possibleStaleRecordMap,
+        };
     }
     finally {
         eventEmitter({ type: 'graphql-eval-end' });
@@ -13922,8 +13944,13 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
             : [];
         let gqlResult;
         let seenRecordIds;
+        let possibleStaleRecordMap;
         try {
-            ({ result: gqlResult, seenRecordIds } = await evaluate({
+            ({
+                result: gqlResult,
+                seenRecordIds,
+                possibleStaleRecordMap,
+            } = await evaluate({
                 ...config,
                 //need to create another copy of the ast for future writes
                 query: parse$3(stringify$3(injectedAST)),
@@ -13953,13 +13980,18 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
         const seenRecords = createSeenRecords(seenRecordIds, nonEvaluatedSnapshot);
         const recordId = generateUniqueRecordId();
         const rebuildWithLocalEval = async (originalSnapshot) => {
-            let { result: rebuildResult, seenRecordIds } = await evaluate({
+            let { result: rebuildResult, seenRecordIds, possibleStaleRecordMap, } = await evaluate({
                 ...config,
                 query: injectedAST,
             }, observers, { userId }, objectInfoNeeded, store, originalSnapshot, graphqlSchemaCache, draftFunctions);
             if (!rebuildResult.errors) {
                 rebuildResult = removeSyntheticFields(rebuildResult, config.query);
             }
+            let snapshotState = 'Fulfilled';
+            if (possibleStaleRecordMap.size > 0) {
+                initiateStaleRecordRefresh(luvio, possibleStaleRecordMap);
+                snapshotState = 'Stale';
+            }
             if (objectsDeepEqual(rebuildResult, originalSnapshot.data)) {
                 return originalSnapshot;
             }
@@ -13968,6 +14000,7 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
                 ...originalSnapshot,
                 data: rebuildResult,
                 recordId,
+                state: snapshotState,
                 seenRecords: createSeenRecords(seenRecordIds, nonEvaluatedSnapshot),
                 rebuildWithLocalEval,
             };
@@ -14005,6 +14038,10 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
                 },
             };
         }
+        if (possibleStaleRecordMap.size > 0) {
+            initiateStaleRecordRefresh(luvio, possibleStaleRecordMap);
+            resultSnapshot.state = 'Stale';
+        }
         return resultSnapshot;
     };
 }
@@ -14065,6 +14102,24 @@ function environmentAwareGraphQLBatchAdapterFactory(objectInfoService, luvio, is
         };
     };
 }
+function initiateStaleRecordRefresh(luvio, keyMap) {
+    const staleRecordKeys = from$1(keyMap.values())
+        .flat()
+        .map((id) => `UiApi::RecordRepresentation:${id}`);
+    luvio.storeExpirePossibleStaleRecords(staleRecordKeys, makeGetRecordsConfig(keyMap), getRecordsAdapterFactory(luvio));
+}
+function makeGetRecordsConfig(keyMap) {
+    const records = [];
+    keyMap.forEach((recordIds, apiName) => {
+        records.push({
+            recordIds,
+            fields: [`${apiName}.Id`],
+        });
+    });
+    return {
+        records,
+    };
+}
 
 const CONTENT_DOCUMENT_DRAFT_ID_KEY = 'CONTENT_DOCUMENT_DRAFT_ID';
 const CONTENT_VERSION_DRAFT_ID_KEY = 'CONTENT_VERSION_DRAFT_ID';
@@ -18374,4 +18429,4 @@ register({
 });
 
 export { O11Y_NAMESPACE_LDS_MOBILE, getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.287.0-dev14-85b5de0a8f
+// version: 1.287.0-dev16-db839640ab