@outbuild-company/schedule-core 1.35.3 → 1.37.0

package/dist/index.cjs

@@ -2306,24 +2306,37 @@ function toLevelWindow(input) {
   return { startLevel, depth: input.depth };
 }
 var INVALID_CRITERION = /* @__PURE__ */ Symbol("invalid-group-criterion");
-function toSecondaryCriterion(input) {
-  const secondary = input.secondary;
-  if (secondary === void 0 || secondary === null) return null;
-  if (typeof secondary !== "object") return INVALID_CRITERION;
-  if (typeof secondary.attributeKey !== "string" || secondary.attributeKey.length === 0) {
+var MAX_NESTED_GROUP_CRITERIA = 3;
+function toNestedCriterion(input, usedKeys) {
+  if (typeof input !== "object" || input === null) return INVALID_CRITERION;
+  if (typeof input.attributeKey !== "string" || input.attributeKey.length === 0) {
     return INVALID_CRITERION;
   }
-  if (secondary.attributeKey === input.attributeKey) return INVALID_CRITERION;
-  const window2 = toLevelWindow(secondary);
+  if (usedKeys.has(input.attributeKey)) return INVALID_CRITERION;
+  const window2 = toLevelWindow(input);
   if (window2 === null) return INVALID_CRITERION;
-  if (!isValidDirection(secondary.direction)) return INVALID_CRITERION;
+  if (!isValidDirection(input.direction)) return INVALID_CRITERION;
   return {
-    attributeKey: secondary.attributeKey,
+    attributeKey: input.attributeKey,
     startLevel: window2.startLevel,
     depth: window2.depth,
-    direction: secondary.direction
+    direction: input.direction
   };
 }
+function toNestedCriteria(input, primaryKey) {
+  const rawNested = input.nested ?? (input.secondary == null ? [] : [input.secondary]);
+  if (!Array.isArray(rawNested)) return INVALID_CRITERION;
+  if (rawNested.length > MAX_NESTED_GROUP_CRITERIA) return INVALID_CRITERION;
+  const usedKeys = /* @__PURE__ */ new Set([primaryKey]);
+  const nested = [];
+  for (const rawCriterion of rawNested) {
+    const criterion = toNestedCriterion(rawCriterion, usedKeys);
+    if (criterion === INVALID_CRITERION) return INVALID_CRITERION;
+    usedKeys.add(criterion.attributeKey);
+    nested.push(criterion);
+  }
+  return nested;
+}
 function toGroupState(input) {
   if (typeof input.attributeKey !== "string" || input.attributeKey.length === 0) {
     return null;
@@ -2337,8 +2350,8 @@ function toGroupState(input) {
   if (!Array.isArray(input.collapsedIds) || input.collapsedIds.some((id) => typeof id !== "string")) {
     return null;
   }
-  const secondary = toSecondaryCriterion(input);
-  if (secondary === INVALID_CRITERION) return null;
+  const nested = toNestedCriteria(input, input.attributeKey);
+  if (nested === INVALID_CRITERION) return null;
   return {
     attributeKey: input.attributeKey,
     startLevel: window2.startLevel,
@@ -2346,7 +2359,7 @@ function toGroupState(input) {
     direction: input.direction,
     includeWbs: input.includeWbs,
     collapsedIds: new Set(input.collapsedIds),
-    secondary
+    nested
   };
 }
 function emptyViewChanges(action) {
@@ -8212,25 +8225,39 @@ function getVisibleBaseline(activity) {
   return points.find((point) => point.isVisibleVersion) ?? null;
 }
 
-// src/columns/baseline-variance/compute.ts
+// src/columns/baseline-variance/baseline-variance-days.ts
 var VARIANCE_DECIMAL_SCALE = 100;
 var roundToVariancePrecision = (days) => Math.round(days * VARIANCE_DECIMAL_SCALE) / VARIANCE_DECIMAL_SCALE;
-function varianceDaysForBaselineEnd(activity, baselineEnd, calendars, hoursPerDay) {
-  if (hoursPerDay <= 0) return null;
-  const activityEnd = activity.endDate;
-  if (!baselineEnd || !activityEnd) return null;
-  const finishesLate = activityEnd.getTime() > baselineEnd.getTime();
-  const finishesEarly = baselineEnd.getTime() > activityEnd.getTime();
+function baselineVarianceDays(input) {
+  const { endDate, baselineEnd, calendar, hoursPerDay } = input;
+  const hasUsableHoursPerDay = Number.isFinite(hoursPerDay) && hoursPerDay > 0;
+  if (!hasUsableHoursPerDay) return null;
+  if (!baselineEnd || !endDate) return null;
+  const hasValidDates = Number.isFinite(endDate.getTime()) && Number.isFinite(baselineEnd.getTime());
+  if (!hasValidDates) return null;
+  const finishesLate = endDate.getTime() > baselineEnd.getTime();
+  const finishesEarly = baselineEnd.getTime() > endDate.getTime();
   if (!finishesLate && !finishesEarly) return 0;
-  const durationHours = calendars.calculateDuration({
-    startDate: finishesLate ? baselineEnd : activityEnd,
-    endDate: finishesLate ? activityEnd : baselineEnd,
-    task: activity
-  });
+  const durationHours = calendar.calculateDuration(
+    finishesLate ? baselineEnd : endDate,
+    finishesLate ? endDate : baselineEnd
+  );
   const magnitude = roundToVariancePrecision(durationHours / hoursPerDay);
   if (magnitude === 0) return 0;
   return finishesLate ? magnitude : -magnitude;
 }
+
+// src/columns/baseline-variance/compute.ts
+function varianceDaysForBaselineEnd(activity, baselineEnd, calendars, hoursPerDay) {
+  return baselineVarianceDays({
+    endDate: activity.endDate,
+    baselineEnd,
+    calendar: {
+      calculateDuration: (startDate, endDate) => calendars.calculateDuration({ startDate, endDate, task: activity })
+    },
+    hoursPerDay
+  });
+}
 function computeBaselineVarianceDays(activity, calendars, hoursPerDay) {
   return varianceDaysForBaselineEnd(
     activity,
@@ -25888,7 +25915,7 @@ function emitActivities(node, context) {
     });
   }
 }
-function emitNode(node, childDirection, allowSecondary, context) {
+function emitNode(node, childDirection, nextNestedIndex, context) {
   const { group, rows } = context;
   rows.push({
     kind: VISUAL_ROW_KIND.GROUP,
@@ -25900,20 +25927,24 @@ function emitNode(node, childDirection, allowSecondary, context) {
   });
   if (group.collapsedIds.has(node.id)) return;
   for (const child of sortedChildNodes(node, childDirection)) {
-    emitNode(child, childDirection, allowSecondary, context);
+    emitNode(child, childDirection, nextNestedIndex, context);
   }
   if (node.activities.length === 0) return;
-  const secondary = group.secondary;
-  if (allowSecondary && secondary != null && context.secondaryCatalog != null) {
-    const secondaryRoot = buildGroupTree(
+  const nestedCriterion = group.nested[nextNestedIndex];
+  const nestedCatalog = context.nestedCatalogs[nextNestedIndex] ?? null;
+  if (nestedCriterion != null && nestedCatalog != null) {
+    const nestedRoot = buildGroupTree(
       node.activities,
-      secondary,
-      context.secondaryCatalog,
+      nestedCriterion,
+      nestedCatalog,
       createNode(node.id, "", "", null, node.level, 0),
       true
     );
-    for (const child of sortedChildNodes(secondaryRoot, secondary.direction)) {
-      emitNode(child, secondary.direction, false, context);
+    for (const child of sortedChildNodes(
+      nestedRoot,
+      nestedCriterion.direction
+    )) {
+      emitNode(child, nestedCriterion.direction, nextNestedIndex + 1, context);
     }
     return;
   }
@@ -25956,11 +25987,11 @@ function projectVisualRows(input) {
     comparator: input.comparator,
     orderMode: input.orderMode,
     wbsDepth: input.wbsDepth,
-    secondaryCatalog: input.secondaryCatalog,
+    nestedCatalogs: input.nestedCatalogs,
     rows
   };
   for (const child of sortedChildNodes(root, group.direction)) {
-    emitNode(child, group.direction, true, context);
+    emitNode(child, group.direction, 0, context);
   }
   return rows;
 }
@@ -26366,7 +26397,9 @@ var ScheduleState = class _ScheduleState {
     if (this._cache.visualRows) return this._cache.visualRows;
     const group = this._viewAttributes.getGroup();
     const catalog = group === null ? null : this._viewAttributes.getCatalog(group.attributeKey);
-    const secondaryCatalog = group?.secondary == null ? null : this._viewAttributes.getCatalog(group.secondary.attributeKey);
+    const nestedCatalogs = group === null ? [] : group.nested.map(
+      (criterion) => this._viewAttributes.getCatalog(criterion.attributeKey)
+    );
     const activitiesInVisualOrder = [];
     for (const activityId of this.getVisualOrderIds()) {
       const activity = this.getActivity(activityId);
@@ -26379,7 +26412,7 @@ var ScheduleState = class _ScheduleState {
       hasChildren: (activityId) => this.hasChildren(activityId),
       group,
       catalog,
-      secondaryCatalog,
+      nestedCatalogs,
       comparator: this.getOrderComparator(),
       orderMode: this.getOrderMode(),
       wbsDepth: this._viewAttributes.getWbsDepth()
@@ -38168,6 +38201,7 @@ exports.WORK_TIME_DIRECTION = WORK_TIME_DIRECTION;
 exports.activityBackendRow = activityBackendRow;
 exports.allowedSecondaryConstraintTypes = allowedSecondaryConstraintTypes;
 exports.appendGroupRowId = appendGroupRowId;
+exports.baselineVarianceDays = baselineVarianceDays;
 exports.buildGroupRowId = buildGroupRowId;
 exports.checkNoUpdatedLinks = checkNoUpdatedLinks;
 exports.computeExpectedProgress = computeExpectedProgress;
@@ -38182,6 +38216,7 @@ exports.expectedProgressFromBaseline = expectedProgressFromBaseline;
 exports.formatUtcAsP6WallDate = formatUtcAsP6WallDate;
 exports.getActiveBaseline = getActiveBaseline;
 exports.getUnsavedActivities = getUnsavedActivities;
+exports.getVisibleBaseline = getVisibleBaseline;
 exports.hostScheduleInput = hostScheduleInput;
 exports.isRestorableActivityField = isRestorableActivityField;
 exports.isRevertibleActivityField = isRevertibleActivityField;