@salesforce/lds-runtime-mobile 1.136.6 → 1.136.7

package/dist/main.js

@@ -37,7 +37,7 @@ import formattingOptions from 'lightning/i18nCldrOptions';
 const { parse: parse$5, stringify: stringify$5 } = JSON;
 const { join: join$2, push: push$2, unshift } = Array.prototype;
 const { isArray: isArray$5 } = Array;
-const { entries: entries$3, keys: keys$6 } = Object;
+const { entries: entries$3, keys: keys$7 } = Object;
 
 const UI_API_BASE_URI = '/services/data/v59.0/ui-api';
 
@@ -102,7 +102,7 @@ function isSpanningRecord$1(fieldValue) {
 function mergeRecordFields$1(first, second) {
     const { fields: targetFields } = first;
     const { fields: sourceFields } = second;
-    const fieldNames = keys$6(sourceFields);
+    const fieldNames = keys$7(sourceFields);
     for (let i = 0, len = fieldNames.length; i < len; i += 1) {
         const fieldName = fieldNames[i];
         const sourceField = sourceFields[fieldName];
@@ -516,7 +516,7 @@ function isDeprecatedDurableStoreEntry(durableRecord) {
 }
 const DefaultDurableSegment = 'DEFAULT';
 
-const { keys: keys$5, create: create$5, assign: assign$4, freeze: freeze$1 } = Object;
+const { keys: keys$6, create: create$5, assign: assign$4, freeze: freeze$1 } = Object;
 
 //Durable store error instrumentation key
 const DURABLE_STORE_ERROR = 'durable-store-error';
@@ -563,7 +563,7 @@ function publishDurableStoreEntries(durableRecords, put, publishMetadata) {
     if (durableRecords === undefined) {
         return { revivedKeys, hadUnexpectedShape };
     }
-    const durableKeys = keys$5(durableRecords);
+    const durableKeys = keys$6(durableRecords);
     if (durableKeys.length === 0) {
         // no records to revive
         return { revivedKeys, hadUnexpectedShape };
@@ -737,7 +737,7 @@ class DurableTTLStore {
                     overrides,
                 };
             }
-            const keys$1 = keys$5(entries);
+            const keys$1 = keys$6(entries);
             for (let i = 0, len = keys$1.length; i < len; i++) {
                 const key = keys$1[i];
                 const entry = entries[key];
@@ -765,7 +765,7 @@ function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStor
     // TODO: W-8909393 Once metadata is stored in its own segment we need to
     // call setEntries for the visitedIds on default segment and call setEntries
     // on the metadata segment for the refreshedIds
-    const keys$1 = keys$5({ ...visitedIds, ...refreshedIds });
+    const keys$1 = keys$6({ ...visitedIds, ...refreshedIds });
     for (let i = 0, len = keys$1.length; i < len; i += 1) {
         const key = keys$1[i];
         const record = records[key];
@@ -787,7 +787,7 @@ function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStor
     }
     const durableStoreOperations = [];
     // publishes
-    const recordKeys = keys$5(durableRecords);
+    const recordKeys = keys$6(durableRecords);
     if (recordKeys.length > 0) {
         durableStoreOperations.push({
             type: 'setEntries',
@@ -796,7 +796,7 @@ function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStor
         });
     }
     // evicts
-    const evictedKeys = keys$5(evictedRecords);
+    const evictedKeys = keys$6(evictedRecords);
     if (evictedKeys.length > 0) {
         durableStoreOperations.push({
             type: 'evictEntries',
@@ -950,7 +950,7 @@ function makeDurable(environment, { durableStore, instrumentation }) {
             try {
                 const entries = await durableStore.getEntries(adapterContextKeysFromDifferentInstance, AdapterContextSegment);
                 if (entries !== undefined) {
-                    const entryKeys = keys$5(entries);
+                    const entryKeys = keys$6(entries);
                     for (let i = 0, len = entryKeys.length; i < len; i++) {
                         const entryKey = entryKeys[i];
                         const entry = entries[entryKey];
@@ -1767,6 +1767,12 @@ function getRelationshipInfo(apiName, fieldName, infoMap) {
 function stringLiteral(value, safe = false, isCaseSensitive = false) {
     return { type: ValueType.StringLiteral, value, safe, isCaseSensitive };
 }
+function isStringLiteral(expression) {
+    return expression.type === ValueType.StringLiteral;
+}
+function isStringArray(expression) {
+    return expression.type === ValueType.StringArray;
+}
 function comparison(left, operator, right) {
     return { type: PredicateType$1.comparison, left, right, operator };
 }
@@ -2537,6 +2543,9 @@ function compoundOperatorToSql(operator) {
     }
 }
 
+const { isArray: isArray$4 } = Array;
+const { keys: keys$5 } = Object;
+
 function isListValueNode(node) {
     return node.kind === 'ListValue';
 }
@@ -2589,13 +2598,13 @@ function isScalarDataType(type) {
 const NotOperator = 'not';
 const { eq, ne, gt, gte, lt, lte, nin, like, includes, excludes } = ComparisonOperator;
 const inOp = ComparisonOperator.in;
-function fieldsToFilters(fieldValues, joinAlias, apiName, input, compoundOperator = CompoundOperator.and, joins) {
+function fieldsToFilters(fieldValues, joinAlias, apiName, input, compoundOperator = CompoundOperator.and, joins, draftFunctions) {
     const results = fieldValues
         .map((value) => {
         if (!isObjectValueNode$1(value)) {
             return [failure([message('Parent filter node should be an object.')])];
         }
-        return Object.entries(value.fields).map(([key, value]) => filter(key, value, joinAlias, apiName, input, joins));
+        return Object.entries(value.fields).map(([key, value]) => filter(key, value, joinAlias, apiName, input, joins, draftFunctions));
     })
         .reduce(flatten$1, []);
     const failures = results.filter(isFailure).reduce(flatMap(errors), []);
@@ -2617,22 +2626,22 @@ function fieldsToFilters(fieldValues, joinAlias, apiName, input, compoundOperato
     return success({ predicate: resolvedPredicate });
 }
 //{where: {Field: ... | and: ... | or: ... | not: ...}}
-function recordFilter(where, joinAlias, apiName, input, joins) {
+function recordFilter(where, joinAlias, apiName, input, joins, draftFunctions) {
     if (where === undefined) {
         return success(undefined);
     }
     // when 'recordFilter' starts, there is no 'NotPredicated'
-    return fieldsToFilters([where.value], joinAlias, apiName, input, CompoundOperator.and, joins).map((result) => result.predicate === undefined || isEmptyPredicate(result.predicate) ? undefined : result);
+    return fieldsToFilters([where.value], joinAlias, apiName, input, CompoundOperator.and, joins, draftFunctions).map((result) => result.predicate === undefined || isEmptyPredicate(result.predicate) ? undefined : result);
 }
-function filter(name, value, tableAlias, apiName, input, joins) {
+function filter(name, value, tableAlias, apiName, input, joins, draftFunctions) {
     if (isCompoundOperator(name)) {
         if (!isListValueNode(value)) {
             return failure([message(`Value for ${name} node must be a list.`)]);
         }
-        return compoundPredicate(name, value, tableAlias, apiName, input, joins);
+        return compoundPredicate(name, value, tableAlias, apiName, input, joins, draftFunctions);
     }
     if (name === NotOperator) {
-        const children = fieldsToFilters([value], tableAlias, apiName, input, CompoundOperator.and, joins);
+        const children = fieldsToFilters([value], tableAlias, apiName, input, CompoundOperator.and, joins, draftFunctions);
         // take the children of a not predicate
         // and wrap them all inside it
         return children.flatMap((container) => {
@@ -2650,10 +2659,10 @@ function filter(name, value, tableAlias, apiName, input, joins) {
     if (!isObjectValueNode$1(value)) {
         return failure([message('Filter node must be an object or list.')]);
     }
-    return fieldFilter(name, value, tableAlias, apiName, input, joins);
+    return fieldFilter(name, value, tableAlias, apiName, input, joins, draftFunctions);
 }
-function compoundPredicate(operator, list, joinAlias, apiName, input, joins) {
-    return fieldsToFilters(list.values, joinAlias, apiName, input, operator, joins);
+function compoundPredicate(operator, list, joinAlias, apiName, input, joins, draftFunctions) {
+    return fieldsToFilters(list.values, joinAlias, apiName, input, operator, joins, draftFunctions);
 }
 /**
  * spans a FieldNode with its ObjectValueNode is passed. All the predicates is added into the 'join' array.
@@ -2664,7 +2673,7 @@ function compoundPredicate(operator, list, joinAlias, apiName, input, joins) {
  * @param joins
  * @returns undefined predicate
  */
-function spanningFilter(fieldInfo, fieldNode, alias, input, joins) {
+function spanningFilter(fieldInfo, fieldNode, alias, input, joins, draftFunctions) {
     const { apiName: fieldName, referenceToInfos, relationshipName } = fieldInfo;
     const referenceInfo = referenceToInfos[0];
     const jsonAlias = `${alias}.${relationshipName}`;
@@ -2683,7 +2692,7 @@ function spanningFilter(fieldInfo, fieldNode, alias, input, joins) {
     joins.push(join);
     // moves constraint predicate to where
     const constraintPredicates = [];
-    const filterResult = fieldsToFilters([fieldNode], jsonAlias, apiName, input, CompoundOperator.and, joins);
+    const filterResult = fieldsToFilters([fieldNode], jsonAlias, apiName, input, CompoundOperator.and, joins, draftFunctions);
     if (filterResult.isSuccess === false) {
         return filterResult;
     }
@@ -2695,7 +2704,11 @@ function spanningFilter(fieldInfo, fieldNode, alias, input, joins) {
     });
     return success({ predicate: combinePredicates(constraintPredicates, CompoundOperator.and) });
 }
-function fieldFilter(fieldName, fieldNode, alias, apiName, input, joins) {
+function isIDValueField$1(fieldInfo) {
+    return (fieldInfo.apiName === 'Id' ||
+        (fieldInfo.referenceToInfos !== undefined && fieldInfo.referenceToInfos.length > 0));
+}
+function fieldFilter(fieldName, fieldNode, alias, apiName, input, joins, draftFunctions) {
     const fieldInfoResult = getFieldInfo(apiName, fieldName, input);
     if (fieldInfoResult.isSuccess === false) {
         return failure([fieldInfoResult.error]);
@@ -2705,8 +2718,9 @@ function fieldFilter(fieldName, fieldNode, alias, apiName, input, joins) {
         return failure([message(`Field ${fieldName} for type ${apiName} not found.`)]);
     }
     if (fieldInfo.dataType === 'Reference' && fieldInfo.relationshipName === fieldName) {
-        return spanningFilter(fieldInfo, fieldNode, alias, input, joins);
+        return spanningFilter(fieldInfo, fieldNode, alias, input, joins, draftFunctions);
     }
+    const idProcessingNeeded = isIDValueField$1(fieldInfo);
     const extract = {
         type: ValueType.Extract,
         jsonAlias: alias,
@@ -2797,7 +2811,29 @@ function fieldFilter(fieldName, fieldNode, alias, apiName, input, joins) {
                 children,
             };
         }
-        return comparison(extract, op.operator, op.value);
+        const rightOperand = op.value;
+        if (idProcessingNeeded) {
+            if (isStringLiteral(rightOperand)) {
+                if (rightOperand.value !== null) {
+                    if (draftFunctions.isDraftId(rightOperand.value)) {
+                        rightOperand.value = draftFunctions.getCanonicalId(rightOperand.value);
+                    }
+                }
+            }
+            else if (isStringArray(rightOperand)) {
+                if (rightOperand.value !== null) {
+                    rightOperand.value = rightOperand.value.map((originalId) => {
+                        if (originalId !== null) {
+                            if (draftFunctions.isDraftId(originalId)) {
+                                return draftFunctions.getCanonicalId(originalId);
+                            }
+                        }
+                        return originalId;
+                    });
+                }
+            }
+        }
+        return comparison(extract, op.operator, rightOperand);
     });
     const combined = combinePredicates(comparisons.concat(...dateFunction.value), CompoundOperator.and);
     const container = {
@@ -3899,7 +3935,7 @@ function recordQuery(selection, apiName, alias, predicates, input) {
     const orderByJoins = [];
     const orderByResult = parseOrderBy(orderByArg, alias, apiName, input.objectInfoMap, orderByJoins);
     const filterJoins = [];
-    const whereResult = recordFilter(whereArg, alias, apiName, input.objectInfoMap, filterJoins);
+    const whereResult = recordFilter(whereArg, alias, apiName, input.objectInfoMap, filterJoins, input.draftFunctions);
     const scopeJoins = [];
     const scopeResult = scopeFilter(scopeArg, alias, apiName, input, scopeJoins);
     let additionalPredicates = [];
@@ -4061,27 +4097,19 @@ function generateVariableGQLQuery(document, variables) {
             ? node.arguments
                 .map((args) => {
                 const { value, name } = args;
+                //The variable is on the top level, for example `where: ${filter}`
                 if (is(value, 'Variable')) {
-                    const variable = variables[value.name];
-                    if (variable) {
-                        const jsonString = JSON.stringify(variable);
-                        const buildRecordQueryString = (name, query, transform) => {
-                            return `${name}: ${transform(query)}`;
-                        };
-                        switch (name) {
-                            case 'scope':
-                            case 'orderBy':
-                                return buildRecordQueryString(name, jsonString, removeAllQuotations);
-                            default:
-                                return buildRecordQueryString(name, jsonString, removeQuotationsFromKeys);
-                        }
-                    }
-                    return '';
+                    return generateVariableNodeQuery(value, name, name, variables);
+                }
+                else if (isObjectValueNode$1(value)) {
+                    return generateVariableSubQuery(value, name, name, variables);
                 }
             })
                 .filter(Boolean)
             : undefined;
-        return gqlArguments ? `${node.name}(${gqlArguments.join(',')}) { Id }` : '';
+        return gqlArguments
+            ? `${node.name} ${gqlArguments.length > 0 ? '(' + gqlArguments.join(',') + ')' : ''} { Id }`
+            : '';
     })
         //remove empty strings
         .filter(Boolean)
@@ -4091,6 +4119,51 @@ function generateVariableGQLQuery(document, variables) {
         return [accu.slice(0, 1), query, accu.slice(1, length)].join('');
     }, '{ }'));
 }
+/**
+ * Given a  LuvioValueNode, generates a sql with its variable node replaced with actual value.
+ * @param valueNode G
+ * @param name
+ * @param type
+ * @param variables
+ * @returns
+ */
+function generateVariableSubQuery(valueNode, name, type, variables) {
+    switch (valueNode.kind) {
+        case Kind.OBJECT: {
+            // For example, `{ Id: { eq: $draftId } }` is a `ObjectValueNode`, which has field keys 'Id'
+            const resultQuery = keys$5(valueNode.fields)
+                .map((key) => generateVariableSubQuery(valueNode.fields[key], key, type, variables))
+                .filter((subquery) => subquery.length > 0)
+                .join(',');
+            if (resultQuery.length > 0) {
+                return `${name}: {${resultQuery}}`;
+            }
+            return resultQuery;
+        }
+        case Kind.VARIABLE:
+            return generateVariableNodeQuery(valueNode, name, type, variables);
+        default:
+            return '';
+    }
+}
+// Generate a sql for the variable node with its actual value.
+function generateVariableNodeQuery(value, name, type, variables) {
+    const variable = variables[value.name];
+    if (variable) {
+        const jsonString = JSON.stringify(variable);
+        const buildRecordQueryString = (name, query, transform) => {
+            return `${name}: ${transform(query)}`;
+        };
+        switch (type) {
+            case 'scope':
+            case 'orderBy':
+                return buildRecordQueryString(name, jsonString, removeAllQuotations);
+            default:
+                return buildRecordQueryString(name, jsonString, removeQuotationsFromKeys);
+        }
+    }
+    return '';
+}
 /**
  * Given an AST with variables
  * Swap out the LuvioArgumentNodes on the original AST with ones generated from its variables.
@@ -4109,14 +4182,43 @@ function swapVariableArguments(document, variables) {
             const { name } = node;
             const first = allArgumentRecords.find((n) => n.name === name);
             if (first) {
-                // if we had arguments that did not contain variables we still want those
-                first.arguments = flatten$1(first.arguments
-                    ? first.arguments.filter((x) => x.value.kind !== 'Variable')
-                    : [], node.arguments ? node.arguments : []);
+                const swappedArgments = swapArgumentWithVariableNodes(node.arguments, first.arguments);
+                first.arguments = swappedArgments ? swappedArgments : [];
             }
         });
     }
 }
+// Replaces the variable node  in original LuvioArgumentNode with the actual value in the swapped node with the same path.
+function swapArgumentWithVariableNodes(swapped, original) {
+    if (swapped === undefined || original === undefined) {
+        return original;
+    }
+    return original.map((x) => {
+        const targetNode = swapped.find((y) => y.name === x.name);
+        if (targetNode === undefined) {
+            return x;
+        }
+        if (x.value.kind === 'Variable') {
+            return targetNode;
+        }
+        swapValueNodeWithVariableNodes(x.value, targetNode.value);
+        return x;
+    });
+}
+function swapValueNodeWithVariableNodes(original, swapped) {
+    if (original.kind === Kind.OBJECT) {
+        for (const key of keys$5(original.fields)) {
+            if (isObjectValueNode$1(swapped) && swapped.fields[key]) {
+                if (is(original.fields[key], 'Variable')) {
+                    original.fields[key] = swapped.fields[key];
+                }
+                else {
+                    swapValueNodeWithVariableNodes(original.fields[key], swapped.fields[key]);
+                }
+            }
+        }
+    }
+}
 //find top level record queries
 function findRecordSelections(document) {
     return document.definitions
@@ -4151,7 +4253,7 @@ class StoreEvalPreconditioner {
      * Missing object info records triggers the objectInfoService (same instance shared with Drafts code), to
      * use the getObjectInfos adapter to efficiently fetch the necessary records.
      */
-    async createRootQuery(config, objectInfoService, userId) {
+    async createRootQuery(config, objectInfoService, userId, draftFunctions) {
         const { query: ast, variables } = config;
         swapVariableArguments(ast, variables);
         // Parse out top-level record queries types we know we will need, since spanning fields will
@@ -4198,6 +4300,7 @@ class StoreEvalPreconditioner {
             astTransformResult = transform(ast, {
                 userId,
                 objectInfoMap,
+                draftFunctions,
             });
             if (astTransformResult.isSuccess === false) {
                 for (const error of astTransformResult.error) {
@@ -4235,8 +4338,6 @@ class StoreEvalPreconditioner {
     }
 }
 
-const { isArray: isArray$4 } = Array;
-
 /**
  * Checks a GraphQL-shaped network response for errors, returning true if it does
  * and false otherwise
@@ -4282,7 +4383,7 @@ const wrapStartEndEvents = (storeEval) => {
         return snapshot;
     };
 };
-function sqliteStoreEvalFactory(userId, sqliteStore, objectInfoService) {
+function sqliteStoreEvalFactory(userId, sqliteStore, objectInfoService, draftFunctions) {
     // if the store does not support eval then use the noop version
     if (sqliteStore.isEvalSupported() === false) {
         return noopStoreEval;
@@ -4290,7 +4391,7 @@ function sqliteStoreEvalFactory(userId, sqliteStore, objectInfoService) {
     const preconditioner = new StoreEvalPreconditioner();
     return makeStoreEval(preconditioner, objectInfoService, userId, async () => {
         return undefined;
-    }, (query, _context, eventEmitter) => evaluateSqlite(query, eventEmitter, sqliteStore));
+    }, (query, _context, eventEmitter) => evaluateSqlite(query, eventEmitter, sqliteStore), draftFunctions);
 }
 async function noopStoreEval(_config, nonEvaluatedSnapshotOrPromise, _observers) {
     return nonEvaluatedSnapshotOrPromise;
@@ -4309,7 +4410,7 @@ function isErrorSnapshotThatShouldGetReturnedToCaller$1(snapshot) {
 function generateUniqueRecordId$1() {
     return `${GRAPHQL_ROOT_KEY$1}${Date.now() + Math.random().toFixed(5).split('.')[1]}`;
 }
-function makeStoreEval(preconditioner, objectInfoService, userId, contextProvider, queryEvaluator) {
+function makeStoreEval(preconditioner, objectInfoService, userId, contextProvider, queryEvaluator, draftFunctions) {
     const storeEval = async (config, nonEvaluatedSnapshotOrPromise, observers) => {
         const eventEmitter = createCustomAdapterEventEmitter(GRAPHQL_EVAL_NAMESPACE$1, observers);
         // the non-eval'ed input could either be a snapshot or promise of one so
@@ -4339,7 +4440,7 @@ function makeStoreEval(preconditioner, objectInfoService, userId, contextProvide
             context = await contextProvider();
             // Ensures ObjectInfo metadata is available for the request.  Sourcing records from L1/L2/Network
             // is delegated to the getObjectInfo adapter via objectInfoService
-            rootQuery = await preconditioner.createRootQuery(config, objectInfoService, userId);
+            rootQuery = await preconditioner.createRootQuery(config, objectInfoService, userId, draftFunctions);
         }
         catch (error) {
             eventEmitter({
@@ -15645,11 +15746,6 @@ function getRuntime() {
         getIngestMetadataForInternalAdapters =
             internalAdapterDurableEnvironment.getIngestStagingStoreRecords;
         lazyObjectInfoService = new ObjectInfoService(getObjectInfo, getObjectInfos, internalAdapterDurableStore);
-        // set storeEval function for lds-adapters-graghql to use
-        withRegistration('@salesforce/lds-adapters-graphql', (registration) => {
-            const { configuration: { setStoreEval }, } = registration;
-            setStoreEval(sqliteStoreEvalFactory(userId, lazyBaseDurableStore, lazyObjectInfoService));
-        });
         // creates a durable store that denormalizes scalar fields for records
         let getIngestRecords;
         let getIngestMetadata;
@@ -15688,6 +15784,20 @@ function getRuntime() {
         setupMobileInstrumentation(lazyLuvio, store);
         // If the inspection nimbus plugin is configured, inspection is enabled otherwise this is a no-op
         setupInspection(lazyLuvio);
+        // set storeEval function for lds-adapters-graghql to use
+        withRegistration('@salesforce/lds-adapters-graphql', (registration) => {
+            const { configuration: { setStoreEval, setDraftFunctions }, } = registration;
+            const getCanonicalId = (id) => {
+                var _a;
+                return ((_a = extractRecordIdFromStoreKey(lazyLuvio.storeGetCanonicalKey(RECORD_ID_PREFIX + id))) !== null && _a !== void 0 ? _a : id);
+            };
+            const draftFuncs = {
+                isDraftId: isGenerated,
+                getCanonicalId,
+            };
+            setStoreEval(sqliteStoreEvalFactory(userId, lazyBaseDurableStore, lazyObjectInfoService, draftFuncs));
+            setDraftFunctions(draftFuncs);
+        });
         // on core the graphql configuration is split so we need to set configureUIAPIGraphQL both in the
         // graphql registration and the uiapi for off core
         const configureUIAPIGraphQL = (registration) => {
@@ -15740,4 +15850,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.136.6-0f5ec3ee7
+// version: 1.136.7-777657471

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-mobile",
-    "version": "1.136.6",
+    "version": "1.136.7",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS runtime for mobile/hybrid environments.",
     "main": "dist/main.js",
@@ -59,7 +59,7 @@
             "maxSize": {
                 "none": "650 kB",
                 "min": "255 kB",
-                "compressed": "100 kB"
+                "compressed": "102 kB"
             }
         },
         {
@@ -67,7 +67,7 @@
             "maxSize": {
                 "none": "650 kB",
                 "min": "255 kB",
-                "compressed": "100 kB"
+                "compressed": "102 kB"
             }
         }
     ],

package/sfdc/main.js

@@ -37,7 +37,7 @@ import formattingOptions from 'lightning/i18nCldrOptions';
 const { parse: parse$5, stringify: stringify$5 } = JSON;
 const { join: join$2, push: push$2, unshift } = Array.prototype;
 const { isArray: isArray$5 } = Array;
-const { entries: entries$3, keys: keys$6 } = Object;
+const { entries: entries$3, keys: keys$7 } = Object;
 
 const UI_API_BASE_URI = '/services/data/v59.0/ui-api';
 
@@ -102,7 +102,7 @@ function isSpanningRecord$1(fieldValue) {
 function mergeRecordFields$1(first, second) {
     const { fields: targetFields } = first;
     const { fields: sourceFields } = second;
-    const fieldNames = keys$6(sourceFields);
+    const fieldNames = keys$7(sourceFields);
     for (let i = 0, len = fieldNames.length; i < len; i += 1) {
         const fieldName = fieldNames[i];
         const sourceField = sourceFields[fieldName];
@@ -516,7 +516,7 @@ function isDeprecatedDurableStoreEntry(durableRecord) {
 }
 const DefaultDurableSegment = 'DEFAULT';
 
-const { keys: keys$5, create: create$5, assign: assign$4, freeze: freeze$1 } = Object;
+const { keys: keys$6, create: create$5, assign: assign$4, freeze: freeze$1 } = Object;
 
 //Durable store error instrumentation key
 const DURABLE_STORE_ERROR = 'durable-store-error';
@@ -563,7 +563,7 @@ function publishDurableStoreEntries(durableRecords, put, publishMetadata) {
     if (durableRecords === undefined) {
         return { revivedKeys, hadUnexpectedShape };
     }
-    const durableKeys = keys$5(durableRecords);
+    const durableKeys = keys$6(durableRecords);
     if (durableKeys.length === 0) {
         // no records to revive
         return { revivedKeys, hadUnexpectedShape };
@@ -737,7 +737,7 @@ class DurableTTLStore {
                     overrides,
                 };
             }
-            const keys$1 = keys$5(entries);
+            const keys$1 = keys$6(entries);
             for (let i = 0, len = keys$1.length; i < len; i++) {
                 const key = keys$1[i];
                 const entry = entries[key];
@@ -765,7 +765,7 @@ function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStor
     // TODO: W-8909393 Once metadata is stored in its own segment we need to
     // call setEntries for the visitedIds on default segment and call setEntries
     // on the metadata segment for the refreshedIds
-    const keys$1 = keys$5({ ...visitedIds, ...refreshedIds });
+    const keys$1 = keys$6({ ...visitedIds, ...refreshedIds });
     for (let i = 0, len = keys$1.length; i < len; i += 1) {
         const key = keys$1[i];
         const record = records[key];
@@ -787,7 +787,7 @@ function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStor
     }
     const durableStoreOperations = [];
     // publishes
-    const recordKeys = keys$5(durableRecords);
+    const recordKeys = keys$6(durableRecords);
     if (recordKeys.length > 0) {
         durableStoreOperations.push({
             type: 'setEntries',
@@ -796,7 +796,7 @@ function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStor
         });
     }
     // evicts
-    const evictedKeys = keys$5(evictedRecords);
+    const evictedKeys = keys$6(evictedRecords);
     if (evictedKeys.length > 0) {
         durableStoreOperations.push({
             type: 'evictEntries',
@@ -950,7 +950,7 @@ function makeDurable(environment, { durableStore, instrumentation }) {
             try {
                 const entries = await durableStore.getEntries(adapterContextKeysFromDifferentInstance, AdapterContextSegment);
                 if (entries !== undefined) {
-                    const entryKeys = keys$5(entries);
+                    const entryKeys = keys$6(entries);
                     for (let i = 0, len = entryKeys.length; i < len; i++) {
                         const entryKey = entryKeys[i];
                         const entry = entries[entryKey];
@@ -1767,6 +1767,12 @@ function getRelationshipInfo(apiName, fieldName, infoMap) {
 function stringLiteral(value, safe = false, isCaseSensitive = false) {
     return { type: ValueType.StringLiteral, value, safe, isCaseSensitive };
 }
+function isStringLiteral(expression) {
+    return expression.type === ValueType.StringLiteral;
+}
+function isStringArray(expression) {
+    return expression.type === ValueType.StringArray;
+}
 function comparison(left, operator, right) {
     return { type: PredicateType$1.comparison, left, right, operator };
 }
@@ -2537,6 +2543,9 @@ function compoundOperatorToSql(operator) {
     }
 }
 
+const { isArray: isArray$4 } = Array;
+const { keys: keys$5 } = Object;
+
 function isListValueNode(node) {
     return node.kind === 'ListValue';
 }
@@ -2589,13 +2598,13 @@ function isScalarDataType(type) {
 const NotOperator = 'not';
 const { eq, ne, gt, gte, lt, lte, nin, like, includes, excludes } = ComparisonOperator;
 const inOp = ComparisonOperator.in;
-function fieldsToFilters(fieldValues, joinAlias, apiName, input, compoundOperator = CompoundOperator.and, joins) {
+function fieldsToFilters(fieldValues, joinAlias, apiName, input, compoundOperator = CompoundOperator.and, joins, draftFunctions) {
     const results = fieldValues
         .map((value) => {
         if (!isObjectValueNode$1(value)) {
             return [failure([message('Parent filter node should be an object.')])];
         }
-        return Object.entries(value.fields).map(([key, value]) => filter(key, value, joinAlias, apiName, input, joins));
+        return Object.entries(value.fields).map(([key, value]) => filter(key, value, joinAlias, apiName, input, joins, draftFunctions));
     })
         .reduce(flatten$1, []);
     const failures = results.filter(isFailure).reduce(flatMap(errors), []);
@@ -2617,22 +2626,22 @@ function fieldsToFilters(fieldValues, joinAlias, apiName, input, compoundOperato
     return success({ predicate: resolvedPredicate });
 }
 //{where: {Field: ... | and: ... | or: ... | not: ...}}
-function recordFilter(where, joinAlias, apiName, input, joins) {
+function recordFilter(where, joinAlias, apiName, input, joins, draftFunctions) {
     if (where === undefined) {
         return success(undefined);
     }
     // when 'recordFilter' starts, there is no 'NotPredicated'
-    return fieldsToFilters([where.value], joinAlias, apiName, input, CompoundOperator.and, joins).map((result) => result.predicate === undefined || isEmptyPredicate(result.predicate) ? undefined : result);
+    return fieldsToFilters([where.value], joinAlias, apiName, input, CompoundOperator.and, joins, draftFunctions).map((result) => result.predicate === undefined || isEmptyPredicate(result.predicate) ? undefined : result);
 }
-function filter(name, value, tableAlias, apiName, input, joins) {
+function filter(name, value, tableAlias, apiName, input, joins, draftFunctions) {
     if (isCompoundOperator(name)) {
         if (!isListValueNode(value)) {
             return failure([message(`Value for ${name} node must be a list.`)]);
         }
-        return compoundPredicate(name, value, tableAlias, apiName, input, joins);
+        return compoundPredicate(name, value, tableAlias, apiName, input, joins, draftFunctions);
     }
     if (name === NotOperator) {
-        const children = fieldsToFilters([value], tableAlias, apiName, input, CompoundOperator.and, joins);
+        const children = fieldsToFilters([value], tableAlias, apiName, input, CompoundOperator.and, joins, draftFunctions);
         // take the children of a not predicate
         // and wrap them all inside it
         return children.flatMap((container) => {
@@ -2650,10 +2659,10 @@ function filter(name, value, tableAlias, apiName, input, joins) {
     if (!isObjectValueNode$1(value)) {
         return failure([message('Filter node must be an object or list.')]);
     }
-    return fieldFilter(name, value, tableAlias, apiName, input, joins);
+    return fieldFilter(name, value, tableAlias, apiName, input, joins, draftFunctions);
 }
-function compoundPredicate(operator, list, joinAlias, apiName, input, joins) {
-    return fieldsToFilters(list.values, joinAlias, apiName, input, operator, joins);
+function compoundPredicate(operator, list, joinAlias, apiName, input, joins, draftFunctions) {
+    return fieldsToFilters(list.values, joinAlias, apiName, input, operator, joins, draftFunctions);
 }
 /**
  * spans a FieldNode with its ObjectValueNode is passed. All the predicates is added into the 'join' array.
@@ -2664,7 +2673,7 @@ function compoundPredicate(operator, list, joinAlias, apiName, input, joins) {
  * @param joins
  * @returns undefined predicate
  */
-function spanningFilter(fieldInfo, fieldNode, alias, input, joins) {
+function spanningFilter(fieldInfo, fieldNode, alias, input, joins, draftFunctions) {
     const { apiName: fieldName, referenceToInfos, relationshipName } = fieldInfo;
     const referenceInfo = referenceToInfos[0];
     const jsonAlias = `${alias}.${relationshipName}`;
@@ -2683,7 +2692,7 @@ function spanningFilter(fieldInfo, fieldNode, alias, input, joins) {
     joins.push(join);
     // moves constraint predicate to where
     const constraintPredicates = [];
-    const filterResult = fieldsToFilters([fieldNode], jsonAlias, apiName, input, CompoundOperator.and, joins);
+    const filterResult = fieldsToFilters([fieldNode], jsonAlias, apiName, input, CompoundOperator.and, joins, draftFunctions);
     if (filterResult.isSuccess === false) {
         return filterResult;
     }
@@ -2695,7 +2704,11 @@ function spanningFilter(fieldInfo, fieldNode, alias, input, joins) {
     });
     return success({ predicate: combinePredicates(constraintPredicates, CompoundOperator.and) });
 }
-function fieldFilter(fieldName, fieldNode, alias, apiName, input, joins) {
+function isIDValueField$1(fieldInfo) {
+    return (fieldInfo.apiName === 'Id' ||
+        (fieldInfo.referenceToInfos !== undefined && fieldInfo.referenceToInfos.length > 0));
+}
+function fieldFilter(fieldName, fieldNode, alias, apiName, input, joins, draftFunctions) {
     const fieldInfoResult = getFieldInfo(apiName, fieldName, input);
     if (fieldInfoResult.isSuccess === false) {
         return failure([fieldInfoResult.error]);
@@ -2705,8 +2718,9 @@ function fieldFilter(fieldName, fieldNode, alias, apiName, input, joins) {
         return failure([message(`Field ${fieldName} for type ${apiName} not found.`)]);
     }
     if (fieldInfo.dataType === 'Reference' && fieldInfo.relationshipName === fieldName) {
-        return spanningFilter(fieldInfo, fieldNode, alias, input, joins);
+        return spanningFilter(fieldInfo, fieldNode, alias, input, joins, draftFunctions);
     }
+    const idProcessingNeeded = isIDValueField$1(fieldInfo);
     const extract = {
         type: ValueType.Extract,
         jsonAlias: alias,
@@ -2797,7 +2811,29 @@ function fieldFilter(fieldName, fieldNode, alias, apiName, input, joins) {
                 children,
             };
         }
-        return comparison(extract, op.operator, op.value);
+        const rightOperand = op.value;
+        if (idProcessingNeeded) {
+            if (isStringLiteral(rightOperand)) {
+                if (rightOperand.value !== null) {
+                    if (draftFunctions.isDraftId(rightOperand.value)) {
+                        rightOperand.value = draftFunctions.getCanonicalId(rightOperand.value);
+                    }
+                }
+            }
+            else if (isStringArray(rightOperand)) {
+                if (rightOperand.value !== null) {
+                    rightOperand.value = rightOperand.value.map((originalId) => {
+                        if (originalId !== null) {
+                            if (draftFunctions.isDraftId(originalId)) {
+                                return draftFunctions.getCanonicalId(originalId);
+                            }
+                        }
+                        return originalId;
+                    });
+                }
+            }
+        }
+        return comparison(extract, op.operator, rightOperand);
     });
     const combined = combinePredicates(comparisons.concat(...dateFunction.value), CompoundOperator.and);
     const container = {
@@ -3899,7 +3935,7 @@ function recordQuery(selection, apiName, alias, predicates, input) {
     const orderByJoins = [];
     const orderByResult = parseOrderBy(orderByArg, alias, apiName, input.objectInfoMap, orderByJoins);
     const filterJoins = [];
-    const whereResult = recordFilter(whereArg, alias, apiName, input.objectInfoMap, filterJoins);
+    const whereResult = recordFilter(whereArg, alias, apiName, input.objectInfoMap, filterJoins, input.draftFunctions);
     const scopeJoins = [];
     const scopeResult = scopeFilter(scopeArg, alias, apiName, input, scopeJoins);
     let additionalPredicates = [];
@@ -4061,27 +4097,19 @@ function generateVariableGQLQuery(document, variables) {
             ? node.arguments
                 .map((args) => {
                 const { value, name } = args;
+                //The variable is on the top level, for example `where: ${filter}`
                 if (is(value, 'Variable')) {
-                    const variable = variables[value.name];
-                    if (variable) {
-                        const jsonString = JSON.stringify(variable);
-                        const buildRecordQueryString = (name, query, transform) => {
-                            return `${name}: ${transform(query)}`;
-                        };
-                        switch (name) {
-                            case 'scope':
-                            case 'orderBy':
-                                return buildRecordQueryString(name, jsonString, removeAllQuotations);
-                            default:
-                                return buildRecordQueryString(name, jsonString, removeQuotationsFromKeys);
-                        }
-                    }
-                    return '';
+                    return generateVariableNodeQuery(value, name, name, variables);
+                }
+                else if (isObjectValueNode$1(value)) {
+                    return generateVariableSubQuery(value, name, name, variables);
                 }
             })
                 .filter(Boolean)
             : undefined;
-        return gqlArguments ? `${node.name}(${gqlArguments.join(',')}) { Id }` : '';
+        return gqlArguments
+            ? `${node.name} ${gqlArguments.length > 0 ? '(' + gqlArguments.join(',') + ')' : ''} { Id }`
+            : '';
     })
         //remove empty strings
         .filter(Boolean)
@@ -4091,6 +4119,51 @@ function generateVariableGQLQuery(document, variables) {
         return [accu.slice(0, 1), query, accu.slice(1, length)].join('');
     }, '{ }'));
 }
+/**
+ * Given a  LuvioValueNode, generates a sql with its variable node replaced with actual value.
+ * @param valueNode G
+ * @param name
+ * @param type
+ * @param variables
+ * @returns
+ */
+function generateVariableSubQuery(valueNode, name, type, variables) {
+    switch (valueNode.kind) {
+        case Kind.OBJECT: {
+            // For example, `{ Id: { eq: $draftId } }` is a `ObjectValueNode`, which has field keys 'Id'
+            const resultQuery = keys$5(valueNode.fields)
+                .map((key) => generateVariableSubQuery(valueNode.fields[key], key, type, variables))
+                .filter((subquery) => subquery.length > 0)
+                .join(',');
+            if (resultQuery.length > 0) {
+                return `${name}: {${resultQuery}}`;
+            }
+            return resultQuery;
+        }
+        case Kind.VARIABLE:
+            return generateVariableNodeQuery(valueNode, name, type, variables);
+        default:
+            return '';
+    }
+}
+// Generate a sql for the variable node with its actual value.
+function generateVariableNodeQuery(value, name, type, variables) {
+    const variable = variables[value.name];
+    if (variable) {
+        const jsonString = JSON.stringify(variable);
+        const buildRecordQueryString = (name, query, transform) => {
+            return `${name}: ${transform(query)}`;
+        };
+        switch (type) {
+            case 'scope':
+            case 'orderBy':
+                return buildRecordQueryString(name, jsonString, removeAllQuotations);
+            default:
+                return buildRecordQueryString(name, jsonString, removeQuotationsFromKeys);
+        }
+    }
+    return '';
+}
 /**
  * Given an AST with variables
  * Swap out the LuvioArgumentNodes on the original AST with ones generated from its variables.
@@ -4109,14 +4182,43 @@ function swapVariableArguments(document, variables) {
             const { name } = node;
             const first = allArgumentRecords.find((n) => n.name === name);
             if (first) {
-                // if we had arguments that did not contain variables we still want those
-                first.arguments = flatten$1(first.arguments
-                    ? first.arguments.filter((x) => x.value.kind !== 'Variable')
-                    : [], node.arguments ? node.arguments : []);
+                const swappedArgments = swapArgumentWithVariableNodes(node.arguments, first.arguments);
+                first.arguments = swappedArgments ? swappedArgments : [];
             }
         });
     }
 }
+// Replaces the variable node  in original LuvioArgumentNode with the actual value in the swapped node with the same path.
+function swapArgumentWithVariableNodes(swapped, original) {
+    if (swapped === undefined || original === undefined) {
+        return original;
+    }
+    return original.map((x) => {
+        const targetNode = swapped.find((y) => y.name === x.name);
+        if (targetNode === undefined) {
+            return x;
+        }
+        if (x.value.kind === 'Variable') {
+            return targetNode;
+        }
+        swapValueNodeWithVariableNodes(x.value, targetNode.value);
+        return x;
+    });
+}
+function swapValueNodeWithVariableNodes(original, swapped) {
+    if (original.kind === Kind.OBJECT) {
+        for (const key of keys$5(original.fields)) {
+            if (isObjectValueNode$1(swapped) && swapped.fields[key]) {
+                if (is(original.fields[key], 'Variable')) {
+                    original.fields[key] = swapped.fields[key];
+                }
+                else {
+                    swapValueNodeWithVariableNodes(original.fields[key], swapped.fields[key]);
+                }
+            }
+        }
+    }
+}
 //find top level record queries
 function findRecordSelections(document) {
     return document.definitions
@@ -4151,7 +4253,7 @@ class StoreEvalPreconditioner {
      * Missing object info records triggers the objectInfoService (same instance shared with Drafts code), to
      * use the getObjectInfos adapter to efficiently fetch the necessary records.
      */
-    async createRootQuery(config, objectInfoService, userId) {
+    async createRootQuery(config, objectInfoService, userId, draftFunctions) {
         const { query: ast, variables } = config;
         swapVariableArguments(ast, variables);
         // Parse out top-level record queries types we know we will need, since spanning fields will
@@ -4198,6 +4300,7 @@ class StoreEvalPreconditioner {
             astTransformResult = transform(ast, {
                 userId,
                 objectInfoMap,
+                draftFunctions,
             });
             if (astTransformResult.isSuccess === false) {
                 for (const error of astTransformResult.error) {
@@ -4235,8 +4338,6 @@ class StoreEvalPreconditioner {
     }
 }
 
-const { isArray: isArray$4 } = Array;
-
 /**
  * Checks a GraphQL-shaped network response for errors, returning true if it does
  * and false otherwise
@@ -4282,7 +4383,7 @@ const wrapStartEndEvents = (storeEval) => {
         return snapshot;
     };
 };
-function sqliteStoreEvalFactory(userId, sqliteStore, objectInfoService) {
+function sqliteStoreEvalFactory(userId, sqliteStore, objectInfoService, draftFunctions) {
     // if the store does not support eval then use the noop version
     if (sqliteStore.isEvalSupported() === false) {
         return noopStoreEval;
@@ -4290,7 +4391,7 @@ function sqliteStoreEvalFactory(userId, sqliteStore, objectInfoService) {
     const preconditioner = new StoreEvalPreconditioner();
     return makeStoreEval(preconditioner, objectInfoService, userId, async () => {
         return undefined;
-    }, (query, _context, eventEmitter) => evaluateSqlite(query, eventEmitter, sqliteStore));
+    }, (query, _context, eventEmitter) => evaluateSqlite(query, eventEmitter, sqliteStore), draftFunctions);
 }
 async function noopStoreEval(_config, nonEvaluatedSnapshotOrPromise, _observers) {
     return nonEvaluatedSnapshotOrPromise;
@@ -4309,7 +4410,7 @@ function isErrorSnapshotThatShouldGetReturnedToCaller$1(snapshot) {
 function generateUniqueRecordId$1() {
     return `${GRAPHQL_ROOT_KEY$1}${Date.now() + Math.random().toFixed(5).split('.')[1]}`;
 }
-function makeStoreEval(preconditioner, objectInfoService, userId, contextProvider, queryEvaluator) {
+function makeStoreEval(preconditioner, objectInfoService, userId, contextProvider, queryEvaluator, draftFunctions) {
     const storeEval = async (config, nonEvaluatedSnapshotOrPromise, observers) => {
         const eventEmitter = createCustomAdapterEventEmitter(GRAPHQL_EVAL_NAMESPACE$1, observers);
         // the non-eval'ed input could either be a snapshot or promise of one so
@@ -4339,7 +4440,7 @@ function makeStoreEval(preconditioner, objectInfoService, userId, contextProvide
             context = await contextProvider();
             // Ensures ObjectInfo metadata is available for the request.  Sourcing records from L1/L2/Network
             // is delegated to the getObjectInfo adapter via objectInfoService
-            rootQuery = await preconditioner.createRootQuery(config, objectInfoService, userId);
+            rootQuery = await preconditioner.createRootQuery(config, objectInfoService, userId, draftFunctions);
         }
         catch (error) {
             eventEmitter({
@@ -15645,11 +15746,6 @@ function getRuntime() {
         getIngestMetadataForInternalAdapters =
             internalAdapterDurableEnvironment.getIngestStagingStoreRecords;
         lazyObjectInfoService = new ObjectInfoService(getObjectInfo, getObjectInfos, internalAdapterDurableStore);
-        // set storeEval function for lds-adapters-graghql to use
-        withRegistration('@salesforce/lds-adapters-graphql', (registration) => {
-            const { configuration: { setStoreEval }, } = registration;
-            setStoreEval(sqliteStoreEvalFactory(userId, lazyBaseDurableStore, lazyObjectInfoService));
-        });
         // creates a durable store that denormalizes scalar fields for records
         let getIngestRecords;
         let getIngestMetadata;
@@ -15688,6 +15784,20 @@ function getRuntime() {
         setupMobileInstrumentation(lazyLuvio, store);
         // If the inspection nimbus plugin is configured, inspection is enabled otherwise this is a no-op
         setupInspection(lazyLuvio);
+        // set storeEval function for lds-adapters-graghql to use
+        withRegistration('@salesforce/lds-adapters-graphql', (registration) => {
+            const { configuration: { setStoreEval, setDraftFunctions }, } = registration;
+            const getCanonicalId = (id) => {
+                var _a;
+                return ((_a = extractRecordIdFromStoreKey(lazyLuvio.storeGetCanonicalKey(RECORD_ID_PREFIX + id))) !== null && _a !== void 0 ? _a : id);
+            };
+            const draftFuncs = {
+                isDraftId: isGenerated,
+                getCanonicalId,
+            };
+            setStoreEval(sqliteStoreEvalFactory(userId, lazyBaseDurableStore, lazyObjectInfoService, draftFuncs));
+            setDraftFunctions(draftFuncs);
+        });
         // on core the graphql configuration is split so we need to set configureUIAPIGraphQL both in the
         // graphql registration and the uiapi for off core
         const configureUIAPIGraphQL = (registration) => {
@@ -15740,4 +15850,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.136.6-0f5ec3ee7
+// version: 1.136.7-777657471