@salesforce/lds-runtime-mobile 1.228.1 → 1.229.0-dev10

package/dist/main.js

@@ -17,6 +17,7 @@ import { HttpStatusCode, StoreKeySet, serializeStructuredKey, Reader, deepFreeze
 import excludeStaleRecordsGate from '@salesforce/gate/lds.graphqlEvalExcludeStaleRecords';
 import { parseAndVisit, Kind, visit, execute, buildSchema, isObjectType, defaultFieldResolver } from '@luvio/graphql-parser';
 import { getRecordId18, keyBuilderQuickActionExecutionRepresentation, ingestQuickActionExecutionRepresentation, keyBuilderContentDocumentCompositeRepresentation, getResponseCacheKeysContentDocumentCompositeRepresentation, keyBuilderFromTypeContentDocumentCompositeRepresentation, ingestContentDocumentCompositeRepresentation, keyBuilderRecord, getTypeCacheKeysRecord, keyBuilderFromTypeRecordRepresentation, ingestRecord, RecordRepresentationRepresentationType, ObjectInfoRepresentationType, getRecordAdapterFactory, getObjectInfoAdapterFactory, getObjectInfosAdapterFactory, UiApiNamespace, RecordRepresentationType, RecordRepresentationTTL, RecordRepresentationVersion, getRecordsAdapterFactory } from '@salesforce/lds-adapters-uiapi';
+import ldsIdempotencyWriteDisabled from '@salesforce/gate/lds.idempotencyWriteDisabled';
 import caseSensitiveUserId from '@salesforce/user/Id';
 import { idleDetector, getInstrumentation } from 'o11y/client';
 import ldsUseShortUrlGate from '@salesforce/gate/lds.useShortUrl';
@@ -552,6 +553,9 @@ function handleDurableStoreRejection(instrument) {
 }
 
 function isStoreEntryError(storeRecord) {
+    if (!storeRecord || typeof storeRecord !== 'object') {
+        return false;
+    }
     return storeRecord.__type === 'error';
 }
 
@@ -1136,12 +1140,12 @@ function makeDurable(environment, { durableStore, instrumentation }) {
         }
         return environment.getNode(key, ingestStagingStore);
     };
-    const wrapNormalizedGraphNode = function (normalized) {
+    const wrapNormalizedGraphNode = function (normalized, key) {
         validateNotDisposed();
         if (ingestStagingStore === null) {
             ingestStagingStore = buildIngestStagingStore(environment);
         }
-        return environment.wrapNormalizedGraphNode(normalized, ingestStagingStore);
+        return environment.wrapNormalizedGraphNode(normalized, key, ingestStagingStore);
     };
     const rebuildSnapshot = function (snapshot, onRebuild) {
         validateNotDisposed();
@@ -1455,6 +1459,72 @@ function makeDurable(environment, { durableStore, instrumentation }) {
     });
 }
 
+/**
+ * Copyright (c) 2022, Salesforce, Inc.,
+ * All rights reserved.
+ * For full license text, see the LICENSE.txt file
+ */
+
+const API_NAMESPACE = 'UiApi';
+const RECORD_REPRESENTATION_NAME = 'RecordRepresentation';
+const RECORD_VIEW_ENTITY_REPRESENTATION_NAME = 'RecordViewEntityRepresentation';
+const RECORD_ID_PREFIX = `${API_NAMESPACE}::${RECORD_REPRESENTATION_NAME}:`;
+const RECORD_VIEW_ENTITY_ID_PREFIX = `${API_NAMESPACE}::${RECORD_VIEW_ENTITY_REPRESENTATION_NAME}:Name:`;
+const RECORD_FIELDS_KEY_JUNCTION = '__fields__';
+function isStoreKeyRecordId(key) {
+    return key.indexOf(RECORD_ID_PREFIX) > -1 && key.indexOf(RECORD_FIELDS_KEY_JUNCTION) === -1;
+}
+function isStoreKeyRecordViewEntity(key) {
+    return (key.indexOf(RECORD_VIEW_ENTITY_ID_PREFIX) > -1 &&
+        key.indexOf(RECORD_FIELDS_KEY_JUNCTION) === -1);
+}
+function isStoreKeyRecordField(key) {
+    return key.indexOf(RECORD_ID_PREFIX) > -1 && key.indexOf(RECORD_FIELDS_KEY_JUNCTION) > -1;
+}
+function extractRecordIdFromStoreKey(key) {
+    if (key === undefined ||
+        (key.indexOf(RECORD_ID_PREFIX) === -1 && key.indexOf(RECORD_VIEW_ENTITY_ID_PREFIX) === -1)) {
+        return undefined;
+    }
+    const parts = key.split(':');
+    return parts[parts.length - 1].split('_')[0];
+}
+function buildRecordFieldStoreKey(recordKey, fieldName) {
+    return `${recordKey}${RECORD_FIELDS_KEY_JUNCTION}${fieldName}`;
+}
+function objectsDeepEqual(lhs, rhs) {
+    if (lhs === rhs)
+        return true;
+    if (typeof lhs !== 'object' || typeof rhs !== 'object' || lhs === null || rhs === null)
+        return false;
+    const lhsKeys = Object.keys(lhs);
+    const rhsKeys = Object.keys(rhs);
+    if (lhsKeys.length !== rhsKeys.length)
+        return false;
+    for (let key of lhsKeys) {
+        if (!rhsKeys.includes(key))
+            return false;
+        if (typeof lhs[key] === 'function' || typeof rhs[key] === 'function') {
+            if (lhs[key].toString() !== rhs[key].toString())
+                return false;
+        }
+        else {
+            if (!objectsDeepEqual(lhs[key], rhs[key]))
+                return false;
+        }
+    }
+    return true;
+}
+
+function isStoreRecordError(storeRecord) {
+    return storeRecord.__type === 'error';
+}
+function isEntryDurableRecordRepresentation(entry, key) {
+    // Either a DurableRecordRepresentation or StoreRecordError can live at a record key
+    return ((isStoreKeyRecordId(key) || isStoreKeyRecordViewEntity(key)) &&
+        entry.data.__type === undefined);
+}
+
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
  * All rights reserved.
@@ -2714,6 +2784,7 @@ function isScalarDataType(type) {
         'Email',
         'TextArea',
         'Percent',
+        'EncryptedString',
     ].includes(type);
 }
 
@@ -4194,8 +4265,12 @@ 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;
+            const timestamp = Number(queryMetadata.ingestionTimestamp);
+            if (!isNaN(timestamp)) {
+                // adjust the timestamp to account for ingestion processing time
+                // 30s is used because this is the default record TTL
+                input.rootTimestamp = timestamp - 30000;
+            }
         }
     }
     return recordQuery(selection, alias, apiName, [], input);
