@pisell/pisellos 2.1.100 → 2.1.101

package/lib/solution/RegisterAndLogin/utils.js

@@ -56,22 +56,22 @@ function validatePhone(phone) {
 function validatePassword(password) {
   const errors = [];
   if (password.length < 8) {
-    errors.push("\u5BC6\u7801\u957F\u5EA6\u81F3\u5C11\u4E3A8\u4F4D");
+    errors.push("密码长度至少为8位");
   }
   if (password.length > 128) {
-    errors.push("\u5BC6\u7801\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7128\u4F4D");
+    errors.push("密码长度不能超过128位");
   }
   if (!/[a-z]/.test(password)) {
-    errors.push("\u5BC6\u7801\u5FC5\u987B\u5305\u542B\u81F3\u5C11\u4E00\u4E2A\u5C0F\u5199\u5B57\u6BCD");
+    errors.push("密码必须包含至少一个小写字母");
   }
   if (!/[A-Z]/.test(password)) {
-    errors.push("\u5BC6\u7801\u5FC5\u987B\u5305\u542B\u81F3\u5C11\u4E00\u4E2A\u5927\u5199\u5B57\u6BCD");
+    errors.push("密码必须包含至少一个大写字母");
   }
   if (!/\d/.test(password)) {
-    errors.push("\u5BC6\u7801\u5FC5\u987B\u5305\u542B\u81F3\u5C11\u4E00\u4E2A\u6570\u5B57");
+    errors.push("密码必须包含至少一个数字");
   }
   if (!/[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(password)) {
-    errors.push("\u5BC6\u7801\u5FC5\u987B\u5305\u542B\u81F3\u5C11\u4E00\u4E2A\u7279\u6B8A\u5B57\u7B26");
+    errors.push("密码必须包含至少一个特殊字符");
   }
   return {
     isValid: errors.length === 0,
@@ -124,7 +124,7 @@ function getOAuthProviderDisplayName(provider) {
     [import_types.OAuthProvider.FACEBOOK]: "Facebook",
     [import_types.OAuthProvider.APPLE]: "Apple",
     [import_types.OAuthProvider.GOOGLE]: "Google",
-    [import_types.OAuthProvider.WECHAT]: "\u5FAE\u4FE1",
+    [import_types.OAuthProvider.WECHAT]: "微信",
     [import_types.OAuthProvider.GITHUB]: "GitHub"
   };
   return displayNames[provider] || provider;
@@ -224,7 +224,7 @@ function safeJsonParse(jsonString, defaultValue) {
   try {
     return JSON.parse(jsonString);
   } catch (error) {
-    console.warn("JSON \u89E3\u6790\u5931\u8D25:", error);
+    console.warn("JSON 解析失败:", error);
     return defaultValue;
   }
 }
@@ -232,7 +232,7 @@ function safeJsonStringify(obj, defaultValue = "{}") {
   try {
     return JSON.stringify(obj);
   } catch (error) {
-    console.warn("JSON \u5B57\u7B26\u4E32\u5316\u5931\u8D25:", error);
+    console.warn("JSON 字符串化失败:", error);
     return defaultValue;
   }
 }

package/lib/solution/ShopDiscount/index.js

@@ -41,16 +41,12 @@ var import_types = require("../../modules/Rules/types");
 var import_decimal = __toESM(require("decimal.js"));
 var import_lodash_es = require("lodash-es");
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
-  defaultName = "shopDiscount";
-  defaultVersion = "1.0.0";
-  isSolution = true;
-  request;
-  window;
-  store;
-  options = {};
-  hooks;
   constructor(name, version) {
     super(name, version);
+    this.defaultName = "shopDiscount";
+    this.defaultVersion = "1.0.0";
+    this.isSolution = true;
+    this.options = {};
     this.store = {
       customer: null,
       productList: [],
@@ -70,7 +66,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     this.options = options;
     this.store = { ...this.store, ...options.store || {} };
     this.hooks = (_b = (_a = options.otherParams) == null ? void 0 : _a.rules) == null ? void 0 : _b.hooks;
-    console.log("[ShopDiscount] \u521D\u59CB\u5316\u5B8C\u6210");
+    console.log("[ShopDiscount] 初始化完成");
     this.initializePlugins();
     this.registerDependentModules();
     this.registerEventListeners();
@@ -83,7 +79,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     (_b = this.store.rules) == null ? void 0 : _b.destroy();
     this.core.effects.offByModuleDestroy(this.name);
     await this.core.effects.emit(`${this.name}:onDestroy`, {});
-    console.log("[ShopDiscount] \u5DF2\u9500\u6BC1");
+    console.log("[ShopDiscount] 已销毁");
   }
   async clear() {
     var _a, _b;
@@ -98,10 +94,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     this.request = this.core.getPlugin("request");
     this.window = this.core.getPlugin("window");
     if (!this.request) {
-      throw new Error("ShopDiscount\u9700\u8981 request \u63D2\u4EF6\u652F\u6301");
+      throw new Error("ShopDiscount需要 request 插件支持");
     }
     if (!this.window) {
-      throw new Error("ShopDiscount\u9700\u8981 window \u63D2\u4EF6\u652F\u6301");
+      throw new Error("ShopDiscount需要 window 插件支持");
     }
   }
   registerDependentModules() {
@@ -349,7 +345,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         unavailableReason
       };
     } catch (error) {
-      console.error("[ShopDiscount] \u626B\u7801\u51FA\u9519:", error);
+      console.error("[ShopDiscount] 扫码出错:", error);
       return {
         type: "clientCalc",
         isAvailable: false,
@@ -433,7 +429,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     const isProductFree = (id) => {
       var _a2;
       const targetProduct = productList.find((n) => n.id === id);
-      if (!targetProduct) return false;
+      if (!targetProduct)
+        return false;
       const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(targetProduct);
       return Number(product == null ? void 0 : product.total) <= 0 && (Number(product == null ? void 0 : product.origin_total) <= 0 || !(product == null ? void 0 : product.origin_total)) || (0, import_lodash_es.isBoolean)(product == null ? void 0 : product.vouchersApplicable) && !(product == null ? void 0 : product.vouchersApplicable);
     };
@@ -482,7 +479,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         );
       }
     } catch (error) {
-      console.error("[ShopDiscount] \u83B7\u53D6\u5BA2\u6237\u94B1\u5305\u4FE1\u606F\u51FA\u9519:", error);
+      console.error("[ShopDiscount] 获取客户钱包信息出错:", error);
     }
   }
   async bestDiscount(cb) {
@@ -538,7 +535,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         filteredDiscountList
       );
     } catch (error) {
-      console.error("[ShopDiscount] \u52A0\u8F7D\u51C6\u5907\u914D\u7F6E\u51FA\u9519:", error);
+      console.error("[ShopDiscount] 加载准备配置出错:", error);
     }
   }
 };

