@pisell/pisellos 2.2.71 → 2.2.72

package/lib/model/strategy/index.js

@@ -20,394 +20,19 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/model/strategy/index.ts
 var strategy_exports = {};
 __export(strategy_exports, {
-  StrategyEngine: () => StrategyEngine,
-  createStrategyEngine: () => createStrategyEngine,
-  evaluate: () => evaluate
+  StrategyEngine: () => import_engine.StrategyEngine,
+  createStrategyEngine: () => import_engine.createStrategyEngine,
+  evaluate: () => import_engine.evaluate
 });
 module.exports = __toCommonJS(strategy_exports);
-var import_type = require("./type");
+var import_engine = require("./engine");
+__reExport(strategy_exports, require("./type"), module.exports);
 __reExport(strategy_exports, require("./adapter"), module.exports);
-var StrategyEngine = class {
-  constructor(options = {}) {
-    this.options = {
-      debug: options.debug ?? false,
-      enableTrace: options.enableTrace ?? false,
-      operatorHandlers: options.operatorHandlers ?? {},
-      errorHandler: options.errorHandler ?? ((error) => console.error(error))
-    };
-    this.operatorHandlers = new Map(
-      Object.entries(this.options.operatorHandlers)
-    );
-    this.initializeBuiltInOperators();
-  }
-  /**
-   * 评估策略
-   */
-  evaluate(config, context) {
-    var _a;
-    const startTime = Date.now();
-    const trace = {
-      steps: [],
-      duration: 0,
-      errors: []
-    };
-    try {
-      this.validateConfig(config);
-      if (this.options.enableTrace) {
-        trace.steps.push({
-          step: "validate_config",
-          status: "success",
-          duration: Date.now() - startTime
-        });
-      }
-      const evaluateStart = Date.now();
-      const evaluationResult = this.evaluateConditionGroup(
-        config.conditions,
-        context
-      );
-      if (this.options.enableTrace) {
-        trace.steps.push({
-          step: "evaluate_conditions",
-          status: "success",
-          duration: Date.now() - evaluateStart,
-          details: {
-            satisfied: evaluationResult.satisfied,
-            collectedActionIds: evaluationResult.actionIds
-          }
-        });
-      }
-      const actionStart = Date.now();
-      const matchedActions = this.getActionsByIds(
-        evaluationResult.actionIds,
-        config.actions
-      );
-      if (this.options.enableTrace) {
-        trace.steps.push({
-          step: "get_actions",
-          status: "success",
-          duration: Date.now() - actionStart,
-          details: { matchedCount: matchedActions.length }
-        });
-      }
-      const sortStart = Date.now();
-      const sortedActions = this.sortActionsByPriority(matchedActions);
-      if (this.options.enableTrace) {
-        trace.steps.push({
-          step: "sort_actions",
-          status: "success",
-          duration: Date.now() - sortStart
-        });
-      }
-      const applicable = evaluationResult.satisfied;
-      const result = {
-        success: true,
-        applicable,
-        code: applicable ? import_type.SUCCESS_CODES.SUCCESS : import_type.NOT_APPLICABLE_CODES.CONDITION_NOT_MET,
-        message: applicable ? "Strategy is applicable" : "Conditions not met",
-        matched: {
-          conditions: applicable,
-          actionIds: evaluationResult.actionIds,
-          details: {}
-        },
-        matchedActions: sortedActions,
-        outputs: {},
-        config
-      };
-      trace.duration = Date.now() - startTime;
-      if (this.options.enableTrace) {
-        result.trace = trace;
-      }
-      return result;
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : "Unknown error";
-      if (this.options.enableTrace) {
-        (_a = trace.errors) == null ? void 0 : _a.push({
-          step: "evaluation",
-          error: errorMessage,
-          timestamp: Date.now()
-        });
-        trace.duration = Date.now() - startTime;
-      }
-      this.options.errorHandler(error, context);
-      return {
-        success: false,
-        applicable: false,
-        code: import_type.ERROR_CODES.EVALUATION_ERROR,
-        message: errorMessage,
-        matched: {
-          conditions: false,
-          actionIds: [],
-          details: {}
-        },
-        matchedActions: [],
-        outputs: {},
-        trace: this.options.enableTrace ? trace : void 0,
-        config
-      };
-    }
-  }
-  /**
-   * 递归评估条件组
-   *
-   * @param group 条件组
-   * @param context 运行时上下文
-   * @returns 评估结果对象，包含条件是否满足和收集到的 actionIds
-   */
-  evaluateConditionGroup(group, context) {
-    const collectedActionIds = [];
-    const isCurrentLayerSatisfied = this.evaluateGroupLogic(group, context);
-    if (isCurrentLayerSatisfied) {
-      collectedActionIds.push(...group.actionIds);
-      for (const rule of group.rules) {
-        if (this.isConditionGroup(rule)) {
-          const nestedResult = this.evaluateConditionGroup(rule, context);
-          collectedActionIds.push(...nestedResult.actionIds);
-        }
-      }
-    }
-    return {
-      satisfied: isCurrentLayerSatisfied,
-      actionIds: collectedActionIds
-    };
-  }
-  /**
-   * 评估条件组的逻辑运算
-   */
-  evaluateGroupLogic(group, context) {
-    const { operator, rules } = group;
-    switch (operator) {
-      case "and":
-        return rules.every((rule) => this.evaluateRule(rule, context));
-      case "or":
-        return rules.some((rule) => this.evaluateRule(rule, context));
-      case "not":
-        if (rules.length === 0)
-          return false;
-        return !this.evaluateRule(rules[0], context);
-      default:
-        throw new Error(`Unknown operator: ${operator}`);
-    }
-  }
-  /**
-   * 评估单个规则
-   */
-  evaluateRule(rule, context) {
-    if (this.isConditionGroup(rule)) {
-      return this.evaluateGroupLogic(rule, context);
-    }
-    const conditionRule = rule;
-    if (conditionRule.type === "code" && conditionRule.code) {
-      return this.evaluateCodeCondition(conditionRule.code, context);
-    }
-    return this.evaluateOperatorCondition(conditionRule, context);
-  }
-  /**
-   * 评估代码模式条件
-   */
-  evaluateCodeCondition(code, context) {
-    try {
-      const { entities, attributes, metadata } = context;
-      const evalFunc = new Function(
-        "entities",
-        "attributes",
-        "metadata",
-        `return (${code})`
-      );
-      const result = evalFunc(entities, attributes, metadata);
-      return Boolean(result);
-    } catch (error) {
-      if (this.options.debug) {
-        console.error("Code evaluation error:", error);
-      }
-      return false;
-    }
-  }
-  /**
-   * 评估运算符模式条件
-   */
-  evaluateOperatorCondition(rule, context) {
-    const { field, operator, value } = rule;
-    if (!field || !operator) {
-      return false;
-    }
-    const fieldValue = this.getFieldValue(field, context);
-    const handler = this.operatorHandlers.get(operator);
-    if (handler) {
-      return handler(fieldValue, value, rule);
-    }
-    return this.evaluateBuiltInOperator(fieldValue, operator, value);
-  }
-  /**
-   * 获取字段值
-   */
-  getFieldValue(field, context) {
-    const path = field.split(".");
-    let value = context.attributes;
-    for (const key of path) {
-      if (value && typeof value === "object" && key in value) {
-        value = value[key];
-      } else {
-        return void 0;
-      }
-    }
-    return value;
-  }
-  /**
-   * 评估内置运算符
-   */
-  evaluateBuiltInOperator(fieldValue, operator, compareValue) {
-    switch (operator) {
-      case "=":
-      case "==":
-        return fieldValue == compareValue;
-      case "!=":
-        return fieldValue != compareValue;
-      case ">":
-        return fieldValue > compareValue;
-      case ">=":
-        return fieldValue >= compareValue;
-      case "<":
-        return fieldValue < compareValue;
-      case "<=":
-        return fieldValue <= compareValue;
-      case "in":
-        return Array.isArray(compareValue) && compareValue.includes(fieldValue);
-      case "not_in":
-        return Array.isArray(compareValue) && !compareValue.includes(fieldValue);
-      case "contains":
-        if (Array.isArray(fieldValue)) {
-          return fieldValue.includes(compareValue);
-        }
-        if (typeof fieldValue === "string") {
-          return fieldValue.includes(compareValue);
-        }
-        return false;
-      case "not_contains":
-        if (Array.isArray(fieldValue)) {
-          return !fieldValue.includes(compareValue);
-        }
-        if (typeof fieldValue === "string") {
-          return !fieldValue.includes(compareValue);
-        }
-        return true;
-      case "starts_with":
-        return typeof fieldValue === "string" && fieldValue.startsWith(compareValue);
-      case "ends_with":
-        return typeof fieldValue === "string" && fieldValue.endsWith(compareValue);
-      case "regex":
-        return typeof fieldValue === "string" && new RegExp(compareValue).test(fieldValue);
-      case "between":
-        if (!Array.isArray(compareValue) || compareValue.length !== 2)
-          return false;
-        return fieldValue >= compareValue[0] && fieldValue <= compareValue[1];
-      case "is_null":
-        return fieldValue === null || fieldValue === void 0;
-      case "is_not_null":
-        return fieldValue !== null && fieldValue !== void 0;
-      case "is_empty":
-        if (Array.isArray(fieldValue))
-          return fieldValue.length === 0;
-        if (typeof fieldValue === "string")
-          return fieldValue.length === 0;
-        if (typeof fieldValue === "object")
-          return Object.keys(fieldValue).length === 0;
-        return !fieldValue;
-      case "is_not_empty":
-        if (Array.isArray(fieldValue))
-          return fieldValue.length > 0;
-        if (typeof fieldValue === "string")
-          return fieldValue.length > 0;
-        if (typeof fieldValue === "object")
-          return Object.keys(fieldValue).length > 0;
-        return Boolean(fieldValue);
-      default:
-        throw new Error(`Unsupported operator: ${operator}`);
-    }
-  }
-  /**
-   * 根据 actionIds 获取 ActionEffect 对象
-   */
-  getActionsByIds(actionIds, actions) {
-    const matchedActions = [];
-    const actionMap = new Map(actions.map((action) => [action.id, action]));
-    for (const id of actionIds) {
-      const action = actionMap.get(id);
-      if (action) {
-        matchedActions.push(action);
-      } else {
-        if (this.options.debug) {
-          console.warn(`Action with id "${id}" not found in actions array`);
-        }
-      }
-    }
-    return matchedActions;
-  }
-  /**
-   * 按 priority 排序（降序）
-   */
-  sortActionsByPriority(actions) {
-    return [...actions].sort((a, b) => {
-      const priorityA = a.priority ?? 0;
-      const priorityB = b.priority ?? 0;
-      return priorityB - priorityA;
-    });
-  }
-  /**
-   * 判断是否为条件组
-   */
-  isConditionGroup(rule) {
-    return "operator" in rule && "rules" in rule && Array.isArray(rule.rules);
-  }
-  /**
-   * 验证配置
-   */
-  validateConfig(config) {
-    if (!config) {
-      throw new Error("Strategy config is required");
-    }
-    if (!config.metadata || !config.metadata.id) {
-      throw new Error("Strategy metadata.id is required");
-    }
-    if (!config.conditions) {
-      throw new Error("Strategy conditions is required");
-    }
-    if (!Array.isArray(config.actions)) {
-      throw new Error("Strategy actions must be an array");
-    }
-  }
-  /**
-   * 初始化内置运算符处理器
-   */
-  initializeBuiltInOperators() {
-  }
-  /**
-   * 注册自定义运算符
-   */
-  registerOperator(operator, handler) {
-    this.operatorHandlers.set(operator, handler);
-  }
-  /**
-   * 获取调试信息
-   */
-  getDebugInfo() {
-    return {
-      debug: this.options.debug,
-      enableTrace: this.options.enableTrace,
-      registeredOperators: Array.from(this.operatorHandlers.keys())
-    };
-  }
-};
-function createStrategyEngine(options) {
-  return new StrategyEngine(options);
-}
-function evaluate(config, context) {
-  const engine = new StrategyEngine();
-  return engine.evaluate(config, context);
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StrategyEngine,
   createStrategyEngine,
   evaluate,
+  ...require("./type"),
   ...require("./adapter")
 });

