@pisell/pisellos 0.10.72 → 0.10.73

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,9 @@
1
+ // 导出评估器
2
+ export { PromotionEvaluator } from "./evaluator";
3
+
4
+ // 导出适配器
5
+ export { PromotionAdapter } from "./adapter";
6
+ export { default } from "./adapter";
7
+
8
+ // 导出策略配置示例常量
9
+ export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";
@@ -12,7 +12,7 @@ export * from './utils';
12
12
  export declare function __clearBookingContextSharedCacheForTest(): void;
13
13
  /** 稳定序列化 config 查询参数,用于判断是否与上次 loadBookingConfig 一致。 */
14
14
  export declare function buildBookingConfigQueryKey(params?: LoadBookingConfigParams): string;
15
- /** 稳定序列化资源列表查询(date + bookingIds),用于跳过重复 loadResources。 */
15
+ /** 稳定序列化资源列表查询(date + bookingIds + resourceIds)。 */
16
16
  export declare function buildBookingResourcesQueryKey(params?: LoadBookingResourcesParams): string;
17
17
  export declare class BookingContextModule extends BaseModule implements Module, BookingContextModuleAPI {
18
18
  protected defaultName: string;
@@ -22,7 +22,7 @@ export declare class BookingContextModule extends BaseModule implements Module,
22
22
  private otherParams;
23
23
  /** 上次成功 loadBookingConfig 的 query key;命中则不再请求。 */
24
24
  private lastConfigQueryKey;
25
- /** 上次成功 loadResources 的 query key(date|bookingIds);命中则不再请求。 */
25
+ /** 上次成功 loadResources 的 query key(接口合同 + 日期/预约/资源范围)。 */
26
26
  private lastResourcesQueryKey;
27
27
  constructor(name?: string, version?: string);
28
28
  initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
@@ -1,10 +1,4 @@
1
1
  function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
2
- function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
3
- function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
4
- function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
5
- function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
6
- function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
7
- function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
8
2
  function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
9
3
  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
10
4
  function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -18,6 +12,12 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
18
12
  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
19
13
  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
20
14
  function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
15
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
16
+ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
17
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
18
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
19
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
20
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
21
21
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
22
22
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
23
23
  function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -174,8 +174,13 @@ function resolveBookingConfigRequest(platform) {
174
174
  key: "".concat(endpoint, ":").concat(JSON.stringify(sortedQuery))
175
175
  };
176
176
  }
177
+ function normalizeBookingResourceIds(ids) {
178
+ return _toConsumableArray(new Set((ids || []).map(function (id) {
179
+ return String(id).trim();
180
+ }).filter(Boolean))).sort();
181
+ }
177
182
 
178
- /** 稳定序列化资源列表查询(date + bookingIds),用于跳过重复 loadResources。 */
183
+ /** 稳定序列化资源列表查询(date + bookingIds + resourceIds)。 */
179
184
  export function buildBookingResourcesQueryKey() {
180
185
  var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
181
186
  var date = toScheduleQueryDate(params.date);
@@ -184,7 +189,28 @@ export function buildBookingResourcesQueryKey() {
184
189
  }).sort(function (a, b) {
185
190
  return a - b;
186
191
  });
187
- return "".concat(date, "|").concat(ids.join(','));
192
+ var resourceIds = normalizeBookingResourceIds(params.resourceIds);
193
+ return "".concat(date, "|").concat(ids.join(',')).concat(resourceIds.length ? "|resources:".concat(JSON.stringify(resourceIds)) : '');
194
+ }
195
+ function resolveBookingResourcesRequest(platform, params) {
196
+ var date = toScheduleQueryDate(params.date);
197
+ var isCustomerPlatform = isCustomerUserPlatform(platform);
198
+ var resourceIds = normalizeBookingResourceIds(params.resourceIds);
199
+ return {
200
+ // The customer endpoint uses the same inclusive date range as DateModule.
201
+ // Keep the public date contract and the staff endpoint's existing query.
202
+ query: isCustomerPlatform ? _objectSpread({
203
+ start_date: date,
204
+ end_date: date
205
+ }, resourceIds.length ? {
206
+ resource_ids: resourceIds
207
+ } : {}) : {
208
+ date: date
209
+ },
210
+ key: "".concat(isCustomerPlatform ? 'customer' : 'staff', ":").concat(buildBookingResourcesQueryKey(_objectSpread(_objectSpread({}, params), {}, {
211
+ date: date
212
+ })))
213
+ };
188
214
  }
