@pisell/pisellos 2.3.99 → 2.3.100

package/dist/modules/ResourcePlanner/planner.d.ts

@@ -1,5 +1,5 @@
-import type { AvailabilityProjection, AvailabilityProjectionInput, AvailabilityQuery, AvailabilityQueryResult, AvailabilitySelectionValidationParams, AvailabilitySelectionValidationResult, GetProductTimeRangesRequest, ProductTimeRangeGroup } from './types';
+import type { AvailabilityProjection, AvailabilityProjectionInput, AvailabilityQuery, AvailabilityQueryResult, AvailabilitySelectionValidationParams, AvailabilitySelectionValidationResult, GetProductTimeRangesRequest, GetProductTimeRangesRuntimeOptions, ProductTimeRangeGroup } from './types';
 export declare function createAvailabilityProjection(input: AvailabilityProjectionInput): AvailabilityProjection;
-export declare function getProductTimeRanges(projection: AvailabilityProjection, request?: GetProductTimeRangesRequest): ProductTimeRangeGroup[];
+export declare function getProductTimeRanges(projection: AvailabilityProjection, request?: GetProductTimeRangesRequest, runtimeOptions?: GetProductTimeRangesRuntimeOptions): ProductTimeRangeGroup[];
 export declare function queryAvailabilityProjection(projection: AvailabilityProjection, request: AvailabilityQuery): AvailabilityQueryResult;
 export declare function validateAvailabilitySelection(projection: AvailabilityProjection, params: AvailabilitySelectionValidationParams): AvailabilitySelectionValidationResult;

package/dist/modules/ResourcePlanner/planner.js

