@salesforce/lds-runtime-mobile 1.131.0-dev12 → 1.131.0-dev14

package/dist/main.js

@@ -4160,8 +4160,8 @@ function rootRecordQuery(selection, input) {
         // If there is no metadata for this query or it somehow lacks a timestamp
         // skip setting the root timestamp
         if (queryMetadata !== undefined && queryMetadata.ingestionTimestamp !== undefined) {
-            // subtract 10ms from timestamp to account for ingestion processing time
-            input.rootTimestamp = queryMetadata.ingestionTimestamp - 10;
+            // subtract 1000ms from timestamp to account for ingestion processing time
+            input.rootTimestamp = queryMetadata.ingestionTimestamp - 1000;
         }
     }
     return recordQuery(selection, alias, apiName, [], input);
@@ -8786,8 +8786,8 @@ async function fetchIngestionTimeStampFromDatabase(apiName, info, args, query) {
         const results = await query(sql, [key]);
         const [timestamp] = results.rows.map((row) => row[0]);
         if (timestamp !== null && typeof timestamp === 'number') {
-            //go back 10 ms to adjust for margin of error when top level query is stored and when raml objects are stored
-            ingestionTimestamp = timestamp - 10;
+            //go back 1000 ms to adjust for margin of error when top level query is stored and when raml objects are stored
+            ingestionTimestamp = timestamp - 1000;
         }
     }
     return ingestionTimestamp;
