@shopbb/helium 0.6.3 → 0.7.0

package/dist/components/CartForm.d.ts

@@ -1,90 +1,52 @@
 /**
- * <CartForm> — 对齐 Shopify Hydrogen 的 CartForm 组件
+ * <CartForm> — 严格对齐 Shopify Hydrogen 的 CartForm 实现
  *
- * Hydrogen 文档：https://shopify.dev/docs/api/hydrogen/latest/components/cartform
+ * 源文件参考：packages/hydrogen/src/cart/CartForm.tsx
  *
- * 用法：
+ * 核心机制：
+ *   - 用 react-router 的 useFetcher() + <fetcher.Form>
+ *   - submit 后 RR7 自动调对应 route 的 action()，完成后自动 revalidate 所有 loader
+ *   - children 是 render prop 可以接 fetcher 对象（state / data / formData）
+ *   - fetcherKey 让相同的 mutation 互相 cancel（例如多次点 +/- 只跑最后一次）
  *
- *   import { CartForm } from '@shopby/helium';
- *
- *   // 加入购物车
- *   <CartForm
- *     action={CartForm.ACTIONS.LinesAdd}
- *     inputs={{ lines: [{ merchandiseId, quantity: 1 }] }}
- *     route="/cart"
- *   >
- *     <button type="submit">加入购物车</button>
- *   </CartForm>
- *
- *   // 自定义按钮渲染
- *   <CartForm action={CartForm.ACTIONS.LinesAdd} inputs={{ lines }}>
- *     {(fetcher) => (
- *       <button disabled={fetcher.state !== 'idle'}>
- *         {fetcher.state === 'submitting' ? '添加中…' : '加入购物车'}
- *       </button>
- *     )}
- *   </CartForm>
- *
- * 服务端（route action）：
- *
- *   import { CartForm } from '@shopbb/helium';
- *
- *   export async function action(request, context) {
- *     const formData = await request.formData();
- *     const { action, inputs } = CartForm.getFormInput(formData);
- *     // ... switch(action) { ... }
- *   }
- *
- * ─────────────────────────────────────────────────────────────────
- *
- * 实现说明：
- *
- *   - 渲染原生 <form method="POST">，无 JS 也能工作（form 默认提交 = 整页 POST）
- *   - INPUT_NAME = "cartFormInput"（hidden input，value = JSON.stringify({action, inputs})）
- *   - JS 加载后，由 helium 提供的 useCartFormFetcher hook（或 useFetcher 实现） 拦截 submit 实现"不跳页"
- *   - 当前简化实现：hydrate 后 onSubmit preventDefault，自己用 fetch 调，调完后通过 CartProvider.applyCart 更新
+ * 与 helium 0.6.x 之前的差异：
+ *   - 删除自己造的 FetcherContext + raw fetch 实现
+ *   - peerDep 加 react-router（这就是 Hydrogen 自己的依赖）
  */
 import * as React from 'react';
+import { type FetcherWithComponents } from 'react-router';
 export declare const CART_FORM_ACTIONS: {
-    /** Update cart attributes */
     readonly AttributesUpdateInput: "AttributesUpdateInput";
-    /** Update buyer identity (email, customerAccessToken, country, etc.) */
     readonly BuyerIdentityUpdate: "BuyerIdentityUpdate";
-    /** Create a new cart */
     readonly Create: "Create";
-    /** Replace discount codes */
     readonly DiscountCodesUpdate: "DiscountCodesUpdate";
-    /** Replace gift card codes */
     readonly GiftCardCodesUpdate: "GiftCardCodesUpdate";
-    /** Append gift card codes */
     readonly GiftCardCodesAdd: "GiftCardCodesAdd";
-    /** Remove specific gift card codes */
     readonly GiftCardCodesRemove: "GiftCardCodesRemove";
-    /** Add cart lines */
     readonly LinesAdd: "LinesAdd";
-    /** Update cart lines (quantity / attributes) */
-    readonly LinesUpdate: "LinesUpdate";
-    /** Remove cart lines */
     readonly LinesRemove: "LinesRemove";
-    /** Update cart note */
+    readonly LinesUpdate: "LinesUpdate";
     readonly NoteUpdate: "NoteUpdate";
-    /** Update selected delivery options */
     readonly SelectedDeliveryOptionsUpdate: "SelectedDeliveryOptionsUpdate";
-    /** Set metafields */
     readonly MetafieldsSet: "MetafieldsSet";
-    /** Delete metafields */
-    readonly MetafieldsDelete: "MetafieldsDelete";
+    readonly MetafieldDelete: "MetafieldDelete";
+    readonly DeliveryAddressesAdd: "DeliveryAddressesAdd";
+    readonly DeliveryAddressesUpdate: "DeliveryAddressesUpdate";
+    readonly DeliveryAddressesRemove: "DeliveryAddressesRemove";
+    readonly DeliveryAddressesReplace: "DeliveryAddressesReplace";
 };
 export type CartFormAction = (typeof CART_FORM_ACTIONS)[keyof typeof CART_FORM_ACTIONS] | `Custom${string}`;
