@pisell/pisellos 0.0.567 → 0.0.569

package/lib/modules/BookingContext/utils/timeSlices.js

@@ -0,0 +1,114 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findNextDuration = findNextDuration;
+exports.findNextSlice = findNextSlice;
+Object.defineProperty(exports, "getDurationValue", {
+  enumerable: true,
+  get: function () {
+    return _flexible.getDurationValue;
+  }
+});
+exports.getEndDate = getEndDate;
+exports.sliceDayIntoFiveMinutes = sliceDayIntoFiveMinutes;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _flexible = require("./flexible");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 把一天切成等长时间槽，输出 timeSlices（开始时间标签）与 durationSlicesBasedOnTime（基于切片的时长选项）。
+ *
+ * 与 info2 `sliceDayIntoFiveMinutes` 行为等价；为了不依赖 `locales`，label 输出原始时间字符串（'08:00 AM' / '90'），
+ * UI 侧需要本地化展示时可基于 value 自行包装。
+ *
+ * @param config booking config `basic.service_time`，{ value: minutes }
+ * @param isDay 是否跨日预约（true 时按 1~30 天切片）
+ */
+function sliceDayIntoFiveMinutes(config, isDay) {
+  const startTime = (0, _dayjs.default)().startOf('day');
+  const endTime = (0, _dayjs.default)().endOf('day');
+  const timeSlice = config && config.value || 5;
+  const timeSlices = [];
+  const durationSlicesBasedOnTime = [];
+  let currentTime = startTime;
+  if (isDay) {
+    let currentDay = 1;
+    while (currentDay <= 30) {
+      timeSlices.push({
+        label: currentTime.format('hh:mm A'),
+        value: currentTime.format('HH:mm')
+      });
+      durationSlicesBasedOnTime.push({
+        label: String(currentDay),
+        value: currentDay
+      });
+      currentDay += 1;
+    }
+    return {
+      timeSlices,
+      durationSlicesBasedOnTime
+    };
+  }
+  while (currentTime.isBefore(endTime)) {
+    timeSlices.push({
+      label: currentTime.format('hh:mm A'),
+      value: currentTime.format('HH:mm')
+    });
+    const nextTime = currentTime.add(timeSlice, 'minute');
+    const durationValue = nextTime.diff(startTime, 'minute');
+    durationSlicesBasedOnTime.push({
+      label: String(durationValue),
+      value: durationValue
+    });
+    currentTime = nextTime;
+  }
+  return {
+    timeSlices,
+    durationSlicesBasedOnTime
+  };
+}
+
+/**
+ * 取「下一个 duration 选项」：优先用 defaultValue；否则在 array 中找匹配的；找不到取第一个。
+ * 与 info2 `findNextDuration` 等价。
+ */
+function findNextDuration(current, array, defaultValue) {
+  if (defaultValue !== undefined && defaultValue !== null) return defaultValue;
+  if (!array || array.length === 0) return undefined;
+  for (let i = 0; i < array.length; i += 1) {
+    if (array[i].value === current?.value) return array[i].value;
+  }
+  return array[0].value;
+}
+
+/** 取首选 time slice：若指定 date（HH:mm）则找第一个 >= date 的；否则第一个。 */
+function findNextSlice(params) {
+  const {
+    timeSlices,
+    index = 0,
+    date = ''
+  } = params;
+  const currentTimeValue = date || (0, _dayjs.default)().format('HH:mm');
+  for (let i = 0; i < timeSlices.length; i += 1) {
+    if (timeSlices[i].value !== 'now' && timeSlices[i].value >= currentTimeValue) {
+      return timeSlices[i].value;
+    }
+  }
+  return timeSlices[index]?.value;
+}
+
+/** 取 endDate；duration='flexible' 时取 endDate 与店铺营业时间的较小值，否则 startDate + duration 分钟。 */
+function getEndDate(startDate, duration, endDate, shopOpeningHours) {
+  if (duration === 'flexible') {
+    let openingDate = (0, _dayjs.default)(`${startDate.format('YYYY-MM-DD')} ${shopOpeningHours || '23:59'}`);
+    if ((0, _dayjs.default)(startDate).isAfter(openingDate)) {
+      openingDate = openingDate.add(1, 'day');
+    }
+    if (!endDate) return openingDate;
+    const endDateObj = (0, _dayjs.default)(endDate);
+    if (endDateObj.isAfter(openingDate)) return openingDate;
+    return endDateObj;
+  }
+  return startDate.add(Number(duration), 'minute');
+}

