@workingdevshero/olympia-ait-adapter 0.1.5 → 1.1.0

package/dist/tools/program-xlsx-to-json.js

@@ -0,0 +1,5 @@
+import { parseProgramWorkbook } from "../reader/parse-workbook.js";
+export async function programXlsxToJson(input) {
+    return parseProgramWorkbook(input.xlsxPath);
+}
+//# sourceMappingURL=program-xlsx-to-json.js.map

package/dist/tools/program-xlsx-to-json.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"program-xlsx-to-json.js","sourceRoot":"","sources":["../../src/tools/program-xlsx-to-json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAMnE,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,KAA6B;IAE7B,OAAO,oBAAoB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AAC9C,CAAC"}

package/dist/tools/warmup-json-to-xlsx.d.ts

@@ -0,0 +1,3 @@
+import type { WarmUpJsonToXlsxInput, WarmUpJsonToXlsxOutput } from "../schema/warmup.js";
+export declare function warmUpJsonToXlsx(input: WarmUpJsonToXlsxInput): Promise<WarmUpJsonToXlsxOutput>;
+//# sourceMappingURL=warmup-json-to-xlsx.d.ts.map

package/dist/tools/warmup-json-to-xlsx.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"warmup-json-to-xlsx.d.ts","sourceRoot":"","sources":["../../src/tools/warmup-json-to-xlsx.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,qBAAqB,CAAC;AAE7B,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,sBAAsB,CAAC,CAEjC"}

package/dist/tools/warmup-json-to-xlsx.js

@@ -0,0 +1,5 @@
+import { buildWarmUpWorkbook } from "../writer/build-warmup-workbook.js";
+export async function warmUpJsonToXlsx(input) {
+    return buildWarmUpWorkbook(input.warmUp, input.outputPath);
+}
+//# sourceMappingURL=warmup-json-to-xlsx.js.map

package/dist/tools/warmup-json-to-xlsx.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"warmup-json-to-xlsx.js","sourceRoot":"","sources":["../../src/tools/warmup-json-to-xlsx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAMzE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,KAA4B;IAE5B,OAAO,mBAAmB,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;AAC7D,CAAC"}

package/dist/tools/warmup-xlsx-to-json.d.ts

@@ -0,0 +1,3 @@
+import type { WarmUpXlsxToJsonInput, WarmUpXlsxToJsonOutput } from "../schema/warmup.js";
+export declare function warmUpXlsxToJson(input: WarmUpXlsxToJsonInput): Promise<WarmUpXlsxToJsonOutput>;
+//# sourceMappingURL=warmup-xlsx-to-json.d.ts.map

package/dist/tools/warmup-xlsx-to-json.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"warmup-xlsx-to-json.d.ts","sourceRoot":"","sources":["../../src/tools/warmup-xlsx-to-json.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,qBAAqB,CAAC;AAE7B,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,sBAAsB,CAAC,CAEjC"}

package/dist/tools/warmup-xlsx-to-json.js

@@ -0,0 +1,5 @@
+import { parseWarmUpWorkbook } from "../reader/parse-warmup-workbook.js";
+export async function warmUpXlsxToJson(input) {
+    return parseWarmUpWorkbook(input.xlsxPath);
+}
+//# sourceMappingURL=warmup-xlsx-to-json.js.map

package/dist/tools/warmup-xlsx-to-json.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"warmup-xlsx-to-json.js","sourceRoot":"","sources":["../../src/tools/warmup-xlsx-to-json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAMzE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,KAA4B;IAE5B,OAAO,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AAC7C,CAAC"}

package/dist/writer/build-warmup-workbook.d.ts

@@ -0,0 +1,3 @@
+import type { WarmUpDocument, WarmUpJsonToXlsxOutput } from "../schema/warmup.js";
+export declare function buildWarmUpWorkbook(doc: WarmUpDocument, outputPath: string): Promise<WarmUpJsonToXlsxOutput>;
+//# sourceMappingURL=build-warmup-workbook.d.ts.map

package/dist/writer/build-warmup-workbook.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-warmup-workbook.d.ts","sourceRoot":"","sources":["../../src/writer/build-warmup-workbook.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACvB,MAAM,qBAAqB,CAAC;AAyC7B,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,cAAc,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,sBAAsB,CAAC,CAwEjC"}

package/dist/writer/build-warmup-workbook.js

