@salesforce/lds-adapters-uiapi 1.228.0 → 1.229.0

package/dist/es/es2018/types/src/generated/graphql/types/type-util.d.ts

@@ -1,6 +1,6 @@
 import { StoreLink as $64$luvio_engine_StoreLink, IngestPath as $64$luvio_engine_IngestPath, Luvio as $64$luvio_engine_Luvio, Store as $64$luvio_engine_Store, NormalizedKeyMetadata as $64$luvio_engine_NormalizedKeyMetadata, SelectionPropertyKey as $64$luvio_engine_SelectionPropertyKey, Reader as $64$luvio_engine_Reader } from '@luvio/engine';
-import { FragmentDefinitionNode as $64$luvio_graphql$45$parser_FragmentDefinitionNode, InlineFragmentNode as $64$luvio_graphql$45$parser_InlineFragmentNode, FieldNode as $64$luvio_graphql$45$parser_FieldNode, FragmentSpreadNode as $64$luvio_graphql$45$parser_FragmentSpreadNode, SelectionNode as $64$luvio_graphql$45$parser_SelectionNode, OperationDefinitionNode as $64$luvio_graphql$45$parser_OperationDefinitionNode, DocumentNode as $64$luvio_graphql$45$parser_DocumentNode, SelectionSetNode as $64$luvio_graphql$45$parser_SelectionSetNode, ArgumentNode as $64$luvio_graphql$45$parser_ArgumentNode, VariableDefinitionNode as $64$luvio_graphql$45$parser_VariableDefinitionNode } from '@luvio/graphql-parser';
-import { GraphQLVariables as $64$luvio_graphql_GraphQLVariables, GraphQLFragmentMap as $64$luvio_graphql_GraphQLFragmentMap } from '@luvio/graphql';
+import { GraphQLVariables as $64$luvio_graphql_GraphQLVariables, GraphQLFragmentMap as $64$luvio_graphql_GraphQLFragmentMap, IsFragmentApplicableType as $64$luvio_graphql_IsFragmentApplicableType } from '@luvio/graphql';
+import { FieldNode as $64$luvio_graphql$45$parser_FieldNode, FragmentSpreadNode as $64$luvio_graphql$45$parser_FragmentSpreadNode, InlineFragmentNode as $64$luvio_graphql$45$parser_InlineFragmentNode, SelectionNode as $64$luvio_graphql$45$parser_SelectionNode, OperationDefinitionNode as $64$luvio_graphql$45$parser_OperationDefinitionNode, DocumentNode as $64$luvio_graphql$45$parser_DocumentNode, SelectionSetNode as $64$luvio_graphql$45$parser_SelectionSetNode, ArgumentNode as $64$luvio_graphql$45$parser_ArgumentNode, FragmentDefinitionNode as $64$luvio_graphql$45$parser_FragmentDefinitionNode, VariableDefinitionNode as $64$luvio_graphql$45$parser_VariableDefinitionNode } from '@luvio/graphql-parser';
 import { PaginationMetadata as pagination_cursor_PaginationMetadata, PaginationParams as pagination_cursor_PaginationParams, PageMetadata as pagination_cursor_PageMetadata } from '../../pagination/cursor';
 export type NormalizedGraphQL<D = undefined> = {
     data: Record<string, any>;
@@ -11,7 +11,6 @@ export type GraphQLTypeDetails = {
     isArray: boolean;
     typename: string;
 };
-type IsFragmentApplicableType = (fragment: $64$luvio_graphql$45$parser_FragmentDefinitionNode | $64$luvio_graphql$45$parser_InlineFragmentNode, typename: string) => boolean;
 export interface GraphQLState<D = unknown> {
     data: D;
     path: $64$luvio_engine_IngestPath;
@@ -44,7 +43,7 @@ export declare function createLink(ref: string | $64$luvio_engine_NormalizedKeyM
 };
 interface IngestBaseParams<AstNodeType, StateType> {
     key: string | $64$luvio_engine_NormalizedKeyMetadata;
-    isFragmentApplicable: IsFragmentApplicableType;
+    isFragmentApplicable: $64$luvio_graphql_IsFragmentApplicableType;
     isMappedFieldImport: (field: $64$luvio_graphql$45$parser_FieldNode) => boolean;
     getFieldType: (field: $64$luvio_graphql$45$parser_FieldNode) => {
         isArray: boolean;
@@ -80,7 +79,6 @@ export declare function injectSelectionSet(selectionSetNode: $64$luvio_graphql$4
 export declare function getPageMetadata(paginationMetadata: pagination_cursor_PaginationMetadata | undefined, paginationParams: pagination_cursor_PaginationParams): pagination_cursor_PageMetadata;
 export declare function isCursorConnectionType(fieldType: GraphQLTypeDetails | undefined): boolean;
 export declare function getSerializedKeyForField(field: $64$luvio_graphql$45$parser_FieldNode, variables: $64$luvio_graphql_GraphQLVariables, fieldType: GraphQLTypeDetails | undefined): string;
-export declare function getRequestedFieldsForType(typename: string, selectionSet: $64$luvio_graphql$45$parser_SelectionSetNode, namedFragmentsMap: $64$luvio_graphql_GraphQLFragmentMap, isFragmentApplicable: IsFragmentApplicableType): Map<string, $64$luvio_graphql$45$parser_FieldNode>;
 export declare function getQueryTransformerForType(typename: string, fragmentMap: $64$luvio_graphql_GraphQLFragmentMap): QueryTransformHelper | undefined;
 export declare function sharedGetFragmentType(fragment: $64$luvio_graphql$45$parser_FragmentSpreadNode | $64$luvio_graphql$45$parser_InlineFragmentNode, fragmentMap: $64$luvio_graphql_GraphQLFragmentMap): string | undefined;
 export declare function getSelectionSetFromFragment(fragment: $64$luvio_graphql$45$parser_FragmentSpreadNode | $64$luvio_graphql$45$parser_InlineFragmentNode, fragmentMap: $64$luvio_graphql_GraphQLFragmentMap): $64$luvio_graphql$45$parser_SelectionSetNode | undefined;
@@ -88,7 +86,7 @@ export declare function getCursorConnectionMinimumSelections(): $64$luvio_graphq
 export declare function evaluateArgumentValue(argumentNode: $64$luvio_graphql$45$parser_ArgumentNode | undefined, expectedKind: 'IntValue' | 'FloatValue' | 'StringValue' | 'BooleanValue' | 'EnumValue', variables: $64$luvio_graphql_GraphQLVariables): any | undefined;
 export declare function getArrayOffsetForPage(state: GraphQLIngestState<any>, node: $64$luvio_graphql$45$parser_FieldNode, key: string | $64$luvio_engine_NormalizedKeyMetadata): number;
 export declare function isFragmentApplicable(fragmentNode: $64$luvio_graphql$45$parser_FragmentDefinitionNode | $64$luvio_graphql$45$parser_InlineFragmentNode, implementedInterfaces: string[], graphqlTypeName: string, typename?: string): boolean;
-export declare function buildSelectionForNode<D = undefined>(source: NormalizedGraphQL<D>, reader: $64$luvio_engine_Reader<any>, parentNode: $64$luvio_graphql$45$parser_FieldNode | $64$luvio_graphql$45$parser_OperationDefinitionNode, selectionNode: $64$luvio_graphql$45$parser_SelectionNode, variables: $64$luvio_graphql_GraphQLVariables, fragments: $64$luvio_graphql_GraphQLFragmentMap, isFragmentApplicable: IsFragmentApplicableType, buildSelectionForField: (source: NormalizedGraphQL<D>, reader: $64$luvio_engine_Reader<any>, sel: $64$luvio_graphql$45$parser_FieldNode, variables: $64$luvio_graphql_GraphQLVariables, fragments: $64$luvio_graphql_GraphQLFragmentMap, parentRecordId: string) => unknown, parentRecordId: string): Record<string, any> | undefined;
+export declare function buildSelectionForNode<D = undefined>(source: NormalizedGraphQL<D>, reader: $64$luvio_engine_Reader<any>, parentNode: $64$luvio_graphql$45$parser_FieldNode | $64$luvio_graphql$45$parser_OperationDefinitionNode, selectionNode: $64$luvio_graphql$45$parser_SelectionNode, variables: $64$luvio_graphql_GraphQLVariables, fragments: $64$luvio_graphql_GraphQLFragmentMap, isFragmentApplicable: $64$luvio_graphql_IsFragmentApplicableType, buildSelectionForField: (source: NormalizedGraphQL<D>, reader: $64$luvio_engine_Reader<any>, sel: $64$luvio_graphql$45$parser_FieldNode, variables: $64$luvio_graphql_GraphQLVariables, fragments: $64$luvio_graphql_GraphQLFragmentMap, parentRecordId: string) => unknown, parentRecordId: string): Record<string, any> | undefined;
 export declare function buildSelectionForField<SourceType>(source: SourceType, reader: $64$luvio_engine_Reader<any>, sel: $64$luvio_graphql$45$parser_FieldNode, variables: $64$luvio_graphql_GraphQLVariables, fragments: $64$luvio_graphql_GraphQLFragmentMap, isCursorConnectionType: boolean, getFieldData: (source: SourceType, sel: $64$luvio_graphql$45$parser_FieldNode, variables: $64$luvio_graphql_GraphQLVariables) => any, getFieldType: (field: $64$luvio_graphql$45$parser_FieldNode) => {
     isArray: boolean;
     typename: string;

package/dist/es/es2018/types/src/graphql-artifacts/types/RecordRepresentation/getInContextFragmentType.d.ts

@@ -1,3 +1,3 @@
 import type { FragmentSpreadNode, InlineFragmentNode } from '@luvio/graphql-parser';
-import type { GraphQLFragmentMap } from '../../../generated/graphql/types/type-util';
+import type { GraphQLFragmentMap } from '@luvio/graphql';
 export declare function getInContextFragmentType(fragment: FragmentSpreadNode | InlineFragmentNode, fragmentMap: GraphQLFragmentMap): string | undefined;

package/dist/es/es2018/uiapi-records-service.js

@@ -7,7 +7,7 @@
 import { register } from '@salesforce/lds-default-luvio';
 import { serializeStructuredKey, ingestShape, coerceConfig as coerceConfig$1, typeCheckConfig as typeCheckConfig$13, createResourceParams as createResourceParams$Z, StoreKeyMap, StoreKeySet, deepFreeze, buildNetworkSnapshotCachePolicy as buildNetworkSnapshotCachePolicy$R, coerceAdapterRequestContext, Wildcard } from '@luvio/engine';
 import { print, visit, parse as parse$1 } from '@luvio/graphql-parser';
-import { buildFieldState, createFragmentMap, serializeFieldArguments, buildQueryTypeStringKey, getOperationFromDocument } from '@luvio/graphql';
+import { getRequestedFieldsForType, buildFieldState, createFragmentMap, mergeSelectionSets, serializeFieldArguments, deepMerge, buildQueryTypeStringKey, getOperationFromDocument } from '@luvio/graphql';
 
 /**
  * Defines configuration for the module with a default value which can be overridden by the runtime environment.
@@ -42441,13 +42441,12 @@ function injectSelectionSet(selectionSetNode, queryTransformHelper, fragmentMap)
         selectionSetNode === undefined) {
         return;
     }
-    const { selections } = selectionSetNode;
-    if (selections === undefined ||
-        selections === null) {
-        return;
-    }
-    const mergedSelections = mergeSelections(queryTransformHelper.getMinimumSelections(), selections);
-    mergedSelections.forEach(selection => {
+    const minimumSelectionSet = {
+        kind: 'SelectionSet',
+        selections: queryTransformHelper.getMinimumSelections()
+    };
+    const mergedSelections = mergeSelectionSets(selectionSetNode, minimumSelectionSet);
+    mergedSelections === null || mergedSelections === void 0 ? void 0 : mergedSelections.selections.forEach(selection => {
         if (selection.kind === 'Field') {
             const fieldType = queryTransformHelper.getFieldType(selection);
             const fieldTransformHelper = fieldType === undefined ? undefined : getQueryTransformerForType(fieldType.typename);
@@ -42476,46 +42475,7 @@ function injectSelectionSet(selectionSetNode, queryTransformHelper, fragmentMap)
             }
         }
     });
-    Object.assign(selectionSetNode, {
-        selections: mergedSelections.length > 0 ? mergedSelections : undefined
-    });
-}
-function mergeSelections(minimumSelections, querySelections) {
-    const mergedSelections = [...querySelections];
-    for (let i = 0; i < minimumSelections.length; i++) {
-        const minimumSelection = minimumSelections[i];
-        if (minimumSelection.kind === 'Field') {
-            const existingNode = mergedSelections.find(selection => {
-                return selection.kind === 'Field' && selection.name.value === minimumSelection.name.value && (selection.directives === undefined || selection.directives.length === 0);
-            });
-            if (existingNode !== undefined && existingNode.kind === 'Field') { // Maybe do better type narrowing above
-                const existingNodeHasSubselections = existingNode.selectionSet !== undefined && existingNode.selectionSet.selections.length > 0;
-                const minimumFieldNodeHasSubselections = minimumSelection.selectionSet !== undefined && minimumSelection.selectionSet.selections.length > 0;
-                // TODO(correctness enhancement): this doesn't handle arugments. Add alias if arguments disagree?
-                if (existingNodeHasSubselections && minimumFieldNodeHasSubselections) {
-                    const mergedChildSelections = mergeSelections(minimumSelection.selectionSet.selections, existingNode.selectionSet.selections);
-                    Object.assign(existingNode.selectionSet, {
-                        selections: mergedChildSelections
-                    });
-                }
-            }
-            else {
-                mergedSelections.push(minimumSelection);
-            }
-        }
-        if (minimumSelection.kind === 'InlineFragment') {
-            mergedSelections.push(minimumSelection);
-        }
-        if (minimumSelection.kind === 'FragmentSpread') {
-            if (process.env.NODE_ENV !== 'production') {
-                console.error('named fragment minimum selections are not supported and will not be added to the query.');
-            }
-        }
-    }
-    return mergedSelections;
-}
-function getRequestedField(responseDataFieldName, requestedFields) {
-    return requestedFields.find(fieldNode => (fieldNode.alias && fieldNode.alias.value === responseDataFieldName) || (!fieldNode.alias && fieldNode.name.value === responseDataFieldName));
+    Object.assign(selectionSetNode, mergedSelections);
 }
 function getPageMetadata(paginationMetadata, paginationParams) {
     const metadataProperties = {};
@@ -42561,67 +42521,6 @@ function getSerializedKeyForField(field, variables, fieldType) {
     const argumentString = mutableArgumentNodes.length > 0 ? '__' + serializeFieldArguments(mutableArgumentNodes, variables) : '';
     return field.name.value + argumentString; // It should be safe to always use the fieldName - If an alias is meaningful, there will be arguments on the key also.
 }
-function mergeFragmentWithExistingSelections(fragmentFieldSelection, existingSelections) {
-    // Check if there is an existing selection for this field we can merge with
-    // If this isn't done, we will see issues such as W-12293630 & W-12236456 as examples
-    const existingField = getRequestedField(fragmentFieldSelection.name.value, existingSelections);
-    if (existingField === undefined) {
-        existingSelections.push(fragmentFieldSelection);
-    }
-    else {
-        if (existingField.selectionSet === undefined) {
-            existingField.selectionSet === fragmentFieldSelection.selectionSet;
-        }
-        else if (fragmentFieldSelection.selectionSet !== undefined) {
-            existingField.selectionSet.selections = mergeSelections(fragmentFieldSelection.selectionSet.selections, existingField.selectionSet.selections);
-        }
-    }
-}
-function calculateRequestedFieldsForType(typename, selectionSet, namedFragmentsMap, isFragmentApplicable) {
-    const selections = [];
-    selectionSet.selections.forEach(selection => {
-        if (selection.kind === "Field") {
-            selections.push(selection);
-        }
-        if (selection.kind === "InlineFragment" && isFragmentApplicable(selection, typename)) {
-            // loops over the map to get the values.
-            getRequestedFieldsForType(typename, selection.selectionSet, namedFragmentsMap, isFragmentApplicable)
-                .forEach(fragmentFieldSelection => { mergeFragmentWithExistingSelections(fragmentFieldSelection, selections); });
-        }
-        if (selection.kind === "FragmentSpread") {
-            const namedFragment = namedFragmentsMap[selection.name.value];
-            if (namedFragment && isFragmentApplicable(namedFragment, typename)) {
-                // loops over the map to get the values.
-                getRequestedFieldsForType(typename, namedFragment.selectionSet, namedFragmentsMap, isFragmentApplicable)
-                    .forEach(fragmentFieldSelection => { mergeFragmentWithExistingSelections(fragmentFieldSelection, selections); });
-            }
-        }
-    });
-    // Needs to happen after the selections are merged.
-    return selections.reduce((acc, fieldNode) => {
-        const fieldName = fieldNode.alias ? fieldNode.alias.value : fieldNode.name.value;
-        // TODO: W-13485835. Some fields are not being merged, and this logic reproduces the current behavior in which the first field with name is being used.
-        if (!acc.has(fieldName)) {
-            acc.set(fieldName, fieldNode);
-        }
-        return acc;
-    }, new Map());
-}
-let selectionSetRequestedFieldsWeakMap = new WeakMap();
-function getRequestedFieldsForType(typename, selectionSet, namedFragmentsMap, isFragmentApplicable) {
-    let cachedRequestedFieldsConfigurations = selectionSetRequestedFieldsWeakMap.get(selectionSet);
-    if (cachedRequestedFieldsConfigurations === undefined) {
-        cachedRequestedFieldsConfigurations = new Map();
-        selectionSetRequestedFieldsWeakMap.set(selectionSet, cachedRequestedFieldsConfigurations);
-    }
-    const cachedRequestedFieldsForType = cachedRequestedFieldsConfigurations.get(typename);
-    if (cachedRequestedFieldsForType !== undefined) {
-        return cachedRequestedFieldsForType;
-    }
-    const selections = calculateRequestedFieldsForType(typename, selectionSet, namedFragmentsMap, isFragmentApplicable);
-    cachedRequestedFieldsConfigurations.set(typename, selections);
-    return selections;
-}
 function getQueryTransformerForType(typename, fragmentMap) {
     switch (typename) {
         case "PercentAggregate": return {
@@ -43167,6 +43066,7 @@ function buildSelectionForField$7(source, reader, sel, variables, fragments, isC
     }
     if (fieldData === null) {
         reader.assignScalar(requestedFieldName, sink, fieldData);
+        reader.exitPath();
         return sink;
     }
     const fieldType = getFieldType(sel);
@@ -43240,18 +43140,7 @@ function selectCalculateSink(sink, field, buildSelectionForNodeFn, source, reade
     (_a = field.selectionSet) === null || _a === void 0 ? void 0 : _a.selections.forEach((sel) => {
         const builtSelection = buildSelectionForNodeFn(source, reader, field, sel, variables, fragments, parentRecordId);
         if (builtSelection !== undefined) {
-            if (sel.kind === "InlineFragment" || sel.kind === "FragmentSpread") {
-                Object.keys(builtSelection).forEach((key, value) => {
-                    // We only assign a field selection in the fragment if it doesn't already exist in sink
-                    // The non-fragment selection already got the merged selections in getRequestedFieldsForType
-                    if (sink[key] === undefined) {
-                        sink[key] = builtSelection[key];
-                    }
-                });
-            }
-            else {
-                Object.assign(sink, builtSelection);
-            }
+            deepMerge(sink, builtSelection);
         }
     });
     return sink;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-adapters-uiapi",
-    "version": "1.228.0",
+    "version": "1.229.0",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "Wire adapters for record related UI API endpoints",
     "main": "dist/es/es2018/uiapi-records-service.js",

package/sfdc/graphqlAdapters.js

@@ -17,7 +17,7 @@ import { print, visit, parse, astResolver } from 'force/ldsGraphqlParser';
 import { createInstrumentedAdapter, createLDSAdapter, createGraphQLWireAdapterConstructor, createGraphQLImperativeAdapter } from 'force/ldsBindings';
 export { refresh as refreshGraphQL } from 'force/ldsBindings';
 import { serializeStructuredKey, deepFreeze, buildNetworkSnapshotCachePolicy as buildNetworkSnapshotCachePolicy$2, StoreKeyMap, createResourceParams as createResourceParams$2, StoreKeySet } from 'force/luvioEngine';
-import { buildFieldState, createFragmentMap, serializeFieldArguments, buildQueryTypeStringKey, getOperationFromDocument } from 'force/luvioGraphql';
+import { getRequestedFieldsForType, buildFieldState, createFragmentMap, mergeSelectionSets, serializeFieldArguments, deepMerge, buildQueryTypeStringKey, getOperationFromDocument } from 'force/luvioGraphql';
 import { createIngestRecordWithFields } from 'force/ldsAdaptersUiapi';
 
 const { hasOwnProperty: ObjectPrototypeHasOwnProperty } = Object.prototype;
@@ -13768,13 +13768,12 @@ function injectSelectionSet(selectionSetNode, queryTransformHelper, fragmentMap)
         selectionSetNode === undefined) {
         return;
     }
-    const { selections } = selectionSetNode;
-    if (selections === undefined ||
-        selections === null) {
-        return;
-    }
-    const mergedSelections = mergeSelections(queryTransformHelper.getMinimumSelections(), selections);
-    mergedSelections.forEach(selection => {
+    const minimumSelectionSet = {
+        kind: 'SelectionSet',
+        selections: queryTransformHelper.getMinimumSelections()
+    };
+    const mergedSelections = mergeSelectionSets(selectionSetNode, minimumSelectionSet);
+    mergedSelections === null || mergedSelections === void 0 ? void 0 : mergedSelections.selections.forEach(selection => {
         if (selection.kind === 'Field') {
             const fieldType = queryTransformHelper.getFieldType(selection);
             const fieldTransformHelper = fieldType === undefined ? undefined : getQueryTransformerForType(fieldType.typename);
@@ -13803,46 +13802,7 @@ function injectSelectionSet(selectionSetNode, queryTransformHelper, fragmentMap)
             }
         }
     });
-    Object.assign(selectionSetNode, {
-        selections: mergedSelections.length > 0 ? mergedSelections : undefined
-    });
-}
-function mergeSelections(minimumSelections, querySelections) {
-    const mergedSelections = [...querySelections];
-    for (let i = 0; i < minimumSelections.length; i++) {
-        const minimumSelection = minimumSelections[i];
-        if (minimumSelection.kind === 'Field') {
-            const existingNode = mergedSelections.find(selection => {
-                return selection.kind === 'Field' && selection.name.value === minimumSelection.name.value && (selection.directives === undefined || selection.directives.length === 0);
-            });
-            if (existingNode !== undefined && existingNode.kind === 'Field') { // Maybe do better type narrowing above
-                const existingNodeHasSubselections = existingNode.selectionSet !== undefined && existingNode.selectionSet.selections.length > 0;
-                const minimumFieldNodeHasSubselections = minimumSelection.selectionSet !== undefined && minimumSelection.selectionSet.selections.length > 0;
-                // TODO(correctness enhancement): this doesn't handle arugments. Add alias if arguments disagree?
-                if (existingNodeHasSubselections && minimumFieldNodeHasSubselections) {
-                    const mergedChildSelections = mergeSelections(minimumSelection.selectionSet.selections, existingNode.selectionSet.selections);
-                    Object.assign(existingNode.selectionSet, {
-                        selections: mergedChildSelections
-                    });
-                }
-            }
-            else {
-                mergedSelections.push(minimumSelection);
-            }
-        }
-        if (minimumSelection.kind === 'InlineFragment') {
-            mergedSelections.push(minimumSelection);
-        }
-        if (minimumSelection.kind === 'FragmentSpread') {
-            if (process.env.NODE_ENV !== 'production') {
-                console.error('named fragment minimum selections are not supported and will not be added to the query.');
-            }
-        }
-    }
-    return mergedSelections;
-}
-function getRequestedField(responseDataFieldName, requestedFields) {
-    return requestedFields.find(fieldNode => (fieldNode.alias && fieldNode.alias.value === responseDataFieldName) || (!fieldNode.alias && fieldNode.name.value === responseDataFieldName));
+    Object.assign(selectionSetNode, mergedSelections);
 }
 function getPageMetadata(paginationMetadata, paginationParams) {
     const metadataProperties = {};
@@ -13888,67 +13848,6 @@ function getSerializedKeyForField(field, variables, fieldType) {
     const argumentString = mutableArgumentNodes.length > 0 ? '__' + serializeFieldArguments(mutableArgumentNodes, variables) : '';
     return field.name.value + argumentString; // It should be safe to always use the fieldName - If an alias is meaningful, there will be arguments on the key also.
 }
-function mergeFragmentWithExistingSelections(fragmentFieldSelection, existingSelections) {
-    // Check if there is an existing selection for this field we can merge with
-    // If this isn't done, we will see issues such as W-12293630 & W-12236456 as examples
-    const existingField = getRequestedField(fragmentFieldSelection.name.value, existingSelections);
-    if (existingField === undefined) {
-        existingSelections.push(fragmentFieldSelection);
-    }
-    else {
-        if (existingField.selectionSet === undefined) {
-            existingField.selectionSet === fragmentFieldSelection.selectionSet;
-        }
-        else if (fragmentFieldSelection.selectionSet !== undefined) {
-            existingField.selectionSet.selections = mergeSelections(fragmentFieldSelection.selectionSet.selections, existingField.selectionSet.selections);
-        }
-    }
-}
-function calculateRequestedFieldsForType(typename, selectionSet, namedFragmentsMap, isFragmentApplicable) {
-    const selections = [];
-    selectionSet.selections.forEach(selection => {
-        if (selection.kind === "Field") {
-            selections.push(selection);
-        }
-        if (selection.kind === "InlineFragment" && isFragmentApplicable(selection, typename)) {
-            // loops over the map to get the values.
-            getRequestedFieldsForType(typename, selection.selectionSet, namedFragmentsMap, isFragmentApplicable)
-                .forEach(fragmentFieldSelection => { mergeFragmentWithExistingSelections(fragmentFieldSelection, selections); });
-        }
-        if (selection.kind === "FragmentSpread") {
-            const namedFragment = namedFragmentsMap[selection.name.value];
-            if (namedFragment && isFragmentApplicable(namedFragment, typename)) {
-                // loops over the map to get the values.
-                getRequestedFieldsForType(typename, namedFragment.selectionSet, namedFragmentsMap, isFragmentApplicable)
-                    .forEach(fragmentFieldSelection => { mergeFragmentWithExistingSelections(fragmentFieldSelection, selections); });
-            }
-        }
-    });
-    // Needs to happen after the selections are merged.
-    return selections.reduce((acc, fieldNode) => {
-        const fieldName = fieldNode.alias ? fieldNode.alias.value : fieldNode.name.value;
-        // TODO: W-13485835. Some fields are not being merged, and this logic reproduces the current behavior in which the first field with name is being used.
-        if (!acc.has(fieldName)) {
-            acc.set(fieldName, fieldNode);
-        }
-        return acc;
-    }, new Map());
-}
-let selectionSetRequestedFieldsWeakMap = new WeakMap();
-function getRequestedFieldsForType(typename, selectionSet, namedFragmentsMap, isFragmentApplicable) {
-    let cachedRequestedFieldsConfigurations = selectionSetRequestedFieldsWeakMap.get(selectionSet);
-    if (cachedRequestedFieldsConfigurations === undefined) {
-        cachedRequestedFieldsConfigurations = new Map();
-        selectionSetRequestedFieldsWeakMap.set(selectionSet, cachedRequestedFieldsConfigurations);
-    }
-    const cachedRequestedFieldsForType = cachedRequestedFieldsConfigurations.get(typename);
-    if (cachedRequestedFieldsForType !== undefined) {
-        return cachedRequestedFieldsForType;
-    }
-    const selections = calculateRequestedFieldsForType(typename, selectionSet, namedFragmentsMap, isFragmentApplicable);
-    cachedRequestedFieldsConfigurations.set(typename, selections);
-    return selections;
-}
 function getQueryTransformerForType(typename, fragmentMap) {
     switch (typename) {
         case "PercentAggregate": return {
@@ -14494,6 +14393,7 @@ function buildSelectionForField$7(source, reader, sel, variables, fragments, isC
     }
     if (fieldData === null) {
         reader.assignScalar(requestedFieldName, sink, fieldData);
+        reader.exitPath();
         return sink;
     }
     const fieldType = getFieldType(sel);
@@ -14567,18 +14467,7 @@ function selectCalculateSink(sink, field, buildSelectionForNodeFn, source, reade
     (_a = field.selectionSet) === null || _a === void 0 ? void 0 : _a.selections.forEach((sel) => {
         const builtSelection = buildSelectionForNodeFn(source, reader, field, sel, variables, fragments, parentRecordId);
         if (builtSelection !== undefined) {
-            if (sel.kind === "InlineFragment" || sel.kind === "FragmentSpread") {
-                Object.keys(builtSelection).forEach((key, value) => {
-                    // We only assign a field selection in the fragment if it doesn't already exist in sink
-                    // The non-fragment selection already got the merged selections in getRequestedFieldsForType
-                    if (sink[key] === undefined) {
-                        sink[key] = builtSelection[key];
-                    }
-                });
-            }
-            else {
-                Object.assign(sink, builtSelection);
-            }
+            deepMerge(sink, builtSelection);
         }
     });
     return sink;
@@ -18233,4 +18122,4 @@ register({
 });
 
 export { configurationForGraphQLAdapters as configuration, graphql, factory$1 as graphqlAdapterFactory, graphqlBatch, graphqlBatch_imperative, graphql_imperative };
-// version: 1.228.0-946298e9a
+// version: 1.229.0-41a436d3f

package/sfdc/index.js

@@ -32847,4 +32847,4 @@ withDefaultLuvio((luvio) => {
 });
 
 export { InMemoryRecordRepresentationQueryEvaluator, MRU, RepresentationType$J as ObjectInfoRepresentationType, RepresentationType$O as RecordRepresentationRepresentationType, TTL$w as RecordRepresentationTTL, RepresentationType$O as RecordRepresentationType, VERSION$17 as RecordRepresentationVersion, keyPrefix as UiApiNamespace, configurationForRestAdapters as configuration, createContentDocumentAndVersion, createContentVersion, createIngestRecordWithFields, createRecord, deleteRecord, getActionOverrides, getActionOverrides_imperative, getAllApps, getAllApps_imperative, getAppDetails, getAppDetails_imperative, getDuplicateConfiguration, getDuplicateConfiguration_imperative, getDuplicates, getDuplicates_imperative, getGlobalActions, getGlobalActions_imperative, getKeywordSearchResults, getKeywordSearchResults_imperative, getLayout, getLayoutUserState, getLayoutUserState_imperative, getLayout_imperative, getListInfoByName, getListInfoByName_imperative, getListInfosByName, getListInfosByName_imperative, getListObjectInfo, getListObjectInfo_imperative, getListRecordsByName, getListRecordsByName_imperative, getListUi, getListUi_imperative, getLookupActions, getLookupActions_imperative, getLookupMetadata, getLookupMetadata_imperative, getLookupRecords, getLookupRecords_imperative, getNavItems, getNavItems_imperative, getObjectCreateActions, getObjectCreateActions_imperative, getObjectInfo, getObjectInfoAdapterFactory, getObjectInfo_imperative, getObjectInfos, getObjectInfosAdapterFactory, getObjectInfos_imperative, getPicklistValues, getPicklistValuesByRecordType, getPicklistValuesByRecordType_imperative, getPicklistValues_imperative, getQuickActionDefaults, getQuickActionDefaults_imperative, getQuickActionLayout, getQuickActionLayout_imperative, getRecord, getRecordActions, getRecordActions_imperative, factory$e as getRecordAdapterFactory, getRecordAvatars, getRecordAvatars_imperative, getRecordCreateDefaults, getRecordCreateDefaults_imperative, getRecordEditActions, getRecordEditActions_imperative, getRecordId18, getRecordNotifyChange, getRecordTemplateClone, getRecordTemplateClone_imperative, getRecordTemplateCreate, getRecordTemplateCreate_imperative, getRecordUi, getRecordUi_imperative, getRecord_imperative, getRecords, getRecordsAdapterFactory, getRecords_imperative, getRelatedListActions, getRelatedListActions_imperative, getRelatedListCount, getRelatedListCount_imperative, getRelatedListInfo, getRelatedListInfoBatch, getRelatedListInfoBatch_imperative, getRelatedListInfo_imperative, getRelatedListPreferences, getRelatedListPreferencesBatch, getRelatedListPreferencesBatch_imperative, getRelatedListPreferences_imperative, getRelatedListRecordActions, getRelatedListRecordActions_imperative, getRelatedListRecords, getRelatedListRecordsBatch, getRelatedListRecordsBatch_imperative, getRelatedListRecords_imperative, getRelatedListsActions, getRelatedListsActions_imperative, getRelatedListsCount, getRelatedListsCount_imperative, getRelatedListsInfo, getRelatedListsInfo_imperative, getResponseCacheKeys as getResponseCacheKeysContentDocumentCompositeRepresentation, getSearchFilterMetadata, getSearchFilterMetadata_imperative, getSearchFilterOptions, getSearchFilterOptions_imperative, getSearchResults, getSearchResults_imperative, getTypeCacheKeys$Q as getTypeCacheKeysRecord, ingest as ingestContentDocumentCompositeRepresentation, ingest$C as ingestObjectInfo, ingest$y as ingestQuickActionExecutionRepresentation, ingest$H as ingestRecord, instrument, keyBuilder as keyBuilderContentDocumentCompositeRepresentation, keyBuilderFromType as keyBuilderFromTypeContentDocumentCompositeRepresentation, keyBuilderFromType$y as keyBuilderFromTypeRecordRepresentation, keyBuilder$1J as keyBuilderObjectInfo, keyBuilder$1D as keyBuilderQuickActionExecutionRepresentation, keyBuilder$1U as keyBuilderRecord, notifyListInfoUpdateAvailable, notifyListViewSummaryUpdateAvailable, notifyQuickActionDefaultsUpdateAvailable, notifyRecordUpdateAvailable, performQuickAction, performUpdateRecordQuickAction, refresh, updateLayoutUserState, updateListInfoByName, updateRecord, updateRecordAvatar, updateRelatedListInfo, updateRelatedListPreferences };
-// version: 1.228.0-946298e9a
+// version: 1.229.0-41a436d3f

package/sfdc/uiapi-static-functions.js

@@ -95,7 +95,7 @@ var TypeCheckShapes;
     TypeCheckShapes[TypeCheckShapes["Integer"] = 3] = "Integer";
     TypeCheckShapes[TypeCheckShapes["Unsupported"] = 4] = "Unsupported";
 })(TypeCheckShapes || (TypeCheckShapes = {}));
-// engine version: 0.145.0-a2297ae0
+// engine version: 0.145.3-1693bfb7
 
 const { keys: ObjectKeys, create: ObjectCreate } = Object;