package/lib/modules/Cart/index.js

@@ -1,90 +1,108 @@
-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 });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {
+  CartModule: true,
+  getProductDeposit: 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 });
+exports.CartModule = void 0;
+Object.defineProperty(exports, "getProductDeposit", {
+  enumerable: true,
+  get: function () {
+    return _utils.getProductDeposit;
   }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/modules/Cart/index.ts
-var Cart_exports = {};
-__export(Cart_exports, {
-  CartModule: () => CartModule,
-  getProductDeposit: () => import_utils3.getProductDeposit
 });
-module.exports = __toCommonJS(Cart_exports);
-var import_BaseModule = require("../BaseModule");
-var import_types = require("./types");
-var import_utils = require("./utils");
-var import_lodash_es = require("lodash-es");
-var import_utils2 = require("../Product/utils");
-__reExport(Cart_exports, require("./types"), module.exports);
-var import_utils3 = require("./utils");
-var CartModule = class extends import_BaseModule.BaseModule {
+var _BaseModule = require("../BaseModule");
+var _types = require("./types");
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _types[key];
+    }
+  });
+});
+var _utils = require("./utils");
+var _lodashEs = require("lodash-es");
+var _utils2 = require("../Product/utils");
+/**
+ * 购物车模块实现
+ */
+class CartModule extends _BaseModule.BaseModule {
+  // 提供给 baseModule 用的默认名称 和 默认版本
+  defaultName = 'cart';
+  defaultVersion = '1.0.0';
+  request;
+  window;
+  store;
+  cacheId;
+  openCache = false;
+  fatherModule;
   constructor(name, version) {
-    super(name || "cart", version || "1.0.0");
-    // 提供给 baseModule 用的默认名称 和 默认版本
-    this.defaultName = "cart";
-    this.defaultVersion = "1.0.0";
-    this.openCache = false;
+    super(name || 'cart', version || '1.0.0');
   }
+
   /**
    * 初始化购物车模块
    */
   async initialize(core, options) {
-    var _a, _b, _c;
     this.core = core;
     this.store = options.store;
-    if (Array.isArray((_a = options.initialState) == null ? void 0 : _a.list)) {
+    if (Array.isArray(options.initialState?.list)) {
       this.store.list = options.initialState.list;
       this.core.effects.emit(`${this.name}:changed`, this.store.list);
     } else {
       this.store.list = [];
     }
-    if ((_b = options.otherParams) == null ? void 0 : _b.cacheId) {
+    if (options.otherParams?.cacheId) {
       this.openCache = options.otherParams.openCache;
       this.cacheId = options.otherParams.cacheId;
     }
-    if ((_c = options.otherParams) == null ? void 0 : _c.fatherModule) {
+    if (options.otherParams?.fatherModule) {
       this.fatherModule = options.otherParams.fatherModule;
     }
-    this.request = core.getPlugin("request");
-    this.window = core.getPlugin("window");
+
+    // 获取依赖的插件
+    this.request = core.getPlugin('request');
+    this.window = core.getPlugin('window');
     if (!this.request) {
-      throw new Error("购物车模块需要 request 插件支持");
+      throw new Error('购物车模块需要 request 插件支持');
     }
     if (!this.window) {
-      throw new Error("购物车模块需要 window 插件支持");
+      throw new Error('购物车模块需要 window 插件支持');
     }
-    console.log("[CartModule] 初始化完成");
+    // this.store.temp = {};
   }
+
   /**
    * 添加商品到购物车
    */
   async addItem(params) {
-    const { account, product, bundle, options, date, quantity = 1 } = params;
+    const {
+      account,
+      product,
+      bundle,
+      options,
+      date,
+      quantity = 1
+    } = params;
+    // 生成一个唯一的 ID
     let cartItem = {
-      _id: (0, import_utils.getUniqueId)(),
-      _origin: (0, import_utils.createCartItemOrigin)()
+      _id: (0, _utils.getUniqueId)(),
+      _origin: (0, _utils.createCartItemOrigin)()
     };
     if (product) {
-      const newProduct = (0, import_utils.handleVariantProduct)(product);
-      cartItem._productOrigin = (0, import_lodash_es.cloneDeep)(newProduct);
-      cartItem._productInit = (0, import_lodash_es.cloneDeep)(newProduct);
-      cartItem._bundleOrigin = (0, import_lodash_es.cloneDeep)(bundle);
-      cartItem._optionsOrigin = (0, import_lodash_es.cloneDeep)(options);
-      cartItem = (0, import_utils.formatProductToCartItem)({
+      const newProduct = (0, _utils.handleVariantProduct)(product);
+      cartItem._productOrigin = (0, _lodashEs.cloneDeep)(newProduct);
+      cartItem._productInit = (0, _lodashEs.cloneDeep)(newProduct);
+      cartItem._bundleOrigin = (0, _lodashEs.cloneDeep)(bundle);
+      cartItem._optionsOrigin = (0, _lodashEs.cloneDeep)(options);
+      cartItem = (0, _utils.formatProductToCartItem)({
         cartItem,
         product: newProduct,
         bundle,
@@ -94,43 +112,61 @@ var CartModule = class extends import_BaseModule.BaseModule {
       });
     }
     if (account) {
-      cartItem = (0, import_utils.formatAccountToCartItem)({ cartItem, account });
+      cartItem = (0, _utils.formatAccountToCartItem)({
+        cartItem,
+        account
+      });
     }
     if (date) {
-      cartItem = (0, import_utils.formatDateToCartItem)({ cartItem, date });
+      cartItem = (0, _utils.formatDateToCartItem)({
+        cartItem,
+        date
+      });
     }
+
+    // 更新购物车数据
     const items = [...this.store.list, cartItem];
     this.store.list = items;
+
+    // 触发事件
     await this.core.effects.emit(`${this.name}:onAddItem`, cartItem);
   }
+
   /**
    * 更新购物车信息
    */
   async updateItem(params) {
     try {
       const tempCartItem = this.formatCartItem(params);
-      const items = this.store.list.map((item) => {
-        if (item._id === (tempCartItem == null ? void 0 : tempCartItem._id)) {
+      // 更新购物车数据
+      const items = this.store.list.map(item => {
+        if (item._id === tempCartItem?._id) {
           return tempCartItem;
         }
         return item;
       });
       this.store.list = [...items];
+      // 触发事件
       await this.core.effects.emit(`${this.name}:onUpdateItem`, tempCartItem);
     } catch (error) {
-      console.error("[CartModule] 更新购物车商品失败", error);
+      console.error('[CartModule] 更新购物车商品失败', error);
     }
   }
+
   // 更新购物车中商品的初始信息
   // 为什么会有这个操作，主要服务于报价单和商品券
   // 商品券那边会使用 init 的 price 做计算，而报价单那边就需要修改 init 的 price 来辅助商品计算
   async updateItemInitInfo(params) {
-    const { _id, product } = params;
-    const cartItem = this.store.list.find((i) => i._id === _id);
+    const {
+      _id,
+      product
+    } = params;
+    const cartItem = this.store.list.find(i => i._id === _id);
     if (cartItem) {
-      cartItem._productInit = (0, import_lodash_es.cloneDeep)(product);
+      cartItem._productInit = (0, _lodashEs.cloneDeep)(product);
     }
   }
+
   /**
    * 格式化数据到购物车
    */
@@ -150,22 +186,22 @@ var CartModule = class extends import_BaseModule.BaseModule {
       osWarnTips
     } = params;
     let quantity = params.quantity;
-    let tempCartItem = this.store.list.find((i) => i._id === _id);
-    if (!quantity && (tempCartItem == null ? void 0 : tempCartItem.num)) {
-      quantity = (tempCartItem == null ? void 0 : tempCartItem.num) || 1;
+    let tempCartItem = this.store.list.find(i => i._id === _id);
+    if (!quantity && tempCartItem?.num) {
+      quantity = tempCartItem?.num || 1;
     }
     if (!tempCartItem) {
-      throw new Error("[CartModule] 格式化数据到购物车失败，商品不存在");
+      throw new Error('[CartModule] 格式化数据到购物车失败，商品不存在');
     }
     if (cartItem) {
       tempCartItem = cartItem;
     }
     if (product) {
-      const newProduct = (0, import_utils.handleVariantProduct)(product);
-      tempCartItem._productOrigin = (0, import_lodash_es.cloneDeep)(newProduct);
-      tempCartItem._bundleOrigin = (0, import_lodash_es.cloneDeep)(bundle);
-      tempCartItem._optionsOrigin = (0, import_lodash_es.cloneDeep)(options);
-      tempCartItem = (0, import_utils.formatProductToCartItem)({
+      const newProduct = (0, _utils.handleVariantProduct)(product);
+      tempCartItem._productOrigin = (0, _lodashEs.cloneDeep)(newProduct);
+      tempCartItem._bundleOrigin = (0, _lodashEs.cloneDeep)(bundle);
+      tempCartItem._optionsOrigin = (0, _lodashEs.cloneDeep)(options);
+      tempCartItem = (0, _utils.formatProductToCartItem)({
         cartItem: tempCartItem,
         product: newProduct,
         bundle,
@@ -176,112 +212,128 @@ var CartModule = class extends import_BaseModule.BaseModule {
       });
     }
     if (discounts) {
-      tempCartItem = (0, import_utils.formatDiscountToCartItem)({
+      tempCartItem = (0, _utils.formatDiscountToCartItem)({
         cartItem: tempCartItem,
         discounts
       });
     }
     if (account) {
-      tempCartItem = (0, import_utils.formatAccountToCartItem)({
+      tempCartItem = (0, _utils.formatAccountToCartItem)({
         cartItem: tempCartItem,
         account
       });
     }
     if (resources) {
-      tempCartItem = (0, import_utils.formatResourceToCartItem)({
+      tempCartItem = (0, _utils.formatResourceToCartItem)({
         cartItem: tempCartItem,
         resources
       });
     }
     if (relationForms) {
-      tempCartItem = (0, import_utils.formatRelationFormsToCartItem)({
+      tempCartItem = (0, _utils.formatRelationFormsToCartItem)({
         cartItem: tempCartItem,
         relationForms
       });
     }
     if (date) {
-      tempCartItem = (0, import_utils.formatDateToCartItem)({ cartItem: tempCartItem, date });
+      tempCartItem = (0, _utils.formatDateToCartItem)({
+        cartItem: tempCartItem,
+        date
+      });
     }
     if (note) {
-      tempCartItem = (0, import_utils.formatNoteToCartItem)({ cartItem: tempCartItem, note });
+      tempCartItem = (0, _utils.formatNoteToCartItem)({
+        cartItem: tempCartItem,
+        note
+      });
     }
     if (osWarnTips) {
       tempCartItem.osWarnTips = osWarnTips;
     }
     return tempCartItem;
   }
+
   /**
    * 批量设置购物车数据
    */
   async batchSetItems(items) {
-    this.store.list = [...items || []];
+    this.store.list = [...(items || [])];
   }
+
   /**
    * 获取购物车商品
    */
   getItems() {
     return this.store.list;
   }
+
   /**
    * 获取购物车商品--通过购物车 id 获取单条
    */
   getItem(id) {
-    return this.store.list.find((item) => item._id === id);
+    return this.store.list.find(item => item._id === id);
   }
+
   /**
    * 根据账户ID获取购物车
    */
   getCartByAccount(account_id) {
-    return this.store.list.filter(
-      (item) => item.holder_id === account_id
-    );
+    return this.store.list.filter(item => item.holder_id === account_id);
   }
+
   /**
    * 移除购物车商品
    */
   async removeItem(id) {
-    const items = this.store.list.filter((i) => i._id !== id);
+    const items = this.store.list.filter(i => i._id !== id);
     this.store.list = items;
     await this.core.effects.emit(`${this.name}:onRemoveItem`, items);
   }
+
   /**
    * 根据账户ID清除购物车
    */
   clearCartByAccount(account_id) {
-    const items = this.store.list.filter(
-      (item) => item.holder_id !== account_id
-    );
-    this.store.list = [...items || []];
+    const items = this.store.list.filter(item => item.holder_id !== account_id);
+    this.store.list = [...(items || [])];
   }
+
   /**
    * 清除购物车商品中的信息
    * @param type 清除购物车商品中的信息类型
    * @param _id 购物车商品ID
    */
   deleteCartItemInfo(type, _id) {
-    const list = this.store.list.map((item) => {
+    const list = this.store.list.map(item => {
       const needDelete = _id ? item._id === _id : true;
+
+      // 如果存在_id，则只需要操作对应的购物车数据，否则操作所有
       if (!needDelete) {
         return item;
       }
       switch (type) {
-        case import_types.ECartItemInfoType.Resource:
-          item = (0, import_utils.deleteResourceFromCartItem)(item);
+        case _types.ECartItemInfoType.Resource:
+          // 清除购物车商品中的资源信息
+          item = (0, _utils.deleteResourceFromCartItem)(item);
           break;
-        case import_types.ECartItemInfoType.Time:
-          item = (0, import_utils.deleteTimeFromCartItem)(item);
+        case _types.ECartItemInfoType.Time:
+          // 清除购物车商品中的时间信息
+          item = (0, _utils.deleteTimeFromCartItem)(item);
           break;
-        case import_types.ECartItemInfoType.RelationForms:
-          item = (0, import_utils.deleteRelationFormsFromCartItem)(item);
+        case _types.ECartItemInfoType.RelationForms:
+          // 清除购物车商品中的关联表单信息
+          item = (0, _utils.deleteRelationFormsFromCartItem)(item);
           break;
-        case import_types.ECartItemInfoType.Holder:
-          item = (0, import_utils.deleteHolderFromCartItem)(item);
+        case _types.ECartItemInfoType.Holder:
+          // 清除购物车商品中的账户信息
+          item = (0, _utils.deleteHolderFromCartItem)(item);
           break;
       }
       return item;
     });
     this.store.list = [...list];
   }
+
   /**
    * 清除购物车
    */
@@ -290,15 +342,14 @@ var CartModule = class extends import_BaseModule.BaseModule {
   }
   storeChange() {
     if (this.openCache) {
-      const store = (0, import_lodash_es.cloneDeep)(this.store);
-      store.list = store.list.filter(
-        (item, index, self) => index === self.findIndex((t) => t._id === item._id)
-      );
+      const store = (0, _lodashEs.cloneDeep)(this.store);
+      // store里的 list 要主动基于 id 做下去重，避免重复写入
+      store.list = store.list.filter((item, index, self) => index === self.findIndex(t => t._id === item._id));
       this.checkSaveCache({
         cacheId: this.cacheId,
         fatherModule: this.fatherModule,
         store,
-        cacheKey: ["list"]
+        cacheKey: ['list']
       });
     }
   }
@@ -313,21 +364,22 @@ var CartModule = class extends import_BaseModule.BaseModule {
       relation_forms
     } = cartItem._origin || {};
     switch (type) {
-      case import_types.ECartItemCheckType.Account:
-        result = !!holder || !!(metadata == null ? void 0 : metadata.account);
+      case _types.ECartItemCheckType.Account:
+        result = !!holder || !!metadata?.account;
         break;
-      case import_types.ECartItemCheckType.Resources:
-        result = !!(resources == null ? void 0 : resources.length);
+      case _types.ECartItemCheckType.Resources:
+        result = !!resources?.length;
         break;
-      case import_types.ECartItemCheckType.Date:
+      case _types.ECartItemCheckType.Date:
         result = !!start_date && !!end_date;
         break;
-      case import_types.ECartItemCheckType.RelationForms:
-        result = !!(relation_forms == null ? void 0 : relation_forms.length);
+      case _types.ECartItemCheckType.RelationForms:
+        result = !!relation_forms?.length;
         break;
     }
     return result;
   }
+
   /**
    * 基于rowkey 合并商品，目前只有普通商品需要合并
    *
@@ -337,17 +389,16 @@ var CartModule = class extends import_BaseModule.BaseModule {
    * @memberof CartModule
    */
   mergeCartItemByRowKey(params) {
-    const { rowKey, quantity, account } = params;
+    const {
+      rowKey,
+      quantity,
+      account
+    } = params;
     let flag = false;
     const cartItems = this.getItems();
-    const targetCartItem = cartItems.find(
-      (n) => {
-        var _a;
-        return ((_a = n._productOrigin) == null ? void 0 : _a.rowKey) === rowKey;
-      }
-    );
-    const isSameAccount = (account == null ? void 0 : account.id) === (targetCartItem == null ? void 0 : targetCartItem.holder_id);
-    if (rowKey && targetCartItem && (0, import_utils2.isNormalProduct)(targetCartItem._productOrigin) && isSameAccount) {
+    const targetCartItem = cartItems.find(n => n._productOrigin?.rowKey === rowKey);
+    const isSameAccount = account?.id === targetCartItem?.holder_id;
+    if (rowKey && targetCartItem && (0, _utils2.isNormalProduct)(targetCartItem._productOrigin) && isSameAccount) {
       this.updateItem({
         _id: targetCartItem._id,
         product: {
@@ -359,10 +410,5 @@ var CartModule = class extends import_BaseModule.BaseModule {
     }
     return flag;
   }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  CartModule,
-  getProductDeposit,
-  ...require("./types")
-});
+}
+exports.CartModule = CartModule;