@outbuild-company/schedule-core 1.31.0 → 1.31.2

package/dist/index.d.cts

@@ -2657,6 +2657,8 @@ interface BackendCalendarExceptionInput {
     to_date: string;
     workable: boolean;
     shifts?: BackendShiftInput[];
+    /** Recurrence step: `DAILY`, `WEEKLY`, `MONTHLY` or `YEARLY`. Empty or unknown means a plain range. */
+    every_type?: string | null;
 }
 /** Calendar payload accepted at the backend normalization boundary. */
 interface BackendCalendarInput {

package/dist/index.d.ts

@@ -2657,6 +2657,8 @@ interface BackendCalendarExceptionInput {
     to_date: string;
     workable: boolean;
     shifts?: BackendShiftInput[];
+    /** Recurrence step: `DAILY`, `WEEKLY`, `MONTHLY` or `YEARLY`. Empty or unknown means a plain range. */
+    every_type?: string | null;
 }
 /** Calendar payload accepted at the backend normalization boundary. */
 interface BackendCalendarInput {

package/dist/index.js

@@ -14907,11 +14907,14 @@ var PASTE_PLACEMENT = {
 };
 
 // src/activity-copy-paste/paste.ts
+function childIdsInCorrelativeOrder(parentId, adapter) {
+  return collectChildrenSnapshots(parentId, adapter).sort(compareActivitiesInVisualOrder).map((activity) => activity.id);
+}
 function resolveEndDestination(adapter) {
-  const rootIds = adapter.getRootIds();
+  const rootIds = childIdsInCorrelativeOrder(ROOT_PARENT_ID, adapter);
   const [soleRootId] = rootIds;
   if (rootIds.length === 1 && soleRootId !== void 0) {
-    const lastChildId = adapter.getChildren(soleRootId).at(-1);
+    const lastChildId = childIdsInCorrelativeOrder(soleRootId, adapter).at(-1);
     return lastChildId === void 0 ? { ok: true, parentId: soleRootId } : { ok: true, parentId: soleRootId, afterSiblingId: lastChildId };
   }
   const lastRootId = rootIds.at(-1);
@@ -14930,14 +14933,14 @@ function resolvePasteDestination(destination, adapter) {
     return adapter.getRootIds().length === 1 ? {
       ok: true,
       parentId: sibling.id,
-      beforeSiblingId: adapter.getChildren(sibling.id)[0]
+      beforeSiblingId: childIdsInCorrelativeOrder(sibling.id, adapter)[0]
     } : { ok: true, parentId: ROOT_PARENT_ID, afterSiblingId };
   }
   if (adapter.hasChildren(sibling.id)) {
     return {
       ok: true,
       parentId: sibling.id,
-      beforeSiblingId: adapter.getChildren(sibling.id)[0]
+      beforeSiblingId: childIdsInCorrelativeOrder(sibling.id, adapter)[0]
     };
   }
   return {
@@ -24246,6 +24249,13 @@ function computeProjectWorkHours(calendars) {
 var DAY_MS = 24 * 60 * 60 * 1e3;
 var EXCEPTION_DATE_FORMAT_REGEX = /^(\d{4})[/-](\d{1,2})[/-](\d{1,2})/;
 var WEEKDAYS_PER_WEEK = 7;
+var EXCEPTION_EVERY_TYPE = {
+  DAILY: "DAILY",
+  WEEKLY: "WEEKLY",
+  MONTHLY: "MONTHLY",
+  YEARLY: "YEARLY"
+};
+var MONTHS_PER_YEAR = 12;
 var CALENDAR_FALLBACK_WORKING_DAYS = [false, true, true, true, true, true, false];
 var WORKING_DAY_TRUE_VALUES = /* @__PURE__ */ new Set([
   "1",
@@ -24342,7 +24352,8 @@ function parseExceptionDays(exceptions, range) {
     const rangeKeys = expandRangeToUtcKeys(
       exception.from_date,
       exception.to_date,
-      range
+      range,
+      exception.every_type
     );
     if (rangeKeys.length === 0) continue;
     const value = exceptionToDateValue(exception);
@@ -24351,19 +24362,59 @@ function parseExceptionDays(exceptions, range) {
   }
   return Object.keys(map).length > 0 ? map : null;
 }
-function expandRangeToUtcKeys(from, to, range) {
+function expandRangeToUtcKeys(from, to, range, everyType) {
   const fromTs = parseExceptionDate(from);
   const toTs = parseExceptionDate(to);
   if (fromTs === null || toTs === null) return [];
   if (range && (toTs < range.start || fromTs > range.end)) return [];
-  const keys = [];
-  let cursor = range ? Math.max(fromTs, range.start) : fromTs;
+  const first = range ? Math.max(fromTs, range.start) : fromTs;
   const last = range ? Math.min(toTs, range.end) : toTs;
-  while (cursor <= last) {
-    keys.push(String(cursor));
-    cursor += DAY_MS;
+  const timestamps = steppedTimestamps(fromTs, first, last, everyType);
+  return timestamps.map(String);
+}
+function steppedTimestamps(anchor, first, last, everyType) {
+  switch (everyType) {
+    case EXCEPTION_EVERY_TYPE.DAILY:
+      return everyNthDay(anchor, first, last, 1);
+    case EXCEPTION_EVERY_TYPE.WEEKLY:
+      return everyNthDay(anchor, first, last, WEEKDAYS_PER_WEEK);
+    case EXCEPTION_EVERY_TYPE.MONTHLY:
+      return monthlyOccurrences(anchor, first, last, 1);
+    case EXCEPTION_EVERY_TYPE.YEARLY:
+      return monthlyOccurrences(anchor, first, last, MONTHS_PER_YEAR);
+    default:
+      return everyNthDay(anchor, first, last, 1);
+  }
+}
+function everyNthDay(anchor, first, last, stepDays) {
+  const stepMs = stepDays * DAY_MS;
+  const skipped = Math.max(0, Math.ceil((first - anchor) / stepMs));
+  const timestamps = [];
+  for (let cursor = anchor + skipped * stepMs; cursor <= last; cursor += stepMs) {
+    timestamps.push(cursor);
+  }
+  return timestamps;
+}
+function monthlyOccurrences(anchor, first, last, stepMonths) {
+  const anchorDate = new Date(anchor);
+  const anchorMonthIndex = anchorDate.getUTCFullYear() * MONTHS_PER_YEAR + anchorDate.getUTCMonth();
+  const firstDate = new Date(first);
+  const firstMonthIndex = firstDate.getUTCFullYear() * MONTHS_PER_YEAR + firstDate.getUTCMonth();
+  const anchorDay = anchorDate.getUTCDate();
+  const skipped = Math.max(
+    0,
+    Math.floor((firstMonthIndex - anchorMonthIndex) / stepMonths)
+  );
+  const timestamps = [];
+  for (let step = skipped; ; step += 1) {
+    const monthIndex = anchorMonthIndex + step * stepMonths;
+    const year = Math.floor(monthIndex / MONTHS_PER_YEAR);
+    const month = monthIndex % MONTHS_PER_YEAR;
+    const timestamp = Date.UTC(year, month, anchorDay);
+    if (timestamp > last) return timestamps;
+    const dayExists = new Date(timestamp).getUTCMonth() === month;
+    if (dayExists && timestamp >= first) timestamps.push(timestamp);
   }
-  return keys;
 }
 function parseExceptionDate(raw) {
   if (typeof raw !== "string") return null;