@typescript-calendar-lib/cli 0.2.2 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-calendar-lib/cli",
-  "version": "0.2.2",
+  "version": "0.2.5",
   "type": "module",
   "bin": {
     "typescript-calendar-lib": "src/bin.ts"
@@ -16,7 +16,7 @@
     "!src/*.test.ts"
   ],
   "dependencies": {
-    "@typescript-calendar-lib/core": "0.2.2",
+    "@typescript-calendar-lib/core": "0.2.5",
     "cli-table3": "^0.6.5"
   },
   "peerDependencies": {

package/src/ansi.ts

@@ -1,5 +1,7 @@
 // ─── ANSI 色付け ─────────────────────────────────────────
 
+import { displayWidth } from "./align.ts";
+
 const ANSI_PATTERN = new RegExp(`${"\u001b"}\\[[0-9;]*m`, "g");
 
 /** ANSI コードを付与する（code が undefined ならそのまま） */
@@ -12,7 +14,12 @@ export function colorize(
   return `\u001b[${code}m${text}\u001b[0m`;
 }
 
-/** ANSI エスケープシーケンスを除去した表示幅を返す */
+/** ANSI エスケープシーケンスを除去した文字列を返す */
+export function stripAnsi(text: string): string {
+  return text.replace(ANSI_PATTERN, "");
+}
+
+/** ANSI エスケープシーケンスを除去した表示幅を返す（全角文字は2列） */
 export function visibleWidth(text: string): number {
-  return text.replace(ANSI_PATTERN, "").length;
+  return displayWidth(stripAnsi(text));
 }

package/src/bin.ts

@@ -4,21 +4,10 @@ import type {
   Locale,
   WeekStart,
 } from "@typescript-calendar-lib/core";
+import { createDate } from "@typescript-calendar-lib/core";
 import { calendar } from "./calendar.ts";
 import type { ColorSchemeName, ThemeName } from "./theme.ts";
 
-const THEMES: readonly ThemeName[] = ["default", "modern"];
-const COLOR_SCHEMES: readonly ColorSchemeName[] = [
-  "default",
-  "ocean",
-  "forest",
-  "sunset",
-  "mono",
-];
-const LOCALES: readonly Locale[] = ["en", "ja", "es", "de", "fr", "ko", "zh"];
-const WEEK_STARTS: readonly WeekStart[] = ["sunday", "monday"];
-const HIGHLIGHT_STYLES: readonly HighlightStyle[] = ["bracket", "reverse"];
-
 export interface CliArgs {
   year?: number;
   month?: number;
@@ -37,6 +26,27 @@ export interface ParseResult {
   help?: boolean;
 }
 
+const THEMES: readonly ThemeName[] = ["default", "modern"];
+const COLOR_SCHEMES: readonly ColorSchemeName[] = [
+  "default",
+  "ocean",
+  "forest",
+  "sunset",
+  "mono",
+];
+const LOCALES: readonly Locale[] = ["en", "ja", "es", "de", "fr", "ko", "zh"];
+const WEEK_STARTS: readonly WeekStart[] = ["sunday", "monday"];
+const HIGHLIGHT_STYLES: readonly HighlightStyle[] = ["bracket", "reverse"];
+
+/** 値を一つ取るオプションと、代入先のフィールド名 */
+const VALUE_OPTIONS: Record<string, keyof CliArgs> = {
+  "--theme": "theme",
+  "--color-scheme": "colorScheme",
+  "--locale": "locale",
+  "--week-start": "weekStart",
+  "--highlight-style": "highlightStyle",
+};
+
 /** YYYY-MM-DD 形式の日付文字列をパースする */
 export function parseDate(value: string): Date | null {
   const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value);
@@ -44,29 +54,18 @@ export function parseDate(value: string): Date | null {
   const year = Number(match[1]);
   const month = Number(match[2]);
   const day = Number(match[3]);
-  if (month < 1 || month > 12) return null;
-  if (day < 1 || day > 31) return null;
-  const date = new Date(year, month - 1, day);
+  if (year < 1 || month < 1 || month > 12 || day < 1 || day > 31) {
+    return null;
+  }
+  const date = createDate(year, month - 1, day);
   if (
     date.getFullYear() !== year ||
     date.getMonth() !== month - 1 ||
     date.getDate() !== day
-  )
+  ) {
     return null;
-  return date;
-}
-
-/** 指定した候補リストに値が含まれるか検証する */
-function validateChoice<T extends string>(
-  value: T | undefined,
-  choices: readonly T[],
-  name: string,
-): string | undefined {
-  if (value === undefined) return undefined;
-  if (!choices.includes(value)) {
-    return `Invalid ${name}: "${value}" (expected: ${choices.join(" | ")})`;
   }
-  return undefined;
+  return date;
 }
 
 /**
@@ -74,109 +73,85 @@ function validateChoice<T extends string>(
  */
 export function parseArgs(args: readonly string[]): ParseResult {
   const result: CliArgs = {};
-  const missing = (name: string): ParseResult => ({
+  const error = (message: string): ParseResult => ({
     args: result,
-    error: `Missing value for option: ${name}`,
+    error: message,
   });
 
   for (let i = 0; i < args.length; i++) {
     const arg = args[i]!;
-    const next = (): string | undefined => args[++i];
-
-    switch (arg) {
-      case "-h":
-      case "--help":
-        return { args: result, help: true };
-      case "--theme": {
-        const value = next();
-        if (value === undefined) return missing("--theme");
-        result.theme = value as ThemeName;
-        break;
-      }
-      case "--color-scheme": {
-        const value = next();
-        if (value === undefined) return missing("--color-scheme");
-        result.colorScheme = value as ColorSchemeName;
-        break;
-      }
-      case "--color":
-        result.color = true;
-        break;
-      case "--locale": {
-        const value = next();
-        if (value === undefined) return missing("--locale");
-        result.locale = value as Locale;
-        break;
-      }
-      case "--week-start": {
-        const value = next();
-        if (value === undefined) return missing("--week-start");
-        result.weekStart = value as WeekStart;
-        break;
-      }
-      case "--highlight": {
-        const value = next();
-        if (value === undefined) return missing("--highlight");
-        const parsed = parseDate(value);
-        if (parsed === null) {
-          return {
-            args: result,
-            error: `Invalid --highlight date: "${value}" (expected YYYY-MM-DD, e.g. 2026-09-08)`,
-          };
-        }
-        result.highlight = parsed;
-        break;
+
+    if (arg === "-h" || arg === "--help") {
+      return { args: result, help: true };
+    }
+    if (arg === "--color") {
+      result.color = true;
+      continue;
+    }
+    if (arg === "--highlight") {
+      const value = args[++i];
+      if (value === undefined) {
+        return error("Missing value for option: --highlight");
       }
-      case "--highlight-style": {
-        const value = next();
-        if (value === undefined) return missing("--highlight-style");
-        result.highlightStyle = value as HighlightStyle;
-        break;
+      const parsed = parseDate(value);
+      if (parsed === null) {
+        return error(
+          `Invalid --highlight date: "${value}" (expected YYYY-MM-DD, e.g. 2026-09-08)`,
+        );
       }
-      default: {
-        if (arg.startsWith("-")) {
-          return { args: result, error: `Unknown option: ${arg}` };
-        }
-        if (!/^\d+$/.test(arg)) {
-          return {
-            args: result,
-            error: `Invalid argument: "${arg}" (expected a year or month number)`,
-          };
-        }
-        if (result.year === undefined) {
-          result.year = Number(arg);
-        } else if (result.month === undefined) {
-          result.month = Number(arg);
-        } else {
-          return { args: result, error: `Too many arguments: "${arg}"` };
-        }
+      result.highlight = parsed;
+      continue;
+    }
+
+    const key = VALUE_OPTIONS[arg];
+    if (key !== undefined) {
+      const value = args[++i];
+      if (value === undefined) {
+        return error(`Missing value for option: ${arg}`);
       }
+      (result as Record<string, unknown>)[key] = value;
+      continue;
+    }
+
+    const numeric = /^-?\d+$/.test(arg);
+    if (arg.startsWith("-") && !numeric) {
+      return error(`Unknown option: ${arg}`);
+    }
+    if (!numeric) {
+      return error(
+        `Invalid argument: "${arg}" (expected a year or month number)`,
+      );
+    }
+    if (result.year === undefined) {
+      result.year = Number(arg);
+    } else if (result.month === undefined) {
+      result.month = Number(arg);
+    } else {
+      return error(`Too many arguments: "${arg}"`);
     }
   }
 
   // 値のバリデーション
   if (result.year !== undefined && (result.year < 1 || result.year > 9999)) {
-    return {
-      args: result,
-      error: `Invalid year: ${result.year} (expected 1–9999)`,
-    };
+    return error(`Invalid year: ${result.year} (expected 1–9999)`);
   }
   if (result.month !== undefined && (result.month < 1 || result.month > 12)) {
-    return {
-      args: result,
-      error: `Invalid month: ${result.month} (expected 1–12)`,
-    };
+    return error(`Invalid month: ${result.month} (expected 1–12)`);
   }
 
-  for (const [value, choices, name] of [
-    [result.theme, THEMES, "theme"] as const,
-    [result.colorScheme, COLOR_SCHEMES, "color-scheme"] as const,
-    [result.locale, LOCALES, "locale"] as const,
-    [result.weekStart, WEEK_STARTS, "week-start"] as const,
-    [result.highlightStyle, HIGHLIGHT_STYLES, "highlight-style"] as const,
-  ]) {
-    const error = validateChoice(value, choices, name);
-    if (error) return { args: result, error };
+  const choiceTable: Array<[string | undefined, readonly string[], string]> = [
+    [result.theme, THEMES, "theme"],
+    [result.colorScheme, COLOR_SCHEMES, "color-scheme"],
+    [result.locale, LOCALES, "locale"],
+    [result.weekStart, WEEK_STARTS, "week-start"],
+    [result.highlightStyle, HIGHLIGHT_STYLES, "highlight-style"],
+  ];
+  for (const [value, choices, name] of choiceTable) {
+    if (value !== undefined && !choices.includes(value)) {
+      return error(
+        `Invalid ${name}: "${value}" (expected: ${choices.join(" | ")})`,
+      );
+    }
   }
 
   return { args: result };

package/src/border.ts

@@ -7,6 +7,19 @@ export function innerWidth(cellWidth: number, cols: number): number {
   return cols * cellWidth + (cols - 1);
 }
 
+/** セル幅の水平線を cols 個つなげた区切り線を生成する */
+function divider(
+  frame: FrameChars,
+  cellWidth: number,
+  cols: number,
+  left: string,
+  right: string,
+  join: string,
+): string {
+  const segments = Array<string>(cols).fill(frame.h.repeat(cellWidth));
+  return `${left}${segments.join(join)}${right}`;
+}
+
 /** 上枠: ┌────┬────...────┐ */
 export function topBorder(
   frame: FrameChars,
@@ -22,8 +35,14 @@ export function bottomBorder(
   cellWidth: number,
   cols: number,
 ): string {
-  const segments = Array<string>(cols).fill(frame.h.repeat(cellWidth));
-  return `${frame.bottomLeft}${segments.join(frame.footJ)}${frame.bottomRight}`;
+  return divider(
+    frame,
+    cellWidth,
+    cols,
+    frame.bottomLeft,
+    frame.bottomRight,
+    frame.footJ,
+  );
 }
 
 /** 区切り行: ├────┬────...┬────┤ */
@@ -32,6 +51,5 @@ export function separatorRow(
   cellWidth: number,
   cols: number,
 ): string {
-  const segments = Array<string>(cols).fill(frame.h.repeat(cellWidth));
-  return `├${segments.join(frame.j)}┤`;
+  return divider(frame, cellWidth, cols, "├", "┤", frame.j);
 }

package/src/calendar.ts

@@ -4,67 +4,28 @@ import type {
   CalendarOptions,
   CalendarRangeOptions,
   CalendarYearOptions,
-  RenderMonthOptions,
 } from "./types.ts";
 
-// ─── Options 解決 ─────────────────────────────────────────
-
-/**
- * 各 API に共通のオプションをデフォルト値込みの描画オプションに正規化する。
- * core 由来のオプションと CLI 固有のオプション（theme 等）をまとめる。
- */
-function toRenderOptions(
-  options: CalendarOptions | CalendarYearOptions | CalendarRangeOptions,
-): RenderMonthOptions {
-  const {
-    locale = "en",
-    weekStart = "sunday",
-    highlight,
-    highlightStyle = "bracket",
-    range,
-    color = false,
-    theme,
-    colorScheme,
-    today,
-  } = options;
-
-  return {
-    locale,
-    weekStart,
-    highlight,
-    highlightStyle,
-    range,
-    color,
-    theme,
-    colorScheme,
-    today,
-  };
-}
-
-// ─── 公開API ─────────────────────────────────────────────
-
 /**
  * 月カレンダーをテキストで返す
  */
 export function calendar(options: CalendarOptions): string {
-  return renderMonth(options.year, options.month, toRenderOptions(options));
+  return renderMonth(options.year, options.month, options);
 }
 
 /**
  * 年間カレンダーを4列×3行でテキストで返す
  */
 export function calendarYear(options: CalendarYearOptions): string {
-  return renderYear(options.year, toRenderOptions(options));
+  return renderYear(options.year, options);
 }
 
 /**
  * 任意の日付範囲のカレンダーをテキストで返す
  */
 export function calendarRange(options: CalendarRangeOptions): string {
-  const renderOptions = toRenderOptions(options);
   const months = getMonthRange(options.from, options.to);
-
   return months
-    .map(({ year, month }) => renderMonth(year, month, renderOptions))
+    .map(({ year, month }) => renderMonth(year, month, options))
     .join("\n\n");
 }

package/src/month.ts

@@ -1,19 +1,22 @@
 import {
   buildMonthGrid,
+  createDate,
   getMonthName,
   getWeekdayHeaders,
   isDateInRange,
   isSameDay,
 } from "@typescript-calendar-lib/core";
-import { centerText, centerTextFull, padStartWidth } from "./align.ts";
+import {
+  centerText,
+  centerTextFull,
+  displayWidth,
+  padStartWidth,
+} from "./align.ts";
 import { colorize } from "./ansi.ts";
 import { bottomBorder, innerWidth, separatorRow, topBorder } from "./border.ts";
-import type { CliPalette } from "./theme.ts";
 import { resolveColorScheme, resolveTheme } from "./theme.ts";
 import type { RenderMonthOptions } from "./types.ts";
 
-const CELL_WIDTH = 3;
-
 /**
  * 1ヶ月分のカレンダーテキストを描画する
  */
@@ -36,28 +39,61 @@ export function renderMonth(
 
   const theme = resolveTheme(themeOption);
   const palette = resolveColorScheme(schemeOption);
+  const frame = theme.frame;
 
   const title = `${getMonthName(locale, month)} ${year}`;
   const weekdays = getWeekdayHeaders(locale, weekStart);
   const grid = buildMonthGrid(year, month, weekStart);
+  const cols = weekdays.length;
+
+  // セル幅はテーマ指定を基本としつつ、以下を満たすように広げる:
+  // - 曜日ヘッダーの表示幅（fr の "dim." 等がセル幅を超えると列が崩れる）
+  // - bracket ハイライトは2桁の日付で `[10]` の4文字になるため
+  const cellWidth = Math.max(
+    theme.cellWidth,
+    ...weekdays.map(displayWidth),
+    highlight !== undefined && highlightStyle === "bracket" ? 4 : 2,
+  );
+
+  // 枠なしテーマは separator、枠ありテーマは縦線でセルを繋ぐ
+  const sep = frame === null ? theme.separator : frame.v;
+
+  /** 1セルを描画する（day は日数または null=空欄） */
+  const renderCell = (day: number | null): string => {
+    if (day === null) return " ".repeat(cellWidth);
+
+    const date = createDate(year, month - 1, day);
+    const isHighlight = highlight !== undefined && isSameDay(date, highlight);
+    const isInRange = isDateInRange(date, range);
+    const isToday = isSameDay(date, today);
+    const isWeekend = date.getDay() === 0 || date.getDay() === 6;
+
+    const text = (
+      isHighlight && highlightStyle === "bracket" ? `[${day}]` : String(day)
+    ).padStart(cellWidth);
+
+    let code: number | undefined;
+    if (isHighlight && highlightStyle === "reverse") {
+      code = palette.highlight ?? 7;
+    } else if (isInRange && !isHighlight) {
+      code = palette.range ?? 33;
+    } else if (isToday && palette.today !== undefined) {
+      code = palette.today;
+    } else if (isWeekend && palette.weekend !== undefined) {
+      code = palette.weekend;
+    } else if (palette.day !== undefined) {
+      code = palette.day;
+    }
 
-  // bracket ハイライトは2桁の日付で `[10]` の4文字になるため、
-  // ハイライト中は全セルを4列に揃えて列ずれを防ぐ
-  const cellWidth =
-    highlight !== undefined && highlightStyle === "bracket"
-      ? CELL_WIDTH + 1
-      : CELL_WIDTH;
+    return colorize(text, code, color);
+  };
 
   const lines: string[] = [];
 
-  if (theme.frame === null) {
+  if (frame === null) {
     // ── 枠なし（default） ──
-    const sep = theme.separator;
-    const totalWidth =
-      weekdays.length * cellWidth + (weekdays.length - 1) * sep.length;
-
+    const totalWidth = cols * cellWidth + (cols - 1) * sep.length;
     lines.push(centerText(title, totalWidth));
-
     lines.push(
       weekdays
         .map((d) =>
@@ -65,51 +101,20 @@ export function renderMonth(
         )
         .join(sep),
     );
-
-    for (const row of grid) {
-      if (row.every((d) => d === null)) continue;
-
-      const cells = row.map((day) =>
-        renderCell(
-          year,
-          month,
-          day,
-          highlight,
-          highlightStyle,
-          range,
-          today,
-          color,
-          palette,
-          cellWidth,
-        ),
-      );
-
-      lines.push(cells.join(sep));
-    }
   } else {
     // ── 枠あり（modern） ──
-    const frame = theme.frame;
-
     lines.push(
-      colorize(
-        topBorder(frame, cellWidth, weekdays.length),
-        palette.frame,
-        color,
-      ),
+      colorize(topBorder(frame, cellWidth, cols), palette.frame, color),
     );
     lines.push(
       colorize(
-        `${frame.v}${centerTextFull(title, innerWidth(cellWidth, weekdays.length))}${frame.v}`,
+        `${frame.v}${centerTextFull(title, innerWidth(cellWidth, cols))}${frame.v}`,
         palette.title,
         color,
       ),
     );
     lines.push(
-      colorize(
-        separatorRow(frame, cellWidth, weekdays.length),
-        palette.frame,
-        color,
-      ),
+      colorize(separatorRow(frame, cellWidth, cols), palette.frame, color),
     );
     lines.push(
       colorize(
@@ -119,89 +124,21 @@ export function renderMonth(
       ),
     );
     lines.push(
-      colorize(
-        separatorRow(frame, cellWidth, weekdays.length),
-        palette.frame,
-        color,
-      ),
+      colorize(separatorRow(frame, cellWidth, cols), palette.frame, color),
     );
+  }
 
-    for (const row of grid) {
-      if (row.every((d) => d === null)) continue;
-
-      const cells = row.map((day) =>
-        renderCell(
-          year,
-          month,
-          day,
-          highlight,
-          highlightStyle,
-          range,
-          today,
-          color,
-          palette,
-          cellWidth,
-        ),
-      );
-
-      lines.push(`${frame.v}${cells.join(frame.v)}${frame.v}`);
-    }
+  for (const row of grid) {
+    if (row.every((d) => d === null)) continue;
+    const cells = row.map(renderCell).join(sep);
+    lines.push(frame === null ? cells : `${frame.v}${cells}${frame.v}`);
+  }
 
+  if (frame !== null) {
     lines.push(
-      colorize(
-        bottomBorder(frame, cellWidth, weekdays.length),
-        palette.frame,
-        color,
-      ),
+      colorize(bottomBorder(frame, cellWidth, cols), palette.frame, color),
     );
   }
 
   return lines.join("\n");
 }
-
-// ─── セル ─────────────────────────────────────────────────
-
-function renderCell(
-  year: number,
-  month: number,
-  day: number | null,
-  highlight: Date | undefined,
-  highlightStyle: "bracket" | "reverse",
-  range: { from: Date; to: Date } | undefined,
-  today: Date,
-  color: boolean,
-  palette: CliPalette,
-  cellWidth: number,
-): string {
-  if (day === null) {
-    return " ".repeat(cellWidth);
-  }
-
-  const date = new Date(year, month - 1, day);
-  const isHighlight = highlight !== undefined && isSameDay(date, highlight);
-  const isInRange = isDateInRange(date, range);
-  const isToday = isSameDay(date, today);
-  const isWeekend = date.getDay() === 0 || date.getDay() === 6;
-
-  let text: string;
-  if (isHighlight && highlightStyle === "bracket") {
-    text = `[${day}]`.padStart(cellWidth);
-  } else {
-    text = String(day).padStart(cellWidth);
-  }
-
-  let code: number | undefined;
-  if (isHighlight && highlightStyle === "reverse") {
-    code = palette.highlight ?? 7;
-  } else if (isInRange && !isHighlight) {
-    code = palette.range ?? 33;
-  } else if (isToday && palette.today !== undefined) {
-    code = palette.today;
-  } else if (isWeekend && palette.weekend !== undefined) {
-    code = palette.weekend;
-  } else if (palette.day !== undefined) {
-    code = palette.day;
-  }
-
-  return colorize(text, code, color);
-}

package/src/theme.ts

@@ -52,9 +52,9 @@ export const THEMES: Record<ThemeName, CliTheme> = {
 };
 
 export function resolveTheme(theme?: ThemeName | CliTheme): CliTheme {
-  if (theme === undefined) return THEMES.default;
-  if (typeof theme === "string") return THEMES[theme] ?? THEMES.default;
-  return theme;
+  return typeof theme === "string"
+    ? (THEMES[theme] ?? THEMES.default)
+    : (theme ?? THEMES.default);
 }
 
 // ─── カラースキーム ───────────────────────────────────────
@@ -140,9 +140,7 @@ export const COLOR_SCHEMES: Record<ColorSchemeName, CliPalette> = {
 export function resolveColorScheme(
   scheme?: ColorSchemeName | CliPalette,
 ): CliPalette {
-  if (scheme === undefined) return COLOR_SCHEMES.default;
-  if (typeof scheme === "string") {
-    return COLOR_SCHEMES[scheme] ?? COLOR_SCHEMES.default;
-  }
-  return scheme;
+  return typeof scheme === "string"
+    ? (COLOR_SCHEMES[scheme] ?? COLOR_SCHEMES.default)
+    : (scheme ?? COLOR_SCHEMES.default);
 }

package/src/year.ts

@@ -1,50 +1,48 @@
-import { visibleWidth } from "./ansi.ts";
+import { displayWidth } from "./align.ts";
+import { stripAnsi } from "./ansi.ts";
 import { renderMonth } from "./month.ts";
 import type { RenderMonthOptions } from "./types.ts";
 
 /**
  * 年間カレンダーを4列×3行でテキストで返す
+ *
+ * 列幅・パディングは「ANSI 除去後のターミナル表示幅」で計算する。
+ * 全角文字（日本語・韓国語・中国語の月名や曜日）も正しく揃う。
  */
 export function renderYear(
   year: number,
   options: RenderMonthOptions = {},
 ): string {
-  const months: string[] = [];
-  for (let m = 1; m <= 12; m++) {
-    months.push(renderMonth(year, m, options));
-  }
-
-  const monthLines = months.map((m) => m.split("\n"));
-  const maxLines = Math.max(...monthLines.map((l) => l.length));
+  const widthOf = (line: string): number => displayWidth(stripAnsi(line));
 
-  const colWidths = monthLines.map((lines) =>
-    Math.max(...lines.map((l) => visibleWidth(l))),
+  const months = Array.from({ length: 12 }, (_, i) =>
+    renderMonth(year, i + 1, options).split("\n"),
   );
+  const maxLines = Math.max(...months.map((lines) => lines.length));
+  const colWidths = months.map((lines) => Math.max(...lines.map(widthOf)));
 
-  const result: string[] = [];
-  for (let row = 0; row < 3; row++) {
-    const rowLines: string[] = [];
-    for (let lineIdx = 0; lineIdx < maxLines; lineIdx++) {
-      const parts: string[] = [];
-      for (let col = 0; col < 4; col++) {
-        const monthIdx = row * 4 + col;
-        if (monthIdx >= 12) {
-          parts.push("");
-          continue;
-        }
-        const lines = monthLines[monthIdx]!;
-        const line = lines[lineIdx] ?? "";
-        const pad = Math.max(0, colWidths[monthIdx]! - visibleWidth(line));
-        parts.push(line + " ".repeat(pad));
-      }
-      rowLines.push(parts.join("    "));
-    }
-    result.push(rowLines.join("\n"));
+  /** 月の各行をその列幅まで右パディングする（行が足りなければ空行として埋める） */
+  const padMonth = (monthIdx: number): string[] =>
+    Array.from({ length: maxLines }, (_, li) => {
+      const line = months[monthIdx]![li] ?? "";
+      return (
+        line + " ".repeat(Math.max(0, colWidths[monthIdx]! - widthOf(line)))
+      );
+    });
 
-    if (row < 2) {
-      result.push("");
-    }
+  const padded = months.map((_, mi) => padMonth(mi));
+
+  const rows: string[] = [];
+  for (let row = 0; row < 3; row++) {
+    rows.push(
+      Array.from({ length: maxLines }, (_, li) =>
+        Array.from({ length: 4 }, (_, col) => {
+          const monthIdx = row * 4 + col;
+          return monthIdx < 12 ? padded[monthIdx]![li]! : "";
+        }).join("    "),
+      ).join("\n"),
+    );
   }
 
-  return result.join("\n");
+  return rows.join("\n\n");
 }