@intercartx/booster-core 0.0.1-beta.27 → 0.0.1-beta.29

package/dist/api/order/index.d.ts

@@ -5,3 +5,4 @@ export * from './cc';
 export * from './pp';
 export * from './ach';
 export * from './types';
+export * from './quick';

package/dist/api/order/index.js

@@ -5,3 +5,4 @@ export * from './cc';
 export * from './pp';
 export * from './ach';
 export * from './types';
+export * from './quick';

package/dist/api/order/quick.d.ts

@@ -0,0 +1,12 @@
+import { OrderProduct } from "../types";
+export interface QuickOrderRequest {
+    products: OrderProduct;
+    confirmUrl: string;
+}
+export interface QuickOrderResponse {
+    sourceToken: string;
+    newToken: string;
+    newOrderId: string;
+    newTradeId: string;
+}
+export declare function apiCreateQuickOrder(token: string, body: QuickOrderRequest): Promise<QuickOrderResponse>;

package/dist/api/order/quick.js

@@ -0,0 +1,4 @@
+import { post } from "../helper";
+export async function apiCreateQuickOrder(token, body) {
+    return post(`/order/quick/submission/${token}`, body);
+}

package/dist/api/types.d.ts

@@ -25,6 +25,7 @@ interface BaseOrderProduct {
         originPrice: number | string;
         discount: number;
         productId?: string;
+        [key: string]: any;
     }[];
 }
 interface OneTimeOrderProduct extends BaseOrderProduct {

package/dist/models/business/CustomInfo.js

@@ -49,7 +49,7 @@ export class CustomInfoModel extends BusinessModel {
             inputMode: 'numeric',
             maxLength: 16,
             ...props.phone,
-            validateFn: validatePhone,
+            validateFn: (e, m) => validatePhone(`${this.phone.prefix}${e}`, m),
             validateMessages: validateMessages.phone,
             region: 'US'
         });

package/dist/models/business/address/Address.js

@@ -23,6 +23,8 @@ export class AddressModel extends BusinessModel {
                 province: addressData.province,
                 zip: addressData.zip,
             });
+            // 关闭multiRegions的验证
+            this.multiRegions.clearErrorValues();
         };
         this.address1 = new AddressSuggestModel({
             label: 'Address',

package/dist/models/business/address/MultiRegions.d.ts

@@ -50,6 +50,7 @@ export declare class MultiRegionsModel extends BusinessModel<MultiRegionsData> i
     getFieldModel(fieldName: string): InputModel<import("../../types").FieldProps> | SelectModel<import("../../types").FieldProps> | undefined;
     getValue(): MultiRegionsData;
     setValue(value: MultiRegionsData): void;
+    clearErrorValues(): void;
     validate(): boolean;
     clearAllFields(): void;
 }

package/dist/models/business/address/MultiRegions.js

@@ -70,6 +70,11 @@ export class MultiRegionsModel extends BusinessModel {
         this.province.setValue(value.province);
         this.zip.setValue(value.zip);
     }
+    clearErrorValues() {
+        this.city.setError('');
+        this.province.setError('');
+        this.zip.setError('');
+    }
     validate() {
         return [
             this.city.validate(),

package/dist/validate/phone.js

@@ -1,12 +1,21 @@
-import { z } from 'zod';
+import { parsePhoneNumber } from 'libphonenumber-js';
 export function validatePhone(phone, validateMessages) {
     var _a, _b;
+    console.log('phone', phone);
     if (!phone) {
         return (_a = validateMessages === null || validateMessages === void 0 ? void 0 : validateMessages.required) !== null && _a !== void 0 ? _a : 'Required!';
     }
-    const result = z.string().regex(/^1[3-9]\d{9}$/, { message: 'Invalid phone number' }).safeParse(phone);
-    if (!result.success) {
-        return (_b = validateMessages === null || validateMessages === void 0 ? void 0 : validateMessages.invalid) !== null && _b !== void 0 ? _b : result.error.issues[0].message;
+    try {
+        // parsePhoneNumber 可以解析 E.164 格式（以 + 开头）的号码
+        // PhoneModel 会将号码格式化为 E.164 格式，所以这里可以直接验证
+        const phoneNumber = parsePhoneNumber(phone);
+        console.log('phoneNumber', phoneNumber);
+        if (phoneNumber && phoneNumber.isValid()) {
+            return '';
+        }
     }
-    return '';
+    catch (error) {
+        // parsePhoneNumber 会抛出错误如果号码无效或格式不正确
+    }
+    return (_b = validateMessages === null || validateMessages === void 0 ? void 0 : validateMessages.invalid) !== null && _b !== void 0 ? _b : 'Invalid phone number';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intercartx/booster-core",
-  "version": "0.0.1-beta.27",
+  "version": "0.0.1-beta.29",
   "description": "核心功能库，提供结账系统的业务逻辑、数据模型、验证工具、API 接口和样式文件",
   "type": "module",
   "main": "dist/index.js",