@salesforce/lwc-adapters-uiapi 1.228.0 → 1.229.0-dev1

package/dist/main.js

@@ -533,7 +533,7 @@ function createResourceParamsImpl(config, configMetadata) {
     }
     return resourceParams;
 }
-// engine version: 0.145.0-a2297ae0
+// engine version: 0.145.2-6a13677c
 
 /**
  * Returns true if the value acts like a Promise, i.e. has a "then" function,
@@ -7646,6 +7646,21 @@ function createFragmentMap(documentNode) {
     });
     return fragments;
 }
+function mergeFragmentWithExistingSelections(fragmentFieldSelection, existingSelections) {
+    // Check if there is an existing selection for this field we can merge with
+    const existingField = getRequestedField(fragmentFieldSelection.name.value, existingSelections);
+    if (existingField === undefined) {
+        existingSelections.push(fragmentFieldSelection);
+    }
+    else {
+        if (existingField.selectionSet) {
+            const mergedSelections = mergeSelectionSets(existingField.selectionSet, fragmentFieldSelection.selectionSet);
+            existingField.selectionSet.selections = mergedSelections
+                ? mergedSelections.selections
+                : [];
+        }
+    }
+}
 
 function buildFieldState(state, fullPath, data) {
     return {
@@ -7714,6 +7729,220 @@ function serializeValueNode(valueNode, variables) {
         }
     }
 }
+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 getRequestedField(responseDataFieldName, requestedFields) {
+    return requestedFields.find((fieldNode) => (fieldNode.alias && fieldNode.alias.value === responseDataFieldName) ||
+        (!fieldNode.alias && fieldNode.name.value === responseDataFieldName));
+}
+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);
+        }
+        else {
+            const existingFieldNode = acc.get(fieldName);
+            acc.set(fieldName, {
+                ...existingFieldNode,
+                selectionSet: mergeSelectionSets(existingFieldNode === null || existingFieldNode === void 0 ? void 0 : existingFieldNode.selectionSet, fieldNode.selectionSet),
+            });
+        }
+        return acc;
+    }, new Map());
+}
+function mergeSelectionSets(set1, set2) {
+    if (!set2) {
+        return set1;
+    }
+    const set1Selections = !set1 ? [] : set1.selections;
+    const mergedSelections = [...set1Selections];
+    for (const selection of set2.selections) {
+        if (selection.kind === 'Field') {
+            const existingFieldIndex = mergedSelections.findIndex((sel) => {
+                return sel.kind === 'Field' && isExactSameField(sel, selection);
+            });
+            if (existingFieldIndex > -1) {
+                const existingField = mergedSelections[existingFieldIndex];
+                const mergedSelectionSet = mergeSelectionSets(existingField.selectionSet, selection.selectionSet);
+                if (mergedSelectionSet) {
+                    mergedSelections[existingFieldIndex] = {
+                        ...existingField,
+                        selectionSet: mergedSelectionSet,
+                    };
+                }
+            }
+            else {
+                mergedSelections.push(selection);
+            }
+        }
+        else if (selection.kind === 'FragmentSpread') {
+            if (!mergedSelections.some((sel) => sel.kind === 'FragmentSpread' &&
+                sel.name.value === selection.name.value &&
+                areDirectivesEqual(sel.directives, selection.directives))) {
+                mergedSelections.push(selection);
+            }
+        }
+        else if (selection.kind === 'InlineFragment') {
+            const existingFragmentIndex = mergedSelections.findIndex((sel) => {
+                return (sel.kind === 'InlineFragment' &&
+                    areTypeConditionsEqual(sel.typeCondition, selection.typeCondition) &&
+                    areDirectivesEqual(sel.directives, selection.directives));
+            });
+            if (existingFragmentIndex > -1) {
+                const existingFragment = mergedSelections[existingFragmentIndex];
+                const mergedSelectionSet = mergeSelectionSets(existingFragment.selectionSet, selection.selectionSet);
+                if (mergedSelectionSet) {
+                    mergedSelections[existingFragmentIndex] = {
+                        ...existingFragment,
+                        selectionSet: mergedSelectionSet,
+                    };
+                }
+            }
+            else {
+                mergedSelections.push(selection);
+            }
+        }
+    }
+    return { kind: 'SelectionSet', selections: mergedSelections };
+}
+function areArgumentsEqual(args1, args2) {
+    if (!args1 && !args2) {
+        return true;
+    }
+    // length 0 arguments is semantically equivalent to falsy arguments.
+    if ((!args1 || args1.length === 0) && (!args2 || args2.length === 0)) {
+        return true;
+    }
+    if ((!args1 && args2) || (args1 && !args2)) {
+        return false;
+    }
+    if (args1.length !== args2.length) {
+        return false;
+    }
+    for (const arg of args1) {
+        const matchingArg = args2.find((a) => a.name.value === arg.name.value && areValuesEqual(a.value, arg.value));
+        if (!matchingArg) {
+            return false;
+        }
+    }
+    return true;
+}
+function areDirectivesEqual(dirs1, dirs2) {
+    if (!dirs1 && !dirs2) {
+        return true;
+    }
+    if ((!dirs1 || dirs1.length === 0) && (!dirs2 || dirs2.length === 0)) {
+        return true;
+    }
+    if ((!dirs1 && dirs2) || (dirs1 && !dirs2)) {
+        return false;
+    }
+    if (dirs1.length !== dirs2.length) {
+        return false;
+    }
+    for (const dir of dirs1) {
+        const matchingDir = dirs2.find((d) => d.name.value === dir.name.value && areArgumentsEqual(d.arguments, dir.arguments));
+        if (!matchingDir) {
+            return false;
+        }
+    }
+    return true;
+}
+function areValuesEqual(valueNode1, valueNode2) {
+    if (valueNode1.kind !== valueNode2.kind) {
+        return false;
+    }
+    // Typescript doesn't understand that the above check means that the switch applies to both values. So there will be casts here.
+    switch (valueNode1.kind) {
+        case 'StringValue':
+        case 'IntValue':
+        case 'FloatValue':
+        case 'BooleanValue':
+        case 'EnumValue':
+            return valueNode1.value === valueNode2.value;
+        case 'NullValue':
+            return true; // Both Null value nodes? Always true.
+        case 'ListValue':
+            if (valueNode1.values.length !== valueNode2.values.length) {
+                return false;
+            }
+            for (let i = 0; i < valueNode1.values.length; i++) {
+                if (!areValuesEqual(valueNode1.values[i], valueNode2.values[i])) {
+                    return false;
+                }
+            }
+            return true;
+        case 'ObjectValue':
+            if (valueNode1.fields.length !== valueNode2.fields.length) {
+                return false;
+            }
+            for (let i = 0; i < valueNode1.fields.length; i++) {
+                const field1 = valueNode1.fields[i];
+                const field2 = valueNode2.fields.find((f) => f.name.value === field1.name.value);
+                if (!field2 || !areValuesEqual(field1.value, field2.value)) {
+                    return false;
+                }
+            }
+            return true;
+        case 'Variable':
+            return valueNode1.name.value === valueNode2.name.value;
+        default:
+            return false;
+    }
+}
+function areTypeConditionsEqual(typeCondition1, typeCondition2) {
+    if (typeCondition1 === undefined && typeCondition2 === undefined) {
+        return true;
+    }
+    if ((!typeCondition1 && typeCondition2) || (typeCondition1 && !typeCondition2)) {
+        return false;
+    }
+    return typeCondition1.name.value === typeCondition2.name.value;
+}
+function isExactSameField(field1, field2) {
+    var _a, _b;
+    return (field1.name.value === field2.name.value &&
+        ((_a = field1.alias) === null || _a === void 0 ? void 0 : _a.value) === ((_b = field2.alias) === null || _b === void 0 ? void 0 : _b.value) &&
+        areArgumentsEqual(field1.arguments, field2.arguments) &&
+        areDirectivesEqual(field1.directives, field2.directives));
+}
 
 function serializeOperationNode(operationNode, variables, fragmentMap) {
     return `${serializeSelectionSet(operationNode.selectionSet, variables, fragmentMap)}`;
@@ -7770,6 +7999,53 @@ function getOperationFromDocument(document, operationName) {
     return operations[0]; // If a named operation is not provided, we return the first one
 }
 
+const { hasOwnProperty: ObjectPrototypeHasOwnProperty$1 } = Object.prototype;
+// Deep merge that works on GraphQL data. It:
+// - recursively merges any Object properties that are present in both
+// - recursively merges arrays by deepMerging each Object item in the array (by index).
+function deepMerge(target, ...sources) {
+    for (const source of sources) {
+        for (const key in source) {
+            if (ObjectPrototypeHasOwnProperty$1.call(source, key)) {
+                const targetValue = target[key];
+                const sourceValue = source[key];
+                if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {
+                    const maxLength = Math.max(targetValue.length, sourceValue.length);
+                    target[key] = Array.from({ length: maxLength }, (_, index) => {
+                        const targetItem = targetValue[index];
+                        const sourceItem = sourceValue[index];
+                        if (targetItem === undefined) {
+                            return sourceItem;
+                        }
+                        else if (sourceItem === undefined) {
+                            return targetItem;
+                        }
+                        else if (targetItem instanceof Object &&
+                            !Array.isArray(targetItem) &&
+                            sourceItem instanceof Object &&
+                            !Array.isArray(sourceItem)) {
+                            return deepMerge({}, targetItem, sourceItem);
+                        }
+                        else {
+                            return sourceItem;
+                        }
+                    });
+                }
+                else if (targetValue instanceof Object &&
+                    !Array.isArray(targetValue) &&
+                    sourceValue instanceof Object &&
+                    !Array.isArray(sourceValue)) {
+                    deepMerge(targetValue, sourceValue);
+                }
+                else {
+                    target[key] = sourceValue;
+                }
+            }
+        }
+    }
+    return target;
+}
+
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
  * All rights reserved.
@@ -12852,7 +13128,7 @@ function fulfill(existing, incoming) {
         const batchRequestWithSingleRequest = isSingleBatchRecordRequest(existingUrlParams) &&
             isSingleRecordRequest(urlParams) &&
             incomingUrlRecords[0] === existingUrlRecords[0];
-        if (!batchRequestWithSingleRequest) {
+        if (!batchRequestWithSingleRequest || isRestrictedPathCondition(existingPath, path)) {
             return false;
         }
     }
@@ -12895,6 +13171,12 @@ function isSingleBatchRecordRequest(urlParams) {
 function isSingleRecordRequest(urlParams) {
     return hasOwnProperty.call(urlParams, 'recordId');
 }
+function isRestrictedPathCondition(existingPath, path) {
+    // should not dedupe getRecordUi and getRecord as both of their representation is different
+    // records call cannot digest response of getRecordUi
+    return ((existingPath.includes('/record-ui') && path.includes('/records')) ||
+        (existingPath.includes('/records') && path.includes('/record-ui')));
+}
 
 const createResourceRequest$16 = function getUiApiRecordsByRecordIdCreateResourceRequest(config) {
     return {
@@ -49485,13 +49767,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);
@@ -49520,46 +49801,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 = {};
@@ -49605,67 +49847,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 {
@@ -50284,18 +50465,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/lwc-adapters-uiapi",
-    "version": "1.228.0",
+    "version": "1.229.0-dev1",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "UIAPI adapters with LWC bindings",
     "module": "dist/main.js",
@@ -31,10 +31,10 @@
         "clean": "rm -rf dist src/generated"
     },
     "devDependencies": {
-        "@salesforce/lds-adapters-uiapi": "*"
+        "@salesforce/lds-adapters-uiapi": "1.229.0-dev1"
     },
     "dependencies": {
-        "@luvio/lwc-luvio": "0.145.0",
-        "@salesforce/lds-default-luvio": "*"
+        "@luvio/lwc-luvio": "0.145.2",
+        "@salesforce/lds-default-luvio": "1.229.0-dev1"
     }
 }