@pisell/pisellos 2.2.283 → 2.2.285

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

@@ -1,162 +1,161 @@
-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/modules/BookingContext/utils/serviceTimes.ts
-var serviceTimes_exports = {};
-__export(serviceTimes_exports, {
-  applySessionTimesToExtend: () => applySessionTimesToExtend,
-  formatDayDate: () => formatDayDate,
-  getDays: () => getDays,
-  getDurationValue: () => import_flexible.getDurationValue,
-  getServeStartTime: () => getServeStartTime,
-  getServiceTimes: () => getServiceTimes,
-  getSessionFromItem: () => getSessionFromItem,
-  isBookingProduct: () => isBookingProduct,
-  isMultiDayProduct: () => isMultiDayProduct,
-  isSessionProduct: () => isSessionProduct
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.applySessionTimesToExtend = applySessionTimesToExtend;
+exports.formatDayDate = formatDayDate;
+exports.getDays = getDays;
+Object.defineProperty(exports, "getDurationValue", {
+  enumerable: true,
+  get: function () {
+    return _flexible.getDurationValue;
+  }
 });
-module.exports = __toCommonJS(serviceTimes_exports);
-var import_dayjs = __toESM(require("dayjs"));
-var import_flexible = require("./flexible");
+exports.getServeStartTime = getServeStartTime;
+exports.getServiceTimes = getServiceTimes;
+exports.getSessionFromItem = getSessionFromItem;
+exports.isBookingProduct = isBookingProduct;
+exports.isMultiDayProduct = isMultiDayProduct;
+exports.isSessionProduct = isSessionProduct;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _flexible = require("./flexible");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 判断商品是否为跨日预约（duration.type === 'days'）。与 info2 isMultiDayProduct 等价。
+ */
 function isMultiDayProduct(product) {
-  var _a;
-  return ((_a = product == null ? void 0 : product.duration) == null ? void 0 : _a.type) === "days";
+  return product?.duration?.type === 'days';
 }
+
+/**
+ * 判断 cacheItem 是否为 session 商品（extension_type ∈ session_product / session_ticket）。
+ */
 function isSessionProduct(cacheItem) {
-  return ["session_product", "session_ticket"].includes(cacheItem == null ? void 0 : cacheItem.extension_type);
+  return ['session_product', 'session_ticket'].includes(cacheItem?.extension_type);
 }
+
+/** 从 catalog `cartDetailValue` 或 `_extend.other` 取 session 快照。 */
 function getSessionFromItem(item) {
-  var _a, _b, _c;
-  const session = ((_a = item == null ? void 0 : item.cartDetailValue) == null ? void 0 : _a.session) ?? ((_c = (_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.session);
-  return session && typeof session === "object" ? session : null;
+  const session = item?.cartDetailValue?.session ?? item?._extend?.other?.session;
+  return session && typeof session === 'object' ? session : null;
 }
+
+/**
+ * 将 cartDetailValue.session 写入 _extend 的起止时间（与 info2 getServiceStartTimeAndEndTime 的 session 分支一致）。
+ * 日历日优先用 ctx.date，时分取自 session.start_at / end_at 或 session.start_time / end_time。
+ */
 function applySessionTimesToExtend(item, extend, ctx) {
-  var _a;
-  const session = ((_a = extend == null ? void 0 : extend.other) == null ? void 0 : _a.session) ?? getSessionFromItem(item);
+  const session = extend?.other?.session ?? getSessionFromItem(item);
   if (!session || !isSessionProduct(item)) {
     return extend;
   }
-  const baseDate = (ctx == null ? void 0 : ctx.date) ? (0, import_dayjs.default)(ctx.date) : (0, import_dayjs.default)();
-  const startAt = (0, import_dayjs.default)(
-    `${baseDate.format("YYYY-MM-DD")} ${(0, import_dayjs.default)(session.start_at).format("HH:mm:ss")}`
-  );
-  const endAt = (0, import_dayjs.default)(
-    `${baseDate.format("YYYY-MM-DD")} ${(0, import_dayjs.default)(session.end_at).format("HH:mm:ss")}`
-  );
+  const baseDate = ctx?.date ? (0, _dayjs.default)(ctx.date) : (0, _dayjs.default)();
+  const startAt = (0, _dayjs.default)(`${baseDate.format('YYYY-MM-DD')} ${(0, _dayjs.default)(session.start_at).format('HH:mm:ss')}`);
+  const endAt = (0, _dayjs.default)(`${baseDate.format('YYYY-MM-DD')} ${(0, _dayjs.default)(session.end_at).format('HH:mm:ss')}`);
   const nextExtend = {
     ...extend,
-    other: { ...extend.other || {}, session },
+    other: {
+      ...(extend.other || {}),
+      session
+    },
     start_date: startAt,
     startDate: startAt,
-    start_time: session.start_time ?? (0, import_dayjs.default)(session.start_at).format("HH:mm"),
+    start_time: session.start_time ?? (0, _dayjs.default)(session.start_at).format('HH:mm'),
     end_date: endAt,
     endDate: endAt,
-    end_time: session.end_time ?? (0, import_dayjs.default)(session.end_at).format("HH:mm")
+    end_time: session.end_time ?? (0, _dayjs.default)(session.end_at).format('HH:mm')
   };
   return {
     ...nextExtend,
-    duration: getDays({ _extend: nextExtend }, "minutes")
+    duration: getDays({
+      _extend: nextExtend
+    }, 'minutes')
   };
 }
+
+/**
+ * 是否应写入 booking（与 Product.utils isNormalProduct 对齐，并覆盖 session_ticket / cartDetailValue.session）。
+ */
 function isBookingProduct(item) {
-  var _a, _b;
-  if (!item)
-    return false;
-  if (item.duration)
-    return true;
-  if ((_a = item == null ? void 0 : item.schedules) == null ? void 0 : _a.length)
-    return true;
-  if ((_b = item == null ? void 0 : item["schedule.ids"]) == null ? void 0 : _b.length)
-    return true;
-  if (isSessionProduct(item))
-    return true;
-  if (getSessionFromItem(item))
-    return true;
+  if (!item) return false;
+  if (item.duration) return true;
+  if (item?.schedules?.length) return true;
+  if (item?.['schedule.ids']?.length) return true;
+  if (isSessionProduct(item)) return true;
+  if (getSessionFromItem(item)) return true;
   return false;
 }
+
+/**
+ * 处理 'now' 时间占位：'now' → 当前 HH:mm；其他原样返回。
+ * 与 info2 `getServeStartTime` 等价。
+ */
 function getServeStartTime(startTime) {
-  if (startTime === "now")
-    return (0, import_dayjs.default)().format("HH:mm");
-  return startTime || "";
+  if (startTime === 'now') return (0, _dayjs.default)().format('HH:mm');
+  return startTime || '';
 }
+
+/**
+ * 计算商品的开始结束时间（统一为 dayjs 实例）。
+ * 与 info2 `getServiceTimes` 行为等价：
+ *   - 跨日商品：startDate = start_date + start_time，endDate = _extend.end_date 原样
+ *   - session 商品：从 _extend.other.session 取 start_at / end_at
+ *   - 普通商品：startDate + duration（含 flexible 处理）
+ */
 function getServiceTimes(service) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
-  const startDate = (0, import_dayjs.default)(
-    `${(0, import_dayjs.default)((_a = service == null ? void 0 : service._extend) == null ? void 0 : _a.start_date).format("YYYY-MM-DD")} ${getServeStartTime(
-      (_b = service == null ? void 0 : service._extend) == null ? void 0 : _b.start_time
-    )}`
-  );
+  const startDate = (0, _dayjs.default)(`${(0, _dayjs.default)(service?._extend?.start_date).format('YYYY-MM-DD')} ${getServeStartTime(service?._extend?.start_time)}`);
   if (isMultiDayProduct(service)) {
-    const startTime = getServeStartTime((_c = service == null ? void 0 : service._extend) == null ? void 0 : _c.start_time);
-    const endDateRaw = ((_d = service == null ? void 0 : service._extend) == null ? void 0 : _d.end_date) ?? ((_e = service == null ? void 0 : service._extend) == null ? void 0 : _e.endDate);
-    const endBase = (0, import_dayjs.default)(endDateRaw);
-    const endDate2 = endBase.isValid() ? (0, import_dayjs.default)(`${endBase.format("YYYY-MM-DD")} ${startTime}`) : endBase;
+    const startTime = getServeStartTime(service?._extend?.start_time);
+    const endDateRaw = service?._extend?.end_date ?? service?._extend?.endDate;
+    const endBase = (0, _dayjs.default)(endDateRaw);
+    // 跨日结束日保留与开始相同的时刻（如 11:24），避免 end_date 仅日期时被解析为 00:00
+    const endDate = endBase.isValid() ? (0, _dayjs.default)(`${endBase.format('YYYY-MM-DD')} ${startTime}`) : endBase;
     return {
       startDate,
-      endDate: endDate2
+      endDate
     };
   }
-  const session = (_g = (_f = service == null ? void 0 : service._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.session;
+  const session = service?._extend?.other?.session;
   if (isSessionProduct(service) && session) {
     return {
-      startDate: (0, import_dayjs.default)(session.start_at),
-      endDate: (0, import_dayjs.default)(session.end_at)
+      startDate: (0, _dayjs.default)(session.start_at),
+      endDate: (0, _dayjs.default)(session.end_at)
     };
   }
-  const endDate = startDate.add(import_flexible.flexibleObj.getValue((_h = service == null ? void 0 : service._extend) == null ? void 0 : _h.duration), "minute");
-  return { startDate, endDate };
+  const endDate = startDate.add(_flexible.flexibleObj.getValue(service?._extend?.duration), 'minute');
+  return {
+    startDate,
+    endDate
+  };
 }
+
+/**
+ * 跨日预约相关：把 _extend.start_date / end_date 都对齐到 dayjs startOf('day')。
+ * 与 info2 `formatDayDate` 等价。
+ */
 function formatDayDate(_extend) {
   return {
-    start_date: (0, import_dayjs.default)(_extend == null ? void 0 : _extend.start_date).startOf("day"),
-    end_date: (0, import_dayjs.default)(_extend == null ? void 0 : _extend.end_date).startOf("day")
+    start_date: (0, _dayjs.default)(_extend?.start_date).startOf('day'),
+    end_date: (0, _dayjs.default)(_extend?.end_date).startOf('day')
   };
 }
+
+/**
+ * 计算跨日预约时长：
+ *   - type='days' → end - start 的天数
+ *   - type='minutes' → end - start 的分钟数
+ * 与 info2 `getDays` 等价。
+ */
 function getDays(cacheItem, type) {
-  var _a, _b;
-  if (type === "days") {
-    const { start_date, end_date } = formatDayDate(cacheItem._extend);
-    return end_date.diff(start_date, "day");
+  if (type === 'days') {
+    const {
+      start_date,
+      end_date
+    } = formatDayDate(cacheItem._extend);
+    return end_date.diff(start_date, 'day');
   }
-  const startDate = (0, import_dayjs.default)((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.start_date);
-  const endDate = (0, import_dayjs.default)((_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.end_date);
+  const startDate = (0, _dayjs.default)(cacheItem?._extend?.start_date);
+  const endDate = (0, _dayjs.default)(cacheItem?._extend?.end_date);
   return endDate.diff(startDate, type);
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  applySessionTimesToExtend,
-  formatDayDate,
-  getDays,
-  getDurationValue,
-  getServeStartTime,
-  getServiceTimes,
-  getSessionFromItem,
-  isBookingProduct,
-  isMultiDayProduct,
-  isSessionProduct
-});
+}

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

@@ -1,58 +1,45 @@
-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/modules/BookingContext/utils/timeSlices.ts
-var timeSlices_exports = {};
-__export(timeSlices_exports, {
-  findNextDuration: () => findNextDuration,
-  findNextSlice: () => findNextSlice,
-  getDurationValue: () => import_flexible.getDurationValue,
-  getEndDate: () => getEndDate,
-  sliceDayIntoFiveMinutes: () => sliceDayIntoFiveMinutes
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findNextDuration = findNextDuration;
+exports.findNextSlice = findNextSlice;
+Object.defineProperty(exports, "getDurationValue", {
+  enumerable: true,
+  get: function () {
+    return _flexible.getDurationValue;
+  }
 });
-module.exports = __toCommonJS(timeSlices_exports);
-var import_dayjs = __toESM(require("dayjs"));
-var import_flexible = require("./flexible");
-var timeSlicesCache = /* @__PURE__ */ new Map();
+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 }; }
+const timeSlicesCache = new Map();
 function copyTimeSlices(result) {
   return {
     timeSlices: [...result.timeSlices],
     durationSlicesBasedOnTime: [...result.durationSlicesBasedOnTime]
   };
 }
+
+/**
+ * 把一天切成等长时间槽，输出 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 timeSlice = config && config.value || 5;
-  const cacheKey = isDay ? "days" : `minutes:${timeSlice}`;
+  const cacheKey = isDay ? 'days' : `minutes:${timeSlice}`;
   const cached = timeSlicesCache.get(cacheKey);
-  if (cached)
-    return copyTimeSlices(cached);
-  const startTime = (0, import_dayjs.default)().startOf("day");
-  const endTime = (0, import_dayjs.default)().endOf("day");
+  if (cached) return copyTimeSlices(cached);
+  const startTime = (0, _dayjs.default)().startOf('day');
+  const endTime = (0, _dayjs.default)().endOf('day');
   const timeSlices = [];
   const durationSlicesBasedOnTime = [];
   let currentTime = startTime;
@@ -60,8 +47,8 @@ function sliceDayIntoFiveMinutes(config, isDay) {
     let currentDay = 1;
     while (currentDay <= 30) {
       timeSlices.push({
-        label: currentTime.format("hh:mm A"),
-        value: currentTime.format("HH:mm")
+        label: currentTime.format('hh:mm A'),
+        value: currentTime.format('HH:mm')
       });
       durationSlicesBasedOnTime.push({
         label: String(currentDay),
@@ -69,71 +56,74 @@ function sliceDayIntoFiveMinutes(config, isDay) {
       });
       currentDay += 1;
     }
-    const result2 = { timeSlices, durationSlicesBasedOnTime };
-    timeSlicesCache.set(cacheKey, result2);
-    return copyTimeSlices(result2);
+    const result = {
+      timeSlices,
+      durationSlicesBasedOnTime
+    };
+    timeSlicesCache.set(cacheKey, result);
+    return copyTimeSlices(result);
   }
   while (currentTime.isBefore(endTime)) {
     timeSlices.push({
-      label: currentTime.format("hh:mm A"),
-      value: currentTime.format("HH:mm")
+      label: currentTime.format('hh:mm A'),
+      value: currentTime.format('HH:mm')
     });
-    const nextTime = currentTime.add(timeSlice, "minute");
-    const durationValue = nextTime.diff(startTime, "minute");
+    const nextTime = currentTime.add(timeSlice, 'minute');
+    const durationValue = nextTime.diff(startTime, 'minute');
     durationSlicesBasedOnTime.push({
       label: String(durationValue),
       value: durationValue
     });
     currentTime = nextTime;
   }
-  const result = { timeSlices, durationSlicesBasedOnTime };
+  const result = {
+    timeSlices,
+    durationSlicesBasedOnTime
+  };
   timeSlicesCache.set(cacheKey, result);
   return copyTimeSlices(result);
 }
+
+/**
+ * 取「下一个 duration 选项」：优先用 defaultValue；否则在 array 中找匹配的；找不到取第一个。
+ * 与 info2 `findNextDuration` 等价。
+ */
 function findNextDuration(current, array, defaultValue) {
-  if (defaultValue !== void 0 && defaultValue !== null)
-    return defaultValue;
-  if (!array || array.length === 0)
-    return void 0;
+  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 == null ? void 0 : current.value))
-      return array[i].value;
+    if (array[i].value === current?.value) return array[i].value;
   }
   return array[0].value;
 }
+
+/** 取首选 time slice：若指定 date（HH:mm）则找第一个 >= date 的；否则第一个。 */
 function findNextSlice(params) {
-  var _a;
-  const { timeSlices, index = 0, date = "" } = params;
-  const currentTimeValue = date || (0, import_dayjs.default)().format("HH:mm");
+  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) {
+    if (timeSlices[i].value !== 'now' && timeSlices[i].value >= currentTimeValue) {
       return timeSlices[i].value;
     }
   }
-  return (_a = timeSlices[index]) == null ? void 0 : _a.value;
+  return timeSlices[index]?.value;
 }
+
+/** 取 endDate；duration='flexible' 时取 endDate 与店铺营业时间的较小值，否则 startDate + duration 分钟。 */
 function getEndDate(startDate, duration, endDate, shopOpeningHours) {
-  if (duration === "flexible") {
-    let openingDate = (0, import_dayjs.default)(
-      `${startDate.format("YYYY-MM-DD")} ${shopOpeningHours || "23:59"}`
-    );
-    if ((0, import_dayjs.default)(startDate).isAfter(openingDate)) {
-      openingDate = openingDate.add(1, "day");
+  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, import_dayjs.default)(endDate);
-    if (endDateObj.isAfter(openingDate))
-      return openingDate;
+    if (!endDate) return openingDate;
+    const endDateObj = (0, _dayjs.default)(endDate);
+    if (endDateObj.isAfter(openingDate)) return openingDate;
     return endDateObj;
   }
-  return startDate.add(Number(duration), "minute");
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  findNextDuration,
-  findNextSlice,
-  getDurationValue,
-  getEndDate,
-  sliceDayIntoFiveMinutes
-});
+  return startDate.add(Number(duration), 'minute');
+}