Update Vendure provider to latest API changes (#352)

Relates to #349

framework/vendure/cart/index.ts

@@ -1,5 +1,4 @@
 export { default as useCart } from './use-cart'
 export { default as useAddItem } from './use-add-item'
 export { default as useRemoveItem } from './use-remove-item'
-export { default as useWishlistActions } from './use-cart-actions'
-export { default as useUpdateItem } from './use-cart-actions'
+export { default as useUpdateItem } from './use-update-item'

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

@@ -1,16 +1,16 @@
-import { Cart, CartItemBody } from '@commerce/types'
 import useAddItem, { UseAddItem } from '@commerce/cart/use-add-item'
 import { CommerceError } from '@commerce/utils/errors'
 import { MutationHook } from '@commerce/utils/types'
 import { useCallback } from 'react'
 import useCart from './use-cart'
 import { AddItemToOrderMutation } from '../schema'
-import { normalizeCart } from '../lib/normalize'
-import { addItemToOrderMutation } from '../lib/mutations/add-item-to-order-mutation'
+import { normalizeCart } from '../utils/normalize'
+import { addItemToOrderMutation } from '../utils/mutations/add-item-to-order-mutation'
+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: addItemToOrderMutation,
   },

framework/vendure/cart/use-cart-actions.tsx

@@ -1,13 +0,0 @@
-import useAddItem from './use-add-item'
-import useRemoveItem from './use-remove-item'
-import useUpdateItem from './use-update-item'
-
-// This hook is probably not going to be used, but it's here
-// to show how a commerce should be structuring it
-export default function useCartActions() {
-  const addItem = useAddItem()
-  const updateItem = useUpdateItem()
-  const removeItem = useRemoveItem()
-
-  return { addItem, updateItem, removeItem }
-}

framework/vendure/cart/use-cart.tsx

@@ -1,10 +1,10 @@
-import { Cart } from '@commerce/types'
 import { SWRHook } from '@commerce/utils/types'
-import useCart, { FetchCartInput, UseCart } from '@commerce/cart/use-cart'
+import useCart, { UseCart } from '@commerce/cart/use-cart'
 import { ActiveOrderQuery, CartFragment } from '../schema'
-import { normalizeCart } from '../lib/normalize'
+import { normalizeCart } from '../utils/normalize'
 import { useMemo } from 'react'
