@salesforce/lds-runtime-mobile 1.121.0 → 1.122.0

package/dist/main.js

@@ -6365,7 +6365,7 @@ function recordLoaderFactory(query) {
     return new DataLoader(batchRecordQuery);
 }
 
-function createContext(store, objectInfos, eventEmitter, settings, snapshot) {
+function createContext(store, objectInfos, eventEmitter, settings, snapshot, draftFunctions) {
     store.query.bind(store);
     const query = (sql, params) => {
         const now = Date.now();
@@ -6392,6 +6392,7 @@ function createContext(store, objectInfos, eventEmitter, settings, snapshot) {
         Record,
         snapshot,
         seenRecordIds: new Set(),
+        draftFunctions,
     };
 }
 
@@ -6777,7 +6778,7 @@ function dateTimeRange(input, op, field, alias) {
 }
 
 const MultiPickListValueSeparator = ';';
-function filterToPredicates(where, recordType, alias, objectInfoMap, joins) {
+function filterToPredicates(where, recordType, alias, objectInfoMap, joins, draftFunctions) {
     if (!where)
         return [];
     let predicates = [];
@@ -6859,38 +6860,52 @@ function filterToPredicates(where, recordType, alias, objectInfoMap, joins) {
             }
         }
         else {
+            //`field` match the filedInfo's apiName
             for (const [op, value] of entries$2(where[field])) {
                 const operator = operatorToSql(op);
-                const fieldInfo = objectInfoMap[recordType].fields[field];
-                const coerceIdNeeded = isCoerceIdNeeded(fieldInfo, field, op);
+                /**
+                Two types ID processing might be needed. Draft ID swapping is optional, which depends on DraftFunctions existence.
+                 1. Coercing is needed when query is executed against local db if field is Id field of entity or a reference to an entity. It is OK to use 15 char ID to query agaist server,
+                    so there is no need to coerce the ID in injected AST which is used by luvio to do the network request when necessary.
+                 2. Draft ID swapping is needed when adapter rebuild is triggered. Draft ID swapping also happens in field injection phase when adapter call is invoked. The injected AST node has
+                 the canonical ID and is passed to Luvio
+                */
+                const idProcessingNeeded = isIDValueField(fieldInfo);
                 const makePredicate = fieldInfo.dataType === 'MultiPicklist'
                     ? createMultiPicklistPredicate
                     : createSinglePredicate;
-                predicates.push(makePredicate(coerceIdNeeded ? generateCoercedPredicateValue(value) : value, operator, fieldInfo, alias));
+                predicates.push(makePredicate(idProcessingNeeded
+                    ? sanitizePredicateIDValue(value, draftFunctions)
+                    : value, operator, fieldInfo, alias));
             }
         }
     }
     return predicates;
 }
 /**
- * Coercing is needed when query is executed against local db if field is Id field of entity or a reference to an entity. It is OK to use 15 char ID to query agaist server,
- * so there is no need to coerce the ID in injected AST which is used by luvio to do the network request when necessary.
+ *
  * @param fieldInfo
- * @param fieldName
- * @returns true if coerce is needed
+ * @returns true if field is of IDValue type
  */
-function isCoerceIdNeeded(fieldInfo, fieldName, op) {
-    return ((fieldName === 'Id' ||
-        (fieldInfo.apiName === fieldName && fieldInfo.referenceToInfos.length > 0)) &&
-        (op === 'eq' || op === 'ne' || op === 'in' || op === 'nin'));
+function isIDValueField(fieldInfo) {
+    return fieldInfo.apiName === 'Id' || fieldInfo.referenceToInfos.length > 0;
 }
-function generateCoercedPredicateValue(value) {
+/**
+ * Coerces and swaps ID if it is a draft ID.
+ * @param value Predicate value which might be a string value like 'John' or a List like ['Acme', 'John']
+ * @param draftFunction optional. If undefined, draft ID swapping does not happen
+ * @returns sanitized previdicate value
+ */
+function sanitizePredicateIDValue(value, draftFunction) {
     if (isArray$2(value)) {
-        return value.map(generateCoercedPredicateValue);
+        return value.map((singleValue) => sanitizePredicateIDValue(singleValue, draftFunction));
     }
     else {
         const coercedId = getRecordId18(value);
         if (coercedId !== undefined) {
+            if (draftFunction !== undefined && draftFunction.isDraftId(coercedId)) {
+                return draftFunction.getCanonicalId(coercedId);
+            }
             return coercedId;
         }
         return value;
@@ -8306,7 +8321,7 @@ function addResolversToSchema(schema, polyFields) {
 }
 async function connectionEdgeResolver(obj, _args, context) {
     const { parentArgs = {}, parentRecord, currentFieldName } = obj;
-    const { query, objectInfos } = context;
+    const { query, objectInfos, draftFunctions } = context;
     let joins = [];
     let alias = currentFieldName;
     let childRelationshipFieldName = undefined;
@@ -8323,7 +8338,7 @@ async function connectionEdgeResolver(obj, _args, context) {
     }
     // Alias starts as entity's ApiName
     const predicates = [
-        ...filterToPredicates(parentArgs.where, alias, alias, context.objectInfos, joins),
+        ...filterToPredicates(parentArgs.where, alias, alias, context.objectInfos, joins, draftFunctions),
         ...scopeToPredicates(parentArgs.scope, context.settings),
         ...childRelationshipToPredicates(childRelationshipFieldName, parentRecord.id),
     ];
@@ -8885,7 +8900,7 @@ function createSchema(objectInfos) {
     return addResolversToSchema(schema, polyFieldTypeNames);
 }
 
-async function evaluate(config, observers, settings, objectInfos, store, snapshot) {
+async function evaluate(config, observers, settings, objectInfos, store, snapshot, draftFunctions) {
     const eventEmitter = createCustomAdapterEventEmitter(GRAPHQL_EVAL_NAMESPACE, observers);
     // this is only wrapped in a try to execute the event after the result was returned
     try {
@@ -8918,7 +8933,7 @@ async function evaluate(config, observers, settings, objectInfos, store, snapsho
         eventEmitter({ type: 'graphql-preconditions-met' });
         // create the resolver request context, runtime values and functions for
         // resolvers to do their job.
-        const contextValue = createContext(store, objectInfos, eventEmitter, settings, snapshot);
+        const contextValue = createContext(store, objectInfos, eventEmitter, settings, snapshot, draftFunctions);
         // We're building this from scratch from each request.  If this becomes a
         // hotspot we can pull it up and memoize it later
         const schema = createSchema(objectInfos);
@@ -12244,11 +12259,11 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
         let internalRequestContext = {
             ...requestContext,
         };
+        const draftFunctions = {
+            isDraftId,
+            getCanonicalId,
+        };
         try {
-            const draftFunctions = {
-                isDraftId,
-                getCanonicalId,
-            };
             ({
                 modifiedAST: injectedAST,
                 objectInfos: objectInfoNeeded,
@@ -12331,7 +12346,7 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
             let { result: rebuildResult, seenRecordIds } = await evaluate({
                 ...config,
                 query: injectedAST,
-            }, observers, { userId }, objectInfoNeeded, store, originalSnapshot);
+            }, observers, { userId }, objectInfoNeeded, store, originalSnapshot, draftFunctions);
             if (!rebuildResult.errors) {
                 rebuildResult = removeSyntheticFields(rebuildResult, config.query);
             }
@@ -15629,4 +15644,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.121.0-f722acdeb
+// version: 1.122.0-aa6cc75e0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-mobile",
-    "version": "1.121.0",
+    "version": "1.122.0",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS runtime for mobile/hybrid environments.",
     "main": "dist/main.js",

package/sfdc/main.js

@@ -6365,7 +6365,7 @@ function recordLoaderFactory(query) {
     return new DataLoader(batchRecordQuery);
 }
 
-function createContext(store, objectInfos, eventEmitter, settings, snapshot) {
+function createContext(store, objectInfos, eventEmitter, settings, snapshot, draftFunctions) {
     store.query.bind(store);
     const query = (sql, params) => {
         const now = Date.now();
@@ -6392,6 +6392,7 @@ function createContext(store, objectInfos, eventEmitter, settings, snapshot) {
         Record,
         snapshot,
         seenRecordIds: new Set(),
+        draftFunctions,
     };
 }
 
@@ -6777,7 +6778,7 @@ function dateTimeRange(input, op, field, alias) {
 }
 
 const MultiPickListValueSeparator = ';';
-function filterToPredicates(where, recordType, alias, objectInfoMap, joins) {
+function filterToPredicates(where, recordType, alias, objectInfoMap, joins, draftFunctions) {
     if (!where)
         return [];
     let predicates = [];
@@ -6859,38 +6860,52 @@ function filterToPredicates(where, recordType, alias, objectInfoMap, joins) {
             }
         }
         else {
+            //`field` match the filedInfo's apiName
             for (const [op, value] of entries$2(where[field])) {
                 const operator = operatorToSql(op);
-                const fieldInfo = objectInfoMap[recordType].fields[field];
-                const coerceIdNeeded = isCoerceIdNeeded(fieldInfo, field, op);
+                /**
+                Two types ID processing might be needed. Draft ID swapping is optional, which depends on DraftFunctions existence.
+                 1. Coercing is needed when query is executed against local db if field is Id field of entity or a reference to an entity. It is OK to use 15 char ID to query agaist server,
+                    so there is no need to coerce the ID in injected AST which is used by luvio to do the network request when necessary.
+                 2. Draft ID swapping is needed when adapter rebuild is triggered. Draft ID swapping also happens in field injection phase when adapter call is invoked. The injected AST node has
+                 the canonical ID and is passed to Luvio
+                */
+                const idProcessingNeeded = isIDValueField(fieldInfo);
                 const makePredicate = fieldInfo.dataType === 'MultiPicklist'
                     ? createMultiPicklistPredicate
                     : createSinglePredicate;
-                predicates.push(makePredicate(coerceIdNeeded ? generateCoercedPredicateValue(value) : value, operator, fieldInfo, alias));
+                predicates.push(makePredicate(idProcessingNeeded
+                    ? sanitizePredicateIDValue(value, draftFunctions)
+                    : value, operator, fieldInfo, alias));
             }
         }
     }
     return predicates;
 }
 /**
- * Coercing is needed when query is executed against local db if field is Id field of entity or a reference to an entity. It is OK to use 15 char ID to query agaist server,
- * so there is no need to coerce the ID in injected AST which is used by luvio to do the network request when necessary.
+ *
  * @param fieldInfo
- * @param fieldName
- * @returns true if coerce is needed
+ * @returns true if field is of IDValue type
  */
-function isCoerceIdNeeded(fieldInfo, fieldName, op) {
-    return ((fieldName === 'Id' ||
-        (fieldInfo.apiName === fieldName && fieldInfo.referenceToInfos.length > 0)) &&
-        (op === 'eq' || op === 'ne' || op === 'in' || op === 'nin'));
+function isIDValueField(fieldInfo) {
+    return fieldInfo.apiName === 'Id' || fieldInfo.referenceToInfos.length > 0;
 }
-function generateCoercedPredicateValue(value) {
+/**
+ * Coerces and swaps ID if it is a draft ID.
+ * @param value Predicate value which might be a string value like 'John' or a List like ['Acme', 'John']
+ * @param draftFunction optional. If undefined, draft ID swapping does not happen
+ * @returns sanitized previdicate value
+ */
+function sanitizePredicateIDValue(value, draftFunction) {
     if (isArray$2(value)) {
-        return value.map(generateCoercedPredicateValue);
+        return value.map((singleValue) => sanitizePredicateIDValue(singleValue, draftFunction));
     }
     else {
         const coercedId = getRecordId18(value);
         if (coercedId !== undefined) {
+            if (draftFunction !== undefined && draftFunction.isDraftId(coercedId)) {
+                return draftFunction.getCanonicalId(coercedId);
+            }
             return coercedId;
         }
         return value;
@@ -8306,7 +8321,7 @@ function addResolversToSchema(schema, polyFields) {
 }
 async function connectionEdgeResolver(obj, _args, context) {
     const { parentArgs = {}, parentRecord, currentFieldName } = obj;
-    const { query, objectInfos } = context;
+    const { query, objectInfos, draftFunctions } = context;
     let joins = [];
     let alias = currentFieldName;
     let childRelationshipFieldName = undefined;
@@ -8323,7 +8338,7 @@ async function connectionEdgeResolver(obj, _args, context) {
     }
     // Alias starts as entity's ApiName
     const predicates = [
-        ...filterToPredicates(parentArgs.where, alias, alias, context.objectInfos, joins),
+        ...filterToPredicates(parentArgs.where, alias, alias, context.objectInfos, joins, draftFunctions),
         ...scopeToPredicates(parentArgs.scope, context.settings),
         ...childRelationshipToPredicates(childRelationshipFieldName, parentRecord.id),
     ];
@@ -8885,7 +8900,7 @@ function createSchema(objectInfos) {
     return addResolversToSchema(schema, polyFieldTypeNames);
 }
 
-async function evaluate(config, observers, settings, objectInfos, store, snapshot) {
+async function evaluate(config, observers, settings, objectInfos, store, snapshot, draftFunctions) {
     const eventEmitter = createCustomAdapterEventEmitter(GRAPHQL_EVAL_NAMESPACE, observers);
     // this is only wrapped in a try to execute the event after the result was returned
     try {
@@ -8918,7 +8933,7 @@ async function evaluate(config, observers, settings, objectInfos, store, snapsho
         eventEmitter({ type: 'graphql-preconditions-met' });
         // create the resolver request context, runtime values and functions for
         // resolvers to do their job.
-        const contextValue = createContext(store, objectInfos, eventEmitter, settings, snapshot);
+        const contextValue = createContext(store, objectInfos, eventEmitter, settings, snapshot, draftFunctions);
         // We're building this from scratch from each request.  If this becomes a
         // hotspot we can pull it up and memoize it later
         const schema = createSchema(objectInfos);
@@ -12244,11 +12259,11 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
         let internalRequestContext = {
             ...requestContext,
         };
+        const draftFunctions = {
+            isDraftId,
+            getCanonicalId,
+        };
         try {
-            const draftFunctions = {
-                isDraftId,
-                getCanonicalId,
-            };
             ({
                 modifiedAST: injectedAST,
                 objectInfos: objectInfoNeeded,
@@ -12331,7 +12346,7 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
             let { result: rebuildResult, seenRecordIds } = await evaluate({
                 ...config,
                 query: injectedAST,
-            }, observers, { userId }, objectInfoNeeded, store, originalSnapshot);
+            }, observers, { userId }, objectInfoNeeded, store, originalSnapshot, draftFunctions);
             if (!rebuildResult.errors) {
                 rebuildResult = removeSyntheticFields(rebuildResult, config.query);
             }
@@ -15629,4 +15644,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.121.0-f722acdeb
+// version: 1.122.0-aa6cc75e0