189
215
  export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
190
216
  _inherits(BookingContextModule, _BaseModule);
@@ -200,7 +226,7 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
200
226
  _defineProperty(_assertThisInitialized(_this), "otherParams", {});
201
227
  /** 上次成功 loadBookingConfig 的 query key;命中则不再请求。 */
202
228
  _defineProperty(_assertThisInitialized(_this), "lastConfigQueryKey", null);
203
- /** 上次成功 loadResources 的 query key(date|bookingIds);命中则不再请求。 */
229
+ /** 上次成功 loadResources 的 query key(接口合同 + 日期/预约/资源范围)。 */
204
230
  _defineProperty(_assertThisInitialized(_this), "lastResourcesQueryKey", null);
205
231
  return _this;
206
232
  }
@@ -348,10 +374,13 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
348
374
  value: function () {
349
375
  var _loadResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
350
376
  var _params$date,
377
+ _this$otherParams2,
351
378
  _this3 = this;
352
379
  var params,
353
380
  options,
354
381
  date,
382
+ _resolveBookingResour,
383
+ query,
355
384
  resourcesKey,
356
385
  sharedKey,
357
386
  _sharedResourcesCache,
@@ -366,10 +395,11 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
366
395
  params = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {};
367
396
  options = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
368
397
  date = toScheduleQueryDate((_params$date = params.date) !== null && _params$date !== void 0 ? _params$date : this.store.date);
369
- resourcesKey = buildBookingResourcesQueryKey({
398
+ _resolveBookingResour = resolveBookingResourcesRequest((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.platform, {
370
399
  date: date,
371
- bookingIds: params.bookingIds
372
- });
400
+ bookingIds: params.bookingIds,
401
+ resourceIds: params.resourceIds
402
+ }), query = _resolveBookingResour.query, resourcesKey = _resolveBookingResour.key;
373
403
  if (!(!options.forceRefresh && this.lastResourcesQueryKey === resourcesKey)) {
374
404
  _context5.next = 6;
375
405
  break;
@@ -395,9 +425,7 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
395
425
  case 0:
396
426
  _context4.prev = 0;
397
427
  _context4.next = 3;
398
- return _this3.request.get('/schedule/resource/list', {
399
- date: date
400
- }, RESOURCE_LIST_CACHE);
428
+ return _this3.request.get('/schedule/resource/list', query, RESOURCE_LIST_CACHE);
401
429
  case 3:
402
430
  res = _context4.sent;
403
431
  _formatResourceListAn = formatResourceListAndMap(res === null || res === void 0 ? void 0 : res.data, params.bookingIds || []), _list = _formatResourceListAn.list;
@@ -440,15 +468,16 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
440
468
  }, {
441
469
  key: "isBookingContextReady",
442
470
  value: function isBookingContextReady() {
443
- var _this$otherParams2, _ref3, _params$date2;
471
+ var _this$otherParams3, _ref3, _params$date2, _this$otherParams4;
444
472
  var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
445
- var configKey = resolveBookingConfigRequest((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.platform, params.bookingConfigParams).key;
473
+ var configKey = resolveBookingConfigRequest((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.platform, params.bookingConfigParams).key;
446
474
  var dateInput = (_ref3 = (_params$date2 = params.date) !== null && _params$date2 !== void 0 ? _params$date2 : this.store.date) !== null && _ref3 !== void 0 ? _ref3 : dayjs();
447
475
  var queryDate = toScheduleQueryDate(dateInput);
448
- var resourcesKey = buildBookingResourcesQueryKey({
449
- date: queryDate,
450
- bookingIds: params.bookingIds
451
- });
476
+ var _resolveBookingResour2 = resolveBookingResourcesRequest((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.platform, {
477
+ date: queryDate,
478
+ bookingIds: params.bookingIds
479
+ }),
480
+ resourcesKey = _resolveBookingResour2.key;
452
481
  var configReady = this.store.bookingConfig != null && this.lastConfigQueryKey === configKey;
453
482
  var resourcesReady = params.loadResources === false || this.lastResourcesQueryKey === resourcesKey;
454
483
  return configReady && resourcesReady;
@@ -457,11 +486,12 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
457
486
  key: "initBookingContext",
458
487
  value: function () {
459
488
  var _initBookingContext = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
460
- var _ref4, _params$date3, _this$otherParams3;
489
+ var _ref4, _params$date3, _this$otherParams5, _this$otherParams6;
461
490
  var params,
462
491
  dateInput,
463
492
  queryDate,
464
493
  configKey,
494
+ _resolveBookingResour3,
465
495
  resourcesKey,
466
496
  needConfig,
467
497
  needResources,
@@ -479,11 +509,11 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
479
509
  }
480
510
  return _context6.abrupt("return", this.getState());
481
511
  case 6:
482
- configKey = resolveBookingConfigRequest((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.platform, params.bookingConfigParams).key;
483
- resourcesKey = buildBookingResourcesQueryKey({
512
+ configKey = resolveBookingConfigRequest((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.platform, params.bookingConfigParams).key;
513
+ _resolveBookingResour3 = resolveBookingResourcesRequest((_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.platform, {
484
514
  date: queryDate,
485
515
  bookingIds: params.bookingIds
486
- });
516
+ }), resourcesKey = _resolveBookingResour3.key;
487
517
  needConfig = params.forceRefresh || this.store.bookingConfig == null || this.lastConfigQueryKey !== configKey;
488
518
  needResources = params.loadResources !== false && (params.forceRefresh || this.lastResourcesQueryKey !== resourcesKey);
489
519
  if (!needConfig) {
@@ -22,6 +22,8 @@ export interface LoadBookingConfigParams {
22
22
  export interface LoadBookingResourcesParams {
23
23
  /** 查询日期,`YYYY-MM-DD`;缺省用 store 内已 set 的 date,再缺省为当天。 */
24
24
  date?: string;
25
+ /** 用户端查询的资源 ID;PC/H5 资源接口需要显式范围才会返回对应实体。 */
26
+ resourceIds?: Array<number | string>;
25
27
  /** 编辑态排除容量占用用的 booking id 列表。 */
26
28
  bookingIds?: number[];
27
29
  }
@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
326
326
  date: string;
327
327
  status: string;
328
328
  week: string;
329
- weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
329
+ weekNum: 0 | 2 | 1 | 3 | 5 | 6 | 4;
330
330
  }[]>;
331
331
  submitTimeSlot(timeSlots: TimeSliceItem): void;
332
332
  private getScheduleDataByIds;
@@ -1 +1,46 @@
1
- "use strict";
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
7
+ enumerable: true,
8
+ get: function () {
9
+ return _examples.BUY_X_GET_Y_FREE_STRATEGY;
10
+ }
11
+ });
12
+ Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
13
+ enumerable: true,
14
+ get: function () {
15
+ return _examples.ITEM_REWARD_STRATEGY;
16
+ }
17
+ });
18
+ Object.defineProperty(exports, "PromotionAdapter", {
19
+ enumerable: true,
20
+ get: function () {
21
+ return _adapter.PromotionAdapter;
22
+ }
23
+ });
24
+ Object.defineProperty(exports, "PromotionEvaluator", {
25
+ enumerable: true,
26
+ get: function () {
27
+ return _evaluator.PromotionEvaluator;
28
+ }
29
+ });
30
+ Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
31
+ enumerable: true,
32
+ get: function () {
33
+ return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
34
+ }
35
+ });
36
+ Object.defineProperty(exports, "default", {
37
+ enumerable: true,
38
+ get: function () {
39
+ return _adapter.default;
40
+ }
41
+ });
42
+ var _evaluator = require("./evaluator");
43
+ var _adapter = _interopRequireWildcard(require("./adapter"));
44
+ var _examples = require("./examples");
45
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
46
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -12,7 +12,7 @@ export * from './utils';
12
12
  export declare function __clearBookingContextSharedCacheForTest(): void;
13
13
  /** 稳定序列化 config 查询参数,用于判断是否与上次 loadBookingConfig 一致。 */
14
14
  export declare function buildBookingConfigQueryKey(params?: LoadBookingConfigParams): string;
15
- /** 稳定序列化资源列表查询(date + bookingIds),用于跳过重复 loadResources。 */
15
+ /** 稳定序列化资源列表查询(date + bookingIds + resourceIds)。 */
16
16
  export declare function buildBookingResourcesQueryKey(params?: LoadBookingResourcesParams): string;
17
17
  export declare class BookingContextModule extends BaseModule implements Module, BookingContextModuleAPI {
18
18
  protected defaultName: string;
@@ -22,7 +22,7 @@ export declare class BookingContextModule extends BaseModule implements Module,
22
22
  private otherParams;
23
23
  /** 上次成功 loadBookingConfig 的 query key;命中则不再请求。 */
24
24
  private lastConfigQueryKey;
25
- /** 上次成功 loadResources 的 query key(date|bookingIds);命中则不再请求。 */
25
+ /** 上次成功 loadResources 的 query key(接口合同 + 日期/预约/资源范围)。 */
26
26
  private lastResourcesQueryKey;
27
27
  constructor(name?: string, version?: string);
28
28
  initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
@@ -190,12 +190,38 @@ function resolveBookingConfigRequest(platform, params = {}) {
190
190
  key: `${endpoint}:${JSON.stringify(sortedQuery)}`
191
191
  };
192
192
  }
193
+ function normalizeBookingResourceIds(ids) {
194
+ return [...new Set((ids || []).map(id => String(id).trim()).filter(Boolean))].sort();
195
+ }
193
196
 
194
- /** 稳定序列化资源列表查询(date + bookingIds),用于跳过重复 loadResources。 */
197
+ /** 稳定序列化资源列表查询(date + bookingIds + resourceIds)。 */
195
198
  function buildBookingResourcesQueryKey(params = {}) {
196
199
  const date = toScheduleQueryDate(params.date);
197
200
  const ids = (params.bookingIds || []).filter(id => typeof id === 'number' && Number.isFinite(id)).sort((a, b) => a - b);
198
- return `${date}|${ids.join(',')}`;
201
+ const resourceIds = normalizeBookingResourceIds(params.resourceIds);
202
+ return `${date}|${ids.join(',')}${resourceIds.length ? `|resources:${JSON.stringify(resourceIds)}` : ''}`;
203
+ }
204
+ function resolveBookingResourcesRequest(platform, params) {
205
+ const date = toScheduleQueryDate(params.date);
206
+ const isCustomerPlatform = (0, _platform.isCustomerUserPlatform)(platform);
207
+ const resourceIds = normalizeBookingResourceIds(params.resourceIds);
208
+ return {
209
+ // The customer endpoint uses the same inclusive date range as DateModule.
210
+ // Keep the public date contract and the staff endpoint's existing query.
211
+ query: isCustomerPlatform ? {
212
+ start_date: date,
213
+ end_date: date,
214
+ ...(resourceIds.length ? {
215
+ resource_ids: resourceIds
216
+ } : {})
217
+ } : {
218
+ date
219
+ },
220
+ key: `${isCustomerPlatform ? 'customer' : 'staff'}:${buildBookingResourcesQueryKey({
221
+ ...params,
222
+ date
223
+ })}`
224
+ };
199
225
  }
200
226
  class BookingContextModule extends _BaseModule.BaseModule {
201
227
  defaultName = 'bookingContext';
@@ -207,7 +233,7 @@ class BookingContextModule extends _BaseModule.BaseModule {
207
233
  otherParams = {};
208
234
  /** 上次成功 loadBookingConfig 的 query key;命中则不再请求。 */
209
235
  lastConfigQueryKey = null;
210
- /** 上次成功 loadResources 的 query key(date|bookingIds);命中则不再请求。 */
236
+ /** 上次成功 loadResources 的 query key(接口合同 + 日期/预约/资源范围)。 */
211
237
  lastResourcesQueryKey = null;
212
238
  constructor(name, version) {
213
239
  super(name, version);
@@ -277,9 +303,13 @@ class BookingContextModule extends _BaseModule.BaseModule {
277
303
  }
278
304
  async loadResources(params = {}, options = {}) {
279
305
  const date = toScheduleQueryDate(params.date ?? this.store.date);
280
- const resourcesKey = buildBookingResourcesQueryKey({
306
+ const {
307
+ query,
308
+ key: resourcesKey
309
+ } = resolveBookingResourcesRequest(this.otherParams?.platform, {
281
310
  date,
282
- bookingIds: params.bookingIds
311
+ bookingIds: params.bookingIds,
312
+ resourceIds: params.resourceIds
283
313
  });
284
314
  if (!options.forceRefresh && this.lastResourcesQueryKey === resourcesKey) {
285
315
  return this.getResourcesOrigin();
@@ -295,9 +325,7 @@ class BookingContextModule extends _BaseModule.BaseModule {
295
325
  if (!pending) {
296
326
  const requestPromise = (async () => {
297
327
  try {
298
- const res = await this.request.get('/schedule/resource/list', {
299
- date
300
- }, RESOURCE_LIST_CACHE);
328
+ const res = await this.request.get('/schedule/resource/list', query, RESOURCE_LIST_CACHE);
301
329
  const {
302
330
  list
303
331
  } = (0, _formatResourceList.formatResourceListAndMap)(res?.data, params.bookingIds || []);
@@ -323,7 +351,9 @@ class BookingContextModule extends _BaseModule.BaseModule {
323
351
  const configKey = resolveBookingConfigRequest(this.otherParams?.platform, params.bookingConfigParams).key;
324
352
  const dateInput = params.date ?? this.store.date ?? (0, _dayjs.default)();
325
353
  const queryDate = toScheduleQueryDate(dateInput);
326
- const resourcesKey = buildBookingResourcesQueryKey({
354
+ const {
355
+ key: resourcesKey
356
+ } = resolveBookingResourcesRequest(this.otherParams?.platform, {
327
357
  date: queryDate,
328
358
  bookingIds: params.bookingIds
329
359
  });
@@ -339,7 +369,9 @@ class BookingContextModule extends _BaseModule.BaseModule {
339
369
  return this.getState();
340
370
  }
341
371
  const configKey = resolveBookingConfigRequest(this.otherParams?.platform, params.bookingConfigParams).key;
342
- const resourcesKey = buildBookingResourcesQueryKey({
372
+ const {
373
+ key: resourcesKey
374
+ } = resolveBookingResourcesRequest(this.otherParams?.platform, {
343
375
  date: queryDate,
344
376
  bookingIds: params.bookingIds
345
377
  });
@@ -22,6 +22,8 @@ export interface LoadBookingConfigParams {
22
22
  export interface LoadBookingResourcesParams {
23
23
  /** 查询日期,`YYYY-MM-DD`;缺省用 store 内已 set 的 date,再缺省为当天。 */
24
24
  date?: string;
25
+ /** 用户端查询的资源 ID;PC/H5 资源接口需要显式范围才会返回对应实体。 */
26
+ resourceIds?: Array<number | string>;
25
27
  /** 编辑态排除容量占用用的 booking id 列表。 */
26
28
  bookingIds?: number[];
27
29
  }
@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
326
326
  date: string;
327
327
  status: string;
328
328
  week: string;
329
- weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
329
+ weekNum: 0 | 2 | 1 | 3 | 5 | 6 | 4;
330
330
  }[]>;
331
331
  submitTimeSlot(timeSlots: TimeSliceItem): void;
332
332
  private getScheduleDataByIds;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "@pisell/pisellos",
4
- "version": "0.10.72",
4
+ "version": "0.10.73",
5
5
  "description": "一个可扩展的前端模块化SDK框架,支持插件系统",
6
6
  "main": "dist/index.js",
7
7
  "types": "dist/index.d.ts",