@salesforce/lds-worker-api 1.158.2 → 1.159.1

package/dist/standalone/es/lds-worker-api.js

@@ -3672,7 +3672,7 @@ class Luvio {
         return this.environment.buildStructuredKey(namespace, representationName, idValues);
     }
 }
-// engine version: 0.143.4-64dccb30
+// engine version: 0.143.5-e5a21255
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -3799,7 +3799,7 @@ function withDefaultLuvio(callback) {
     }
     callbacks.push(callback);
 }
-// version: 1.158.2-6b3522c4a
+// version: 1.159.1-0b4572813
 
 // TODO [TD-0081508]: once that TD is fulfilled we can probably change this file
 function instrumentAdapter$1(createFunction, _metadata) {
@@ -15232,7 +15232,7 @@ function parseAndVisit(source) {
     updateReferenceMapWithKnownKey(ast, luvioDocumentNode);
     return luvioDocumentNode;
 }
-// version: 1.158.2-6b3522c4a
+// version: 1.159.1-0b4572813
 
 function unwrap(data) {
     // The lwc-luvio bindings import a function from lwc called "unwrap".
@@ -16145,7 +16145,7 @@ function createGraphQLWireAdapterConstructor(luvio, adapter, metadata, astResolv
     const { apiFamily, name } = metadata;
     return createGraphQLWireAdapterConstructor$1(adapter, `${apiFamily}.${name}`, luvio, astResolver);
 }
-// version: 1.158.2-6b3522c4a
+// version: 1.159.1-0b4572813
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -16228,7 +16228,7 @@ var FragmentReadResultState;
 ({
     state: FragmentReadResultState.Missing,
 });
-// engine version: 0.143.4-64dccb30
+// engine version: 0.143.5-e5a21255
 
 const { keys: ObjectKeys$3, create: ObjectCreate$3 } = Object;
 
@@ -44016,7 +44016,7 @@ withDefaultLuvio((luvio) => {
         dropFunction: instrumentation$2.notifyRecordUpdateAvailableDropped,
     });
 });
-// version: 1.158.2-2489a5047
+// version: 1.159.1-3cc6c1f48
 
 var caseSensitiveUserId = '005B0000000GR4OIAW';
 
@@ -60050,7 +60050,7 @@ register({
     id: '@salesforce/lds-network-adapter',
     instrument: instrument$1,
 });
-// version: 1.158.2-6b3522c4a
+// version: 1.159.1-0b4572813
 
 const { create: create$2, keys: keys$2 } = Object;
 const { stringify: stringify$1, parse: parse$1 } = JSON;
@@ -60066,6 +60066,17 @@ function createFragmentMap(documentNode) {
     return fragments;
 }
 