@@ -96,6 +96,9 @@ function addMinutesZoned(value, minutes, _timezoneName) {
 function ceilToTenMinutes(value, _timezoneName) {
   return ceilLocalScalarToTenMinutes(value);
 }
+function floorToMinute(value) {
+  return Math.floor(value / 60000) * 60000;
+}
 function nextDate(value, _timezoneName) {
   return getNextLocalDate(value);
 }
@@ -981,6 +984,9 @@ function dedupeProductRanges(ranges) {
 }
 function createDurationTimeRange(product, start, durationMinutes, projection, fixedOffsetMinutes) {
   var bookingEnd = addMinutesZoned(start, durationMinutes, projection.meta.timezone);
+  return createDurationTimeRangeWithEnd(product, start, bookingEnd, projection, fixedOffsetMinutes);
+}
+function createDurationTimeRangeWithEnd(product, start, bookingEnd, projection, fixedOffsetMinutes) {
   return {
     key: "".concat(String(product.id), ":").concat(start, ":").concat(bookingEnd),
     productId: product.id,
@@ -999,6 +1005,7 @@ function createDurationTimeRange(product, start, durationMinutes, projection, fi
 export function getProductTimeRanges(projection) {
   var _extractFixedOffsetMi3, _request$productIds;
   var request = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var runtimeOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var normalizedPartySize = normalizePartySize(request.partySize);
   var dateRange = resolveProjectionDateRange(projection, request.dateRange);
   var slotStepMinutes = projection.meta.defaults.slotStepMinutes;
@@ -1045,10 +1052,29 @@ export function getProductTimeRanges(projection) {
     }, null) || [] : null;
     var baseRanges = resourceRanges === null ? operatingRanges : intersectRangeLists(resourceRanges, operatingRanges);
     var durationMinutes = resolveRequestedDurationMinutes(product, request);
+    var flexibleStartAt = function () {
+      if (!product.isFlexibleDuration) return undefined;
+      var evaluatedAt = toDateTime(runtimeOptions.evaluatedAt || projection.meta.durationCandidateAnchorAt, projection.meta.timezone);
+      if (!Number.isFinite(evaluatedAt)) {
+        throw availabilityError('INVALID_TARGET_FILTER', 'runtimeOptions.evaluatedAt 必须是有效时间', {
+          evaluatedAt: runtimeOptions.evaluatedAt
+        });
+      }
+      return floorToMinute(evaluatedAt);
+    }();
     var durationAnchor = ceilToTenMinutes(toDateTime(projection.meta.durationCandidateAnchorAt, projection.meta.timezone), projection.meta.timezone);
     var requestedStartTimes = resolveRequestedDurationStartTimes(product, request);
     var ranges = [];
     baseRanges.forEach(function (range) {
+      if (product.isFlexibleDuration && flexibleStartAt !== undefined) {
+        var start = Math.max(range.start, flexibleStartAt);
+        if (start >= range.end) return;
+        var bookingDate = formatDate(start);
+        if (bookingDate >= dateRange.startDate && bookingDate <= dateRange.endDate) {
+          ranges.push(createDurationTimeRangeWithEnd(product, start, range.end, projection, fixedOffsetMinutes));
+        }
+        return;
+      }
       if (range.end <= durationAnchor) return;
       var cursor = range.start;
       if (cursor < durationAnchor) {
@@ -1057,8 +1083,8 @@ export function getProductTimeRanges(projection) {
       while (true) {
         var bookingEnd = addMinutesZoned(cursor, durationMinutes, projection.meta.timezone);
         if (bookingEnd > range.end) break;
-        var bookingDate = formatDate(cursor);
-        if (bookingDate >= dateRange.startDate && bookingDate <= dateRange.endDate) {
+        var _bookingDate = formatDate(cursor);
+        if (_bookingDate >= dateRange.startDate && _bookingDate <= dateRange.endDate) {
           ranges.push(createDurationTimeRange(product, cursor, durationMinutes, projection, fixedOffsetMinutes));
         }
         cursor = addMinutesZoned(cursor, slotStepMinutes, projection.meta.timezone);
@@ -1858,6 +1884,8 @@ export function queryAvailabilityProjection(projection, request) {
     dateRange: dateRange,
     resourceIds: request.resourceIds,
     partySize: normalizedPartySize
+  }, {
+    evaluatedAt: evaluatedAt
   });
   var candidateGroupMap = new Map(candidateGroups.map(function (group) {
     return [String(group.productId), group];

package/dist/modules/ResourcePlanner/types.d.ts

@@ -81,6 +81,7 @@ export interface AvailabilityProduct {
     id: AvailabilityId;
     title?: string;
     kind: AvailabilityProductKind;
+    isFlexibleDuration?: boolean;
     durationMinutes?: number;
     quantity?: number;
     capacityRequired?: number;
@@ -240,6 +241,9 @@ export interface GetProductTimeRangesRequest {
      */
     allowOutsideOperatingHoursForRequestedStartTimes?: boolean;
 }
+export interface GetProductTimeRangesRuntimeOptions {
+    evaluatedAt?: string;
+}
 export interface QueryAvailabilityBaseRequest {
     productIds?: AvailabilityId[];
     resourceIds?: AvailabilityId[];

package/dist/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 5 | 3 | 1 | 2 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/dist/solution/UnifiedBookingSales/index.d.ts

@@ -244,7 +244,7 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     private releaseAvailabilityCommitLock;
     /** IO boundary: loads catalog, schedules, resources, occupancies, and registers one context. */
     prepareAvailabilityProjection(params: UnifiedBookingSalesPrepareAvailabilityProjectionParams): Promise<AvailabilityContextRef>;
-    /** Pure configuration calculation over the current context projection. */
+    /** Candidate calculation over the current context projection and runtime minute. */
     getProductTimeRanges(contextId: string, request?: GetProductTimeRangesRequest): Promise<ContextualProductTimeRangeGroup[]>;
     /** Thin facade: auto-refresh on cart drift, then delegate to the pure projection query. */
     queryBookingAvailability(contextId: string, request: ContextualAvailabilityQuery): Promise<ContextualAvailabilityQueryResult>;

package/dist/solution/UnifiedBookingSales/index.js

@@ -36,6 +36,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 import dayjs from 'dayjs';
 import { cloneDeep } from 'lodash-es';
 import { OpenDataModule } from "../../modules";
+import { isProductFlexibleDuration } from "../../modules/BookingContext/utils";
 import { getScheduleStartEndTimePoints } from "../../modules/Schedule/getDateIsInSchedule";
 import { AvailabilityError, createAvailabilityProjection, getProductTimeRanges as getProjectionProductTimeRanges, queryAvailabilityProjection, validateAvailabilitySelection } from "../../modules/ResourcePlanner";
 import { UnifiedBookingSalesHooks } from "./types";
@@ -544,6 +545,7 @@ export function normalizeProductForAvailability(product) {
   var fixedOffsetMinutes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : captureRuntimeOffsetMinutes();
   var raw = product;
   var kind = resolveProductKind(raw);
+  var isFlexibleDuration = kind === 'duration' && isProductFlexibleDuration(raw.duration);
   var sessionRules = [];
   var sessionRanges = [];
   var explicitSession = ((_raw$cartDetailValue = raw.cartDetailValue) === null || _raw$cartDetailValue === void 0 ? void 0 : _raw$cartDetailValue.session) || ((_raw$_extend = raw._extend) === null || _raw$_extend === void 0 || (_raw$_extend = _raw$_extend.other) === null || _raw$_extend === void 0 ? void 0 : _raw$_extend.session) || raw.session;
@@ -565,7 +567,8 @@ export function normalizeProductForAvailability(product) {
     id: (_raw$id = raw.id) !== null && _raw$id !== void 0 ? _raw$id : raw.product_id,
     title: pickLocalizedText(raw.title || raw.name || raw.product_title),
     kind: kind,
-    durationMinutes: kind === 'duration' ? Math.max(1, Number(((_raw$duration = raw.duration) === null || _raw$duration === void 0 ? void 0 : _raw$duration.value) || raw.duration || raw.service_duration || 30) || 30) : undefined,
+    isFlexibleDuration: isFlexibleDuration || undefined,
+    durationMinutes: kind === 'duration' && !isFlexibleDuration ? Math.max(1, Number(((_raw$duration = raw.duration) === null || _raw$duration === void 0 ? void 0 : _raw$duration.value) || raw.duration || raw.service_duration || 30) || 30) : undefined,
     requirementGroups: normalizeRequirementGroups(raw),
     sessionRules: sessionRules,
     sessionRanges: sessionRanges,
@@ -4457,7 +4460,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
         return _prepareAvailabilityProjection.apply(this, arguments);
       }
       return prepareAvailabilityProjection;
-    }() /** Pure configuration calculation over the current context projection. */)
+    }() /** Candidate calculation over the current context projection and runtime minute. */)
   }, {
     key: "getProductTimeRanges",
     value: (function () {
@@ -4488,7 +4491,9 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               });
               return _context40.abrupt("return", getProjectionProductTimeRanges(projectionEntry.projection, _objectSpread(_objectSpread({}, request), allowOutsideOperatingHoursForRequestedStartTimes ? {
                 allowOutsideOperatingHoursForRequestedStartTimes: true
-              } : {})).map(function (group) {
+              } : {}), {
+                evaluatedAt: this.getAvailabilityRuntimeDateTime()
+              }).map(function (group) {
                 return _objectSpread(_objectSpread({}, group), {}, {
                   ranges: group.ranges.map(function (candidate) {
                     return _this10.decorateAvailabilityCandidate(context.contextId, contextVersion, candidate);

package/lib/modules/ResourcePlanner/planner.d.ts

@@ -1,5 +1,5 @@
-import type { AvailabilityProjection, AvailabilityProjectionInput, AvailabilityQuery, AvailabilityQueryResult, AvailabilitySelectionValidationParams, AvailabilitySelectionValidationResult, GetProductTimeRangesRequest, ProductTimeRangeGroup } from './types';
+import type { AvailabilityProjection, AvailabilityProjectionInput, AvailabilityQuery, AvailabilityQueryResult, AvailabilitySelectionValidationParams, AvailabilitySelectionValidationResult, GetProductTimeRangesRequest, GetProductTimeRangesRuntimeOptions, ProductTimeRangeGroup } from './types';
 export declare function createAvailabilityProjection(input: AvailabilityProjectionInput): AvailabilityProjection;
-export declare function getProductTimeRanges(projection: AvailabilityProjection, request?: GetProductTimeRangesRequest): ProductTimeRangeGroup[];
+export declare function getProductTimeRanges(projection: AvailabilityProjection, request?: GetProductTimeRangesRequest, runtimeOptions?: GetProductTimeRangesRuntimeOptions): ProductTimeRangeGroup[];
 export declare function queryAvailabilityProjection(projection: AvailabilityProjection, request: AvailabilityQuery): AvailabilityQueryResult;
 export declare function validateAvailabilitySelection(projection: AvailabilityProjection, params: AvailabilitySelectionValidationParams): AvailabilitySelectionValidationResult;

package/lib/modules/ResourcePlanner/planner.js

@@ -88,6 +88,9 @@ function addMinutesZoned(value, minutes, _timezoneName) {
 function ceilToTenMinutes(value, _timezoneName) {
   return (0, _localClock.ceilLocalScalarToTenMinutes)(value);
 }
+function floorToMinute(value) {
+  return Math.floor(value / 60000) * 60000;
+}
 function nextDate(value, _timezoneName) {
   return (0, _localClock.nextDate)(value);
 }
@@ -880,6 +883,9 @@ function dedupeProductRanges(ranges) {
 }
 function createDurationTimeRange(product, start, durationMinutes, projection, fixedOffsetMinutes) {
   const bookingEnd = addMinutesZoned(start, durationMinutes, projection.meta.timezone);
+  return createDurationTimeRangeWithEnd(product, start, bookingEnd, projection, fixedOffsetMinutes);
+}
+function createDurationTimeRangeWithEnd(product, start, bookingEnd, projection, fixedOffsetMinutes) {
   return {
     key: `${String(product.id)}:${start}:${bookingEnd}`,
     productId: product.id,
@@ -895,7 +901,7 @@ function createDurationTimeRange(product, start, durationMinutes, projection, fi
     scheduleRefs: []
   };
 }
-function getProductTimeRanges(projection, request = {}) {
+function getProductTimeRanges(projection, request = {}, runtimeOptions = {}) {
   const normalizedPartySize = normalizePartySize(request.partySize);
   const dateRange = resolveProjectionDateRange(projection, request.dateRange);
   const slotStepMinutes = projection.meta.defaults.slotStepMinutes;
@@ -934,10 +940,29 @@ function getProductTimeRanges(projection, request = {}) {
     })).reduce((current, ranges) => current === null ? ranges : intersectRangeLists(current, ranges), null) || [] : null;
     const baseRanges = resourceRanges === null ? operatingRanges : intersectRangeLists(resourceRanges, operatingRanges);
     const durationMinutes = resolveRequestedDurationMinutes(product, request);
+    const flexibleStartAt = (() => {
+      if (!product.isFlexibleDuration) return undefined;
+      const evaluatedAt = toDateTime(runtimeOptions.evaluatedAt || projection.meta.durationCandidateAnchorAt, projection.meta.timezone);
+      if (!Number.isFinite(evaluatedAt)) {
+        throw availabilityError('INVALID_TARGET_FILTER', 'runtimeOptions.evaluatedAt 必须是有效时间', {
+          evaluatedAt: runtimeOptions.evaluatedAt
+        });
+      }
+      return floorToMinute(evaluatedAt);
+    })();
     const durationAnchor = ceilToTenMinutes(toDateTime(projection.meta.durationCandidateAnchorAt, projection.meta.timezone), projection.meta.timezone);
     const requestedStartTimes = resolveRequestedDurationStartTimes(product, request);
     const ranges = [];
     baseRanges.forEach(range => {
+      if (product.isFlexibleDuration && flexibleStartAt !== undefined) {
+        const start = Math.max(range.start, flexibleStartAt);
+        if (start >= range.end) return;
+        const bookingDate = formatDate(start);
+        if (bookingDate >= dateRange.startDate && bookingDate <= dateRange.endDate) {
+          ranges.push(createDurationTimeRangeWithEnd(product, start, range.end, projection, fixedOffsetMinutes));
+        }
+        return;
+      }
       if (range.end <= durationAnchor) return;
       let cursor = range.start;
       if (cursor < durationAnchor) {
@@ -1593,6 +1618,8 @@ function queryAvailabilityProjection(projection, request) {
     dateRange,
     resourceIds: request.resourceIds,
     partySize: normalizedPartySize
+  }, {
+    evaluatedAt
   });
   const candidateGroupMap = new Map(candidateGroups.map(group => [String(group.productId), group]));
   if (request.target === 'date') {

package/lib/modules/ResourcePlanner/types.d.ts

@@ -81,6 +81,7 @@ export interface AvailabilityProduct {
     id: AvailabilityId;
     title?: string;
     kind: AvailabilityProductKind;
+    isFlexibleDuration?: boolean;
     durationMinutes?: number;
     quantity?: number;
     capacityRequired?: number;
@@ -240,6 +241,9 @@ export interface GetProductTimeRangesRequest {
      */
     allowOutsideOperatingHoursForRequestedStartTimes?: boolean;
 }
+export interface GetProductTimeRangesRuntimeOptions {
+    evaluatedAt?: string;
+}
 export interface QueryAvailabilityBaseRequest {
     productIds?: AvailabilityId[];
     resourceIds?: AvailabilityId[];

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 5 | 3 | 1 | 2 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/lib/solution/UnifiedBookingSales/index.d.ts

@@ -244,7 +244,7 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     private releaseAvailabilityCommitLock;
     /** IO boundary: loads catalog, schedules, resources, occupancies, and registers one context. */
     prepareAvailabilityProjection(params: UnifiedBookingSalesPrepareAvailabilityProjectionParams): Promise<AvailabilityContextRef>;
-    /** Pure configuration calculation over the current context projection. */
+    /** Candidate calculation over the current context projection and runtime minute. */
     getProductTimeRanges(contextId: string, request?: GetProductTimeRangesRequest): Promise<ContextualProductTimeRangeGroup[]>;
     /** Thin facade: auto-refresh on cart drift, then delegate to the pure projection query. */
     queryBookingAvailability(contextId: string, request: ContextualAvailabilityQuery): Promise<ContextualAvailabilityQueryResult>;

package/lib/solution/UnifiedBookingSales/index.js

@@ -32,6 +32,7 @@ exports.normalizeProductForAvailability = normalizeProductForAvailability;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _lodashEs = require("lodash-es");
 var _modules = require("../../modules");
+var _utils = require("../../modules/BookingContext/utils");
 var _getDateIsInSchedule = require("../../modules/Schedule/getDateIsInSchedule");
 var _ResourcePlanner = require("../../modules/ResourcePlanner");
 var _types = require("./types");
@@ -503,6 +504,7 @@ function resolveProductScheduleItems(product, scheduleList) {
 function normalizeProductForAvailability(product, scheduleList = [], fixedOffsetMinutes = (0, _localClock.captureRuntimeOffsetMinutes)()) {
   const raw = product;
   const kind = resolveProductKind(raw);
+  const isFlexibleDuration = kind === 'duration' && (0, _utils.isProductFlexibleDuration)(raw.duration);
   const sessionRules = [];
   const sessionRanges = [];
   const explicitSession = raw.cartDetailValue?.session || raw._extend?.other?.session || raw.session;
@@ -524,7 +526,8 @@ function normalizeProductForAvailability(product, scheduleList = [], fixedOffset
     id: raw.id ?? raw.product_id,
     title: pickLocalizedText(raw.title || raw.name || raw.product_title),
     kind,
-    durationMinutes: kind === 'duration' ? Math.max(1, Number(raw.duration?.value || raw.duration || raw.service_duration || 30) || 30) : undefined,
+    isFlexibleDuration: isFlexibleDuration || undefined,
+    durationMinutes: kind === 'duration' && !isFlexibleDuration ? Math.max(1, Number(raw.duration?.value || raw.duration || raw.service_duration || 30) || 30) : undefined,
     requirementGroups: normalizeRequirementGroups(raw),
     sessionRules,
     sessionRanges,
@@ -2919,7 +2922,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     return handle;
   }
 
-  /** Pure configuration calculation over the current context projection. */
+  /** Candidate calculation over the current context projection and runtime minute. */
   async getProductTimeRanges(contextId, request = {}) {
     const {
       context,
@@ -2932,6 +2935,8 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       ...(allowOutsideOperatingHoursForRequestedStartTimes ? {
         allowOutsideOperatingHoursForRequestedStartTimes: true
       } : {})
+    }, {
+      evaluatedAt: this.getAvailabilityRuntimeDateTime()
     }).map(group => ({
       ...group,
       ranges: group.ranges.map(candidate => this.decorateAvailabilityCandidate(context.contextId, contextVersion, candidate))

package/package.json

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