-export type CartLineInput = {
+export interface CartLineInput {
     merchandiseId: string;
     quantity?: number;
     attributes?: Array<{
         key: string;
         value: string;
     }>;
-};
-export type CartLineUpdateInput = {
+    /** 用于 optimistic UI 展示（不会发到服务端） */
+    selectedVariant?: unknown;
+}
+export interface CartLineUpdateInput {
     id: string;
     quantity?: number;
     merchandiseId?: string;
@@ -92,7 +54,7 @@ export type CartLineUpdateInput = {
         key: string;
         value: string;
     }>;
-};
+}
 interface OtherFormData {
     [key: string]: unknown;
 }
@@ -143,59 +105,25 @@ export type CartFormInput = {
     action: `Custom${string}`;
     inputs: Record<string, unknown>;
 };
-/** 服务端 / 客户端共享的 hidden field name — 对齐 Hydrogen */
 declare const INPUT_NAME = "cartFormInput";
-/**
- * Fetcher 状态对象 — 模仿 Remix useFetcher
- *
- * 关键属性：
- *   - state: 'idle' | 'submitting' | 'loading'
- *   - data: 服务端 action 返回的 JSON（成功时）
- *   - error: 错误信息
- */
-export interface CartFormFetcher {
-    state: 'idle' | 'submitting' | 'loading';
-    data: any;
-    error: string | null;
-    /** 取最近一次提交的 form data（optimistic UI 用） */
-    formData: FormData | null;
-}
-/**
- * 在 <CartForm> 内部任何深度的组件里拿 fetcher 状态。
- *
- *   <CartForm action="LinesAdd" inputs={{lines}}>
- *     <MyButton />
- *   </CartForm>
- *
- *   function MyButton() {
- *     const fetcher = useFetcher();
- *     return <button disabled={fetcher.state !== 'idle'}>添加</button>;
- *   }
- */
-export declare function useFetcher(): CartFormFetcher;
 export interface CartFormCommonProps {
-    /** children 可以是普通节点，也可以是 (fetcher) => ReactNode */
-    children: React.ReactNode | ((fetcher: CartFormFetcher) => React.ReactNode);
-    /** 提交的 route。默认 "/cart" */
+    /** children 可以是普通 React 节点，也可以是 render prop 接收 fetcher 对象 */
+    children: React.ReactNode | ((fetcher: FetcherWithComponents<any>) => React.ReactNode);
+    /** 提交的 route。默认空字符串表示当前 route */
     route?: string;
-    /** Optional key — 同一 key 的 fetcher state 共享。当前简化版未使用 */
+    /** Fetcher key — 相同 key 的 fetcher 会互相 cancel（用于幂等操作）*/
     fetcherKey?: string;
-    /** 表单 className（不影响行为） */
-    className?: string;
 }
 export type CartFormProps = CartFormInput & CartFormCommonProps;
 interface CartFormImpl {
     (props: CartFormProps): React.ReactElement;
     ACTIONS: typeof CART_FORM_ACTIONS;
     INPUT_NAME: typeof INPUT_NAME;
-    /**
-     * 服务端 helper：从 request.formData() 解析出 { action, inputs }
-     *
-     *   const formData = await request.formData();
-     *   const { action, inputs } = CartForm.getFormInput(formData);
-     */
     getFormInput: (formData: FormData) => CartFormInput;
 }
 declare const CartForm: CartFormImpl;
 export { CartForm };
