@outbuild-company/schedule-core 1.9.3 → 1.10.0

package/dist/index.d.cts

@@ -282,9 +282,9 @@ type StringOperator = 'includes' | 'notIncludes' | 'is' | 'isNot';
 type NumberOperator = 'equals' | 'notEquals' | 'greaterThan' | 'lessThan' | 'greaterOrEqual' | 'lessOrEqual';
 type DateOperator = 'after' | 'before';
 type MembershipOperator = 'someOf' | 'notSomeOf';
-type FilterOperator = StringOperator | NumberOperator | DateOperator | MembershipOperator;
+type FilterOperator = StringOperator | NumberOperator | DateOperator | 'between' | MembershipOperator;
 type StringFilterField = 'name' | 'description' | 'customId';
-type NumberFilterField = 'correlativeId' | 'uniqueCorrelativeId' | 'progress' | 'durationDays' | 'calendarDuration' | 'cost' | 'usedCost' | 'realCost' | 'workHours' | 'realWorkHours' | 'ponderator' | 'freeSlackDays' | 'totalSlackDays' | 'expectedProgressBaseline' | 'baselineDurationDays' | 'baselineCost' | 'baselineWorkHours';
+type NumberFilterField = 'correlativeId' | 'uniqueCorrelativeId' | 'progress' | 'durationDays' | 'calendarDuration' | 'cost' | 'usedCost' | 'realCost' | 'workHours' | 'realWorkHours' | 'ponderator' | 'freeSlackDays' | 'totalSlackDays' | 'expectedProgressBaseline' | 'baselineDurationDays' | 'baselineCost' | 'baselineWorkHours' | 'expectedProgress';
 type DateFilterField = 'startDate' | 'endDate' | 'constraintDate' | 'baselineStartDate' | 'baselineEndDate' | 'earlyStart' | 'earlyFinish' | 'lateStart' | 'lateFinish';
 type IdArrayFilterField = 'responsableIds' | 'tagIds';
 type EnumFilterField = 'status' | 'constraintType';
@@ -298,7 +298,13 @@ interface Criterion<Field extends FilterField, Operator, Value> {
     readonly operator: Operator;
     readonly value: Value;
 }