+function buildFieldState(state, fullPath, data) {
+    return {
+        ...state,
+        path: {
+            parent: null,
+            propertyName: null,
+            fullPath,
+        },
+        data,
+    };
+}
 function serializeFieldArguments(argumentNodes, variables) {
     const mutableArgumentNodes = Object.assign([], argumentNodes);
     return `args__(${mutableArgumentNodes
@@ -61057,80 +61068,32 @@ function getTypeCacheKeys$13(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'DoubleValue': {
-                const avgState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const avgState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$16(requestedField, avgState));
                 break;
             }
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'PercentValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$14(requestedField, maxState));
                 break;
             }
             case 'PercentValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$14(requestedField, minState));
                 break;
             }
             case 'PercentValue': {
-                const sumState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const sumState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$14(requestedField, sumState));
                 break;
             }
@@ -61221,41 +61184,17 @@ function ingestFieldByType$_(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'DoubleValue': {
-            const DoubleValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DoubleValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$13(requestedField, DoubleValueState);
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'PercentValue': {
-            const PercentValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const PercentValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$11(requestedField, PercentValueState);
             break;
         }
@@ -61667,67 +61606,27 @@ function getTypeCacheKeys$10(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'IntValue': {
-                const groupingState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const groupingState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$12(requestedField, groupingState));
                 break;
             }
             case 'StringValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$11(requestedField, maxState));
                 break;
             }
             case 'StringValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$11(requestedField, minState));
                 break;
             }
@@ -61808,41 +61707,17 @@ function ingestFieldByType$X(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'IntValue': {
-            const IntValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IntValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$$(requestedField, IntValueState);
             break;
         }
         case 'StringValue': {
-            const StringValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const StringValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$_(requestedField, StringValueState);
             break;
         }
@@ -62318,210 +62193,82 @@ function getTypeCacheKeys$Z(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'DateFunctionAggregation': {
-                const calendarMonthState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const calendarMonthState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$$(requestedField, calendarMonthState));
                 break;
             }
             case 'DateFunctionAggregation': {
-                const calendarQuarterState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const calendarQuarterState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$$(requestedField, calendarQuarterState));
                 break;
             }
             case 'DateFunctionAggregation': {
-                const calendarYearState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const calendarYearState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$$(requestedField, calendarYearState));
                 break;
             }
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'DateFunctionAggregation': {
-                const dayInMonthState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const dayInMonthState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$$(requestedField, dayInMonthState));
                 break;
             }
             case 'DateFunctionAggregation': {
-                const dayInWeekState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const dayInWeekState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$$(requestedField, dayInWeekState));
                 break;
             }
             case 'DateFunctionAggregation': {
-                const dayInYearState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const dayInYearState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$$(requestedField, dayInYearState));
                 break;
             }
             case 'DateFunctionAggregation': {
-                const fiscalMonthState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const fiscalMonthState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$$(requestedField, fiscalMonthState));
                 break;
             }
             case 'DateFunctionAggregation': {
-                const fiscalQuarterState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const fiscalQuarterState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$$(requestedField, fiscalQuarterState));
                 break;
             }
             case 'DateFunctionAggregation': {
-                const fiscalYearState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const fiscalYearState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$$(requestedField, fiscalYearState));
                 break;
             }
             case 'IntValue': {
-                const groupingState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const groupingState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$12(requestedField, groupingState));
                 break;
             }
             case 'DateValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$_(requestedField, maxState));
                 break;
             }
             case 'DateValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$_(requestedField, minState));
                 break;
             }
             case 'DateFunctionAggregation': {
-                const weekInMonthState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const weekInMonthState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$$(requestedField, weekInMonthState));
                 break;
             }
             case 'DateFunctionAggregation': {
-                const weekInYearState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const weekInYearState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$$(requestedField, weekInYearState));
                 break;
             }
@@ -62672,54 +62419,22 @@ function ingestFieldByType$U(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'DateFunctionAggregation': {
-            const DateFunctionAggregationState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DateFunctionAggregationState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$Y(requestedField, DateFunctionAggregationState);
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'IntValue': {
-            const IntValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IntValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$$(requestedField, IntValueState);
             break;
         }
         case 'DateValue': {
-            const DateValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DateValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$X(requestedField, DateValueState);
             break;
         }
@@ -63187,15 +62902,7 @@ function getTypeCacheKeys$W(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'ObjectInfo': {
-                const objectInfoState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const objectInfoState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$R(requestedField, objectInfoState));
                 break;
             }
@@ -63264,15 +62971,7 @@ function ingestFieldByType$R(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'ObjectInfo': {
-            const ObjectInfoState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const ObjectInfoState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$O(requestedField, ObjectInfoState);
             break;
         }
@@ -63718,15 +63417,7 @@ function getTypeCacheKeys$T(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'FilteredLookupInfo': {
-                const filteredLookupInfoState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const filteredLookupInfoState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$U(requestedField, filteredLookupInfoState));
                 break;
             }
@@ -63962,15 +63653,7 @@ function ingestFieldByType$O(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'FilteredLookupInfo': {
-            const FilteredLookupInfoState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const FilteredLookupInfoState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$R(requestedField, FilteredLookupInfoState);
             break;
         }
@@ -63979,15 +63662,7 @@ function ingestFieldByType$O(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'ReferenceToInfo': {
-            const ReferenceToInfoState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const ReferenceToInfoState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$N(requestedField, ReferenceToInfoState);
             break;
         }
@@ -64348,15 +64023,7 @@ function getTypeCacheKeys$R(astNode, state) {
                 break;
             }
             case 'ThemeInfo': {
-                const themeInfoState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const themeInfoState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$S(requestedField, themeInfoState));
                 break;
             }
@@ -64509,15 +64176,7 @@ function ingestFieldByType$M(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'ChildRelationship': {
-            const ChildRelationshipState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const ChildRelationshipState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$T(requestedField, ChildRelationshipState);
             break;
         }
@@ -64530,54 +64189,22 @@ function ingestFieldByType$M(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'DependentField': {
-            const DependentFieldState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DependentFieldState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$S(requestedField, DependentFieldState);
             break;
         }
         case 'Field': {
-            const FieldState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const FieldState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$Q(requestedField, FieldState);
             break;
         }
         case 'RecordTypeInfo': {
-            const RecordTypeInfoState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const RecordTypeInfoState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$V(requestedField, RecordTypeInfoState);
             break;
         }
         case 'ThemeInfo': {
-            const ThemeInfoState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const ThemeInfoState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$P(requestedField, ThemeInfoState);
             break;
         }
@@ -64702,15 +64329,7 @@ function getTypeCacheKeys$Q(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'ObjectInfo': {
-                const objectInfoState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const objectInfoState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$R(requestedField, objectInfoState));
                 break;
             }
@@ -64761,15 +64380,7 @@ function ingestFieldByType$L(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'ObjectInfo': {
-            const ObjectInfoState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const ObjectInfoState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$O(requestedField, ObjectInfoState);
             break;
         }
@@ -65183,93 +64794,37 @@ function getTypeCacheKeys$N(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'DoubleValue': {
-                const avgState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const avgState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$16(requestedField, avgState));
                 break;
             }
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'IntValue': {
-                const groupingState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const groupingState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$12(requestedField, groupingState));
                 break;
             }
             case 'LongValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, maxState));
                 break;
             }
             case 'LongValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, minState));
                 break;
             }
             case 'LongValue': {
-                const sumState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const sumState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, sumState));
                 break;
             }
@@ -65366,41 +64921,17 @@ function ingestFieldByType$I(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'DoubleValue': {
-            const DoubleValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DoubleValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$13(requestedField, DoubleValueState);
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'IntValue': {
-            const IntValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IntValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$$(requestedField, IntValueState);
             break;
         }
@@ -65676,67 +65207,27 @@ function getTypeCacheKeys$L(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'IntValue': {
-                const groupingState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const groupingState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$12(requestedField, groupingState));
                 break;
             }
             case 'PhoneNumberValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$M(requestedField, maxState));
                 break;
             }
             case 'PhoneNumberValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$M(requestedField, minState));
                 break;
             }
@@ -65815,41 +65306,17 @@ function ingestFieldByType$G(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'IntValue': {
-            const IntValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IntValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$$(requestedField, IntValueState);
             break;
         }
         case 'PhoneNumberValue': {
-            const PhoneNumberValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const PhoneNumberValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$J(requestedField, PhoneNumberValueState);
             break;
         }
@@ -66275,80 +65742,32 @@ function getTypeCacheKeys$I(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'DoubleValue': {
-                const avgState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const avgState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$16(requestedField, avgState));
                 break;
             }
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'CurrencyValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$J(requestedField, maxState));
                 break;
             }
             case 'CurrencyValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$J(requestedField, minState));
                 break;
             }
             case 'CurrencyValue': {
-                const sumState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const sumState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$J(requestedField, sumState));
                 break;
             }
@@ -66439,41 +65858,17 @@ function ingestFieldByType$D(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'DoubleValue': {
-            const DoubleValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DoubleValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$13(requestedField, DoubleValueState);
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'CurrencyValue': {
-            const CurrencyValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const CurrencyValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$G(requestedField, CurrencyValueState);
             break;
         }
@@ -67041,67 +66436,27 @@ function getTypeCacheKeys$F(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'IntValue': {
-                const groupingState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const groupingState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$12(requestedField, groupingState));
                 break;
             }
             case 'EmailValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$G(requestedField, maxState));
                 break;
             }
             case 'EmailValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$G(requestedField, minState));
                 break;
             }
@@ -67180,41 +66535,17 @@ function ingestFieldByType$A(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'IntValue': {
-            const IntValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IntValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$$(requestedField, IntValueState);
             break;
         }
         case 'EmailValue': {
-            const EmailValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const EmailValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$D(requestedField, EmailValueState);
             break;
         }
@@ -67626,15 +66957,7 @@ function getTypeCacheKeys$C(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'DateFunctionAggregation': {
-                const hourInDayState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const hourInDayState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$$(requestedField, hourInDayState));
                 break;
             }
@@ -67695,15 +67018,7 @@ function ingestFieldByType$x(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'DateFunctionAggregation': {
-            const DateFunctionAggregationState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DateFunctionAggregationState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$Y(requestedField, DateFunctionAggregationState);
             break;
         }
@@ -67979,80 +67294,32 @@ function getTypeCacheKeys$A(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'DoubleValue': {
-                const avgState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const avgState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$16(requestedField, avgState));
                 break;
             }
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'LatitudeValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$B(requestedField, maxState));
                 break;
             }
             case 'LatitudeValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$B(requestedField, minState));
                 break;
             }
             case 'DoubleValue': {
-                const sumState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const sumState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$16(requestedField, sumState));
                 break;
             }
@@ -68137,41 +67404,17 @@ function ingestFieldByType$v(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'DoubleValue': {
-            const DoubleValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DoubleValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$13(requestedField, DoubleValueState);
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'LatitudeValue': {
-            const LatitudeValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LatitudeValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$y(requestedField, LatitudeValueState);
             break;
         }
@@ -68447,80 +67690,32 @@ function getTypeCacheKeys$y(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'DoubleValue': {
-                const avgState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const avgState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$16(requestedField, avgState));
                 break;
             }
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'LongitudeValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$P(requestedField, maxState));
                 break;
             }
             case 'LongitudeValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$P(requestedField, minState));
                 break;
             }
             case 'DoubleValue': {
-                const sumState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const sumState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$16(requestedField, sumState));
                 break;
             }
@@ -68605,41 +67800,17 @@ function ingestFieldByType$t(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'DoubleValue': {
-            const DoubleValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DoubleValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$13(requestedField, DoubleValueState);
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'LongitudeValue': {
-            const LongitudeValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongitudeValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$M(requestedField, LongitudeValueState);
             break;
         }
@@ -68773,80 +67944,32 @@ function getTypeCacheKeys$x(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'DoubleValue': {
-                const avgState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const avgState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$16(requestedField, avgState));
                 break;
             }
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'DoubleValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$16(requestedField, maxState));
                 break;
             }
             case 'DoubleValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$16(requestedField, minState));
                 break;
             }
             case 'DoubleValue': {
-                const sumState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const sumState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$16(requestedField, sumState));
                 break;
             }
@@ -68937,28 +68060,12 @@ function ingestFieldByType$s(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'DoubleValue': {
-            const DoubleValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DoubleValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$13(requestedField, DoubleValueState);
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
@@ -69234,67 +68341,27 @@ function getTypeCacheKeys$v(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'IntValue': {
-                const groupingState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const groupingState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$12(requestedField, groupingState));
                 break;
             }
             case 'IDValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$a(requestedField, maxState));
                 break;
             }
             case 'IDValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$a(requestedField, minState));
                 break;
             }
@@ -69373,41 +68440,17 @@ function ingestFieldByType$q(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'IntValue': {
-            const IntValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IntValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$$(requestedField, IntValueState);
             break;
         }
         case 'IDValue': {
-            const IDValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IDValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$7(requestedField, IDValueState);
             break;
         }
@@ -69545,67 +68588,27 @@ function getTypeCacheKeys$u(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'IntValue': {
-                const groupingState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const groupingState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$12(requestedField, groupingState));
                 break;
             }
             case 'UrlValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$O(requestedField, maxState));
                 break;
             }
             case 'UrlValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$O(requestedField, minState));
                 break;
             }
@@ -69684,41 +68687,17 @@ function ingestFieldByType$p(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'IntValue': {
-            const IntValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IntValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$$(requestedField, IntValueState);
             break;
         }
         case 'UrlValue': {
-            const UrlValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const UrlValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$L(requestedField, UrlValueState);
             break;
         }
@@ -69856,67 +68835,27 @@ function getTypeCacheKeys$t(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'IntValue': {
-                const groupingState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const groupingState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$12(requestedField, groupingState));
                 break;
             }
             case 'TextAreaValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$w(requestedField, maxState));
                 break;
             }
             case 'TextAreaValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$w(requestedField, minState));
                 break;
             }
@@ -69995,41 +68934,17 @@ function ingestFieldByType$o(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'IntValue': {
-            const IntValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IntValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$$(requestedField, IntValueState);
             break;
         }
         case 'TextAreaValue': {
-            const TextAreaValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const TextAreaValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$t(requestedField, TextAreaValueState);
             break;
         }
@@ -70311,67 +69226,27 @@ function getTypeCacheKeys$r(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'IntValue': {
-                const groupingState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const groupingState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$12(requestedField, groupingState));
                 break;
             }
             case 'PicklistValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$K(requestedField, maxState));
                 break;
             }
             case 'PicklistValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$K(requestedField, minState));
                 break;
             }
@@ -70456,41 +69331,17 @@ function ingestFieldByType$m(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'IntValue': {
-            const IntValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IntValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$$(requestedField, IntValueState);
             break;
         }
         case 'PicklistValue': {
-            const PicklistValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const PicklistValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$H(requestedField, PicklistValueState);
             break;
         }
@@ -70628,93 +69479,37 @@ function getTypeCacheKeys$q(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'DoubleValue': {
-                const avgState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const avgState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$16(requestedField, avgState));
                 break;
             }
             case 'LongValue': {
-                const countState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countState));
                 break;
             }
             case 'LongValue': {
-                const countDistinctState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const countDistinctState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, countDistinctState));
                 break;
             }
             case 'IntValue': {
-                const groupingState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const groupingState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$12(requestedField, groupingState));
                 break;
             }
             case 'IntValue': {
-                const maxState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const maxState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$12(requestedField, maxState));
                 break;
             }
             case 'IntValue': {
-                const minState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const minState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$12(requestedField, minState));
                 break;
             }
             case 'LongValue': {
-                const sumState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const sumState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, sumState));
                 break;
             }
@@ -70811,41 +69606,17 @@ function ingestFieldByType$l(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'DoubleValue': {
-            const DoubleValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DoubleValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$13(requestedField, DoubleValueState);
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'IntValue': {
-            const IntValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IntValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$$(requestedField, IntValueState);
             break;
         }
@@ -71113,15 +69884,7 @@ function getTypeCacheKeys$o(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'IntValue': {
-                const groupingState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const groupingState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$12(requestedField, groupingState));
                 break;
             }
@@ -71176,15 +69939,7 @@ function ingestFieldByType$j(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'IntValue': {
-            const IntValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IntValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$$(requestedField, IntValueState);
             break;
         }
@@ -72040,28 +70795,12 @@ function ingestFieldByType$e(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'ListColumn': {
-            const ListColumnState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const ListColumnState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$i(requestedField, ListColumnState);
             break;
         }
         case 'ListOrder': {
-            const ListOrderState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const ListOrderState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$h(requestedField, ListOrderState);
             break;
         }
@@ -72450,223 +71189,87 @@ function getTypeCacheKeys$h(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'BooleanAggregate': {
-                const BooleanAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const BooleanAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$o(requestedField, BooleanAggregateState));
                 break;
             }
             case 'CurrencyAggregate': {
-                const CurrencyAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const CurrencyAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$I(requestedField, CurrencyAggregateState));
                 break;
             }
             case 'DateAggregate': {
-                const DateAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const DateAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$Z(requestedField, DateAggregateState));
                 break;
             }
             case 'DoubleAggregate': {
-                const DoubleAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const DoubleAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$x(requestedField, DoubleAggregateState));
                 break;
             }
             case 'EmailAggregate': {
-                const EmailAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const EmailAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$F(requestedField, EmailAggregateState));
                 break;
             }
             case 'IDAggregate': {
-                const IDAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const IDAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$v(requestedField, IDAggregateState));
                 break;
             }
             case 'IntAggregate': {
-                const IntAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const IntAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$q(requestedField, IntAggregateState));
                 break;
             }
             case 'LatitudeAggregate': {
-                const LatitudeAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const LatitudeAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$A(requestedField, LatitudeAggregateState));
                 break;
             }
             case 'LongitudeAggregate': {
-                const LongitudeAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const LongitudeAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$y(requestedField, LongitudeAggregateState));
                 break;
             }
             case 'LongAggregate': {
-                const LongAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const LongAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$N(requestedField, LongAggregateState));
                 break;
             }
             case 'PercentAggregate': {
-                const PercentAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const PercentAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$13(requestedField, PercentAggregateState));
                 break;
             }
             case 'PhoneNumberAggregate': {
-                const PhoneNumberAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const PhoneNumberAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$L(requestedField, PhoneNumberAggregateState));
                 break;
             }
             case 'PicklistAggregate': {
-                const PicklistAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const PicklistAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$r(requestedField, PicklistAggregateState));
                 break;
             }
             case 'StringAggregate': {
-                const StringAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const StringAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$10(requestedField, StringAggregateState));
                 break;
             }
             case 'TextAreaAggregate': {
-                const TextAreaAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const TextAreaAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$t(requestedField, TextAreaAggregateState));
                 break;
             }
             case 'TimeAggregate': {
-                const TimeAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const TimeAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$C(requestedField, TimeAggregateState));
                 break;
             }
             case 'UrlAggregate': {
-                const UrlAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const UrlAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$u(requestedField, UrlAggregateState));
                 break;
             }
@@ -72687,223 +71290,87 @@ function ingestFieldByType$d(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'BooleanAggregate': {
-            const BooleanAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const BooleanAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$l(requestedField, BooleanAggregateState);
             break;
         }
         case 'CurrencyAggregate': {
-            const CurrencyAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const CurrencyAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$F(requestedField, CurrencyAggregateState);
             break;
         }
         case 'DateAggregate': {
-            const DateAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DateAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$W(requestedField, DateAggregateState);
             break;
         }
         case 'DoubleAggregate': {
-            const DoubleAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DoubleAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$u(requestedField, DoubleAggregateState);
             break;
         }
         case 'EmailAggregate': {
-            const EmailAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const EmailAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$C(requestedField, EmailAggregateState);
             break;
         }
         case 'IDAggregate': {
-            const IDAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IDAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$s(requestedField, IDAggregateState);
             break;
         }
         case 'IntAggregate': {
-            const IntAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IntAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$n(requestedField, IntAggregateState);
             break;
         }
         case 'LatitudeAggregate': {
-            const LatitudeAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LatitudeAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$x(requestedField, LatitudeAggregateState);
             break;
         }
         case 'LongitudeAggregate': {
-            const LongitudeAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongitudeAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$v(requestedField, LongitudeAggregateState);
             break;
         }
         case 'LongAggregate': {
-            const LongAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$K(requestedField, LongAggregateState);
             break;
         }
         case 'PercentAggregate': {
-            const PercentAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const PercentAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$10(requestedField, PercentAggregateState);
             break;
         }
         case 'PhoneNumberAggregate': {
-            const PhoneNumberAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const PhoneNumberAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$I(requestedField, PhoneNumberAggregateState);
             break;
         }
         case 'PicklistAggregate': {
-            const PicklistAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const PicklistAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$o(requestedField, PicklistAggregateState);
             break;
         }
         case 'StringAggregate': {
-            const StringAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const StringAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$Z(requestedField, StringAggregateState);
             break;
         }
         case 'TextAreaAggregate': {
-            const TextAreaAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const TextAreaAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$q(requestedField, TextAreaAggregateState);
             break;
         }
         case 'TimeAggregate': {
-            const TimeAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const TimeAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$z(requestedField, TimeAggregateState);
             break;
         }
         case 'UrlAggregate': {
-            const UrlAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const UrlAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$r(requestedField, UrlAggregateState);
             break;
         }
@@ -73028,15 +71495,7 @@ function getTypeCacheKeys$g(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'RecordAggregate': {
-                const aggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const aggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$h(requestedField, aggregateState));
                 break;
             }
@@ -73075,15 +71534,7 @@ function ingestFieldByType$c(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'RecordAggregate': {
-            const RecordAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const RecordAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$e(requestedField, RecordAggregateState);
             break;
         }
@@ -73208,15 +71659,7 @@ function getTypeCacheKeys$f(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'RecordResult': {
-                const nodeState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const nodeState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$g(requestedField, nodeState));
                 break;
             }
@@ -73261,15 +71704,7 @@ function ingestFieldByType$b(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'RecordResult': {
-            const RecordResultState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const RecordResultState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$d(requestedField, RecordResultState);
             break;
         }
@@ -73635,15 +72070,7 @@ function getTypeCacheKeys$d(astNode, state) {
                 break;
             }
             case 'PageInfo': {
-                const pageInfoState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const pageInfoState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$e(requestedField, pageInfoState));
                 break;
             }
@@ -73694,28 +72121,12 @@ function ingestFieldByType$9(typename, parentKey, fullPathKey, requestedField, s
             break;
         }
         case 'RecordAggregateEdge': {
-            const RecordAggregateEdgeState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: fullPathKey
-                },
-                data: fieldData,
-            };
+            const RecordAggregateEdgeState = buildFieldState(state, fullPathKey, fieldData);
             sink[fieldKey] = ingest$c(requestedField, RecordAggregateEdgeState);
             break;
         }
         case 'PageInfo': {
-            const PageInfoState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: fullPathKey
-                },
-                data: fieldData,
-            };
+            const PageInfoState = buildFieldState(state, fullPathKey, fieldData);
             sink[fieldKey] = ingest$b(requestedField, PageInfoState);
             break;
         }
@@ -74181,15 +72592,7 @@ function getTypeCacheKeys$c(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'RecordAggregateConnection': {
-                const recordQueryAggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const recordQueryAggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$d(requestedField, recordQueryAggregateState));
                 break;
             }
@@ -74210,15 +72613,7 @@ function ingestFieldByType$8(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'RecordAggregateConnection': {
-            const RecordAggregateConnectionState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const RecordAggregateConnectionState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$a(requestedField, RecordAggregateConnectionState);
             break;
         }
@@ -76561,405 +74956,157 @@ function getTypeCacheKeys$5(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'IDValue': {
-                const LastModifiedByIdState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const LastModifiedByIdState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$a(requestedField, LastModifiedByIdState));
                 break;
             }
             case 'DateTimeValue': {
-                const LastModifiedDateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const LastModifiedDateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$H(requestedField, LastModifiedDateState));
                 break;
             }
             case 'DateTimeValue': {
-                const SystemModstampState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const SystemModstampState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$H(requestedField, SystemModstampState));
                 break;
             }
             case 'IDValue': {
-                const RecordTypeIdState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const RecordTypeIdState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$a(requestedField, RecordTypeIdState));
                 break;
             }
             case 'IntValue': {
-                const IntValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const IntValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$12(requestedField, IntValueState));
                 break;
             }
             case 'StringValue': {
-                const StringValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const StringValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$11(requestedField, StringValueState));
                 break;
             }
             case 'BooleanValue': {
-                const BooleanValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const BooleanValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$X(requestedField, BooleanValueState));
                 break;
             }
             case 'IDValue': {
-                const IDValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const IDValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$a(requestedField, IDValueState));
                 break;
             }
             case 'DateTimeValue': {
-                const DateTimeValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const DateTimeValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$H(requestedField, DateTimeValueState));
                 break;
             }
             case 'TimeValue': {
-                const TimeValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const TimeValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$s(requestedField, TimeValueState));
                 break;
             }
             case 'DateValue': {
-                const DateValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const DateValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$_(requestedField, DateValueState));
                 break;
             }
             case 'TextAreaValue': {
-                const TextAreaValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const TextAreaValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$w(requestedField, TextAreaValueState));
                 break;
             }
             case 'LongTextAreaValue': {
-                const LongTextAreaValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const LongTextAreaValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$z(requestedField, LongTextAreaValueState));
                 break;
             }
             case 'RichTextAreaValue': {
-                const RichTextAreaValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const RichTextAreaValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$E(requestedField, RichTextAreaValueState));
                 break;
             }
             case 'PhoneNumberValue': {
-                const PhoneNumberValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const PhoneNumberValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$M(requestedField, PhoneNumberValueState));
                 break;
             }
             case 'EmailValue': {
-                const EmailValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const EmailValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$G(requestedField, EmailValueState));
                 break;
             }
             case 'UrlValue': {
-                const UrlValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const UrlValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$O(requestedField, UrlValueState));
                 break;
             }
             case 'EncryptedStringValue': {
-                const EncryptedStringValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const EncryptedStringValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$m(requestedField, EncryptedStringValueState));
                 break;
             }
             case 'CurrencyValue': {
-                const CurrencyValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const CurrencyValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$J(requestedField, CurrencyValueState));
                 break;
             }
             case 'LongitudeValue': {
-                const LongitudeValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const LongitudeValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$P(requestedField, LongitudeValueState));
                 break;
             }
             case 'LatitudeValue': {
-                const LatitudeValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const LatitudeValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$B(requestedField, LatitudeValueState));
                 break;
             }
             case 'PicklistValue': {
-                const PicklistValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const PicklistValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$K(requestedField, PicklistValueState));
                 break;
             }
             case 'MultiPicklistValue': {
-                const MultiPicklistValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const MultiPicklistValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$D(requestedField, MultiPicklistValueState));
                 break;
             }
             case 'LongValue': {
-                const LongValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const LongValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$15(requestedField, LongValueState));
                 break;
             }
             case 'DoubleValue': {
-                const DoubleValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const DoubleValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$16(requestedField, DoubleValueState));
                 break;
             }
             case 'PercentValue': {
-                const PercentValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const PercentValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$14(requestedField, PercentValueState));
                 break;
             }
             case 'Base64Value': {
-                const Base64ValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const Base64ValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$n(requestedField, Base64ValueState));
                 break;
             }
             case 'JSONValue': {
-                const JSONValueState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const JSONValueState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$p(requestedField, JSONValueState));
                 break;
             }
             case 'RecordRepresentation': {
-                const parentRelationshipState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const parentRelationshipState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$5(requestedField, parentRelationshipState));
                 break;
             }
             case 'PolymorphicParentRelationship': {
-                const polymorphicParentRelationshipState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const polymorphicParentRelationshipState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$i(requestedField, polymorphicParentRelationshipState));
                 break;
             }
             case 'RecordConnection': {
-                const childRelationshipState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const childRelationshipState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$6(requestedField, childRelationshipState));
                 break;
             }
@@ -76989,353 +75136,137 @@ function ingestFieldByType$5(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'IDValue': {
-            const IDValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IDValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$7(requestedField, IDValueState);
             break;
         }
         case 'DateTimeValue': {
-            const DateTimeValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DateTimeValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$E(requestedField, DateTimeValueState);
             break;
         }
         case 'IntValue': {
-            const IntValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const IntValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$$(requestedField, IntValueState);
             break;
         }
         case 'StringValue': {
-            const StringValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const StringValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$_(requestedField, StringValueState);
             break;
         }
         case 'BooleanValue': {
-            const BooleanValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const BooleanValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$U(requestedField, BooleanValueState);
             break;
         }
         case 'TimeValue': {
-            const TimeValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const TimeValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$p(requestedField, TimeValueState);
             break;
         }
         case 'DateValue': {
-            const DateValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DateValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$X(requestedField, DateValueState);
             break;
         }
         case 'TextAreaValue': {
-            const TextAreaValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const TextAreaValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$t(requestedField, TextAreaValueState);
             break;
         }
         case 'LongTextAreaValue': {
-            const LongTextAreaValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongTextAreaValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$w(requestedField, LongTextAreaValueState);
             break;
         }
         case 'RichTextAreaValue': {
-            const RichTextAreaValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const RichTextAreaValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$B(requestedField, RichTextAreaValueState);
             break;
         }
         case 'PhoneNumberValue': {
-            const PhoneNumberValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const PhoneNumberValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$J(requestedField, PhoneNumberValueState);
             break;
         }
         case 'EmailValue': {
-            const EmailValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const EmailValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$D(requestedField, EmailValueState);
             break;
         }
         case 'UrlValue': {
-            const UrlValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const UrlValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$L(requestedField, UrlValueState);
             break;
         }
         case 'EncryptedStringValue': {
-            const EncryptedStringValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const EncryptedStringValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$j(requestedField, EncryptedStringValueState);
             break;
         }
         case 'CurrencyValue': {
-            const CurrencyValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const CurrencyValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$G(requestedField, CurrencyValueState);
             break;
         }
         case 'LongitudeValue': {
-            const LongitudeValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongitudeValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$M(requestedField, LongitudeValueState);
             break;
         }
         case 'LatitudeValue': {
-            const LatitudeValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LatitudeValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$y(requestedField, LatitudeValueState);
             break;
         }
         case 'PicklistValue': {
-            const PicklistValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const PicklistValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$H(requestedField, PicklistValueState);
             break;
         }
         case 'MultiPicklistValue': {
-            const MultiPicklistValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const MultiPicklistValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$A(requestedField, MultiPicklistValueState);
             break;
         }
         case 'LongValue': {
-            const LongValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const LongValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$12(requestedField, LongValueState);
             break;
         }
         case 'DoubleValue': {
-            const DoubleValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const DoubleValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$13(requestedField, DoubleValueState);
             break;
         }
         case 'PercentValue': {
-            const PercentValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const PercentValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$11(requestedField, PercentValueState);
             break;
         }
         case 'Base64Value': {
-            const Base64ValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const Base64ValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$k(requestedField, Base64ValueState);
             break;
         }
         case 'JSONValue': {
-            const JSONValueState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const JSONValueState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$m(requestedField, JSONValueState);
             break;
         }
         case 'RecordRepresentation': {
-            const RecordRepresentationState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const RecordRepresentationState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$6(requestedField, RecordRepresentationState);
             break;
         }
         case 'PolymorphicParentRelationship': {
-            const PolymorphicParentRelationshipState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const PolymorphicParentRelationshipState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$f(requestedField, PolymorphicParentRelationshipState);
             break;
         }
         case 'RecordConnection': {
-            const RecordConnectionState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const RecordConnectionState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$4(requestedField, RecordConnectionState);
             break;
         }
@@ -77454,15 +75385,7 @@ function getTypeCacheKeys$4(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'RecordRepresentation': {
-                const nodeState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const nodeState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$5(requestedField, nodeState));
                 break;
             }
@@ -77507,15 +75430,7 @@ function ingestFieldByType$4(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'RecordRepresentation': {
-            const RecordRepresentationState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const RecordRepresentationState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$6(requestedField, RecordRepresentationState);
             break;
         }
@@ -77721,28 +75636,12 @@ function ingestFieldByType$3(typename, parentKey, fullPathKey, requestedField, s
             break;
         }
         case 'RecordEdge': {
-            const RecordEdgeState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: fullPathKey
-                },
-                data: fieldData,
-            };
+            const RecordEdgeState = buildFieldState(state, fullPathKey, fieldData);
             sink[fieldKey] = ingest$5(requestedField, RecordEdgeState);
             break;
         }
         case 'PageInfo': {
-            const PageInfoState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: fullPathKey
-                },
-                data: fieldData,
-            };
+            const PageInfoState = buildFieldState(state, fullPathKey, fieldData);
             sink[fieldKey] = ingest$b(requestedField, PageInfoState);
             break;
         }
@@ -77871,15 +75770,7 @@ function getTypeCacheKeys$3(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'RecordConnection': {
-                const recordQueryState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const recordQueryState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$6(requestedField, recordQueryState));
                 break;
             }
@@ -77900,15 +75791,7 @@ function ingestFieldByType$2(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'RecordConnection': {
-            const RecordConnectionState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const RecordConnectionState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$4(requestedField, RecordConnectionState);
             break;
         }
@@ -78045,28 +75928,12 @@ function getTypeCacheKeys$2(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'RecordQuery': {
-                const queryState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const queryState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$3(requestedField, queryState));
                 break;
             }
             case 'RecordQueryAggregate': {
-                const aggregateState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const aggregateState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$c(requestedField, aggregateState));
                 break;
             }
@@ -78088,15 +75955,7 @@ function getTypeCacheKeys$2(astNode, state) {
                 break;
             }
             case 'RelatedListInfo': {
-                const relatedListByNameState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const relatedListByNameState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$j(requestedField, relatedListByNameState));
                 break;
             }
@@ -78153,54 +76012,22 @@ function ingestFieldByType$1(typename, parentKey, requestedField, sink, fieldKey
             break;
         }
         case 'RecordQuery': {
-            const RecordQueryState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const RecordQueryState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$3(requestedField, RecordQueryState);
             break;
         }
         case 'RecordQueryAggregate': {
-            const RecordQueryAggregateState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const RecordQueryAggregateState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$9(requestedField, RecordQueryAggregateState);
             break;
         }
         case 'ObjectInfo': {
-            const ObjectInfoState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const ObjectInfoState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$O(requestedField, ObjectInfoState);
             break;
         }
         case 'RelatedListInfo': {
-            const RelatedListInfoState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const RelatedListInfoState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$g(requestedField, RelatedListInfoState);
             break;
         }
@@ -78325,28 +76152,12 @@ function getTypeCacheKeys$1(astNode, state) {
         const fieldKey = getSerializedKeyForField(requestedField, state.variables, fieldType);
         switch (fieldType.typename) {
             case 'UIAPI': {
-                const uiapiState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const uiapiState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$2(requestedField, uiapiState));
                 break;
             }
             case 'RateLimit': {
-                const rateLimitState = {
-                    ...state,
-                    path: {
-                        parent: null,
-                        propertyName: null,
-                        fullPath: rootKey + '__' + fieldKey
-                    },
-                    data: fieldData,
-                };
+                const rateLimitState = buildFieldState(state, rootKey + '__' + fieldKey, fieldData);
                 cacheKeySink.merge(getTypeCacheKeys$b(requestedField, rateLimitState));
                 break;
             }
@@ -78391,28 +76202,12 @@ function ingestFieldByType(typename, parentKey, requestedField, sink, fieldKey,
             break;
         }
         case 'UIAPI': {
-            const UIAPIState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const UIAPIState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$2(requestedField, UIAPIState);
             break;
         }
         case 'RateLimit': {
-            const RateLimitState = {
-                ...state,
-                path: {
-                    parent: null,
-                    propertyName: null,
-                    fullPath: parentKey + '__' + fieldKey
-                },
-                data: fieldData,
-            };
+            const RateLimitState = buildFieldState(state, parentKey + '__' + fieldKey, fieldData);
             sink[fieldKey] = ingest$8(requestedField, RateLimitState);
             break;
         }
@@ -79737,7 +77532,7 @@ register({
     configuration: { ...configurationForGraphQLAdapters },
     instrument,
 });
-// version: 1.158.2-2489a5047
+// version: 1.159.1-3cc6c1f48
 
 // On core the unstable adapters are re-exported with different names,
 
@@ -81984,7 +79779,7 @@ withDefaultLuvio((luvio) => {
     unstable_graphQL_imperative = createImperativeAdapter(luvio, createInstrumentedAdapter(ldsAdapter, adapterMetadata), adapterMetadata);
     graphQLImperative = ldsAdapter;
 });
-// version: 1.158.2-2489a5047
+// version: 1.159.1-3cc6c1f48
 
 var gqlApi = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -82673,4 +80468,4 @@ const { luvio } = getRuntime();
 setDefaultLuvio({ luvio });
 
 export { createPrimingSession, draftManager, draftQueue, executeAdapter, executeMutatingAdapter, getImperativeAdapterNames, invokeAdapter, invokeAdapterWithDraftToReplace, invokeAdapterWithMetadata, nimbusDraftQueue, registerReportObserver, setMetadataTTL, setUiApiRecordTTL, subscribeToAdapter };
-// version: 1.158.2-6b3522c4a
+// version: 1.159.1-0b4572813