fix(storefront-data): avoid hooks-in-callback by resolving region in cart/product hooks

Author: KaiUweCZE

libs/storefront-data/src/cart/hooks.ts

@@ -339,14 +339,15 @@ export function createCartHooks<
   }
 
   function useAddLineItem(options?: CartMutationOptions<TCart, TAddInput>) {
+    const region = resolveRegion ? resolveRegion() : null
     const queryClient = useQueryClient()
     return useMutation({
       mutationFn: async (input: TAddInput) => {
         if (!service.addLineItem) {
           throw new Error("addLineItem service is not configured")
         }
 
-        const resolvedInput = applyRegion(input, resolveRegion?.() ?? undefined)
+        const resolvedInput = applyRegion(input, region ?? undefined)
         let cartId = resolveCartId(resolvedInput.cartId)
         const autoCreate = resolvedInput.autoCreate ?? true
         const canCreate =
@@ -518,11 +519,11 @@ export function createCartHooks<
     skipIfCached?: boolean
   }) {
     const queryClient = useQueryClient()
+    const region = resolveRegion ? resolveRegion() : null
     const cacheStrategy = options?.cacheStrategy ?? "realtime"
     const skipIfCached = options?.skipIfCached ?? true
 
     const prefetchCart = async (input: CartInputBase) => {
-      const region = resolveRegion ? resolveRegion() : null
       const resolvedInput = applyRegion(input, region ?? undefined)
       const cartId = resolveCartId(resolvedInput.cartId)
       const autoCreate = resolvedInput.autoCreate ?? true

libs/storefront-data/src/products/hooks.ts

@@ -261,6 +261,7 @@ export function createProductHooks<
     skipIfCached?: boolean
   }) {
     const queryClient = useQueryClient()
+    const region = resolveRegion ? resolveRegion() : null
     const timeoutsRef = useRef<Map<string, ReturnType<typeof setTimeout>>>(
       new Map()
     )
@@ -272,7 +273,6 @@ export function createProductHooks<
       input: TListInput,
       prefetchOptions?: PrefetchListOptions
     ) => {
-      const region = resolveRegion ? resolveRegion() : null
       const resolvedInput = applyRegion(input, region ?? undefined)
       if (requireRegion && !resolvedInput.region_id) {
         return
@@ -306,7 +306,6 @@ export function createProductHooks<
       input: TListInput,
       prefetchOptions?: PrefetchListOptions
     ) => {
-      const region = resolveRegion ? resolveRegion() : null
       const resolvedInput = applyRegion(input, region ?? undefined)
       if (requireRegion && !resolvedInput.region_id) {
         return
@@ -341,7 +340,6 @@ export function createProductHooks<
       delay = defaultDelay,
       prefetchId?: string
     ) => {
-      const region = resolveRegion ? resolveRegion() : null
       const resolvedInput = applyRegion(input, region ?? undefined)
       const listParams = buildList(resolvedInput)
       const queryKey = resolvedQueryKeys.list(listParams)
@@ -382,6 +380,7 @@ export function createProductHooks<
     skipIfCached?: boolean
   }) {
     const queryClient = useQueryClient()
+    const region = resolveRegion ? resolveRegion() : null
     const timeoutsRef = useRef<Map<string, ReturnType<typeof setTimeout>>>(
       new Map()
     )
@@ -393,7 +392,6 @@ export function createProductHooks<
       input: TDetailInput,
       prefetchOptions?: PrefetchProductOptions
     ) => {
-      const region = resolveRegion ? resolveRegion() : null
       const resolvedInput = applyRegion(input, region ?? undefined)
       if (requireRegion && !resolvedInput.region_id) {
         return
@@ -425,7 +423,6 @@ export function createProductHooks<
       delay = defaultDelay,
       prefetchId?: string
     ) => {
-      const region = resolveRegion ? resolveRegion() : null
       const resolvedInput = applyRegion(input, region ?? undefined)
       const detailParams = buildDetail(resolvedInput)
       const queryKey = resolvedQueryKeys.detail(detailParams)