@salesforce/lds-runtime-mobile 1.354.0-dev6 → 1.354.0-dev7

package/dist/main.js

@@ -44335,7 +44335,75 @@ function filterToPredicates(where, recordType, alias, objectInfoMap, joins, draf
             // in 'Account' has the 'Owner' as the 'RelationshipName', the api name in 'referenceToInfos' is 'User'
             if (fieldInfo.referenceToInfos.length === 1) {
                 const childRecordType = fieldInfo.referenceToInfos[0].apiName;
-                predicates.push(...filterToPredicates(where[field], childRecordType, childAlias, objectInfoMap, joins));
+                let p = filterToPredicates(where[field], childRecordType, childAlias, objectInfoMap, joins);
+                if (isSinglePredicate(p[0]) && p[0].value === null) {
+                    // @W-18311580 - this is a reference field with a null value. We need to ensure that we handle the case
+                    // where we are joining to a record that may not exist in our offline database, so we need to detect if
+                    // the value is really a null, or if it is a missing record in the offline database.
+                    //
+                    // This effecitvely adds the following predicates to a "where Contact.Account.Name IS NULL" query:
+                    //
+                    // AND (
+                    //        (
+                    //          json_extract("Contact__c_Account__r".data, '$.fields.Id.value') IS NOT NULL (a)
+                    //          AND json_extract("Contact__c".data, '$.fields.AccountId.value') IS NOT NULL (b)
+                    //        )
+                    //        OR json_extract("Contact__c".data, '$.fields.AccountId.value') IS NULL (c)
+                    //     )
+                    //
+                    // Where:
+                    // (a) AND (b) ensures we have an account record when it is supposed to exist,
+                    // OR (c) if AccountId is null, we know we are not referencing an account record.
+                    let notNullPredicate = {
+                        type: PredicateType.compound,
+                        operator: 'and',
+                        children: [
+                            {
+                                alias: alias,
+                                leftPath: leftPath,
+                                operator: 'IS NOT',
+                                value: null,
+                                dataType: 'String',
+                                type: PredicateType.single,
+                                isCaseSensitive: true,
+                            },
+                            {
+                                alias: childAlias,
+                                leftPath: `$.fields.Id.value`,
+                                operator: 'IS NOT',
+                                value: null,
+                                dataType: 'String',
+                                type: PredicateType.single,
+                                isCaseSensitive: true,
+                            },
+                        ],
+                    };
+                    let nullPredicate = {
+                        type: PredicateType.compound,
+                        operator: 'or',
+                        children: [
+                            notNullPredicate,
+                            {
+                                alias: alias,
+                                leftPath: leftPath,
+                                operator: 'IS',
+                                value: null,
+                                dataType: 'String',
+                                type: PredicateType.single,
+                                isCaseSensitive: true,
+                            },
+                        ],
+                    };
+                    let compoundPredicate = {
+                        type: PredicateType.compound,
+                        operator: 'and',
+                        children: [...p, nullPredicate],
+                    };
+                    predicates.push(compoundPredicate);
+                }
+                else {
+                    predicates.push(...p);
+                }
             }
             else {
                 // @W-12618378 polymorphic query sometimes does not work as expected on server. The GQL on certain entities could fail.
@@ -52496,6 +52564,7 @@ function generateTypedBatches(work, batchSize) {
     return batches;
 }
 
+const skippedCompoundFieldTypes = ['Address', 'Location'];
 function getMissingElementsFromSuperset(superset, subset) {
     return subset.filter((val) => !superset.includes(val));
 }
@@ -52512,6 +52581,7 @@ function buildFieldUnionArray(existingRecord, incomingRecord, objectInfo) {
     const allFields = Array.from(new Set([...Object.keys(existingRecord.fields), ...Object.keys(incomingRecord.fields)]));
     const fieldUnion = [];
     let includesSpanningFields = false;
+    let includesSkippedFields = false;
     allFields.forEach((fieldName) => {
         const objectInfoField = objectInfo.fields[fieldName];
         if (objectInfoField === undefined) {
@@ -52529,10 +52599,17 @@ function buildFieldUnionArray(existingRecord, incomingRecord, objectInfo) {
             }
         }
         else {
+            if (skippedCompoundFieldTypes.includes(objectInfo.fields[fieldName].dataType)) {
+                includesSkippedFields = true;
+            }
             fieldUnion.push(fieldName);
         }
     });
-    return { fields: fieldUnion, includesSpanningFields };
+    return {
+        fields: fieldUnion,
+        includesSpanningFields,
+        includesSkippedFields,
+    };
 }
 /**
  * Merges (if possible) an incoming record from a priming session with an existing record in the durable store.
@@ -52595,9 +52672,15 @@ function mergeRecord(existingRecord, incomingRecord, objectInfo) {
     }
     else {
         const missingFields = getMissingElementsFromSuperset(Object.keys(incomingRecord.fields), Object.keys(existingRecord.fields));
-        // if the only missing fields are spanning fields and their corresponding lookup fields match, we can merge
-        // since none of the changed fields are part of the incoming record
-        if (missingFields.every((field) => {
+        // tests for missing optional fields, pending fields, and spanning fields that can be merged
+        const fieldIsMergeable = (field) => {
+            // missing and pending fields in the existing record are mergeable
+            const fieldState = existingRecord.fields[field].__state;
+            if (fieldState && (fieldState.pending === true || fieldState.isMissing === true)) {
+                return true;
+            }
+            // if the only missing fields are spanning fields and their corresponding lookup fields match, we can merge
+            // since none of the changed fields are part of the incoming record
             const referenceFieldName = findReferenceFieldForSpanningField(field, objectInfo);
             if (referenceFieldName === undefined) {
                 return false;
@@ -52606,7 +52689,8 @@ function mergeRecord(existingRecord, incomingRecord, objectInfo) {
                 incomingRecord.fields[referenceFieldName] &&
                 incomingRecord.fields[referenceFieldName].value ===
                     existingRecord.fields[referenceFieldName].value);
-        })) {
+        };
+        if (missingFields.every(fieldIsMergeable)) {
             return {
                 ok: true,
                 needsWrite: true,
@@ -52626,8 +52710,8 @@ function mergeRecord(existingRecord, incomingRecord, objectInfo) {
             };
         }
         // If Etags do not match and the incoming record does not contain all fields, re-request the record
-        const { fields, includesSpanningFields } = buildFieldUnionArray(existingRecord, incomingRecord, objectInfo);
-        if (includesSpanningFields) {
+        const { fields, includesSpanningFields, includesSkippedFields } = buildFieldUnionArray(existingRecord, incomingRecord, objectInfo);
+        if (includesSpanningFields || includesSkippedFields) {
             return {
                 ok: false,
                 code: 'conflict-spanning-record',
@@ -53617,7 +53701,15 @@ class RecordLoaderSOQLComposite extends NetworkRecordLoader {
         if (Object.keys(recordTypeInfos).length > 1) {
             fieldSet.add('RecordTypeId');
         }
-        const fields = Array.from(fieldSet);
+        const fields = Array.from(fieldSet).filter((field) => {
+            const fieldMetadata = batch.objectInfo.fields[field];
+            // skip Address and Location compound fields
+            if (fieldMetadata.compound &&
+                skippedCompoundFieldTypes.includes(fieldMetadata.dataType)) {
+                return false;
+            }
+            return true;
+        });
         // We will have SOQL format specific data types for us by adding a format() value.
         // The field alias will have ___display added to the end.
         for (const field of fieldSet) {
@@ -53636,7 +53728,6 @@ class RecordLoaderSOQLComposite extends NetworkRecordLoader {
             }
         }
         const query = `SELECT ${fields.join(',')} FROM ${batch.type} `;
-        // console.log(`DUSTIN: soql batch query: ${query}`);
         return query;
     }
     generateWhere(ids) {
@@ -55676,4 +55767,4 @@ register({
 });
 
 export { O11Y_NAMESPACE_LDS_MOBILE, getRuntime, ingest$1o as ingestDenormalizedRecordRepresentation, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.354.0-dev6-a32f37c654
+// version: 1.354.0-dev7-d25082f814

package/dist/types/priming/utils/merge.d.ts

@@ -14,6 +14,7 @@ export interface MergeResultConflict {
     fieldUnion: string[];
 }
 type MergeResult = MergeResultSuccess | MergeResultConflict;
+export declare const skippedCompoundFieldTypes: string[];
 /**
  * Merges (if possible) an incoming record from a priming session with an existing record in the durable store.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-mobile",
-    "version": "1.354.0-dev6",
+    "version": "1.354.0-dev7",
     "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.354.0-dev6",
-        "@salesforce/lds-bindings": "^1.354.0-dev6",
-        "@salesforce/lds-instrumentation": "^1.354.0-dev6",
+        "@salesforce/lds-adapters-uiapi": "^1.354.0-dev7",
+        "@salesforce/lds-bindings": "^1.354.0-dev7",
+        "@salesforce/lds-instrumentation": "^1.354.0-dev7",
         "@salesforce/user": "0.0.21",
         "o11y": "250.7.0",
         "o11y_schema": "256.126.0"
     },
     "devDependencies": {
-        "@salesforce/lds-adapters-graphql": "^1.354.0-dev6",
-        "@salesforce/lds-drafts": "^1.354.0-dev6",
-        "@salesforce/lds-durable-records": "^1.354.0-dev6",
-        "@salesforce/lds-network-adapter": "^1.354.0-dev6",
-        "@salesforce/lds-network-nimbus": "^1.354.0-dev6",
-        "@salesforce/lds-store-binary": "^1.354.0-dev6",
-        "@salesforce/lds-store-nimbus": "^1.354.0-dev6",
-        "@salesforce/lds-store-sql": "^1.354.0-dev6",
-        "@salesforce/lds-utils-adapters": "^1.354.0-dev6",
-        "@salesforce/nimbus-plugin-lds": "^1.354.0-dev6",
+        "@salesforce/lds-adapters-graphql": "^1.354.0-dev7",
+        "@salesforce/lds-drafts": "^1.354.0-dev7",
+        "@salesforce/lds-durable-records": "^1.354.0-dev7",
+        "@salesforce/lds-network-adapter": "^1.354.0-dev7",
+        "@salesforce/lds-network-nimbus": "^1.354.0-dev7",
+        "@salesforce/lds-store-binary": "^1.354.0-dev7",
+        "@salesforce/lds-store-nimbus": "^1.354.0-dev7",
+        "@salesforce/lds-store-sql": "^1.354.0-dev7",
+        "@salesforce/lds-utils-adapters": "^1.354.0-dev7",
+        "@salesforce/nimbus-plugin-lds": "^1.354.0-dev7",
         "babel-plugin-dynamic-import-node": "^2.3.3",
         "wait-for-expect": "^3.0.2"
     },
@@ -57,7 +57,7 @@
         {
             "path": "./dist/main.js",
             "maxSize": {
-                "none": "2200 kB",
+                "none": "2205 kB",
                 "min": "1000 kB",
                 "compressed": "250 kB"
             }
@@ -65,7 +65,7 @@
         {
             "path": "./sfdc/main.js",
             "maxSize": {
-                "none": "2200 kB",
+                "none": "2205 kB",
                 "min": "1000 kB",
                 "compressed": "250 kB"
             }

package/sfdc/main.js

@@ -44335,7 +44335,75 @@ function filterToPredicates(where, recordType, alias, objectInfoMap, joins, draf
             // in 'Account' has the 'Owner' as the 'RelationshipName', the api name in 'referenceToInfos' is 'User'
             if (fieldInfo.referenceToInfos.length === 1) {
                 const childRecordType = fieldInfo.referenceToInfos[0].apiName;
-                predicates.push(...filterToPredicates(where[field], childRecordType, childAlias, objectInfoMap, joins));
+                let p = filterToPredicates(where[field], childRecordType, childAlias, objectInfoMap, joins);
+                if (isSinglePredicate(p[0]) && p[0].value === null) {
+                    // @W-18311580 - this is a reference field with a null value. We need to ensure that we handle the case
+                    // where we are joining to a record that may not exist in our offline database, so we need to detect if
+                    // the value is really a null, or if it is a missing record in the offline database.
+                    //
+                    // This effecitvely adds the following predicates to a "where Contact.Account.Name IS NULL" query:
+                    //
+                    // AND (
+                    //        (
+                    //          json_extract("Contact__c_Account__r".data, '$.fields.Id.value') IS NOT NULL (a)
+                    //          AND json_extract("Contact__c".data, '$.fields.AccountId.value') IS NOT NULL (b)
+                    //        )
+                    //        OR json_extract("Contact__c".data, '$.fields.AccountId.value') IS NULL (c)
+                    //     )
+                    //
+                    // Where:
+                    // (a) AND (b) ensures we have an account record when it is supposed to exist,
+                    // OR (c) if AccountId is null, we know we are not referencing an account record.
+                    let notNullPredicate = {
+                        type: PredicateType.compound,
+                        operator: 'and',
+                        children: [
+                            {
+                                alias: alias,
+                                leftPath: leftPath,
+                                operator: 'IS NOT',
+                                value: null,
+                                dataType: 'String',
+                                type: PredicateType.single,
+                                isCaseSensitive: true,
+                            },
+                            {
+                                alias: childAlias,
+                                leftPath: `$.fields.Id.value`,
+                                operator: 'IS NOT',
+                                value: null,
+                                dataType: 'String',
+                                type: PredicateType.single,
+                                isCaseSensitive: true,
+                            },
+                        ],
+                    };
+                    let nullPredicate = {
+                        type: PredicateType.compound,
+                        operator: 'or',
+                        children: [
+                            notNullPredicate,
+                            {
+                                alias: alias,
+                                leftPath: leftPath,
+                                operator: 'IS',
+                                value: null,
+                                dataType: 'String',
+                                type: PredicateType.single,
+                                isCaseSensitive: true,
+                            },
+                        ],
+                    };
+                    let compoundPredicate = {
+                        type: PredicateType.compound,
+                        operator: 'and',
+                        children: [...p, nullPredicate],
+                    };
+                    predicates.push(compoundPredicate);
+                }
+                else {
+                    predicates.push(...p);
+                }
             }
             else {
                 // @W-12618378 polymorphic query sometimes does not work as expected on server. The GQL on certain entities could fail.
@@ -52496,6 +52564,7 @@ function generateTypedBatches(work, batchSize) {
     return batches;
 }
 
+const skippedCompoundFieldTypes = ['Address', 'Location'];
 function getMissingElementsFromSuperset(superset, subset) {
     return subset.filter((val) => !superset.includes(val));
 }
@@ -52512,6 +52581,7 @@ function buildFieldUnionArray(existingRecord, incomingRecord, objectInfo) {
     const allFields = Array.from(new Set([...Object.keys(existingRecord.fields), ...Object.keys(incomingRecord.fields)]));
     const fieldUnion = [];
     let includesSpanningFields = false;
+    let includesSkippedFields = false;
     allFields.forEach((fieldName) => {
         const objectInfoField = objectInfo.fields[fieldName];
         if (objectInfoField === undefined) {
@@ -52529,10 +52599,17 @@ function buildFieldUnionArray(existingRecord, incomingRecord, objectInfo) {
             }
         }
         else {
+            if (skippedCompoundFieldTypes.includes(objectInfo.fields[fieldName].dataType)) {
+                includesSkippedFields = true;
+            }
             fieldUnion.push(fieldName);
         }
     });
-    return { fields: fieldUnion, includesSpanningFields };
+    return {
+        fields: fieldUnion,
+        includesSpanningFields,
+        includesSkippedFields,
+    };
 }
 /**
  * Merges (if possible) an incoming record from a priming session with an existing record in the durable store.
@@ -52595,9 +52672,15 @@ function mergeRecord(existingRecord, incomingRecord, objectInfo) {
     }
     else {
         const missingFields = getMissingElementsFromSuperset(Object.keys(incomingRecord.fields), Object.keys(existingRecord.fields));
-        // if the only missing fields are spanning fields and their corresponding lookup fields match, we can merge
-        // since none of the changed fields are part of the incoming record
-        if (missingFields.every((field) => {
+        // tests for missing optional fields, pending fields, and spanning fields that can be merged
+        const fieldIsMergeable = (field) => {
+            // missing and pending fields in the existing record are mergeable
+            const fieldState = existingRecord.fields[field].__state;
+            if (fieldState && (fieldState.pending === true || fieldState.isMissing === true)) {
+                return true;
+            }
+            // if the only missing fields are spanning fields and their corresponding lookup fields match, we can merge
+            // since none of the changed fields are part of the incoming record
             const referenceFieldName = findReferenceFieldForSpanningField(field, objectInfo);
             if (referenceFieldName === undefined) {
                 return false;
@@ -52606,7 +52689,8 @@ function mergeRecord(existingRecord, incomingRecord, objectInfo) {
                 incomingRecord.fields[referenceFieldName] &&
                 incomingRecord.fields[referenceFieldName].value ===
                     existingRecord.fields[referenceFieldName].value);
-        })) {
+        };
+        if (missingFields.every(fieldIsMergeable)) {
             return {
                 ok: true,
                 needsWrite: true,
@@ -52626,8 +52710,8 @@ function mergeRecord(existingRecord, incomingRecord, objectInfo) {
             };
         }
         // If Etags do not match and the incoming record does not contain all fields, re-request the record
-        const { fields, includesSpanningFields } = buildFieldUnionArray(existingRecord, incomingRecord, objectInfo);
-        if (includesSpanningFields) {
+        const { fields, includesSpanningFields, includesSkippedFields } = buildFieldUnionArray(existingRecord, incomingRecord, objectInfo);
+        if (includesSpanningFields || includesSkippedFields) {
             return {
                 ok: false,
                 code: 'conflict-spanning-record',
@@ -53617,7 +53701,15 @@ class RecordLoaderSOQLComposite extends NetworkRecordLoader {
         if (Object.keys(recordTypeInfos).length > 1) {
             fieldSet.add('RecordTypeId');
         }
-        const fields = Array.from(fieldSet);
+        const fields = Array.from(fieldSet).filter((field) => {
+            const fieldMetadata = batch.objectInfo.fields[field];
+            // skip Address and Location compound fields
+            if (fieldMetadata.compound &&
+                skippedCompoundFieldTypes.includes(fieldMetadata.dataType)) {
+                return false;
+            }
+            return true;
+        });
         // We will have SOQL format specific data types for us by adding a format() value.
         // The field alias will have ___display added to the end.
         for (const field of fieldSet) {
@@ -53636,7 +53728,6 @@ class RecordLoaderSOQLComposite extends NetworkRecordLoader {
             }
         }
         const query = `SELECT ${fields.join(',')} FROM ${batch.type} `;
-        // console.log(`DUSTIN: soql batch query: ${query}`);
         return query;
     }
     generateWhere(ids) {
@@ -55676,4 +55767,4 @@ register({
 });
 
 export { O11Y_NAMESPACE_LDS_MOBILE, getRuntime, ingest$1o as ingestDenormalizedRecordRepresentation, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.354.0-dev6-a32f37c654
+// version: 1.354.0-dev7-d25082f814

package/sfdc/types/priming/utils/merge.d.ts

@@ -14,6 +14,7 @@ export interface MergeResultConflict {
     fieldUnion: string[];
 }
 type MergeResult = MergeResultSuccess | MergeResultConflict;
+export declare const skippedCompoundFieldTypes: string[];
 /**
  * Merges (if possible) an incoming record from a priming session with an existing record in the durable store.
  *