@@ -9187,26 +9187,20 @@ function generateRecordQueries(objectInfos) {
     let recordConnections = ``;
     const polymorphicFieldTypeNames = new Set();
     let typedScalars = new Set();
+    let parentRelationshipFields = new Set();
     for (const objectInfo of values(objectInfos)) {
         const { apiName, childRelationships } = objectInfo;
         let fields = ``;
         typedScalars.add(`${apiName}_Filter`);
         typedScalars.add(`${apiName}_OrderBy`);
-        for (const childRelationship of childRelationships) {
-            const { childObjectApiName } = childRelationship;
-            // Only add the relationship if there is relevant objectinfos for it,
-            // otherwise we'd be defining types we cannot satisfy and aren't referenced in
-            // the query.
-            if (objectInfos[childObjectApiName] !== undefined) {
-                fields += `${childRelationship.relationshipName}(first: Int, where: ${childObjectApiName}_Filter, orderBy: ${childObjectApiName}_OrderBy, scope: SupportedScopes): ${childObjectApiName}Connection \n`;
-                typedScalars.add(`${childObjectApiName}_Filter`);
-                typedScalars.add(`${childObjectApiName}_OrderBy`);
-            }
-        }
         for (const field of values(objectInfo.fields)) {
             if (!fieldsStaticallyAdded.includes(field.apiName)) {
                 fields += `${field.apiName}: ${dataTypeToType(field.dataType, field.apiName)}\n`;
             }
+            //handles parent relationship
+            if (field.relationshipName === null) {
+                continue;
+            }
             // For spanning parent relationships with no union types
             if (field.referenceToInfos.length === 1) {
                 const [relation] = field.referenceToInfos;
@@ -9214,11 +9208,13 @@ function generateRecordQueries(objectInfos) {
                 // otherwise we'd be defining types we cannot satisfy and aren't referenced in
                 // the query.
                 if (objectInfos[relation.apiName] !== undefined) {
+                    parentRelationshipFields.add(field.relationshipName);
                     fields += `${field.relationshipName}: ${relation.apiName}\n`;
                 }
                 // For polymorphic field, its type is 'Record' inteface. The concrete entity type name is saved for field resolving of next phase
             }
             else if (field.referenceToInfos.length > 1) {
+                parentRelationshipFields.add(field.relationshipName);
                 fields += `${field.relationshipName}: Record\n`;
                 for (const relation of field.referenceToInfos) {
                     if (objectInfos[relation.apiName] !== undefined) {
@@ -9227,6 +9223,20 @@ function generateRecordQueries(objectInfos) {
                 }
             }
         }
+        // handles child relationship
+        for (const childRelationship of childRelationships) {
+            const { childObjectApiName } = childRelationship;
+            // Only add the relationship if there is relevant objectinfos for it,
+            // otherwise we'd be defining types we cannot satisfy and aren't referenced in
+            // the query.
+            // If one field has both parent relationship and child relationship with the same name, the child relationship is ignored. This is how the server GQL has implemented as date of 08/07/2023
+            if (objectInfos[childObjectApiName] !== undefined &&
+                !parentRelationshipFields.has(childRelationship.relationshipName)) {
+                fields += `${childRelationship.relationshipName}(first: Int, where: ${childObjectApiName}_Filter, orderBy: ${childObjectApiName}_OrderBy, scope: SupportedScopes): ${childObjectApiName}Connection \n`;
+                typedScalars.add(`${childObjectApiName}_Filter`);
+                typedScalars.add(`${childObjectApiName}_OrderBy`);
+            }
+        }
         recordQueries += `${apiName}(first: Int, where: ${apiName}_Filter, orderBy: ${apiName}_OrderBy, scope: SupportedScopes): ${apiName}Connection\n`;
         const isServiceAppointment = apiName === 'ServiceAppointment';
         recordConnections += /* GraphQL */ `
@@ -16200,4 +16210,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.131.0-dev12-f6948e56d
+// version: 1.131.0-dev14-98d776146

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-mobile",
-    "version": "1.131.0-dev12",
+    "version": "1.131.0-dev14",
     "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-dev12",
-        "@salesforce/lds-bindings": "1.131.0-dev12",
-        "@salesforce/lds-instrumentation": "1.131.0-dev12",
-        "@salesforce/lds-priming": "1.131.0-dev12",
+        "@salesforce/lds-adapters-uiapi": "1.131.0-dev14",
+        "@salesforce/lds-bindings": "1.131.0-dev14",
+        "@salesforce/lds-instrumentation": "1.131.0-dev14",
+        "@salesforce/lds-priming": "1.131.0-dev14",
         "@salesforce/user": "0.0.12",
         "o11y": "244.0.0"
     },
     "devDependencies": {
-        "@salesforce/lds-adapters-graphql": "1.131.0-dev12",
-        "@salesforce/lds-drafts": "1.131.0-dev12",
-        "@salesforce/lds-drafts-adapters-uiapi": "1.131.0-dev12",
-        "@salesforce/lds-graphql-eval": "1.131.0-dev12",
-        "@salesforce/lds-network-adapter": "1.131.0-dev12",
-        "@salesforce/lds-network-nimbus": "1.131.0-dev12",
-        "@salesforce/lds-store-binary": "1.131.0-dev12",
-        "@salesforce/lds-store-sql": "1.131.0-dev12",
-        "@salesforce/lds-utils-adapters": "1.131.0-dev12",
-        "@salesforce/nimbus-plugin-lds": "1.131.0-dev12",
+        "@salesforce/lds-adapters-graphql": "1.131.0-dev14",
+        "@salesforce/lds-drafts": "1.131.0-dev14",
+        "@salesforce/lds-drafts-adapters-uiapi": "1.131.0-dev14",
+        "@salesforce/lds-graphql-eval": "1.131.0-dev14",
+        "@salesforce/lds-network-adapter": "1.131.0-dev14",
+        "@salesforce/lds-network-nimbus": "1.131.0-dev14",
+        "@salesforce/lds-store-binary": "1.131.0-dev14",
+        "@salesforce/lds-store-sql": "1.131.0-dev14",
+        "@salesforce/lds-utils-adapters": "1.131.0-dev14",
+        "@salesforce/nimbus-plugin-lds": "1.131.0-dev14",
         "babel-plugin-dynamic-import-node": "^2.3.3",
         "wait-for-expect": "^3.0.2"
     },

package/sfdc/main.js

@@ -4160,8 +4160,8 @@ function rootRecordQuery(selection, input) {
         // If there is no metadata for this query or it somehow lacks a timestamp
         // skip setting the root timestamp
         if (queryMetadata !== undefined && queryMetadata.ingestionTimestamp !== undefined) {
-            // subtract 10ms from timestamp to account for ingestion processing time
-            input.rootTimestamp = queryMetadata.ingestionTimestamp - 10;
+            // subtract 1000ms from timestamp to account for ingestion processing time
+            input.rootTimestamp = queryMetadata.ingestionTimestamp - 1000;
         }
     }
     return recordQuery(selection, alias, apiName, [], input);
@@ -8786,8 +8786,8 @@ async function fetchIngestionTimeStampFromDatabase(apiName, info, args, query) {
         const results = await query(sql, [key]);
         const [timestamp] = results.rows.map((row) => row[0]);
         if (timestamp !== null && typeof timestamp === 'number') {
-            //go back 10 ms to adjust for margin of error when top level query is stored and when raml objects are stored
-            ingestionTimestamp = timestamp - 10;
+            //go back 1000 ms to adjust for margin of error when top level query is stored and when raml objects are stored
+            ingestionTimestamp = timestamp - 1000;
         }
     }
     return ingestionTimestamp;
@@ -9187,26 +9187,20 @@ function generateRecordQueries(objectInfos) {
     let recordConnections = ``;
     const polymorphicFieldTypeNames = new Set();
     let typedScalars = new Set();
+    let parentRelationshipFields = new Set();
     for (const objectInfo of values(objectInfos)) {
         const { apiName, childRelationships } = objectInfo;
         let fields = ``;
         typedScalars.add(`${apiName}_Filter`);
         typedScalars.add(`${apiName}_OrderBy`);
-        for (const childRelationship of childRelationships) {
-            const { childObjectApiName } = childRelationship;
-            // Only add the relationship if there is relevant objectinfos for it,
-            // otherwise we'd be defining types we cannot satisfy and aren't referenced in
-            // the query.
-            if (objectInfos[childObjectApiName] !== undefined) {
-                fields += `${childRelationship.relationshipName}(first: Int, where: ${childObjectApiName}_Filter, orderBy: ${childObjectApiName}_OrderBy, scope: SupportedScopes): ${childObjectApiName}Connection \n`;
-                typedScalars.add(`${childObjectApiName}_Filter`);
-                typedScalars.add(`${childObjectApiName}_OrderBy`);
-            }
-        }
         for (const field of values(objectInfo.fields)) {
             if (!fieldsStaticallyAdded.includes(field.apiName)) {
                 fields += `${field.apiName}: ${dataTypeToType(field.dataType, field.apiName)}\n`;
             }
+            //handles parent relationship
+            if (field.relationshipName === null) {
+                continue;
+            }
             // For spanning parent relationships with no union types
             if (field.referenceToInfos.length === 1) {
                 const [relation] = field.referenceToInfos;
@@ -9214,11 +9208,13 @@ function generateRecordQueries(objectInfos) {
                 // otherwise we'd be defining types we cannot satisfy and aren't referenced in
                 // the query.
                 if (objectInfos[relation.apiName] !== undefined) {
+                    parentRelationshipFields.add(field.relationshipName);
                     fields += `${field.relationshipName}: ${relation.apiName}\n`;
                 }
                 // For polymorphic field, its type is 'Record' inteface. The concrete entity type name is saved for field resolving of next phase
             }
             else if (field.referenceToInfos.length > 1) {
+                parentRelationshipFields.add(field.relationshipName);
                 fields += `${field.relationshipName}: Record\n`;
                 for (const relation of field.referenceToInfos) {
                     if (objectInfos[relation.apiName] !== undefined) {
@@ -9227,6 +9223,20 @@ function generateRecordQueries(objectInfos) {
                 }
             }
         }
+        // handles child relationship
+        for (const childRelationship of childRelationships) {
+            const { childObjectApiName } = childRelationship;
+            // Only add the relationship if there is relevant objectinfos for it,
+            // otherwise we'd be defining types we cannot satisfy and aren't referenced in
+            // the query.
+            // If one field has both parent relationship and child relationship with the same name, the child relationship is ignored. This is how the server GQL has implemented as date of 08/07/2023
+            if (objectInfos[childObjectApiName] !== undefined &&
+                !parentRelationshipFields.has(childRelationship.relationshipName)) {
+                fields += `${childRelationship.relationshipName}(first: Int, where: ${childObjectApiName}_Filter, orderBy: ${childObjectApiName}_OrderBy, scope: SupportedScopes): ${childObjectApiName}Connection \n`;
+                typedScalars.add(`${childObjectApiName}_Filter`);
+                typedScalars.add(`${childObjectApiName}_OrderBy`);
+            }
+        }
         recordQueries += `${apiName}(first: Int, where: ${apiName}_Filter, orderBy: ${apiName}_OrderBy, scope: SupportedScopes): ${apiName}Connection\n`;
         const isServiceAppointment = apiName === 'ServiceAppointment';
         recordConnections += /* GraphQL */ `
@@ -16200,4 +16210,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.131.0-dev12-f6948e56d
+// version: 1.131.0-dev14-98d776146