@graphcommerce/magento-cart 8.1.0-canary.9 → 9.0.0-canary.101

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.9",
+  "version": "9.0.0-canary.101",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,25 +12,26 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/ecommerce-ui": "^8.1.0-canary.9",
-    "@graphcommerce/eslint-config-pwa": "^8.1.0-canary.9",
-    "@graphcommerce/framer-next-pages": "^8.1.0-canary.9",
-    "@graphcommerce/framer-scroller": "^8.1.0-canary.9",
-    "@graphcommerce/framer-utils": "^8.1.0-canary.9",
-    "@graphcommerce/graphql": "^8.1.0-canary.9",
-    "@graphcommerce/image": "^8.1.0-canary.9",
-    "@graphcommerce/magento-customer": "^8.1.0-canary.9",
-    "@graphcommerce/magento-graphql": "^8.1.0-canary.9",
-    "@graphcommerce/magento-store": "^8.1.0-canary.9",
-    "@graphcommerce/next-ui": "^8.1.0-canary.9",
-    "@graphcommerce/prettier-config-pwa": "^8.1.0-canary.9",
-    "@graphcommerce/react-hook-form": "^8.1.0-canary.9",
-    "@graphcommerce/typescript-config-pwa": "^8.1.0-canary.9",
+    "@graphcommerce/ecommerce-ui": "^9.0.0-canary.101",
+    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.101",
+    "@graphcommerce/framer-next-pages": "^9.0.0-canary.101",
+    "@graphcommerce/framer-scroller": "^9.0.0-canary.101",
+    "@graphcommerce/framer-utils": "^9.0.0-canary.101",
+    "@graphcommerce/graphql": "^9.0.0-canary.101",
+    "@graphcommerce/image": "^9.0.0-canary.101",
+    "@graphcommerce/magento-customer": "^9.0.0-canary.101",
+    "@graphcommerce/magento-graphql": "^9.0.0-canary.101",
+    "@graphcommerce/magento-store": "^9.0.0-canary.101",
+    "@graphcommerce/next-ui": "^9.0.0-canary.101",
+    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.101",
+    "@graphcommerce/react-hook-form": "^9.0.0-canary.101",
+    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.101",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",
     "@mui/material": "^5.10.16",
     "framer-motion": "^10.0.0",
+    "graphql": "^16.0.0",
     "next": "*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

package/plugins/MagentoCartGraphqlProvider.tsx

@@ -1,6 +1,9 @@
 import { GraphQLProviderProps } from '@graphcommerce/graphql'
 import type { PluginConfig, PluginProps } from '@graphcommerce/next-config'