@@ -4653,7 +4728,11 @@ function makeStoreEval(preconditioner, objectInfoService, userId, contextProvide
         try {
             const { data, seenRecords } = await queryEvaluator(rootQuery, context, eventEmitter);
             const rebuildWithStoreEval = ((originalSnapshot) => {
-                return storeEval(config, originalSnapshot, observers, connectionKeyBuilder);
+                return storeEval(config, originalSnapshot, observers, connectionKeyBuilder).then((rebuiltSnapshot) => {
+                    return objectsDeepEqual(originalSnapshot.data, rebuiltSnapshot.data)
+                        ? originalSnapshot
+                        : rebuiltSnapshot;
+                });
             });
             const recordId = generateUniqueRecordId$1();
             // if the non-eval'ed snapshot was an error then we return a synthetic
@@ -5004,8 +5083,12 @@ function uuidv4() {
 
 const HTTP_HEADER_RETRY_AFTER = 'Retry-After';
 const HTTP_HEADER_IDEMPOTENCY_KEY = 'Idempotency-Key';
+const ERROR_CODE_IDEMPOTENCY_FEATURE_NOT_ENABLED = 'IDEMPOTENCY_FEATURE_NOT_ENABLED';
+const ERROR_CODE_IDEMPOTENCY_NOT_SUPPORTED = 'IDEMPOTENCY_NOT_SUPPORTED';
 const ERROR_CODE_IDEMPOTENCY_KEY_USED_DIFFERENT_USER = 'IDEMPOTENCY_KEY_USED_DIFFERENT_USER';
 const ERROR_CODE_IDEMPOTENCY_CONCURRENT_REQUEST = 'IDEMPOTENCY_CONCURRENT_REQUEST';
+const ERROR_CODE_IDEMPOTENCY_KEY_ALREADY_USED = 'IDEMPOTENCY_KEY_ALREADY_USED';
+const ERROR_CODE_IDEMPOTENCY_BACKEND_OPERATION_ERROR = 'IDEMPOTENCY_BACKEND_OPERATION_ERROR';
 /**
  * Get the retry after in milliseconds from the response headers, undefined if not specified.
  * The header could have two different format.
@@ -5035,7 +5118,9 @@ function buildLuvioOverrideForDraftAdapters(luvio, handler, extractTargetIdFromC
     const dispatchResourceRequest = async function (resourceRequest, _context) {
         const resourceRequestCopy = clone$1(resourceRequest);
         resourceRequestCopy.headers = resourceRequestCopy.headers || {};
-        resourceRequestCopy.headers[HTTP_HEADER_IDEMPOTENCY_KEY] = uuidv4();
+        if (handler.hasIdempotencySupport()) {
+            resourceRequestCopy.headers[HTTP_HEADER_IDEMPOTENCY_KEY] = uuidv4();
+        }
         // enable return extra fields for record creation and record update http call
         if (resourceRequest.basePath === '/ui-api/records' &&
             (resourceRequest.method === 'post' || resourceRequest.method === 'patch')) {
@@ -5871,6 +5956,12 @@ class AbstractResourceRequestActionHandler {
         // the luvio store redirect table, during which a new draft might be enqueued
         // which would not see a necessary mapping.
         this.ephemeralRedirects = {};
+        // determined by Server setup.
+        this.isIdempotencySupported = true;
+        // idempotency write flag set by lds
+        this.isLdsIdempotencyWriteDisabled = ldsIdempotencyWriteDisabled.isOpen({
+            fallback: false,
+        });
     }
     enqueue(data) {
         return this.draftQueue.enqueue(this.handlerId, data);
@@ -5900,21 +5991,43 @@ class AbstractResourceRequestActionHandler {
                         retryDelayInMs = getRetryAfterInMs(response.headers);
                         shouldRetry = true;
                         break;
-                    case HttpStatusCode.ServerError:
+                    case HttpStatusCode.ServerError: {
                         shouldRetry = true;
+                        if (this.handleIdempotencyServerError(response.body, updatedAction, false, ERROR_CODE_IDEMPOTENCY_BACKEND_OPERATION_ERROR)) {
+                            this.isIdempotencySupported = false;
+                            retryDelayInMs = 0;
+                            actionDataChanged = true;
+                        }
                         break;
+                    }
                     case 409 /* IdempotentWriteSpecificHttpStatusCode.Conflict */: {
-                        const errorCode = response.body[0].errorCode;
-                        if (errorCode === ERROR_CODE_IDEMPOTENCY_KEY_USED_DIFFERENT_USER) {
-                            updatedAction.data.headers = updatedAction.data.headers || {};
-                            updatedAction.data.headers[HTTP_HEADER_IDEMPOTENCY_KEY] = uuidv4();
+                        if (this.isUiApiErrors(response.body)) {
+                            const errorCode = response.body[0].errorCode;
+                            if (this.handleIdempotencyServerError(response.body, updatedAction, true, ERROR_CODE_IDEMPOTENCY_KEY_USED_DIFFERENT_USER)) {
+                                retryDelayInMs = 0;
+                                actionDataChanged = true;
+                            }
+                            else if (errorCode === ERROR_CODE_IDEMPOTENCY_CONCURRENT_REQUEST) {
+                                retryDelayInMs = getRetryAfterInMs(response.headers);
+                            }
+                            shouldRetry = true;
+                        }
+                        break;
+                    }
+                    case HttpStatusCode.BadRequest: {
+                        if (this.handleIdempotencyServerError(response.body, updatedAction, false, ERROR_CODE_IDEMPOTENCY_FEATURE_NOT_ENABLED, ERROR_CODE_IDEMPOTENCY_NOT_SUPPORTED)) {
                             retryDelayInMs = 0;
                             actionDataChanged = true;
+                            shouldRetry = true;
                         }
-                        else if (errorCode === ERROR_CODE_IDEMPOTENCY_CONCURRENT_REQUEST) {
-                            retryDelayInMs = getRetryAfterInMs(response.headers);
+                        break;
+                    }
+                    case 422 /* IdempotentWriteSpecificHttpStatusCode.UnProcessableEntity */: {
+                        if (this.handleIdempotencyServerError(response.body, updatedAction, true, ERROR_CODE_IDEMPOTENCY_KEY_ALREADY_USED)) {
+                            retryDelayInMs = 0;
+                            actionDataChanged = true;
+                            shouldRetry = true;
                         }
-                        shouldRetry = true;
                         break;
                     }
                 }
@@ -5933,6 +6046,27 @@ class AbstractResourceRequestActionHandler {
             return ProcessActionResult.NETWORK_ERROR;
         }
     }
+    // true if response is an idempotency server error. updates or deletes idempotency key if the reponse is idempotency related error. Idempotency related error is in format of UiApiError array.
+    handleIdempotencyServerError(responseBody, action, updateIdempotencyKey, ...targetErrorCodes) {
+        if (this.isUiApiErrors(responseBody)) {
+            const errorCode = responseBody[0].errorCode;
+            if (targetErrorCodes.includes(errorCode)) {
+                action.data.headers = action.data.headers || {};
+                if (updateIdempotencyKey) {
+                    action.data.headers[HTTP_HEADER_IDEMPOTENCY_KEY] = uuidv4();
+                }
+                else {
+                    delete action.data.headers[HTTP_HEADER_IDEMPOTENCY_KEY];
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+    // checks if the body is an array of UiApiError. Sometimes the body has `enhancedErrorType` field as an error indicator(one example is the field validation failure). In such case Action being processed updates to an Error Action.
+    isUiApiErrors(body) {
+        return body !== undefined && Array.isArray(body) && body.length > 0 && body[0].errorCode;
+    }
     async buildPendingAction(request, queue) {
         const targetId = await this.getIdFromRequest(request);
         if (targetId === undefined) {
@@ -6146,6 +6280,10 @@ class AbstractResourceRequestActionHandler {
             ...targetData,
             body: this.mergeRequestBody(targetBody, sourceBody),
         };
+        // Updates Idempotency key if target has one
+        if (targetData.headers && targetData.headers[HTTP_HEADER_IDEMPOTENCY_KEY]) {
+            merged.data.headers[HTTP_HEADER_IDEMPOTENCY_KEY] = uuidv4();
+        }
         // overlay metadata
         merged.metadata = { ...targetMetadata, ...sourceMetadata };
         // put status back to pending to auto upload if queue is active and targed is at the head.
@@ -6182,6 +6320,9 @@ class AbstractResourceRequestActionHandler {
     getDraftIdsFromAction(action) {
         return [action.targetId];
     }
+    hasIdempotencySupport() {
+        return this.isIdempotencySupported && !this.isLdsIdempotencyWriteDisabled;
+    }
     async ingestResponses(responses, action) {
         const luvio = this.getLuvio();
         await luvio.handleSuccessResponse(() => {
@@ -6613,49 +6754,6 @@ function makeEnvironmentDraftAware(luvio, env, durableStore, handlers, draftQueu
     });
 }
 
-/**
- * Copyright (c) 2022, Salesforce, Inc.,
- * All rights reserved.
- * For full license text, see the LICENSE.txt file
- */
-
-const API_NAMESPACE = 'UiApi';
-const RECORD_REPRESENTATION_NAME = 'RecordRepresentation';
-const RECORD_VIEW_ENTITY_REPRESENTATION_NAME = 'RecordViewEntityRepresentation';
-const RECORD_ID_PREFIX = `${API_NAMESPACE}::${RECORD_REPRESENTATION_NAME}:`;
-const RECORD_VIEW_ENTITY_ID_PREFIX = `${API_NAMESPACE}::${RECORD_VIEW_ENTITY_REPRESENTATION_NAME}:Name:`;
-const RECORD_FIELDS_KEY_JUNCTION = '__fields__';
-function isStoreKeyRecordId(key) {
-    return key.indexOf(RECORD_ID_PREFIX) > -1 && key.indexOf(RECORD_FIELDS_KEY_JUNCTION) === -1;
-}
-function isStoreKeyRecordViewEntity(key) {
-    return (key.indexOf(RECORD_VIEW_ENTITY_ID_PREFIX) > -1 &&
-        key.indexOf(RECORD_FIELDS_KEY_JUNCTION) === -1);
-}
-function isStoreKeyRecordField(key) {
-    return key.indexOf(RECORD_ID_PREFIX) > -1 && key.indexOf(RECORD_FIELDS_KEY_JUNCTION) > -1;
-}
-function extractRecordIdFromStoreKey(key) {
-    if (key === undefined ||
-        (key.indexOf(RECORD_ID_PREFIX) === -1 && key.indexOf(RECORD_VIEW_ENTITY_ID_PREFIX) === -1)) {
-        return undefined;
-    }
-    const parts = key.split(':');
-    return parts[parts.length - 1].split('_')[0];
-}
-function buildRecordFieldStoreKey(recordKey, fieldName) {
-    return `${recordKey}${RECORD_FIELDS_KEY_JUNCTION}${fieldName}`;
-}
-
-function isStoreRecordError(storeRecord) {
-    return storeRecord.__type === 'error';
-}
-function isEntryDurableRecordRepresentation(entry, key) {
-    // Either a DurableRecordRepresentation or StoreRecordError can live at a record key
-    return ((isStoreKeyRecordId(key) || isStoreKeyRecordViewEntity(key)) &&
-        entry.data.__type === undefined);
-}
-
 function serializeFieldArguments(argumentNodes, variables) {
     const mutableArgumentNodes = Object.assign([], argumentNodes);
     return `args__(${mutableArgumentNodes
@@ -8030,6 +8128,10 @@ function isOperationDefinitionNode(node) {
     return node.kind === 'OperationDefinition';
 }
 
+const POLYMORPHIC_PARENT_RELATIONSHIP = 'polymorphicParentRelationship';
+const PARENT_RELATIONSHIP = 'parentRelationship';
+const CHILD_RELATIONSHIP = 'childRelationship';
+const RECORD_QUERY = 'recordQuery';
 function requestsDraftsField(recordFieldNode) {
     if (!recordFieldNode.selectionSet)
         return false;
@@ -8045,18 +8147,41 @@ function isRecordQuery(recordQueryField) {
                 directive.arguments
                     .map((argument) => argument.value)
                     .filter(isStringValueNode)
-                    .some((categoryName) => categoryName.value === 'recordQuery'));
+                    .some((categoryName) => categoryName.value === RECORD_QUERY));
         });
     }
     return false;
 }
-// finds field with 'recordQuery' and 'childRelationship' directive
-function findNearestRecordQuery(ancestors) {
-    const recordQueryAncester = findNearestAncesterPath(ancestors, true).node;
-    return recordQueryAncester === undefined ? undefined : recordQueryAncester;
+// finds connection field with 'recordQuery' and 'childRelationship' directive.
+function findNearestConnection(ancestors) {
+    const connectionAncestor = findNearestAncesterPath(ancestors, true).node;
+    return connectionAncestor === undefined ? undefined : connectionAncestor;
+}
+// convinient method to find nearest connection with its path
+function findNearestConnectionWithPath(ancestors) {
+    const closestAncestorPath = findNearestAncesterPath(ancestors, true);
+    let connection = undefined;
+    let connectionPath = undefined;
+    if (closestAncestorPath.parentIndex > 0) {
+        const connectionAncestor = closestAncestorPath.node;
+        const connectionAncestors = ancestors.slice(0, closestAncestorPath.parentIndex);
+        connection =
+            connectionAncestor === undefined ? undefined : connectionAncestor;
+        if (connection !== undefined) {
+            const ancesterPath = findAncesterPath(connectionAncestors);
+            connectionPath =
+                ancesterPath === ''
+                    ? connection.name.value
+                    : `${ancesterPath}#${connection.name.value}`;
+        }
+    }
+    return {
+        connection,
+        path: connectionPath,
+    };
 }
-// finds cloeset ancester. If 'parentRelationship' is allowed, it could be 'InlineFragmentNode' since it inherits the 'parent' relationship. 'InlineFragmentNode' makes sure that only one 'apiName' returns when tree is traversed.
-function findNearestAncesterPath(ancestors, recordQueryOnly) {
+// finds closest ancestor. If node with 'parentRelationship' is the ancester, the end result could be 'InlineFragmentNode' since it inherits the 'parent' relationship. 'InlineFragmentNode' makes sure that only one 'apiName' returns when tree is traversed.
+function findNearestAncesterPath(ancestors, connectionOnly) {
     let recordQueryPath = { node: undefined, parentIndex: -1 };
     let relationship = '';
     for (let i = ancestors.length - 1; i >= 0; i--) {
@@ -8070,9 +8195,11 @@ function findNearestAncesterPath(ancestors, recordQueryOnly) {
                 continue;
             for (let arg of directive.arguments) {
                 if (arg.value &&
-                    (arg.value.value === 'recordQuery' ||
-                        arg.value.value === 'childRelationship' ||
-                        (!recordQueryOnly && arg.value.value === 'parentRelationship'))) {
+                    (arg.value.value === RECORD_QUERY ||
+                        arg.value.value === CHILD_RELATIONSHIP ||
+                        (!connectionOnly &&
+                            (arg.value.value === PARENT_RELATIONSHIP ||
+                                arg.value.value === POLYMORPHIC_PARENT_RELATIONSHIP)))) {
                     recordQueryPath = { node: node, parentIndex: i };
                     relationship = arg.value.value;
                     break;
@@ -8087,17 +8214,19 @@ function findNearestAncesterPath(ancestors, recordQueryOnly) {
     //checks if nearest ancester could be an inline fragment
     if (recordQueryPath.node !== undefined &&
         recordQueryPath.node.selectionSet &&
-        relationship === 'parentRelationship') {
-        //
-        if (recordQueryPath.node.selectionSet.selections.every(isInlineFragmentNode)) {
-            //
-            const inlineFragmentLoc = recordQueryPath.parentIndex + 2;
-            if (inlineFragmentLoc < ancestors.length && ancestors[inlineFragmentLoc]) {
+        (relationship === PARENT_RELATIONSHIP || relationship === POLYMORPHIC_PARENT_RELATIONSHIP)) {
+        // InlineFragment is usually 3 steps aways from its FieldNode parent within ancester hierarchy if it exists. The below search
+        // is applied to adapt to future AST structure change
+        let parentIndex = recordQueryPath.parentIndex + 1;
+        while (parentIndex < ancestors.length) {
+            if (isInlineFragmentNode(ancestors[parentIndex])) {
                 recordQueryPath = {
-                    node: ancestors[inlineFragmentLoc],
-                    parentIndex: inlineFragmentLoc,
+                    node: ancestors[parentIndex],
+                    parentIndex,
                 };
+                break;
             }
+            parentIndex++;
         }
     }
     return recordQueryPath;
@@ -8121,7 +8250,7 @@ function findAncesterPath(ancesters) {
                         ? sectionPath
                         : sectionPath === ''
                             ? path
-                            : `${sectionPath}_${path}`;
+                            : `${sectionPath}#${path}`;
             }
         }
         boundaryIndex = parentIndex;
@@ -8179,9 +8308,9 @@ function getRelation(node) {
         const relationships = args
             .map((arg) => arg.value)
             .filter(isStringValueNode)
-            .filter((valueNode) => valueNode.value === 'childRelationship' ||
-            valueNode.value === 'parentRelationship' ||
-            valueNode.value === 'polymorphicParentRelationship')
+            .filter((valueNode) => valueNode.value === CHILD_RELATIONSHIP ||
+            valueNode.value === PARENT_RELATIONSHIP ||
+            valueNode.value === POLYMORPHIC_PARENT_RELATIONSHIP)
             .map((relationshipNode) => relationshipNode.value);
         if (relationships.length > 0) {
             return relationships[0];
@@ -8238,8 +8367,8 @@ function isFieldSpanning(node, parentNode) {
  */
 function isParentRelationship(node) {
     return (node &&
-        (isRelationship(node, 'parentRelationship') ||
-            isRelationship(node, 'polymorphicParentRelationship')));
+        (isRelationship(node, PARENT_RELATIONSHIP) ||
+            isRelationship(node, POLYMORPHIC_PARENT_RELATIONSHIP)));
 }
 /*
 checks if the InlineFragment spans
@@ -8545,6 +8674,26 @@ function findFieldInfo(objectInfo, fieldName) {
     return values$1(objectInfo.fields).find((field) => field.apiName === fieldName ||
         (field.dataType === 'Reference' && field.relationshipName === fieldName));
 }
+async function readIngestionTimestampForKey(key, query) {
+    let ingestionTimestamp = 0;
+    const sql = `
+                    SELECT json_extract(metadata, '${JSON_EXTRACT_PATH_INGESTION_TIMESTAMP}') 
+                    FROM lds_data 
+                    WHERE key IS ?
+                    `;
+    const results = await query(sql, [key]);
+    const [timestamp] = results.rows.map((row) => row[0]);
+    if (timestamp !== null) {
+        const numericalTimestamp = Number(timestamp);
+        if (isNaN(numericalTimestamp)) {
+            return ingestionTimestamp;
+        }
+        // adjust the timestamp to account for ingestion processing time
+        // 30s is used because this is the default record TTL
+        ingestionTimestamp = numericalTimestamp - 30000;
+    }
+    return ingestionTimestamp;
+}
 
 function findSpanningField(name) {
     return (field) => {
@@ -9064,17 +9213,7 @@ async function fetchIngestionTimeStampFromDatabase(apiName, info, args, query) {
         const key = buildKeyStringForRecordQuery(operation, 
         // join varables passed from query to the argument variables given from the AST
         { ...variableValues, ...args }, info.fieldNodes[0].arguments, apiName);
-        const sql = `
-                    SELECT json_extract(metadata, '${JSON_EXTRACT_PATH_INGESTION_TIMESTAMP}') 
-                    FROM lds_data 
-                    WHERE key IS ?
-                    `;
-        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;
-        }
+        return readIngestionTimestampForKey(key, query);
     }
     return ingestionTimestamp;
 }
@@ -9122,26 +9261,20 @@ function generateRecordQueries(objectInfos) {
     let recordConnections = ``;
     const polymorphicFieldTypeNames = new Set();
     let typedScalars = new Set();
+    let parentRelationshipFields = new Set();
     for (const objectInfo of values$1(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$1(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;
@@ -9149,11 +9282,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) {
@@ -9162,6 +9297,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 */ `
@@ -9236,6 +9385,8 @@ function dataTypeToType(objectInfoDataType, apiName) {
             return 'PercentValue';
         case 'Int':
             return 'IntValue';
+        case 'EncryptedString':
+            return 'EncryptedStringValue';
         // ! do the rest of the custom types
         default:
             return 'String';
@@ -9321,7 +9472,7 @@ const parentRelationshipDirective = {
             },
             value: {
                 kind: Kind.STRING,
-                value: 'parentRelationship',
+                value: PARENT_RELATIONSHIP,
                 block: false,
             },
         },
@@ -9335,8 +9486,8 @@ async function injectSyntheticFields(originalAST, objectInfoService, draftFuncti
     // example 2 'ServiceAppointment' -> ['Owner']; 'Owner' -> ['User', 'Group']
     const objectNodeInfoTree = {};
     // save the field path to apiName map
-    // example 1: 'ServiceAppointment' -> ['ServiceAppointment']; 'ServiceAppointment_Account' -> ['Account']; 'ServiceAppointment_Account_Owner' -> ['User']
-    const objectInfoApiMap = {};
+    // example 1: 'ServiceAppointment' -> ['ServiceAppointment']; 'ServiceAppointment#ccount' -> ['Account']; 'ServiceAppointment#Account#Owner' -> ['User']
+    const pathToObjectApiNamesMap = {};
     let startNodes = new Set();
     let totalNodes = new Set();
     let objectInfos = {};
@@ -9350,11 +9501,11 @@ async function injectSyntheticFields(originalAST, objectInfoService, draftFuncti
     visit(originalAST, {
         Argument: {
             enter(node, key, parent, path, ancestors) {
-                const recordQueryNode = findNearestRecordQuery(ancestors);
-                if (!recordQueryNode)
+                const { connection: recordConnectionNode, path: ancesterPath } = findNearestConnectionWithPath(ancestors);
+                if (!recordConnectionNode || !ancesterPath)
                     return;
-                if (!objectNodeInfoTree[recordQueryNode.name.value]) {
-                    objectNodeInfoTree[recordQueryNode.name.value] = [];
+                if (!objectNodeInfoTree[ancesterPath]) {
+                    objectNodeInfoTree[ancesterPath] = [];
                 }
                 switch (node.name.value) {
                     case 'orderBy':
@@ -9362,12 +9513,12 @@ async function injectSyntheticFields(originalAST, objectInfoService, draftFuncti
                         if (node.value.kind !== 'ObjectValue') {
                             return;
                         }
-                        totalNodes.add(recordQueryNode.name.value);
+                        totalNodes.add(ancesterPath);
                         // 'childRelationship' node is not taken as the startNode of the 'NodeInfoTree' graph. The field scanning will construct the graph which lead here.
-                        if (isRecordQuery(recordQueryNode)) {
-                            startNodes.add(recordQueryNode.name.value);
+                        if (isRecordQuery(recordConnectionNode)) {
+                            startNodes.add(recordConnectionNode.name.value);
                         }
-                        growObjectFieldTree(objectNodeInfoTree, recordQueryNode.name.value, node.value, totalNodes, startNodes);
+                        growObjectFieldTree(objectNodeInfoTree, ancesterPath, node.value, totalNodes, startNodes);
                         break;
                     case 'scope':
                         if (!isScopeArgumentNodeWithType(node, 'ASSIGNEDTOME', variables)) {
@@ -9382,17 +9533,16 @@ async function injectSyntheticFields(originalAST, objectInfoService, draftFuncti
                                 name: 'ServiceResources',
                             });
                         }
-                        if (objectNodeInfoTree['ServiceResources'] === undefined) {
-                            objectNodeInfoTree['ServiceResources'] = [];
-                        }
-                        if (!objectNodeInfoTree['ServiceResources'].some((child) => child.name === 'ServiceResource')) {
-                            objectNodeInfoTree['ServiceResources'].push({
-                                relation: 'parent',
-                                name: 'ServiceResource',
-                            });
+                        if (objectNodeInfoTree['ServiceAppointment#ServiceResources'] === undefined) {
+                            objectNodeInfoTree['ServiceAppointment#ServiceResources'] = [
+                                {
+                                    relation: 'parent',
+                                    name: 'ServiceResource',
+                                },
+                            ];
                         }
-                        if (objectNodeInfoTree['ServiceResource'] === undefined) {
-                            objectNodeInfoTree['ServiceResource'] = [];
+                        if (objectNodeInfoTree['ServiceAppointment#ServiceResources#ServiceResource'] === undefined) {
+                            objectNodeInfoTree['ServiceAppointment#ServiceResources#ServiceResource'] = [];
                         }
                         break;
                     default:
@@ -9406,7 +9556,7 @@ async function injectSyntheticFields(originalAST, objectInfoService, draftFuncti
                     return;
                 if (!node.selectionSet)
                     return;
-                const recordQueryField = findNearestRecordQuery(ancestors);
+                const recordQueryField = findNearestConnection(ancestors);
                 //only injects fields for 'recordQuery' field. ignores the 'childRelationship' field since it will be traversed as the child of the 'recordQuery'
                 if (isRecordQuery(recordQueryField) && recordQueryField) {
                     totalNodes.add(recordQueryField.name.value);
@@ -9417,21 +9567,21 @@ async function injectSyntheticFields(originalAST, objectInfoService, draftFuncti
         },
     });
     if (objectInfoService && startNodes.size > 0) {
-        objectInfos = await resolveObjectInfos(objectNodeInfoTree, objectInfoApiMap, startNodes, objectInfoService);
+        objectInfos = await resolveObjectInfos(objectNodeInfoTree, pathToObjectApiNamesMap, startNodes, objectInfoService);
     }
     // read pass; gather whats needed
     visit(originalAST, {
         Argument: {
             leave(node, key, parent, path, ancestors) {
-                const recordQueryField = findNearestRecordQuery(ancestors);
+                const recordQueryField = findNearestConnection(ancestors);
                 if (!recordQueryField)
                     return;
                 const ancestorPath = findAncesterPath(ancestors);
                 if (!inlineFragmentSelections[ancestorPath]) {
                     inlineFragmentSelections[ancestorPath] = [];
                 }
-                const recordQueryApiName = objectInfoApiMap[ancestorPath]
-                    ? objectInfoApiMap[ancestorPath][0]
+                const recordQueryApiName = pathToObjectApiNamesMap[ancestorPath]
+                    ? pathToObjectApiNamesMap[ancestorPath][0]
                     : recordQueryField.name.value;
                 // The record node acts as the reference. The duplicated field in the record node is not injected
                 const recordReferenceNode = [recordQueryField]
@@ -9445,7 +9595,7 @@ async function injectSyntheticFields(originalAST, objectInfoService, draftFuncti
                     case 'scope':
                         // Hanle 'MINE' field
                         if (isScopeArgumentNodeWithType(node, 'MINE', variables)) {
-                            if (isMineScopeAvailable(ancestorPath, objectInfoApiMap, objectInfos)) {
+                            if (isMineScopeAvailable(ancestorPath, pathToObjectApiNamesMap, objectInfos)) {
                                 // 'typeConditon' is added when the 'InlineFragmentNode' is appended at the write pass
                                 inlineFragmentSelections[ancestorPath].push(...mineFragmentSelections);
                             }
@@ -9471,7 +9621,7 @@ async function injectSyntheticFields(originalAST, objectInfoService, draftFuncti
                     case 'where': {
                         inlineFragmentSelections[ancestorPath] = [
                             ...inlineFragmentSelections[ancestorPath],
-                            ...injectFilter(node, idState, ancestorPath, objectInfos, objectInfoApiMap, draftFunctions, recordReferenceNode),
+                            ...injectFilter(node, idState, ancestorPath, false, objectInfos, pathToObjectApiNamesMap, draftFunctions, recordReferenceNode),
                         ];
                         break;
                     }
@@ -9487,7 +9637,7 @@ async function injectSyntheticFields(originalAST, objectInfoService, draftFuncti
                 if (!node.selectionSet)
                     return;
                 // it could be 'recordQuery' or 'childRelationship'
-                const recordQueryField = findNearestRecordQuery(ancestors);
+                const recordQueryField = findNearestConnection(ancestors);
                 if (!recordQueryField)
                     return;
                 const ancestorPath = findAncesterPath(ancestors);
@@ -9499,7 +9649,7 @@ async function injectSyntheticFields(originalAST, objectInfoService, draftFuncti
                         spanningSelections.push(selection);
                     }
                 }
-                const injectedFields = injectFields(spanningSelections, node, ancestors, objectInfos, objectInfoApiMap);
+                const injectedFields = injectFields(spanningSelections, node, ancestorPath, ancestors, objectInfos, pathToObjectApiNamesMap);
                 const mergedInjectedFields = mergeSelectionNodes(inlineFragmentSelections[ancestorPath], injectedFields);
                 inlineFragmentSelections[ancestorPath] = mergedInjectedFields;
             },
@@ -9512,7 +9662,7 @@ async function injectSyntheticFields(originalAST, objectInfoService, draftFuncti
                 // removes 'ServicesResources' query field node if 'assignedtome' scope shows up
                 if (assignedtomeQueryFieldNode !== undefined &&
                     node.name.value === 'ServiceResources') {
-                    const serviceResourcesAncestor = findNearestRecordQuery(ancestors);
+                    const serviceResourcesAncestor = findNearestConnection(ancestors);
                     if (serviceResourcesAncestor === assignedtomeQueryFieldNode) {
                         return null;
                     }
@@ -9521,7 +9671,7 @@ async function injectSyntheticFields(originalAST, objectInfoService, draftFuncti
                     return;
                 if (!node.selectionSet)
                     return;
-                const recordQueryField = findNearestRecordQuery(ancestors);
+                const recordQueryField = findNearestConnection(ancestors);
                 if (!recordQueryField)
                     return;
                 const ancestorPath = findAncesterPath(ancestors);
@@ -9530,8 +9680,8 @@ async function injectSyntheticFields(originalAST, objectInfoService, draftFuncti
                     return;
                 //const recordQueryPath = findAncesterPath(ancestors);
                 // 'apiName' has to be at index 0 since 'node' record type could only be of 'recordQuery' or 'childRelationship'. They can not have the 'InlineFragmentNode' as its children.
-                const recordQueryApiName = objectInfoApiMap[ancestorPath]
-                    ? objectInfoApiMap[ancestorPath][0]
+                const recordQueryApiName = pathToObjectApiNamesMap[ancestorPath]
+                    ? pathToObjectApiNamesMap[ancestorPath][0]
                     : recordQueryField.name.value;
                 const nodeWithFragments = {
                     ...node,
@@ -9568,7 +9718,7 @@ async function injectSyntheticFields(originalAST, objectInfoService, draftFuncti
                 if (node.name.value === 'where') {
                     const ancestorPath = findAncesterPath(ancestors);
                     if (idState.paths.includes(ancestorPath)) {
-                        const apiName = objectInfoApiMap[ancestorPath][0];
+                        const apiName = pathToObjectApiNamesMap[ancestorPath][0];
                         const objectInfo = objectInfos[apiName];
                         const swappedIdFilter = swapIdField(node.value, objectInfo, false, idState, draftFunctions);
                         return {
@@ -9634,8 +9784,8 @@ function swapIdField(filterFields, objectInfo, swapped, idState, draftFunctions)
             };
     }
 }
-function isMineScopeAvailable(apiNamePath, objectInfoApiMap, objectInfos) {
-    const apiName = objectInfoApiMap[apiNamePath];
+function isMineScopeAvailable(apiNamePath, pathToObjectApiNamesMap, objectInfos) {
+    const apiName = pathToObjectApiNamesMap[apiNamePath];
     if (!apiName)
         return false;
     const objectInfo = objectInfos[apiName[0]];
@@ -9724,15 +9874,16 @@ function growObjectFieldTree(tree, parentNode, entryNode, totalNodes, startNodes
                     }
                     // example: 'Account'
                     const childNode = objectFieldNode.name.value;
+                    const childNodepath = `${parentNode}#${childNode}`;
                     if (!tree[parentNode].some((child) => child.name === childNode)) {
                         tree[parentNode].push({
                             relation: 'parent',
                             name: childNode,
                         });
-                        totalNodes.add(childNode);
+                        totalNodes.add(childNodepath);
                     }
                     // recursively go to deeper level of filter.
-                    growObjectFieldTree(tree, childNode, objectFieldNode.value, totalNodes, startNodes);
+                    growObjectFieldTree(tree, childNodepath, objectFieldNode.value, totalNodes, startNodes);
                 }
             }
         }
@@ -9767,19 +9918,20 @@ function growFieldTree(tree, parentSectionPath, entryNode, parentNode, totalNode
                 }
                 if (!tree[parentSectionPath].some((field) => field.name === fieldName)) {
                     tree[parentSectionPath].push({
-                        relation: relationType === 'parentRelationship' ||
-                            relationType === 'polymorphicParentRelationship'
+                        relation: relationType === PARENT_RELATIONSHIP ||
+                            relationType === POLYMORPHIC_PARENT_RELATIONSHIP
                             ? 'parent'
                             : 'child',
                         name: fieldName,
                     });
-                    totalNodes.add(fieldName);
+                    totalNodes.add(`${parentSectionPath}#${fieldName}`);
                 }
                 if (entryNode.selectionSet && entryNode.selectionSet.selections) {
                     const childNodes = entryNode.selectionSet.selections.filter(isFieldOrInlineFragmentNode);
                     // recursively build the traversal tree
                     for (const child of childNodes) {
-                        growFieldTree(tree, fieldName, child, entryNode, totalNodes, startNodes);
+                        const path = `${parentSectionPath}#${fieldName}`;
+                        growFieldTree(tree, path, child, entryNode, totalNodes, startNodes);
                     }
                 }
             }
@@ -9809,23 +9961,23 @@ function growFieldTree(tree, parentSectionPath, entryNode, parentNode, totalNode
                     }
                     if (!tree[parentSectionPath].some((field) => field.name === conditionName)) {
                         tree[parentSectionPath].push({
-                            relation: relationType === 'parentRelationship' ||
-                                relationType === 'polymorphicParentRelationship'
+                            relation: relationType === PARENT_RELATIONSHIP ||
+                                relationType === POLYMORPHIC_PARENT_RELATIONSHIP
                                 ? 'parent'
                                 : 'child',
                             name: conditionName,
                         });
-                        totalNodes.add(conditionName);
+                        const path = `${parentSectionPath}#${conditionName}`;
+                        totalNodes.add(path);
                     }
                 }
             }
             // dive deep immediately for 'InlineFragment'
             const childNodes = entryNode.selectionSet.selections.filter(isFieldOrInlineFragmentNode);
+            const path = `${parentSectionPath}${entryNode.typeCondition ? '#' + entryNode.typeCondition.name.value : ''}`;
             // Navigates into InLineFragment
             for (const child of childNodes) {
-                growFieldTree(tree, entryNode.typeCondition
-                    ? entryNode.typeCondition.name.value
-                    : parentSectionPath, child, entryNode, totalNodes, startNodes);
+                growFieldTree(tree, path, child, entryNode, totalNodes, startNodes);
             }
         }
     }
@@ -9837,7 +9989,7 @@ function growFieldTree(tree, parentSectionPath, entryNode, parentNode, totalNode
  * @param startNodes start nodes of the tree. It can be used to fetch ObjectInfo immediately
  * @param path
  */
-async function resolveObjectInfos(objectInfotree, objectInfoApiMap, startNodes, objectInfoService) {
+async function resolveObjectInfos(objectInfotree, pathToObjectApiNamesMap, startNodes, objectInfoService) {
     let objectInfos;
     try {
         objectInfos = await objectInfoService.getObjectInfos(Array.from(startNodes));
@@ -9851,9 +10003,9 @@ async function resolveObjectInfos(objectInfotree, objectInfoApiMap, startNodes,
         throw new Error(`Unable to resolve ObjectInfo(s) for ${Array.from(startNodes)}`);
     }
     for (const startNode of startNodes) {
-        objectInfoApiMap[startNode] = [startNode];
+        pathToObjectApiNamesMap[startNode] = [startNode];
         const children = objectInfotree[startNode];
-        const subObjectInfoMap = await fetchObjectInfos(objectInfotree, objectInfoApiMap, objectInfos, children, startNode, objectInfoService);
+        const subObjectInfoMap = await fetchObjectInfos(objectInfotree, pathToObjectApiNamesMap, objectInfos, children, startNode, objectInfoService);
         objectInfos = { ...objectInfos, ...subObjectInfoMap };
     }
     return objectInfos;
@@ -9861,15 +10013,15 @@ async function resolveObjectInfos(objectInfotree, objectInfoApiMap, startNodes,
 // example 1: 'parentPath': 'ServiceAppointment', 'nodesAtSameLevel': ['Account']
 // example 2: 'parentPath': 'ServiceAppointment', 'nodesAtSameLevel': ['Owner'], this example has 2 apiName for the node 'Owner'
 // example 3: 'parentPath': 'ServiceAppointment_Owner', 'nodesAtSameLevel': ['User', 'Group']
-async function fetchObjectInfos(objectInfotree, objectInfoApiMap, objectInfoMap, nodesAtSameLevel, parentPath, objectInfoService) {
-    const objectInfoApiNames = objectInfoApiMap[parentPath];
+async function fetchObjectInfos(objectInfotree, pathToObjectApiNamesMap, objectInfoMap, nodesAtSameLevel, parentPath, objectInfoService) {
+    const objectInfoApiNames = pathToObjectApiNamesMap[parentPath];
     if (!objectInfoApiNames) {
         // eslint-disable-next-line
         throw new Error(`Object Info does not exist for ${parentPath}`);
     }
     const validObjectInfoNodes = [];
     let updatedObjectInfoMap = {};
-    // InlineFragment and polymorphic field support fits into this scenario  ObjectInfoApiMap Entry:  'ServiceAppointment_Owner' -> ['User', 'Group']; ServiceAppointment_Owner_User' -> ['User']
+    // InlineFragment and polymorphic field support fits into this scenario  pathToObjectApiNamesMap Entry:  'ServiceAppointment#Owner' -> ['User', 'Group']; ServiceAppointment#Owner#User' -> ['User']
     if (objectInfoApiNames.length > 0 &&
         nodesAtSameLevel.length > 0 &&
         objectInfoApiNames.includes(nodesAtSameLevel[0].name)) {
@@ -9881,8 +10033,8 @@ async function fetchObjectInfos(objectInfotree, objectInfoApiMap, objectInfoMap,
                 // eslint-disable-next-line
                 throw new Error(`Condition ${field.name} does not exists for ${parentPath}`);
             }
-            const path = `${parentPath}_${field.name}`;
-            objectInfoApiMap[path] = [field.name];
+            const path = `${parentPath}#${field.name}`;
+            pathToObjectApiNamesMap[path] = [field.name];
         }
         validObjectInfoNodes.push(...nodesAtSameLevel);
         updatedObjectInfoMap = { ...objectInfoMap };
@@ -9897,7 +10049,7 @@ async function fetchObjectInfos(objectInfotree, objectInfoApiMap, objectInfoMap,
         let apiNames = [];
         for (const nodeInfo of nodesAtSameLevel) {
             const field = nodeInfo.name;
-            const path = `${parentPath}_${field}`;
+            const path = `${parentPath}#${field}`;
             // Handle 'parentRelationship'
             if (nodeInfo.relation === 'parent') {
                 const relationshipId = referenceIdFieldForRelationship(field);
@@ -9915,21 +10067,21 @@ async function fetchObjectInfos(objectInfotree, objectInfoApiMap, objectInfoMap,
                     }
                 }
                 // This is a polymorphic field
-                if (fieldDefinition.referenceToInfos.length > 1 && objectInfotree[field]) {
+                if (fieldDefinition.referenceToInfos.length > 1 && objectInfotree[path]) {
                     // Fields needs to expand and heterogenous entity ObjectInfo needs to be fetched
-                    const referencedNodeInfos = objectInfotree[field];
+                    const referencedNodeInfos = objectInfotree[path];
                     const requestedApiNames = referencedNodeInfos.map((referenceNodeInfo) => referenceNodeInfo.name);
                     // Fetches requested ObjectInfo only. Some entity's relation field could define more than 6 references. Only references show up in query need to be handled.
-                    if (requestedApiNames.length > 0 && objectInfotree[field]) {
+                    if (requestedApiNames.length > 0 && objectInfotree[path]) {
                         fieldDefinition.referenceToInfos
                             .filter((referenceToInfo) => requestedApiNames.includes(referenceToInfo.apiName))
                             .forEach((ref) => {
-                            if (!objectInfoApiMap[path]) {
-                                objectInfoApiMap[path] = [];
+                            if (!pathToObjectApiNamesMap[path]) {
+                                pathToObjectApiNamesMap[path] = [];
                             }
                             // 'ServiceAppointment_Owner' ->['User', 'Group']
-                            if (!objectInfoApiMap[path].includes(ref.apiName)) {
-                                objectInfoApiMap[path].push(ref.apiName);
+                            if (!pathToObjectApiNamesMap[path].includes(ref.apiName)) {
+                                pathToObjectApiNamesMap[path].push(ref.apiName);
                             }
                             if (!apiNames.includes(ref.apiName)) {
                                 apiNames.push(ref.apiName);
@@ -9939,11 +10091,11 @@ async function fetchObjectInfos(objectInfotree, objectInfoApiMap, objectInfoMap,
                 }
                 else if (fieldDefinition.referenceToInfos.length === 1) {
                     const ref = fieldDefinition.referenceToInfos[0];
-                    if (!objectInfoApiMap[path]) {
-                        objectInfoApiMap[path] = [];
+                    if (!pathToObjectApiNamesMap[path]) {
+                        pathToObjectApiNamesMap[path] = [];
                     }
-                    if (!objectInfoApiMap[path].includes(ref.apiName)) {
-                        objectInfoApiMap[path].push(ref.apiName);
+                    if (!pathToObjectApiNamesMap[path].includes(ref.apiName)) {
+                        pathToObjectApiNamesMap[path].push(ref.apiName);
                     }
                     if (!apiNames.includes(ref.apiName)) {
                         apiNames.push(ref.apiName);
@@ -9954,11 +10106,11 @@ async function fetchObjectInfos(objectInfotree, objectInfoApiMap, objectInfoMap,
                 // handles 'childRelationship'
                 const childRelationship = parentObjectInfo.childRelationships.find((childRelationship) => childRelationship.relationshipName === field);
                 if (childRelationship) {
-                    if (!objectInfoApiMap[path]) {
-                        objectInfoApiMap[path] = [];
+                    if (!pathToObjectApiNamesMap[path]) {
+                        pathToObjectApiNamesMap[path] = [];
                     }
-                    if (!objectInfoApiMap[path].includes(childRelationship.childObjectApiName)) {
-                        objectInfoApiMap[path].push(childRelationship.childObjectApiName);
+                    if (!pathToObjectApiNamesMap[path].includes(childRelationship.childObjectApiName)) {
+                        pathToObjectApiNamesMap[path].push(childRelationship.childObjectApiName);
                     }
                     if (!apiNames.includes(childRelationship.childObjectApiName)) {
                         apiNames.push(childRelationship.childObjectApiName);
@@ -9980,10 +10132,10 @@ async function fetchObjectInfos(objectInfotree, objectInfoApiMap, objectInfoMap,
     }
     for (const nodeInfo of validObjectInfoNodes) {
         const field = nodeInfo.name;
-        const subLevelFields = objectInfotree[field];
-        const path = `${parentPath}_${field}`;
+        const path = `${parentPath}#${field}`;
+        const subLevelFields = objectInfotree[path];
         if (subLevelFields && subLevelFields.length > 0) {
-            const subObjectInfos = await fetchObjectInfos(objectInfotree, objectInfoApiMap, updatedObjectInfoMap, subLevelFields, path, objectInfoService);
+            const subObjectInfos = await fetchObjectInfos(objectInfotree, pathToObjectApiNamesMap, updatedObjectInfoMap, subLevelFields, path, objectInfoService);
             updatedObjectInfoMap = { ...updatedObjectInfoMap, ...subObjectInfos };
         }
     }
@@ -9998,27 +10150,29 @@ async function fetchObjectInfos(objectInfotree, objectInfoApiMap, objectInfoMap,
  * 'path' and 'queryNode' is 1 level above the 'filterNode'
  * @param filterNode filter node which needs to be injected. For example, 'State' ObjectFieldNode  within filter 'where: { State: { eq: "Nova Scotia" }}'
  * @param idState ID state will be updated to determine if the ID fields in AST need to be swapped. The swapping happens later.
- * @param path path to the current filterNode's parent. For example, path could be 'ServiceApointment' when filterNode is 'State'. If the path does not exist in 'objectInfoApiMap', parent node is not an field of relationship or recordQuery
+ * @param parentPath path to the current filterNode's parent. For example, path could be 'ServiceApointment' when filterNode is 'State'. If the path does not exist in 'pathToObjectApiNamesMap', parent node is not an field of relationship or recordQuery
+ * @param isParentPolymorphic true if parent points to a polymorphic field.
  * @param queryNode referece FieldNode which provides the information if 'filterNode' exist in it nor not.
  * @param objectInfos ObjectInfo map used in injection. If ObjectInfo misses or field does not exist in ObjectInfo, the error will be thrown
- * @param objectInfoApiMap map used to locate the ObjectInfo. The key is path to a field, value is the ObjectInfo's apiName array. In the case of polymorphic fields, the apiName array have 2 or more elements. For example, 'ServiceAppointment' -> ['ServiceAppointment']; 'ServiceAppointment_Account' -> ['Account'], 'ServiceAppointment_Owner' -> ['User', 'Group'].
+ * @param pathToObjectApiNamesMap map used to locate the ObjectInfo. The key is path to a field, value is the ObjectInfo's apiName array. In the case of polymorphic fields, the apiName array have 2 or more elements. For example, 'ServiceAppointment' -> ['ServiceAppointment']; 'ServiceAppointment_Account' -> ['Account'], 'ServiceAppointment_Owner' -> ['User', 'Group'].
  * @param draftFunctions functions for working with record ids that may be draft-created ids
  * @returns an array of nodes with injected fields
  */
-function injectFilter(filterNode, idState, path, objectInfos, objectInfoApiMap, draftFunctions, queryNode) {
+function injectFilter(filterNode, idState, parentPath, isParentPolymorphic, objectInfos, pathToObjectApiNamesMap, draftFunctions, queryNode) {
     const injectedSelections = [];
+    let isPolymorphicField = false;
     switch (filterNode.kind) {
         case Kind.ARGUMENT:
             if (filterNode.value.kind !== 'ObjectValue')
                 return [];
             filterNode.value.fields.forEach((objectFieldNode) => {
-                let subResults = injectFilter(objectFieldNode, idState, path, objectInfos, objectInfoApiMap, draftFunctions, queryNode);
+                let subResults = injectFilter(objectFieldNode, idState, parentPath, isParentPolymorphic, objectInfos, pathToObjectApiNamesMap, draftFunctions, queryNode);
                 for (const subResult of subResults) {
                     mergeOrAddToGroup(injectedSelections, subResult);
                 }
                 // multiple Ids might need to be swapped. remember their paths for faster write.
                 if (idState.swapNeeded) {
-                    idState.paths.push(path);
+                    idState.paths.push(parentPath);
                 }
             });
             return injectedSelections;
@@ -10027,7 +10181,7 @@ function injectFilter(filterNode, idState, path, objectInfos, objectInfoApiMap,
                 case Kind.LIST: {
                     filterNode.value.values.filter(isObjectValueNode).forEach((objectValueNode) => {
                         objectValueNode.fields.forEach((objectFieldNode) => {
-                            const subResults = injectFilter(objectFieldNode, idState, path, objectInfos, objectInfoApiMap, draftFunctions, queryNode);
+                            const subResults = injectFilter(objectFieldNode, idState, parentPath, isParentPolymorphic, objectInfos, pathToObjectApiNamesMap, draftFunctions, queryNode);
                             for (const subResult of subResults) {
                                 mergeOrAddToGroup(injectedSelections, subResult);
                             }
@@ -10038,7 +10192,7 @@ function injectFilter(filterNode, idState, path, objectInfos, objectInfoApiMap,
                 case Kind.OBJECT: {
                     if (filterNode.name.value === 'not') {
                         filterNode.value.fields.forEach((objectFieldNode) => {
-                            const subResults = injectFilter(objectFieldNode, idState, path, objectInfos, objectInfoApiMap, draftFunctions, queryNode);
+                            const subResults = injectFilter(objectFieldNode, idState, parentPath, isParentPolymorphic, objectInfos, pathToObjectApiNamesMap, draftFunctions, queryNode);
                             for (const subResult of subResults) {
                                 mergeOrAddToGroup(injectedSelections, subResult);
                             }
@@ -10048,15 +10202,15 @@ function injectFilter(filterNode, idState, path, objectInfos, objectInfoApiMap,
                         let apiNames = [];
                         let isScalarField = false;
                         //It is possible that this is a polymorphic field
-                        apiNames = objectInfoApiMap[path];
-                        // example: path: 'ServiceAppointment_LastModifiedDate'; filterNode: '{eq: {literal: LAST_WEEK}}'. queryNode: 'LastModifedDate { value}' FilterNode's parent has been verifed as a valid node
+                        apiNames = pathToObjectApiNamesMap[parentPath];
+                        // example: path: 'ServiceAppointment#LastModifiedDate'; filterNode: '{eq: {literal: LAST_WEEK}}'. queryNode: 'LastModifedDate { value}' FilterNode's parent has been verifed as a valid node
                         if (apiNames === undefined) {
                             isScalarField = true;
                         }
                         else {
                             if (apiNames.some((apiName) => objectInfos[apiName] === undefined)) {
                                 // eslint-disable-next-line
-                                throw new Error(`ObjectInfo is missing for ${path}`);
+                                throw new Error(`ObjectInfo is missing for ${parentPath}`);
                             }
                         }
                         if (isScalarField) {
@@ -10078,29 +10232,19 @@ function injectFilter(filterNode, idState, path, objectInfos, objectInfoApiMap,
                                 }
                             });
                         let isSpanning = false;
+                        // if true, current node is a polymorphic concrete type node. For example, field node `User` under `Owner`
                         let isInlineFragment = false;
-                        let isPolymorphicField = false;
                         let isTypeNameExisting = false;
                         let curPath;
                         let fieldName = filterNode.name.value;
-                        curPath = `${path}_${fieldName}`;
-                        if (objectInfoApiMap[curPath] && objectInfoApiMap[curPath].length > 0) {
+                        curPath = `${parentPath}#${fieldName}`;
+                        if (pathToObjectApiNamesMap[curPath] &&
+                            pathToObjectApiNamesMap[curPath].length > 0) {
                             isSpanning = true;
-                            if (objectInfoApiMap[curPath].length === 1) {
-                                if (objectInfoApiMap[path] &&
-                                    objectInfoApiMap[path].length >= 1 &&
-                                    objectInfoApiMap[path].includes(objectInfoApiMap[curPath][0])) {
-                                    isInlineFragment = true;
-                                }
-                            }
-                            // Checks if the current filter node is a polymorphic field. 'ServiceAppointment_Owner' --> ['User']; 'ServiceAppointment_Owner_User' --> ['User']
-                            const childApiName = objectInfoApiMap[curPath][0];
-                            const trialApiNames = objectInfoApiMap[`${curPath}_${childApiName}`];
-                            if (trialApiNames !== undefined &&
-                                trialApiNames.length === 1 &&
-                                trialApiNames[0] === childApiName) {
-                                isPolymorphicField = true;
-                            }
+                            isInlineFragment =
+                                isParentPolymorphic &&
+                                    pathToObjectApiNamesMap[curPath].length === 1;
+                            isPolymorphicField = isPolymorphicFieldPath(curPath, pathToObjectApiNamesMap, objectInfos);
                         }
                         // When filter node is at InLineFragment Level(a concrete entity of polymorphic field), query node is one level up. For example,  ObjectFieldNode is ...{User:{...}}, queryNode is Owner:[User]
                         if (isInlineFragment) {
@@ -10144,23 +10288,25 @@ function injectFilter(filterNode, idState, path, objectInfos, objectInfoApiMap,
                                 throw new Error(`Field ${fieldName} does not exist in ${apiNames[0]}`);
                             }
                         }
-                        const objectInfoName = objectInfoApiMap[curPath] !== undefined
-                            ? objectInfoApiMap[curPath][0]
-                            : objectInfoApiMap[path][0];
+                        const objectInfoName = pathToObjectApiNamesMap[curPath] !== undefined
+                            ? pathToObjectApiNamesMap[curPath][0]
+                            : pathToObjectApiNamesMap[parentPath][0];
                         const isIdField = isFieldAnIdField(filterNode.name.value, objectInfos[objectInfoName]);
                         if (!isIdField) {
                             let subSelectionNodes = [];
                             let subFieldsHasId = false;
-                            filterNode.value.fields.forEach((subFieldNode) => {
-                                // Check if the filter field has the 'Id'
-                                if (isFieldAnIdField(subFieldNode.name.value, objectInfos[objectInfoName])) {
-                                    subFieldsHasId = true;
-                                    updateIDInfo(subFieldNode, idState, draftFunctions);
-                                }
-                                // try injecting the fields within predicate no matter it has relation or not.
-                                let subResults = injectFilter(subFieldNode, idState, curPath, objectInfos, objectInfoApiMap, draftFunctions, existingFields ? existingFields[0] : undefined);
-                                subSelectionNodes = subSelectionNodes.concat(subResults);
-                            });
+                            if (isSpanning) {
+                                filterNode.value.fields.forEach((subFieldNode) => {
+                                    // Check if the filter field has the 'Id'
+                                    if (isFieldAnIdField(subFieldNode.name.value, objectInfos[objectInfoName])) {
+                                        subFieldsHasId = true;
+                                        updateIDInfo(subFieldNode, idState, draftFunctions);
+                                    }
+                                    // try injecting the fields within predicate no matter it has relation or not.
+                                    let subResults = injectFilter(subFieldNode, idState, curPath, isPolymorphicField, objectInfos, pathToObjectApiNamesMap, draftFunctions, existingFields ? existingFields[0] : undefined);
+                                    subSelectionNodes = subSelectionNodes.concat(subResults);
+                                });
+                            }
                             if (!subFieldsHasId) {
                                 // Check if the query field has the 'Id'
                                 const existingIdsInQuery = existingFields &&
@@ -10189,6 +10335,7 @@ function injectFilter(filterNode, idState, path, objectInfos, objectInfoApiMap,
                             }
                             //Inject Conditions: 1. Same field does not exist 2. Same fields has different children. 3. Filter spanning field does not have Id. 4. InLineFragment does not have the '__typename' field
                             if (!existingFields ||
+                                existingFields.length === 0 ||
                                 subSelectionNodes.length > 0 ||
                                 (isSpanning && !subFieldsHasId) ||
                                 (isInlineFragment && !isTypeNameExisting)) {
@@ -10319,6 +10466,44 @@ function mergeOrAddToGroup(group, element) {
     }
     group.push(element);
 }
+// checks if the path points to a polymorphic field. For example, for  the below `pathToObjectApiNamesMap`
+//  {
+//    'ServiceAppointment' -> ['ServiceAppointment']
+//    'ServiceAppointment#Owner' --> ['User'],
+//    'ServiceAppointment#Owner#User' --> ['User']
+//  }
+//  path `ServiceAppointment#Owner` points to a polymorphic field, but path `ServiceAppointment#Owner#User` does not.
+function isPolymorphicFieldPath(path, pathToObjectApiNamesMap, objectInfos) {
+    const lastSegmentIndex = path.lastIndexOf('#');
+    if (lastSegmentIndex < 0) {
+        return false;
+    }
+    const lastSegment = path.slice(lastSegmentIndex + 1);
+    const parentApiPath = path.slice(0, lastSegmentIndex);
+    if (pathToObjectApiNamesMap[parentApiPath] === undefined) {
+        return false;
+    }
+    const parentObjectApiNames = pathToObjectApiNamesMap[parentApiPath];
+    // If the last segment is a Polymorphic field, its immediate parent is a concrete object entity, which has 1 objectApiName mapped to the parent path in `pathToObjectApiNamesMap`.
+    // For example, we like to check if `ServiceAppointment#Owner` path is polymorphic. The last segment is `Owner` and its parent `ServiceAppointment` has one element (which is also `ServiceAppointment`) array as its value.
+    // Below are the entries in `pathToObjectApiNamesMap`
+    //   {
+    //      `ServiceAppointmen`t: [`ServiceAppointment`],
+    //      `ServiceAppointment#Owner`: [`User`, `Group`],
+    //      `ServiceAppointment#Owner#User`: [`User`],
+    //      `ServiceAppointment#Owner#Group`: [`Group`],
+    //   }
+    if (parentObjectApiNames.length !== 1) {
+        return false;
+    }
+    const parentObjectInfo = objectInfos[parentObjectApiNames[0]];
+    const relationshipField = referenceIdFieldForRelationship(lastSegment);
+    let fieldDefinition = parentObjectInfo.fields[relationshipField];
+    if (fieldDefinition === undefined) {
+        return false;
+    }
+    return fieldDefinition.polymorphicForeignKey;
+}
 function isFieldAnIdField(fieldName, objectInfo) {
     if (fieldName === 'Id')
         return true;
@@ -10371,10 +10556,10 @@ function updateIDInfo(fieldNode, idState, draftFunctions) {
  * @param parentNode parent node of param 1
  * @param ancestors ancester of param 1
  * @param objectInfos ObjectInfo map used in injection. If ObjectInfo misses or field does not exist in ObjectInfo, the error will be thrown
- * @param objectInfoApiMap map used to locate the ObjectInfo. The key is path to a field, value is the ObjectInfo's apiName array. In the case of polymorphic fields, the apiName array have 2 or more elements. For example, 'ServiceAppointment' -> ['ServiceAppointment']; 'ServiceAppointment_Account' -> ['Account'], 'ServiceAppointment_Owner' -> ['User', 'Group'].
+ * @param pathToObjectApiNamesMap map used to locate the ObjectInfo. The key is path to a field, value is the ObjectInfo's apiName array. In the case of polymorphic fields, the apiName array have 2 or more elements. For example, 'ServiceAppointment' -> ['ServiceAppointment']; 'ServiceAppointment#Account' -> ['Account'], 'ServiceAppointment#Owner' -> ['User', 'Group'].
  * @return injected SelectionNodes used to construct the InlineFragment.
  */
-function injectFields(selections, parentNode, ancestors, objectInfos, objectInfoApiMap) {
+function injectFields(selections, parentNode, parentPath, ancestors, objectInfos, pathToObjectApiNamesMap) {
     /**
      *  1 parentship can return 2 FieldNode which need to be flattened
      *  Concact: {   **   Contact {    ** ContactId {
@@ -10392,6 +10577,10 @@ function injectFields(selections, parentNode, ancestors, objectInfos, objectInfo
         if (!selection.selectionSet) {
             return selection;
         }
+        const segment = isFieldNode(selection)
+            ? selection.name.value
+            : selection.typeCondition.name.value;
+        const curPath = `${parentPath}#${segment}`;
         const spanningSubSelections = [];
         for (const subSelection of selection.selectionSet.selections) {
             if (isFieldSpanning(subSelection, selection)) {
@@ -10399,7 +10588,7 @@ function injectFields(selections, parentNode, ancestors, objectInfos, objectInfo
             }
         }
         // Handles multiple level field injection like 'ServiceAppointment' --> 'Account' --> 'Owner'
-        const subInjectedSelections = injectFields(spanningSubSelections, selection, ancestors, objectInfos, objectInfoApiMap);
+        const subInjectedSelections = injectFields(spanningSubSelections, selection, curPath, ancestors, objectInfos, pathToObjectApiNamesMap);
         if (!selection.selectionSet) {
             return selection;
         }
@@ -10442,7 +10631,7 @@ function injectFields(selections, parentNode, ancestors, objectInfos, objectInfo
             }
         }
         // For polymorphic fields, the Id field is excluded.
-        const excludeId = selection.selectionSet.selections.every(isInlineFragmentNode);
+        const excludeId = isPolymorphicFieldPath(curPath, pathToObjectApiNamesMap, objectInfos);
         const idSelection = [];
         if (!excludeId && !hasIdAlready) {
             idSelection.push({
@@ -10453,8 +10642,8 @@ function injectFields(selections, parentNode, ancestors, objectInfos, objectInfo
                 },
             });
         }
-        // Inject '__typename' for polymorphic fields. '__typename' field acts as a reference to concrete type of a polymorphic field and is used to match JSON response with AST node. For more detail,
-        // please reference 'removeSyntheticFields'.
+        // Inject '__typename' for InlineFragment. '__typename' field acts as a reference to concrete type of a polymorphic field or a standard field in the returned GQL response, which equals to
+        // `typedCondition` of the InlineFragment in the query AST. It is used to match JSON response with AST node. For more detail, please reference 'removeSyntheticFields'.
         if (isInlineFragmentNode(selection) &&
             !selection.selectionSet.selections.find((selection) => isFieldNode(selection) && selection.name.value === '__typename')) {
             idSelection.push({
@@ -10488,7 +10677,7 @@ function injectFields(selections, parentNode, ancestors, objectInfos, objectInfo
     if (isFieldNode(parentNode) && parentNode.selectionSet && parentNode.name.value === 'node') {
         if (parentNode.selectionSet.selections
             .filter(isFieldOrInlineFragmentNode)
-            .some((selectionNode) => isRelationship(selectionNode, 'childRelationship'))) {
+            .some((selectionNode) => isRelationship(selectionNode, CHILD_RELATIONSHIP))) {
             if (!parentNode.selectionSet.selections
                 .filter(isFieldNode)
                 .some((sibling) => sibling.name.value === 'Id')) {
@@ -10507,15 +10696,15 @@ function injectFields(selections, parentNode, ancestors, objectInfos, objectInfo
             if (parentInfo.parentIndex >= 0) {
                 // example node { TimeSheetEntries { edges { node { Id }}}}
                 const parent = parentInfo.node;
-                if (isRelationship(parent, 'childRelationship')) {
+                if (isRelationship(parent, CHILD_RELATIONSHIP)) {
                     const unVisitedAncestors = ancestors.slice(0, parentInfo.parentIndex);
                     // path : "TimeSheet"
                     const grandParentPath = findAncesterPath(unVisitedAncestors);
-                    if (objectInfoApiMap &&
-                        objectInfoApiMap[grandParentPath] &&
+                    if (pathToObjectApiNamesMap &&
+                        pathToObjectApiNamesMap[grandParentPath] &&
                         objectInfos &&
-                        objectInfos[objectInfoApiMap[grandParentPath][0]]) {
-                        const grandParentObjectInfo = objectInfos[objectInfoApiMap[grandParentPath][0]];
+                        objectInfos[pathToObjectApiNamesMap[grandParentPath][0]]) {
+                        const grandParentObjectInfo = objectInfos[pathToObjectApiNamesMap[grandParentPath][0]];
                         // exmaple "TimeSheetEntries"
                         const parentFieldName = parent.name.value;
                         const targetRelationship = grandParentObjectInfo.childRelationships.find((childRelationship) => {
@@ -10636,7 +10825,7 @@ const assignedToMeFragmentSelections = [
                         },
                         value: {
                             kind: 'StringValue',
-                            value: 'childRelationship',
+                            value: CHILD_RELATIONSHIP,
                             block: false,
                         },
                     },
@@ -10728,7 +10917,7 @@ const assignedToMeFragmentSelections = [
                                                             },
                                                             value: {
                                                                 kind: 'StringValue',
-                                                                value: 'parentRelationship',
+                                                                value: PARENT_RELATIONSHIP,
                                                                 block: false,
                                                             },
                                                         },
@@ -10865,7 +11054,9 @@ function handleNonArrayJsonProperty(selection, fieldName, jsonInput, jsonOutput)
             jsonOutput[fieldName] = null;
             return;
         }
-        jsonOutput[fieldName] = {};
+        if (jsonOutput[fieldName] === undefined) {
+            jsonOutput[fieldName] = {};
+        }
         createUserJsonOutput(selection, jsonInput[fieldName], jsonOutput[fieldName]);
     }
     else {
@@ -11597,34 +11788,42 @@ function applyReferenceLinksToDraft(record, draftMetadata) {
         }
         const { dataType, relationshipName, referenceToInfos } = fieldInfo;
         const draftFieldValue = record.fields[draftField].value;
-        if (dataType === 'Reference' && relationshipName !== null && draftFieldValue !== null) {
-            if (typeof draftFieldValue !== 'string') {
-                throw Error('reference field value is not a string');
+        if (dataType === 'Reference' && relationshipName !== null) {
+            if (draftFieldValue === null) {
+                recordFields[relationshipName] = {
+                    displayValue: null,
+                    value: null,
+                };
             }
-            const key = getRecordKeyForId(luvio, draftFieldValue);
-            const referencedRecord = referencedRecords.get(key);
-            recordFields[relationshipName] = {
-                displayValue: null,
-                value: createLink(key),
-            };
-            // for custom objects, we select the 'Name' field
-            // otherwise we check the object info for name fields.
-            //if there are multiple we select 'Name' if it exists, otherwise the first one
-            if (referencedRecord !== undefined && referenceToInfos.length > 0) {
-                let nameField;
-                const referenceToInfo = referenceToInfos[0];
-                const nameFields = referenceToInfo.nameFields;
-                if (nameFields.length !== 0) {
-                    nameField = nameFields.find((x) => x === 'Name');
-                    if (nameField === undefined) {
-                        nameField = nameFields[0];
-                    }
+            else {
+                if (typeof draftFieldValue !== 'string') {
+                    throw Error('reference field value is not a string');
                 }
-                if (nameField !== undefined) {
-                    const nameFieldRef = referencedRecord.fields[nameField];
-                    if (nameFieldRef) {
-                        recordFields[relationshipName].displayValue =
-                            (_a = nameFieldRef.displayValue) !== null && _a !== void 0 ? _a : nameFieldRef.value;
+                const key = getRecordKeyForId(luvio, draftFieldValue);
+                const referencedRecord = referencedRecords.get(key);
+                recordFields[relationshipName] = {
+                    displayValue: null,
+                    value: createLink(key),
+                };
+                // for custom objects, we select the 'Name' field
+                // otherwise we check the object info for name fields.
+                //if there are multiple we select 'Name' if it exists, otherwise the first one
+                if (referencedRecord !== undefined && referenceToInfos.length > 0) {
+                    let nameField;
+                    const referenceToInfo = referenceToInfos[0];
+                    const nameFields = referenceToInfo.nameFields;
+                    if (nameFields.length !== 0) {
+                        nameField = nameFields.find((x) => x === 'Name');
+                        if (nameField === undefined) {
+                            nameField = nameFields[0];
+                        }
+                    }
+                    if (nameField !== undefined) {
+                        const nameFieldRef = referencedRecord.fields[nameField];
+                        if (nameFieldRef) {
+                            recordFields[relationshipName].displayValue =
+                                (_a = nameFieldRef.displayValue) !== null && _a !== void 0 ? _a : nameFieldRef.value;
+                        }
                     }
                 }
             }
@@ -11917,17 +12116,8 @@ class UiApiActionHandler extends AbstractResourceRequestActionHandler {
         };
         for (const fieldName of keys$3(recordWithSpanningRefLinks.fields)) {
             const fieldKey = buildRecordFieldStoreKey(key, fieldName);
-            if (this.collectedFields[fieldKey] !== undefined) {
-                const fieldData = recordWithSpanningRefLinks.fields[fieldName];
-                normalizedRecord.fields[fieldName] = { __ref: fieldKey };
-                publishData(fieldKey, fieldData);
-            }
-            else if (recordWithSpanningRefLinks.fields[fieldName] &&
-                recordWithSpanningRefLinks.fields[fieldName].value &&
-                recordWithSpanningRefLinks.fields[fieldName].value.__ref !== undefined) {
-                normalizedRecord.fields[fieldName] = { __ref: fieldKey };
-                publishData(fieldKey, recordWithSpanningRefLinks.fields[fieldName]);
-            }
+            normalizedRecord.fields[fieldName] = { __ref: fieldKey };
+            publishData(fieldKey, recordWithSpanningRefLinks.fields[fieldName]);
         }
         // publish the normalized record
         publishData(key, normalizedRecord);
@@ -12826,6 +13016,9 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
             if (!rebuildResult.errors) {
                 rebuildResult = removeSyntheticFields(rebuildResult, config.query);
             }
+            if (objectsDeepEqual(rebuildResult, originalSnapshot.data)) {
+                return originalSnapshot;
+            }
             // 'originalSnapshot' is the local eval snapshot subscribed. It is always in 'Fulfilled' state. This behavior would change once W-1273462(rebuild non-evaluated snapshot when the graphql local eval rebuild is triggered) is resolved.
             return {
                 ...originalSnapshot,
@@ -12844,7 +13037,7 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
         // Fulfilled snapshot (this only happens in this code path if
         // the error is network error or 504), otherwise we spread over
         // the non-eval'ed snapshot (which will be either Fulfilled or Stale)
-        return nonEvaluatedSnapshot.state === 'Error'
+        const resultSnapshot = nonEvaluatedSnapshot.state === 'Error'
             ? createLocalEvalSnapshot(gqlResult, seenRecords, recordId, rebuildWithLocalEval)
             : {
                 ...nonEvaluatedSnapshot,
@@ -12853,6 +13046,22 @@ function draftAwareGraphQLAdapterFactory(userId, objectInfoService, store, luvio
                 seenRecords,
                 rebuildWithLocalEval,
             };
+        const { refresh, state } = resultSnapshot;
+        if (state !== 'Error' && refresh) {
+            // after refreshing a graphql snapshot, we want to force a rebuild regardless
+            // of if the call failed or not or if the data changed or not because we want
+            // to make sure any potential new drafts are picked up
+            resultSnapshot.refresh = {
+                ...refresh,
+                resolve: (config) => {
+                    return refresh.resolve(config).finally(() => {
+                        luvio.storePublish(resultSnapshot.recordId, undefined);
+                        luvio.storeBroadcast();
+                    });
+                },
+            };
+        }
+        return resultSnapshot;
     };
 }
 
@@ -13907,7 +14116,10 @@ function isErrorResponse(response) {
  * @returns the merged record
  */
 function mergeAggregateUiResponse(response, mergeFunc) {
-    const { body } = response;
+    if (response.ok === false) {
+        return response;
+    }
+    const body = response.body;
     try {
         if (body === null ||
             body === undefined ||
@@ -15870,6 +16082,9 @@ class PrimingSession extends EventEmitter {
         this.ldsRecordRefresher = config.ldsRecordRefresher;
         this.networkWorkerPool = new AsyncWorkerPool(this.concurrency);
         this.useBatchGQL = ldsPrimingGraphqlBatch.isOpen({ fallback: false });
+        if (this.useBatchGQL) {
+            this.batchSize = this.batchSize / DEFAULT_GQL_QUERY_BATCH_SIZE;
+        }
         this.conflictPool = new ConflictPool(config.store, this.objectInfoLoader);
     }
     // function that enqueues priming work
@@ -16731,4 +16946,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.228.1-4e6356f71
+// version: 1.229.0-dev10-bc9ef2513