@nowline/layout 0.8.6 → 0.10.0

package/dist/row-packer.js

@@ -1,8 +1,10 @@
-// RowPacker — the topmost-fit row-pack engine shared by `SwimlaneNode`
-// and `GroupNode`. Tracks rows of variable height (each row's height is
-// the max of its placed children's heights, with a per-packer minimum)
-// and bumps a child to a new row when it would collide with a sibling's
-// `rightEdge`, caption `spillX`, or a slack-arrow corridor.
+// RowPacker — the row-pack engine shared by `SwimlaneNode` and
+// `GroupNode`. A child never lands above the one before it
+// (specs/true-width-layout.md §3.2), so it either joins the last row or
+// opens a new one below it: it drops a row when it would collide with the
+// last row's `rightEdge`, caption `spillX`, or a slack-arrow corridor.
+// Each row's height is the max of its placed children's heights, with a
+// per-packer minimum.
 //
 // Two-phase API per child:
 //   1) `placeItem(...)` / `placeBlock(...)` decides which row the child
@@ -12,45 +14,41 @@
 //      back into the packer so the row's `rightEdge` / `spillX` advance
 //      and the row's height grows to accommodate the new child.
 //
-// When a row's height grows after later rows already exist, the packer
-// shifts every subsequent row (and every positioned child placed in it)
-// downward by the delta. Items keep their row-anchored top edge; the
-// row simply gets taller. This keeps the contract "all children in a
-// row share that row's top y" intact while letting individual children
-// grow vertically (e.g. wrapped label-chiclet stacks in m3).
+// A child only ever commits to the last row, so a row that grows has no
+// rows below it to move.
 export class RowPacker {
     rows;
     opts;
+    /** Rightmost `BlockCommitInput.paintedRight` committed so far. */
+    paintedRightX;
     constructor(opts) {
         this.opts = opts;
+        this.paintedRightX = opts.laneLeftX;
         this.rows = [
             {
                 y: opts.originY,
                 height: opts.minRowHeight,
                 rightEdge: opts.laneLeftX,
                 spillX: opts.laneLeftX,
-                placedChildren: [],
+                contentOffsetY: 0,
             },
         ];
     }
     /**
-     * Find the topmost row where the item's natural extent fits without
-     * colliding with sibling content or a slack corridor; appending a
-     * fresh row at the bottom when none of the existing rows fit.
+     * Join the last row (the last committed child's) when the item's natural
+     * extent fits there without colliding with sibling content or a slack
+     * corridor; otherwise append a fresh row below it.
      */
     placeItem(input) {
-        for (let i = 0; i < this.rows.length; i += 1) {
-            const r = this.rows[i];
-            if (input.desiredStart < r.rightEdge)
-                continue;
-            if (input.desiredStart < r.spillX)
-                continue;
-            if (this.rowIntersectsCorridor(r, input))
-                continue;
-            return { rowIndex: i, y: r.y };
-        }
-        const fresh = this.appendRow(Math.max(this.opts.minRowHeight, input.predictedHeight));
-        return { rowIndex: this.rows.length - 1, y: fresh.y };
+        const last = this.rows[this.rows.length - 1];
+        const fits = input.desiredStart >= last.rightEdge &&
+            input.desiredStart >= last.spillX &&
+            !this.rowIntersectsCorridor(last, input) &&
+            !this.rowCrossesOwnCorridor(last, input);
+        const row = fits
+            ? last
+            : this.appendRow(Math.max(this.opts.minRowHeight, input.predictedHeight));
+        return { rowIndex: this.rows.length - 1, y: row.y + row.contentOffsetY };
     }
     /**
      * Blocks (parallel / group) always claim a fresh row at the bottom
@@ -68,16 +66,13 @@ export class RowPacker {
     }
     /**
      * Record a placed item back into its row. Grows the row's height to
-     * fit the item, advances `rightEdge`, sets the caption spill, and
-     * shifts later rows down if this row got taller.
+     * fit the item, advances `rightEdge` and sets the caption spill.
      */
     commitItem(input) {
         const row = this.rows[input.rowIndex];
-        const target = Math.max(input.placed.box.height, input.rowHeight ?? 0);
-        this.growRowHeight(input.rowIndex, target);
+        row.height = Math.max(row.height, row.contentOffsetY + Math.max(input.placed.box.height, input.rowHeight ?? 0));
         row.rightEdge = input.logicalEnd;
         row.spillX = input.spillReservation ?? this.opts.laneLeftX;
-        row.placedChildren.push(input.placed);
     }
     /**
      * Record a placed block. Sets the row's height to the block's full
@@ -85,10 +80,13 @@ export class RowPacker {
      */
     commitBlock(input) {
         const row = this.rows[input.rowIndex];
-        this.growRowHeight(input.rowIndex, input.blockHeight);
+        row.height = Math.max(row.height, input.blockHeight);
+        row.contentOffsetY = input.contentOffsetY ?? 0;
         row.rightEdge = input.blockEnd;
-        row.spillX = this.opts.laneLeftX;
-        row.placedChildren.push(input.placed);
+        row.spillX = input.spillReservation ?? this.opts.laneLeftX;
+        if (input.paintedRight !== undefined && input.paintedRight > this.paintedRightX) {
+            this.paintedRightX = input.paintedRight;
+        }
     }
     /** Total vertical extent reached (last row's bottom - originY). */
     usedHeight() {
@@ -96,10 +94,11 @@ export class RowPacker {
         return last.y + last.height - this.opts.originY;
     }
     /** Rightmost extent reached — bar logical end OR caption spill,
-     *  whichever is wider, across every row. Empty rows contribute
-     *  `laneLeftX`. */
+     *  whichever is wider, across every row, and anything a committed
+     *  block paints past its own box (`BlockCommitInput.paintedRight`).
+     *  Empty rows contribute `laneLeftX`. */
     usedRightX() {
-        let x = this.opts.laneLeftX;
+        let x = this.paintedRightX;
         for (const r of this.rows) {
             if (r.rightEdge > x)
                 x = r.rightEdge;
@@ -113,7 +112,19 @@ export class RowPacker {
             c.y < r.y + r.height &&
             p.desiredStart < c.xEnd &&
             p.desiredEnd > c.xStart &&
-            c.slackPredId !== p.childId);
+            c.slackPredId !== p.childId &&
+            !p.pendingIds?.has(c.slackPredId));
+    }
+    /**
+     * An overrun slack arrow runs left, from its source back to a milestone
+     * dated before the source ends. Rows never move up, so the source cannot
+     * push the work before it out of that path; it drops to a row where the
+     * path is clear instead.
+     */
+    rowCrossesOwnCorridor(r, p) {
+        return this.opts.slackCorridors.some((c) => c.slackPredId === p.childId &&
+            c.xStart < p.desiredStart &&
+            r.rightEdge > Math.max(c.xStart, this.opts.laneLeftX));
     }
     appendRow(height) {
         const last = this.rows[this.rows.length - 1];
@@ -122,48 +133,10 @@ export class RowPacker {
             height,
             rightEdge: this.opts.laneLeftX,
             spillX: this.opts.laneLeftX,
-            placedChildren: [],
+            contentOffsetY: 0,
         };
         this.rows.push(r);
         return r;
     }
-    growRowHeight(rowIndex, newHeight) {
-        const row = this.rows[rowIndex];
-        const delta = newHeight - row.height;
-        if (delta <= 0)
-            return;
-        row.height = newHeight;
-        for (let i = rowIndex + 1; i < this.rows.length; i += 1) {
-            const r = this.rows[i];
-            r.y += delta;
-            for (const child of r.placedChildren) {
-                shiftPositionedY(child, delta);
-            }
-        }
-    }
-}
-/**
- * Walk a positioned subtree and shift every absolute y by `dy`. Used
- * when an earlier row in the packer grows, retroactively pushing every
- * later row (and its placed subtrees) down to keep them clear.
- *
- * Items: shift the bar box plus label chips and any overflow box.
- * Groups / parallels: shift the container box and recurse into
- * children. The caller's `box.y` already moved with the parent.
- */
-function shiftPositionedY(p, dy) {
-    p.box.y += dy;
-    if (p.kind === 'item') {
-        for (const chip of p.labelChips) {
-            chip.box.y += dy;
-        }
-        if (p.overflowBox) {
-            p.overflowBox.y += dy;
-        }
-        return;
-    }
-    for (const child of p.children) {
-        shiftPositionedY(child, dy);
-    }
 }
 //# sourceMappingURL=row-packer.js.map

package/dist/row-packer.js.map

@@ -1 +1 @@
-{"version":3,"file":"row-packer.js","sourceRoot":"","sources":["../src/row-packer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"row-packer.js","sourceRoot":"","sources":["../src/row-packer.ts"],"names":[],"mappings":"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"}

package/dist/schedule.d.ts

@@ -1,8 +1,15 @@
-import type { ItemDeclaration, MilestoneDeclaration, NowlineFile, ResolveResult } from '@nowline/core';
+import type { ItemDeclaration, MilestoneDeclaration, NowlineFile, ResolveResult, WavePlan } from '@nowline/core';
+import { type ResolvedCalendar } from './calendar-resolver.js';
 /** Per-item scheduled interval, keyed by item id (name). */
 export interface ScheduledItem {
     start: Date;
     end: Date;
+    /**
+     * Duration in working days: the `duration:` literal, or the size's effort
+     * divided by `capacity:`, under the file's calendar. 0 when the item has
+     * neither, or names an undeclared size.
+     */
+    days: number;
 }
 /**
  * Result of scheduling a roadmap. All dates are UTC midnight.
@@ -15,6 +22,8 @@ export interface ScheduledItem {
 export interface RoadmapSchedule {
     /** Resolved roadmap start date (UTC midnight). */
     startDate: Date;
+    /** The file's calendar, which every date and `days` here uses. */
+    calendar: ResolvedCalendar;
     /** Named items keyed by their DSL id (`name`). */
     items: Map<string, ScheduledItem>;
     /** Every item keyed by AST node identity (named and anonymous). */
@@ -25,10 +34,58 @@ export interface RoadmapSchedule {
     milestoneByNode: WeakMap<MilestoneDeclaration, Date>;
     /** Named anchors: their declared or computed date. */
     anchors: Map<string, Date>;
+    /**
+     * Waves by id, in declaration order (specs/waves.md §8.5). Present only
+     * when the roadmap declares waves.
+     */
+    waves?: Map<string, ScheduledWave>;
+    /** The wave plan the schedule ran with; undefined without waves. */
+    plan?: WavePlan;
+    /** The `ResolveResult` this schedule was built from. */
+    resolved: ResolveResult;
+    /** What the date window needs (specs/scheduler-unification.md §3.3). */
+    extent: ScheduleExtent;
+}
+/**
+ * True when some wave has a member (specs/waves.md §9.1). With none, the
+ * roadmap draws no waves: no strip, no hatch, no legend. The barrier still
+ * runs, so wave floors and `after:<wave>` keep their dates.
+ */
+export declare function hasVisibleWaves(schedule: Pick<RoadmapSchedule, 'waves'>): boolean;
+/** A wave's solved span (specs/waves.md §5.1). */
+export interface ScheduledWave {
+    /** 1-based declaration order. */
+    index: number;
+    /** `S_k` (UTC midnight). */
+    start: Date;
+    /** `E_k`, exclusive (UTC midnight); equals `start` for an empty wave. */
+    end: Date;
+    /** Members placed in the main lanes and first-level isolated regions. */
+    memberCount: number;
+    /** The member that sets `E_k` (id ?? title); omitted when none ends past `S_k`. */
+    heldBy?: string;
+    /** The wave's `after:` element that set `S_k`, when it beat the previous wave's end. */
+    floorRef?: string;
 }
 export interface ScheduleOptions {
     /** Passed as the reference date when the roadmap omits `start:`. */
     today?: Date;
+    /**
+     * The roadmap's wave plan from `buildWavePlan(resolved)`, when the caller
+     * already built it; `null` means "built, no waves". Omitted: built here.
+     */
+    plan?: WavePlan | null;
+}
+/** What the date window needs from the schedule (specs/scheduler-unification.md §3.2). */
+export interface ScheduleExtent {
+    /**
+     * Latest working-day offset from `startDate` reached by any lane cursor
+     * (item ends and container starts), any dated anchor, any milestone, and,
+     * with waves, every `S_k` and `E_n`. Isolated regions count too: without
+     * waves every region at any depth with its anchors and milestones, with
+     * waves the first-level regions' lanes. `today` is not included.
+     */
+    contentEndDay: number;
 }
 /**
  * Compute the scheduled start/end date for every named entity in the roadmap.

package/dist/schedule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../src/schedule.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAER,eAAe,EACf,oBAAoB,EACpB,WAAW,EAEX,aAAa,EAEhB,MAAM,eAAe,CAAC;AAWvB,4DAA4D;AAC5D,MAAM,WAAW,aAAa;IAC1B,KAAK,EAAE,IAAI,CAAC;IACZ,GAAG,EAAE,IAAI,CAAC;CACb;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC5B,kDAAkD;IAClD,SAAS,EAAE,IAAI,CAAC;IAChB,kDAAkD;IAClD,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAClC,mEAAmE;IACnE,MAAM,EAAE,OAAO,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IAChD,8CAA8C;IAC9C,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9B,wEAAwE;IACxE,eAAe,EAAE,OAAO,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;IACrD,sDAAsD;IACtD,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC5B,oEAAoE;IACpE,KAAK,CAAC,EAAE,IAAI,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC3B,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,aAAa,EACvB,OAAO,GAAE,eAAoB,GAC9B,eAAe,CA4IjB"}
+{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../src/schedule.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAER,eAAe,EACf,oBAAoB,EACpB,WAAW,EAEX,aAAa,EAEb,QAAQ,EACX,MAAM,eAAe,CAAC;AAIvB,OAAO,EAAE,KAAK,gBAAgB,EAA0B,MAAM,wBAAwB,CAAC;AAMvF,4DAA4D;AAC5D,MAAM,WAAW,aAAa;IAC1B,KAAK,EAAE,IAAI,CAAC;IACZ,GAAG,EAAE,IAAI,CAAC;IACV;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC5B,kDAAkD;IAClD,SAAS,EAAE,IAAI,CAAC;IAChB,kEAAkE;IAClE,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,kDAAkD;IAClD,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAClC,mEAAmE;IACnE,MAAM,EAAE,OAAO,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IAChD,8CAA8C;IAC9C,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9B,wEAAwE;IACxE,eAAe,EAAE,OAAO,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;IACrD,sDAAsD;IACtD,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC3B;;;OAGG;IACH,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACnC,oEAAoE;IACpE,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,wDAAwD;IACxD,QAAQ,EAAE,aAAa,CAAC;IACxB,wEAAwE;IACxE,MAAM,EAAE,cAAc,CAAC;CAC1B;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,GAAG,OAAO,CAKjF;AAED,kDAAkD;AAClD,MAAM,WAAW,aAAa;IAC1B,iCAAiC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,4BAA4B;IAC5B,KAAK,EAAE,IAAI,CAAC;IACZ,yEAAyE;IACzE,GAAG,EAAE,IAAI,CAAC;IACV,yEAAyE;IACzE,WAAW,EAAE,MAAM,CAAC;IACpB,mFAAmF;IACnF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wFAAwF;IACxF,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC5B,oEAAoE;IACpE,KAAK,CAAC,EAAE,IAAI,CAAC;IACb;;;OAGG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;CAC1B;AAED,0FAA0F;AAC1F,MAAM,WAAW,cAAc;IAC3B;;;;;;OAMG;IACH,aAAa,EAAE,MAAM,CAAC;CACzB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC3B,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,aAAa,EACvB,OAAO,GAAE,eAAoB,GAC9B,eAAe,CAmTjB"}