package/lib/modules/BaseModule.d.ts

@@ -17,4 +17,8 @@ export declare class BaseModule {
     effectsOn(eventType: string, callback: (payload: any) => void): () => void;
     effectsOff(eventType: string, callback: (payload: any) => void): void;
     effectsOnce(eventType: string, callback: (payload: any) => void): () => void;
+    effectsEmit(eventType: string, payload: any): Promise<{
+        status: boolean;
+        data: any;
+    }>;
 }

package/lib/modules/BaseModule.js

@@ -91,6 +91,9 @@ var BaseModule = class {
   effectsOnce(eventType, callback) {
     return this.core.effects.once(`${this.name}:${eventType}`, callback);
   }
+  effectsEmit(eventType, payload) {
+    return this.core.effects.emit(`${this.name}:${eventType}`, payload);
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Rules/index.d.ts

@@ -30,6 +30,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         discountList: Discount[];
         productList: any[];
     };
+    filterDiscountListByType(discountList: Discount[], type: string): Discount[];
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];
         productList: any[];

package/lib/modules/Rules/index.js

@@ -149,6 +149,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       productList: hasApplicableDiscount ? result.productList : productList
     };
   }
+  filterDiscountListByType(discountList, type) {
+    return (discountList || []).filter((item) => item.type === type || item.tag === type);
+  }
   calcDiscount({
     discountList,
     productList,
@@ -582,7 +585,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     const processedFlatItemsMap = /* @__PURE__ */ new Map();
     sortedFlattenedList.forEach((flatItem, index) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -697,6 +700,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           _h,
           (item) => item.type === "product"
         )));
