@salesforce/lds-ads-bridge 1.309.0-dev15 → 1.309.0-dev17

package/dist/ads-bridge-perf.js

@@ -433,7 +433,7 @@ function createResourceParamsImpl(config, configMetadata) {
     }
     return resourceParams;
 }
-// engine version: 0.156.4-dev1-8df86bf0
+// engine version: 0.156.4-dev2-78889b7e
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -481,7 +481,7 @@ const callbacks$1 = [];
 function register(r) {
     callbacks$1.forEach((callback) => callback(r));
 }
-// version: 1.309.0-dev15-f211d80f81
+// version: 1.309.0-dev17-5357fa694b
 
 /**
  * Returns true if the value acts like a Promise, i.e. has a "then" function,
@@ -7573,7 +7573,7 @@ const RECORD_REPRESENTATION_ERROR_STORE_METADATA_PARAMS = {
     version: RECORD_REPRESENTATION_ERROR_VERSION,
 };
 function isGraphNode$1(node) {
-    return node !== null && node.type === 'Node';
+    return !!node && node.type === 'Node';
 }
 function addScalarFieldId(current) {
     addScalarField(current, 'Id');
@@ -7640,6 +7640,8 @@ function extractTrackedFieldsToTrie(recordId, node, root, config, visitedRecordI
                 const spanning = spanningLink.follow();
                 // W-8058425, do not include external lookups added by getTrackedFields
                 if (isExternalLookupFieldKey(spanning)) {
+                    // NOTE: the logic to get here is mimicked in RecordRepresentation/merge::mergePendingFields as of
+                    // W-11899329 due to issues with external lookups being marked pending but never fetched
                     continue;
                 }
                 extractTrackedFieldsToTrie(spanningLink.data.__ref, spanning, next, config, spanningVisitedRecordIds, depth + 1);
@@ -7672,6 +7674,8 @@ function extractTrackedFieldsToTrie(recordId, node, root, config, visitedRecordI
                     const { fields } = state;
                     // W-8058425, do not include external lookups added by getTrackedFields
                     if (includes.call(fields, 'ExternalId')) {
+                        // NOTE: the logic to get here is mimicked in RecordRepresentation/merge::mergePendingFields as of
+                        // W-11899329 due to issues with external lookups being marked pending but never fetched
                         continue;
                     }
                     for (let s = 0, len = fields.length; s < len; s += 1) {
@@ -7883,15 +7887,49 @@ function isSuperRecordFieldTrie(a, b) {
 
 // This function sets fields that we are refreshing to pending
 // These values will go into the store
-function mergePendingFields(newRecord, oldRecord) {
-    // TODO [W-6900046]: avoid casting to any by updating
-    // RecordRepresentationNormalized['fields'] to include `pending:true` property
+function mergePendingFields(newRecord, oldRecord, existingNode) {
     const mergedFields = { ...newRecord.fields };
     const merged = { ...newRecord, fields: mergedFields };
     const existingFields = keys$1(oldRecord.fields);
     for (let i = 0, len = existingFields.length; i < len; i += 1) {
         const spanningFieldName = existingFields[i];
         if (newRecord.fields[spanningFieldName] === undefined) {
+            /*
+             * Per W-8058425 external lookups fields are excluded from the tracked fields. However, as covered in
+             * W-11899329, situations can arise in which a merge conflict occurs when the existing record has a
+             * reference to an external lookup field.  The exclusion ultimately results in a snapshot stuck in the
+             * pending state. This is an approach to prevent that situation.
+             *
+             * The same logic checks for W-8058425 to "continue" as it relates to not tracking external lookups is
+             * mimicked here as it relates to not marking them as pending.
+             */
+            // make sure external lookups are NOT marked as pending when `existingNode` is provided
+            if (isGraphNode$1(existingNode)) {
+                // get the node for the spanning field
+                const fieldValueRep = existingNode
+                    .object('fields')
+                    .link(spanningFieldName);
+                const field = fieldValueRep.follow();
+                if (isGraphNode$1(field)) {
+                    if (field.isScalar('value') === false) {
+                        const record = field
+                            .link('value')
+                            .follow();
+                        if (isExternalLookupFieldKey(record)) {
+                            continue;
+                        }
+                    }
+                }
+                else {
+                    const state = fieldValueRep.linkData();
+                    if (state !== undefined) {
+                        const { fields } = state;
+                        if (includes.call(fields, 'ExternalId')) {
+                            continue;
+                        }
+                    }
+                }
+            }
             // TODO [W-6900046]: fix above casting issue so we're not stuffing arbitrary things
             // into RecordRepresentationNormalized['fields']
             mergedFields[spanningFieldName] = {
@@ -7905,7 +7943,7 @@ function mergePendingFields(newRecord, oldRecord) {
 // This method gets called
 // when incoming record has a higher version
 // than the record that is currently in the store
-function mergeAndRefreshHigherVersionRecord(incoming, existing, incomingTrackedFieldsTrieRoot, existingTrackedFieldsTrieRoot, recordConflictMap) {
+function mergeAndRefreshHigherVersionRecord(incoming, existing, incomingTrackedFieldsTrieRoot, existingTrackedFieldsTrieRoot, recordConflictMap, existingNode) {
     // If the higher version (incoming) does not contain a superset of fields as existing
     // then we need to refresh to get updated versions of fields in existing
     if (isSuperRecordFieldTrie(incomingTrackedFieldsTrieRoot, existingTrackedFieldsTrieRoot) ===
@@ -7922,14 +7960,14 @@ function mergeAndRefreshHigherVersionRecord(incoming, existing, incomingTrackedF
         };
         // We want to mark fields in the store as pending
         // Because we don't want to emit any data to components
-        return mergePendingFields(incoming, existing);
+        return mergePendingFields(incoming, existing, existingNode);
     }
     return incoming;
 }
 // This method gets called
 // when incoming record has a lower version
 // than the record that is currently in the store
-function mergeAndRefreshLowerVersionRecord(luvio, incoming, existing, incomingTrackedFieldsTrieRoot, existingTrackedFieldsTrieRoot, recordConflictMap) {
+function mergeAndRefreshLowerVersionRecord(luvio, incoming, existing, incomingTrackedFieldsTrieRoot, existingTrackedFieldsTrieRoot, recordConflictMap, existingNode) {
     // If the higher version (existing) does not have a superset of fields as incoming
     // then we need to refresh to get updated versions of fields on incoming
     if (isSuperRecordFieldTrie(existingTrackedFieldsTrieRoot, incomingTrackedFieldsTrieRoot) ===
@@ -7939,7 +7977,7 @@ function mergeAndRefreshLowerVersionRecord(luvio, incoming, existing, incomingTr
         if (isSupportedEntity(incoming.apiName) === false) {
             return mergeRecordFields(existing, incoming);
         }
-        const merged = mergePendingFields(existing, incoming);
+        const merged = mergePendingFields(existing, incoming, existingNode);
         // update the conflict map to resolve the record conflict in resolveConflict
         if (recordConflictMap) {
             recordConflictMap.conflicts[incoming.id] = {
@@ -7978,7 +8016,7 @@ function mergeRecordConflict(luvio, incoming, existing, recordConflictMap) {
     extractTrackedFieldsToTrie(recordKey, incomingNode, incomingTrackedFieldsTrieRoot, trackedFieldsConfig);
     extractTrackedFieldsToTrie(recordKey, existingNode, existingTrackedFieldsTrieRoot, trackedFieldsConfig);
     if (incoming.weakEtag > existing.weakEtag) {
-        return mergeAndRefreshHigherVersionRecord(incoming, existing, incomingTrackedFieldsTrieRoot, existingTrackedFieldsTrieRoot, recordConflictMap);
+        return mergeAndRefreshHigherVersionRecord(incoming, existing, incomingTrackedFieldsTrieRoot, existingTrackedFieldsTrieRoot, recordConflictMap, existingNode);
     }
     return mergeAndRefreshLowerVersionRecord(luvio, incoming, existing, incomingTrackedFieldsTrieRoot, existingTrackedFieldsTrieRoot, recordConflictMap);
 }

package/dist/adsBridge.js

@@ -367,4 +367,4 @@ function withAdsBridge(callback) {
 }
 
 export { instrument, withAdsBridge };
-// version: 1.309.0-dev15-f211d80f81
+// version: 1.309.0-dev17-5357fa694b

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-ads-bridge",
-    "version": "1.309.0-dev15",
+    "version": "1.309.0-dev17",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "Bridge to sync data between LDS and ADS",
     "main": "dist/adsBridge.js",
@@ -30,8 +30,8 @@
         "release:corejar": "yarn build && ../core-build/scripts/core.js --name=lds-ads-bridge"
     },
     "devDependencies": {
-        "@salesforce/lds-adapters-uiapi": "^1.309.0-dev15",
-        "@salesforce/lds-uiapi-record-utils-mobile": "^1.309.0-dev15"
+        "@salesforce/lds-adapters-uiapi": "^1.309.0-dev17",
+        "@salesforce/lds-uiapi-record-utils-mobile": "^1.309.0-dev17"
     },
     "volta": {
         "extends": "../../package.json"