Update Swell Provider (#359)

* fix update cart item

* update types

* update checkout

* update get-page, cleanup types

* revert change to incorrect file

* cleanup

Co-authored-by: Greg Hoskin <greghoskin@Gregs-MacBook-Pro.local>

framework/swell/cart/use-add-item.tsx

@@ -2,14 +2,14 @@ import type { MutationHook } from '@commerce/utils/types'
 import { CommerceError } from '@commerce/utils/errors'
 import useAddItem, { UseAddItem } from '@commerce/cart/use-add-item'
 import useCart from './use-cart'
-import { Cart, CartItemBody } from '../types'
 import { checkoutToCart } from './utils'
 import { getCheckoutId } from '../utils'
 import { useCallback } from 'react'
+import { AddItemHook } from '../types/cart'
 
 export default useAddItem as UseAddItem<typeof handler>
 
-export const handler: MutationHook<Cart, {}, CartItemBody> = {
+export const handler: MutationHook<AddItemHook> = {
   fetchOptions: {
     query: 'cart',
     method: 'addItem',
@@ -24,7 +24,7 @@ export const handler: MutationHook<Cart, {}, CartItemBody> = {
       })
     }
     const variables: {
-      product_id: string
+      product_id: string | undefined
       variant_id?: string
       checkoutId?: string
       quantity?: number

framework/swell/cart/use-cart.tsx

@@ -1,13 +1,13 @@
 import useCart, { UseCart } from '@commerce/cart/use-cart'
-import { Cart } from '@commerce/types'
 import { SWRHook } from '@commerce/utils/types'
 import { useMemo } from 'react'
 import { normalizeCart } from '../utils/normalize'
 import { checkoutCreate, checkoutToCart } from './utils'
+import type { GetCartHook } from '@commerce/types/cart'
 
 export default useCart as UseCart<typeof handler>
 
-export const handler: SWRHook<Cart | null, {}, any, { isEmpty?: boolean }> = {
+export const handler: SWRHook<GetCartHook> = {
   fetchOptions: {
     query: 'cart',
     method: 'get',

framework/swell/cart/use-remove-item.tsx

@@ -1,29 +1,21 @@
 import { useCallback } from 'react'
-
 import type {
   MutationHookContext,
   HookFetcherContext,
 } from '@commerce/utils/types'
 
-import { ValidationError } from '@commerce/utils/errors'
-
-import useRemoveItem, {
-  RemoveItemInput as RemoveItemInputBase,
-  UseRemoveItem,
-} from '@commerce/cart/use-remove-item'
-
+import useRemoveItem, { UseRemoveItem } from '@commerce/cart/use-remove-item'
+import type { Cart, LineItem, RemoveItemHook } from '@commerce/types/cart'
 import useCart from './use-cart'
 import { checkoutToCart } from './utils'
-import { Cart, LineItem } from '../types'
-import { RemoveCartItemBody } from '@commerce/types'
 
 export type RemoveItemFn<T = any> = T extends LineItem
-  ? (input?: RemoveItemInput<T>) => Promise<Cart | null>
-  : (input: RemoveItemInput<T>) => Promise<Cart | null>
+  ? (input?: RemoveItemActionInput<T>) => Promise<Cart | null | undefined>
+  : (input: RemoveItemActionInput<T>) => Promise<Cart | null>
 
-export type RemoveItemInput<T = any> = T extends LineItem
-  ? Partial<RemoveItemInputBase>
-  : RemoveItemInputBase
+export type RemoveItemActionInput<T = any> = T extends LineItem
+  ? Partial<RemoveItemHook['actionInput']>
+  : RemoveItemHook['actionInput']
 
 export default useRemoveItem as UseRemoveItem<typeof handler>
 
@@ -36,36 +28,22 @@ export const handler = {
     input: { itemId },
     options,
     fetch,
-  }: HookFetcherContext<RemoveCartItemBody>) {
-    const response = await fetch({
-      ...options,
-      variables: [itemId],
-    })
+  }: HookFetcherContext<RemoveItemHook>) {
+    const response = await fetch({ ...options, variables: [itemId] })
+
     return checkoutToCart(response)
   },
-  useHook: ({
-    fetch,
-  }: MutationHookContext<Cart | null, RemoveCartItemBody>) => <
-    T extends LineItem | undefined = undefined
-  >(
-    ctx: { item?: T } = {}
-  ) => {
-    const { item } = ctx
+  useHook: ({ fetch }: MutationHookContext<RemoveItemHook>) => () => {
     const { mutate } = useCart()
-    const removeItem: RemoveItemFn<LineItem> = async (input) => {
-      const itemId = input?.id ?? item?.id
 
-      if (!itemId) {
-        throw new ValidationError({
-          message: 'Invalid input used for this operation',
-        })
-      }
+    return useCallback(
+      async function removeItem(input) {
+        const data = await fetch({ input: { itemId: input.id } })
+        await mutate(data, false)
 
-      const data = await fetch({ input: { itemId } })
-      await mutate(data, false)
-      return data
-    }
-
-    return useCallback(removeItem as RemoveItemFn<T>, [fetch, mutate])
+        return data
+      },
+      [fetch, mutate]
+    )
   },
 }

framework/swell/cart/use-update-item.tsx

@@ -2,25 +2,30 @@ import { useCallback } from 'react'
 import debounce from 'lodash.debounce'
 import type {
   HookFetcherContext,
+  MutationHook,
   MutationHookContext,
 } from '@commerce/utils/types'
 import { ValidationError } from '@commerce/utils/errors'
-import useUpdateItem, {
-  UpdateItemInput as UpdateItemInputBase,
-  UseUpdateItem,
-} from '@commerce/cart/use-update-item'
-
+// import useUpdateItem, {
+//   UpdateItemInput as UpdateItemInputBase,
+//   UseUpdateItem,
+// } from '@commerce/cart/use-update-item'
+import useUpdateItem, { UseUpdateItem } from '@commerce/cart/use-update-item'
 import useCart from './use-cart'
 import { handler as removeItemHandler } from './use-remove-item'
-import type { Cart, LineItem, UpdateCartItemBody } from '../types'
+import { CartItemBody, LineItem } from '@commerce/types/cart'
 import { checkoutToCart } from './utils'
-
-export type UpdateItemInput<T = any> = T extends LineItem
-  ? Partial<UpdateItemInputBase<LineItem>>
-  : UpdateItemInputBase<LineItem>
+import { UpdateItemHook } from '../types/cart'
+// export type UpdateItemInput<T = any> = T extends LineItem
+//   ? Partial<UpdateItemInputBase<LineItem>>
+//   : UpdateItemInputBase<LineItem>
 
 export default useUpdateItem as UseUpdateItem<typeof handler>
 
+export type UpdateItemActionInput<T = any> = T extends LineItem
+  ? Partial<UpdateItemHook['actionInput']>
+  : UpdateItemHook['actionInput']
+
 export const handler = {
   fetchOptions: {
     query: 'cart',
@@ -30,7 +35,7 @@ export const handler = {
     input: { itemId, item },
     options,
     fetch,
-  }: HookFetcherContext<UpdateCartItemBody>) {
+  }: HookFetcherContext<UpdateItemHook>) {
     if (Number.isInteger(item.quantity)) {
       // Also allow the update hook to remove an item if the quantity is lower than 1
       if (item.quantity! < 1) {
@@ -52,9 +57,7 @@ export const handler = {
 
     return checkoutToCart(response)
   },
-  useHook: ({
-    fetch,
-  }: MutationHookContext<Cart | null, UpdateCartItemBody>) => <
+  useHook: ({ fetch }: MutationHookContext<UpdateItemHook>) => <
     T extends LineItem | undefined = undefined
   >(
     ctx: {
@@ -66,7 +69,7 @@ export const handler = {
     const { mutate, data: cartData } = useCart() as any
 
     return useCallback(
-      debounce(async (input: UpdateItemInput<T>) => {
+      debounce(async (input: UpdateItemActionInput) => {
         const firstLineItem = cartData.lineItems[0]
         const itemId = item?.id || firstLineItem.id
         const productId = item?.productId || firstLineItem.productId

framework/swell/cart/utils/checkout-create.ts

@@ -9,7 +9,7 @@ export const checkoutCreate = async (fetch: any) => {
   })
 
   if (!cart) {
-    const cart = await fetch({
+    await fetch({
       query: 'cart',
       method: 'setItems',
       variables: [[]],

framework/swell/cart/utils/fetcher.ts

@@ -1,33 +0,0 @@
-import { HookFetcherFn } from '@commerce/utils/types'
-import { Cart } from '@commerce/types'
-// import { checkoutCreate, checkoutToCart } from '.'
-import { FetchCartInput } from '@commerce/cart/use-cart'
-import { data } from 'autoprefixer'
-import { normalizeCart } from '../../utils'
-
-const fetcher: HookFetcherFn<Cart | null, FetchCartInput> = async ({
-  options,
-  // input: { cartId: checkoutId },
-  fetch,
-}) => {
-  let checkout
-
-  // if (checkoutId) {
-  const data = await fetch({
-    query: 'cart',
-    method: 'get',
-    // variables: { category: categoryId },
-  })
-  // checkout = data.node
-  // }
-
-  // if (checkout?.completedAt || !checkoutId) {
-  //   checkout = await checkoutCreate(fetch)
-  // }
-
-  // TODO: Fix this type
-  // return checkoutToCart({ checkout } as any)
-  return normalizeCart(data)
-}
-
-export default fetcher