+        if (product.inPromotion) {
+          isManualDiscount = false;
+        }
       } else {
         const parentProduct = flatItem.parentProduct;
         if (parentProduct) {
@@ -800,7 +806,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   }),
                   price: product.price
                 },
-                discount_list: []
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
             ]);
           } else {
@@ -811,18 +817,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   main_product_selling_price: product.price
                 } : {
                   _id: product._id.split("___")[0] + "___" + index,
-                  total: product.origin_total || product.total,
+                  total: product.inPromotion ? ((_u = product == null ? void 0 : product._promotion) == null ? void 0 : _u.finalPrice) ?? product.origin_total ?? product.total : product.origin_total || product.total,
                   price: product.price,
                   main_product_selling_price: product.price
                 },
-                discount_list: []
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
             ]);
           }
         } else {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
-            discount_list: [],
+            discount_list: this.filterDiscountListByType(((_v = flatItem.bundleItem) == null ? void 0 : _v.discount_list) || [], "promotion"),
             price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
             processed: true
           }]);
@@ -850,7 +856,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (splitCount < totalQuantity && isNeedSplit) {
           arr.push(
             this.hooks.setProduct(originProduct, {
-              discount_list: [],
+              discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
               quantity: totalQuantity - splitCount,
               _id: product._id.split("___")[0],
               total: product.origin_total || product.total
@@ -866,10 +872,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           }
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           let productOriginTotal = product.origin_total || product.total || 0;
-          if (((_u = product.discount_list) == null ? void 0 : _u.length) && product.origin_total) {
+          if (this.filterDiscountListByType(product.discount_list, "promotion").length && product.origin_total) {
             productOriginTotal = product.origin_total;
           }
-          if (Number(((_v = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _v.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+          if (Number(((_w = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _w.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
           const isOrderLevel = (0, import_utils3.isOrderLevelFixedAmountDiscount)(selectedDiscount2);
@@ -892,9 +898,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount,
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
-              discount_card_type: (_w = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _w.discount_card_type,
+              discount_card_type: (_x = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _x.discount_card_type,
               fixed_amount: amount,
-              discount_calculation_mode: (_x = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _x.discount_calculation_mode,
+              discount_calculation_mode: (_y = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _y.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.price,
@@ -942,7 +948,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           } else {
             arr.push(
               this.hooks.setProduct(originProduct, {
-                discount_list: [discountDetail],
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion").concat([discountDetail]),
                 _id: product._id.split("___")[0] + "___" + selectedDiscount2.id + index,
                 price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
@@ -978,7 +984,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               type: "good_pass",
               discount: {
                 fixed_amount: product.origin_total,
-                discount_calculation_mode: (_y = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _y.discount_calculation_mode,
+                discount_calculation_mode: (_z = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _z.discount_calculation_mode,
                 resource_id: selectedDiscount2.id,
                 title: selectedDiscount2.format_title,
                 original_amount: product.origin_total,
@@ -1052,9 +1058,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: fixedAmountPerItem * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
-              discount_card_type: (_z = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _z.discount_card_type,
+              discount_card_type: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_card_type,
               fixed_amount: fixedAmountPerItem,
-              discount_calculation_mode: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_calculation_mode,
+              discount_calculation_mode: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
@@ -1070,7 +1076,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             },
             config: selectedDiscount2 == null ? void 0 : selectedDiscount2.config,
-            _num: (product.num || 1) * (((_B = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _B.num) || 1)
+            _num: (product.num || 1) * (((_C = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _C.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);
@@ -1095,7 +1101,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           const getDefaultProduct = () => {
             if (product.isClient) {
               return this.hooks.setProduct(originProduct, {
-                discount_list: [],
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
                 price: product.price,
                 origin_total: (0, import_utils2.getProductOriginTotalPrice)({
                   product: {
@@ -1116,7 +1122,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               });
             } else {
               return this.hooks.setProduct(originProduct, {
-                discount_list: [],
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
                 total: product.total,
                 origin_total: product.origin_total,
                 price: product.price

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.71",
+  "version": "2.2.72",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",