package/lib/solution/ShopDiscount/types.d.ts

@@ -11,7 +11,7 @@ export declare enum ShopDiscountHooks {
     onRulesListChange = "shopDiscount:onRulesListChange",
     onLoadPrepareCalcResult = "shopDiscount:onLoadPrepareCalcResult"
 }
-export declare type Customer = {
+export type Customer = {
     id: string | number;
     name: string;
     email: string;

package/lib/solution/ShopDiscount/utils.d.ts

@@ -12,13 +12,13 @@ export declare const isAllNormalProduct: (items: any[]) => boolean;
  * @returns
  */
 export declare const getDiscountAmount: (discount: Discount, total: number, price: number) => number;
-export declare const getDiscountListAmountTotal: (discount: Discount[]) => Discount;
+export declare const getDiscountListAmountTotal: (discount: Discount[]) => any;
 /**
  * 获取折扣金额 计算每个折扣的金额
  * @param discount
  * @returns
  */
-export declare const getDiscountListAmount: (discount: Discount[]) => Discount;
+export declare const getDiscountListAmount: (discount: Discount[]) => any;
 export interface ScheduleItem {
     id: number;
     name: string | {

package/lib/solution/ShopDiscount/utils.js

@@ -351,7 +351,8 @@ var calculateOrderLevelDiscountAllocation = (discount, applicableProducts) => {
     if (singleQuantityProducts.length > 0) {
       const productsWithEnoughSpace = singleQuantityProducts.filter((product) => {
         const allocation = result.get(product.productId);
-        if (!allocation) return false;
+        if (!allocation)
+          return false;
         const remainingSpace = new import_decimal.default(product.amount).minus(allocation.discountAmount).toNumber();
         return remainingSpace >= totalDifference;
       });

package/lib/types/index.d.ts

@@ -27,7 +27,7 @@ export interface ModuleOptions {
     initialState?: Record<string, any>;
     otherParams?: Record<string, any>;
 }
-export declare type EventHandler = (data?: any) => void;
+export type EventHandler = (data?: any) => void;
 export interface PisellCore {
     registerPlugin: (plugin: Plugin, options?: PluginOptions) => void;
     getPlugin: <T extends Plugin>(name: string) => T | null;

package/lib/utils/task.d.ts

@@ -1,5 +1,5 @@
-declare type Action = (...args: any[]) => Promise<any>;
-declare type Task = {
+type Action = (...args: any[]) => Promise<any>;
+type Task = {
     uuid: string;
     type: string;
     actionParams?: Record<string, any>;

package/lib/utils/task.js

@@ -23,10 +23,10 @@ __export(task_exports, {
 });
 module.exports = __toCommonJS(task_exports);
 var Tasks = class {
-  actions = /* @__PURE__ */ new Map();
-  taskQueue = [];
-  isRunning = false;
   constructor(actions) {
+    this.actions = /* @__PURE__ */ new Map();
+    this.taskQueue = [];
+    this.isRunning = false;
     if (actions) {
       this.actions = actions;
     }

package/lib/utils/watch.d.ts

@@ -2,8 +2,8 @@
  * 监听模块
  *
  */
-export declare type WatchEventCallback = (...args: any[]) => void;
-export declare type WatchEventItem = {
+export type WatchEventCallback = (...args: any[]) => void;
+export type WatchEventItem = {
     key: string;
     callback: WatchEventCallback;
 };

package/lib/utils/watch.js

@@ -23,10 +23,12 @@ __export(watch_exports, {
 });
 module.exports = __toCommonJS(watch_exports);
 var Watch = class {
-  // 监听列表
-  events = /* @__PURE__ */ new Map();
-  // 启用列表 - 使用数组保持顺序
-  enableListMap = /* @__PURE__ */ new Map();
+  constructor() {
+    // 监听列表
+    this.events = /* @__PURE__ */ new Map();
+    // 启用列表 - 使用数组保持顺序
+    this.enableListMap = /* @__PURE__ */ new Map();
+  }
   /**
    * 订阅事件
    * @param event 事件名称
@@ -130,7 +132,7 @@ var Watch = class {
       try {
         (_a = callbacks.get(lastCallbackKey)) == null ? void 0 : _a(...args);
       } catch (error) {
-        console.error(`\u6267\u884C\u4E8B\u4EF6"${watchKey}"\u7684\u56DE\u8C03\u65F6\u51FA\u9519:`, error);
+        console.error(`执行事件"${watchKey}"的回调时出错:`, error);
       }
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.1.100",
+  "version": "2.1.101",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,6 +9,22 @@
     "dist",
     "lib"
   ],
+  "scripts": {
+    "build": "father build",
+    "dev": "father dev --watch",
+    "push": "yalc push --replace",
+    "test": "vitest",
+    "lint": "eslint src --ext .ts",
+    "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md}\"",
+    "changeset": "changeset",
+    "version": "changeset version",
+    "release": "changeset publish --registry=https://registry.npmjs.com/ && npm run sync && git push",
+    "example": "npx parcel-bundler examples/index.html",
+    "docs": "typedoc --out docs src/index.ts",
+    "sync": "node sync.js",
+    "prepublishOnly": "npm run build",
+    "deploy": "npm run build && npm run changeset && npm run version && npm run release"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/username/pisell-os.git"
@@ -52,20 +68,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "build": "father build",
-    "dev": "father dev --watch",
-    "push": "yalc push --replace",
-    "test": "vitest",
-    "lint": "eslint src --ext .ts",
-    "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md}\"",
-    "changeset": "changeset",
-    "version": "changeset version",
-    "release": "changeset publish --registry=https://registry.npmjs.com/ && npm run sync && git push",
-    "example": "npx parcel-bundler examples/index.html",
-    "docs": "typedoc --out docs src/index.ts",
-    "sync": "node sync.js",
-    "deploy": "npm run build && npm run changeset && npm run version && npm run release"
   }
 }