-import { getCartQuery } from '../lib/queries/get-cart-query'
+import { getCartQuery } from '../utils/queries/get-cart-query'
+import { GetCartHook } from '../types/cart'
 
 export type CartResult = {
   activeOrder?: CartFragment
@@ -15,12 +15,7 @@ export type CartResult = {
 
 export default useCart as UseCart<typeof handler>
 
-export const handler: SWRHook<
-  Cart | null,
-  {},
-  FetchCartInput,
-  { isEmpty?: boolean }
-> = {
+export const handler: SWRHook<GetCartHook> = {
   fetchOptions: {
     query: getCartQuery,
   },

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

@@ -1,25 +1,31 @@
 import { useCallback } from 'react'
-import { HookFetcherContext, MutationHookContext } from '@commerce/utils/types'
+import {
+  HookFetcherContext,
+  MutationHook,
+  MutationHookContext,
+  SWRHook,
+} from '@commerce/utils/types'
 import useRemoveItem, { UseRemoveItem } from '@commerce/cart/use-remove-item'
 import { CommerceError } from '@commerce/utils/errors'
+import { Cart } from '@commerce/types/cart'
 import useCart from './use-cart'
 import {
   RemoveOrderLineMutation,
   RemoveOrderLineMutationVariables,
 } from '../schema'
-import { Cart, LineItem, RemoveCartItemBody } from '@commerce/types'
-import { normalizeCart } from '../lib/normalize'
-import { removeOrderLineMutation } from '../lib/mutations/remove-order-line-mutation'
+import { normalizeCart } from '../utils/normalize'
+import { RemoveItemHook } from '../types/cart'
+import { removeOrderLineMutation } from '../utils/mutations/remove-order-line-mutation'
 
 export default useRemoveItem as UseRemoveItem<typeof handler>
 
-export const handler = {
+export const handler: MutationHook<RemoveItemHook> = {
   fetchOptions: {
     query: removeOrderLineMutation,
   },
-  async fetcher({ input, options, fetch }: HookFetcherContext<LineItem>) {
+  async fetcher({ input, options, fetch }) {
     const variables: RemoveOrderLineMutationVariables = {
-      orderLineId: input.id,
+      orderLineId: input.itemId,
     }
     const { removeOrderLine } = await fetch<RemoveOrderLineMutation>({
       ...options,
@@ -31,14 +37,12 @@ export const handler = {
     }
     throw new CommerceError(removeOrderLine)
   },
-  useHook: ({
-    fetch,
-  }: MutationHookContext<Cart | null, RemoveCartItemBody>) => (ctx = {}) => {
+  useHook: ({ fetch }) => () => {
     const { mutate } = useCart()
 
     return useCallback(
       async function removeItem(input) {
-        const data = await fetch({ input })
+        const data = await fetch({ input: { itemId: input.id } })
         await mutate(data, false)
         return data
       },

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

@@ -1,20 +1,24 @@
 import { useCallback } from 'react'
-import { HookFetcherContext, MutationHookContext } from '@commerce/utils/types'
+import {
+  HookFetcherContext,
+  MutationHook,
+  MutationHookContext,
+} from '@commerce/utils/types'
 import { CommerceError, ValidationError } from '@commerce/utils/errors'
 import useUpdateItem, { UseUpdateItem } from '@commerce/cart/use-update-item'
-import {
-  Cart,
-  CartItemBody,
-  LineItem,
-  UpdateCartItemBody,
-} from '@commerce/types'
+import { CartItemBody, LineItem } from '@commerce/types/cart'
 import useCart from './use-cart'
 import {
   AdjustOrderLineMutation,
   AdjustOrderLineMutationVariables,
 } from '../schema'
-import { normalizeCart } from '../lib/normalize'
-import { adjustOrderLineMutation } from '../lib/mutations/adjust-order-line-mutation'
+import { normalizeCart } from '../utils/normalize'
+import { adjustOrderLineMutation } from '../utils/mutations/adjust-order-line-mutation'
+import { UpdateItemHook } from '../types/cart'
+
+export type UpdateItemActionInput<T = any> = T extends LineItem
+  ? Partial<UpdateItemHook['actionInput']>
+  : UpdateItemHook['actionInput']
 
 export default useUpdateItem as UseUpdateItem<typeof handler>
 
@@ -22,7 +26,7 @@ export const handler = {
   fetchOptions: {
     query: adjustOrderLineMutation,
   },
-  async fetcher(context: HookFetcherContext<UpdateCartItemBody<CartItemBody>>) {
+  async fetcher(context: HookFetcherContext<UpdateItemHook>) {
     const { input, options, fetch } = context
     const variables: AdjustOrderLineMutationVariables = {
       quantity: input.item.quantity || 1,
@@ -38,9 +42,7 @@ export const handler = {
     }
     throw new CommerceError(adjustOrderLine)
   },
-  useHook: ({
-    fetch,
-  }: MutationHookContext<Cart | null, UpdateCartItemBody<CartItemBody>>) => (
+  useHook: ({ fetch }: MutationHookContext<UpdateItemHook>) => (
     ctx: {
       item?: LineItem
       wait?: number
@@ -50,7 +52,7 @@ export const handler = {
     const { mutate } = useCart()
 
     return useCallback(
-      async function addItem(input: Partial<CartItemBody>) {
+      async function addItem(input: UpdateItemActionInput) {
         const itemId = item?.id
         const productId = input.productId ?? item?.productId
         const variantId = input.productId ?? item?.variantId