@anker-in/shopify-react 1.3.0-beta.3 → 1.3.0-beta.5

package/dist/hooks/index.d.mts

@@ -920,7 +920,7 @@ interface UseAllProductsOptions extends SWRConfiguration<NormalizedProduct[]> {
  */
 declare function useAllProducts(options?: UseAllProductsOptions): swr.SWRResponse<NormalizedProduct[], any, SWRConfiguration<NormalizedProduct[], any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>)> | undefined>;
 
-interface UseProductsByHandlesOptions extends SWRConfiguration<NormalizedProduct[]> {
+interface UseProductsByHandlesOptions extends SWRConfiguration<(NormalizedProduct | undefined)[]> {
     handles?: string[];
     metafieldIdentifiers?: {
         product: HasMetafieldsIdentifier[];
@@ -956,7 +956,7 @@ interface UseProductsByHandlesOptions extends SWRConfiguration<NormalizedProduct
  * }
  * ```
  */
-declare function useProductsByHandles(options?: UseProductsByHandlesOptions): swr.SWRResponse<NormalizedProduct[], any, SWRConfiguration<NormalizedProduct[], any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>)> | undefined>;
+declare function useProductsByHandles(options?: UseProductsByHandlesOptions): swr.SWRResponse<(NormalizedProduct | undefined)[], any, SWRConfiguration<(NormalizedProduct | undefined)[], any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<(NormalizedProduct | undefined)[]>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<(NormalizedProduct | undefined)[]>)> | undefined>;
 
 /**
  * useVariant Hook

package/dist/hooks/index.d.ts

@@ -920,7 +920,7 @@ interface UseAllProductsOptions extends SWRConfiguration<NormalizedProduct[]> {
  */
 declare function useAllProducts(options?: UseAllProductsOptions): swr.SWRResponse<NormalizedProduct[], any, SWRConfiguration<NormalizedProduct[], any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>)> | undefined>;
 
-interface UseProductsByHandlesOptions extends SWRConfiguration<NormalizedProduct[]> {
+interface UseProductsByHandlesOptions extends SWRConfiguration<(NormalizedProduct | undefined)[]> {
     handles?: string[];
     metafieldIdentifiers?: {
         product: HasMetafieldsIdentifier[];
@@ -956,7 +956,7 @@ interface UseProductsByHandlesOptions extends SWRConfiguration<NormalizedProduct
  * }
  * ```
  */
-declare function useProductsByHandles(options?: UseProductsByHandlesOptions): swr.SWRResponse<NormalizedProduct[], any, SWRConfiguration<NormalizedProduct[], any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>)> | undefined>;
+declare function useProductsByHandles(options?: UseProductsByHandlesOptions): swr.SWRResponse<(NormalizedProduct | undefined)[], any, SWRConfiguration<(NormalizedProduct | undefined)[], any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<(NormalizedProduct | undefined)[]>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<(NormalizedProduct | undefined)[]>)> | undefined>;
 
 /**
  * useVariant Hook

package/dist/hooks/index.js

@@ -1165,6 +1165,26 @@ function useRemoveCartCodes(options) {
   );
   return useSWRMutation__default.default("remove-codes", removeCodes, options);
 }
+function useUpdateCartLines(options) {
+  const { client, locale, cartCookieAdapter } = useShopify();
+  const { mutateCart, metafieldIdentifiers } = useCartContext();
+  const updateLines = react.useCallback(
+    async (_key, { arg }) => {
+      const updatedCart = await shopifySdk.updateCartLines(client, {
+        ...arg,
+        metafieldIdentifiers,
+        cookieAdapter: cartCookieAdapter
+      });
+      if (updatedCart) {
+        mutateCart(updatedCart);
+      }
+      console.log("use-update-cart-lines updatedCart", metafieldIdentifiers, updatedCart);
+      return updatedCart;
+    },
+    [client, locale, cartCookieAdapter, mutateCart, metafieldIdentifiers]
+  );
+  return useSWRMutation__default.default("update-cart-lines", updateLines, options);
+}
 var initSameLinesAttributes = ({
   cart,
   line
@@ -2326,6 +2346,7 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
   const { trigger: applyCartCodes } = useApplyCartCodes();
   const { trigger: removeInvalidCodes } = useRemoveCartCodes();
   const { trigger: addCartLines2 } = useAddCartLines();
+  const { trigger: updateCartLines3 } = useUpdateCartLines();
   const { trigger: createCart4 } = useCreateCart({
     updateCookie: true
   });
@@ -2378,10 +2399,36 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
           // 初次加购时，就把所有 cart attributes 带上
         });
       } else {
-        resultCart = await addCartLines2({
-          cartId,
-          lines
+        const linesToUpdate = [];
+        const linesToAddNew = lines.filter((lineToAdd) => {
+          const existingLine = cart?.lineItems?.find(
+            (item) => item.variant?.id === lineToAdd.merchandiseId
+          );
+          if (existingLine) {
+            linesToUpdate.push({
+              id: existingLine.id,
+              quantity: existingLine.quantity + (lineToAdd.quantity || 1),
+              attributes: lineToAdd.attributes || void 0
+            });
+            return false;
+          }
+          return true;
         });
+        if (linesToUpdate.length > 0) {
+          resultCart = await updateCartLines3({
+            cartId,
+            lines: linesToUpdate
+          });
+        }
+        if (linesToAddNew.length > 0) {
+          resultCart = await addCartLines2({
+            cartId: resultCart?.id || cartId,
+            lines: linesToAddNew
+          });
+        }
+        if (!resultCart) {
+          resultCart = cart;
+        }
         console.log("npm addCartLines resultCart", resultCart);
         if (resultCart && resultCart.discountCodes && resultCart.discountCodes.length > 0) {
           const unapplicableCodes = resultCart.discountCodes.filter((item) => !item.applicable).map((item) => item.code);
@@ -2442,6 +2489,7 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
       performanceAdapter,
       createCart4,
       addCartLines2,
+      updateCartLines3,
       applyCartCodes,
       removeInvalidCodes,
       addCustomAttributes,
@@ -2451,26 +2499,6 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
   );
   return useSWRMutation__default.default("add-to-cart", addToCart, swrOptions);
 }
-function useUpdateCartLines(options) {
-  const { client, locale, cartCookieAdapter } = useShopify();
-  const { mutateCart, metafieldIdentifiers } = useCartContext();
-  const updateLines = react.useCallback(
-    async (_key, { arg }) => {
-      const updatedCart = await shopifySdk.updateCartLines(client, {
-        ...arg,
-        metafieldIdentifiers,
-        cookieAdapter: cartCookieAdapter
-      });
-      if (updatedCart) {
-        mutateCart(updatedCart);
-      }
-      console.log("use-update-cart-lines updatedCart", metafieldIdentifiers, updatedCart);
-      return updatedCart;
-    },
-    [client, locale, cartCookieAdapter, mutateCart, metafieldIdentifiers]
-  );
-  return useSWRMutation__default.default("update-cart-lines", updateLines, options);
-}
 function useUpdateCartAttributes({
   mutate,
   metafieldIdentifiers,