@salesforce/lds-ads-bridge 1.428.0-dev1 → 1.428.0-dev10

package/dist/ads-bridge-perf.js

@@ -483,7 +483,7 @@ const callbacks$1 = [];
 function register(r) {
     callbacks$1.forEach((callback) => callback(r));
 }
-// version: 1.428.0-dev1-c95a813572
+// version: 1.428.0-dev10-1e665d263f
 
 /**
  * Returns true if the value acts like a Promise, i.e. has a "then" function,
@@ -7920,6 +7920,9 @@ function isSpanningRecord(fieldValue) {
 function isStoreKeyRecordId(key) {
     return key.indexOf(RECORD_ID_PREFIX) > -1 && key.indexOf(RECORD_FIELDS_KEY_JUNCTION) === -1;
 }
+function isStoreKeyRecordField(key) {
+    return key.indexOf(RECORD_ID_PREFIX) > -1 && key.indexOf(RECORD_FIELDS_KEY_JUNCTION) > -1;
+}
 /**
  * Returns a shallow copy of a record with its field values if it is a scalar and a reference and a
  * a RecordRepresentation with no field if the value if a spanning record.
@@ -8214,6 +8217,33 @@ class AdsBridge {
             this.isRecordEmitLocked = false;
         }
     }
+    filterAndSynthesizeBaseIds(updatedEntries) {
+        // Collect base record IDs that are directly present in the entries.
+        const directBaseIds = new Set();
+        for (let i = 0; i < updatedEntries.length; i++) {
+            if (isStoreKeyRecordId(updatedEntries[i].id)) {
+                directBaseIds.add(updatedEntries[i].id);
+            }
+        }
+        // For field entries whose base record ID has no direct entry, synthesize one.
+        const syntheticBaseIds = new Set();
+        for (let i = 0; i < updatedEntries.length; i++) {
+            if (isStoreKeyRecordField(updatedEntries[i].id)) {
+                const baseId = updatedEntries[i].id.split(RECORD_FIELDS_KEY_JUNCTION)[0];
+                if (!directBaseIds.has(baseId)) {
+                    syntheticBaseIds.add(baseId);
+                }
+            }
+        }
+        // Exclude all the store record ids not matching with the record id pattern.
+        // Note: FieldValueRepresentation have the same prefix than RecordRepresentation so we
+        // need to filter them out.
+        const filteredUpdatedEntries = updatedEntries.filter((entry) => isStoreKeyRecordId(entry.id));
+        syntheticBaseIds.forEach((baseId) => {
+            push.call(filteredUpdatedEntries, { id: baseId });
+        });
+        return filteredUpdatedEntries;
+    }
     /**
      * This method retrieves queries the store with with passed record ids to retrieve their
      * associated records and object info. Note that the passed ids are not Salesforce record id
@@ -8224,14 +8254,10 @@ class AdsBridge {
         let shouldEmit = false;
         const adsRecordMap = {};
         const adsObjectMap = {};
-        for (let i = 0; i < updatedEntries.length; i++) {
-            const storeRecordId = updatedEntries[i].id;
-            // Exclude all the store record ids not matching with the record id pattern.
-            // Note: FieldValueRepresentation have the same prefix than RecordRepresentation so we
-            // need to filter them out.
-            if (!isStoreKeyRecordId(storeRecordId)) {
-                continue;
-            }
+        // Context for change: W-21715343
+        const filteredUpdatedEntries = this.filterAndSynthesizeBaseIds(updatedEntries);
+        for (let i = 0; i < filteredUpdatedEntries.length; i++) {
+            const storeRecordId = filteredUpdatedEntries[i].id;
             const record = this.recordRepresentationIngestOverride !== undefined
                 ? getShallowRecordDenormalized(luvio, storeRecordId)
                 : getShallowRecord(luvio, storeRecordId);

package/dist/adsBridge.js

@@ -58,6 +58,9 @@ function isSpanningRecord(fieldValue) {
 function isStoreKeyRecordId(key) {
     return key.indexOf(RECORD_ID_PREFIX) > -1 && key.indexOf(RECORD_FIELDS_KEY_JUNCTION) === -1;
 }
+function isStoreKeyRecordField(key) {
+    return key.indexOf(RECORD_ID_PREFIX) > -1 && key.indexOf(RECORD_FIELDS_KEY_JUNCTION) > -1;
+}
 /**
  * Returns a shallow copy of a record with its field values if it is a scalar and a reference and a
  * a RecordRepresentation with no field if the value if a spanning record.
@@ -356,6 +359,33 @@ class AdsBridge {
             this.isRecordEmitLocked = false;
         }
     }
+    filterAndSynthesizeBaseIds(updatedEntries) {
+        // Collect base record IDs that are directly present in the entries.
+        const directBaseIds = new Set();
+        for (let i = 0; i < updatedEntries.length; i++) {
+            if (isStoreKeyRecordId(updatedEntries[i].id)) {
+                directBaseIds.add(updatedEntries[i].id);
+            }
+        }
+        // For field entries whose base record ID has no direct entry, synthesize one.
+        const syntheticBaseIds = new Set();
+        for (let i = 0; i < updatedEntries.length; i++) {
+            if (isStoreKeyRecordField(updatedEntries[i].id)) {
+                const baseId = updatedEntries[i].id.split(RECORD_FIELDS_KEY_JUNCTION)[0];
+                if (!directBaseIds.has(baseId)) {
+                    syntheticBaseIds.add(baseId);
+                }
+            }
+        }
+        // Exclude all the store record ids not matching with the record id pattern.
+        // Note: FieldValueRepresentation have the same prefix than RecordRepresentation so we
+        // need to filter them out.
+        const filteredUpdatedEntries = updatedEntries.filter((entry) => isStoreKeyRecordId(entry.id));
+        syntheticBaseIds.forEach((baseId) => {
+            push.call(filteredUpdatedEntries, { id: baseId });
+        });
+        return filteredUpdatedEntries;
+    }
     /**
      * This method retrieves queries the store with with passed record ids to retrieve their
      * associated records and object info. Note that the passed ids are not Salesforce record id
@@ -367,14 +397,10 @@ class AdsBridge {
         let shouldEmit = false;
         const adsRecordMap = {};
         const adsObjectMap = {};
-        for (let i = 0; i < updatedEntries.length; i++) {
-            const storeRecordId = updatedEntries[i].id;
-            // Exclude all the store record ids not matching with the record id pattern.
-            // Note: FieldValueRepresentation have the same prefix than RecordRepresentation so we
-            // need to filter them out.
-            if (!isStoreKeyRecordId(storeRecordId)) {
-                continue;
-            }
+        // Context for change: W-21715343
+        const filteredUpdatedEntries = this.filterAndSynthesizeBaseIds(updatedEntries);
+        for (let i = 0; i < filteredUpdatedEntries.length; i++) {
+            const storeRecordId = filteredUpdatedEntries[i].id;
             const record = this.recordRepresentationIngestOverride !== undefined
                 ? getShallowRecordDenormalized(luvio, storeRecordId)
                 : getShallowRecord(luvio, storeRecordId);
@@ -435,4 +461,4 @@ function withAdsBridge(callback) {
 }
 
 export { instrument, withAdsBridge };
-// version: 1.428.0-dev1-c95a813572
+// version: 1.428.0-dev10-1e665d263f

package/dist/types/ads-bridge.d.ts

@@ -78,6 +78,7 @@ export default class AdsBridge {
      * mutations triggered by ADS to be emit back to ADS.
      */
     private lockLdsRecordEmit;
