@windrun-huaiin/third-ui 7.6.1 → 10.1.0

package/dist/main/money-price/money-price-button.js

@@ -1,80 +1,200 @@
 "use client";
 'use strict';
 
-var tslib_es6 = require('../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.2/node_modules/tslib/tslib.es6.js');
+var tslib_es6 = require('../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.js');
 var jsxRuntime = require('react/jsx-runtime');
 var utils = require('@windrun-huaiin/lib/utils');
 var moneyPriceTypes = require('./money-price-types.js');
 var React = require('react');
 
-function capitalize(str) {
-    return str.charAt(0).toUpperCase() + str.slice(1);
-}
-function MoneyPriceButton({ planKey, userContext, billingType, onLogin, onUpgrade, texts, isProcessing = false }) {
+function MoneyPriceButton({ planKey, userContext, billingType, onAuth, onAction, texts, isProcessing = false, isInitLoading = false, enableSubscriptionUpgrade = true }) {
+    if (isInitLoading) {
+        return (jsxRuntime.jsx("div", { className: "w-full h-11 md:h-12 mt-4 md:mt-auto rounded-full bg-transparent", "aria-hidden": "true", "data-plan-button-placeholder": planKey }));
+    }
     const { isAuthenticated, subscriptionStatus } = userContext;
     const [isLoading, setIsLoading] = React.useState(false);
-    // 决定按钮显示和行为
-    const getButtonConfig = () => {
+    const subscriptionBilling = userContext.subscriptionType;
+    const planTier = planKey;
+    const planBilling = billingType;
+    const getPlanRank = (tier, billing) => {
+        if (tier === 'F1')
+            return 0;
+        if (tier === 'P2')
+            return billing === 'monthly' ? 1 : 3;
+        if (tier === 'U3')
+            return billing === 'monthly' ? 2 : 4;
+        return 0;
+    };
+    // OneTime 模式的按钮配置
+    const getOnetimeButtonConfig = () => {
+        // 匿名用户：所有卡片都显示登录按钮
+        if (!isAuthenticated) {
+            return {
+                text: texts.getStarted,
+                onClick: onAuth,
+                disabled: false,
+                hidden: false
+            };
+        }
+        if (subscriptionStatus === moneyPriceTypes.UserState.Anonymous) {
+            // 已登录但状态未知 → 视为 FreeUser
+            console.warn('Clerk is authed OK but user is anonymous!');
+            return { text: '', disabled: true, hidden: true };
+        }
+        // 登录用户：OneTime 模式下所有卡片都显示购买积分按钮
+        return {
+            text: texts.buyCredits || texts.upgrade,
+            onClick: () => onAction(planKey, billingType),
+            disabled: false,
+            hidden: false
+        };
+    };
+    // 订阅模式的按钮配置
+    const getSubscriptionButtonConfig = () => {
         // 匿名用户
         if (!isAuthenticated) {
-            const textKey = planKey === 'free' ? 'getStarted' : `get${capitalize(planKey)}`;
+            const getButtonText = () => {
+                switch (planKey) {
+                    case 'F1':
+                        return texts.getStarted;
+                    case 'P2':
+                        return texts.getPro;
+                    case 'U3':
+                        return texts.getUltra;
+                    default:
+                        return texts.getStarted;
+                }
+            };
             return {
-                text: texts[textKey] || texts.getStarted,
-                onClick: onLogin,
+                text: getButtonText(),
+                onClick: onAuth,
                 disabled: false,
                 hidden: false
             };
         }
         // 已登录用户
         switch (subscriptionStatus) {
-            case moneyPriceTypes.UserState.FreeUser:
-                if (planKey === 'free') {
+            case moneyPriceTypes.UserState.FreeUser: {
+                if (planTier === 'F1') {
                     return {
                         text: texts.currentPlan,
                         disabled: true,
                         hidden: false
                     };
                 }
-                const getFreeUserText = planKey === 'pro' ? texts.getPro : texts.getUltra;
                 return {
-                    text: getFreeUserText,
-                    onClick: () => onUpgrade(planKey, billingType),
+                    text: texts.upgrade,
+                    onClick: () => onAction(planTier, planBilling),
                     disabled: false,
                     hidden: false
                 };
-            case moneyPriceTypes.UserState.ProUser:
-                if (planKey === 'free')
+            }
+            case moneyPriceTypes.UserState.ProUser: {
+                // 不允许降级到 Free
+                if (planTier === 'F1') {
                     return { hidden: true };
-                if (planKey === 'pro') {
-                    return {
-                        text: texts.currentPlan,
-                        disabled: true,
-                        hidden: false
-                    };
                 }
-                return {
-                    text: texts.upgrade,
-                    onClick: () => onUpgrade('ultra', billingType),
-                    disabled: false,
-                    hidden: false
-                };
-            case moneyPriceTypes.UserState.UltraUser:
-                if (planKey !== 'ultra')
+                const currentBilling = subscriptionBilling === 'yearly' ? 'yearly' : 'monthly';
+                const currentRank = getPlanRank('P2', currentBilling);
+                if (planTier === 'P2') {
+                    const targetRank = getPlanRank('P2', planBilling);
+                    if (planBilling === currentBilling) {
+                        return {
+                            text: texts.currentPlan,
+                            disabled: true,
+                            hidden: false
+                        };
+                    }
+                    if (targetRank > currentRank) {
+                        return {
+                            text: texts.upgrade,
+                            onClick: () => onAction('P2', planBilling),
+                            disabled: false,
+                            hidden: false
+                        };
+                    }
                     return { hidden: true };
-                return {
-                    text: texts.currentPlan,
-                    disabled: true,
-                    hidden: false
-                };
+                }
+                if (planTier === 'U3') {
+                    const targetRank = getPlanRank('U3', planBilling);
+                    if (targetRank > currentRank) {
+                        return {
+                            text: texts.upgrade,
+                            onClick: () => onAction('U3', planBilling),
+                            disabled: false,
+                            hidden: false
+                        };
+                    }
+                    return { hidden: true };
+                }
+                return { hidden: true };
+            }
+            case moneyPriceTypes.UserState.UltraUser: {
+                const currentBilling = subscriptionBilling === 'yearly' ? 'yearly' : 'monthly';
+                const currentRank = getPlanRank('U3', currentBilling);
+                if (planTier === 'F1') {
+                    return { hidden: true };
+                }
+                if (planTier === 'P2') {
+                    const targetRank = getPlanRank('P2', planBilling);
+                    if (targetRank > currentRank) {
+                        return {
+                            text: texts.upgrade,
+                            onClick: () => onAction('P2', planBilling),
+                            disabled: false,
+                            hidden: false
+                        };
+                    }
+                    return { hidden: true };
+                }
+                if (planTier === 'U3') {
+                    const targetRank = getPlanRank('U3', planBilling);
+                    if (planBilling === currentBilling) {
+                        return {
+                            text: texts.currentPlan,
+                            disabled: true,
+                            hidden: false
+                        };
+                    }
+                    if (targetRank > currentRank) {
+                        return {
+                            text: texts.upgrade,
+                            onClick: () => onAction('U3', planBilling),
+                            disabled: false,
+                            hidden: false
+                        };
+                    }
+                }
+                return { hidden: true };
+            }
             default:
+                // 已登录但状态未知 → 视为 FreeUser
+                console.warn('Clerk is authed OK but user is anonymous!');
                 return { text: '', disabled: true, hidden: true };
         }
     };
+    // 主要的按钮配置函数
+    const getButtonConfig = () => {
+        if (billingType === 'onetime') {
+            return getOnetimeButtonConfig();
+        }
+        return getSubscriptionButtonConfig();
+    };
     const config = getButtonConfig();
     if (config.hidden)
         return null;
+    if (!enableSubscriptionUpgrade &&
+        billingType !== 'onetime' &&
+        config.text === texts.upgrade &&
+        typeof config.onClick === 'function') {
+        return null;
+    }
+    const isBusy = isLoading || isProcessing;
+    const isDisabled = config.disabled || isBusy;
+    const displayText = isBusy ? 'Processing...' : config.text;
+    const isDisabledByConfigOnly = config.disabled && !isBusy;
     const handleClick = (e) => tslib_es6.__awaiter(this, void 0, void 0, function* () {
-        if (config.disabled || isLoading || isProcessing) {
+        if (isDisabled) {
             e.preventDefault();
             return;
         }
@@ -94,11 +214,11 @@ function MoneyPriceButton({ planKey, userContext, billingType, onLogin, onUpgrad
             }
         }
     });
-    const isDisabled = config.disabled || isLoading || isProcessing;
-    const displayText = isLoading ? 'Processing...' : config.text;
-    return (jsxRuntime.jsx("button", { className: utils.cn('w-full py-2 mt-auto text-white text-base font-bold shadow-lg hover:shadow-xl transition-all duration-300 rounded-full', isDisabled
-            ? 'bg-gray-400 cursor-not-allowed'
-            : 'bg-gradient-to-r from-purple-400 to-pink-500 hover:from-purple-500 hover:to-pink-600 dark:from-purple-500 dark:to-pink-600 dark:hover:from-purple-600 dark:hover:to-pink-700'), disabled: isDisabled, onClick: handleClick, type: "button", "data-plan-button": planKey, children: displayText }));
+    const buttonClassName = utils.cn('w-full h-11 md:h-12 px-5 md:px-8 mt-4 md:mt-auto inline-flex items-center justify-center text-white text-sm md:text-base font-bold tracking-wide shadow-md hover:shadow-lg transition-all duration-300 rounded-full', isDisabledByConfigOnly
+        ? 'bg-gray-400 cursor-not-allowed'
+        : 'bg-linear-to-r from-purple-400 to-pink-500 dark:from-purple-500 dark:to-pink-600', !isDisabledByConfigOnly && !isBusy &&
+        'hover:from-purple-500 hover:to-pink-600 dark:hover:from-purple-600 dark:hover:to-pink-700', isBusy && !isDisabledByConfigOnly && 'opacity-70 cursor-not-allowed');
+    return (jsxRuntime.jsx("button", { className: buttonClassName, disabled: isDisabled, onClick: handleClick, type: "button", "data-plan-button": planKey, children: displayText }));
 }
 
 exports.MoneyPriceButton = MoneyPriceButton;

package/dist/main/money-price/money-price-button.mjs

@@ -1,78 +1,198 @@
 "use client";
-import { __awaiter } from '../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.2/node_modules/tslib/tslib.es6.mjs';
+import { __awaiter } from '../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.mjs';
 import { jsx } from 'react/jsx-runtime';
 import { cn } from '@windrun-huaiin/lib/utils';
 import { UserState } from './money-price-types.mjs';
 import { useState } from 'react';
 
-function capitalize(str) {
-    return str.charAt(0).toUpperCase() + str.slice(1);
-}
-function MoneyPriceButton({ planKey, userContext, billingType, onLogin, onUpgrade, texts, isProcessing = false }) {
+function MoneyPriceButton({ planKey, userContext, billingType, onAuth, onAction, texts, isProcessing = false, isInitLoading = false, enableSubscriptionUpgrade = true }) {
+    if (isInitLoading) {
+        return (jsx("div", { className: "w-full h-11 md:h-12 mt-4 md:mt-auto rounded-full bg-transparent", "aria-hidden": "true", "data-plan-button-placeholder": planKey }));
+    }
     const { isAuthenticated, subscriptionStatus } = userContext;
     const [isLoading, setIsLoading] = useState(false);
-    // 决定按钮显示和行为
-    const getButtonConfig = () => {
+    const subscriptionBilling = userContext.subscriptionType;
+    const planTier = planKey;
+    const planBilling = billingType;
+    const getPlanRank = (tier, billing) => {
+        if (tier === 'F1')
+            return 0;
+        if (tier === 'P2')
+            return billing === 'monthly' ? 1 : 3;
+        if (tier === 'U3')
+            return billing === 'monthly' ? 2 : 4;
+        return 0;
+    };
+    // OneTime 模式的按钮配置
+    const getOnetimeButtonConfig = () => {
+        // 匿名用户：所有卡片都显示登录按钮
+        if (!isAuthenticated) {
+            return {
+                text: texts.getStarted,
+                onClick: onAuth,
+                disabled: false,
+                hidden: false
+            };
+        }
+        if (subscriptionStatus === UserState.Anonymous) {
+            // 已登录但状态未知 → 视为 FreeUser
+            console.warn('Clerk is authed OK but user is anonymous!');
+            return { text: '', disabled: true, hidden: true };
+        }
+        // 登录用户：OneTime 模式下所有卡片都显示购买积分按钮
+        return {
+            text: texts.buyCredits || texts.upgrade,
+            onClick: () => onAction(planKey, billingType),
+            disabled: false,
+            hidden: false
+        };
+    };
+    // 订阅模式的按钮配置
+    const getSubscriptionButtonConfig = () => {
         // 匿名用户
         if (!isAuthenticated) {
-            const textKey = planKey === 'free' ? 'getStarted' : `get${capitalize(planKey)}`;
+            const getButtonText = () => {
+                switch (planKey) {
+                    case 'F1':
+                        return texts.getStarted;
+                    case 'P2':
+                        return texts.getPro;
+                    case 'U3':
+                        return texts.getUltra;
+                    default:
+                        return texts.getStarted;
+                }
+            };
             return {
-                text: texts[textKey] || texts.getStarted,
-                onClick: onLogin,
+                text: getButtonText(),
+                onClick: onAuth,
                 disabled: false,
                 hidden: false
             };
         }
         // 已登录用户
         switch (subscriptionStatus) {
-            case UserState.FreeUser:
-                if (planKey === 'free') {
+            case UserState.FreeUser: {
+                if (planTier === 'F1') {
                     return {
                         text: texts.currentPlan,
                         disabled: true,
                         hidden: false
                     };
                 }
-                const getFreeUserText = planKey === 'pro' ? texts.getPro : texts.getUltra;
                 return {
-                    text: getFreeUserText,
-                    onClick: () => onUpgrade(planKey, billingType),
+                    text: texts.upgrade,
+                    onClick: () => onAction(planTier, planBilling),
                     disabled: false,
                     hidden: false
                 };
-            case UserState.ProUser:
-                if (planKey === 'free')
+            }
+            case UserState.ProUser: {
+                // 不允许降级到 Free
+                if (planTier === 'F1') {
                     return { hidden: true };
-                if (planKey === 'pro') {
-                    return {
-                        text: texts.currentPlan,
-                        disabled: true,
-                        hidden: false
-                    };
                 }
-                return {
-                    text: texts.upgrade,
-                    onClick: () => onUpgrade('ultra', billingType),
-                    disabled: false,
-                    hidden: false
-                };
-            case UserState.UltraUser:
-                if (planKey !== 'ultra')
+                const currentBilling = subscriptionBilling === 'yearly' ? 'yearly' : 'monthly';
+                const currentRank = getPlanRank('P2', currentBilling);
+                if (planTier === 'P2') {
+                    const targetRank = getPlanRank('P2', planBilling);
+                    if (planBilling === currentBilling) {
+                        return {
+                            text: texts.currentPlan,
+                            disabled: true,
+                            hidden: false
+                        };
+                    }
+                    if (targetRank > currentRank) {
+                        return {
+                            text: texts.upgrade,
+                            onClick: () => onAction('P2', planBilling),
+                            disabled: false,
+                            hidden: false
+                        };
+                    }
                     return { hidden: true };
-                return {
-                    text: texts.currentPlan,
-                    disabled: true,
-                    hidden: false
-                };
+                }
+                if (planTier === 'U3') {
+                    const targetRank = getPlanRank('U3', planBilling);
+                    if (targetRank > currentRank) {
+                        return {
+                            text: texts.upgrade,
+                            onClick: () => onAction('U3', planBilling),
+                            disabled: false,
+                            hidden: false
+                        };
+                    }
+                    return { hidden: true };
+                }
+                return { hidden: true };
+            }
+            case UserState.UltraUser: {
+                const currentBilling = subscriptionBilling === 'yearly' ? 'yearly' : 'monthly';
+                const currentRank = getPlanRank('U3', currentBilling);
+                if (planTier === 'F1') {
+                    return { hidden: true };
+                }
+                if (planTier === 'P2') {
+                    const targetRank = getPlanRank('P2', planBilling);
+                    if (targetRank > currentRank) {
+                        return {
+                            text: texts.upgrade,
+                            onClick: () => onAction('P2', planBilling),
+                            disabled: false,
+                            hidden: false
+                        };
+                    }
+                    return { hidden: true };
+                }
+                if (planTier === 'U3') {
+                    const targetRank = getPlanRank('U3', planBilling);
+                    if (planBilling === currentBilling) {
+                        return {
+                            text: texts.currentPlan,
+                            disabled: true,
+                            hidden: false
+                        };
+                    }
+                    if (targetRank > currentRank) {
+                        return {
+                            text: texts.upgrade,
+                            onClick: () => onAction('U3', planBilling),
+                            disabled: false,
+                            hidden: false
+                        };
+                    }
+                }
+                return { hidden: true };
+            }
             default:
+                // 已登录但状态未知 → 视为 FreeUser
+                console.warn('Clerk is authed OK but user is anonymous!');
                 return { text: '', disabled: true, hidden: true };
         }
     };
+    // 主要的按钮配置函数
+    const getButtonConfig = () => {
+        if (billingType === 'onetime') {
+            return getOnetimeButtonConfig();
+        }
+        return getSubscriptionButtonConfig();
+    };
     const config = getButtonConfig();
     if (config.hidden)
         return null;
+    if (!enableSubscriptionUpgrade &&
+        billingType !== 'onetime' &&
+        config.text === texts.upgrade &&
+        typeof config.onClick === 'function') {
+        return null;
+    }
+    const isBusy = isLoading || isProcessing;
+    const isDisabled = config.disabled || isBusy;
+    const displayText = isBusy ? 'Processing...' : config.text;
+    const isDisabledByConfigOnly = config.disabled && !isBusy;
     const handleClick = (e) => __awaiter(this, void 0, void 0, function* () {
-        if (config.disabled || isLoading || isProcessing) {
+        if (isDisabled) {
             e.preventDefault();
             return;
         }
@@ -92,11 +212,11 @@ function MoneyPriceButton({ planKey, userContext, billingType, onLogin, onUpgrad
             }
         }
     });
-    const isDisabled = config.disabled || isLoading || isProcessing;
-    const displayText = isLoading ? 'Processing...' : config.text;
-    return (jsx("button", { className: cn('w-full py-2 mt-auto text-white text-base font-bold shadow-lg hover:shadow-xl transition-all duration-300 rounded-full', isDisabled
-            ? 'bg-gray-400 cursor-not-allowed'
-            : 'bg-gradient-to-r from-purple-400 to-pink-500 hover:from-purple-500 hover:to-pink-600 dark:from-purple-500 dark:to-pink-600 dark:hover:from-purple-600 dark:hover:to-pink-700'), disabled: isDisabled, onClick: handleClick, type: "button", "data-plan-button": planKey, children: displayText }));
+    const buttonClassName = cn('w-full h-11 md:h-12 px-5 md:px-8 mt-4 md:mt-auto inline-flex items-center justify-center text-white text-sm md:text-base font-bold tracking-wide shadow-md hover:shadow-lg transition-all duration-300 rounded-full', isDisabledByConfigOnly
+        ? 'bg-gray-400 cursor-not-allowed'
+        : 'bg-linear-to-r from-purple-400 to-pink-500 dark:from-purple-500 dark:to-pink-600', !isDisabledByConfigOnly && !isBusy &&
+        'hover:from-purple-500 hover:to-pink-600 dark:hover:from-purple-600 dark:hover:to-pink-700', isBusy && !isDisabledByConfigOnly && 'opacity-70 cursor-not-allowed');
+    return (jsx("button", { className: buttonClassName, disabled: isDisabled, onClick: handleClick, type: "button", "data-plan-button": planKey, children: displayText }));
 }
 
 export { MoneyPriceButton };

package/dist/main/money-price/money-price-config-util.d.ts

@@ -3,5 +3,53 @@
  * 价格组件配置文件
  */
 import type { MoneyPriceConfig, PaymentProviderConfig, EnhancePricePlan } from './money-price-types';
-export declare function getActiveProviderConfig(config: MoneyPriceConfig): PaymentProviderConfig;
-export declare function getProductPricing(productKey: 'free' | 'pro' | 'ultra', billingType: 'monthly' | 'yearly', provider: string, config: MoneyPriceConfig): EnhancePricePlan;
+/**
+ * 获取当前激活的支付供应商配置
+ *
+ * 🔒 安全设计：
+ * - util层负责从config中提取激活的provider配置
+ * - 只返回提取的结果，不暴露任何config结构
+ * - 调用方（应用层）通过wrapper隐藏config对象
+ *
+ * @param config - MoneyPriceConfig对象（由应用层提供）
+ * @returns 当前激活的支付供应商配置
+ */
+export declare function getActiveProviderConfigUtil(config: MoneyPriceConfig): PaymentProviderConfig;
+export declare function getProductPricing(productKey: 'F1' | 'P2' | 'U3', billingType: string, provider: string, config: MoneyPriceConfig): EnhancePricePlan;
+/**
+ * 根据 priceId 获取对应的积分数量
+ *
+ * 🔒 安全设计：
+ * - util层负责解析config，提取所需数据
+ * - 只返回查询结果，不暴露任何config结构
+ * - 调用方（应用层）通过wrapper隐藏config对象
+ *
+ * @param priceId - 查询的价格ID
+ * @param config - MoneyPriceConfig对象（由应用层提供）
+ * @returns 对应的积分数量，或null
+ */
+export declare function getCreditsFromPriceIdUtil(priceId: string | undefined, config: MoneyPriceConfig): number | null;
+/**
+ * 根据查询参数获取价格配置
+ *
+ * 支持三种查询方式：
+ * 1. 按 priceId 直接查询
+ * 2. 按 plan + billingType 查询
+ * 3. 按 plan 查询
+ *
+ * 🔒 安全设计：
+ * - util层负责解析config，提取和匹配数据
+ * - 只返回查询结果，不暴露任何config结构
+ * - 调用方（应用层）通过wrapper隐藏config对象
+ *
+ * @param priceId - 查询的价格ID（可选）
+ * @param plan - 查询的套餐名称如'P2'、'U3'（可选）
+ * @param billingType - 查询的计费类型如'monthly'、'yearly'（可选）
+ * @param config - MoneyPriceConfig对象（由应用层提供）
+ * @returns 匹配的价格配置，包含计算好的元数据（priceName、description、interval）
+ */
+export declare function getPriceConfigUtil(priceId: string | undefined, plan: string | undefined, billingType: string | undefined, config: MoneyPriceConfig): (EnhancePricePlan & {
+    priceName: string;
+    description: string;
+    interval?: string;
+}) | null;