+export { useFetcher } from 'react-router';
+export type { FetcherWithComponents } from 'react-router';
+export type CartFormFetcher = FetcherWithComponents<any>;
 //# sourceMappingURL=CartForm.d.ts.map

package/dist/components/CartForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CartForm.d.ts","sourceRoot":"","sources":["../../src/components/CartForm.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CartForm.d.ts","sourceRoot":"","sources":["../../src/components/CartForm.tsx"],"names":[],"mappings":"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"}

package/dist/components/CartForm.js

@@ -1,213 +1,73 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/**
- * <CartForm> — 对齐 Shopify Hydrogen 的 CartForm 组件
- *
- * Hydrogen 文档：https://shopify.dev/docs/api/hydrogen/latest/components/cartform
- *
- * 用法：
- *
- *   import { CartForm } from '@shopby/helium';
- *
- *   // 加入购物车
- *   <CartForm
- *     action={CartForm.ACTIONS.LinesAdd}
- *     inputs={{ lines: [{ merchandiseId, quantity: 1 }] }}
- *     route="/cart"
- *   >
- *     <button type="submit">加入购物车</button>
- *   </CartForm>
- *
- *   // 自定义按钮渲染
- *   <CartForm action={CartForm.ACTIONS.LinesAdd} inputs={{ lines }}>
- *     {(fetcher) => (
- *       <button disabled={fetcher.state !== 'idle'}>
- *         {fetcher.state === 'submitting' ? '添加中…' : '加入购物车'}
- *       </button>
- *     )}
- *   </CartForm>
- *
- * 服务端（route action）：
- *
- *   import { CartForm } from '@shopbb/helium';
- *
- *   export async function action(request, context) {
- *     const formData = await request.formData();
- *     const { action, inputs } = CartForm.getFormInput(formData);
- *     // ... switch(action) { ... }
- *   }
- *
- * ─────────────────────────────────────────────────────────────────
- *
- * 实现说明：
- *
- *   - 渲染原生 <form method="POST">，无 JS 也能工作（form 默认提交 = 整页 POST）
- *   - INPUT_NAME = "cartFormInput"（hidden input，value = JSON.stringify({action, inputs})）
- *   - JS 加载后，由 helium 提供的 useCartFormFetcher hook（或 useFetcher 实现） 拦截 submit 实现"不跳页"
- *   - 当前简化实现：hydrate 后 onSubmit preventDefault，自己用 fetch 调，调完后通过 CartProvider.applyCart 更新
- */
-import * as React from 'react';
-import { useCartOptional } from './CartProvider';
-import { __registerPendingMutation } from './hooks/useOptimisticCart';
+import { useFetcher } from 'react-router';
 // ============================================================
 // Action 枚举 — 对齐 Hydrogen CartForm.ACTIONS
 // ============================================================
 export const CART_FORM_ACTIONS = {
-    /** Update cart attributes */
     AttributesUpdateInput: 'AttributesUpdateInput',
-    /** Update buyer identity (email, customerAccessToken, country, etc.) */
     BuyerIdentityUpdate: 'BuyerIdentityUpdate',
-    /** Create a new cart */
     Create: 'Create',
-    /** Replace discount codes */
     DiscountCodesUpdate: 'DiscountCodesUpdate',
-    /** Replace gift card codes */
     GiftCardCodesUpdate: 'GiftCardCodesUpdate',
-    /** Append gift card codes */
     GiftCardCodesAdd: 'GiftCardCodesAdd',
-    /** Remove specific gift card codes */
     GiftCardCodesRemove: 'GiftCardCodesRemove',
-    /** Add cart lines */
     LinesAdd: 'LinesAdd',
-    /** Update cart lines (quantity / attributes) */
-    LinesUpdate: 'LinesUpdate',
-    /** Remove cart lines */
     LinesRemove: 'LinesRemove',
-    /** Update cart note */
+    LinesUpdate: 'LinesUpdate',
     NoteUpdate: 'NoteUpdate',
-    /** Update selected delivery options */
     SelectedDeliveryOptionsUpdate: 'SelectedDeliveryOptionsUpdate',
-    /** Set metafields */
     MetafieldsSet: 'MetafieldsSet',
-    /** Delete metafields */
-    MetafieldsDelete: 'MetafieldsDelete',
+    MetafieldDelete: 'MetafieldDelete',
+    DeliveryAddressesAdd: 'DeliveryAddressesAdd',
+    DeliveryAddressesUpdate: 'DeliveryAddressesUpdate',
+    DeliveryAddressesRemove: 'DeliveryAddressesRemove',
+    DeliveryAddressesReplace: 'DeliveryAddressesReplace',
 };
 // ============================================================
