@pisell/pisellos 2.2.282 → 2.2.284

package/lib/modules/Schedule/index.js

@@ -1,64 +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/Schedule/index.ts
-var Schedule_exports = {};
-__export(Schedule_exports, {
-  ScheduleModule: () => ScheduleModule
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(Schedule_exports);
-var import_lodash_es = require("lodash-es");
-var import_BaseModule = require("../BaseModule");
-var import_dayjs = __toESM(require("dayjs"));
-var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
-var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
-var import_utils = require("../Date/utils");
-var import_utils2 = require("./utils");
-var import_getDateIsInSchedule = require("./getDateIsInSchedule");
-import_dayjs.default.extend(import_isSameOrBefore.default);
-import_dayjs.default.extend(import_isSameOrAfter.default);
-var ScheduleModule = class extends import_BaseModule.BaseModule {
+exports.ScheduleModule = void 0;
+var _lodashEs = require("lodash-es");
+var _BaseModule = require("../BaseModule");
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _isSameOrBefore = _interopRequireDefault(require("dayjs/plugin/isSameOrBefore"));
+var _isSameOrAfter = _interopRequireDefault(require("dayjs/plugin/isSameOrAfter"));
+var _utils = require("../Date/utils");
+var _utils2 = require("./utils");
+var _getDateIsInSchedule = require("./getDateIsInSchedule");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+_dayjs.default.extend(_isSameOrBefore.default);
+_dayjs.default.extend(_isSameOrAfter.default);
+class ScheduleModule extends _BaseModule.BaseModule {
+  defaultName = 'schedule';
+  defaultVersion = '1.0.0';
+  request;
+  store = {};
+  cacheId;
+  openCache = false;
+  fatherModule;
+  hasLoadedScheduleList = false;
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "schedule";
-    this.defaultVersion = "1.0.0";
-    this.store = {};
-    this.openCache = false;
-    this.hasLoadedScheduleList = false;
   }
   async initialize(core, options) {
-    var _a, _b;
     this.core = core;
-    this.request = core.getPlugin("request");
+
+    // 获取依赖的插件
+    this.request = core.getPlugin('request');
     if (!this.request) {
-      throw new Error("ScheduleModule 需要 request 插件支持");
+      throw new Error('ScheduleModule 需要 request 插件支持');
     }
-    this.store = options == null ? void 0 : options.store;
+
+    // if (options?.initialState) {
+    //   this.state = { ...this.state, ...options.initialState }
+    // }
+    this.store = options?.store;
     if (options.initialState) {
       this.store.scheduleList = options.initialState.scheduleList;
       this.syncScheduleMap();
@@ -66,18 +47,19 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
       this.hasLoadedScheduleList = Array.isArray(options.initialState.scheduleList);
     } else {
       this.store.scheduleList = [];
-      this.store.map = /* @__PURE__ */ new Map();
+      this.store.map = new Map();
       this.store.availabilityDateList = [];
       this.hasLoadedScheduleList = false;
     }
-    if ((_a = options.otherParams) == null ? void 0 : _a.cacheId) {
+    if (options.otherParams?.cacheId) {
       this.openCache = options.otherParams.openCache;
       this.cacheId = options.otherParams.cacheId;
     }
-    if ((_b = options.otherParams) == null ? void 0 : _b.fatherModule) {
+    if (options.otherParams?.fatherModule) {
       this.fatherModule = options.otherParams.fatherModule;
     }
   }
+
   /**
    * 更新父级解决方案透传的运行态参数，并刷新 schedule 缓存写入配置。
    *
@@ -90,19 +72,19 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     this.cacheId = otherParams.cacheId;
     this.fatherModule = otherParams.fatherModule;
   }
+
   /**
    * 加载当前店铺下所有 schedule
    *
    * @memberof ScheduleModule
    */
   async loadAllSchedule(options = {}) {
-    var _a;
-    const scheduleList = await this.request.get(
-      `/schedule`,
-      { num: 999 },
-      { useCache: options.useCache ?? true }
-    );
-    this.setScheduleList(((_a = scheduleList.data) == null ? void 0 : _a.list) || []);
+    const scheduleList = await this.request.get(`/schedule`, {
+      num: 999
+    }, {
+      useCache: options.useCache ?? true
+    });
+    this.setScheduleList(scheduleList.data?.list || []);
   }
   setScheduleList(list) {
     this.store.scheduleList = list;
@@ -110,9 +92,7 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     this.hasLoadedScheduleList = true;
   }
   syncScheduleMap() {
-    this.store.map = new Map(
-      (this.store.scheduleList || []).map((schedule) => [Number(schedule.id), schedule])
-    );
+    this.store.map = new Map((this.store.scheduleList || []).map(schedule => [Number(schedule.id), schedule]));
   }
   getScheduleList() {
     return this.store.scheduleList || [];
@@ -126,54 +106,54 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     custom_page_id,
     channel
   }) {
-    if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day")) {
-      startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
+    // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天，需要把 startDate 置为今天
+    if ((0, _dayjs.default)(startDate).isBefore((0, _dayjs.default)(), 'day')) {
+      startDate = (0, _dayjs.default)().format('YYYY-MM-DD');
     }
-    let dates = (0, import_utils.generateMonthDates)(startDate, endDate);
-    dates = (0, import_utils.disableAllDates)(dates);
-    if ((0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
+    // 1.生成当前月份的所有日期，默认都不可用
+    let dates = (0, _utils.generateMonthDates)(startDate, endDate);
+    dates = (0, _utils.disableAllDates)(dates);
+    // 如果 endDate 在今天之前，则不用查接口，直接返回 dates
+    if ((0, _dayjs.default)(endDate).isBefore((0, _dayjs.default)(), 'day')) {
       return dates;
     }
-    const res = await this.request.get(
-      `/schedule/product/availability/v2`,
-      {
-        start_date: startDate,
-        end_date: endDate,
-        custom_page_id,
-        channel
-      }
-    );
+    const res = await this.request.get(`/schedule/product/availability/v2`, {
+      start_date: startDate,
+      end_date: endDate,
+      custom_page_id,
+      channel
+    });
     const responseData = res.data || {};
     const dateList = Array.isArray(responseData.date_list) ? responseData.date_list : [];
     const otherProductIds = Array.isArray(responseData.other_product_ids) ? responseData.other_product_ids : [];
     this.setAvailabilityScheduleDateList(dateList);
     this.setOtherProductsIds(otherProductIds);
-    if (!dateList.length && !otherProductIds.length || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
+    // 如果没有schedule或者结束日期在今天之前，则所有日期均不可用
+    if (!dateList.length && !otherProductIds.length || (0, _dayjs.default)(endDate).isBefore((0, _dayjs.default)(), 'day')) {
       return dates;
     }
     if (otherProductIds.length) {
-      dates.forEach((n) => {
-        n.status = "available";
+      // 如果后端有返回 other_product_ids ，意味着有 duration 商品，则今天以及今天以后的日期均可用
+      dates.forEach(n => {
+        n.status = 'available';
       });
     } else {
-      dateList.forEach((n) => {
-        const index = dates.findIndex((m) => m.date === n.date);
+      dateList.forEach(n => {
+        const index = dates.findIndex(m => m.date === n.date);
         if (index !== -1) {
-          dates[index].status = "available";
+          dates[index].status = 'available';
         }
       });
     }
-    dates = (0, import_utils.disableDatesBeforeOneDay)(dates);
+    dates = (0, _utils.disableDatesBeforeOneDay)(dates);
     return dates;
   }
   getScheduleListByIds(ids) {
-    var _a;
-    const idSet = new Set(ids.map((id) => String(id)));
-    console.log("getScheduleListByIds", this.store.scheduleList);
+    const idSet = new Set(ids.map(id => String(id)));
     if (this.store.map instanceof Map && this.store.map.size > 0) {
-      return ids.map((id) => this.store.map.get(Number(id))).filter(Boolean);
+      return ids.map(id => this.store.map.get(Number(id))).filter(Boolean);
     }
-    const list = (_a = this.store.scheduleList) == null ? void 0 : _a.filter((n) => idSet.has(String(n.id)));
+    const list = this.store.scheduleList?.filter(n => idSet.has(String(n.id)));
     return list;
   }
   setAvailabilityScheduleDateList(list) {
@@ -190,12 +170,13 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
   }
   storeChange() {
     if (this.openCache) {
-      const store = (0, import_lodash_es.cloneDeep)(this.store);
+      const store = (0, _lodashEs.cloneDeep)(this.store);
+      // store里的 list 要主动基于 id 做下去重，避免重复写入
       this.checkSaveCache({
         cacheId: this.cacheId,
         fatherModule: this.fatherModule,
         store,
-        cacheKey: ["scheduleList", "availabilityDateList", "otherProductsIds"]
+        cacheKey: ['scheduleList', 'availabilityDateList', 'otherProductsIds']
       });
     }
   }
@@ -208,7 +189,7 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     date,
     schedule
   }) {
-    return (0, import_getDateIsInSchedule.getDateIsInSchedule)(date, [schedule]);
+    return (0, _getDateIsInSchedule.getDateIsInSchedule)(date, [schedule]);
   }
   /**
   * 传入一个时间, 判断改时间是否在schedule 内
@@ -219,37 +200,41 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     date,
     schedule
   }) {
-    var _a, _b, _c, _d;
-    return (0, import_getDateIsInSchedule.getDateIsInSchedule)(date, [schedule]);
+    return (0, _getDateIsInSchedule.getDateIsInSchedule)(date, [schedule]);
     if (schedule.start_time && schedule.end_time) {
-      const isBeforeStartTime = (0, import_dayjs.default)(date).isBefore(
-        (0, import_dayjs.default)(schedule.start_time)
-      );
-      const isAfterEndTime = (0, import_dayjs.default)(date).isAfter((0, import_dayjs.default)(schedule.end_time));
+      const isBeforeStartTime = (0, _dayjs.default)(date).isBefore((0, _dayjs.default)(schedule.start_time));
+      const isAfterEndTime = (0, _dayjs.default)(date).isAfter((0, _dayjs.default)(schedule.end_time));
+      // 如果不在 schedule 日期区间内直接返回false
       if (isBeforeStartTime || isAfterEndTime) {
         return false;
       }
     }
+
+    // 节约性能, 强制将schedule的时间范围改为前后一天，避免大量计算.
     let _schedule = {
       ...schedule,
       // 开始时间向前推一天
-      start_time: (0, import_dayjs.default)(date).subtract(1, "day").format("YYYY-MM-DD HH:mm:ss"),
-      end_time: (0, import_dayjs.default)(date).add(1, "day").format("YYYY-MM-DD HH:mm:ss")
+      start_time: (0, _dayjs.default)(date).subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'),
+      end_time: (0, _dayjs.default)(date).add(1, 'day').format('YYYY-MM-DD HH:mm:ss')
     };
-    if (((_b = (_a = _schedule.repeat_rule) == null ? void 0 : _a.end) == null ? void 0 : _b.type) === "never") {
+
+    // 不限制的 改为后一天
+    if (_schedule.repeat_rule?.end?.type === 'never') {
       _schedule = {
         ..._schedule,
         repeat_rule: {
           ..._schedule.repeat_rule,
           end: {
-            type: "date",
+            type: 'date',
             end_date: _schedule.end_time,
             occurrence: null
           }
         }
       };
     }
-    if (((_d = (_c = _schedule.repeat_rule) == null ? void 0 : _c.end) == null ? void 0 : _d.type) === "date") {
+
+    // 限制结束日期的也改为后一天
+    if (_schedule.repeat_rule?.end?.type === 'date') {
       _schedule = {
         ..._schedule,
         repeat_rule: {
@@ -261,17 +246,18 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
         }
       };
     }
-    const dateRanges = (0, import_utils2.calcScheduleDateRange)({ ..._schedule });
+    const dateRanges = (0, _utils2.calcScheduleDateRange)({
+      ..._schedule
+    });
     for (const range of dateRanges) {
-      const startTime = (0, import_dayjs.default)(range.start);
-      const endTime = (0, import_dayjs.default)(range.end);
-      if ((0, import_dayjs.default)(date).isSameOrAfter(startTime) && (0, import_dayjs.default)(date).isSameOrBefore(endTime)) {
+      const startTime = (0, _dayjs.default)(range.start);
+      const endTime = (0, _dayjs.default)(range.end);
+
+      // 如果输入时间在这个范围内（包含边界）
+      if ((0, _dayjs.default)(date).isSameOrAfter(startTime) && (0, _dayjs.default)(date).isSameOrBefore(endTime)) {
         return true;
       }
     }
   }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ScheduleModule
-});
+}
+exports.ScheduleModule = ScheduleModule;

package/lib/modules/Schedule/type.js

@@ -1,17 +1,5 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Schedule/type.ts
-var type_exports = {};
-module.exports = __toCommonJS(type_exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/modules/Schedule/types.js

@@ -1,17 +1,5 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Schedule/types.ts
-var types_exports = {};
-module.exports = __toCommonJS(types_exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});