@pisell/pisellos 0.0.567 → 0.0.569

package/dist/solution/VenueBooking/sales-section-4-annotated.json

@@ -71,8 +71,6 @@
         "num__comment": "数量；int；↕；必填。统一使用 num，不再使用 product_quantity。",
         "product_variant_id": 0,
         "product_variant_id__comment": "多规格 ID；int；↕；可选。",
-        "product_option_item": [],
-        "product_option_item__comment": "选项配置；array；↕；可选。",
         "selling_price": "50.00",
         "selling_price__comment": "销售单价（交易快照）；string；←；服务端返回，不能依赖基准数据回填。",
         "original_price": "60.00",

package/dist/solution/VenueBooking/utils/slotMerge.d.ts

@@ -5,6 +5,12 @@ export declare function mergeConsecutiveSlots(slots: VenueSlotSelection[]): Merg
 export declare function buildPriceBreakdown(params: {
     group: MergedSlotGroup;
     productId: number;
+    quotation?: {
+        getQuotationShelfId: (p: {
+            productId: number;
+            datetime: string;
+        }) => number;
+    };
 }): PriceBreakdownEntry[];
 export interface BuildVenueBookingParams {
     group: MergedSlotGroup;

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -51,7 +51,9 @@ export function mergeConsecutiveSlots(slots) {
   return groups;
 }
 export function buildPriceBreakdown(params) {
-  var group = params.group;
+  var group = params.group,
+    productId = params.productId,
+    quotation = params.quotation;
   if (!group.slots.length) return [];
   var entries = [];
   var _iterator = _createForOfIteratorHelper(group.slots),
@@ -60,10 +62,14 @@ export function buildPriceBreakdown(params) {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var slot = _step.value;
       var unitPrice = Number(slot.price || '0');
+      var shelfId = quotation ? quotation.getQuotationShelfId({
+        productId: productId,
+        datetime: slot.startTime
+      }) : 0;
       var startHm = dayjs(slot.startTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');
       var endHm = dayjs(slot.endTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');
       var last = entries[entries.length - 1];
-      if (last && last.unit_price === unitPrice && last.quotation_shelf_id === 0 && last.end_time === startHm) {
+      if (last && last.unit_price === unitPrice && last.quotation_shelf_id === shelfId && last.end_time === startHm) {
         last.end_time = endHm;
         last.quantity += 1;
       } else {
@@ -71,7 +77,7 @@ export function buildPriceBreakdown(params) {
           start_time: startHm,
           end_time: endHm,
           unit_price: unitPrice,
-          quotation_shelf_id: 0,
+          quotation_shelf_id: shelfId,
           quantity: 1
         });
       }

package/dist/solution/index.d.ts

@@ -6,4 +6,6 @@ export * from './RegisterAndLogin';
 export * from './Checkout';
 export * from './Sales';
 export * from './ScanOrder';
+export * from './BaseSales';
 export * from './VenueBooking';
+export * from './UnifiedBookingSales';

package/dist/solution/index.js

@@ -6,4 +6,6 @@ export * from "./RegisterAndLogin";
 export * from "./Checkout";
 export * from "./Sales";
 export * from "./ScanOrder";
-export * from "./VenueBooking";
+export * from "./BaseSales";
+export * from "./VenueBooking";
+export * from "./UnifiedBookingSales";

package/dist/types/index.d.ts

@@ -15,6 +15,16 @@ export interface Module {
     name: string;
     version: string;
     initialize: (core: PisellCore, options: ModuleOptions) => Promise<void> | void;
+    /**
+     * 父级解决方案运行时更新 otherParams 后，显式通知子模块刷新自己的运行态参数。
+     *
+     * @example
+     * await module.updateOtherParams?.({ channel: 'pos' }, { changedParams: { channel: 'pos' } });
+     */
+    updateOtherParams?: (params: Record<string, any>, meta?: {
+        changedParams?: Record<string, any>;
+        cover?: boolean;
+    }) => Promise<void> | void;
     destroy?: () => Promise<void> | void;
     exports?: Record<string, any>;
     isSolution?: boolean;
@@ -39,7 +49,7 @@ export interface PisellCore {
     getModuleExports: <T = any>(name: string) => T | null;
     hasModule: (name: string) => boolean;
     effects: {
-        on: (event: string, callback: (payload: any) => void, force?: boolean) => void;
+        on: (event: string, callback: (payload: any) => void) => () => void;
         once: (event: string, callback: (payload: any) => void, force?: boolean) => void;
         only: (event: string, callback: (payload: any) => void) => () => void;
         off: (event: string, callback: (payload: any) => void) => void;

package/dist/utils/task.js

@@ -94,7 +94,7 @@ var Tasks = /*#__PURE__*/function () {
               // 遍历任务队列
             case 6:
               if (!(this.taskQueue.length > 0)) {
-                _context.next = 32;
+                _context.next = 29;
                 break;
               }
               // 获取任务，但是不删除
@@ -109,7 +109,7 @@ var Tasks = /*#__PURE__*/function () {
               // 获取任务对应的action
               action = this.actions.get(task.type); // 如果找到对应的action，则执行
               if (!action) {
-                _context.next = 28;
+                _context.next = 26;
                 break;
               }
               _context.prev = 13;
@@ -118,36 +118,33 @@ var Tasks = /*#__PURE__*/function () {
                 uuid: task === null || task === void 0 ? void 0 : task.uuid
               }));
             case 16:
-              console.log('task_success>>>>>>>', task);
-              _context.next = 22;
+              _context.next = 21;
               break;
-            case 19:
-              _context.prev = 19;
+            case 18:
+              _context.prev = 18;
               _context.t0 = _context["catch"](13);
               console.error('task_error>>>>>>>', _context.t0);
-            case 22:
-              _context.prev = 22;
+            case 21:
+              _context.prev = 21;
               // 将任务删除
               _task = this.taskQueue.shift();
-              console.log('task_shift>>>>>>>', _task);
-              return _context.finish(22);
-            case 26:
-              _context.next = 30;
+              return _context.finish(21);
+            case 24:
+              _context.next = 27;
               break;
-            case 28:
+            case 26:
               // 如果找不到对应的action，则删除任务
               _task2 = this.taskQueue.shift();
-              console.log('task_action_not_found>>>>>>>', _task2);
-            case 30:
+            case 27:
               _context.next = 6;
               break;
-            case 32:
+            case 29:
               this.isRunning = false;
-            case 33:
+            case 30:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[13, 19, 22, 26]]);
+        }, _callee, this, [[13, 18, 21, 24]]);
       }));
       function run() {
         return _run.apply(this, arguments);

package/dist/utils/watch.js

@@ -203,7 +203,6 @@ var Watch = /*#__PURE__*/function () {
     key: "getLastEnableEventKey",
     value: function getLastEnableEventKey(watchKey) {
       var enableList = this.enableListMap.get(watchKey);
-      console.log('enableList', enableList);
       if (!enableList) {
         return undefined;
       }

package/lib/apis/picoding.js

@@ -0,0 +1,2 @@
+// picoding 相关公共 api
+"use strict";

package/lib/core/index.js

@@ -1,116 +1,101 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/core/index.ts
-var core_exports = {};
-__export(core_exports, {
-  PisellOSCore: () => PisellOSCore,
-  default: () => core_default
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(core_exports);
-var import_createStore = require("../store/createStore");
-var import_effects = require("../effects");
-var PisellOSCore = class {
-  // 保存 Server 配置
+exports.default = exports.PisellOSCore = void 0;
+var _createStore = require("../store/createStore");
+var _effects = require("../effects");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+/**
+ * pisell OS 核心实现
+ */
+class PisellOSCore {
+  plugins = new Map();
+  modules = new Map();
+  stores = new Map();
+  effects = new _effects.EffectsManager();
+  debug = false;
+  context = {};
+  server; // Server 实例
+  serverOptions; // 保存 Server 配置
+
   constructor(options) {
-    this.plugins = /* @__PURE__ */ new Map();
-    this.modules = /* @__PURE__ */ new Map();
-    this.stores = /* @__PURE__ */ new Map();
-    this.effects = new import_effects.EffectsManager();
-    this.debug = false;
-    this.context = {};
-    this.debug = (options == null ? void 0 : options.debug) || false;
-    this.context = (options == null ? void 0 : options.context) || {};
-    if (options == null ? void 0 : options.server) {
+    this.debug = options?.debug || false;
+    this.context = options?.context || {};
+
+    // 保存 Server 配置但不初始化
+    if (options?.server) {
       this.serverOptions = options.server;
     }
     this.initialize(options);
   }
   initialize(options) {
-    if (options == null ? void 0 : options.plugins) {
-      options.plugins.forEach((item) => {
+    if (options?.plugins) {
+      options.plugins.forEach(item => {
         this.registerPlugin(item.plugin, item.options);
       });
     }
-    if (options == null ? void 0 : options.modules) {
-      options.modules.forEach((item) => {
+    if (options?.modules) {
+      options.modules.forEach(item => {
         this.registerModule(item.module, item.options);
       });
     }
-    this.log("[PisellOS] 核心初始化完成");
+    this.log('[PisellOS] 核心初始化完成');
   }
+
   /**
    * 初始化 Server（公开方法，需要外部显式调用并等待）
    * Server 配置从构造函数传入的 options.server 中获取
    */
   async initializeServer(options) {
+    // 检查是否已经初始化
     if (this.server) {
-      this.log("Server 已经初始化，跳过重复初始化", "warn");
+      this.log('Server 已经初始化，跳过重复初始化', 'warn');
       return;
     }
+
+    // 检查是否有 Server 配置
     if (!this.serverOptions) {
-      this.log("未提供 Server 配置，无法初始化", "warn");
+      this.log('未提供 Server 配置，无法初始化', 'warn');
       return;
     }
     try {
-      const ServerModule = await import("../server");
+      // 动态导入 Server 类以避免循环依赖
+      const ServerModule = await Promise.resolve().then(() => _interopRequireWildcard(require("../server")));
       const Server = ServerModule.default;
+
+      // 创建 Server 实例
       this.server = new Server(this);
-      this.log("Server 实例已创建");
+      this.log('Server 实例已创建');
+
+      // 初始化模块并预加载数据
       if (this.serverOptions.modules) {
-        await this.server.initialize(
-          this.serverOptions.modules,
-          this.serverOptions.autoInitData !== false,
-          options
-        );
+        await this.server.initialize(this.serverOptions.modules, this.serverOptions.autoInitData !== false, options);
       }
-      console.log("[PisellOS] ✅ Server 初始化完成，所有数据已预加载");
-      this.log("[PisellOS] Server 初始化完成");
+      this.log('[PisellOS] Server 初始化完成');
     } catch (error) {
-      console.error("[PisellOS] ❌ Server 初始化失败:", error);
-      this.log(`Server 初始化失败: ${error}`, "error");
+      console.error('[PisellOS] ❌ Server 初始化失败:', error);
+      this.log(`Server 初始化失败: ${error}`, 'error');
       throw error;
     }
   }
+
   // 日志方法
-  log(message, level = "info") {
-    if (!this.debug && level === "info") {
+  log(message, level = 'info') {
+    if (!this.debug && level === 'info') {
       return;
     }
-    const prefix = "[PisellOS]";
+    const prefix = '[PisellOS]';
     switch (level) {
-      case "info":
-        console.log(`${prefix} ${message}`);
+      case 'info':
         break;
-      case "warn":
-        console.log(`%c${prefix}%c ${message}`, "color: #f59e0b; font-weight: bold;", "color: #f59e0b;");
+      case 'warn':
+        // 使用 console.log 避免显示堆栈跟踪，提升性能
+
         break;
-      case "error":
+      case 'error':
         console.error(`${prefix} ${message}`);
         break;
     }
@@ -118,27 +103,31 @@ var PisellOSCore = class {
   // 插件相关方法
   registerPlugin(plugin, options) {
     if (this.plugins.has(plugin.name)) {
-      this.log(`插件 ${plugin.name} 已经注册过，将被覆盖`, "warn");
+      this.log(`插件 ${plugin.name} 已经注册过，将被覆盖`, 'warn');
     }
-    if (options == null ? void 0 : options.dependencies) {
+
+    // 检查依赖
+    if (options?.dependencies) {
       for (const dep of options.dependencies) {
         if (!this.plugins.has(dep)) {
           throw new Error(`注册插件 ${plugin.name} 失败：缺少依赖插件 ${dep}`);
         }
       }
     }
+
+    // 初始化插件
     try {
       const result = plugin.initialize();
       if (result instanceof Promise) {
-        result.catch((err) => {
-          this.log(`插件 ${plugin.name} 初始化失败: ${err.message}`, "error");
+        result.catch(err => {
+          this.log(`插件 ${plugin.name} 初始化失败: ${err.message}`, 'error');
           throw err;
         });
       }
       this.plugins.set(plugin.name, plugin);
       this.log(`插件 ${plugin.name} v${plugin.version} 注册成功`);
     } catch (error) {
-      this.log(`插件 ${plugin.name} 初始化过程中出错: ${error}`, "error");
+      this.log(`插件 ${plugin.name} 初始化过程中出错: ${error}`, 'error');
       throw error;
     }
   }
@@ -148,125 +137,135 @@ var PisellOSCore = class {
   hasPlugin(name) {
     return this.plugins.has(name);
   }
+
   // 模块相关方法
-  registerModule(module2, options) {
-    if (this.modules.has(module2.name)) {
-      this.log(`模块 ${module2.name} 已经注册过，将被覆盖`, "warn");
+  registerModule(module, options) {
+    if (this.modules.has(module.name)) {
+      this.log(`模块 ${module.name} 已经注册过，将被覆盖`, 'warn');
     }
-    if (options == null ? void 0 : options.dependencies) {
+
+    // 检查依赖模块
+    if (options?.dependencies) {
       for (const dep of options.dependencies) {
         if (!this.modules.has(dep)) {
-          throw new Error(`注册模块 ${module2.name} 失败：缺少依赖模块 ${dep}`);
+          throw new Error(`注册模块 ${module.name} 失败：缺少依赖模块 ${dep}`);
         }
       }
     }
-    if (options == null ? void 0 : options.plugins) {
+
+    // 检查依赖插件
+    if (options?.plugins) {
       for (const plugin of options.plugins) {
         if (!this.plugins.has(plugin)) {
-          throw new Error(
-            `注册模块 ${module2.name} 失败：缺少依赖插件 ${plugin}`
-          );
+          throw new Error(`注册模块 ${module.name} 失败：缺少依赖插件 ${plugin}`);
         }
       }
     }
-    const { proxy } = (0, import_createStore.createStore)(
-      (options == null ? void 0 : options.initialState) || {},
-      module2.name,
-      (path, value) => {
-        console.log("core 检测到模块值更新", module2.name, path, value);
-        this.effects.emit(`${module2.name}:changed`, { path, value });
-        if (module2.storeChange)
-          module2.storeChange(path, value);
-      }
-    );
-    this.stores.set(module2.name, proxy);
+    // 预先给模块初始化值系统
+    const {
+      proxy
+    } = (0, _createStore.createStore)(options?.initialState || {}, module.name, (path, value) => {
+      this.effects.emit(`${module.name}:changed`, {
+        path,
+        value
+      });
+      if (module.storeChange) module.storeChange(path, value);
+    });
+    this.stores.set(module.name, proxy);
+    // 初始化模块
     try {
-      const result = module2.initialize(this, { store: proxy, ...options });
+      const result = module.initialize(this, {
+        store: proxy,
+        ...options
+      });
       if (result instanceof Promise) {
-        result.catch((err) => {
-          this.log(`模块 ${module2.name} 初始化失败: ${err.message}`, "error");
+        result.catch(err => {
+          this.log(`模块 ${module.name} 初始化失败: ${err.message}`, 'error');
           throw err;
         });
       }
-      this.modules.set(module2.name, module2);
-      this.log(`模块 ${module2.name} v${module2.version} 注册成功`);
+      this.modules.set(module.name, module);
+      this.log(`模块 ${module.name} v${module.version} 注册成功`);
     } catch (error) {
-      this.log(`模块 ${module2.name} 初始化过程中出错: ${error}`, "error");
+      this.log(`模块 ${module.name} 初始化过程中出错: ${error}`, 'error');
       throw error;
     }
   }
-  unregisterModule(module2) {
-    this.stores.delete(module2.name);
-    this.modules.delete(module2.name);
+  unregisterModule(module) {
+    this.stores.delete(module.name);
+    this.modules.delete(module.name);
   }
   getModule(name) {
     return this.modules.get(name) || null;
   }
   getModuleExports(name) {
-    const module2 = this.modules.get(name);
-    return (module2 == null ? void 0 : module2.exports) || null;
+    const module = this.modules.get(name);
+    return module?.exports || null;
   }
   hasModule(name) {
     return this.modules.has(name);
   }
+
   // 销毁方法
   async destroy() {
-    for (const [name, module2] of this.modules.entries()) {
-      if (module2.destroy) {
+    // 先销毁模块
+    for (const [name, module] of this.modules.entries()) {
+      if (module.destroy) {
         try {
-          await Promise.resolve(module2.destroy());
+          await Promise.resolve(module.destroy());
           this.log(`模块 ${name} 已销毁`);
         } catch (error) {
-          this.log(`销毁模块 ${name} 时出错: ${error}`, "error");
+          this.log(`销毁模块 ${name} 时出错: ${error}`, 'error');
         }
       }
     }
     this.modules.clear();
+
+    // 再销毁插件
     for (const [name, plugin] of this.plugins.entries()) {
       if (plugin.destroy) {
         try {
           await Promise.resolve(plugin.destroy());
           this.log(`插件 ${name} 已销毁`);
         } catch (error) {
-          this.log(`销毁插件 ${name} 时出错: ${error}`, "error");
+          this.log(`销毁插件 ${name} 时出错: ${error}`, 'error');
         }
       }
     }
     this.plugins.clear();
-    this.log("PisellOS 核心已销毁");
+    this.log('PisellOS 核心已销毁');
   }
   setContext(ctx) {
-    this.context = { ...this.context, ...ctx };
+    this.context = {
+      ...this.context,
+      ...ctx
+    };
     this.log(`上下文已更新: ${JSON.stringify(Object.keys(ctx))}`);
   }
+
   /**
    * 验证上下文参数
    */
   validateContext(config) {
     for (const rule of config.validations) {
       const value = this.context[rule.name];
-      if (rule.required && (value === void 0 || value === null)) {
-        this.log(
-          `模块 ${config.name} 缺少必需的上下文参数: ${rule.name}`,
-          "error"
-        );
+
+      // 检查必需参数
+      if (rule.required && (value === undefined || value === null)) {
+        this.log(`模块 ${config.name} 缺少必需的上下文参数: ${rule.name}`, 'error');
         return false;
       }
-      if (rule.validate && value !== void 0 && value !== null) {
+
+      // 执行自定义验证
+      if (rule.validate && value !== undefined && value !== null) {
         if (!rule.validate(value)) {
-          this.log(
-            `模块 ${config.name} 上下文参数验证失败: ${rule.name} - ${rule.message || "验证失败"}`,
-            "error"
-          );
+          this.log(`模块 ${config.name} 上下文参数验证失败: ${rule.name} - ${rule.message || '验证失败'}`, 'error');
           return false;
         }
       }
     }
     return true;
   }
-};
-var core_default = PisellOSCore;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  PisellOSCore
-});
+}
+exports.PisellOSCore = PisellOSCore;
+var _default = exports.default = PisellOSCore;