@graphcommerce/magento-cart 8.1.0-canary.3 → 8.1.0-canary.30

package/Api/CartItemCountChanged.graphql

@@ -1,4 +1,4 @@
-fragment CartItemCountChanged on Cart @injectable {
+fragment CartItemCountChanged on Cart {
   __typename
   id
   total_quantity

package/CHANGELOG.md

@@ -1,6 +1,126 @@
 # Change Log
 
-## 8.1.0-canary.3
+## 8.1.0-canary.30
+
+## 8.1.0-canary.29
+
+## 8.1.0-canary.28
+
+## 8.1.0-canary.27
+
+## 8.1.0-canary.26
+
+## 8.1.0-canary.25
+
+### Patch Changes
+
+- [#2266](https://github.com/graphcommerce-org/graphcommerce/pull/2266) [`0d1fe7a`](https://github.com/graphcommerce-org/graphcommerce/commit/0d1fe7a26ed2d18510c8767795294654c478fb88) - Enable the use of one or more anchor links within the 'checkbox_text' field and customize their paths.
+  ([@carlocarels90](https://github.com/carlocarels90))
+
+## 8.1.0-canary.24
+
+## 8.1.0-canary.23
+
+## 8.1.0-canary.22
+
+## 8.1.0-canary.21
+
+## 8.1.0-canary.20
+
+## 8.1.0-canary.19
+
+## 8.1.0-canary.18
+
+## 8.1.0-canary.17
+
+## 8.1.0-canary.16
+
+## 8.1.0-canary.15
+
+## 8.1.0-canary.14
+
+## 8.1.0-canary.13
+
+## 8.1.0-canary.12
+
+## 8.1.0-canary.11
+
+## 8.1.0-canary.10
+
+## 8.1.0-canary.9
+
+## 8.1.0-canary.8
+
+### Patch Changes
+
+- [#2247](https://github.com/graphcommerce-org/graphcommerce/pull/2247) [`a56a7c6`](https://github.com/graphcommerce-org/graphcommerce/commit/a56a7c67cf27dfb91bf763a873beeec562ab3156) - Solve an issue where the cart would be sometimes undefined, but Partial was too eleborate
+  ([@paales](https://github.com/paales))
+
+## 8.1.0-canary.7
+
+## 8.1.0-canary.6
+
+## 8.1.0-canary.5
+
+## 8.0.6-canary.4
+
+## 8.0.6-canary.3
+
+## 8.0.6-canary.2
+
+### Patch Changes
+
+- [#2234](https://github.com/graphcommerce-org/graphcommerce/pull/2234) [`0767bc4`](https://github.com/graphcommerce-org/graphcommerce/commit/0767bc40f7b596209f24ca4e745ff0441f3275c9) - Upgrade input components to no longer use muiRegister, which improves INP scores
+  ([@FrankHarland](https://github.com/FrankHarland))
+
+- [#2234](https://github.com/graphcommerce-org/graphcommerce/pull/2234) [`530076e`](https://github.com/graphcommerce-org/graphcommerce/commit/530076e3664703cb8b577b7fcf1998a420819f60) - Moved all usages of useFormPersist to the <FormPersist/> component to prevent rerenders.
+  ([@FrankHarland](https://github.com/FrankHarland))
+
+## 8.0.6-canary.1
+
+## 8.0.6-canary.0
+
+## 8.0.5
+
+## 8.0.5-canary.10
+
+## 8.0.5-canary.9
+
+## 8.0.5-canary.8
+
+## 8.0.5-canary.7
+
+## 8.0.5-canary.6
+
+## 8.0.5-canary.5
+
+## 8.0.5-canary.4
+
+## 8.0.5-canary.3
+
+## 8.0.5-canary.2
+
+## 8.0.5-canary.1
+
+## 8.0.5-canary.0
+
+## 8.0.4
+
+### Patch Changes
+
+- [#2221](https://github.com/graphcommerce-org/graphcommerce/pull/2221) [`0ba1fdc`](https://github.com/graphcommerce-org/graphcommerce/commit/0ba1fdc9a2d005f47cd1725fe723e77da4cc5b9d) - After a user just logged in the checkout, the useFormGqlMutationCart would still run even though the cart was locked.
+  ([@paales](https://github.com/paales))
+
+## 8.0.4-canary.1
+
+## 8.0.4-canary.0
+
+### Patch Changes
+
+- [#2221](https://github.com/graphcommerce-org/graphcommerce/pull/2221) [`0ba1fdc`](https://github.com/graphcommerce-org/graphcommerce/commit/0ba1fdc9a2d005f47cd1725fe723e77da4cc5b9d) - After a user just logged in the checkout, the useFormGqlMutationCart would still run even though the cart was locked.
+  ([@paales](https://github.com/paales))
+
+## 8.0.3
 
 ### Patch Changes
 
@@ -10,7 +130,26 @@
 - [#2205](https://github.com/graphcommerce-org/graphcommerce/pull/2205) [`3fbf3da`](https://github.com/graphcommerce-org/graphcommerce/commit/3fbf3da8a67f2fbaa7fa974a37cbbf34613844e4) - Solve an issue where the user would be presented with the Session expired dialog when the user would be logging in during the checkout process.
   ([@paales](https://github.com/paales))
 
-## 8.1.0-canary.2
+- [#2207](https://github.com/graphcommerce-org/graphcommerce/pull/2207) [`9876b13`](https://github.com/graphcommerce-org/graphcommerce/commit/9876b139b2c12c860a16af97eddea761d1059110) - Remove redundant query on the success page for logged in customers
+  ([@paales](https://github.com/paales))
+
+## 8.0.3-canary.6
+
+## 8.0.3-canary.5
+
+## 8.0.3-canary.4
+
+## 8.0.3-canary.3
+
+## 8.0.3-canary.2
+
+### Patch Changes
+
+- [#2205](https://github.com/graphcommerce-org/graphcommerce/pull/2205) [`d67c89d`](https://github.com/graphcommerce-org/graphcommerce/commit/d67c89d464a60f0e2618dab670b63a39f6291341) - Deprecate the allowUrl option for useCartQuery, it was already enabled by default and should never be set to false.
+  ([@paales](https://github.com/paales))
+
+- [#2205](https://github.com/graphcommerce-org/graphcommerce/pull/2205) [`3fbf3da`](https://github.com/graphcommerce-org/graphcommerce/commit/3fbf3da8a67f2fbaa7fa974a37cbbf34613844e4) - Solve an issue where the user would be presented with the Session expired dialog when the user would be logging in during the checkout process.
+  ([@paales](https://github.com/paales))
 
 ## 8.0.3-canary.1
 

package/components/CartAgreementsForm/CartAgreementsForm.tsx

@@ -2,13 +2,13 @@ import { CheckboxElement } from '@graphcommerce/ecommerce-ui'
 import { useQuery } from '@graphcommerce/graphql'
 import { extendableComponent, FormDiv } from '@graphcommerce/next-ui'
 import {
+  FormPersist,
   useForm,
   useFormCompose,
   UseFormComposeOptions,
-  useFormPersist,
 } from '@graphcommerce/react-hook-form'
 import { i18n } from '@lingui/core'
-import { Box, Link, SxProps, Theme } from '@mui/material'
+import { Box, Link, SxProps, Theme, Typography } from '@mui/material'
 import React from 'react'
 import { CartAgreementsDocument } from './CartAgreements.gql'
 
@@ -18,16 +18,27 @@ const componentName = 'CartAgreementsForm' as const
 const parts = ['form', 'formInner', 'formControlRoot', 'manualCheck'] as const
 const { classes } = extendableComponent(componentName, parts)
 
+/**
+ * Checks if a string contains an anchor tag (<a> ... </a>).
+ * @param {string} str - The string to check.
+ * @returns {boolean} - True if the string contains an anchor tag, otherwise false.
+ */
+const containsAnchorTag = (str: string): boolean => {
+  const anchorTagRegex = /<a\s+[^>]*>(.*?)<\/a>/i
+  return anchorTagRegex.test(str)
+}
+
 export function CartAgreementsForm(props: CartAgreementsFormProps) {
   const { step, sx = [] } = props
   const { data } = useQuery(CartAgreementsDocument)
 
   // sort conditions so checkboxes will be placed first
   const sortedAgreements = data?.checkoutAgreements
-    ? [...data.checkoutAgreements].sort((a, b) =>
-        // eslint-disable-next-line no-nested-ternary
-        a?.mode === 'MANUAL' ? -1 : b?.mode === 'MANUAL' ? 1 : 0,
-      )
+    ? [...data.checkoutAgreements]?.sort((a, b) => {
+        if (a?.mode === 'MANUAL') return -1
+        if (b?.mode === 'MANUAL') return 1
+        return 0
+      })
     : []
 
   const form = useForm()
@@ -39,8 +50,6 @@ export function CartAgreementsForm(props: CartAgreementsFormProps) {
     console.log(values)
   })
 
-  useFormPersist({ form, name: 'PaymentAgreementsForm' })
-
   useFormCompose({ form, step, submit, key: 'PaymentAgreementsForm' })
 
   if (data?.checkoutAgreements?.length === 0) return null
@@ -50,6 +59,7 @@ export function CartAgreementsForm(props: CartAgreementsFormProps) {
       className={classes.form}
       sx={[(theme) => ({ pt: theme.spacings.md }), ...(Array.isArray(sx) ? sx : [sx])]}
     >
+      <FormPersist form={form} name='PaymentAgreementsForm' />
       <form noValidate onSubmit={submit} name='cartAgreements'>
         <Box className={classes.formInner} sx={{ typography: 'body1', display: 'inline-block' }}>
           {data?.checkoutAgreements &&
@@ -57,6 +67,45 @@ export function CartAgreementsForm(props: CartAgreementsFormProps) {
               if (!agreement) return null
               const href = `/checkout/terms/${agreement.name?.toLowerCase().replace(/\s+/g, '-')}`
               const agreementTextParts = agreement.checkbox_text.split(agreement.name)
+              // check if the agreement text contains an anchor tag
+              const containsLink = containsAnchorTag(agreement.checkbox_text)
+              let labelContent: React.ReactNode
+
+              if (containsLink) {
+                labelContent = (
+                  <Typography
+                    dangerouslySetInnerHTML={{ __html: agreement.checkbox_text }}
+                    sx={{
+                      '& a': {
+                        color: 'secondary.main',
+                        textDecoration: 'none',
+                        '&:hover, &:focus, &:active': {
+                          textDecoration: 'underline',
+                        },
+                      },
+                    }}
+                  />
+                )
+              } else if (
+                agreement.mode === 'MANUAL' &&
+                agreement.checkbox_text.includes(agreement.name)
+              ) {
+                labelContent = (
+                  <>
+                    {agreementTextParts[0]}
+                    <Link href={href} color='secondary' underline='hover'>
+                      {agreement.name}
+                    </Link>
+                    {agreementTextParts[1]}
+                  </>
+                )
+              } else {
+                labelContent = (
+                  <Link href={href} color='secondary' underline='hover'>
+                    {agreement.checkbox_text}
+                  </Link>
+                )
+              }
 
               return (
                 <React.Fragment key={agreement.agreement_id}>
@@ -73,27 +122,11 @@ export function CartAgreementsForm(props: CartAgreementsFormProps) {
                       rules={{
                         required: i18n._(/* i18n */ 'You have to agree in order to proceed'),
                       }}
-                      label={
-                        agreement.checkbox_text.includes(agreement.name) ? (
-                          <>
-                            {agreementTextParts[0]}
-                            <Link href={href} color='secondary' underline='hover'>
-                              {agreement.name}
-                            </Link>
-                            {agreementTextParts[1]}
-                          </>
-                        ) : (
-                          <Link href={href} color='secondary' underline='hover'>
-                            {agreement.checkbox_text}
-                          </Link>
-                        )
-                      }
+                      label={labelContent}
                     />
                   ) : (
                     <Box className={classes.manualCheck} sx={{ padding: `9px 0` }}>
-                      <Link href={href} color='secondary' underline='hover'>
-                        {agreement.checkbox_text}
-                      </Link>
+                      {labelContent}
                     </Box>
                   )}
                 </React.Fragment>

package/components/CartStartCheckout/CartStartCheckout.graphql

@@ -1,10 +1,9 @@
-fragment CartStartCheckout on Cart @injectable {
+fragment CartStartCheckout on Cart {
   prices {
     grand_total {
       ...Money
     }
   }
-
   items {
     errors {
       message

package/components/CartStartCheckout/CartStartCheckout.tsx

@@ -5,12 +5,16 @@ import { Box, Button, ButtonProps, SxProps, Theme } from '@mui/material'
 import React from 'react'
 import { CartStartCheckoutFragment } from './CartStartCheckout.gql'
 
-export type CartStartCheckoutProps = CartStartCheckoutFragment & {
+export type CartStartCheckoutProps = {
   children?: React.ReactNode
   sx?: SxProps<Theme>
   buttonProps?: ButtonProps<'button'>
   disabled?: boolean
-  onStart?: (e: React.MouseEvent<HTMLButtonElement>, cart: CartStartCheckoutFragment) => void
+  cart?: CartStartCheckoutFragment | null | undefined
+  onStart?: (
+    e: React.MouseEvent<HTMLButtonElement>,
+    cart: CartStartCheckoutFragment | null | undefined,
+  ) => void
 }
 
 const name = 'CartStartCheckout' as const
@@ -29,11 +33,11 @@ export function CartStartCheckout(props: CartStartCheckoutProps) {
     buttonProps: { onClick, ...buttonProps } = {},
     disabled,
     sx = [],
-    ...cart
+    cart,
   } = props
 
-  const hasTotals = (cart.prices?.grand_total?.value ?? 0) > 0
-  const hasErrors = cart.items?.some((item) => (item?.errors?.length ?? 0) > 0)
+  const hasTotals = (cart?.prices?.grand_total?.value ?? 0) > 0
+  const hasErrors = cart?.items?.some((item) => (item?.errors?.length ?? 0) > 0)
 
   return (
     <Box
@@ -71,7 +75,7 @@ export function CartStartCheckout(props: CartStartCheckoutProps) {
         </Box>{' '}
         {hasTotals && (
           <span className={classes.checkoutMoney}>
-            <Money {...cart.prices?.grand_total} />
+            <Money {...cart?.prices?.grand_total} />
           </span>
         )}
       </Button>

package/components/CartStartCheckout/CartStartCheckoutLinkOrButton.tsx

@@ -4,13 +4,14 @@ import { SxProps, Theme } from '@mui/material'
 import React from 'react'
 import { CartStartCheckoutFragment } from './CartStartCheckout.gql'
 
-export type CartStartCheckoutLinkOrButtonProps = CartStartCheckoutFragment & {
+export type CartStartCheckoutLinkOrButtonProps = {
   children?: React.ReactNode
   sx?: SxProps<Theme>
   disabled?: boolean
+  cart?: CartStartCheckoutFragment | null | undefined
   onStart?: (
     e: React.MouseEvent<HTMLButtonElement & HTMLAnchorElement & HTMLSpanElement>,
-    cart: CartStartCheckoutFragment,
+    cart: CartStartCheckoutFragment | null | undefined,
   ) => void
   linkOrButtonProps?: LinkOrButtonProps
 }
@@ -21,11 +22,11 @@ export function CartStartCheckoutLinkOrButton(props: CartStartCheckoutLinkOrButt
     onStart,
     disabled,
     linkOrButtonProps: { onClick, button, ...linkOrButtonProps } = {},
-    ...cart
+    cart,
   } = props
 
-  const hasTotals = (cart.prices?.grand_total?.value ?? 0) > 0
-  const hasErrors = cart.items?.some((item) => (item?.errors?.length ?? 0) > 0)
+  const hasTotals = (cart?.prices?.grand_total?.value ?? 0) > 0
+  const hasErrors = cart?.items?.some((item) => (item?.errors?.length ?? 0) > 0)
 
   return (
     <LinkOrButton

package/components/CartSummary/CartSummary.tsx

@@ -21,7 +21,7 @@ const { classes } = extendableComponent<OwnerState, typeof compName, typeof part
 export function CartSummary(props: CartSummaryProps) {
   const { children, editable, sx = [] } = props
 
-  const { data } = useCartQuery(GetCartSummaryDocument, { allowUrl: true })
+  const { data } = useCartQuery(GetCartSummaryDocument)
   const { href: historyHref, onClick: historyOnClick } = useHistoryLink({
     href: '/checkout',
   })

package/components/CartTotals/CartTotals.graphql

@@ -1,6 +1,4 @@
-fragment CartTotals on Cart
-@injectable
-@inject(into: ["CartItemCountChanged", "PaymentMethodUpdated"]) {
+fragment CartTotals on Cart @inject(into: ["CartItemCountChanged", "PaymentMethodUpdated"]) {
   shipping_addresses {
     selected_shipping_method {
       carrier_code
@@ -11,7 +9,7 @@ fragment CartTotals on Cart
         ...Money
       }
     }
-    # https://github.com/magento/magento2/pull/31322
+    # todo: https://github.com/magento/magento2/pull/31322
     available_shipping_methods {
       carrier_code
       method_code

package/components/OrderSucces/OrderSuccesPage.graphql

@@ -1,4 +1,4 @@
-fragment OrderSuccesPage on Cart @injectable {
+fragment OrderSuccesPage on Cart {
   ...CartItems
   ...CartTotals
 }

package/hooks/useFormGqlMutationCart.ts

@@ -1,9 +1,10 @@
-import { MutationHookOptions, TypedDocumentNode } from '@graphcommerce/graphql'
+import { MutationHookOptions, TypedDocumentNode, useApolloClient } from '@graphcommerce/graphql'
 import {
   useFormGqlMutation,
   UseFormGqlMutationReturn,
   UseFormGraphQlOptions,
 } from '@graphcommerce/react-hook-form'
+import { CurrentCartIdDocument } from './CurrentCartId.gql'
 import { useCartIdCreate } from './useCartIdCreate'
 
 export function useFormGqlMutationCart<
@@ -11,18 +12,28 @@ export function useFormGqlMutationCart<
   V extends { cartId: string; [index: string]: unknown },
 >(
   document: TypedDocumentNode<Q, V>,
-  options: UseFormGraphQlOptions<Q, V> = {},
+  options: UseFormGraphQlOptions<Q, V> & { submitWhileLocked?: boolean } = {},
   operationOptions?: MutationHookOptions<Q, V>,
 ): UseFormGqlMutationReturn<Q, V> {
   const cartId = useCartIdCreate()
+  const client = useApolloClient()
 
-  const onBeforeSubmit = async (variables: V) => {
-    const vars = { ...variables, cartId: await cartId() }
-    return options.onBeforeSubmit ? options.onBeforeSubmit(vars) : vars
-  }
   const result = useFormGqlMutation<Q, V>(
     document,
-    { ...options, onBeforeSubmit },
+    {
+      ...options,
+      onBeforeSubmit: async (variables) => {
+        const vars = { ...variables, cartId: await cartId() }
+
+        const res = client.cache.readQuery({ query: CurrentCartIdDocument })
+        if (!options.submitWhileLocked && res?.currentCartId?.locked) {
+          console.log('Could not submit form, cart is locked', res.currentCartId.locked)
+          return false
+        }
+
+        return options.onBeforeSubmit ? options.onBeforeSubmit(vars) : vars
+      },
+    },
     { errorPolicy: 'all', ...operationOptions },
   )
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-cart",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.1.0-canary.3",
+  "version": "8.1.0-canary.30",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,20 +12,20 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/ecommerce-ui": "^8.1.0-canary.3",
-    "@graphcommerce/eslint-config-pwa": "^8.1.0-canary.3",
-    "@graphcommerce/framer-next-pages": "^8.1.0-canary.3",
-    "@graphcommerce/framer-scroller": "^8.1.0-canary.3",
-    "@graphcommerce/framer-utils": "^8.1.0-canary.3",
-    "@graphcommerce/graphql": "^8.1.0-canary.3",
-    "@graphcommerce/image": "^8.1.0-canary.3",
-    "@graphcommerce/magento-customer": "^8.1.0-canary.3",
-    "@graphcommerce/magento-graphql": "^8.1.0-canary.3",
-    "@graphcommerce/magento-store": "^8.1.0-canary.3",
-    "@graphcommerce/next-ui": "^8.1.0-canary.3",
-    "@graphcommerce/prettier-config-pwa": "^8.1.0-canary.3",
-    "@graphcommerce/react-hook-form": "^8.1.0-canary.3",
-    "@graphcommerce/typescript-config-pwa": "^8.1.0-canary.3",
+    "@graphcommerce/ecommerce-ui": "^8.1.0-canary.30",
+    "@graphcommerce/eslint-config-pwa": "^8.1.0-canary.30",
+    "@graphcommerce/framer-next-pages": "^8.1.0-canary.30",
+    "@graphcommerce/framer-scroller": "^8.1.0-canary.30",
+    "@graphcommerce/framer-utils": "^8.1.0-canary.30",
+    "@graphcommerce/graphql": "^8.1.0-canary.30",
+    "@graphcommerce/image": "^8.1.0-canary.30",
+    "@graphcommerce/magento-customer": "^8.1.0-canary.30",
+    "@graphcommerce/magento-graphql": "^8.1.0-canary.30",
+    "@graphcommerce/magento-store": "^8.1.0-canary.30",
+    "@graphcommerce/next-ui": "^8.1.0-canary.30",
+    "@graphcommerce/prettier-config-pwa": "^8.1.0-canary.30",
+    "@graphcommerce/react-hook-form": "^8.1.0-canary.30",
+    "@graphcommerce/typescript-config-pwa": "^8.1.0-canary.30",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",

package/plugins/MagentoCartGraphqlProvider.tsx

@@ -1,12 +1,14 @@
 import { GraphQLProviderProps } from '@graphcommerce/graphql'
-import type { PluginProps } from '@graphcommerce/next-config'
+import type { PluginConfig, PluginProps } from '@graphcommerce/next-config'
 import { cartErrorLink } from '../link/createCartErrorLink'
 import { cartTypePolicies, migrateCart } from '../typePolicies'
 
-export const component = 'GraphQLProvider'
-export const exported = '@graphcommerce/graphql'
+export const config: PluginConfig = {
+  type: 'component',
+  module: '@graphcommerce/graphql',
+}
 
-function MagentoCartGraphqlProvider(props: PluginProps<GraphQLProviderProps>) {
+export function GraphQLProvider(props: PluginProps<GraphQLProviderProps>) {
   const { Prev, links = [], policies = [], migrations = [], ...rest } = props
   return (
     <Prev
@@ -17,5 +19,3 @@ function MagentoCartGraphqlProvider(props: PluginProps<GraphQLProviderProps>) {
     />
   )
 }
-
-export const Plugin = MagentoCartGraphqlProvider

package/plugins/useSignInFormMergeCart.ts

@@ -1,12 +1,12 @@
 import { useApolloClient } from '@graphcommerce/graphql'
-import type { useSignInForm } from '@graphcommerce/magento-customer/hooks/useSignInForm'
+import type { useSignInForm } from '@graphcommerce/magento-customer'
 import type { MethodPlugin } from '@graphcommerce/next-config'
 import { cartLock, readCartId, useAssignCurrentCartId } from '../hooks'
 import { CustomerCartDocument } from '../hooks/CustomerCart.gql'
 import { MergeCartsDocument } from '../hooks/MergeCarts.gql'
 
 export const func = 'useSignInForm'
-export const exported = '@graphcommerce/magento-customer/hooks/useSignInForm'
+export const exported = '@graphcommerce/magento-customer'
 
 const useSignInFormMergeCart: MethodPlugin<typeof useSignInForm> = (useSignInForm, options) => {
   const client = useApolloClient()

package/typePolicies.ts

@@ -9,6 +9,9 @@ export const cartTypePolicies: StrictTypedTypePolicies = {
   CartPrices: {
     merge: (exiting, incoming, { mergeObjects }) => mergeObjects(exiting, incoming),
   },
+  CartItemPrices: {
+    merge: (exiting, incoming, { mergeObjects }) => mergeObjects(exiting, incoming),
+  },
   Cart: {
     fields: {
       shipping_addresses: {
@@ -21,6 +24,7 @@ export const cartTypePolicies: StrictTypedTypePolicies = {
           return merged ? [merged] : []
         },
       },
+      items: { merge: (_, incoming) => incoming },
       prices: {
         merge: (existing: CartPrices[] | undefined, incoming: CartPrices[], options) =>
           options.mergeObjects(existing ?? {}, incoming),