@salesforce/lds-runtime-mobile 1.131.0-dev10 → 1.131.0-dev11

package/dist/main.js

@@ -11014,6 +11014,14 @@ function getRecordKeyFromRecordRequest(luvio, resourceRequest) {
 function getRecordKeyForId(luvio, recordId) {
     return keyBuilderRecord(luvio, { recordId });
 }
+/**
+ * Drafts are stored with denormalized fields and normalized field links. This method
+ * filters out the field links and returns a flattened record representation.
+ *
+ * Note that reference field links get re-applied during draft record ingestion
+ * @param record draft record representation
+ * @returns flattened record representation
+ */
 function filterOutReferenceFieldsAndLinks(record) {
     const filteredFields = {};
     const fieldNames = keys$2(record.fields);
@@ -11032,32 +11040,6 @@ function filterOutReferenceFieldsAndLinks(record) {
     delete filteredRecords.links;
     return filteredRecords;
 }
-async function resolveReferencesOneLevelDeep(record, getRecordFromKey) {
-    const fieldNames = keys$2(record.fields);
-    const resolvedFields = {};
-    for (const fieldName of fieldNames) {
-        const field = record.fields[fieldName];
-        if (isFieldLink(field)) {
-            const denormalizedRecord = await getRecordFromKey(field.value.__ref);
-            if (denormalizedRecord !== undefined) {
-                resolvedFields[fieldName] = {
-                    value: filterOutReferenceFieldsAndLinks(denormalizedRecord),
-                    displayValue: null,
-                };
-            }
-            else {
-                resolvedFields[fieldName] = {
-                    value: null,
-                    displayValue: null,
-                };
-            }
-        }
-        else {
-            resolvedFields[fieldName] = field;
-        }
-    }
-    return { ...record, fields: resolvedFields };
-}
 
 /**
  * Checks if a resource request is a GET method on the record endpoint
@@ -11354,11 +11336,15 @@ const DEFAULT_FIELD_RECORD_TYPE_ID = 'RecordTypeId';
  */
 function replayDraftsOnRecord(record, draftMetadata) {
     let objectInfo;
+    let luvio;
     if (record && draftMetadata) {
         objectInfo = draftMetadata.objectInfos.get(record.apiName);
     }
+    if (draftMetadata) {
+        luvio = draftMetadata.luvio;
+    }
     // remove drafts before reapply
-    const baseRecord = record === undefined ? undefined : removeDrafts(record, objectInfo);
+    const baseRecord = record === undefined ? undefined : removeDrafts(record, luvio, objectInfo);
     // record is a draft create
     if (baseRecord === undefined) {
         if (draftMetadata === undefined) {
@@ -11481,7 +11467,7 @@ function recursivelyApplyDraftsToRecord(record, draftMetadata, recordOperations)
  * @param record record with drafts applied
  * @returns
  */
-function removeDrafts(record, objectInfo) {
+function removeDrafts(record, luvio, objectInfo) {
     const { drafts, fields } = record;
     if (drafts === undefined) {
         return record;
@@ -11497,6 +11483,12 @@ function removeDrafts(record, objectInfo) {
         const originalField = drafts.serverValues[fieldName];
         if (originalField !== undefined) {
             updatedFields[fieldName] = originalField;
+            if (objectInfo && luvio) {
+                const reference = getReferenceInfoForKey(fieldName, originalField, luvio, objectInfo);
+                if (reference) {
+                    updatedFields[reference.referenceFieldName] = reference.field;
+                }
+            }
             // restore the record type id on the root of the record
             if (fieldName === DEFAULT_FIELD_RECORD_TYPE_ID) {
                 const originalRecordTypeId = originalField.value;
@@ -11534,7 +11526,6 @@ function removeDrafts(record, objectInfo) {
  * @param fields List of draft record fields
  */
 function buildRecordFieldValueRepresentationsFromDraftFields(luvio, apiName, fields, objectInfos, referencedRecords, formatDisplayValue) {
-    var _a;
     const fieldNames = keys$2(fields);
     const recordFields = {};
     const objectInfo = objectInfos.get(apiName);
@@ -11548,7 +11539,7 @@ function buildRecordFieldValueRepresentationsFromDraftFields(luvio, apiName, fie
         if (objectInfo !== undefined) {
             const fieldInfo = objectInfo.fields[fieldName];
             if (fieldInfo !== undefined) {
-                const { dataType, relationshipName, referenceToInfos } = fieldInfo;
+                const { dataType } = fieldInfo;
                 recordFields[fieldName].displayValue = formatDisplayValue(draftField, dataType);
                 if (dataType === 'DateTime' &&
                     draftField !== null &&
@@ -11560,46 +11551,6 @@ function buildRecordFieldValueRepresentationsFromDraftFields(luvio, apiName, fie
                         throw Error('date field value not valid');
                     }
                 }
-                if (dataType === 'Reference' && relationshipName !== null && draftField !== null) {
-                    if (typeof draftField !== 'string') {
-                        throw Error('reference field value is not a string');
-                    }
-                    const key = getRecordKeyForId(luvio, draftField);
-                    const referencedRecord = referencedRecords.get(key);
-                    if (referencedRecord) {
-                        recordFields[relationshipName] = {
-                            displayValue: null,
-                            value: createLink(key),
-                        };
-                    }
-                    else {
-                        recordFields[relationshipName] = {
-                            displayValue: null,
-                            value: null,
-                        };
-                    }
-                    // for custom objects, we select the 'Name' field
-                    // otherwise we check the object info for name fields.
-                    //if there are multiple we select 'Name' if it exists, otherwise the first one
-                    if (referencedRecord !== undefined && referenceToInfos.length > 0) {
-                        let nameField;
-                        const referenceToInfo = referenceToInfos[0];
-                        const nameFields = referenceToInfo.nameFields;
-                        if (nameFields.length !== 0) {
-                            nameField = nameFields.find((x) => x === 'Name');
-                            if (nameField === undefined) {
-                                nameField = nameFields[0];
-                            }
-                        }
-                        if (nameField !== undefined) {
-                            const nameFieldRef = referencedRecord.fields[nameField];
-                            if (nameFieldRef) {
-                                recordFields[relationshipName].displayValue =
-                                    (_a = nameFieldRef.displayValue) !== null && _a !== void 0 ? _a : nameFieldRef.value;
-                            }
-                        }
-                    }
-                }
             }
         }
     }
@@ -11673,9 +11624,78 @@ function buildSyntheticRecordRepresentation(luvio, createOperation, userId, obje
         },
     };
 }
+function applyReferenceLinksToDraft(record, draftMetadata) {
+    var _a;
+    const { objectInfos, referencedRecords, luvio } = draftMetadata;
+    const objectInfo = objectInfos.get(record.apiName);
+    if (objectInfo === undefined) {
+        return record;
+    }
+    let fieldNames = Object.keys(record.fields);
+    const recordFields = { ...record.fields };
+    for (const draftField of fieldNames) {
+        const fieldInfo = objectInfo.fields[draftField];
+        if (fieldInfo === undefined) {
+            continue;
+        }
+        const { dataType, relationshipName, referenceToInfos } = fieldInfo;
+        const draftFieldValue = record.fields[draftField].value;
+        if (dataType === 'Reference' && relationshipName !== null && draftFieldValue !== null) {
+            if (typeof draftFieldValue !== 'string') {
+                throw Error('reference field value is not a string');
+            }
+            const key = getRecordKeyForId(luvio, draftFieldValue);
+            const referencedRecord = referencedRecords.get(key);
+            recordFields[relationshipName] = {
+                displayValue: null,
+                value: createLink(key),
+            };
+            // for custom objects, we select the 'Name' field
+            // otherwise we check the object info for name fields.
+            //if there are multiple we select 'Name' if it exists, otherwise the first one
+            if (referencedRecord !== undefined && referenceToInfos.length > 0) {
+                let nameField;
+                const referenceToInfo = referenceToInfos[0];
+                const nameFields = referenceToInfo.nameFields;
+                if (nameFields.length !== 0) {
+                    nameField = nameFields.find((x) => x === 'Name');
+                    if (nameField === undefined) {
+                        nameField = nameFields[0];
+                    }
+                }
+                if (nameField !== undefined) {
+                    const nameFieldRef = referencedRecord.fields[nameField];
+                    if (nameFieldRef) {
+                        recordFields[relationshipName].displayValue =
+                            (_a = nameFieldRef.displayValue) !== null && _a !== void 0 ? _a : nameFieldRef.value;
+                    }
+                }
+            }
+        }
+    }
+    return { ...record, fields: recordFields };
+}
 function createLink(key) {
     return { __ref: key };
 }
+function getReferenceInfoForKey(fieldName, field, luvio, objectInfo) {
+    const { dataType, relationshipName } = objectInfo.fields[fieldName];
+    const draftFieldValue = field.value;
+    if (dataType === 'Reference' && relationshipName !== null && draftFieldValue !== null) {
+        if (typeof draftFieldValue !== 'string') {
+            throw Error('reference field value is not a string');
+        }
+        const key = getRecordKeyForId(luvio, draftFieldValue);
+        return {
+            referenceFieldName: relationshipName,
+            field: {
+                displayValue: null,
+                value: createLink(key),
+            },
+        };
+    }
+    return undefined;
+}
 
 async function getAdapterData(adapter, config) {
     const snapshot = await adapter(config);
@@ -11820,8 +11840,7 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
      *
      * @param action The draft action related to this record
      * @param _queue The draft queue
-     * @returns The record with the updated draft queue applied. This record is resolved with references one-level
-     * deep to ensure that reference links are properly established during ingestion to it
+     * @returns The record with the updated draft queue applied. References are not included and must be applied at ingest.
      *
      * or
      *
@@ -11845,7 +11864,7 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
             if (recordWithDrafts === undefined) {
                 return undefined;
             }
-            return resolveReferencesOneLevelDeep(recordWithDrafts, this.durableStore.getDenormalizedRecord.bind(this.durableStore));
+            return filterOutReferenceFieldsAndLinks(recordWithDrafts);
         }
         const record = await this.durableStore.getDenormalizedRecord(key);
         if (record === undefined) {
@@ -11856,7 +11875,7 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
         if (recordWithDrafts === undefined) {
             return recordWithDrafts;
         }
-        return resolveReferencesOneLevelDeep(recordWithDrafts, this.durableStore.getDenormalizedRecord.bind(this.durableStore));
+        return filterOutReferenceFieldsAndLinks(recordWithDrafts);
     }
     applyDraftsToIncomingData(key, data, draftMetadata, publishData) {
         if (isField(key)) {
@@ -11883,19 +11902,26 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
             }
         }
         const recordWithDrafts = replayDraftsOnRecord(partialRecord, draftMetadata);
+        const recordWithSpanningRefLinks = applyReferenceLinksToDraft(recordWithDrafts, draftMetadata);
         // publish the normalized fields
         const normalizedRecord = {
-            ...recordWithDrafts,
+            ...recordWithSpanningRefLinks,
             ...data,
             fields: { ...data.fields },
         };
-        for (const fieldName of recordFieldNames) {
+        for (const fieldName of keys$2(recordWithSpanningRefLinks.fields)) {
             const fieldKey = buildRecordFieldStoreKey(key, fieldName);
             if (this.collectedFields[fieldKey] !== undefined) {
-                const fieldData = recordWithDrafts.fields[fieldName];
+                const fieldData = recordWithSpanningRefLinks.fields[fieldName];
                 normalizedRecord.fields[fieldName] = { __ref: fieldKey };
                 publishData(fieldKey, fieldData);
             }
+            else if (recordWithSpanningRefLinks.fields[fieldName] &&
+                recordWithSpanningRefLinks.fields[fieldName].value &&
+                recordWithSpanningRefLinks.fields[fieldName].value.__ref !== undefined) {
+                normalizedRecord.fields[fieldName] = { __ref: fieldKey };
+                publishData(fieldKey, recordWithSpanningRefLinks.fields[fieldName]);
+            }
         }
         // publish the normalized record
         publishData(key, normalizedRecord);
@@ -13069,27 +13095,10 @@ class ContentDocumentCompositeRepresentationActionHandler extends AbstractResour
         if (contentVersion === undefined) {
             return undefined;
         }
-        // this lambda can be shared across the calls to resolveReferencesOneLevelDeep
-        const luvio = this.getLuvio();
-        const contentDocumentKey = getRecordKeyForId(luvio, contentDocumentId);
-        const contentDocumentLinkKey = getRecordKeyForId(luvio, contentDocumentLinkId);
-        const contentVersionKey = getRecordKeyForId(luvio, contentVersionId);
-        const getRecordFromKey = async (key) => {
-            if (key === contentDocumentKey) {
-                return contentDocRecord;
-            }
-            if (key === contentDocumentLinkKey) {
-                return contentDocLink;
-            }
-            if (key === contentVersionKey) {
-                return contentVersion;
-            }
-            return this.durableStore.getDenormalizedRecord(key);
-        };
         // finally we resolve all references for each record
-        const contentDocResolved = await resolveReferencesOneLevelDeep(contentDocRecord, getRecordFromKey);
-        const contentDocLinkResolved = await resolveReferencesOneLevelDeep(contentDocLink, getRecordFromKey);
-        const contentVersionResolved = await resolveReferencesOneLevelDeep(contentVersion, getRecordFromKey);
+        const contentDocResolved = await filterOutReferenceFieldsAndLinks(contentDocRecord);
+        const contentDocLinkResolved = await filterOutReferenceFieldsAndLinks(contentDocLink);
+        const contentVersionResolved = await filterOutReferenceFieldsAndLinks(contentVersion);
         return {
             contentDocument: contentDocResolved,
             contentDocumentLinks: [contentDocLinkResolved],
@@ -16191,4 +16200,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.131.0-dev10-b950ecbb3
+// version: 1.131.0-dev11-b15472a13

package/package.json

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

package/sfdc/main.js

@@ -11014,6 +11014,14 @@ function getRecordKeyFromRecordRequest(luvio, resourceRequest) {
 function getRecordKeyForId(luvio, recordId) {
     return keyBuilderRecord(luvio, { recordId });
 }
+/**
+ * Drafts are stored with denormalized fields and normalized field links. This method
+ * filters out the field links and returns a flattened record representation.
+ *
+ * Note that reference field links get re-applied during draft record ingestion
+ * @param record draft record representation
+ * @returns flattened record representation
+ */
 function filterOutReferenceFieldsAndLinks(record) {
     const filteredFields = {};
     const fieldNames = keys$2(record.fields);
@@ -11032,32 +11040,6 @@ function filterOutReferenceFieldsAndLinks(record) {
     delete filteredRecords.links;
     return filteredRecords;
 }
-async function resolveReferencesOneLevelDeep(record, getRecordFromKey) {
-    const fieldNames = keys$2(record.fields);
-    const resolvedFields = {};
-    for (const fieldName of fieldNames) {
-        const field = record.fields[fieldName];
-        if (isFieldLink(field)) {
-            const denormalizedRecord = await getRecordFromKey(field.value.__ref);
-            if (denormalizedRecord !== undefined) {
-                resolvedFields[fieldName] = {
-                    value: filterOutReferenceFieldsAndLinks(denormalizedRecord),
-                    displayValue: null,
-                };
-            }
-            else {
-                resolvedFields[fieldName] = {
-                    value: null,
-                    displayValue: null,
-                };
-            }
-        }
-        else {
-            resolvedFields[fieldName] = field;
-        }
-    }
-    return { ...record, fields: resolvedFields };
-}
 
 /**
  * Checks if a resource request is a GET method on the record endpoint
@@ -11354,11 +11336,15 @@ const DEFAULT_FIELD_RECORD_TYPE_ID = 'RecordTypeId';
  */
 function replayDraftsOnRecord(record, draftMetadata) {
     let objectInfo;
+    let luvio;
     if (record && draftMetadata) {
         objectInfo = draftMetadata.objectInfos.get(record.apiName);
     }
+    if (draftMetadata) {
+        luvio = draftMetadata.luvio;
+    }
     // remove drafts before reapply
-    const baseRecord = record === undefined ? undefined : removeDrafts(record, objectInfo);
+    const baseRecord = record === undefined ? undefined : removeDrafts(record, luvio, objectInfo);
     // record is a draft create
     if (baseRecord === undefined) {
         if (draftMetadata === undefined) {
@@ -11481,7 +11467,7 @@ function recursivelyApplyDraftsToRecord(record, draftMetadata, recordOperations)
  * @param record record with drafts applied
  * @returns
  */
-function removeDrafts(record, objectInfo) {
+function removeDrafts(record, luvio, objectInfo) {
     const { drafts, fields } = record;
     if (drafts === undefined) {
         return record;
@@ -11497,6 +11483,12 @@ function removeDrafts(record, objectInfo) {
         const originalField = drafts.serverValues[fieldName];
         if (originalField !== undefined) {
             updatedFields[fieldName] = originalField;
+            if (objectInfo && luvio) {
+                const reference = getReferenceInfoForKey(fieldName, originalField, luvio, objectInfo);
+                if (reference) {
+                    updatedFields[reference.referenceFieldName] = reference.field;
+                }
+            }
             // restore the record type id on the root of the record
             if (fieldName === DEFAULT_FIELD_RECORD_TYPE_ID) {
                 const originalRecordTypeId = originalField.value;
@@ -11534,7 +11526,6 @@ function removeDrafts(record, objectInfo) {
  * @param fields List of draft record fields
  */
 function buildRecordFieldValueRepresentationsFromDraftFields(luvio, apiName, fields, objectInfos, referencedRecords, formatDisplayValue) {
-    var _a;
     const fieldNames = keys$2(fields);
     const recordFields = {};
     const objectInfo = objectInfos.get(apiName);
@@ -11548,7 +11539,7 @@ function buildRecordFieldValueRepresentationsFromDraftFields(luvio, apiName, fie
         if (objectInfo !== undefined) {
             const fieldInfo = objectInfo.fields[fieldName];
             if (fieldInfo !== undefined) {
-                const { dataType, relationshipName, referenceToInfos } = fieldInfo;
+                const { dataType } = fieldInfo;
                 recordFields[fieldName].displayValue = formatDisplayValue(draftField, dataType);
                 if (dataType === 'DateTime' &&
                     draftField !== null &&
@@ -11560,46 +11551,6 @@ function buildRecordFieldValueRepresentationsFromDraftFields(luvio, apiName, fie
                         throw Error('date field value not valid');
                     }
                 }
-                if (dataType === 'Reference' && relationshipName !== null && draftField !== null) {
-                    if (typeof draftField !== 'string') {
-                        throw Error('reference field value is not a string');
-                    }
-                    const key = getRecordKeyForId(luvio, draftField);
-                    const referencedRecord = referencedRecords.get(key);
-                    if (referencedRecord) {
-                        recordFields[relationshipName] = {
-                            displayValue: null,
-                            value: createLink(key),
-                        };
-                    }
-                    else {
-                        recordFields[relationshipName] = {
-                            displayValue: null,
-                            value: null,
-                        };
-                    }
-                    // for custom objects, we select the 'Name' field
-                    // otherwise we check the object info for name fields.
-                    //if there are multiple we select 'Name' if it exists, otherwise the first one
-                    if (referencedRecord !== undefined && referenceToInfos.length > 0) {
-                        let nameField;
-                        const referenceToInfo = referenceToInfos[0];
-                        const nameFields = referenceToInfo.nameFields;
-                        if (nameFields.length !== 0) {
-                            nameField = nameFields.find((x) => x === 'Name');
-                            if (nameField === undefined) {
-                                nameField = nameFields[0];
-                            }
-                        }
-                        if (nameField !== undefined) {
-                            const nameFieldRef = referencedRecord.fields[nameField];
-                            if (nameFieldRef) {
-                                recordFields[relationshipName].displayValue =
-                                    (_a = nameFieldRef.displayValue) !== null && _a !== void 0 ? _a : nameFieldRef.value;
-                            }
-                        }
-                    }
-                }
             }
         }
     }
@@ -11673,9 +11624,78 @@ function buildSyntheticRecordRepresentation(luvio, createOperation, userId, obje
         },
     };
 }
+function applyReferenceLinksToDraft(record, draftMetadata) {
+    var _a;
+    const { objectInfos, referencedRecords, luvio } = draftMetadata;
+    const objectInfo = objectInfos.get(record.apiName);
+    if (objectInfo === undefined) {
+        return record;
+    }
+    let fieldNames = Object.keys(record.fields);
+    const recordFields = { ...record.fields };
+    for (const draftField of fieldNames) {
+        const fieldInfo = objectInfo.fields[draftField];
+        if (fieldInfo === undefined) {
+            continue;
+        }
+        const { dataType, relationshipName, referenceToInfos } = fieldInfo;
+        const draftFieldValue = record.fields[draftField].value;
+        if (dataType === 'Reference' && relationshipName !== null && draftFieldValue !== null) {
+            if (typeof draftFieldValue !== 'string') {
+                throw Error('reference field value is not a string');
+            }
+            const key = getRecordKeyForId(luvio, draftFieldValue);
+            const referencedRecord = referencedRecords.get(key);
+            recordFields[relationshipName] = {
+                displayValue: null,
+                value: createLink(key),
+            };
+            // for custom objects, we select the 'Name' field
+            // otherwise we check the object info for name fields.
+            //if there are multiple we select 'Name' if it exists, otherwise the first one
+            if (referencedRecord !== undefined && referenceToInfos.length > 0) {
+                let nameField;
+                const referenceToInfo = referenceToInfos[0];
+                const nameFields = referenceToInfo.nameFields;
+                if (nameFields.length !== 0) {
+                    nameField = nameFields.find((x) => x === 'Name');
+                    if (nameField === undefined) {
+                        nameField = nameFields[0];
+                    }
+                }
+                if (nameField !== undefined) {
+                    const nameFieldRef = referencedRecord.fields[nameField];
+                    if (nameFieldRef) {
+                        recordFields[relationshipName].displayValue =
+                            (_a = nameFieldRef.displayValue) !== null && _a !== void 0 ? _a : nameFieldRef.value;
+                    }
+                }
+            }
+        }
+    }
+    return { ...record, fields: recordFields };
+}
 function createLink(key) {
     return { __ref: key };
 }
+function getReferenceInfoForKey(fieldName, field, luvio, objectInfo) {
+    const { dataType, relationshipName } = objectInfo.fields[fieldName];
+    const draftFieldValue = field.value;
+    if (dataType === 'Reference' && relationshipName !== null && draftFieldValue !== null) {
+        if (typeof draftFieldValue !== 'string') {
+            throw Error('reference field value is not a string');
+        }
+        const key = getRecordKeyForId(luvio, draftFieldValue);
+        return {
+            referenceFieldName: relationshipName,
+            field: {
+                displayValue: null,
+                value: createLink(key),
+            },
+        };
+    }
+    return undefined;
+}
 
 async function getAdapterData(adapter, config) {
     const snapshot = await adapter(config);
@@ -11820,8 +11840,7 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
      *
      * @param action The draft action related to this record
      * @param _queue The draft queue
-     * @returns The record with the updated draft queue applied. This record is resolved with references one-level
-     * deep to ensure that reference links are properly established during ingestion to it
+     * @returns The record with the updated draft queue applied. References are not included and must be applied at ingest.
      *
      * or
      *
@@ -11845,7 +11864,7 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
             if (recordWithDrafts === undefined) {
                 return undefined;
             }
-            return resolveReferencesOneLevelDeep(recordWithDrafts, this.durableStore.getDenormalizedRecord.bind(this.durableStore));
+            return filterOutReferenceFieldsAndLinks(recordWithDrafts);
         }
         const record = await this.durableStore.getDenormalizedRecord(key);
         if (record === undefined) {
@@ -11856,7 +11875,7 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
         if (recordWithDrafts === undefined) {
             return recordWithDrafts;
         }
-        return resolveReferencesOneLevelDeep(recordWithDrafts, this.durableStore.getDenormalizedRecord.bind(this.durableStore));
+        return filterOutReferenceFieldsAndLinks(recordWithDrafts);
     }
     applyDraftsToIncomingData(key, data, draftMetadata, publishData) {
         if (isField(key)) {
@@ -11883,19 +11902,26 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
             }
         }
         const recordWithDrafts = replayDraftsOnRecord(partialRecord, draftMetadata);
+        const recordWithSpanningRefLinks = applyReferenceLinksToDraft(recordWithDrafts, draftMetadata);
         // publish the normalized fields
         const normalizedRecord = {
-            ...recordWithDrafts,
+            ...recordWithSpanningRefLinks,
             ...data,
             fields: { ...data.fields },
         };
-        for (const fieldName of recordFieldNames) {
+        for (const fieldName of keys$2(recordWithSpanningRefLinks.fields)) {
             const fieldKey = buildRecordFieldStoreKey(key, fieldName);
             if (this.collectedFields[fieldKey] !== undefined) {
-                const fieldData = recordWithDrafts.fields[fieldName];
+                const fieldData = recordWithSpanningRefLinks.fields[fieldName];
                 normalizedRecord.fields[fieldName] = { __ref: fieldKey };
                 publishData(fieldKey, fieldData);
             }
+            else if (recordWithSpanningRefLinks.fields[fieldName] &&
+                recordWithSpanningRefLinks.fields[fieldName].value &&
+                recordWithSpanningRefLinks.fields[fieldName].value.__ref !== undefined) {
+                normalizedRecord.fields[fieldName] = { __ref: fieldKey };
+                publishData(fieldKey, recordWithSpanningRefLinks.fields[fieldName]);
+            }
         }
         // publish the normalized record
         publishData(key, normalizedRecord);
@@ -13069,27 +13095,10 @@ class ContentDocumentCompositeRepresentationActionHandler extends AbstractResour
         if (contentVersion === undefined) {
             return undefined;
         }
-        // this lambda can be shared across the calls to resolveReferencesOneLevelDeep
-        const luvio = this.getLuvio();
-        const contentDocumentKey = getRecordKeyForId(luvio, contentDocumentId);
-        const contentDocumentLinkKey = getRecordKeyForId(luvio, contentDocumentLinkId);
-        const contentVersionKey = getRecordKeyForId(luvio, contentVersionId);
-        const getRecordFromKey = async (key) => {
-            if (key === contentDocumentKey) {
-                return contentDocRecord;
-            }
-            if (key === contentDocumentLinkKey) {
-                return contentDocLink;
-            }
-            if (key === contentVersionKey) {
-                return contentVersion;
-            }
-            return this.durableStore.getDenormalizedRecord(key);
-        };
         // finally we resolve all references for each record
-        const contentDocResolved = await resolveReferencesOneLevelDeep(contentDocRecord, getRecordFromKey);
-        const contentDocLinkResolved = await resolveReferencesOneLevelDeep(contentDocLink, getRecordFromKey);
-        const contentVersionResolved = await resolveReferencesOneLevelDeep(contentVersion, getRecordFromKey);
+        const contentDocResolved = await filterOutReferenceFieldsAndLinks(contentDocRecord);
+        const contentDocLinkResolved = await filterOutReferenceFieldsAndLinks(contentDocLink);
+        const contentVersionResolved = await filterOutReferenceFieldsAndLinks(contentVersion);
         return {
             contentDocument: contentDocResolved,
             contentDocumentLinks: [contentDocLinkResolved],
@@ -16191,4 +16200,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.131.0-dev10-b950ecbb3
+// version: 1.131.0-dev11-b15472a13