-// <CartForm> 组件
+// CartForm
 // ============================================================
-/** 服务端 / 客户端共享的 hidden field name — 对齐 Hydrogen */
 const INPUT_NAME = 'cartFormInput';
 /**
- * CartFormFetcher Context — 让 CartForm 内部任何位置都能用 useFetcher() 拿状态
- *
- * Hydrogen 是用 Remix global fetcher，我们用一个本地 Context。children 既可以是
- * render prop（推荐），也可以是普通节点 + useFetcher() 调用。
+ * 严格照抄 Hydrogen 实现（packages/hydrogen/src/cart/CartForm.tsx）
  */
-const FetcherContext = React.createContext(null);
-/**
- * 在 <CartForm> 内部任何深度的组件里拿 fetcher 状态。
- *
- *   <CartForm action="LinesAdd" inputs={{lines}}>
- *     <MyButton />
- *   </CartForm>
- *
- *   function MyButton() {
- *     const fetcher = useFetcher();
- *     return <button disabled={fetcher.state !== 'idle'}>添加</button>;
- *   }
- */
-export function useFetcher() {
-    const ctx = React.useContext(FetcherContext);
-    if (!ctx) {
-        throw new Error('useFetcher must be used inside a <CartForm>');
-    }
-    return ctx;
-}
 const CartFormBase = (props) => {
-    const { children, route = '/cart', className, action, inputs, ...rest } = props;
-    const cartCtx = useCartOptional();
-    // 序列化 { action, inputs } 一并放进 hidden input
-    // 服务端用 CartForm.getFormInput(formData) 反序列化
-    const payload = React.useMemo(() => JSON.stringify({ action, inputs }), [action, inputs]);
-    const [fetcher, setFetcher] = React.useState({
-        state: 'idle',
-        data: null,
-        error: null,
-        formData: null,
-    });
-    // hydrate 后拦截 submit；SSR 时 onSubmit 不存在 → form 原生 POST
-    const handleSubmit = React.useCallback(async (e) => {
-        e.preventDefault();
-        const form = e.currentTarget;
-        const formData = new FormData(form);
-        setFetcher({ state: 'submitting', data: null, error: null, formData });
-        // 注册到 pending store — useOptimisticCart 会看到这个 mutation 立刻应用
-        // 只对 cart line 类型的 action 做（DiscountCodesUpdate / Custom* 等不做 optimistic）
-        let unregisterPending = null;
-        if (action === 'LinesAdd' || action === 'LinesUpdate' || action === 'LinesRemove') {
-            const pendingId = `${action}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-            unregisterPending = __registerPendingMutation({ id: pendingId, action: action, inputs });
-        }
-        try {
-            // 显式标记 X-Helium-Fetch — 让服务端知道这是 JS fetch 不是原生 form POST
-            // 服务端 handleCartFormAction 看到此 header 会返回 JSON 而不是 303 redirect
-            const res = await fetch(route, {
-                method: 'POST',
-                body: formData,
-                credentials: 'include',
-                headers: { 'Accept': 'application/json', 'X-Helium-Fetch': '1' },
-            });
-            const data = await res.json().catch(() => null);
-            if (!res.ok || data?.error || data?.userErrors?.length) {
-                throw new Error(data?.error || data?.userErrors?.[0]?.message || `HTTP ${res.status}`);
-            }
-            // 服务端约定：成功时返回 { cart: Cart }
-            // 这里直接 applyCart 到 CartProvider，避免 refetch
-            if (data?.cart && cartCtx?.applyCart) {
-                cartCtx.applyCart(data.cart);
-            }
-            setFetcher({ state: 'idle', data, error: null, formData: null });
-        }
-        catch (err) {
-            setFetcher({ state: 'idle', data: null, error: err.message || String(err), formData: null });
-        }
-        finally {
-            unregisterPending?.();
-        }
-    }, [route, cartCtx, action, inputs]);
-    const renderedChildren = typeof children === 'function' ? children(fetcher) : children;
-    return (_jsx(FetcherContext.Provider, { value: fetcher, children: _jsxs("form", { method: "POST", action: route, onSubmit: handleSubmit, className: className, "data-cart-form": true, "data-cart-action": action, children: [_jsx("input", { type: "hidden", name: INPUT_NAME, value: payload }), renderedChildren] }) }));
+    const { children, action, inputs, route, fetcherKey } = props;
+    const fetcher = useFetcher({ key: fetcherKey });
+    return (_jsxs(fetcher.Form, { action: route || '', method: "post", children: [(action || inputs) && (_jsx("input", { type: "hidden", name: INPUT_NAME, value: JSON.stringify({ action, inputs }) })), typeof children === 'function' ? children(fetcher) : children] }));
 };
 /**
  * 服务端 helper：从 request.formData() 还原出 { action, inputs }
  *
- * 与 Hydrogen 完全一致的 API：
- *
- *   const formData = await request.formData();
- *   const { action, inputs } = CartForm.getFormInput(formData);
+ * 严格照抄 Hydrogen 实现：把 form 内其它 input（如 <input name="note">）合并进 inputs。
  */
 function getFormInput(formData) {
-    const raw = formData.get(INPUT_NAME);
-    if (typeof raw !== 'string') {
-        throw new Error(`CartForm.getFormInput: missing field "${INPUT_NAME}" in form data`);
-    }
-    let parsed;
-    try {
-        parsed = JSON.parse(raw);
-    }
-    catch {
-        throw new Error(`CartForm.getFormInput: field "${INPUT_NAME}" is not valid JSON`);
-    }
-    if (!parsed || typeof parsed.action !== 'string') {
-        throw new Error('CartForm.getFormInput: missing "action" in parsed payload');
-    }
-    // 合并 form 里的其它字段进 inputs（对齐 Hydrogen 的 OtherFormData 设计）
-    // <CartForm action=NoteUpdate><input name="note" /></CartForm> 这种场景
-    // FormData 里同时有 cartFormInput 和 note 两个字段，inputs.note 来自 FormData 而不是 JSON。
-    const otherInputs = {};
-    for (const [key, value] of formData.entries()) {
-        if (key === INPUT_NAME)
-            continue;
-        otherInputs[key] = value;
+    // 拿全部 form data
+    const data = {};
+    for (const pair of formData.entries()) {
+        const key = pair[0];
+        const values = formData.getAll(key);
+        data[key] = values.length > 1 ? values : pair[1];
+        // checkbox → boolean
+        if (data[key] === 'on')
+            data[key] = true;
+        else if (data[key] === 'off')
+            data[key] = false;
     }
+    const { cartFormInput, ...otherData } = data;
+    const parsed = cartFormInput ? JSON.parse(String(cartFormInput)) : {};
     return {
         action: parsed.action,
-        inputs: { ...otherInputs, ...(parsed.inputs || {}) },
+        inputs: {
+            ...(parsed.inputs || {}),
+            ...otherData,
+        },
     };
 }
-// 把 ACTIONS / INPUT_NAME / getFormInput 挂到 CartForm 对象上 — 对齐 Hydrogen
 const CartForm = CartFormBase;
 CartForm.ACTIONS = CART_FORM_ACTIONS;
 CartForm.INPUT_NAME = INPUT_NAME;
 CartForm.getFormInput = getFormInput;
 export { CartForm };
+// useFetcher 透传 — 让商家也能用同款 API（其实就是 RR7 原生）
+export { useFetcher } from 'react-router';
 //# sourceMappingURL=CartForm.js.map

package/dist/components/CartForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"CartForm.js","sourceRoot":"","sources":["../../src/components/CartForm.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CartForm.js","sourceRoot":"","sources":["../../src/components/CartForm.tsx"],"names":[],"mappings":";AAiBA,OAAO,EAAE,UAAU,EAA8B,MAAM,cAAc,CAAC;AAEtE,+DAA+D;AAC/D,2CAA2C;AAC3C,+DAA+D;AAE/D,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,qBAAqB,EAAE,uBAAuB;IAC9C,mBAAmB,EAAE,qBAAqB;IAC1C,MAAM,EAAE,QAAQ;IAChB,mBAAmB,EAAE,qBAAqB;IAC1C,mBAAmB,EAAE,qBAAqB;IAC1C,gBAAgB,EAAE,kBAAkB;IACpC,mBAAmB,EAAE,qBAAqB;IAC1C,QAAQ,EAAE,UAAU;IACpB,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,YAAY;IACxB,6BAA6B,EAAE,+BAA+B;IAC9D,aAAa,EAAE,eAAe;IAC9B,eAAe,EAAE,iBAAiB;IAClC,oBAAoB,EAAE,sBAAsB;IAC5C,uBAAuB,EAAE,yBAAyB;IAClD,uBAAuB,EAAE,yBAAyB;IAClD,wBAAwB,EAAE,0BAA0B;CAC5C,CAAC;AAsCX,+DAA+D;AAC/D,WAAW;AACX,+DAA+D;AAE/D,MAAM,UAAU,GAAG,eAAe,CAAC;AAoBnC;;GAEG;AACH,MAAM,YAAY,GAAG,CAAC,KAAoB,EAAsB,EAAE;IAChE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,KAAY,CAAC;IACrE,MAAM,OAAO,GAAG,UAAU,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;IAEhD,OAAO,CACL,MAAC,OAAO,CAAC,IAAI,IAAC,MAAM,EAAE,KAAK,IAAI,EAAE,EAAE,MAAM,EAAC,MAAM,aAC7C,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CACrB,gBACE,IAAI,EAAC,QAAQ,EACb,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,GACzC,CACH,EACA,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,IACjD,CAChB,CAAC;AACJ,CAAC,CAAC;AAEF;;;;GAIG;AACH,SAAS,YAAY,CAAC,QAAkB;IACtC,gBAAgB;IAChB,MAAM,IAAI,GAA4B,EAAE,CAAC;IACzC,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjD,qBAAqB;QACrB,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI;YAAE,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;aACpC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK;YAAE,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IAClD,CAAC;IAED,MAAM,EAAE,aAAa,EAAE,GAAG,SAAS,EAAE,GAAG,IAAI,CAAC;IAC7C,MAAM,MAAM,GAAQ,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE3E,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,MAAM,EAAE;YACN,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;YACxB,GAAG,SAAS;SACb;KACe,CAAC;AACrB,CAAC;AAED,MAAM,QAAQ,GAAG,YAA4B,CAAC;AAC9C,QAAQ,CAAC,OAAO,GAAG,iBAAiB,CAAC;AACrC,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;AACjC,QAAQ,CAAC,YAAY,GAAG,YAAY,CAAC;AAErC,OAAO,EAAE,QAAQ,EAAE,CAAC;AAEpB,4CAA4C;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC"}

package/dist/components/DiscountComponents.d.ts

@@ -6,44 +6,94 @@
  *   <DiscountClaimButton>        单个领取按钮
  *   <MyDiscountList>             我的卡包
  *
- * 注：W5 已删除以下组件（旧设计）：
- *   - <DiscountCodeInput>: 输入框范式已过时。请用 <DiscountSelector> + <ClaimableDiscountList>。
- *   - <BestDiscountHint>: 服务端自动选择最佳券，不需要前端提示。用户在 <DiscountSelector> 看到 / 切换。
- *
- * 全部无样式 + data-* 钩子。
+ * helium 0.7：所有组件**接 props 不靠 Provider**。
+ * 商家从 loader 拉 publicDiscounts / myClaims / cart.discountAllocations 传入。
  */
 import * as React from 'react';
-import { type Discount } from './DiscountProvider';
+export type DiscountValueType = 'PERCENTAGE' | 'FIXED_AMOUNT' | 'FREE_SHIPPING';
+export interface DiscountValuePercentage {
+    __typename: 'DiscountPercentage';
+    percentage: number;
+}
+export interface DiscountValueAmount {
+    __typename: 'DiscountAmount';
+    amount: {
+        amount: string;
+        currencyCode: string;
+    };
+}
+export interface DiscountValueFreeShipping {
+    __typename: 'DiscountFreeShipping';
+    freeShipping: boolean;
+}
+export interface Discount {
+    id: string;
+    code: string | null;
+    title: string;
+    description: string | null;
+    valueType: DiscountValueType;
+    value: DiscountValuePercentage | DiscountValueAmount | DiscountValueFreeShipping;
+    minSubtotal: {
+        amount: string;
+        currencyCode: string;
+    } | null;
+    startsAt: string | null;
+    endsAt: string | null;
+}
+export interface DiscountClaim {
+    id: string;
+    claimedAt: string;
+    expiresAt: string | null;
+    isExpired: boolean;
+    remainingUses: number;
+    usedCount: number;
+    discount: Discount;
+}
+export interface DiscountAllocation {
+    discountedAmount: {
+        amount: string;
+        currencyCode: string;
+    };
+    title?: string | null;
+    code?: string | null;
+}
 export interface AppliedDiscountListProps {
+    /** 从 cart.discountAllocations 传入 */
+    allocations?: DiscountAllocation[];
     className?: string;
     emptyText?: React.ReactNode;
 }
 export declare function AppliedDiscountList(props: AppliedDiscountListProps): import("react/jsx-runtime").JSX.Element;
 export interface ClaimableDiscountListProps {
-    scope?: 'store' | 'product';
-    productHandle?: string;
+    /** 可领取的折扣（从 loader 拉，例如 publicDiscounts 或 productDiscounts） */
+    discounts?: Discount[];
+    /** 一次最多渲染几张，默认 10 */
     first?: number;
     className?: string;
     emptyText?: React.ReactNode;
     renderItem?: (discount: Discount) => React.ReactNode;
 }
-export declare function ClaimableDiscountList(props: ClaimableDiscountListProps): import("react/jsx-runtime").JSX.Element | null;
+export declare function ClaimableDiscountList(props: ClaimableDiscountListProps): import("react/jsx-runtime").JSX.Element;
 export interface DiscountClaimButtonProps {
     discount: Discount;
-    children?: React.ReactNode;
+    /** 点击触发的回调（商家实现 claim 逻辑） */
+    onClaim?: (discount: Discount) => Promise<void> | void;
+    /** 是否已领（外部判断后传入，按钮 disabled） */
+    claimed?: boolean;
+    /** 加载中文本 */
     loadingText?: React.ReactNode;
+    /** 已领文本 */
     claimedText?: React.ReactNode;
-    /** 未登录时跳转的路径。默认 `/login?next=` + 当前路径 */
-    loginPath?: string;
-    onClaimed?: () => void;
-    onError?: (msg: string) => void;
+    children?: React.ReactNode;
     className?: string;
 }
 export declare function DiscountClaimButton(props: DiscountClaimButtonProps): import("react/jsx-runtime").JSX.Element;
 export interface MyDiscountListProps {
-    className?: string;
-    emptyText?: React.ReactNode;
+    /** 从 customer GraphQL 拉的 claims */
+    claims?: DiscountClaim[];
     filter?: 'available' | 'used' | 'expired' | 'all';
+    emptyText?: React.ReactNode;
+    className?: string;
 }
-export declare function MyDiscountList(props: MyDiscountListProps): import("react/jsx-runtime").JSX.Element | null;
+export declare function MyDiscountList(props: MyDiscountListProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=DiscountComponents.d.ts.map

package/dist/components/DiscountComponents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiscountComponents.d.ts","sourceRoot":"","sources":["../../src/components/DiscountComponents.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAqC,KAAK,QAAQ,EAAsB,MAAM,oBAAoB,CAAC;AAU1G,MAAM,WAAW,wBAAwB;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC7B;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,2CAqBlE;AAMD,MAAM,WAAW,0BAA0B;IACzC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,KAAK,CAAC,SAAS,CAAC;CACtD;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,0BAA0B,kDA0BtE;AAsCD,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,yCAAyC;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,2CA2DlE;AAMD,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,GAAG,KAAK,CAAC;CACnD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,kDA8CxD"}
+{"version":3,"file":"DiscountComponents.d.ts","sourceRoot":"","sources":["../../src/components/DiscountComponents.tsx"],"names":[],"mappings":"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"}