@pisell/pisellos 0.10.28 → 0.10.30

package/dist/core/index.d.ts

@@ -12,8 +12,15 @@ declare class PisellOSCore implements PisellCore {
     context: BusinessContext;
     server: any;
     serverOptions?: ServerOptions;
+    private serverModulePromise?;
     constructor(options?: PisellOSOptions);
     private initialize;
+    /**
+     * 仅预加载 Server 模块代码，不创建实例、不注册模块、不请求业务数据。
+     * 导入失败会清空 Promise，正式 initializeServer 时仍可重新尝试。
+     */
+    preloadServerModule(): Promise<void>;
+    private loadServerModule;
     /**
      * 初始化 Server（公开方法，需要外部显式调用并等待）
      * Server 配置从构造函数传入的 options.server 中获取

package/dist/core/index.js

@@ -24,8 +24,6 @@ import { EffectsManager } from "../effects";
  * pisell OS 核心实现
  */
 var PisellOSCore = /*#__PURE__*/function () {
-  // 保存 Server 配置
-
   function PisellOSCore(options) {
     _classCallCheck(this, PisellOSCore);
     _defineProperty(this, "plugins", new Map());
@@ -37,6 +35,8 @@ var PisellOSCore = /*#__PURE__*/function () {
     _defineProperty(this, "server", void 0);
     // Server 实例
     _defineProperty(this, "serverOptions", void 0);
+    // 保存 Server 配置
+    _defineProperty(this, "serverModulePromise", void 0);
     this.debug = (options === null || options === void 0 ? void 0 : options.debug) || false;
     this.context = (options === null || options === void 0 ? void 0 : options.context) || {};
 
@@ -63,6 +63,49 @@ var PisellOSCore = /*#__PURE__*/function () {
       this.log('[PisellOS] 核心初始化完成');
     }
 
+    /**
+     * 仅预加载 Server 模块代码，不创建实例、不注册模块、不请求业务数据。
+     * 导入失败会清空 Promise，正式 initializeServer 时仍可重新尝试。
+     */
+  }, {
+    key: "preloadServerModule",
+    value: (function () {
+      var _preloadServerModule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (!(this.server || !this.serverOptions)) {
+                _context.next = 2;
+                break;
+              }
+              return _context.abrupt("return");
+            case 2:
+              _context.next = 4;
+              return this.loadServerModule();
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function preloadServerModule() {
+        return _preloadServerModule.apply(this, arguments);
+      }
+      return preloadServerModule;
+    }())
+  }, {
+    key: "loadServerModule",
+    value: function loadServerModule() {
+      var _this2 = this;
+      if (!this.serverModulePromise) {
+        this.serverModulePromise = import("../server").catch(function (error) {
+          _this2.serverModulePromise = undefined;
+          throw error;
+        });
+      }
+      return this.serverModulePromise;
+    }
+
     /**
      * 初始化 Server（公开方法，需要外部显式调用并等待）
      * Server 配置从构造函数传入的 options.server 中获取
@@ -70,56 +113,56 @@ var PisellOSCore = /*#__PURE__*/function () {
   }, {
     key: "initializeServer",
     value: (function () {
-      var _initializeServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
+      var _initializeServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(options) {
         var ServerModule, Server;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               if (!this.server) {
-                _context.next = 3;
+                _context2.next = 3;
                 break;
               }
               this.log('Server 已经初始化，跳过重复初始化', 'warn');
-              return _context.abrupt("return");
+              return _context2.abrupt("return");
             case 3:
               if (this.serverOptions) {
-                _context.next = 6;
+                _context2.next = 6;
                 break;
               }
               this.log('未提供 Server 配置，无法初始化', 'warn');
-              return _context.abrupt("return");
+              return _context2.abrupt("return");
             case 6:
-              _context.prev = 6;
-              _context.next = 9;
-              return import("../server");
+              _context2.prev = 6;
+              _context2.next = 9;
+              return this.loadServerModule();
             case 9:
-              ServerModule = _context.sent;
+              ServerModule = _context2.sent;
               Server = ServerModule.default; // 创建 Server 实例
               this.server = new Server(this);
               this.log('Server 实例已创建');
 
               // 初始化模块并预加载数据
               if (!this.serverOptions.modules) {
-                _context.next = 16;
+                _context2.next = 16;
                 break;
               }
-              _context.next = 16;
+              _context2.next = 16;
               return this.server.initialize(this.serverOptions.modules, this.serverOptions.autoInitData !== false, options);
             case 16:
               this.log('[PisellOS] Server 初始化完成');
-              _context.next = 24;
+              _context2.next = 24;
               break;
             case 19:
-              _context.prev = 19;
-              _context.t0 = _context["catch"](6);
-              console.error('[PisellOS] ❌ Server 初始化失败:', _context.t0);
-              this.log("Server \u521D\u59CB\u5316\u5931\u8D25: ".concat(_context.t0), 'error');
-              throw _context.t0;
+              _context2.prev = 19;
+              _context2.t0 = _context2["catch"](6);
+              console.error('[PisellOS] ❌ Server 初始化失败:', _context2.t0);
+              this.log("Server \u521D\u59CB\u5316\u5931\u8D25: ".concat(_context2.t0), 'error');
+              throw _context2.t0;
             case 24:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this, [[6, 19]]);
+        }, _callee2, this, [[6, 19]]);
       }));
       function initializeServer(_x) {
         return _initializeServer.apply(this, arguments);
@@ -151,7 +194,7 @@ var PisellOSCore = /*#__PURE__*/function () {
   }, {
     key: "registerPlugin",
     value: function registerPlugin(plugin, options) {
-      var _this2 = this;
+      var _this3 = this;
       if (this.plugins.has(plugin.name)) {
         this.log("\u63D2\u4EF6 ".concat(plugin.name, " \u5DF2\u7ECF\u6CE8\u518C\u8FC7\uFF0C\u5C06\u88AB\u8986\u76D6"), 'warn');
       }
@@ -179,7 +222,7 @@ var PisellOSCore = /*#__PURE__*/function () {
         var result = plugin.initialize();
         if (result instanceof Promise) {
           result.catch(function (err) {
-            _this2.log("\u63D2\u4EF6 ".concat(plugin.name, " \u521D\u59CB\u5316\u5931\u8D25: ").concat(err.message), 'error');
+            _this3.log("\u63D2\u4EF6 ".concat(plugin.name, " \u521D\u59CB\u5316\u5931\u8D25: ").concat(err.message), 'error');
             throw err;
           });
         }
@@ -205,7 +248,7 @@ var PisellOSCore = /*#__PURE__*/function () {
   }, {
     key: "registerModule",
     value: function registerModule(module, options) {
-      var _this3 = this;
+      var _this4 = this;
       if (this.modules.has(module.name)) {
         this.log("\u6A21\u5757 ".concat(module.name, " \u5DF2\u7ECF\u6CE8\u518C\u8FC7\uFF0C\u5C06\u88AB\u8986\u76D6"), 'warn');
       }
@@ -247,7 +290,7 @@ var PisellOSCore = /*#__PURE__*/function () {
       }
       // 预先给模块初始化值系统
       var _createStore = createStore((options === null || options === void 0 ? void 0 : options.initialState) || {}, module.name, function (path, value) {
-          _this3.effects.emit("".concat(module.name, ":changed"), {
+          _this4.effects.emit("".concat(module.name, ":changed"), {
             path: path,
             value: value
           });
@@ -262,7 +305,7 @@ var PisellOSCore = /*#__PURE__*/function () {
         }, options));
         if (result instanceof Promise) {
           result.catch(function (err) {
-            _this3.log("\u6A21\u5757 ".concat(module.name, " \u521D\u59CB\u5316\u5931\u8D25: ").concat(err.message), 'error');
+            _this4.log("\u6A21\u5757 ".concat(module.name, " \u521D\u59CB\u5316\u5931\u8D25: ").concat(err.message), 'error');
             throw err;
           });
         }
@@ -307,100 +350,100 @@ var PisellOSCore = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var _iterator4, _step4, _step4$value, name, module, _iterator5, _step5, _step5$value, _name, plugin;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               // 先销毁模块
               _iterator4 = _createForOfIteratorHelper(this.modules.entries());
-              _context2.prev = 1;
+              _context3.prev = 1;
               _iterator4.s();
             case 3:
               if ((_step4 = _iterator4.n()).done) {
-                _context2.next = 17;
+                _context3.next = 17;
                 break;
               }
               _step4$value = _slicedToArray(_step4.value, 2), name = _step4$value[0], module = _step4$value[1];
               if (!module.destroy) {
-                _context2.next = 15;
+                _context3.next = 15;
                 break;
               }
-              _context2.prev = 6;
-              _context2.next = 9;
+              _context3.prev = 6;
+              _context3.next = 9;
               return Promise.resolve(module.destroy());
             case 9:
               this.log("\u6A21\u5757 ".concat(name, " \u5DF2\u9500\u6BC1"));
-              _context2.next = 15;
+              _context3.next = 15;
               break;
             case 12:
-              _context2.prev = 12;
-              _context2.t0 = _context2["catch"](6);
-              this.log("\u9500\u6BC1\u6A21\u5757 ".concat(name, " \u65F6\u51FA\u9519: ").concat(_context2.t0), 'error');
+              _context3.prev = 12;
+              _context3.t0 = _context3["catch"](6);
+              this.log("\u9500\u6BC1\u6A21\u5757 ".concat(name, " \u65F6\u51FA\u9519: ").concat(_context3.t0), 'error');
             case 15:
-              _context2.next = 3;
+              _context3.next = 3;
               break;
             case 17:
-              _context2.next = 22;
+              _context3.next = 22;
               break;
             case 19:
-              _context2.prev = 19;
-              _context2.t1 = _context2["catch"](1);
-              _iterator4.e(_context2.t1);
+              _context3.prev = 19;
+              _context3.t1 = _context3["catch"](1);
+              _iterator4.e(_context3.t1);
             case 22:
-              _context2.prev = 22;
+              _context3.prev = 22;
               _iterator4.f();
-              return _context2.finish(22);
+              return _context3.finish(22);
             case 25:
               this.modules.clear();
 
               // 再销毁插件
               _iterator5 = _createForOfIteratorHelper(this.plugins.entries());
-              _context2.prev = 27;
+              _context3.prev = 27;
               _iterator5.s();
             case 29:
               if ((_step5 = _iterator5.n()).done) {
-                _context2.next = 43;
+                _context3.next = 43;
                 break;
               }
               _step5$value = _slicedToArray(_step5.value, 2), _name = _step5$value[0], plugin = _step5$value[1];
               if (!plugin.destroy) {
-                _context2.next = 41;
+                _context3.next = 41;
                 break;
               }
-              _context2.prev = 32;
-              _context2.next = 35;
+              _context3.prev = 32;
+              _context3.next = 35;
               return Promise.resolve(plugin.destroy());
             case 35:
               this.log("\u63D2\u4EF6 ".concat(_name, " \u5DF2\u9500\u6BC1"));
-              _context2.next = 41;
+              _context3.next = 41;
               break;
             case 38:
-              _context2.prev = 38;
-              _context2.t2 = _context2["catch"](32);
-              this.log("\u9500\u6BC1\u63D2\u4EF6 ".concat(_name, " \u65F6\u51FA\u9519: ").concat(_context2.t2), 'error');
+              _context3.prev = 38;
+              _context3.t2 = _context3["catch"](32);
+              this.log("\u9500\u6BC1\u63D2\u4EF6 ".concat(_name, " \u65F6\u51FA\u9519: ").concat(_context3.t2), 'error');
             case 41:
-              _context2.next = 29;
+              _context3.next = 29;
               break;
             case 43:
-              _context2.next = 48;
+              _context3.next = 48;
               break;
             case 45:
-              _context2.prev = 45;
-              _context2.t3 = _context2["catch"](27);
-              _iterator5.e(_context2.t3);
+              _context3.prev = 45;
+              _context3.t3 = _context3["catch"](27);
+              _iterator5.e(_context3.t3);
             case 48:
-              _context2.prev = 48;
+              _context3.prev = 48;
               _iterator5.f();
-              return _context2.finish(48);
+              return _context3.finish(48);
             case 51:
               this.plugins.clear();
               this.log('PisellOS 核心已销毁');
             case 53:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this, [[1, 19, 22, 25], [6, 12], [27, 45, 48, 51], [32, 38]]);
+        }, _callee3, this, [[1, 19, 22, 25], [6, 12], [27, 45, 48, 51], [32, 38]]);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);

package/dist/model/strategy/adapter/dataVariant/evaluator.js

@@ -502,8 +502,17 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
       if (!(appliedInfo !== null && appliedInfo !== void 0 && (_appliedInfo$appliedF = appliedInfo.appliedFields) !== null && _appliedInfo$appliedF !== void 0 && _appliedInfo$appliedF.length)) {
         return originalItem;
       }
+
+      // 套餐加价/减价使用配置价；仅商品原价模式跟随子商品的 Data Variant 价格。
+      var isOriginalPriceBundleItem = originalItem.price_type === 'markup' && originalItem.price_type_ext === 'product_price';
+      var appliedFields = appliedInfo.appliedFields.filter(function (field) {
+        return field !== 'price' || isOriginalPriceBundleItem;
+      });
+      if (!appliedFields.length) {
+        return originalItem;
+      }
       var result = _objectSpread({}, originalItem);
-      var _iterator8 = _createForOfIteratorHelper(appliedInfo.appliedFields),
+      var _iterator8 = _createForOfIteratorHelper(appliedFields),
         _step8;
       try {
         for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
@@ -517,7 +526,9 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
       } finally {
         _iterator8.f();
       }
-      result._dataVariant = appliedInfo;
+      result._dataVariant = _objectSpread(_objectSpread({}, appliedInfo), {}, {
+        appliedFields: appliedFields
+      });
       return result;
     }
   }, {

package/dist/model/strategy/adapter/promotion/index.js

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

package/dist/modules/Discount/index.js

@@ -194,7 +194,10 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               return _context4.abrupt("return", {
                 discountList: goodPassList,
                 availableWalletIds: availableWalletIds,
-                virtualCurrencyList: virtualCurrencyList
+                virtualCurrencyList: virtualCurrencyList,
+                availableWalletPassList: availableWalletPassList.map(function (item) {
+                  return _objectSpread({}, item || {});
+                })
               });
             case 11:
             case "end":

package/dist/modules/Discount/types.d.ts

@@ -17,7 +17,7 @@ interface Formattitle {
 }
 interface PackageSubItemUsageRules {
     type: 'universal_discount' | 'package_exclusive' | 'single_item_promo' | 'custom_usage_rules';
-    rules: ("original_price" | "markup_price")[];
+    rules: ('original_price' | 'markup_price')[];
     package_scope?: {
         type: 'all_packages' | 'specific_packages' | 'product_all' | 'products';
         exclude_bundle_product_ids: number[];
@@ -68,10 +68,20 @@ export interface DiscountWithReason {
     discountList: Discount[];
     unavailableReasonKey: DiscountFilterRejectKey | null;
 }
+export interface WalletPassPrepareConfigItem {
+    id?: number | string | null;
+    tag?: string | null;
+    product_id?: number | string | null;
+    product_name?: string | null;
+    par_value?: string | number | null;
+    used_par_value?: string | number | null;
+    [key: string]: any;
+}
 export interface DiscountPrepareConfigResult {
     discountList: Discount[];
     availableWalletIds: number[];
     virtualCurrencyList?: VirtualCurrencyAsset[];
+    availableWalletPassList: WalletPassPrepareConfigItem[];
 }
 export interface VirtualCurrencyAsset extends Record<string, any> {
     id: number;
@@ -113,14 +123,14 @@ export interface Discount {
     metadata?: {
         discount_card_type?: 'fixed_amount' | 'percent';
         custom_product_bundle_map_id?: string;
-        validity_type?: "custom_schedule_validity" | "fixed_validity";
+        validity_type?: 'custom_schedule_validity' | 'fixed_validity';
         discount_calculation_mode: 'item_level' | 'order_level';
         holder: {
-            type: "customer" | "custom";
+            type: 'customer' | 'custom';
         };
     };
     product: Product;
-    type: "product" | 'good_pass';
+    type: 'product' | 'good_pass';
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;

package/dist/modules/Order/index.d.ts

@@ -169,6 +169,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     consumeSessionStorageRestore(): Record<string, any> | null;
     notifyTempOrderChanged(): void;
     private createDefaultTempOrderInstance;
+    private clearTempOrderPointCardSnapshot;
+    private writePointCardSnapshotFromPrepareConfig;
     private createExternalSaleNumber;
     private ensureExternalSaleNumber;
     private ensureRequestUniqueIdempotencyToken;
@@ -610,4 +612,4 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getOrderInfo(order_id: number): Promise<any>;
     getVouchers(): any[];
 }
-export type { AddProductToOrderOptions, RemoveProductsFromOrderOptions, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';
+export type { AddProductToOrderOptions, OrderMetaList, PointCardSnapshotItem, RemoveProductsFromOrderOptions, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';