-import { cartErrorLink } from '../link/createCartErrorLink'
+import { useEventCallback } from '@mui/material'
+import { NextRouter } from 'next/router'
+import { useMemo } from 'react'
+import { cartLink } from '../link/cartLink'
 import { cartTypePolicies, migrateCart } from '../typePolicies'
 
 export const config: PluginConfig = {
@@ -9,11 +12,20 @@ export const config: PluginConfig = {
 }
 
 export function GraphQLProvider(props: PluginProps<GraphQLProviderProps>) {
-  const { Prev, links = [], policies = [], migrations = [], ...rest } = props
+  const { Prev, router, links = [], policies = [], migrations = [], ...rest } = props
+
+  const push = useEventCallback<NextRouter['push']>((...args) => router.push(...args))
+
+  const cartLinkMemo = useMemo(
+    () => cartLink({ push, events: router.events, locale: router.locale }),
+    [push, router.events, router.locale],
+  )
+
   return (
     <Prev
       {...rest}
-      links={[...links, cartErrorLink]}
+      router={router}
+      links={[...links, cartLinkMemo]}
       policies={[...policies, cartTypePolicies]}
       migrations={[...migrations, migrateCart]}
     />

package/plugins/useSignInFormMergeCart.ts

@@ -1,14 +1,16 @@
 import { useApolloClient } from '@graphcommerce/graphql'
-import type { useSignInForm } from '@graphcommerce/magento-customer'
-import type { MethodPlugin } from '@graphcommerce/next-config'
+import type { useSignInForm as useSignInFormType } from '@graphcommerce/magento-customer'
+import type { FunctionPlugin, PluginConfig } 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'
+export const config: PluginConfig = {
+  type: 'function',
+  module: '@graphcommerce/magento-customer',
+}
 
-const useSignInFormMergeCart: MethodPlugin<typeof useSignInForm> = (useSignInForm, options) => {
+export const useSignInForm: FunctionPlugin<typeof useSignInFormType> = (useSignInForm, options) => {
   const client = useApolloClient()
   const assignCurrentCartId = useAssignCurrentCartId()
 
@@ -16,6 +18,7 @@ const useSignInFormMergeCart: MethodPlugin<typeof useSignInForm> = (useSignInFor
     ...options,
     onComplete: async (data, variables) => {
       await options.onComplete?.(data, variables)
+      if (data.errors) return
 
       cartLock(client.cache, true)
 
@@ -46,5 +49,3 @@ const useSignInFormMergeCart: MethodPlugin<typeof useSignInForm> = (useSignInFor
     },
   })
 }
-
-export const plugin = useSignInFormMergeCart

package/typePolicies.ts

@@ -24,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),

package/utils/cartPermissions.ts

@@ -0,0 +1,23 @@
+import { storefrontConfig } from '@graphcommerce/next-ui'
+
+function getCartPermissions(locale: string | undefined) {
+  return (
+    storefrontConfig(locale)?.permissions?.cart ??
+    import.meta.graphCommerce.permissions?.cart ??
+    'ENABLED'
+  )
+}
+
+export function getCartDisabled(locale: string | undefined) {
+  return getCartPermissions(locale) === 'DISABLED'
+}
+
+export function getCartGuestEnabled(locale: string | undefined) {
+  return getCartPermissions(locale) === 'ENABLED'
+}
+
+export function getCartEnabledForUser(locale: string | undefined, loggedIn: () => boolean) {
+  if (getCartGuestEnabled(locale)) return true
+  if (getCartDisabled(locale)) return false
+  return !!loggedIn()
+}

package/utils/checkoutPermissions.ts

@@ -0,0 +1,13 @@
+import { storefrontConfig } from '@graphcommerce/next-ui'
+
+function getCheckoutPermission(locale: string | undefined) {
+  return (
+    storefrontConfig(locale)?.permissions?.checkout ??
+    import.meta.graphCommerce.permissions?.checkout ??
+    'ENABLED'
+  )
+}
+
+export function getCheckoutIsDisabled(locale: string | undefined) {
+  return getCheckoutPermission(locale) === 'DISABLED'
+}

package/utils/index.ts

@@ -0,0 +1,2 @@
+export * from './cartPermissions'
+export * from './checkoutPermissions'

package/hooks/CurrentCartId.graphqls

@@ -1,12 +0,0 @@
-extend type Query {
-  currentCartId: CurrentCartId
-}
-
-type CurrentCartId {
-  id: String
-  locked: Boolean
-}
-
-input RegisterCartIdInput {
-  cart_id: String!
-}

package/link/createCartErrorLink.ts

@@ -1,71 +0,0 @@
-import { fromPromise, globalApolloClient, Operation } from '@graphcommerce/graphql'
-import { onError } from '@graphcommerce/graphql/apollo'
-import { ErrorCategory } from '@graphcommerce/magento-graphql'
-import type { GraphQLError } from 'graphql'
-import { writeCartId } from '../hooks'
-import { CreateEmptyCartDocument } from '../hooks/CreateEmptyCart.gql'
-
-type CartOperation = Operation & { variables: { cartId: string } }
-function isCartOperation(operation: Operation): operation is CartOperation {
-  return typeof operation.variables.cartId === 'string'
-}
-
-function errorIsIncluded(errorPath: readonly (string | number)[] | undefined, keys: string[]) {
-  const error = errorPath?.join()
-  return keys.some((value) => value === error)
-}
-
-export const cartErrorLink = onError(({ graphQLErrors, operation, forward }) => {
-  if (!globalApolloClient.current) return undefined
-
-  const client = globalApolloClient.current
-  const { cache } = client
-
-  if (!isCartOperation(operation) || !graphQLErrors) return undefined
-
-  const isErrorCategory = (err: GraphQLError, category: ErrorCategory) =>
-    err.extensions?.category === category
-
-  const isNoSuchEntityError = (err: GraphQLError) =>
-    isErrorCategory(err, 'graphql-no-such-entity') &&
-    errorIsIncluded(err.path, [
-      'cart',
-      'addProductsToCart',
-      /**
-       * These mutations can also throw the graphql-no-such-entity exception, however, we're not
-       * sure if it also throws for other types of entities.
-       */
-      // 'removeItemFromCart',
-      // 'setBillingAddressOnCart',
-      // 'setGuestEmailOnCart',
-      // 'setPaymentMethodOnCart',
-      // 'setShippingAddressesOnCart',
-      // 'setShippingMethodsOnCart',
-      // 'updateCartItems',
-      // 'applyCouponToCart',
-      // 'removeCouponFromCart'
-    ])
-  const cartErr = graphQLErrors.find((err) => isNoSuchEntityError(err))
-
-  if (!cartErr) return undefined
-
-  if (globalThis.location?.search) {
-    const urlParams = new URLSearchParams(window.location.search)
-    if (urlParams.get('cart_id')) return forward(operation)
-  }
-
-  return fromPromise(client?.mutate({ mutation: CreateEmptyCartDocument }))
-    .filter((value) => Boolean(value))
-    .flatMap((cartData) => {
-      const cartId = cartData.data?.createEmptyCart
-      if (!cartId) return forward(operation)
-
-      writeCartId(cache, cartId)
-      operation.variables = { ...operation.variables, cartId }
-
-      // retry the request, returning the new observable
-      return forward(operation)
-    })
-})
-
-export const createCartErrorLink = () => cartErrorLink