@pisell/pisellos 2.1.4 → 2.1.6

package/lib/solution/ShopDiscount/index.js

@@ -38,6 +38,7 @@ var import_types = require("./types");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
 var import_decimal = __toESM(require("decimal.js"));
+var import_lodash_es = require("lodash-es");
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -49,7 +50,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       customer: null,
       productList: [],
       discount: null,
-      rules: null
+      rules: null,
+      originalDiscountList: []
     };
   }
   // =========== 生命周期方法 ===========
@@ -172,27 +174,34 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     };
   }
   // 设置优惠券使用状态
-  setDiscountSelected({
-    discountId,
-    isSelected
-  }) {
+  setDiscountSelected(params) {
     const discountList = this.getDiscountList();
+    const selectionOperations = [];
+    selectionOperations.push({
+      discountId: params.discountId,
+      isSelected: params.isSelected
+    });
+    if (params.selectedList && params.selectedList.length > 0) {
+      selectionOperations.push(...params.selectedList);
+    }
+    const selectionMap = /* @__PURE__ */ new Map();
+    selectionOperations.forEach((operation) => {
+      selectionMap.set(operation.discountId, operation.isSelected);
+    });
     const newDiscountList = discountList.map((discount) => {
-      if (discount.id === discountId) {
+      if (selectionMap.has(discount.id)) {
+        const targetIsSelected = selectionMap.get(discount.id);
         return {
           ...discount,
-          isSelected,
+          isSelected: targetIsSelected,
           // 手动设置不使用
-          isManualSelect: !isSelected
+          isManualSelect: !targetIsSelected
         };
       }
       return { ...discount, isManualSelect: !(discount == null ? void 0 : discount.isSelected) };
     });
     this.setDiscountList(newDiscountList);
-    return this.calcDiscount(this.store.productList || [], {
-      discountId,
-      isSelected
-    });
+    return this.calcDiscount(this.store.productList || [], params);
   }
   setProductList(productList) {
     this.store.productList = productList;
@@ -240,6 +249,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       };
       if (isAvailable) {
         this.setDiscountList(newDiscountList || []);
+        this.store.originalDiscountList = newDiscountList || [];
         this.setProductList(newProductList || []);
         if (this.isWalkIn() && resultDiscountList.length && ((_b = this.options.otherParams) == null ? void 0 : _b.platform) === "shop") {
           await this.getCustomerWallet(
@@ -337,7 +347,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       var _a2;
       const targetProduct = productList.find((n) => n.id === id);
       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));
+      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);
     };
     const allUsedProductIds = newDiscountList.map((n) => {
       var _a2;
@@ -387,6 +397,23 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       console.error("[ShopDiscount] 获取客户钱包信息出错:", error);
     }
   }
+  async bestDiscount(cb) {
+    var _a;
+    const newDiscountList = this.store.originalDiscountList;
+    this.setDiscountList(newDiscountList);
+    if ((_a = this.store.productList) == null ? void 0 : _a.length) {
+      const result = this.calcDiscount(this.store.productList);
+      cb == null ? void 0 : cb(result);
+      await this.core.effects.emit(
+        import_types.ShopDiscountHooks.onLoadPrepareCalcResult,
+        result
+      );
+    }
+    await this.core.effects.emit(
+      import_types.ShopDiscountHooks.onLoadDiscountList,
+      newDiscountList
+    );
+  }
   // 加载准备配置
   async loadPrepareConfig(params) {
     var _a, _b, _c, _d;
@@ -404,6 +431,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const scanDiscountIds = scanDiscount.map((n) => n.id);
       const newGoodPassList = goodPassList == null ? void 0 : goodPassList.filter((n) => !scanDiscountIds.includes(n.id));
       const newDiscountList = [...scanDiscount, ...newGoodPassList || []];
+      this.store.originalDiscountList = newDiscountList;
       this.setDiscountList(newDiscountList || []);
       if ((_d = this.store.productList) == null ? void 0 : _d.length) {
         const result = this.calcDiscount(this.store.productList);

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

@@ -1,4 +1,4 @@
-import { DiscountModule } from '../../modules/Discount';
+import { DiscountModule, Discount } from '../../modules/Discount';
 import { RulesModule } from '../../modules/Rules';
 export declare enum ShopDiscountHooks {
     onInited = "shopDiscount:onInited",
@@ -22,4 +22,13 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
+    originalDiscountList: Discount[];
+}
+export interface SetDiscountSelectedParams {
+    discountId: number;
+    isSelected: boolean;
+    selectedList?: {
+        discountId: number;
+        isSelected: boolean;
+    }[];
 }

package/lib/solution/index.d.ts

@@ -1,3 +1,5 @@
 export * from './BuyTickets';
 export * from './BookingByStep';
+export * from './BookingTicket';
 export * from './ShopDiscount';
+export * from './Checkout';

package/lib/solution/index.js

@@ -18,10 +18,14 @@ var solution_exports = {};
 module.exports = __toCommonJS(solution_exports);
 __reExport(solution_exports, require("./BuyTickets"), module.exports);
 __reExport(solution_exports, require("./BookingByStep"), module.exports);
+__reExport(solution_exports, require("./BookingTicket"), module.exports);
 __reExport(solution_exports, require("./ShopDiscount"), module.exports);
+__reExport(solution_exports, require("./Checkout"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./BuyTickets"),
   ...require("./BookingByStep"),
-  ...require("./ShopDiscount")
+  ...require("./BookingTicket"),
+  ...require("./ShopDiscount"),
+  ...require("./Checkout")
 });

package/lib/types/index.d.ts

@@ -38,7 +38,9 @@ export interface PisellCore {
     getModuleExports: <T = any>(name: string) => T | null;
     hasModule: (name: string) => boolean;
     effects: {
-        on: (event: string, callback: (payload: any) => void) => void;
+        on: (event: string, callback: (payload: any) => void) => () => void;
+        once: (event: string, callback: (payload: any) => void) => () => void;
+        off: (event: string, callback: (payload: any) => void) => void;
         emit: (event: string, payload: any, value?: any) => Promise<{
             status: boolean;
             data: any;

package/lib/utils/task.d.ts

@@ -0,0 +1,40 @@
+type Action = (...args: any[]) => Promise<any>;
+type Task = {
+    uuid: string;
+    type: string;
+    actionParams?: Record<string, any>;
+};
+declare class Tasks {
+    private actions;
+    private taskQueue;
+    isRunning: boolean;
+    constructor(actions?: Map<string, Action>);
+    /**
+     * 清空所有任务
+     */
+    clear(): void;
+    /**
+     * 清空任务执行队列
+     */
+    clearTaskQueue(): void;
+    /**
+     * 添加action
+     * @param name action名称
+     * @param action action函数
+     */
+    addAction(name: string, action: Action): void;
+    /**
+     * 添加任务
+     * @param task 任务
+     */
+    addTask(task: Task): void;
+    /**
+     * 执行任务
+     */
+    run(): Promise<void>;
+    /**
+     * 判定当前的任务是否依然存在
+     */
+    isTaskExist(uuid: string): boolean;
+}
+export default Tasks;

package/lib/utils/task.js

@@ -0,0 +1,109 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/task.ts
+var task_exports = {};
+__export(task_exports, {
+  default: () => task_default
+});
+module.exports = __toCommonJS(task_exports);
+var Tasks = class {
+  constructor(actions) {
+    this.actions = /* @__PURE__ */ new Map();
+    this.taskQueue = [];
+    this.isRunning = false;
+    if (actions) {
+      this.actions = actions;
+    }
+  }
+  /**
+   * 清空所有任务
+   */
+  clear() {
+    this.actions.clear();
+    this.taskQueue = [];
+    this.isRunning = false;
+  }
+  /**
+   * 清空任务执行队列
+   */
+  clearTaskQueue() {
+    this.taskQueue = [];
+    this.isRunning = false;
+  }
+  /**
+   * 添加action
+   * @param name action名称
+   * @param action action函数
+   */
+  addAction(name, action) {
+    this.actions.set(name, action);
+  }
+  /**
+   * 添加任务
+   * @param task 任务
+   */
+  addTask(task) {
+    this.taskQueue.push(task);
+    this.run();
+  }
+  /**
+   * 执行任务
+   */
+  async run() {
+    var _a;
+    if (this.isRunning) {
+      return;
+    }
+    if (this.taskQueue.length === 0) {
+      this.isRunning = false;
+      return;
+    }
+    this.isRunning = true;
+    while (this.taskQueue.length > 0) {
+      const task = (_a = this.taskQueue) == null ? void 0 : _a[0];
+      if (!task) {
+        this.isRunning = false;
+        return;
+      }
+      const action = this.actions.get(task.type);
+      if (action) {
+        try {
+          await action({ ...(task == null ? void 0 : task.actionParams) || {}, uuid: task == null ? void 0 : task.uuid });
+          console.log("task_success>>>>>>>", task);
+        } catch (error) {
+          console.error("task_error>>>>>>>", error);
+        } finally {
+          const _task = this.taskQueue.shift();
+          console.log("task_shift>>>>>>>", _task);
+        }
+      } else {
+        const _task = this.taskQueue.shift();
+        console.log("task_action_not_found>>>>>>>", _task);
+      }
+    }
+    this.isRunning = false;
+  }
+  /**
+   * 判定当前的任务是否依然存在
+   */
+  isTaskExist(uuid) {
+    return this.taskQueue.some((task) => (task == null ? void 0 : task.uuid) === uuid);
+  }
+};
+var task_default = Tasks;

package/lib/utils/watch.d.ts

@@ -0,0 +1,102 @@
+/**
+ * 监听模块
+ *
+ */
+export type WatchEventCallback = (...args: any[]) => void;
+export type WatchEventItem = {
+    key: string;
+    callback: WatchEventCallback;
+};
+export interface WatchEventSubscription {
+    unsubscribe: () => void;
+}
+declare class Watch {
+    private events;
+    private enableListMap;
+    /**
+     * 订阅事件
+     * @param event 事件名称
+     * @param callback 回调函数
+     * @returns 订阅对象，可用于取消订阅
+     */
+    subscribe(watchKey: string, event: WatchEventItem): WatchEventSubscription;
+    /**
+     * 启用事件
+     * @param watchKey 监听的key
+     * @param event 事件名称
+     */
+    enableEvent(watchKey: string, eventKey: string): void;
+    /**
+     * 禁用某个事件
+     * @param watchKey 监听的key
+     * @param eventKey 事件名称
+     */
+    disableEvent(watchKey: string, eventKey: string): void;
+    /**
+     * 冻结某个监听下的所有事件
+     * @param watchKey 监听的key
+     */
+    disabledAllEventByWatchKey(watchKey: string): void;
+    /**
+     * 启用某个监听下的所有事件
+     * @param watchKey 监听的key
+     */
+    enableAllEventByWatchKey(watchKey: string): void;
+    /**
+     * 取消订阅事件
+     * @param event 事件名称
+     * @param callback 回调函数
+     * @returns 是否成功取消订阅
+     */
+    unsubscribe(watchKey: string, event: WatchEventItem): void;
+    /**
+     * 发布事件
+     * @param event 事件名称
+     * @param args 事件参数
+     */
+    publish(watchKey: string, ...args: any[]): void;
+    /**
+     * 根据事件名称发布事件
+     * @param watchKey 监听的key
+     * @param eventKey 事件名称
+     * @param args 事件参数
+     */
+    publishByEventKey(watchKey: string, eventKey: string, ...args: any[]): void;
+    /**
+     * 获取最后一个启用的事件
+     * @param watchKey 监听的key
+     * @returns 最后一个启用的事件
+     */
+    getLastEnableEventKey(watchKey: string): WatchEventItem['key'] | undefined;
+    /**
+     * 移除某个事件的所有订阅
+     * @param event 事件名称
+     * @returns 是否成功移除
+     */
+    clearEvent(watchKey: string): void;
+    /**
+     * 移除所有事件订阅
+     */
+    clearAllEvents(): void;
+    /**
+     * 获取事件的订阅数量
+     * @param event 事件名称
+     * @returns 订阅数量
+     */
+    getSubscriberCount(event: string): number;
+    /**
+     * 检查事件是否有订阅者
+     * @param event 事件名称
+     * @returns 是否有订阅者
+     */
+    hasSubscribers(event: string): boolean;
+    /**
+     * 一次性订阅事件，事件触发后自动取消订阅
+     * @param event 事件名称
+     * @param callback 回调函数
+     * @returns 订阅对象，可用于取消订阅
+     */
+    once(watchKey: string, event: WatchEventItem): WatchEventSubscription;
+}
+declare const watch: Watch;
+export default watch;

package/lib/utils/watch.js

@@ -0,0 +1,217 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/watch.ts
+var watch_exports = {};
+__export(watch_exports, {
+  default: () => watch_default
+});
+module.exports = __toCommonJS(watch_exports);
+var Watch = class {
+  constructor() {
+    // 监听列表
+    this.events = /* @__PURE__ */ new Map();
+    // 启用列表 - 使用数组保持顺序
+    this.enableListMap = /* @__PURE__ */ new Map();
+  }
+  /**
+   * 订阅事件
+   * @param event 事件名称
+   * @param callback 回调函数
+   * @returns 订阅对象，可用于取消订阅
+   */
+  subscribe(watchKey, event) {
+    if (!this.events.has(watchKey)) {
+      this.events.set(watchKey, /* @__PURE__ */ new Map());
+    }
+    const callbacks = this.events.get(watchKey);
+    callbacks.set(event.key, event.callback);
+    this.enableEvent(watchKey, event.key);
+    return {
+      // 取消订阅
+      unsubscribe: () => {
+        this.unsubscribe(watchKey, event);
+      }
+    };
+  }
+  /**
+   * 启用事件
+   * @param watchKey 监听的key
+   * @param event 事件名称
+   */
+  enableEvent(watchKey, eventKey) {
+    const enableList = this.enableListMap.get(watchKey);
+    if (enableList) {
+      if (enableList.includes(eventKey)) {
+        return;
+      }
+      enableList.push(eventKey);
+    } else {
+      this.enableListMap.set(watchKey, [eventKey]);
+    }
+  }
+  /**
+   * 禁用某个事件
+   * @param watchKey 监听的key
+   * @param eventKey 事件名称
+   */
+  disableEvent(watchKey, eventKey) {
+    const enableList = this.enableListMap.get(watchKey);
+    if (enableList) {
+      const index = enableList.indexOf(eventKey);
+      if (index !== -1) {
+        enableList.splice(index);
+      }
+    }
+  }
+  /**
+   * 冻结某个监听下的所有事件
+   * @param watchKey 监听的key
+   */
+  disabledAllEventByWatchKey(watchKey) {
+    this.enableListMap.set(watchKey, []);
+  }
+  /**
+   * 启用某个监听下的所有事件
+   * @param watchKey 监听的key
+   */
+  enableAllEventByWatchKey(watchKey) {
+    var _a;
+    this.enableListMap.set(
+      watchKey,
+      Array.from(((_a = this.events.get(watchKey)) == null ? void 0 : _a.keys()) || [])
+    );
+  }
+  /**
+   * 取消订阅事件
+   * @param event 事件名称
+   * @param callback 回调函数
+   * @returns 是否成功取消订阅
+   */
+  unsubscribe(watchKey, event) {
+    const callbacks = this.events.get(watchKey);
+    if (!callbacks) {
+      return;
+    }
+    this.disableEvent(watchKey, event.key);
+    callbacks.delete(event.key);
+    return;
+  }
+  /**
+   * 发布事件
+   * @param event 事件名称
+   * @param args 事件参数
+   */
+  publish(watchKey, ...args) {
+    var _a;
+    const callbacks = this.events.get(watchKey);
+    if (!callbacks) {
+      return;
+    }
+    const enableList = this.enableListMap.get(watchKey);
+    if (!enableList || enableList.length === 0) {
+      return;
+    }
+    const lastCallbackKey = enableList.at(-1);
+    if (lastCallbackKey) {
+      try {
+        (_a = callbacks.get(lastCallbackKey)) == null ? void 0 : _a(...args);
+      } catch (error) {
+        console.error(`执行事件"${watchKey}"的回调时出错:`, error);
+      }
+    }
+  }
+  /**
+   * 根据事件名称发布事件
+   * @param watchKey 监听的key
+   * @param eventKey 事件名称
+   * @param args 事件参数
+   */
+  publishByEventKey(watchKey, eventKey, ...args) {
+    var _a;
+    const callbacks = this.events.get(watchKey);
+    if (!callbacks) {
+      return;
+    }
+    (_a = callbacks.get(eventKey)) == null ? void 0 : _a(...args);
+  }
+  /**
+   * 获取最后一个启用的事件
+   * @param watchKey 监听的key
+   * @returns 最后一个启用的事件
+   */
+  getLastEnableEventKey(watchKey) {
+    const enableList = this.enableListMap.get(watchKey);
+    console.log("enableList", enableList);
+    if (!enableList) {
+      return void 0;
+    }
+    return enableList.at(-1) || void 0;
+  }
+  /**
+   * 移除某个事件的所有订阅
+   * @param event 事件名称
+   * @returns 是否成功移除
+   */
+  clearEvent(watchKey) {
+    this.disabledAllEventByWatchKey(watchKey);
+    this.events.delete(watchKey);
+  }
+  /**
+   * 移除所有事件订阅
+   */
+  clearAllEvents() {
+    this.events.clear();
+    this.enableListMap.clear();
+  }
+  /**
+   * 获取事件的订阅数量
+   * @param event 事件名称
+   * @returns 订阅数量
+   */
+  getSubscriberCount(event) {
+    const callbacks = this.events.get(event);
+    return callbacks ? callbacks.size : 0;
+  }
+  /**
+   * 检查事件是否有订阅者
+   * @param event 事件名称
+   * @returns 是否有订阅者
+   */
+  hasSubscribers(event) {
+    return this.getSubscriberCount(event) > 0;
+  }
+  /**
+   * 一次性订阅事件，事件触发后自动取消订阅
+   * @param event 事件名称
+   * @param callback 回调函数
+   * @returns 订阅对象，可用于取消订阅
+   */
+  once(watchKey, event) {
+    const wrappedCallback = (...args) => {
+      this.unsubscribe(watchKey, { key: event.key, callback: wrappedCallback });
+      event.callback(...args);
+    };
+    return this.subscribe(watchKey, {
+      key: event.key,
+      callback: wrappedCallback
+    });
+  }
+};
+var watch = new Watch();
+var watch_default = watch;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,6 +12,7 @@
   "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}\"",
@@ -54,6 +55,7 @@
     "@typescript-eslint/parser": "^5.57.1",
     "axios": "1.7.2",
     "eslint": "^8.37.0",
+    "fake-indexeddb": "^6.0.1",
     "father": "^4.1.0",
     "prettier": "^3.5.3",
     "ts-node": "^10.9.1",
@@ -67,4 +69,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}