-type FilterCriterion = Criterion<StringFilterField, StringOperator, string> | Criterion<NumberFilterField, NumberOperator, string | number> | Criterion<DateFilterField, DateOperator, string | number | Date> | Criterion<IdArrayFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<EnumFilterField, MembershipOperator, ReadonlyArray<string>> | Criterion<ReferenceFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<BooleanFilterField, MembershipOperator, ReadonlyArray<boolean>>;
+interface BetweenCriterion<Field extends FilterField, Value> {
+    readonly field: Field;
+    readonly operator: 'between';
+    readonly value: Value;
+    readonly valueTo: Value;
+}
+type FilterCriterion = Criterion<StringFilterField, StringOperator, string> | Criterion<NumberFilterField, NumberOperator, string | number> | BetweenCriterion<NumberFilterField, string | number> | Criterion<DateFilterField, DateOperator, string | number | Date> | BetweenCriterion<DateFilterField, string | number | Date> | Criterion<IdArrayFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<EnumFilterField, MembershipOperator, ReadonlyArray<string>> | Criterion<ReferenceFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<BooleanFilterField, MembershipOperator, ReadonlyArray<boolean>>;
 interface FilterDateRange {
     readonly start: Date;
     readonly end: Date;
@@ -837,6 +843,7 @@ declare class ScheduleCore {
     getChildrenIds(parentId: ActivityId | '0'): ReadonlyArray<ActivityId>;
     getSelectedActivityIds(): string[];
     getHiddenActivityIds(): string[];
+    getVisibleActivityIds(): string[];
     getActiveFilter(): Readonly<FilterState> | null;
     getActiveOrder(): Readonly<OrderState> | null;
     getVisualOrderIds(): ReadonlyArray<ActivityId>;

package/dist/index.d.ts

@@ -282,9 +282,9 @@ type StringOperator = 'includes' | 'notIncludes' | 'is' | 'isNot';
 type NumberOperator = 'equals' | 'notEquals' | 'greaterThan' | 'lessThan' | 'greaterOrEqual' | 'lessOrEqual';
 type DateOperator = 'after' | 'before';
 type MembershipOperator = 'someOf' | 'notSomeOf';
-type FilterOperator = StringOperator | NumberOperator | DateOperator | MembershipOperator;
+type FilterOperator = StringOperator | NumberOperator | DateOperator | 'between' | MembershipOperator;
 type StringFilterField = 'name' | 'description' | 'customId';
-type NumberFilterField = 'correlativeId' | 'uniqueCorrelativeId' | 'progress' | 'durationDays' | 'calendarDuration' | 'cost' | 'usedCost' | 'realCost' | 'workHours' | 'realWorkHours' | 'ponderator' | 'freeSlackDays' | 'totalSlackDays' | 'expectedProgressBaseline' | 'baselineDurationDays' | 'baselineCost' | 'baselineWorkHours';
+type NumberFilterField = 'correlativeId' | 'uniqueCorrelativeId' | 'progress' | 'durationDays' | 'calendarDuration' | 'cost' | 'usedCost' | 'realCost' | 'workHours' | 'realWorkHours' | 'ponderator' | 'freeSlackDays' | 'totalSlackDays' | 'expectedProgressBaseline' | 'baselineDurationDays' | 'baselineCost' | 'baselineWorkHours' | 'expectedProgress';
 type DateFilterField = 'startDate' | 'endDate' | 'constraintDate' | 'baselineStartDate' | 'baselineEndDate' | 'earlyStart' | 'earlyFinish' | 'lateStart' | 'lateFinish';
 type IdArrayFilterField = 'responsableIds' | 'tagIds';
 type EnumFilterField = 'status' | 'constraintType';
@@ -298,7 +298,13 @@ interface Criterion<Field extends FilterField, Operator, Value> {
     readonly operator: Operator;
     readonly value: Value;
 }
-type FilterCriterion = Criterion<StringFilterField, StringOperator, string> | Criterion<NumberFilterField, NumberOperator, string | number> | Criterion<DateFilterField, DateOperator, string | number | Date> | Criterion<IdArrayFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<EnumFilterField, MembershipOperator, ReadonlyArray<string>> | Criterion<ReferenceFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<BooleanFilterField, MembershipOperator, ReadonlyArray<boolean>>;
+interface BetweenCriterion<Field extends FilterField, Value> {
+    readonly field: Field;
+    readonly operator: 'between';
+    readonly value: Value;
+    readonly valueTo: Value;
+}
+type FilterCriterion = Criterion<StringFilterField, StringOperator, string> | Criterion<NumberFilterField, NumberOperator, string | number> | BetweenCriterion<NumberFilterField, string | number> | Criterion<DateFilterField, DateOperator, string | number | Date> | BetweenCriterion<DateFilterField, string | number | Date> | Criterion<IdArrayFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<EnumFilterField, MembershipOperator, ReadonlyArray<string>> | Criterion<ReferenceFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<BooleanFilterField, MembershipOperator, ReadonlyArray<boolean>>;
 interface FilterDateRange {
     readonly start: Date;
     readonly end: Date;
@@ -837,6 +843,7 @@ declare class ScheduleCore {
     getChildrenIds(parentId: ActivityId | '0'): ReadonlyArray<ActivityId>;
     getSelectedActivityIds(): string[];
     getHiddenActivityIds(): string[];
+    getVisibleActivityIds(): string[];
     getActiveFilter(): Readonly<FilterState> | null;
     getActiveOrder(): Readonly<OrderState> | null;
     getVisualOrderIds(): ReadonlyArray<ActivityId>;

package/dist/index.js

@@ -336,8 +336,13 @@ var FIELD_REGISTRY = {
   },
   expectedProgressBaseline: {
     valueKind: "number",
+    equalityPrecision: 2,
     extract: (activity) => activity.expectedProgressBaseline
   },
+  expectedProgress: {
+    valueKind: "number",
+    extract: (activity) => activity.expectedProgress
+  },
   baselineDurationDays: {
     valueKind: "number",
     extract: (activity) => activity.baselineSnapshot?.durationDays ?? null
@@ -420,6 +425,9 @@ function toTargetDate(value) {
   }
   return new Date(Number.NaN);
 }
+function utcDayMs(date2) {
+  return Date.UTC(date2.getUTCFullYear(), date2.getUTCMonth(), date2.getUTCDate());
+}
 function matchString(value, target, operator) {
   const isAbsent = value === null;
   if (operator === "includes") {
@@ -432,24 +440,35 @@ function matchString(value, target, operator) {
   if (operator === "isNot") return isAbsent || String(value) !== target;
   return false;
 }
-function matchNumber(value, target, operator) {
+function matchNumber(value, target, operator, equalityPrecision) {
   if (value === null || typeof value !== "number") {
     return operator === "notEquals";
   }
-  if (operator === "equals") return value === target;
-  if (operator === "notEquals") return value !== target;
+  const equalityValue = equalityPrecision === void 0 ? value : Number(value.toFixed(equalityPrecision));
+  if (operator === "equals") return equalityValue === target;
+  if (operator === "notEquals") return equalityValue !== target;
   if (operator === "greaterThan") return value > target;
   if (operator === "lessThan") return value < target;
   if (operator === "greaterOrEqual") return value >= target;
   if (operator === "lessOrEqual") return value <= target;
   return false;
 }
+function matchNumberBetween(value, minimum, maximum) {
+  return typeof value === "number" && value >= minimum && value <= maximum;
+}
 function matchDate(value, target, operator) {
   if (!(value instanceof Date)) return false;
-  if (operator === "after") return value.getTime() > target.getTime();
-  if (operator === "before") return value.getTime() < target.getTime();
+  const valueDay = utcDayMs(value);
+  const targetDay = utcDayMs(target);
+  if (operator === "after") return valueDay > targetDay;
+  if (operator === "before") return valueDay < targetDay;
   return false;
 }
+function matchDateBetween(value, minimum, maximum) {
+  if (!(value instanceof Date)) return false;
+  const day = utcDayMs(value);
+  return day >= utcDayMs(minimum) && day <= utcDayMs(maximum);
+}
 function matchIdArray(value, allowed, operator) {
   const ids = Array.isArray(value) ? value : [];
   const intersects = ids.some((id) => allowed.has(String(id)));
@@ -472,11 +491,33 @@ function matchCriterion(activity, criterion, context) {
   if (descriptor === null) return false;
   const value = descriptor.extract(activity, context);
   const { operator } = criterion;
+  if (operator === "between") {
+    if (descriptor.valueKind === "number") {
+      return matchNumberBetween(
+        value,
+        Number(criterion.value),
+        Number(criterion.valueTo)
+      );
+    }
+    if (descriptor.valueKind === "date") {
+      return matchDateBetween(
+        value,
+        toTargetDate(criterion.value),
+        toTargetDate(criterion.valueTo)
+      );
+    }
+    return false;
+  }
   if (descriptor.valueKind === "string") {
     return matchString(value, String(criterion.value), operator);
   }
   if (descriptor.valueKind === "number") {
-    return matchNumber(value, Number(criterion.value), operator);
+    return matchNumber(
+      value,
+      Number(criterion.value),
+      operator,
+      descriptor.equalityPrecision
+    );
   }
   if (descriptor.valueKind === "date") {
     return matchDate(value, toTargetDate(criterion.value), operator);
@@ -498,10 +539,10 @@ function matchesCriteria(activity, filter, context) {
   );
 }
 function overlapsRange(activity, range) {
-  const taskStart = activity.startDate.getTime();
-  const taskEnd = activity.endDate.getTime();
-  const windowStart = range.start.getTime();
-  const windowEnd = range.end.getTime();
+  const taskStart = utcDayMs(activity.startDate);
+  const taskEnd = utcDayMs(activity.endDate);
+  const windowStart = utcDayMs(range.start);
+  const windowEnd = utcDayMs(range.end);
   const fullyInside = taskStart >= windowStart && taskEnd <= windowEnd;
   const startsInside = taskStart >= windowStart && taskStart <= windowEnd;
   const windowStartsInside = windowStart >= taskStart && windowStart <= taskEnd;
@@ -651,9 +692,10 @@ var OPERATORS_BY_KIND = {
     "greaterThan",
     "lessThan",
     "greaterOrEqual",
-    "lessOrEqual"
+    "lessOrEqual",
+    "between"
   ]),
-  date: /* @__PURE__ */ new Set(["after", "before"]),
+  date: /* @__PURE__ */ new Set(["after", "before", "between"]),
   "id-array": /* @__PURE__ */ new Set(["someOf", "notSomeOf"]),
   enum: /* @__PURE__ */ new Set(["someOf", "notSomeOf"]),
   boolean: /* @__PURE__ */ new Set(["someOf", "notSomeOf"]),
@@ -684,6 +726,9 @@ function normalizeCriterion(criterion) {
   if (!OPERATORS_BY_KIND[descriptor.valueKind].has(criterion.operator)) {
     return { ok: false, reason: "unknown_operator" };
   }
+  if (criterion.operator === "between") {
+    return normalizeBetweenCriterion(criterion, descriptor.valueKind);
+  }
   if (descriptor.valueKind === "number") {
     const value = normalizeNumberValue(criterion.value);
     return value === null ? { ok: false, reason: "invalid_value" } : {
@@ -724,6 +769,31 @@ function normalizeCriterion(criterion) {
   }
   return { ok: true, criterion };
 }
+function normalizeBetweenCriterion(criterion, valueKind) {
+  if (valueKind === "number") {
+    const value = normalizeNumberValue(criterion.value);
+    const valueTo = normalizeNumberValue(criterion.valueTo);
+    if (value === null || valueTo === null || value > valueTo) {
+      return { ok: false, reason: "invalid_value" };
+    }
+    return {
+      ok: true,
+      criterion: { ...criterion, value, valueTo }
+    };
+  }
+  if (valueKind === "date") {
+    const value = normalizeDateValue(criterion.value);
+    const valueTo = normalizeDateValue(criterion.valueTo);
+    if (value === null || valueTo === null || value.getTime() > valueTo.getTime()) {
+      return { ok: false, reason: "invalid_value" };
+    }
+    return {
+      ok: true,
+      criterion: { ...criterion, value, valueTo }
+    };
+  }
+  return { ok: false, reason: "unknown_operator" };
+}
 function validateValueForKind(criterion, valueKind) {
   const { value } = criterion;
   if (valueKind === "boolean") {
@@ -1621,13 +1691,19 @@ function resolveExpansionAnchors(originalLink, adapter) {
     userLag: originalLink.lag ?? 0,
     sourceEndpointIsStart,
     targetLag: targetEndpointIsFinish ? -endpointSpanHours(target, targetBounds, adapter) : 0,
-    summarySourceId: originalLink.type === LINK_TYPE.START_TO_START && sourceBounds ? originalLink.source : void 0
+    summarySourceId: originalLink.type === LINK_TYPE.START_TO_START && sourceBounds ? originalLink.source : void 0,
+    finishAnchoredSummaryTargetId: targetEndpointIsFinish && targetBounds ? originalLink.target : void 0
   };
 }
 function pushOffsetPreservingLinks(expanded, sourceIds, leafIds, originalLink, adapter, virtualIdCounter, linksByActivity) {
   const anchors = resolveExpansionAnchors(originalLink, adapter);
   const { source, sourceBounds, targetStart, userLag } = anchors;
-  const { sourceEndpointIsStart, targetLag, summarySourceId } = anchors;
+  const {
+    sourceEndpointIsStart,
+    targetLag,
+    summarySourceId,
+    finishAnchoredSummaryTargetId
+  } = anchors;
   let counter = virtualIdCounter;
   for (const srcId of sourceIds) {
     const sourceLag = sourceEndpointIsStart ? sourceLagForLeaf(srcId, source, sourceBounds, adapter) : 0;
@@ -1650,7 +1726,7 @@ function pushOffsetPreservingLinks(expanded, sourceIds, leafIds, originalLink, a
           targetLag,
           userLag + offTarget,
           summarySourceId,
-          offTarget !== 0 && targetLag === 0 ? originalLink.target : void 0
+          finishAnchoredSummaryTargetId ?? (offTarget !== 0 && targetLag === 0 ? originalLink.target : void 0)
         )
       );
       counter += 1;
@@ -2098,7 +2174,7 @@ async function asapPass(orderedIds, links, adapter, options, isCurrent, plans) {
       if (!maxStart || result.successorStart > maxStart) {
         maxStart = result.successorStart;
         drivingLinkId = String(link.id);
-        drivingOffsetIsStale = link._summaryTargetId !== void 0 && !predecessorMovedThisRun;
+        drivingOffsetIsStale = link._summaryTargetId !== void 0 && !predecessorMovedThisRun && (link._targetLag === 0 || options.preventSummaryTargetPullback === true);
       }
     }
     const staleOffsetWouldPullBack = maxStart !== null && drivingOffsetIsStale && maxStart < activity.startDate;
@@ -9961,7 +10037,11 @@ async function runPostMutation(deps, args) {
   if (passes.has(DERIVED_PASS.AUTOSCHEDULE)) {
     await refreshMutatedParentBounds(deps.adapter, args);
   }
-  const schedule = passes.has(DERIVED_PASS.AUTOSCHEDULE) ? await runAutoschedule(deps, args.autoscheduleFrom) : emptySchedule();
+  const schedule = passes.has(DERIVED_PASS.AUTOSCHEDULE) ? await runAutoschedule(
+    deps,
+    args.autoscheduleFrom,
+    args.preventSummaryTargetPullback
+  ) : emptySchedule();
   await rollUpParentBounds(
     deps.adapter,
     args,
@@ -10032,8 +10112,11 @@ function collectFieldProgressInvalidations(adapter, beforeById, dirtySeeds, affe
     }
   }
 }
-async function runAutoschedule(deps, autoscheduleFrom) {
+async function runAutoschedule(deps, autoscheduleFrom, preventSummaryTargetPullback = false) {
   const options = autoscheduleFrom === "roots" ? {} : { triggerId: autoscheduleFrom };
+  if (preventSummaryTargetPullback) {
+    options.preventSummaryTargetPullback = true;
+  }
   const result = await deps.scheduler.schedule(options);
   const outcome = captureScheduledRows(deps.adapter, result.updatedIds);
   applyResults(deps.adapter, result);
@@ -11502,14 +11585,21 @@ async function createActivityCore(action, deps, opts = {}) {
     recomputeUsedCostCascadeForActivity(newId, adapter);
     recomputeCostCascadeForActivity(newId, adapter);
   }
-  recomputeAndFoldCorrelatives(
+  const correlativeShifts = recomputeCorrelatives(
     adapter,
     newId,
-    beforeSnap,
     initialTouched,
     opts
   );
-  return { ok: true, newId, parent, newActivity, beforeSnap, initialTouched };
+  return {
+    ok: true,
+    newId,
+    parent,
+    newActivity,
+    beforeSnap,
+    initialTouched,
+    correlativeShifts
+  };
 }
 function validateCreateTarget(action, adapter) {
   const isRoot = isRootParent(action.parentId);
@@ -11604,20 +11694,16 @@ function applyParentMutations(action, newId, parent, adapter, parentWasLeaf) {
     );
   }
 }
-function recomputeAndFoldCorrelatives(adapter, newId, beforeSnap, initialTouched, opts) {
-  if (opts.skipCorrelativeRecompute) return;
-  const correlativeShifts = recomputeCorrelativeIds(adapter);
-  if (opts.skipBeforeSnap) return;
-  foldCorrelativeShifts(
-    adapter,
-    correlativeShifts,
-    /* @__PURE__ */ new Set([String(newId)]),
-    beforeSnap,
-    initialTouched
+function recomputeCorrelatives(adapter, newId, initialTouched, opts) {
+  if (opts.skipCorrelativeRecompute) return [];
+  const shifts = recomputeCorrelativeIds(adapter).filter(
+    (shift) => shift.activityId !== String(newId)
   );
+  for (const shift of shifts) initialTouched.add(shift.activityId);
+  return shifts;
 }
 async function buildCreateChangeSet(adapter, action, coreResult, scheduledIds, hoursPerDay) {
-  const { newId, newActivity, beforeSnap, initialTouched } = coreResult;
+  const { newId, newActivity, beforeSnap, initialTouched, correlativeShifts } = coreResult;
   const trackingEvent = {
     name: DISPATCH_TRACK_EVENT.ACTIVITY_CREATION,
     properties: {
@@ -11634,6 +11720,7 @@ async function buildCreateChangeSet(adapter, action, coreResult, scheduledIds, h
     beforeSnap,
     touchedIds: initialTouched,
     scheduledIds,
+    correlativeShifts,
     trackingEvents: [trackingEvent]});
 }
 async function dispatchActivityCreate(action, options, deps) {
@@ -11662,8 +11749,9 @@ async function dispatchActivityCreate(action, options, deps) {
       },
       {
         action,
-        autoscheduleFrom: "roots",
+        autoscheduleFrom: newId,
         recomputeParentsFrom: [newId],
+        preventSummaryTargetPullback: true,
         now: deps.now,
         options
       }
@@ -21350,6 +21438,11 @@ var ScheduleCore = class _ScheduleCore {
     this.assertReady();
     return this.coreRuntime.state.hiddenIds().map(String);
   }
+  getVisibleActivityIds() {
+    this.assertReady();
+    const hiddenIds = new Set(this.coreRuntime.state.hiddenIds().map(String));
+    return this.coreRuntime.state.getAllIds().map(String).filter((activityId) => !hiddenIds.has(activityId));
+  }
   getActiveFilter() {
     this.assertReady();
     return cloneDomainValue(this.coreRuntime.state.getActiveFilter());