@@ -0,0 +1,101 @@
+import { promises as fs } from "node:fs";
+import ExcelJS from "exceljs";
+// The warm-up format shares nothing with the program format (no borders,
+// no fills, no logo, Calibri instead of Arial), so its four styles live
+// here instead of in styles.ts.
+const FONT_BASE = {
+    name: "Calibri",
+    family: 2,
+    size: 14,
+};
+const CENTER = { horizontal: "center" };
+const WU_DAY_HEADER = {
+    font: { ...FONT_BASE, bold: true, underline: true },
+    alignment: CENTER,
+};
+const WU_SECTION_HEADER = {
+    font: { ...FONT_BASE, bold: true },
+    alignment: CENTER,
+};
+const WU_ITEM = {
+    font: { ...FONT_BASE },
+    alignment: { ...CENTER, wrapText: true },
+};
+// Italic — not the source files' plain-12pt convention — so that notes
+// without surrounding parentheses still decode as notes (the reader treats
+// italic as the primary note marker).
+const WU_NOTE = {
+    font: { ...FONT_BASE, italic: true },
+    alignment: { ...CENTER, wrapText: true },
+};
+const DAY_COLUMN_WIDTH = 35.83203125;
+const DAY_HEADER_ROW = 1;
+const FIRST_SECTION_ROW = 3;
+export async function buildWarmUpWorkbook(doc, outputPath) {
+    const workbook = new ExcelJS.Workbook();
+    workbook.creator = "olympia-ait-adapter";
+    workbook.created = new Date(0);
+    workbook.modified = new Date(0);
+    workbook.title = `${doc.client} Warm Up ${doc.warmUpDate}`;
+    workbook.subject = doc.client;
+    workbook.keywords = doc.warmUpDate;
+    const ws = workbook.addWorksheet("Sheet1");
+    ws.pageSetup.orientation = "landscape";
+    ws.views = [{ style: "pageLayout" }];
+    // Day i lives in column 1 + 2i (A, C, E, …) with empty gutter columns
+    // between; all columns through the last day column get the same width.
+    const colOf = (dayIdx) => 1 + 2 * dayIdx;
+    for (let c = 1; c <= colOf(doc.days.length - 1); c++) {
+        ws.getColumn(c).width = DAY_COLUMN_WIDTH;
+    }
+    for (const [dayIdx, day] of doc.days.entries()) {
+        const cell = ws.getRow(DAY_HEADER_ROW).getCell(colOf(dayIdx));
+        cell.value = day.name;
+        Object.assign(cell, WU_DAY_HEADER);
+    }
+    // Sections are row-aligned across days: section s starts on the same row
+    // in every day column, and the next section starts after the tallest
+    // day's block (items + notes) plus one blank spacer row.
+    const sectionCount = Math.max(...doc.days.map((d) => d.sections.length));
+    let row = FIRST_SECTION_ROW;
+    for (let s = 0; s < sectionCount; s++) {
+        let blockHeight = 0;
+        for (const [dayIdx, day] of doc.days.entries()) {
+            const section = day.sections[s];
+            if (!section)
+                continue;
+            if (section.title !== "") {
+                const cell = ws.getRow(row).getCell(colOf(dayIdx));
+                cell.value = section.title;
+                Object.assign(cell, WU_SECTION_HEADER);
+            }
+            let r = row + 1;
+            for (const item of section.items) {
+                const itemCell = ws.getRow(r).getCell(colOf(dayIdx));
+                itemCell.value = item.text;
+                Object.assign(itemCell, WU_ITEM);
+                r++;
+                if (item.note !== undefined) {
+                    // The schema rejects blank note lines, but direct library callers
+                    // bypass it — skip them so layout height matches what the reader
+                    // can observe (blank cells are structural no-ops on decode).
+                    const lines = item.note
+                        .split("\n")
+                        .filter((line) => line.trim() !== "");
+                    for (const line of lines) {
+                        const noteCell = ws.getRow(r).getCell(colOf(dayIdx));
+                        noteCell.value = line;
+                        Object.assign(noteCell, WU_NOTE);
+                        r++;
+                    }
+                }
+            }
+            blockHeight = Math.max(blockHeight, r - (row + 1));
+        }
+        row += 1 + blockHeight + 1; // header + tallest block + blank spacer
+    }
+    await workbook.xlsx.writeFile(outputPath);
+    const stat = await fs.stat(outputPath);
+    return { outputPath, bytesWritten: stat.size };
+}
+//# sourceMappingURL=build-warmup-workbook.js.map

package/dist/writer/build-warmup-workbook.js.map

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

package/dist/writer/build-workbook.d.ts

@@ -1,3 +1,3 @@
-import type { JsonToXlsxOutput, Program } from "../schema/program.js";
-export declare function buildWorkbook(program: Program, outputPath: string): Promise<JsonToXlsxOutput>;
+import { type ProgramJsonToXlsxOutput, type Program } from "../schema/program.js";
+export declare function buildProgramWorkbook(program: Program, outputPath: string): Promise<ProgramJsonToXlsxOutput>;
 //# sourceMappingURL=build-workbook.d.ts.map