+    private filterAndSynthesizeBaseIds;
     /**
      * This method retrieves queries the store with with passed record ids to retrieve their
      * associated records and object info. Note that the passed ids are not Salesforce record id

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-ads-bridge",
-    "version": "1.428.0-dev1",
+    "version": "1.428.0-dev10",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "Bridge to sync data between LDS and ADS",
     "main": "dist/adsBridge.js",
@@ -30,9 +30,9 @@
         "release:corejar": "yarn build && ../core-build/scripts/core.js --name=lds-ads-bridge"
     },
     "devDependencies": {
-        "@salesforce/lds-adapters-uiapi": "^1.428.0-dev1",
-        "@salesforce/lds-runtime-mobile": "^1.428.0-dev1",
-        "@salesforce/lds-uiapi-record-utils-mobile": "^1.428.0-dev1"
+        "@salesforce/lds-adapters-uiapi": "^1.428.0-dev10",
+        "@salesforce/lds-runtime-mobile": "^1.428.0-dev10",
+        "@salesforce/lds-uiapi-record-utils-mobile": "^1.428.0-dev10"
     },
     "volta": {
         "extends": "../../package.json"
@@ -41,9 +41,9 @@
         {
             "path": "./dist/adsBridge.js",
             "maxSize": {
-                "none": "17 kB",
-                "min": "5.51 kB",
-                "compressed": "4 kB"
+                "none": "18.4 kB",
+                "min": "6 kB",
+                "compressed": "4.3 kB"
             }
         }
     ]

package/src/__tests__/ads-bridge.spec.ts

@@ -1,5 +1,10 @@
 import { Luvio, InMemoryStore, Environment } from '@luvio/engine';
-import { keyBuilderRecord, ingestRecord, type Registration } from '@salesforce/lds-adapters-uiapi';
+import {
+    keyBuilderRecord,
+    ingestRecord,
+    type Registration,
+    ingestRecordSuccess,
+} from '@salesforce/lds-adapters-uiapi';
 import { expect } from '@jest/globals';
 
 import AdsBridge from '../ads-bridge';
@@ -417,6 +422,159 @@ describe('AdsBridge', () => {
             });
         });
 
+        // W-21715343
+        // Context for change: https://docs.google.com/document/d/1iF6M9jldEX_K9FOpdttLqVwO9uESUUrlyWi2mWnXtAQ/edit?usp=sharing
+        it('correctly emits the updated Case record to ADS when refreshSnapshot is called, and the Case record was updated via spanning record updates on the Task record', async () => {
+            const initialLdsState = JSON.parse(JSON.stringify(require('./initial_record.json')));
+            const addRecordsGet = JSON.parse(JSON.stringify(require('./task_record_gvp_get.json')));
+            const addRecordsSave = JSON.parse(
+                JSON.stringify(require('./task_record_gvp_save.json'))
+            );
+            const addRecordsGet2 = JSON.parse(
+                JSON.stringify(require('./task_record_gvp_get2.json'))
+            );
+
+            const { bridge, luvio } = createBridge();
+            const caseId: string = initialLdsState.id;
+
+            const selector = {
+                recordId: keyBuilderRecord(luvio, { recordId: caseId }),
+                node: { kind: 'Fragment' as const, private: [] as string[] },
+                variables: {},
+            };
+
+            // Creating a refreshable snapshot of the Case record as we don't have the wire adapter bindings available to us in jest environment to refresh the snapshot manually.
+            const snapshot = luvio.storeLookup(selector, {
+                config: { recordId: caseId },
+                resolve: async () => {
+                    const response = await luvio.dispatchResourceRequest({
+                        baseUri: '',
+                        basePath: `/ui-api/records/${caseId}`,
+                        method: 'get',
+                        body: null,
+                        queryParams: {},
+                        urlParams: {},
+                        headers: {},
+                        priority: 'normal',
+                    });
+                    const config = {
+                        optionalFields: ['Case.Id'],
+                        recordId: caseId,
+                    };
+                    const trackedFields = ['Case.Status'];
+                    ingestRecordSuccess(luvio, config, caseId, trackedFields, response as any, 0);
+                    await luvio.storeBroadcast();
+                    return luvio.storeLookup(selector);
+                },
+            });
+
+            // 1. Prime LDS with the Case fixture (via addRecord → storeIngest + storeBroadcast).
+            addRecord(luvio, initialLdsState);
+
+            const expectedStatus = queryRecord(luvio, { recordId: caseId }).data.fields.Status;
+            expect(expectedStatus).toEqual({ value: 'New', displayValue: 'New' });
+
+            luvio.dispatchResourceRequest = jest.fn();
+
+            const fn = jest.fn();
+            bridge.receiveFromLdsCallback = fn;
+
+            // 2. Ingest the Task (+ spanning Case__r) via addRecords().
+            bridge.addRecords(addRecordsGet); // A RecordGvp.getRecord call is made to get the initial Task record when switching from the Case record to the Task record in console mode.
+            bridge.addRecords(addRecordsSave); // Clicking the complete button on the Task record which does a RecordGvp.saveRecord call.
+            bridge.addRecords(addRecordsGet2); // A RecordGvp.getRecord call is made to get the updated Task record.
+
+            expect(luvio.dispatchResourceRequest).toHaveBeenCalledTimes(0);
+
+            // 3. Synthesize the closed Case record server response which is expected to be received when the refreshSnapshot is called.
+            const closedCaseResponse = JSON.parse(JSON.stringify(require('./initial_record.json')));
+            closedCaseResponse.fields.Status = { value: 'Closed', displayValue: 'Closed' };
+            closedCaseResponse.weakEtag = addRecordsGet2[0].weakEtag;
+            closedCaseResponse.systemModstamp = addRecordsGet2[0].systemModstamp;
+            closedCaseResponse.lastModifiedDate = addRecordsGet2[0].lastModifiedDate;
+
+            luvio.dispatchResourceRequest = jest
+                .fn()
+                .mockResolvedValueOnce({ body: closedCaseResponse })
+                .mockImplementation(() => new Promise(() => {}));
+
+            // 4. Refresh the snapshot to get the updated Case record. This was previously not working because the interactions on the ADS-Bridge had updated the Case record with the latest weakEtag, but NOT the updated Status field value.
+            const refreshedSnapshot = await luvio.refreshSnapshot(snapshot);
+            expect((refreshedSnapshot.data as any).fields.Status).toEqual(
+                expect.objectContaining({ value: 'Closed' })
+            );
+
+            // 5. With the ADS-Bridge changes, the Case record is now emitted when the refreshSnapshot is called.
+            expect(fn.mock.calls[0]).toMatchInlineSnapshot(`
+                Array [
+                  Object {
+                    "500xx000000boDJAAY": Object {
+                      "Case": Object {
+                        "isPrimary": true,
+                        "record": Object {
+                          "apiName": "Case",
+                          "childRelationships": Object {},
+                          "eTag": "",
+                          "fields": Object {
+                            "CaseNumber": Object {
+                              "displayValue": null,
+                              "value": "00001026",
+                            },
+                            "Id": Object {
+                              "displayValue": null,
+                              "value": "500xx000000boDJAAY",
+                            },
+                            "IsEscalated": Object {
+                              "displayValue": null,
+                              "value": false,
+                            },
+                            "MasterRecordId": Object {
+                              "displayValue": null,
+                              "value": null,
+                            },
+                            "Priority": Object {
+                              "displayValue": "Medium",
+                              "value": "Medium",
+                            },
+                            "RecordTypeId": Object {
+                              "displayValue": null,
+                              "value": "012000000000000AAA",
+                            },
+                            "Status": Object {
+                              "displayValue": "Closed",
+                              "value": "Closed",
+                            },
+                            "Subject": Object {
+                              "displayValue": null,
+                              "value": "Fixture subject",
+                            },
+                            "SystemModstamp": Object {
+                              "displayValue": null,
+                              "value": "2026-04-11T00:46:56.000Z",
+                            },
+                          },
+                          "id": "500xx000000boDJAAY",
+                          "lastModifiedById": "005xx000001X8gHAAS",
+                          "lastModifiedDate": "2026-04-13T20:54:41.000Z",
+                          "recordTypeId": "012000000000000AAA",
+                          "recordTypeInfo": null,
+                          "systemModstamp": "2026-04-13T20:54:41.000Z",
+                          "weakEtag": 1776113681000,
+                        },
+                      },
+                    },
+                  },
+                  Object {
+                    "Case": Object {
+                      "_entityLabel": "Case",
+                      "_keyPrefix": "500",
+                      "_nameField": "Name",
+                    },
+                  },
+                ]
+            `);
+        });
+
         describe('displayValue', () => {
             it('does not let null overwrite non-null displayValue', () => {
                 const { bridge, luvio } = createBridge();
@@ -1383,6 +1541,82 @@ describe('AdsBridge', () => {
         });
     });
 
+    describe('filterAndSynthesizeBaseIds', () => {
+        const BASE_KEY = 'UiApi::RecordRepresentation:001xx000000001AAA';
+        const FIELD_KEY = 'UiApi::RecordRepresentation:001xx000000001AAA__fields__Name';
+        const BASE_KEY_2 = 'UiApi::RecordRepresentation:001xx000000002AAA';
+        const FIELD_KEY_2A = 'UiApi::RecordRepresentation:001xx000000002AAA__fields__Name';
+        const FIELD_KEY_2B = 'UiApi::RecordRepresentation:001xx000000002AAA__fields__Id';
+        const NON_RECORD_KEY = 'SomeOther::Thing:abc123';
+
+        function callFilter(bridge: AdsBridge, entries: { id: string }[]): { id: string }[] {
+            return (bridge as any).filterAndSynthesizeBaseIds(entries);
+        }
+
+        it('returns an empty array when given an empty array', () => {
+            const { bridge } = createBridge();
+            expect(callFilter(bridge, [])).toEqual([]);
+        });
+
+        it('filters out non-record entries', () => {
+            const { bridge } = createBridge();
+            const result = callFilter(bridge, [{ id: NON_RECORD_KEY }]);
+            expect(result).toEqual([]);
+        });
+
+        it('returns base record entries unchanged', () => {
+            const { bridge } = createBridge();
+            const result = callFilter(bridge, [{ id: BASE_KEY }]);
+            expect(result).toEqual([{ id: BASE_KEY }]);
+        });
+
+        it('synthesizes a base record entry for a field entry with no direct base entry', () => {
+            const { bridge } = createBridge();
+            const result = callFilter(bridge, [{ id: FIELD_KEY }]);
+            expect(result).toEqual([{ id: BASE_KEY }]);
+        });
+
+        it('does not synthesize a duplicate base entry when a direct base entry is already present', () => {
+            const { bridge } = createBridge();
+            const result = callFilter(bridge, [{ id: BASE_KEY }, { id: FIELD_KEY }]);
+            expect(result).toHaveLength(1);
+            expect(result).toEqual([{ id: BASE_KEY }]);
+        });
+
+        it('synthesizes exactly one base entry for multiple field entries sharing the same base', () => {
+            const { bridge } = createBridge();
+            const result = callFilter(bridge, [{ id: FIELD_KEY_2A }, { id: FIELD_KEY_2B }]);
+            expect(result).toHaveLength(1);
+            expect(result).toEqual([{ id: BASE_KEY_2 }]);
+        });
+
+        it('returns base entries and synthesizes entries for fields whose base is not directly present', () => {
+            const { bridge } = createBridge();
+            const entries = [
+                { id: BASE_KEY },
+                { id: FIELD_KEY },
+                { id: FIELD_KEY_2A },
+                { id: FIELD_KEY_2B },
+            ];
+            const result = callFilter(bridge, entries);
+            expect(result).toHaveLength(2);
+            expect(result).toContainEqual({ id: BASE_KEY });
+            expect(result).toContainEqual({ id: BASE_KEY_2 });
+        });
+
+        it('filters out non-record entries while still processing valid entries', () => {
+            const { bridge } = createBridge();
+            const result = callFilter(bridge, [
+                { id: NON_RECORD_KEY },
+                { id: BASE_KEY },
+                { id: FIELD_KEY_2A },
+            ]);
+            expect(result).toHaveLength(2);
+            expect(result).toContainEqual({ id: BASE_KEY });
+            expect(result).toContainEqual({ id: BASE_KEY_2 });
+        });
+    });
+
     describe('isDMOEntity', () => {
         it('should return true for DMO record', () => {
             const record = createRecord({

package/src/__tests__/initial_record.json

@@ -0,0 +1,50 @@
+{
+    "apiName": "Case",
+    "childRelationships": {},
+    "eTag": "",
+    "fields": {
+        "Id": {
+            "displayValue": null,
+            "value": "500xx000000boDJAAY"
+        },
+        "RecordTypeId": {
+            "displayValue": null,
+            "value": "012000000000000AAA"
+        },
+        "IsEscalated": {
+            "displayValue": null,
+            "value": false
+        },
+        "MasterRecordId": {
+            "displayValue": null,
+            "value": null
+        },
+        "SystemModstamp": {
+            "displayValue": null,
+            "value": "2026-04-11T00:46:56.000Z"
+        },
+        "CaseNumber": {
+            "displayValue": null,
+            "value": "00001026"
+        },
+        "Priority": {
+            "displayValue": "Medium",
+            "value": "Medium"
+        },
+        "Status": {
+            "displayValue": "New",
+            "value": "New"
+        },
+        "Subject": {
+            "displayValue": null,
+            "value": "Fixture subject"
+        }
+    },
+    "id": "500xx000000boDJAAY",
+    "lastModifiedById": "005xx000001X8gHAAS",
+    "lastModifiedDate": "2026-04-13T20:50:18.000Z",
+    "recordTypeId": "012000000000000AAA",
+    "recordTypeInfo": null,
+    "systemModstamp": "2026-04-13T20:50:18.000Z",
+    "weakEtag": 1776113418000
+}

package/src/__tests__/task_record_gvp_get.json

@@ -0,0 +1,233 @@
+[
+    {
+        "apiName": "Task",
+        "childRelationships": {},
+        "eTag": "2d24f5c26414c4f90731ba59a83c8d71",
+        "fields": {
+            "ActivityDate": {
+                "displayValue": null,
+                "value": null
+            },
+            "Case__c": {
+                "displayValue": null,
+                "value": "500xx000000boDJAAY"
+            },
+            "Case__r": {
+                "displayValue": "00001027",
+                "value": {
+                    "apiName": "Case",
+                    "childRelationships": {},
+                    "eTag": "f9130f3feb968a9bb7e0c222a78ef1dc",
+                    "fields": {
+                        "CaseNumber": {
+                            "displayValue": null,
+                            "value": "00001027"
+                        },
+                        "Id": {
+                            "displayValue": null,
+                            "value": "500xx000000boDJAAY"
+                        }
+                    },
+                    "id": "500xx000000boDJAAY",
+                    "lastModifiedById": "005xx000001X8gHAAS",
+                    "lastModifiedDate": "2026-04-13T20:50:18.000Z",
+                    "recordTypeId": "012000000000000AAA",
+                    "recordTypeInfo": null,
+                    "systemModstamp": "2026-04-13T20:50:18.000Z",
+                    "weakEtag": 1776113418000
+                }
+            },
+            "CreatedBy": {
+                "displayValue": "Ethan Chan",
+                "value": {
+                    "apiName": "User",
+                    "childRelationships": {},
+                    "eTag": "2ca65e8b3117284d9253195c82c5f03d",
+                    "fields": {
+                        "FirstName": {
+                            "displayValue": null,
+                            "value": "Ethan"
+                        },
+                        "Id": {
+                            "displayValue": null,
+                            "value": "005xx000001X8gHAAS"
+                        },
+                        "LastName": {
+                            "displayValue": null,
+                            "value": "Chan"
+                        },
+                        "Name": {
+                            "displayValue": null,
+                            "value": "Ethan Chan"
+                        }
+                    },
+                    "id": "005xx000001X8gHAAS",
+                    "lastModifiedById": "005xx000001X8gHAAS",
+                    "lastModifiedDate": "2026-04-13T19:07:57.000Z",
+                    "recordTypeId": null,
+                    "recordTypeInfo": null,
+                    "systemModstamp": "2026-04-13T19:07:57.000Z",
+                    "weakEtag": 1776107277000
+                }
+            },
+            "CreatedById": {
+                "displayValue": null,
+                "value": "005xx000001X8gHAAS"
+            },
+            "CreatedDate": {
+                "displayValue": "4/13/2026, 12:09 PM",
+                "value": "2026-04-13T19:09:48.000Z"
+            },
+            "Description": {
+                "displayValue": null,
+                "value": null
+            },
+            "Id": {
+                "displayValue": null,
+                "value": "00Txx000003rIcmEAE"
+            },
+            "IsClosed": {
+                "displayValue": null,
+                "value": false
+            },
+            "LastModifiedBy": {
+                "displayValue": "Ethan Chan",
+                "value": {
+                    "apiName": "User",
+                    "childRelationships": {},
+                    "eTag": "2ca65e8b3117284d9253195c82c5f03d",
+                    "fields": {
+                        "FirstName": {
+                            "displayValue": null,
+                            "value": "Ethan"
+                        },
+                        "Id": {
+                            "displayValue": null,
+                            "value": "005xx000001X8gHAAS"
+                        },
+                        "LastName": {
+                            "displayValue": null,
+                            "value": "Chan"
+                        },
+                        "Name": {
+                            "displayValue": null,
+                            "value": "Ethan Chan"
+                        }
+                    },
+                    "id": "005xx000001X8gHAAS",
+                    "lastModifiedById": "005xx000001X8gHAAS",
+                    "lastModifiedDate": "2026-04-13T19:07:57.000Z",
+                    "recordTypeId": null,
+                    "recordTypeInfo": null,
+                    "systemModstamp": "2026-04-13T19:07:57.000Z",
+                    "weakEtag": 1776107277000
+                }
+            },
+            "LastModifiedById": {
+                "displayValue": null,
+                "value": "005xx000001X8gHAAS"
+            },
+            "LastModifiedDate": {
+                "displayValue": "4/13/2026, 1:50 PM",
+                "value": "2026-04-13T20:50:05.000Z"
+            },
+            "Owner": {
+                "displayValue": "Ethan Chan",
+                "value": {
+                    "apiName": "Name",
+                    "childRelationships": {},
+                    "eTag": "202a115a07830e8af0343368d4d309d4",
+                    "fields": {
+                        "FirstName": {
+                            "displayValue": null,
+                            "value": "Ethan"
+                        },
+                        "Id": {
+                            "displayValue": null,
+                            "value": "005xx000001X8gHAAS"
+                        },
+                        "LastName": {
+                            "displayValue": null,
+                            "value": "Chan"
+                        },
+                        "Name": {
+                            "displayValue": null,
+                            "value": "Ethan Chan"
+                        }
+                    },
+                    "id": "005xx000001X8gHAAS",
+                    "lastModifiedById": null,
+                    "lastModifiedDate": null,
+                    "recordTypeId": null,
+                    "recordTypeInfo": null,
+                    "systemModstamp": null,
+                    "weakEtag": 0
+                }
+            },
+            "OwnerId": {
+                "displayValue": null,
+                "value": "005xx000001X8gHAAS"
+            },
+            "Priority": {
+                "displayValue": "High",
+                "value": "High"
+            },
+            "Status": {
+                "displayValue": "Not Started",
+                "value": "Not Started"
+            },
+            "Subject": {
+                "displayValue": null,
+                "value": "Call"
+            },
+            "SystemModstamp": {
+                "displayValue": "4/13/2026, 1:50 PM",
+                "value": "2026-04-13T20:50:05.000Z"
+            },
+            "What": {
+                "displayValue": "00001027",
+                "value": {
+                    "apiName": "Name",
+                    "childRelationships": {},
+                    "eTag": "deffd76450e8f3c8fc116a1cb6a0bb6b",
+                    "fields": {
+                        "Id": {
+                            "displayValue": null,
+                            "value": "500xx000000boDJAAY"
+                        },
+                        "Name": {
+                            "displayValue": null,
+                            "value": "00001027"
+                        }
+                    },
+                    "id": "500xx000000boDJAAY",
+                    "lastModifiedById": null,
+                    "lastModifiedDate": null,
+                    "recordTypeId": null,
+                    "recordTypeInfo": null,
+                    "systemModstamp": null,
+                    "weakEtag": 0
+                }
+            },
+            "WhatId": {
+                "displayValue": null,
+                "value": "500xx000000boDJAAY"
+            },
+            "Who": {
+                "displayValue": null,
+                "value": null
+            },
+            "WhoId": {
+                "displayValue": null,
+                "value": null
+            }
+        },
+        "id": "00Txx000003rIcmEAE",
+        "lastModifiedById": "005xx000001X8gHAAS",
+        "lastModifiedDate": "2026-04-13T20:50:05.000Z",
+        "recordTypeId": "012000000000000AAA",
+        "recordTypeInfo": null,
+        "systemModstamp": "2026-04-13T20:50:05.000Z",
+        "weakEtag": 1776113405000
+    }
+]

package/src/__tests__/task_record_gvp_get2.json

@@ -0,0 +1,233 @@
+[
+    {
+        "apiName": "Task",
+        "childRelationships": {},
+        "eTag": "49e9f990d8b63da61c32917c3a0ef32b",
+        "fields": {
+            "ActivityDate": {
+                "displayValue": null,
+                "value": null
+            },
+            "Case__c": {
+                "displayValue": null,
+                "value": "500xx000000boDJAAY"
+            },
+            "Case__r": {
+                "displayValue": "00001027",
+                "value": {
+                    "apiName": "Case",
+                    "childRelationships": {},
+                    "eTag": "d1912a07365b1f4f276cc2b60f857107",
+                    "fields": {
+                        "CaseNumber": {
+                            "displayValue": null,
+                            "value": "00001027"
+                        },
+                        "Id": {
+                            "displayValue": null,
+                            "value": "500xx000000boDJAAY"
+                        }
+                    },
+                    "id": "500xx000000boDJAAY",
+                    "lastModifiedById": "005xx000001X8gHAAS",
+                    "lastModifiedDate": "2026-04-13T20:54:41.000Z",
+                    "recordTypeId": "012000000000000AAA",
+                    "recordTypeInfo": null,
+                    "systemModstamp": "2026-04-13T20:54:41.000Z",
+                    "weakEtag": 1776113681000
+                }
+            },
+            "CreatedBy": {
+                "displayValue": "Ethan Chan",
+                "value": {
+                    "apiName": "User",
+                    "childRelationships": {},
+                    "eTag": "2ca65e8b3117284d9253195c82c5f03d",
+                    "fields": {
+                        "FirstName": {
+                            "displayValue": null,
+                            "value": "Ethan"
+                        },
+                        "Id": {
+                            "displayValue": null,
+                            "value": "005xx000001X8gHAAS"
+                        },
+                        "LastName": {
+                            "displayValue": null,
+                            "value": "Chan"
+                        },
+                        "Name": {
+                            "displayValue": null,
+                            "value": "Ethan Chan"
+                        }
+                    },
+                    "id": "005xx000001X8gHAAS",
+                    "lastModifiedById": "005xx000001X8gHAAS",
+                    "lastModifiedDate": "2026-04-13T19:07:57.000Z",
+                    "recordTypeId": null,
+                    "recordTypeInfo": null,
+                    "systemModstamp": "2026-04-13T19:07:57.000Z",
+                    "weakEtag": 1776107277000
+                }
+            },
+            "CreatedById": {
+                "displayValue": null,
+                "value": "005xx000001X8gHAAS"
+            },
+            "CreatedDate": {
+                "displayValue": "4/13/2026, 12:09 PM",
+                "value": "2026-04-13T19:09:48.000Z"
+            },
+            "Description": {
+                "displayValue": null,
+                "value": null
+            },
+            "Id": {
+                "displayValue": null,
+                "value": "00Txx000003rIcmEAE"
+            },
+            "IsClosed": {
+                "displayValue": null,
+                "value": true
+            },
+            "LastModifiedBy": {
+                "displayValue": "Ethan Chan",
+                "value": {
+                    "apiName": "User",
+                    "childRelationships": {},
+                    "eTag": "2ca65e8b3117284d9253195c82c5f03d",
+                    "fields": {
+                        "FirstName": {
+                            "displayValue": null,
+                            "value": "Ethan"
+                        },
+                        "Id": {
+                            "displayValue": null,
+                            "value": "005xx000001X8gHAAS"
+                        },
+                        "LastName": {
+                            "displayValue": null,
+                            "value": "Chan"
+                        },
+                        "Name": {
+                            "displayValue": null,
+                            "value": "Ethan Chan"
+                        }
+                    },
+                    "id": "005xx000001X8gHAAS",
+                    "lastModifiedById": "005xx000001X8gHAAS",
+                    "lastModifiedDate": "2026-04-13T19:07:57.000Z",
+                    "recordTypeId": null,
+                    "recordTypeInfo": null,
+                    "systemModstamp": "2026-04-13T19:07:57.000Z",
+                    "weakEtag": 1776107277000
+                }
+            },
+            "LastModifiedById": {
+                "displayValue": null,
+                "value": "005xx000001X8gHAAS"
+            },
+            "LastModifiedDate": {
+                "displayValue": "4/13/2026, 1:54 PM",
+                "value": "2026-04-13T20:54:41.000Z"
+            },
+            "Owner": {
+                "displayValue": "Ethan Chan",
+                "value": {
+                    "apiName": "Name",
+                    "childRelationships": {},
+                    "eTag": "202a115a07830e8af0343368d4d309d4",
+                    "fields": {
+                        "FirstName": {
+                            "displayValue": null,
+                            "value": "Ethan"
+                        },
+                        "Id": {
+                            "displayValue": null,
+                            "value": "005xx000001X8gHAAS"
+                        },
+                        "LastName": {
+                            "displayValue": null,
+                            "value": "Chan"
+                        },
+                        "Name": {
+                            "displayValue": null,
+                            "value": "Ethan Chan"
+                        }
+                    },
+                    "id": "005xx000001X8gHAAS",
+                    "lastModifiedById": null,
+                    "lastModifiedDate": null,
+                    "recordTypeId": null,
+                    "recordTypeInfo": null,
+                    "systemModstamp": null,
+                    "weakEtag": 0
+                }
+            },
+            "OwnerId": {
+                "displayValue": null,
+                "value": "005xx000001X8gHAAS"
+            },
+            "Priority": {
+                "displayValue": "High",
+                "value": "High"
+            },
+            "Status": {
+                "displayValue": "Completed",
+                "value": "Completed"
+            },
+            "Subject": {
+                "displayValue": null,
+                "value": "Call"
+            },
+            "SystemModstamp": {
+                "displayValue": "4/13/2026, 1:54 PM",
+                "value": "2026-04-13T20:54:41.000Z"
+            },
+            "What": {
+                "displayValue": "00001027",
+                "value": {
+                    "apiName": "Name",
+                    "childRelationships": {},
+                    "eTag": "deffd76450e8f3c8fc116a1cb6a0bb6b",
+                    "fields": {
+                        "Id": {
+                            "displayValue": null,
+                            "value": "500xx000000boDJAAY"
+                        },
+                        "Name": {
+                            "displayValue": null,
+                            "value": "00001027"
+                        }
+                    },
+                    "id": "500xx000000boDJAAY",
+                    "lastModifiedById": null,
+                    "lastModifiedDate": null,
+                    "recordTypeId": null,
+                    "recordTypeInfo": null,
+                    "systemModstamp": null,
+                    "weakEtag": 0
+                }
+            },
+            "WhatId": {
+                "displayValue": null,
+                "value": "500xx000000boDJAAY"
+            },
+            "Who": {
+                "displayValue": null,
+                "value": null
+            },
+            "WhoId": {
+                "displayValue": null,
+                "value": null
+            }
+        },
+        "id": "00Txx000003rIcmEAE",
+        "lastModifiedById": "005xx000001X8gHAAS",
+        "lastModifiedDate": "2026-04-13T20:54:41.000Z",
+        "recordTypeId": "012000000000000AAA",
+        "recordTypeInfo": null,
+        "systemModstamp": "2026-04-13T20:54:41.000Z",
+        "weakEtag": 1776113681000
+    }
+]

package/src/__tests__/task_record_gvp_save.json

@@ -0,0 +1,233 @@
+[
+    {
+        "apiName": "Task",
+        "childRelationships": {},
+        "eTag": "e339e322e2906b92f0faa82d0b0987e2",
+        "fields": {
+            "ActivityDate": {
+                "displayValue": null,
+                "value": null
+            },
+            "Case__c": {
+                "displayValue": null,
+                "value": "500xx000000boDJAAY"
+            },
+            "Case__r": {
+                "displayValue": "00001027",
+                "value": {
+                    "apiName": "Case",
+                    "childRelationships": {},
+                    "eTag": "1e500759421709c0bff030ea20a7485d",
+                    "fields": {
+                        "CaseNumber": {
+                            "displayValue": null,
+                            "value": "00001027"
+                        },
+                        "Id": {
+                            "displayValue": null,
+                            "value": "500xx000000boDJAAY"
+                        }
+                    },
+                    "id": "500xx000000boDJAAY",
+                    "lastModifiedById": null,
+                    "lastModifiedDate": null,
+                    "recordTypeId": "012000000000000AAA",
+                    "recordTypeInfo": null,
+                    "systemModstamp": null,
+                    "weakEtag": 0
+                }
+            },
+            "CreatedBy": {
+                "displayValue": "Ethan Chan",
+                "value": {
+                    "apiName": "User",
+                    "childRelationships": {},
+                    "eTag": "6209fb69d2a4b5c09799b1bd5f93bcca",
+                    "fields": {
+                        "FirstName": {
+                            "displayValue": null,
+                            "value": "Ethan"
+                        },
+                        "Id": {
+                            "displayValue": null,
+                            "value": "005xx000001X8gHAAS"
+                        },
+                        "LastName": {
+                            "displayValue": null,
+                            "value": "Chan"
+                        },
+                        "Name": {
+                            "displayValue": null,
+                            "value": "Ethan Chan"
+                        }
+                    },
+                    "id": "005xx000001X8gHAAS",
+                    "lastModifiedById": null,
+                    "lastModifiedDate": null,
+                    "recordTypeId": null,
+                    "recordTypeInfo": null,
+                    "systemModstamp": null,
+                    "weakEtag": 0
+                }
+            },
+            "CreatedById": {
+                "displayValue": null,
+                "value": "005xx000001X8gHAAS"
+            },
+            "CreatedDate": {
+                "displayValue": "4/13/2026, 12:09 PM",
+                "value": "2026-04-13T19:09:48.000Z"
+            },
+            "Description": {
+                "displayValue": null,
+                "value": null
+            },
+            "Id": {
+                "displayValue": null,
+                "value": "00Txx000003rIcmEAE"
+            },
+            "IsClosed": {
+                "displayValue": null,
+                "value": true
+            },
+            "LastModifiedBy": {
+                "displayValue": "Ethan Chan",
+                "value": {
+                    "apiName": "User",
+                    "childRelationships": {},
+                    "eTag": "6209fb69d2a4b5c09799b1bd5f93bcca",
+                    "fields": {
+                        "FirstName": {
+                            "displayValue": null,
+                            "value": "Ethan"
+                        },
+                        "Id": {
+                            "displayValue": null,
+                            "value": "005xx000001X8gHAAS"
+                        },
+                        "LastName": {
+                            "displayValue": null,
+                            "value": "Chan"
+                        },
+                        "Name": {
+                            "displayValue": null,
+                            "value": "Ethan Chan"
+                        }
+                    },
+                    "id": "005xx000001X8gHAAS",
+                    "lastModifiedById": null,
+                    "lastModifiedDate": null,
+                    "recordTypeId": null,
+                    "recordTypeInfo": null,
+                    "systemModstamp": null,
+                    "weakEtag": 0
+                }
+            },
+            "LastModifiedById": {
+                "displayValue": null,
+                "value": "005xx000001X8gHAAS"
+            },
+            "LastModifiedDate": {
+                "displayValue": "4/13/2026, 1:54 PM",
+                "value": "2026-04-13T20:54:41.000Z"
+            },
+            "Owner": {
+                "displayValue": "Ethan Chan",
+                "value": {
+                    "apiName": "Name",
+                    "childRelationships": {},
+                    "eTag": "202a115a07830e8af0343368d4d309d4",
+                    "fields": {
+                        "FirstName": {
+                            "displayValue": null,
+                            "value": "Ethan"
+                        },
+                        "Id": {
+                            "displayValue": null,
+                            "value": "005xx000001X8gHAAS"
+                        },
+                        "LastName": {
+                            "displayValue": null,
+                            "value": "Chan"
+                        },
+                        "Name": {
+                            "displayValue": null,
+                            "value": "Ethan Chan"
+                        }
+                    },
+                    "id": "005xx000001X8gHAAS",
+                    "lastModifiedById": null,
+                    "lastModifiedDate": null,
+                    "recordTypeId": null,
+                    "recordTypeInfo": null,
+                    "systemModstamp": null,
+                    "weakEtag": 0
+                }
+            },
+            "OwnerId": {
+                "displayValue": null,
+                "value": "005xx000001X8gHAAS"
+            },
+            "Priority": {
+                "displayValue": "High",
+                "value": "High"
+            },
+            "Status": {
+                "displayValue": "Completed",
+                "value": "Completed"
+            },
+            "Subject": {
+                "displayValue": null,
+                "value": "Call"
+            },
+            "SystemModstamp": {
+                "displayValue": "4/13/2026, 1:54 PM",
+                "value": "2026-04-13T20:54:41.000Z"
+            },
+            "What": {
+                "displayValue": "00001027",
+                "value": {
+                    "apiName": "Name",
+                    "childRelationships": {},
+                    "eTag": "deffd76450e8f3c8fc116a1cb6a0bb6b",
+                    "fields": {
+                        "Id": {
+                            "displayValue": null,
+                            "value": "500xx000000boDJAAY"
+                        },
+                        "Name": {
+                            "displayValue": null,
+                            "value": "00001027"
+                        }
+                    },
+                    "id": "500xx000000boDJAAY",
+                    "lastModifiedById": null,
+                    "lastModifiedDate": null,
+                    "recordTypeId": null,
+                    "recordTypeInfo": null,
+                    "systemModstamp": null,
+                    "weakEtag": 0
+                }
+            },
+            "WhatId": {
+                "displayValue": null,
+                "value": "500xx000000boDJAAY"
+            },
+            "Who": {
+                "displayValue": null,
+                "value": null
+            },
+            "WhoId": {
+                "displayValue": null,
+                "value": null
+            }
+        },
+        "id": "00Txx000003rIcmEAE",
+        "lastModifiedById": "005xx000001X8gHAAS",
+        "lastModifiedDate": "2026-04-13T20:54:41.000Z",
+        "recordTypeId": "012000000000000AAA",
+        "recordTypeInfo": null,
+        "systemModstamp": "2026-04-13T20:54:41.000Z",
+        "weakEtag": 1776113681000
+    }
+]

package/src/ads-bridge.ts

@@ -107,6 +107,10 @@ function isStoreKeyRecordId(key: string) {
     return key.indexOf(RECORD_ID_PREFIX) > -1 && key.indexOf(RECORD_FIELDS_KEY_JUNCTION) === -1;
 }
 
+function isStoreKeyRecordField(key: string) {
+    return key.indexOf(RECORD_ID_PREFIX) > -1 && key.indexOf(RECORD_FIELDS_KEY_JUNCTION) > -1;
+}
+
 /**
  * Returns a shallow copy of a record with its field values if it is a scalar and a reference and a
  * a RecordRepresentation with no field if the value if a spanning record.
@@ -488,6 +492,37 @@ export default class AdsBridge {
         }
     }
 
+    private filterAndSynthesizeBaseIds(updatedEntries: { id: string }[]): { id: string }[] {
+        // Collect base record IDs that are directly present in the entries.
+        const directBaseIds = new Set<string>();
+        for (let i = 0; i < updatedEntries.length; i++) {
+            if (isStoreKeyRecordId(updatedEntries[i].id)) {
+                directBaseIds.add(updatedEntries[i].id);
+            }
+        }
+
+        // For field entries whose base record ID has no direct entry, synthesize one.
+        const syntheticBaseIds = new Set<string>();
+        for (let i = 0; i < updatedEntries.length; i++) {
+            if (isStoreKeyRecordField(updatedEntries[i].id)) {
+                const baseId = updatedEntries[i].id.split(RECORD_FIELDS_KEY_JUNCTION)[0];
+                if (!directBaseIds.has(baseId)) {
+                    syntheticBaseIds.add(baseId);
+                }
+            }
+        }
+        // Exclude all the store record ids not matching with the record id pattern.
+        // Note: FieldValueRepresentation have the same prefix than RecordRepresentation so we
+        // need to filter them out.
+        const filteredUpdatedEntries: { id: string }[] = updatedEntries.filter((entry) =>
+            isStoreKeyRecordId(entry.id)
+        );
+        syntheticBaseIds.forEach((baseId) => {
+            ArrayPrototypePush.call(filteredUpdatedEntries, { id: baseId });
+        });
+        return filteredUpdatedEntries;
+    }
+
     /**
      * This method retrieves queries the store with with passed record ids to retrieve their
      * associated records and object info. Note that the passed ids are not Salesforce record id
@@ -504,16 +539,10 @@ export default class AdsBridge {
         const adsRecordMap: AdsRecordMap = {};
         const adsObjectMap: AdsObjectMetadataMap = {};
 
-        for (let i = 0; i < updatedEntries.length; i++) {
-            const storeRecordId = updatedEntries[i].id;
-
-            // Exclude all the store record ids not matching with the record id pattern.
-            // Note: FieldValueRepresentation have the same prefix than RecordRepresentation so we
-            // need to filter them out.
-            if (!isStoreKeyRecordId(storeRecordId)) {
-                continue;
-            }
-
+        // Context for change: W-21715343
+        const filteredUpdatedEntries = this.filterAndSynthesizeBaseIds(updatedEntries);
+        for (let i = 0; i < filteredUpdatedEntries.length; i++) {
+            const storeRecordId = filteredUpdatedEntries[i].id;
             const record =
                 this.recordRepresentationIngestOverride !== undefined
                     ? getShallowRecordDenormalized(luvio, storeRecordId)