@outbuild-company/schedule-core 1.35.3 → 1.36.0

package/dist/index.d.cts

@@ -685,9 +685,9 @@ interface GroupLevelWindow {
     readonly depth: number;
 }
 /**
- * One grouping level below the primary one. Nesting more than a second level is
- * expressed through the level window on a hierarchical attribute, not by chaining
- * these.
+ * One grouping level: the attribute to band by, the window of its outline levels
+ * that becomes bands, and the band order. The primary level lives on `GroupState`
+ * itself; every further level is chained through `GroupState.nested`.
  */
 interface GroupCriterion extends GroupLevelWindow {
     readonly attributeKey: string;
@@ -704,11 +704,15 @@ interface GroupCriterion extends GroupLevelWindow {
 type WbsDepth = number | null;
 /** The depth that leaves no WBS row on screen. */
 declare const FLAT_WBS_DEPTH = 0;
-/** Runtime grouping configuration active on a schedule. */
+/**
+ * Runtime grouping configuration active on a schedule. The interface itself is
+ * the primary criterion; `nested` holds the criteria chained below it, in order,
+ * so a schedule can band by several attributes at once.
+ */
 interface GroupState extends GroupCriterion {
     readonly includeWbs: boolean;
     readonly collapsedIds: ReadonlySet<string>;
-    readonly secondary: GroupCriterion | null;
+    readonly nested: ReadonlyArray<GroupCriterion>;
 }
 /**
  * JSON-friendly criterion. `startLevel` is optional so views persisted before
@@ -721,11 +725,17 @@ interface GroupCriterionInput {
     readonly depth: number;
     readonly direction: OrderDirection;
 }
-/** JSON-friendly grouping command accepted by `group-set`. */
+/**
+ * JSON-friendly grouping command accepted by `group-set`. `nested` carries the
+ * levels chained below the primary, in order; `secondary` is the legacy
+ * single-nested-level field kept so views persisted before chaining still
+ * deserialize, and it is read only when `nested` is absent.
+ */
 interface GroupStateInput extends GroupCriterionInput {
     readonly includeWbs: boolean;
     readonly collapsedIds: ReadonlyArray<string>;
     readonly secondary?: GroupCriterionInput | null;
+    readonly nested?: ReadonlyArray<GroupCriterionInput>;
 }
 /** A single display row: either a synthetic group band or a real activity. */
 type VisualRow = {
@@ -743,7 +753,7 @@ type VisualRow = {
 declare function buildGroupRowId(attributeKey: string, valueId: string): string;
 /**
  * Extends a band id with a nested level. The parent path has to stay in the id
- * because the same secondary value shows up under several primary bands, and
+ * because the same nested value shows up under several parent bands, and
  * consumers key rows (and persisted collapse state) by this id.
  */
 declare function appendGroupRowId(parentRowId: string, attributeKey: string, valueId: string): string;

package/dist/index.d.ts

@@ -685,9 +685,9 @@ interface GroupLevelWindow {
     readonly depth: number;
 }
 /**
- * One grouping level below the primary one. Nesting more than a second level is
- * expressed through the level window on a hierarchical attribute, not by chaining
- * these.
+ * One grouping level: the attribute to band by, the window of its outline levels
+ * that becomes bands, and the band order. The primary level lives on `GroupState`
+ * itself; every further level is chained through `GroupState.nested`.
  */
 interface GroupCriterion extends GroupLevelWindow {
     readonly attributeKey: string;
@@ -704,11 +704,15 @@ interface GroupCriterion extends GroupLevelWindow {
 type WbsDepth = number | null;
 /** The depth that leaves no WBS row on screen. */
 declare const FLAT_WBS_DEPTH = 0;
-/** Runtime grouping configuration active on a schedule. */
+/**
+ * Runtime grouping configuration active on a schedule. The interface itself is
+ * the primary criterion; `nested` holds the criteria chained below it, in order,
+ * so a schedule can band by several attributes at once.
+ */
 interface GroupState extends GroupCriterion {
     readonly includeWbs: boolean;
     readonly collapsedIds: ReadonlySet<string>;
-    readonly secondary: GroupCriterion | null;
+    readonly nested: ReadonlyArray<GroupCriterion>;
 }
 /**
  * JSON-friendly criterion. `startLevel` is optional so views persisted before
@@ -721,11 +725,17 @@ interface GroupCriterionInput {
     readonly depth: number;
     readonly direction: OrderDirection;
 }
-/** JSON-friendly grouping command accepted by `group-set`. */
+/**
+ * JSON-friendly grouping command accepted by `group-set`. `nested` carries the
+ * levels chained below the primary, in order; `secondary` is the legacy
+ * single-nested-level field kept so views persisted before chaining still
+ * deserialize, and it is read only when `nested` is absent.
+ */
 interface GroupStateInput extends GroupCriterionInput {
     readonly includeWbs: boolean;
     readonly collapsedIds: ReadonlyArray<string>;
     readonly secondary?: GroupCriterionInput | null;
+    readonly nested?: ReadonlyArray<GroupCriterionInput>;
 }
 /** A single display row: either a synthetic group band or a real activity. */
 type VisualRow = {
@@ -743,7 +753,7 @@ type VisualRow = {
 declare function buildGroupRowId(attributeKey: string, valueId: string): string;
 /**
  * Extends a band id with a nested level. The parent path has to stay in the id
- * because the same secondary value shows up under several primary bands, and
+ * because the same nested value shows up under several parent bands, and
  * consumers key rows (and persisted collapse state) by this id.
  */
 declare function appendGroupRowId(parentRowId: string, attributeKey: string, valueId: string): string;

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) {
@@ -25886,7 +25899,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 +25911,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 +25971,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 +26381,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 +26396,7 @@ var ScheduleState = class _ScheduleState {
       hasChildren: (activityId) => this.hasChildren(activityId),
       group,
       catalog,
-      secondaryCatalog,
+      nestedCatalogs,
       comparator: this.getOrderComparator(),
       orderMode: this.getOrderMode(),
       wbsDepth: this._viewAttributes.getWbsDepth()