@outbuild-company/schedule-core 1.35.3 → 1.37.0

package/dist/index.js

@@ -2304,24 +2304,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;
@@ -2335,8 +2348,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,
@@ -2344,7 +2357,7 @@ function toGroupState(input) {
     direction: input.direction,
     includeWbs: input.includeWbs,
     collapsedIds: new Set(input.collapsedIds),
-    secondary
+    nested
   };
 }
 function emptyViewChanges(action) {
@@ -8210,25 +8223,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,
@@ -25886,7 +25913,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,
@@ -25898,20 +25925,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;
   }
@@ -25954,11 +25985,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;
 }
@@ -26364,7 +26395,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);
@@ -26377,7 +26410,7 @@ var ScheduleState = class _ScheduleState {
       hasChildren: (activityId) => this.hasChildren(activityId),
       group,
       catalog,
-      secondaryCatalog,
+      nestedCatalogs,
       comparator: this.getOrderComparator(),
       orderMode: this.getOrderMode(),
       wbsDepth: this._viewAttributes.getWbsDepth()
@@ -38094,6 +38127,6 @@ var CREATION_KIND = {
   ROOT: "root"
 };
 
-export { ACTIVITY_BATCH_ACTION_KIND, ACTIVITY_BATCH_MODE, ACTIVITY_DATE_EDGE, ACTIVITY_FIELD, ACTIVITY_PONDERATOR_CRITERION, ACTIVITY_PROGRESS_ORIGIN, ACTIVITY_TYPE, BASELINE_ROLE, CALENDAR_UNIT, CHANGE_SET_SOURCE_KIND, COLUMN, COMPLETED_PROGRESS, CONFIRMATION_KIND, CONSTRAINT_TYPE, CONSTRAINT_TYPE_TO_LABEL, CONSTRAINT_WARNING_KIND, CREATION_KIND, P6_PROPERTY_CONTRACT as DATA_DATE_PROPERTY_CONTRACT, DATE_GESTURE_KIND, DEFAULT_HOURS_PER_DAY, DISPATCH_ACTION_KIND, DISPATCH_ACTION_KINDS, DISPATCH_LINK_OPERATION_KIND, DISPATCH_TRACK_EVENT, P6CapabilityError as DataDateCapabilityError, EDIT_ALERT_KEY, EDIT_DENIAL_REASON, ENTITY_CHANGE_KIND, FILTER_FIELD, FILTER_LOGIC, FILTER_OPERATOR, FILTER_REJECTION_REASON, FILTER_VALUE_KIND, FLAT_WBS_DEPTH, GROUP_ID_PREFIX, GROUP_ID_SEPARATOR, LINK_BATCH_OPERATION_KIND, LINK_CODE, LINK_CODE_TO_TYPE, LINK_REJECTION_REASON, LINK_RELATIONSHIP, LINK_TYPE, LINK_TYPE_CODE, LOOKAHEAD_CONFIRMATION_KIND, LookaheadActualTransitionError, MINIMUM_GROUP_DEPTH, MINIMUM_GROUP_LEVEL, NEW_ACTIVITY_DEFAULTS, NOT_STARTED_PROGRESS, ORDER_DIRECTION, ORDER_MODE, PASTE_PLACEMENT, PERSISTENCE_REBASE_CONFLICT_KIND, PERSISTENCE_REBASE_ENTITY, REJECTION_REASON, RESTORABLE_ACTIVITY_FIELDS, ROOT_PARENT_ID, SCHEDULE_CORE_STATUS, SCHEDULE_EFFECT_KIND, SIR_AUTO_REJECT_REASON, STATUS, STATUS_CRITERIA, STRUCTURE_ACTIVITY_FIELDS, ScheduleCore, UNASSIGNED_GROUP_LABEL, UNASSIGNED_VALUE_ID, VIEW_ATTRIBUTE_KIND, VISUAL_ROW_KIND, WORK_TIME_DIRECTION, activityBackendRow, allowedSecondaryConstraintTypes, appendGroupRowId, buildGroupRowId, checkNoUpdatedLinks, computeExpectedProgress, createCalendarReader, createLookaheadDerivedFields, createOutbuildP6ScheduleSettings as createOutbuildDataDateScheduleSettings, createSchedule, p6InputFromDto as dataDateInputFromDto, decodeWireValue, encodeWireValue, expectedProgressFromBaseline, formatUtcAsP6WallDate, getActiveBaseline, getUnsavedActivities, hostScheduleInput, isRestorableActivityField, isRevertibleActivityField, isRootParent, isViewAttributeCriterion, isViewAttributeOrderRule, linkBackendRow, loadTimeWork, mapP6ScheduleOptions as mapDataDateScheduleOptions, movedToAnotherUtcDay, normalizeParentKey, parseFromBackend, parseP6DayAsCalendarStart, parseP6WallDateAsUtc, planLookaheadProgressActuals, prepareLookaheadProgressActuals, prepareLookaheadProgressActualsForPersistence, rescheduledOnLoad, resolveExpectedFinishDateSelection, resolveLookaheadActualDateSelection, serializeP6Activity as serializeDataDateActivity, serializeP6Settings as serializeDataDateSettings, serializeP6State as serializeDataDateState, willRunCriticalPath, yieldToBrowser };
+export { ACTIVITY_BATCH_ACTION_KIND, ACTIVITY_BATCH_MODE, ACTIVITY_DATE_EDGE, ACTIVITY_FIELD, ACTIVITY_PONDERATOR_CRITERION, ACTIVITY_PROGRESS_ORIGIN, ACTIVITY_TYPE, BASELINE_ROLE, CALENDAR_UNIT, CHANGE_SET_SOURCE_KIND, COLUMN, COMPLETED_PROGRESS, CONFIRMATION_KIND, CONSTRAINT_TYPE, CONSTRAINT_TYPE_TO_LABEL, CONSTRAINT_WARNING_KIND, CREATION_KIND, P6_PROPERTY_CONTRACT as DATA_DATE_PROPERTY_CONTRACT, DATE_GESTURE_KIND, DEFAULT_HOURS_PER_DAY, DISPATCH_ACTION_KIND, DISPATCH_ACTION_KINDS, DISPATCH_LINK_OPERATION_KIND, DISPATCH_TRACK_EVENT, P6CapabilityError as DataDateCapabilityError, EDIT_ALERT_KEY, EDIT_DENIAL_REASON, ENTITY_CHANGE_KIND, FILTER_FIELD, FILTER_LOGIC, FILTER_OPERATOR, FILTER_REJECTION_REASON, FILTER_VALUE_KIND, FLAT_WBS_DEPTH, GROUP_ID_PREFIX, GROUP_ID_SEPARATOR, LINK_BATCH_OPERATION_KIND, LINK_CODE, LINK_CODE_TO_TYPE, LINK_REJECTION_REASON, LINK_RELATIONSHIP, LINK_TYPE, LINK_TYPE_CODE, LOOKAHEAD_CONFIRMATION_KIND, LookaheadActualTransitionError, MINIMUM_GROUP_DEPTH, MINIMUM_GROUP_LEVEL, NEW_ACTIVITY_DEFAULTS, NOT_STARTED_PROGRESS, ORDER_DIRECTION, ORDER_MODE, PASTE_PLACEMENT, PERSISTENCE_REBASE_CONFLICT_KIND, PERSISTENCE_REBASE_ENTITY, REJECTION_REASON, RESTORABLE_ACTIVITY_FIELDS, ROOT_PARENT_ID, SCHEDULE_CORE_STATUS, SCHEDULE_EFFECT_KIND, SIR_AUTO_REJECT_REASON, STATUS, STATUS_CRITERIA, STRUCTURE_ACTIVITY_FIELDS, ScheduleCore, UNASSIGNED_GROUP_LABEL, UNASSIGNED_VALUE_ID, VIEW_ATTRIBUTE_KIND, VISUAL_ROW_KIND, WORK_TIME_DIRECTION, activityBackendRow, allowedSecondaryConstraintTypes, appendGroupRowId, baselineVarianceDays, buildGroupRowId, checkNoUpdatedLinks, computeExpectedProgress, createCalendarReader, createLookaheadDerivedFields, createOutbuildP6ScheduleSettings as createOutbuildDataDateScheduleSettings, createSchedule, p6InputFromDto as dataDateInputFromDto, decodeWireValue, encodeWireValue, expectedProgressFromBaseline, formatUtcAsP6WallDate, getActiveBaseline, getUnsavedActivities, getVisibleBaseline, hostScheduleInput, isRestorableActivityField, isRevertibleActivityField, isRootParent, isViewAttributeCriterion, isViewAttributeOrderRule, linkBackendRow, loadTimeWork, mapP6ScheduleOptions as mapDataDateScheduleOptions, movedToAnotherUtcDay, normalizeParentKey, parseFromBackend, parseP6DayAsCalendarStart, parseP6WallDateAsUtc, planLookaheadProgressActuals, prepareLookaheadProgressActuals, prepareLookaheadProgressActualsForPersistence, rescheduledOnLoad, resolveExpectedFinishDateSelection, resolveLookaheadActualDateSelection, serializeP6Activity as serializeDataDateActivity, serializeP6Settings as serializeDataDateSettings, serializeP6State as serializeDataDateState, willRunCriticalPath, yieldToBrowser };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map