package/dist/writer/build-workbook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-workbook.d.ts","sourceRoot":"","sources":["../../src/writer/build-workbook.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,gBAAgB,EAChB,OAAO,EAER,MAAM,sBAAsB,CAAC;AAgC9B,wBAAsB,aAAa,CACjC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,gBAAgB,CAAC,CAoK3B"}
+{"version":3,"file":"build-workbook.d.ts","sourceRoot":"","sources":["../../src/writer/build-workbook.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,OAAO,EAEb,MAAM,sBAAsB,CAAC;AA8B9B,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,uBAAuB,CAAC,CA4JlC"}

package/dist/writer/build-workbook.js

@@ -2,13 +2,14 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { promises as fs } from "node:fs";
 import ExcelJS from "exceljs";
-import { COLUMN_WIDTHS, DATE_ROW, FIRST_EXERCISE_ROW, HEADER_ROW, LOGO_ANCHOR_TL, LOGO_PIXEL_SIZE, NOTES_COL, WARMUP_ROW, WEEK_REPS_COLS, WEEK_WEIGHT_COLS, } from "./layout.js";
+import { programWeekCount, } from "../schema/program.js";
+import { DATE_ROW, FIRST_EXERCISE_ROW, HEADER_ROW, LOGO_ANCHOR_TL, LOGO_PIXEL_SIZE, WARMUP_ROW, weekLayout, } from "./layout.js";
 import { DATE_LABEL, EXERCISE_HEADER, headerPadAboveStyle, headerPadBelowStyle, NOTES_HEADER_CELL, NOTES_SPACER, REPS_HEADER, SECTION_LABEL, WARMUP_DAY, WARMUP_DAY_LAST, WEIGHT_HEADER, } from "./styles.js";
 import { groupNumberOf, stampExercise } from "./stamp-exercise.js";
 import { stampSupplementalTemplate } from "./supplemental-template.js";
 const here = path.dirname(fileURLToPath(import.meta.url));
 const LOGO_PATH = path.resolve(here, "../../src/assets/olympia-logo.png");
-export async function buildWorkbook(program, outputPath) {
+export async function buildProgramWorkbook(program, outputPath) {
     const workbook = new ExcelJS.Workbook();
     workbook.creator = "olympia-ait-adapter";
     workbook.created = new Date(0);
@@ -30,10 +31,12 @@ export async function buildWorkbook(program, outputPath) {
             extension: "png",
         })
         : undefined;
+    const layout = weekLayout(programWeekCount(program));
+    const { weekCount, repsCols: WEEK_REPS_COLS, weightCols: WEEK_WEIGHT_COLS, notesCol: NOTES_COL } = layout;
     for (const [dayIdx, day] of program.days.entries()) {
         const ws = workbook.addWorksheet(day.name);
         // Column widths
-        for (const { col, width } of COLUMN_WIDTHS) {
+        for (const { col, width } of layout.columnWidths) {
             ws.getColumn(col).width = width;
         }
         // --- Row 2: "Date:" cells + "Notes" header ---
@@ -58,7 +61,7 @@ export async function buildWorkbook(program, outputPath) {
         for (let r = WARMUP_ROW; r < FIRST_EXERCISE_ROW; r++) {
             Object.assign(ws.getCell(`${NOTES_COL}${r}`), NOTES_SPACER);
         }
-        for (let i = 0; i < 6; i++) {
+        for (let i = 0; i < weekCount; i++) {
             ws.mergeCells(`${WEEK_REPS_COLS[i]}${DATE_ROW}:${WEEK_WEIGHT_COLS[i]}${DATE_ROW}`);
         }
         // --- Row 3: "Warmup" + "Warm Up #N" labels (N = day index, so
@@ -69,18 +72,18 @@ export async function buildWorkbook(program, outputPath) {
             Object.assign(c, SECTION_LABEL);
         }
         const warmupLabel = `Warm Up #${dayIdx + 1}`;
-        for (let i = 0; i < 6; i++) {
+        for (let i = 0; i < weekCount; i++) {
             const a = WEEK_REPS_COLS[i];
             const b = WEEK_WEIGHT_COLS[i];
             ws.mergeCells(`${a}${WARMUP_ROW}:${b}${WARMUP_ROW}`);
             const c = ws.getCell(`${a}${WARMUP_ROW}`);
             c.value = warmupLabel;
-            Object.assign(c, i === 5 ? WARMUP_DAY_LAST : WARMUP_DAY);
+            Object.assign(c, i === weekCount - 1 ? WARMUP_DAY_LAST : WARMUP_DAY);
         }
         // --- Row 4: gray padding above the "Exercise" header ---
         {
             Object.assign(ws.getCell(`C4`), headerPadAboveStyle("C"));
-            for (let i = 0; i < 6; i++) {
+            for (let i = 0; i < weekCount; i++) {
                 Object.assign(ws.getCell(`${WEEK_REPS_COLS[i]}4`), headerPadAboveStyle("reps"));
                 Object.assign(ws.getCell(`${WEEK_WEIGHT_COLS[i]}4`), headerPadAboveStyle("weight"));
             }
@@ -91,7 +94,7 @@ export async function buildWorkbook(program, outputPath) {
             c.value = "Exercise";
             Object.assign(c, EXERCISE_HEADER);
         }
-        for (let i = 0; i < 6; i++) {
+        for (let i = 0; i < weekCount; i++) {
             const reps = ws.getCell(`${WEEK_REPS_COLS[i]}${HEADER_ROW}`);
             reps.value = "Reps";
             Object.assign(reps, REPS_HEADER);
@@ -102,21 +105,11 @@ export async function buildWorkbook(program, outputPath) {
         // --- Row 6: gray padding below the "Exercise" header ---
         {
             Object.assign(ws.getCell(`C6`), headerPadBelowStyle("C"));
-            for (let i = 0; i < 6; i++) {
+            for (let i = 0; i < weekCount; i++) {
                 Object.assign(ws.getCell(`${WEEK_REPS_COLS[i]}6`), headerPadBelowStyle("reps"));
                 Object.assign(ws.getCell(`${WEEK_WEIGHT_COLS[i]}6`), headerPadBelowStyle("weight"));
             }
         }
-        // Week dates (row 2) — override "Date:" labels if program has them.
-        if (program.weekDates) {
-            for (let i = 0; i < 6; i++) {
-                const v = program.weekDates[i];
-                if (v) {
-                    const c = ws.getCell(`${WEEK_REPS_COLS[i]}${DATE_ROW}`);
-                    c.value = v;
-                }
-            }
-        }
         // --- Body: walk sections, stamp exercises with neighbor-aware borders. ---
         let row = FIRST_EXERCISE_ROW;
         for (const section of day.sections) {
@@ -126,11 +119,11 @@ export async function buildWorkbook(program, outputPath) {
                 // not be filling these in for now).
                 continue;
             }
-            row = stampSection(ws, row, section);
+            row = stampSection(ws, row, section, layout);
         }
         // --- Fixed Sport Specific / Supplemental template at the bottom of
         //     the sheet, with any freeform notes the trainer/agent supplied. ---
-        row = stampSupplementalTemplate(ws, row, day.supplementalNotes);
+        row = stampSupplementalTemplate(ws, row, layout, day.supplementalNotes);
         // Olympia logo: one-cell anchor with explicit pixel dimensions so the
         // image keeps its native aspect ratio (a two-cell anchor stretches the
         // image to fit the cell range, which distorts the logo vertically).
@@ -156,7 +149,7 @@ export async function buildWorkbook(program, outputPath) {
  *   - non-last block: group-label bottom NONE (the next block's top provides
  *     the visual separator)
  */
-function stampSection(ws, startRow, section) {
+function stampSection(ws, startRow, section, layout) {
     let row = startRow;
     for (let i = 0; i < section.exercises.length; i++) {
         const ex = section.exercises[i];
@@ -167,7 +160,10 @@ function stampSection(ws, startRow, section) {
             ? "hair"
             : "medium";
         const bottomBorder = i === section.exercises.length - 1 ? "medium" : "none";
-        row = stampExercise(ws, row, ex, { topBorder, bottomBorder });
+        // In-sheet warm-up exercises carry a "Warmup N" label where a main
+        // exercise carries its group label.
+        const label = section.kind === "warmup" ? `Warmup ${i + 1}` : ex.groupLabel;
+        row = stampExercise(ws, row, ex, layout, { topBorder, bottomBorder, label });
     }
     return row;
 }

package/dist/writer/build-workbook.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-workbook.js","sourceRoot":"","sources":["../../src/writer/build-workbook.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,OAAO,MAAM,SAAS,CAAC;AAM9B,OAAO,EACL,aAAa,EACb,QAAQ,EACR,kBAAkB,EAClB,UAAU,EACV,cAAc,EACd,eAAe,EACf,SAAS,EACT,UAAU,EACV,cAAc,EACd,gBAAgB,GACjB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,EACZ,WAAW,EACX,aAAa,EACb,UAAU,EACV,eAAe,EACf,aAAa,GACd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAEvE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC1D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,mCAAmC,CAAC,CAAC;AAE1E,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAgB,EAChB,UAAkB;IAElB,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IACxC,QAAQ,CAAC,OAAO,GAAG,qBAAqB,CAAC;IACzC,QAAQ,CAAC,OAAO,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/B,QAAQ,CAAC,QAAQ,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IAChC,QAAQ,CAAC,KAAK,GAAG,GAAG,OAAO,CAAC,MAAM,aAAa,OAAO,CAAC,WAAW,EAAE,CAAC;IACrE,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAClC,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC;IAExC,IAAI,SAAiC,CAAC;IACtC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzC,SAAS,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,0BAA0B;IAC5B,CAAC;IACD,MAAM,OAAO,GACX,SAAS,KAAK,SAAS;QACrB,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAChB,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,KAAK;SACyC,CAAC;QAC9D,CAAC,CAAC,SAAS,CAAC;IAEhB,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;QACnD,MAAM,EAAE,GAAG,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE3C,gBAAgB;QAChB,KAAK,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,aAAa,EAAE,CAAC;YAC3C,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC;QAClC,CAAC;QAED,gDAAgD;QAChD,KAAK,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,QAAQ,EAAE,CAAC,CAAC;YAC1C,CAAC,CAAC,KAAK,GAAG,OAAO,CAAC;YAClB,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QAC/B,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;YACnC,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,QAAQ,EAAE,CAAC,CAAC;YAC1C,CAAC,CAAC,KAAK,GAAG,OAAO,CAAC;YAClB,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QAC/B,CAAC;QACD,CAAC;YACC,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,SAAS,GAAG,QAAQ,EAAE,CAAC,CAAC;YACnD,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;YACrB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QACzC,CAAC;QACD,kEAAkE;QAClE,yEAAyE;QACzE,2EAA2E;QAC3E,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,kBAAkB,EAAE,CAAC,EAAE,EAAE,CAAC;YACrD,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,SAAS,GAAG,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;QAC9D,CAAC;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3B,EAAE,CAAC,UAAU,CACX,GAAG,cAAc,CAAC,CAAC,CAAE,GAAG,QAAQ,IAAI,gBAAgB,CAAC,CAAC,CAAE,GAAG,QAAQ,EAAE,CACtE,CAAC;QACJ,CAAC;QAED,+DAA+D;QAC/D,uEAAuE;QACvE,CAAC;YACC,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC;YACvC,CAAC,CAAC,KAAK,GAAG,QAAQ,CAAC;YACnB,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;QAClC,CAAC;QACD,MAAM,WAAW,GAAG,YAAY,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3B,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAE,CAAC;YAC7B,MAAM,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAE,CAAC;YAC/B,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,UAAU,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,CAAC;YACrD,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,UAAU,EAAE,CAAC,CAAC;YAC1C,CAAC,CAAC,KAAK,GAAG,WAAW,CAAC;YACtB,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAC3D,CAAC;QAED,0DAA0D;QAC1D,CAAC;YACC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3B,MAAM,CAAC,MAAM,CACX,EAAE,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,CAAC,CAAE,GAAG,CAAC,EACpC,mBAAmB,CAAC,MAAM,CAAC,CAC5B,CAAC;gBACF,MAAM,CAAC,MAAM,CACX,EAAE,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAE,GAAG,CAAC,EACtC,mBAAmB,CAAC,QAAQ,CAAC,CAC9B,CAAC;YACJ,CAAC;QACH,CAAC;QAED,gCAAgC;QAChC,CAAC;YACC,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC;YACvC,CAAC,CAAC,KAAK,GAAG,UAAU,CAAC;YACrB,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;QACpC,CAAC;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,CAAC,CAAE,GAAG,UAAU,EAAE,CAAC,CAAC;YAC9D,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;YACpB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YACjC,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAE,GAAG,UAAU,EAAE,CAAC,CAAC;YAClE,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC;YACxB,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QACvC,CAAC;QAED,0DAA0D;QAC1D,CAAC;YACC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3B,MAAM,CAAC,MAAM,CACX,EAAE,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,CAAC,CAAE,GAAG,CAAC,EACpC,mBAAmB,CAAC,MAAM,CAAC,CAC5B,CAAC;gBACF,MAAM,CAAC,MAAM,CACX,EAAE,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAE,GAAG,CAAC,EACtC,mBAAmB,CAAC,QAAQ,CAAC,CAC9B,CAAC;YACJ,CAAC;QACH,CAAC;QAED,oEAAoE;QACpE,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3B,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,CAAC,EAAE,CAAC;oBACN,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,CAAC,CAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;oBACzD,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC;QAED,4EAA4E;QAC5E,IAAI,GAAG,GAAG,kBAAkB,CAAC;QAC7B,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;YACnC,IAAI,OAAO,CAAC,IAAI,KAAK,eAAe,IAAI,OAAO,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBACxE,kEAAkE;gBAClE,mEAAmE;gBACnE,oCAAoC;gBACpC,SAAS;YACX,CAAC;YACD,GAAG,GAAG,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC;QAED,oEAAoE;QACpE,yEAAyE;QACzE,GAAG,GAAG,yBAAyB,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAEhE,sEAAsE;QACtE,uEAAuE;QACvE,oEAAoE;QACpE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE;gBACnB,EAAE,EAAE,EAAE,GAAG,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,CAAC,GAAG,EAAE;gBACxD,GAAG,EAAE,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC,MAAM,EAAE;gBACrE,MAAM,EAAE,SAAS;aACyC,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACvC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;AACjD,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,YAAY,CACnB,EAAqB,EACrB,QAAgB,EAChB,OAAgB;IAEhB,IAAI,GAAG,GAAG,QAAQ,CAAC;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClD,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAE,CAAC;QACjC,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1D,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,aAAa,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QAE7C,MAAM,SAAS,GACb,IAAI,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,OAAO;YACpE,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,QAAQ,CAAC;QACf,MAAM,YAAY,GAChB,CAAC,KAAK,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;QAEzD,GAAG,GAAG,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"build-workbook.js","sourceRoot":"","sources":["../../src/writer/build-workbook.ts"],"names":[],"mappings":"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"}

package/dist/writer/layout.d.ts

@@ -1,14 +1,26 @@
-export declare const COLUMN_WIDTHS: {
-    col: string;
-    width: number;
-}[];
+export interface WeekLayout {
+    weekCount: number;
+    /** Reps column per week: D, F, H, … */
+    repsCols: string[];
+    /** Weight column per week: E, G, I, … */
+    weightCols: string[];
+    /** The Notes column sits immediately right of the last week pair. */
+    notesCol: string;
+    columnWidths: {
+        col: string;
+        width: number;
+    }[];
+}
+/**
+ * Column positions for a program of `weekCount` weeks. Week 1 is always
+ * D/E; each further week takes the next column pair, and the Notes column
+ * follows the last pair (L for 4 weeks, P for 6).
+ */
+export declare function weekLayout(weekCount: number): WeekLayout;
 export declare const DATE_ROW = 2;
 export declare const WARMUP_ROW = 3;
 export declare const HEADER_ROW = 5;
 export declare const FIRST_EXERCISE_ROW = 7;
-export declare const WEEK_REPS_COLS: readonly ["D", "F", "H", "J", "L", "N"];
-export declare const WEEK_WEIGHT_COLS: readonly ["E", "G", "I", "K", "M", "O"];
-export declare const NOTES_COL = "P";
 export declare const EXERCISE_NAME_COL = "C";
 export declare const LOGO_ANCHOR_TL: {
     readonly col: 5;

package/dist/writer/layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../src/writer/layout.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,aAAa,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAoBzD,CAAC;AAEF,eAAO,MAAM,QAAQ,IAAI,CAAC;AAC1B,eAAO,MAAM,UAAU,IAAI,CAAC;AAC5B,eAAO,MAAM,UAAU,IAAI,CAAC;AAC5B,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAGpC,eAAO,MAAM,cAAc,yCAA0C,CAAC;AACtE,eAAO,MAAM,gBAAgB,yCAA0C,CAAC;AACxE,eAAO,MAAM,SAAS,MAAM,CAAC;AAC7B,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAOrC,eAAO,MAAM,cAAc;;;CAA+B,CAAC;AAC3D,eAAO,MAAM,eAAe;;;CAAsC,CAAC"}
+{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../src/writer/layout.ts"],"names":[],"mappings":"AA4BA,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,uCAAuC;IACvC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,yCAAyC;IACzC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,qEAAqE;IACrE,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAChD;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAmBxD;AAED,eAAO,MAAM,QAAQ,IAAI,CAAC;AAC1B,eAAO,MAAM,UAAU,IAAI,CAAC;AAC5B,eAAO,MAAM,UAAU,IAAI,CAAC;AAC5B,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAOrC,eAAO,MAAM,cAAc;;;CAA+B,CAAC;AAC3D,eAAO,MAAM,eAAe;;;CAAsC,CAAC"}

package/dist/writer/layout.js

@@ -1,34 +1,53 @@
 // Column widths and row positions extracted from the sample Olympia workbooks.
 // These are constants so output is byte-stable.
-export const COLUMN_WIDTHS = [
+const MARGIN_WIDTHS = [
     { col: "A", width: 0.66 },
     { col: "B", width: 0.66 },
     { col: "C", width: 25.83 },
-    { col: "D", width: 7.66 },
-    { col: "E", width: 8.83 },
-    { col: "F", width: 7.66 },
-    { col: "G", width: 7.83 },
-    { col: "H", width: 7.66 },
-    { col: "I", width: 8.0 },
-    { col: "J", width: 7.66 },
-    { col: "K", width: 8.66 },
-    { col: "L", width: 7.66 },
-    { col: "M", width: 9.33 },
-    { col: "N", width: 7.66 },
-    { col: "O", width: 8.33 },
-    // Notes column — widened from the source's 10.83 so coaching cues fit
-    // without wrapping aggressively.
-    { col: "P", width: 18 },
-    { col: "Q", width: 10.5 },
 ];
+// Reps/weight widths for weeks 1-6, in week order.
+const WEEK_PAIR_WIDTHS = [
+    [7.66, 8.83],
+    [7.66, 7.83],
+    [7.66, 8.0],
+    [7.66, 8.66],
+    [7.66, 9.33],
+    [7.66, 8.33],
+];
+// Notes column — widened from the source's 10.83 so coaching cues fit
+// without wrapping aggressively.
+const NOTES_WIDTH = 18;
+const TRAILING_WIDTH = 10.5;
+const FIRST_WEEK_COL_INDEX = 4; // column D
+function colLetter(index) {
+    return String.fromCharCode(64 + index);
+}
+/**
+ * Column positions for a program of `weekCount` weeks. Week 1 is always
+ * D/E; each further week takes the next column pair, and the Notes column
+ * follows the last pair (L for 4 weeks, P for 6).
+ */
+export function weekLayout(weekCount) {
+    const repsCols = [];
+    const weightCols = [];
+    const columnWidths = [...MARGIN_WIDTHS];
+    for (let i = 0; i < weekCount; i++) {
+        const reps = colLetter(FIRST_WEEK_COL_INDEX + 2 * i);
+        const weight = colLetter(FIRST_WEEK_COL_INDEX + 2 * i + 1);
+        repsCols.push(reps);
+        weightCols.push(weight);
+        const [repsWidth, weightWidth] = WEEK_PAIR_WIDTHS[i];
+        columnWidths.push({ col: reps, width: repsWidth }, { col: weight, width: weightWidth });
+    }
+    const notesIndex = FIRST_WEEK_COL_INDEX + 2 * weekCount;
+    const notesCol = colLetter(notesIndex);
+    columnWidths.push({ col: notesCol, width: NOTES_WIDTH }, { col: colLetter(notesIndex + 1), width: TRAILING_WIDTH });
+    return { weekCount, repsCols, weightCols, notesCol, columnWidths };
+}
 export const DATE_ROW = 2;
 export const WARMUP_ROW = 3;
 export const HEADER_ROW = 5;
 export const FIRST_EXERCISE_ROW = 7;
-// Per-week column pairs: D/E = week 1 reps/weight, F/G = week 2, etc.
-export const WEEK_REPS_COLS = ["D", "F", "H", "J", "L", "N"];
-export const WEEK_WEIGHT_COLS = ["E", "G", "I", "K", "M", "O"];
-export const NOTES_COL = "P";
 export const EXERCISE_NAME_COL = "C";
 // Olympia logo anchor. We use a one-cell anchor with explicit pixel
 // dimensions (rather than a two-cell anchor) so the image keeps its native

package/dist/writer/layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/writer/layout.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,gDAAgD;AAEhD,MAAM,CAAC,MAAM,aAAa,GAAqC;IAC7D,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;IACzB,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;IACzB,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE;IAC1B,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;IACzB,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;IACzB,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;IACzB,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;IACzB,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;IACzB,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;IACxB,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;IACzB,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;IACzB,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;IACzB,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;IACzB,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;IACzB,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;IACzB,sEAAsE;IACtE,iCAAiC;IACjC,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE;IACvB,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;CAC1B,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAC;AAC1B,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC;AAC5B,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC;AAC5B,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAEpC,sEAAsE;AACtE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAU,CAAC;AACtE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAU,CAAC;AACxE,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAAC;AAC7B,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAErC,oEAAoE;AACpE,2EAA2E;AAC3E,yEAAyE;AACzE,yEAAyE;AACzE,0DAA0D;AAC1D,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAW,CAAC;AAC3D,MAAM,CAAC,MAAM,eAAe,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAW,CAAC"}
+{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/writer/layout.ts"],"names":[],"mappings":"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"}

package/dist/writer/stamp-exercise.d.ts

@@ -1,5 +1,6 @@
 import type ExcelJS from "exceljs";
 import type { Exercise } from "../schema/program.js";
+import { type WeekLayout } from "./layout.js";
 import { type CTopBorder, type CBottomBorder } from "./styles.js";
 export interface StampOptions {
     /** Border style for the top of the exercise-name (column C) cell. */
@@ -9,15 +10,22 @@ export interface StampOptions {
      * "medium" only on the last exercise of a section; otherwise "none".
      */
     bottomBorder: CBottomBorder;
+    /**
+     * Text for the label row under the exercise name: the group label ("1A")
+     * for a main exercise, "Warmup N" for an in-sheet warm-up exercise.
+     */
+    label: string | undefined;
 }
 /**
  * Stamps one exercise block onto the worksheet starting at `startRow`.
  *
  * Layout rules (N = exercise.sets.length):
- *   - With groupLabel: name occupies the first N−1 rows of col C (merged
- *     when N > 2); group label sits in col C of the last row.
- *   - Without groupLabel: name occupies all N rows of col C (merged when
- *     N > 1); no group-label row.
+ *   - With a label: name occupies the first N−1 rows of col C (merged
+ *     when N > 2); the label sits in col C of the last row.
+ *   - With a label and a single set: the set sits on the name row and the
+ *     label gets a row of its own below it, with empty prescription cells.
+ *   - Without a label: name occupies all N rows of col C (merged when
+ *     N > 1); no label row.
  *
  * Borders on column C (the gray bar) are driven by `topBorder` and
  * `bottomBorder` so the caller can express "this block is the first/last
@@ -25,7 +33,7 @@ export interface StampOptions {
  *
  * @returns the next free row after the block.
  */
-export declare function stampExercise(ws: ExcelJS.Worksheet, startRow: number, exercise: Exercise, opts: StampOptions): number;
+export declare function stampExercise(ws: ExcelJS.Worksheet, startRow: number, exercise: Exercise, layout: WeekLayout, opts: StampOptions): number;
 /** Extracts the leading numeric portion of a group label ("1A" → "1"). */
 export declare function groupNumberOf(label: string | undefined): string | undefined;
 //# sourceMappingURL=stamp-exercise.d.ts.map

package/dist/writer/stamp-exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stamp-exercise.d.ts","sourceRoot":"","sources":["../../src/writer/stamp-exercise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAOrD,OAAO,EAML,KAAK,UAAU,EACf,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,YAAY;IAC3B,qEAAqE;IACrE,SAAS,EAAE,UAAU,CAAC;IACtB;;;OAGG;IACH,YAAY,EAAE,aAAa,CAAC;CAC7B;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAC3B,EAAE,EAAE,OAAO,CAAC,SAAS,EACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,YAAY,GACjB,MAAM,CAiER;AAED,0EAA0E;AAC1E,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAI3E"}
+{"version":3,"file":"stamp-exercise.d.ts","sourceRoot":"","sources":["../../src/writer/stamp-exercise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAqB,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAML,KAAK,UAAU,EACf,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,YAAY;IAC3B,qEAAqE;IACrE,SAAS,EAAE,UAAU,CAAC;IACtB;;;OAGG;IACH,YAAY,EAAE,aAAa,CAAC;IAC5B;;;OAGG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,aAAa,CAC3B,EAAE,EAAE,OAAO,CAAC,SAAS,EACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,YAAY,GACjB,MAAM,CAqER;AAED,0EAA0E;AAC1E,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAI3E"}

package/dist/writer/stamp-exercise.js

@@ -1,13 +1,15 @@
-import { EXERCISE_NAME_COL, NOTES_COL, WEEK_REPS_COLS, WEEK_WEIGHT_COLS, } from "./layout.js";
+import { EXERCISE_NAME_COL } from "./layout.js";
 import { exerciseNameStyle, groupLabelStyle, NOTES_CELL, weekRepsCellStyle, weekWeightCellStyle, } from "./styles.js";
 /**
  * Stamps one exercise block onto the worksheet starting at `startRow`.
  *
  * Layout rules (N = exercise.sets.length):
- *   - With groupLabel: name occupies the first N−1 rows of col C (merged
- *     when N > 2); group label sits in col C of the last row.
- *   - Without groupLabel: name occupies all N rows of col C (merged when
- *     N > 1); no group-label row.
+ *   - With a label: name occupies the first N−1 rows of col C (merged
+ *     when N > 2); the label sits in col C of the last row.
+ *   - With a label and a single set: the set sits on the name row and the
+ *     label gets a row of its own below it, with empty prescription cells.
+ *   - Without a label: name occupies all N rows of col C (merged when
+ *     N > 1); no label row.
  *
  * Borders on column C (the gray bar) are driven by `topBorder` and
  * `bottomBorder` so the caller can express "this block is the first/last
@@ -15,21 +17,25 @@ import { exerciseNameStyle, groupLabelStyle, NOTES_CELL, weekRepsCellStyle, week
  *
  * @returns the next free row after the block.
  */
-export function stampExercise(ws, startRow, exercise, opts) {
+export function stampExercise(ws, startRow, exercise, layout, opts) {
+    const { repsCols: WEEK_REPS_COLS, weightCols: WEEK_WEIGHT_COLS, notesCol: NOTES_COL } = layout;
     const setCount = exercise.sets.length;
-    const hasGroupLabel = exercise.groupLabel !== undefined;
-    const lastBlockRow = startRow + setCount - 1;
+    const hasGroupLabel = opts.label !== undefined;
+    // The label shares the last set's row; a one-set block gets an extra row
+    // for it, left empty of prescriptions.
+    const rowCount = hasGroupLabel && setCount === 1 ? 2 : setCount;
+    const lastBlockRow = startRow + rowCount - 1;
     // Where the exercise-name region ends.
-    const nameLastRow = hasGroupLabel && setCount > 1 ? lastBlockRow - 1 : lastBlockRow;
+    const nameLastRow = hasGroupLabel ? lastBlockRow - 1 : lastBlockRow;
     if (nameLastRow > startRow) {
         ws.mergeCells(`${EXERCISE_NAME_COL}${startRow}:${EXERCISE_NAME_COL}${nameLastRow}`);
     }
     const nameCell = ws.getCell(`${EXERCISE_NAME_COL}${startRow}`);
     nameCell.value = exercise.name;
     Object.assign(nameCell, exerciseNameStyle(opts.topBorder));
-    if (hasGroupLabel && setCount > 1) {
+    if (hasGroupLabel) {
         const groupCell = ws.getCell(`${EXERCISE_NAME_COL}${lastBlockRow}`);
-        groupCell.value = exercise.groupLabel;
+        groupCell.value = opts.label;
         Object.assign(groupCell, groupLabelStyle(opts.bottomBorder));
     }
     else if (!hasGroupLabel && opts.bottomBorder === "medium") {
@@ -44,27 +50,28 @@ export function stampExercise(ws, startRow, exercise, opts) {
         };
         Object.assign(nameCell, composed);
     }
-    // Notes column P: merge across the whole block when there's more than one row.
-    if (setCount > 1) {
+    // Notes column: merge across the whole block when there's more than one row.
+    if (rowCount > 1) {
         ws.mergeCells(`${NOTES_COL}${startRow}:${NOTES_COL}${lastBlockRow}`);
     }
     const noteCell = ws.getCell(`${NOTES_COL}${startRow}`);
     noteCell.value = exercise.notes ?? "";
     Object.assign(noteCell, NOTES_CELL);
     // Per-set per-week cells
-    for (let setIdx = 0; setIdx < setCount; setIdx++) {
+    for (let setIdx = 0; setIdx < rowCount; setIdx++) {
         const r = startRow + setIdx;
         const isTop = setIdx === 0;
-        const isBottom = setIdx === setCount - 1;
-        const setRow = exercise.sets[setIdx];
-        for (let weekIdx = 0; weekIdx < 6; weekIdx++) {
+        const isBottom = setIdx === rowCount - 1;
+        const setRow = exercise.sets[setIdx] ?? [];
+        const weightRow = exercise.weights?.[setIdx];
+        for (let weekIdx = 0; weekIdx < layout.weekCount; weekIdx++) {
             const repsCol = WEEK_REPS_COLS[weekIdx];
             const weightCol = WEEK_WEIGHT_COLS[weekIdx];
             const repsCell = ws.getCell(`${repsCol}${r}`);
             repsCell.value = setRow[weekIdx] ?? null;
             Object.assign(repsCell, weekRepsCellStyle({ isTop, isBottom }));
             const weightCell = ws.getCell(`${weightCol}${r}`);
-            weightCell.value = null;
+            weightCell.value = weightRow?.[weekIdx] ?? null;
             Object.assign(weightCell, weekWeightCellStyle({ isTop, isBottom }));
         }
     }