@hirokisakabe/pom 8.3.0 → 8.5.0

package/README.md

@@ -39,9 +39,12 @@
 - **Declarative** — Describe slides as XML. No imperative API calls needed — just data in, PPTX out.
 - **Flexible Layout** — Flexbox-style layout with VStack / HStack, powered by yoga-layout. Ratio-based layouts (e.g., 2:1 columns) via the `grow` attribute (CSS `flex-grow`).
 - **Shorthand + Dot Notation** — Layout/style attributes (e.g. `padding`, `margin`, `border`, `fill`, `shadow`) can mix shorthand and dot notation on the same node. Shorthand sets defaults and dot notation overrides specific keys.
+- **Per-Side Borders** — `borderTop` / `borderRight` / `borderBottom` / `borderLeft` style each edge independently (e.g. `borderLeft.width="6"` for an accent bar, `borderBottom.width="3"` for an underlined heading), merging field-by-field with the uniform `border`. See [Nodes — Common Properties](./docs/nodes.md#common-properties).
 - **Rich Nodes** — 18 built-in node types: charts, flowcharts, tables, timelines, org trees, and more.
+- **Design Tokens** — Declare a color palette once with a top-level `<Theme>` element and reference tokens as `$name` from any color attribute. See [Nodes — Top-Level `<Theme>`](./docs/nodes.md#top-level-theme-design-tokens).
 - **Schema-validated** — XML input is validated with Zod schemas at runtime with clear error messages.
 - **PowerPoint Native** — Generates real editable PowerPoint shapes — not images. Recipients can modify everything. Linear gradient backgrounds (`backgroundGradient="linear-gradient(135deg, #667EEA 0%, #764BA2 100%)"`) are exported as native gradient fills.
+- **Leaf Rotation** — `Text`, `Shape`, `Image`, and `Icon` support `rotate` in clockwise degrees at render time without affecting flex layout.
 - **Pixel Units** — Intuitive pixel-based sizing (internally converted to inches at 96 DPI).
 - **Master Slide** — Define headers, footers, and page numbers once — applied to all slides automatically.
 - **Accurate Text Measurement** — Text width measured with opentype.js and bundled Noto Sans JP fonts for consistent layout.
@@ -70,32 +73,41 @@ const { pptx } = await buildPptx(xml, { w: 1280, h: 720 });
 await pptx.writeFile({ fileName: "presentation.pptx" });
 ```
 
-Each slide must be wrapped in a `<Slide>` element. To produce multiple slides, list multiple `<Slide>` elements at the top level.
+Each slide must be wrapped in a `<Slide>` element. To produce multiple slides, list multiple `<Slide>` elements at the top level. A single top-level `<Theme>` element may precede the slides to declare color tokens (referenced as `$name` from color attributes):
+
+```xml
+<Theme surface="0F172A" accent="38BDF8" textMain="F8FAFC" />
+<Slide>
+  <VStack w="100%" h="max" padding="48" backgroundColor="$surface">
+    <Text fontSize="48" bold="true" color="$textMain">Dark Theme</Text>
+  </VStack>
+</Slide>
+```
 
 ## Available Nodes
 
-| Node         | Description                                                                                                             |
-| ------------ | ----------------------------------------------------------------------------------------------------------------------- |
-| Text         | Text with font styling, decoration, letter spacing, inline bold/italic/underline/strike/highlight/color, and hyperlinks |
-| Ul           | Unordered (bullet) list with Li items                                                                                   |
-| Ol           | Ordered (numbered) list with Li items                                                                                   |
-| Image        | Images from file path, URL, or base64                                                                                   |
-| Table        | Tables with customizable columns and rows                                                                               |
-| Shape        | PowerPoint shapes (roundRect, ellipse, etc.)                                                                            |
-| Chart        | Charts (bar, line, pie, area, doughnut, radar)                                                                          |
-| Timeline     | Timeline / roadmap visualizations                                                                                       |
-| Matrix       | 2x2 positioning maps                                                                                                    |
-| Tree         | Organization charts and decision trees                                                                                  |
-| Flow         | Flowcharts with nodes and edges                                                                                         |
-| ProcessArrow | Chevron-style process diagrams                                                                                          |
-| Pyramid      | Pyramid diagrams for hierarchies                                                                                        |
-| Line         | Horizontal / vertical lines                                                                                             |
-| Arrow        | Connectors between nodes referenced by ID                                                                               |
-| Layer        | Absolute-positioned overlay container                                                                                   |
-| VStack       | Vertical stack layout                                                                                                   |
-| HStack       | Horizontal stack layout                                                                                                 |
-| Icon         | Lucide icons                                                                                                            |
-| Svg          | Inline SVG graphics                                                                                                     |
+| Node         | Description                                                                                                                                               |
+| ------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Text         | Text with font styling, decoration, rotation, letter spacing, glow / outline effects, inline bold/italic/underline/strike/highlight/color, and hyperlinks |
+| Ul           | Unordered (bullet) list with Li items                                                                                                                     |
+| Ol           | Ordered (numbered) list with Li items                                                                                                                     |
+| Image        | Images from file path, URL, or base64, with optional rotation                                                                                             |
+| Table        | Tables with customizable columns and rows                                                                                                                 |
+| Shape        | PowerPoint shapes (roundRect, ellipse, etc.) with optional rotation                                                                                       |
+| Chart        | Charts (bar, line, pie, area, doughnut, radar)                                                                                                            |
+| Timeline     | Timeline / roadmap visualizations                                                                                                                         |
+| Matrix       | 2x2 positioning maps                                                                                                                                      |
+| Tree         | Organization charts and decision trees                                                                                                                    |
+| Flow         | Flowcharts with nodes and edges                                                                                                                           |
+| ProcessArrow | Chevron-style process diagrams                                                                                                                            |
+| Pyramid      | Pyramid diagrams for hierarchies                                                                                                                          |
+| Line         | Horizontal / vertical lines                                                                                                                               |
+| Arrow        | Connectors between nodes referenced by ID                                                                                                                 |
+| Layer        | Absolute-positioned overlay container                                                                                                                     |
+| VStack       | Vertical stack layout                                                                                                                                     |
+| HStack       | Horizontal stack layout                                                                                                                                   |
+| Icon         | Lucide icons with optional rotation                                                                                                                       |
+| Svg          | Inline SVG graphics                                                                                                                                       |
 
 For detailed node documentation, see [Nodes](./docs/nodes.md).
 

package/dist/autoFit/autoFit.js

@@ -62,7 +62,7 @@ async function autoFitSlide(node, slideSize, ctx) {
 		const result = await measureOverflow(node, slideSize, ctx);
 		freeYogaTree(result.map);
 		if (!result.isOverflowing) break;
-		if (!strategy(node, result.targetRatio)) continue;
+		if (!strategy(node, result.targetRatio).changed) continue;
 	}
 	return finalizeLayout(node, slideSize, ctx);
 }

package/dist/autoFit/autoFit.js.map

@@ -1 +1 @@
-{"version":3,"file":"autoFit.js","names":[],"sources":["../../src/autoFit/autoFit.ts"],"sourcesContent":["import type { POMNode } from \"../types.ts\";\nimport type { BuildContext } from \"../buildContext.ts\";\nimport type { YogaNodeMap } from \"../calcYogaLayout/types.ts\";\nimport { calcYogaLayout } from \"../calcYogaLayout/calcYogaLayout.ts\";\nimport { freeYogaTree } from \"../shared/freeYogaTree.ts\";\nimport { reduceTableRowHeight } from \"./strategies/reduceTableRowHeight.ts\";\nimport { reduceFontSize } from \"./strategies/reduceFontSize.ts\";\nimport { reduceGapAndPadding } from \"./strategies/reduceGapAndPadding.ts\";\nimport { uniformScale } from \"./strategies/uniformScale.ts\";\n\n/** オーバーフロー判定の許容マージン（0.5%） */\nconst OVERFLOW_TOLERANCE = 1.005;\n\ntype Strategy = (node: POMNode, targetRatio: number) => boolean;\n\nconst strategies: Strategy[] = [\n  reduceTableRowHeight,\n  reduceFontSize,\n  reduceGapAndPadding,\n  uniformScale,\n];\n\n/** オーバーフロー測定結果 */\ninterface OverflowResult {\n  contentHeight: number;\n  isOverflowing: boolean;\n  /** スライド高さ / コンテンツ高さ（オーバーフロー時 < 1） */\n  targetRatio: number;\n  map: YogaNodeMap;\n}\n\n/**\n * レイアウト計算を実行し、コンテンツのオーバーフロー状態を測定する。\n */\nasync function measureOverflow(\n  node: POMNode,\n  slideSize: { w: number; h: number },\n  ctx: BuildContext,\n): Promise<OverflowResult> {\n  const map = await calcYogaLayout(node, slideSize, ctx);\n  const contentHeight = calcContentHeight(map, node);\n  const isOverflowing = contentHeight > slideSize.h * OVERFLOW_TOLERANCE;\n  const targetRatio = isOverflowing ? slideSize.h / contentHeight : 1;\n  return { contentHeight, isOverflowing, targetRatio, map };\n}\n\n/**\n * Yoga レイアウト結果からコンテンツの占有高さを算出する。\n *\n * ルートの yogaNode の子要素の (top + height) の最大値を計算し、\n * ルートの padding.bottom を加算してコンテンツの占有高さとする。\n * h=\"max\" や flexGrow の影響を受けず、正確なコンテンツ高さを返す。\n */\nfunction calcContentHeight(map: YogaNodeMap, node: POMNode): number {\n  const rootYoga = map.get(node);\n  if (!rootYoga) {\n    throw new Error(\"YogaNode not found in map for root node\");\n  }\n\n  const childCount = rootYoga.getChildCount();\n  if (childCount === 0) {\n    return rootYoga.getComputedHeight();\n  }\n\n  let maxBottom = 0;\n  for (let i = 0; i < childCount; i++) {\n    const child = rootYoga.getChild(i);\n    const childLayout = child.getComputedLayout();\n    const bottom = childLayout.top + childLayout.height;\n    if (bottom > maxBottom) {\n      maxBottom = bottom;\n    }\n  }\n\n  // ルートの paddingBottom を加算\n  const paddingBottom = rootYoga.getComputedPadding(2); // EDGE_BOTTOM = 2\n  return maxBottom + paddingBottom;\n}\n\n/**\n * スライドのオーバーフローを検出し、段階的に調整してスライド内に収める。\n *\n * 調整の優先順:\n * 1. テーブル行高さ縮小\n * 2. フォントサイズ縮小\n * 3. gap/padding 縮小\n * 4. 全体スケーリング（フォールバック）\n */\nexport async function autoFitSlide(\n  node: POMNode,\n  slideSize: { w: number; h: number },\n  ctx: BuildContext,\n): Promise<YogaNodeMap> {\n  // Phase 1: 戦略を順次適用してオーバーフローを解消\n  for (const strategy of strategies) {\n    const result = await measureOverflow(node, slideSize, ctx);\n    freeYogaTree(result.map);\n\n    if (!result.isOverflowing) {\n      break;\n    }\n\n    const changed = strategy(node, result.targetRatio);\n    if (!changed) {\n      continue;\n    }\n  }\n\n  // Phase 2: 最終レイアウト計算とオーバーフロー検証\n  return finalizeLayout(node, slideSize, ctx);\n}\n\n/**\n * 最終レイアウトを計算し、オーバーフローが残っていれば警告を出力する。\n */\nasync function finalizeLayout(\n  node: POMNode,\n  slideSize: { w: number; h: number },\n  ctx: BuildContext,\n): Promise<YogaNodeMap> {\n  const result = await measureOverflow(node, slideSize, ctx);\n  if (result.isOverflowing) {\n    ctx.diagnostics.add(\n      \"AUTOFIT_OVERFLOW\",\n      `autoFit: content height (${Math.round(result.contentHeight)}px) exceeds slide height (${slideSize.h}px) after all adjustments.`,\n    );\n  }\n  freeYogaTree(result.map);\n\n  return calcYogaLayout(node, slideSize, ctx);\n}\n"],"mappings":";;;;;;;;AAWA,MAAM,qBAAqB;AAI3B,MAAM,aAAyB;CAC7B;CACA;CACA;CACA;AACF;;;;AAcA,eAAe,gBACb,MACA,WACA,KACyB;CACzB,MAAM,MAAM,MAAM,eAAe,MAAM,WAAW,GAAG;CACrD,MAAM,gBAAgB,kBAAkB,KAAK,IAAI;CACjD,MAAM,gBAAgB,gBAAgB,UAAU,IAAI;CAEpD,OAAO;EAAE;EAAe;EAAe,aADnB,gBAAgB,UAAU,IAAI,gBAAgB;EACd;CAAI;AAC1D;;;;;;;;AASA,SAAS,kBAAkB,KAAkB,MAAuB;CAClE,MAAM,WAAW,IAAI,IAAI,IAAI;CAC7B,IAAI,CAAC,UACH,MAAM,IAAI,MAAM,yCAAyC;CAG3D,MAAM,aAAa,SAAS,cAAc;CAC1C,IAAI,eAAe,GACjB,OAAO,SAAS,kBAAkB;CAGpC,IAAI,YAAY;CAChB,KAAK,IAAI,IAAI,GAAG,IAAI,YAAY,KAAK;EAEnC,MAAM,cADQ,SAAS,SAAS,CACR,CAAC,CAAC,kBAAkB;EAC5C,MAAM,SAAS,YAAY,MAAM,YAAY;EAC7C,IAAI,SAAS,WACX,YAAY;CAEhB;CAGA,MAAM,gBAAgB,SAAS,mBAAmB,CAAC;CACnD,OAAO,YAAY;AACrB;;;;;;;;;;AAWA,eAAsB,aACpB,MACA,WACA,KACsB;CAEtB,KAAK,MAAM,YAAY,YAAY;EACjC,MAAM,SAAS,MAAM,gBAAgB,MAAM,WAAW,GAAG;EACzD,aAAa,OAAO,GAAG;EAEvB,IAAI,CAAC,OAAO,eACV;EAIF,IAAI,CADY,SAAS,MAAM,OAAO,WAC3B,GACT;CAEJ;CAGA,OAAO,eAAe,MAAM,WAAW,GAAG;AAC5C;;;;AAKA,eAAe,eACb,MACA,WACA,KACsB;CACtB,MAAM,SAAS,MAAM,gBAAgB,MAAM,WAAW,GAAG;CACzD,IAAI,OAAO,eACT,IAAI,YAAY,IACd,oBACA,4BAA4B,KAAK,MAAM,OAAO,aAAa,EAAE,4BAA4B,UAAU,EAAE,2BACvG;CAEF,aAAa,OAAO,GAAG;CAEvB,OAAO,eAAe,MAAM,WAAW,GAAG;AAC5C"}
+{"version":3,"file":"autoFit.js","names":[],"sources":["../../src/autoFit/autoFit.ts"],"sourcesContent":["import type { POMNode } from \"../types.ts\";\nimport type { BuildContext } from \"../buildContext.ts\";\nimport type { YogaNodeMap } from \"../calcYogaLayout/types.ts\";\nimport { calcYogaLayout } from \"../calcYogaLayout/calcYogaLayout.ts\";\nimport { freeYogaTree } from \"../shared/freeYogaTree.ts\";\nimport { reduceTableRowHeight } from \"./strategies/reduceTableRowHeight.ts\";\nimport { reduceFontSize } from \"./strategies/reduceFontSize.ts\";\nimport { reduceGapAndPadding } from \"./strategies/reduceGapAndPadding.ts\";\nimport { uniformScale } from \"./strategies/uniformScale.ts\";\nimport type { AutoFitStrategyResult } from \"./strategyResult.ts\";\n\n/** オーバーフロー判定の許容マージン（0.5%） */\nconst OVERFLOW_TOLERANCE = 1.005;\n\ntype Strategy = (node: POMNode, targetRatio: number) => AutoFitStrategyResult;\n\nconst strategies: Strategy[] = [\n  reduceTableRowHeight,\n  reduceFontSize,\n  reduceGapAndPadding,\n  uniformScale,\n];\n\n/** オーバーフロー測定結果 */\ninterface OverflowResult {\n  contentHeight: number;\n  isOverflowing: boolean;\n  /** スライド高さ / コンテンツ高さ（オーバーフロー時 < 1） */\n  targetRatio: number;\n  map: YogaNodeMap;\n}\n\n/**\n * レイアウト計算を実行し、コンテンツのオーバーフロー状態を測定する。\n */\nasync function measureOverflow(\n  node: POMNode,\n  slideSize: { w: number; h: number },\n  ctx: BuildContext,\n): Promise<OverflowResult> {\n  const map = await calcYogaLayout(node, slideSize, ctx);\n  const contentHeight = calcContentHeight(map, node);\n  const isOverflowing = contentHeight > slideSize.h * OVERFLOW_TOLERANCE;\n  const targetRatio = isOverflowing ? slideSize.h / contentHeight : 1;\n  return { contentHeight, isOverflowing, targetRatio, map };\n}\n\n/**\n * Yoga レイアウト結果からコンテンツの占有高さを算出する。\n *\n * ルートの yogaNode の子要素の (top + height) の最大値を計算し、\n * ルートの padding.bottom を加算してコンテンツの占有高さとする。\n * h=\"max\" や flexGrow の影響を受けず、正確なコンテンツ高さを返す。\n */\nfunction calcContentHeight(map: YogaNodeMap, node: POMNode): number {\n  const rootYoga = map.get(node);\n  if (!rootYoga) {\n    throw new Error(\"YogaNode not found in map for root node\");\n  }\n\n  const childCount = rootYoga.getChildCount();\n  if (childCount === 0) {\n    return rootYoga.getComputedHeight();\n  }\n\n  let maxBottom = 0;\n  for (let i = 0; i < childCount; i++) {\n    const child = rootYoga.getChild(i);\n    const childLayout = child.getComputedLayout();\n    const bottom = childLayout.top + childLayout.height;\n    if (bottom > maxBottom) {\n      maxBottom = bottom;\n    }\n  }\n\n  // ルートの paddingBottom を加算\n  const paddingBottom = rootYoga.getComputedPadding(2); // EDGE_BOTTOM = 2\n  return maxBottom + paddingBottom;\n}\n\n/**\n * スライドのオーバーフローを検出し、段階的に調整してスライド内に収める。\n *\n * 調整の優先順:\n * 1. テーブル行高さ縮小\n * 2. フォントサイズ縮小\n * 3. gap/padding 縮小\n * 4. 全体スケーリング（フォールバック）\n */\nexport async function autoFitSlide(\n  node: POMNode,\n  slideSize: { w: number; h: number },\n  ctx: BuildContext,\n): Promise<YogaNodeMap> {\n  // Phase 1: 戦略を順次適用してオーバーフローを解消\n  for (const strategy of strategies) {\n    const result = await measureOverflow(node, slideSize, ctx);\n    freeYogaTree(result.map);\n\n    if (!result.isOverflowing) {\n      break;\n    }\n\n    const strategyResult = strategy(node, result.targetRatio);\n    if (!strategyResult.changed) {\n      continue;\n    }\n  }\n\n  // Phase 2: 最終レイアウト計算とオーバーフロー検証\n  return finalizeLayout(node, slideSize, ctx);\n}\n\n/**\n * 最終レイアウトを計算し、オーバーフローが残っていれば警告を出力する。\n */\nasync function finalizeLayout(\n  node: POMNode,\n  slideSize: { w: number; h: number },\n  ctx: BuildContext,\n): Promise<YogaNodeMap> {\n  const result = await measureOverflow(node, slideSize, ctx);\n  if (result.isOverflowing) {\n    ctx.diagnostics.add(\n      \"AUTOFIT_OVERFLOW\",\n      `autoFit: content height (${Math.round(result.contentHeight)}px) exceeds slide height (${slideSize.h}px) after all adjustments.`,\n    );\n  }\n  freeYogaTree(result.map);\n\n  return calcYogaLayout(node, slideSize, ctx);\n}\n"],"mappings":";;;;;;;;AAYA,MAAM,qBAAqB;AAI3B,MAAM,aAAyB;CAC7B;CACA;CACA;CACA;AACF;;;;AAcA,eAAe,gBACb,MACA,WACA,KACyB;CACzB,MAAM,MAAM,MAAM,eAAe,MAAM,WAAW,GAAG;CACrD,MAAM,gBAAgB,kBAAkB,KAAK,IAAI;CACjD,MAAM,gBAAgB,gBAAgB,UAAU,IAAI;CAEpD,OAAO;EAAE;EAAe;EAAe,aADnB,gBAAgB,UAAU,IAAI,gBAAgB;EACd;CAAI;AAC1D;;;;;;;;AASA,SAAS,kBAAkB,KAAkB,MAAuB;CAClE,MAAM,WAAW,IAAI,IAAI,IAAI;CAC7B,IAAI,CAAC,UACH,MAAM,IAAI,MAAM,yCAAyC;CAG3D,MAAM,aAAa,SAAS,cAAc;CAC1C,IAAI,eAAe,GACjB,OAAO,SAAS,kBAAkB;CAGpC,IAAI,YAAY;CAChB,KAAK,IAAI,IAAI,GAAG,IAAI,YAAY,KAAK;EAEnC,MAAM,cADQ,SAAS,SAAS,CACR,CAAC,CAAC,kBAAkB;EAC5C,MAAM,SAAS,YAAY,MAAM,YAAY;EAC7C,IAAI,SAAS,WACX,YAAY;CAEhB;CAGA,MAAM,gBAAgB,SAAS,mBAAmB,CAAC;CACnD,OAAO,YAAY;AACrB;;;;;;;;;;AAWA,eAAsB,aACpB,MACA,WACA,KACsB;CAEtB,KAAK,MAAM,YAAY,YAAY;EACjC,MAAM,SAAS,MAAM,gBAAgB,MAAM,WAAW,GAAG;EACzD,aAAa,OAAO,GAAG;EAEvB,IAAI,CAAC,OAAO,eACV;EAIF,IAAI,CADmB,SAAS,MAAM,OAAO,WAC3B,CAAC,CAAC,SAClB;CAEJ;CAGA,OAAO,eAAe,MAAM,WAAW,GAAG;AAC5C;;;;AAKA,eAAe,eACb,MACA,WACA,KACsB;CACtB,MAAM,SAAS,MAAM,gBAAgB,MAAM,WAAW,GAAG;CACzD,IAAI,OAAO,eACT,IAAI,YAAY,IACd,oBACA,4BAA4B,KAAK,MAAM,OAAO,aAAa,EAAE,4BAA4B,UAAU,EAAE,2BACvG;CAEF,aAAa,OAAO,GAAG;CAEvB,OAAO,eAAe,MAAM,WAAW,GAAG;AAC5C"}

package/dist/autoFit/strategies/reduceFontSize.js

@@ -1,32 +1,30 @@
 import { walkPOMTree } from "../../shared/walkTree.js";
+import { toStrategyResult } from "../strategyResult.js";
 //#region src/autoFit/strategies/reduceFontSize.ts
 const MIN_FONT_SIZE = 10;
 const MIN_SCALE = .6;
 /**
 * テキスト系ノードの fontSize を縮小する。
 * 対象: text, ul, ol, shape
-* @returns 変更があった場合 true
 */
 function reduceFontSize(node, targetRatio) {
 	const ratio = Math.max(targetRatio, MIN_SCALE);
 	let changed = false;
+	let sawTarget = false;
 	walkPOMTree(node, (n) => {
-		switch (n.type) {
-			case "text":
-			case "shape":
-			case "ul":
-			case "ol":
-				if (n.fontSize !== void 0) {
-					const newSize = Math.max(MIN_FONT_SIZE, Math.round(n.fontSize * ratio));
-					if (newSize !== n.fontSize) {
-						n.fontSize = newSize;
-						changed = true;
-					}
+		if (n.type === "text" || n.type === "shape" || n.type === "ul" || n.type === "ol") {
+			if (n.fontSize !== void 0) {
+				sawTarget = true;
+				const newSize = Math.max(MIN_FONT_SIZE, Math.round(n.fontSize * ratio));
+				if (newSize !== n.fontSize) {
+					n.fontSize = newSize;
+					changed = true;
 				}
-				break;
+			}
 		}
 		if (n.type === "ul" || n.type === "ol") {
 			for (const item of n.items) if (item.fontSize !== void 0) {
+				sawTarget = true;
 				const newSize = Math.max(MIN_FONT_SIZE, Math.round(item.fontSize * ratio));
 				if (newSize !== item.fontSize) {
 					item.fontSize = newSize;
@@ -36,6 +34,7 @@ function reduceFontSize(node, targetRatio) {
 		}
 		if (n.type === "table") {
 			for (const row of n.rows) for (const cell of row.cells) if (cell.fontSize !== void 0) {
+				sawTarget = true;
 				const newSize = Math.max(MIN_FONT_SIZE, Math.round(cell.fontSize * ratio));
 				if (newSize !== cell.fontSize) {
 					cell.fontSize = newSize;
@@ -44,7 +43,10 @@ function reduceFontSize(node, targetRatio) {
 			}
 		}
 	});
-	return changed;
+	return toStrategyResult({
+		changed,
+		sawTarget
+	});
 }
 //#endregion
 export { reduceFontSize };

package/dist/autoFit/strategies/reduceFontSize.js.map

@@ -1 +1 @@
-{"version":3,"file":"reduceFontSize.js","names":[],"sources":["../../../src/autoFit/strategies/reduceFontSize.ts"],"sourcesContent":["import type { POMNode } from \"../../types.ts\";\nimport { walkPOMTree } from \"../../shared/walkTree.ts\";\n\nconst MIN_FONT_SIZE = 10;\nconst MIN_SCALE = 0.6;\n\n/**\n * テキスト系ノードの fontSize を縮小する。\n * 対象: text, ul, ol, shape\n * @returns 変更があった場合 true\n */\nexport function reduceFontSize(node: POMNode, targetRatio: number): boolean {\n  const ratio = Math.max(targetRatio, MIN_SCALE);\n  let changed = false;\n\n  walkPOMTree(node, (n) => {\n    switch (n.type) {\n      case \"text\":\n      case \"shape\":\n      case \"ul\":\n      case \"ol\": {\n        if (n.fontSize !== undefined) {\n          const newSize = Math.max(\n            MIN_FONT_SIZE,\n            Math.round(n.fontSize * ratio),\n          );\n          if (newSize !== n.fontSize) {\n            n.fontSize = newSize;\n            changed = true;\n          }\n        }\n        break;\n      }\n    }\n\n    // ul/ol の li 要素の fontSize も縮小\n    if (n.type === \"ul\" || n.type === \"ol\") {\n      for (const item of n.items) {\n        if (item.fontSize !== undefined) {\n          const newSize = Math.max(\n            MIN_FONT_SIZE,\n            Math.round(item.fontSize * ratio),\n          );\n          if (newSize !== item.fontSize) {\n            item.fontSize = newSize;\n            changed = true;\n          }\n        }\n      }\n    }\n\n    // table セルの fontSize も縮小\n    if (n.type === \"table\") {\n      for (const row of n.rows) {\n        for (const cell of row.cells) {\n          if (cell.fontSize !== undefined) {\n            const newSize = Math.max(\n              MIN_FONT_SIZE,\n              Math.round(cell.fontSize * ratio),\n            );\n            if (newSize !== cell.fontSize) {\n              cell.fontSize = newSize;\n              changed = true;\n            }\n          }\n        }\n      }\n    }\n  });\n\n  return changed;\n}\n"],"mappings":";;AAGA,MAAM,gBAAgB;AACtB,MAAM,YAAY;;;;;;AAOlB,SAAgB,eAAe,MAAe,aAA8B;CAC1E,MAAM,QAAQ,KAAK,IAAI,aAAa,SAAS;CAC7C,IAAI,UAAU;CAEd,YAAY,OAAO,MAAM;EACvB,QAAQ,EAAE,MAAV;GACE,KAAK;GACL,KAAK;GACL,KAAK;GACL,KAAK;IACH,IAAI,EAAE,aAAa,KAAA,GAAW;KAC5B,MAAM,UAAU,KAAK,IACnB,eACA,KAAK,MAAM,EAAE,WAAW,KAAK,CAC/B;KACA,IAAI,YAAY,EAAE,UAAU;MAC1B,EAAE,WAAW;MACb,UAAU;KACZ;IACF;IACA;EAEJ;EAGA,IAAI,EAAE,SAAS,QAAQ,EAAE,SAAS;QAC3B,MAAM,QAAQ,EAAE,OACnB,IAAI,KAAK,aAAa,KAAA,GAAW;IAC/B,MAAM,UAAU,KAAK,IACnB,eACA,KAAK,MAAM,KAAK,WAAW,KAAK,CAClC;IACA,IAAI,YAAY,KAAK,UAAU;KAC7B,KAAK,WAAW;KAChB,UAAU;IACZ;GACF;;EAKJ,IAAI,EAAE,SAAS;QACR,MAAM,OAAO,EAAE,MAClB,KAAK,MAAM,QAAQ,IAAI,OACrB,IAAI,KAAK,aAAa,KAAA,GAAW;IAC/B,MAAM,UAAU,KAAK,IACnB,eACA,KAAK,MAAM,KAAK,WAAW,KAAK,CAClC;IACA,IAAI,YAAY,KAAK,UAAU;KAC7B,KAAK,WAAW;KAChB,UAAU;IACZ;GACF;;CAIR,CAAC;CAED,OAAO;AACT"}
+{"version":3,"file":"reduceFontSize.js","names":[],"sources":["../../../src/autoFit/strategies/reduceFontSize.ts"],"sourcesContent":["import type { POMNode } from \"../../types.ts\";\nimport { walkPOMTree } from \"../../shared/walkTree.ts\";\nimport type { AutoFitStrategyResult } from \"../strategyResult.ts\";\nimport { toStrategyResult } from \"../strategyResult.ts\";\n\nconst MIN_FONT_SIZE = 10;\nconst MIN_SCALE = 0.6;\n\n/**\n * テキスト系ノードの fontSize を縮小する。\n * 対象: text, ul, ol, shape\n */\nexport function reduceFontSize(\n  node: POMNode,\n  targetRatio: number,\n): AutoFitStrategyResult {\n  const ratio = Math.max(targetRatio, MIN_SCALE);\n  let changed = false;\n  let sawTarget = false;\n\n  walkPOMTree(node, (n) => {\n    if (\n      n.type === \"text\" ||\n      n.type === \"shape\" ||\n      n.type === \"ul\" ||\n      n.type === \"ol\"\n    ) {\n      if (n.fontSize !== undefined) {\n        sawTarget = true;\n        const newSize = Math.max(MIN_FONT_SIZE, Math.round(n.fontSize * ratio));\n        if (newSize !== n.fontSize) {\n          n.fontSize = newSize;\n          changed = true;\n        }\n      }\n    }\n\n    // ul/ol の li 要素の fontSize も縮小\n    if (n.type === \"ul\" || n.type === \"ol\") {\n      for (const item of n.items) {\n        if (item.fontSize !== undefined) {\n          sawTarget = true;\n          const newSize = Math.max(\n            MIN_FONT_SIZE,\n            Math.round(item.fontSize * ratio),\n          );\n          if (newSize !== item.fontSize) {\n            item.fontSize = newSize;\n            changed = true;\n          }\n        }\n      }\n    }\n\n    // table セルの fontSize も縮小\n    if (n.type === \"table\") {\n      for (const row of n.rows) {\n        for (const cell of row.cells) {\n          if (cell.fontSize !== undefined) {\n            sawTarget = true;\n            const newSize = Math.max(\n              MIN_FONT_SIZE,\n              Math.round(cell.fontSize * ratio),\n            );\n            if (newSize !== cell.fontSize) {\n              cell.fontSize = newSize;\n              changed = true;\n            }\n          }\n        }\n      }\n    }\n  });\n\n  return toStrategyResult({ changed, sawTarget });\n}\n"],"mappings":";;;AAKA,MAAM,gBAAgB;AACtB,MAAM,YAAY;;;;;AAMlB,SAAgB,eACd,MACA,aACuB;CACvB,MAAM,QAAQ,KAAK,IAAI,aAAa,SAAS;CAC7C,IAAI,UAAU;CACd,IAAI,YAAY;CAEhB,YAAY,OAAO,MAAM;EACvB,IACE,EAAE,SAAS,UACX,EAAE,SAAS,WACX,EAAE,SAAS,QACX,EAAE,SAAS;OAEP,EAAE,aAAa,KAAA,GAAW;IAC5B,YAAY;IACZ,MAAM,UAAU,KAAK,IAAI,eAAe,KAAK,MAAM,EAAE,WAAW,KAAK,CAAC;IACtE,IAAI,YAAY,EAAE,UAAU;KAC1B,EAAE,WAAW;KACb,UAAU;IACZ;GACF;;EAIF,IAAI,EAAE,SAAS,QAAQ,EAAE,SAAS;QAC3B,MAAM,QAAQ,EAAE,OACnB,IAAI,KAAK,aAAa,KAAA,GAAW;IAC/B,YAAY;IACZ,MAAM,UAAU,KAAK,IACnB,eACA,KAAK,MAAM,KAAK,WAAW,KAAK,CAClC;IACA,IAAI,YAAY,KAAK,UAAU;KAC7B,KAAK,WAAW;KAChB,UAAU;IACZ;GACF;;EAKJ,IAAI,EAAE,SAAS;QACR,MAAM,OAAO,EAAE,MAClB,KAAK,MAAM,QAAQ,IAAI,OACrB,IAAI,KAAK,aAAa,KAAA,GAAW;IAC/B,YAAY;IACZ,MAAM,UAAU,KAAK,IACnB,eACA,KAAK,MAAM,KAAK,WAAW,KAAK,CAClC;IACA,IAAI,YAAY,KAAK,UAAU;KAC7B,KAAK,WAAW;KAChB,UAAU;IACZ;GACF;;CAIR,CAAC;CAED,OAAO,iBAAiB;EAAE;EAAS;CAAU,CAAC;AAChD"}

package/dist/autoFit/strategies/reduceGapAndPadding.js

@@ -1,46 +1,39 @@
+import { mapBoxSpacing } from "../../shared/boxSpacing.js";
 import { walkPOMTree } from "../../shared/walkTree.js";
+import { toStrategyResult } from "../strategyResult.js";
 //#region src/autoFit/strategies/reduceGapAndPadding.ts
 const MIN_GAP = 2;
 const MIN_PADDING = 2;
 const MIN_SCALE = .25;
 /**
 * gap と padding を縮小する。
-* @returns 変更があった場合 true
 */
 function reduceGapAndPadding(node, targetRatio) {
 	const ratio = Math.max(targetRatio, MIN_SCALE);
 	let changed = false;
+	let sawTarget = false;
 	walkPOMTree(node, (n) => {
 		if ((n.type === "vstack" || n.type === "hstack") && n.gap !== void 0) {
+			sawTarget = true;
 			const newGap = Math.max(MIN_GAP, Math.round(n.gap * ratio));
 			if (newGap !== n.gap) {
 				n.gap = newGap;
 				changed = true;
 			}
 		}
-		if (n.padding !== void 0) if (typeof n.padding === "number") {
-			const newPadding = Math.max(MIN_PADDING, Math.round(n.padding * ratio));
-			if (newPadding !== n.padding) {
-				n.padding = newPadding;
+		if (n.padding !== void 0) {
+			sawTarget = true;
+			const result = mapBoxSpacing(n.padding, (v) => Math.max(MIN_PADDING, Math.round(v * ratio)));
+			if (result.changed) {
+				n.padding = result.value;
 				changed = true;
 			}
-		} else for (const dir of [
-			"top",
-			"right",
-			"bottom",
-			"left"
-		]) {
-			const val = n.padding[dir];
-			if (val !== void 0) {
-				const newVal = Math.max(MIN_PADDING, Math.round(val * ratio));
-				if (newVal !== val) {
-					n.padding[dir] = newVal;
-					changed = true;
-				}
-			}
 		}
 	});
-	return changed;
+	return toStrategyResult({
+		changed,
+		sawTarget
+	});
 }
 //#endregion
 export { reduceGapAndPadding };

package/dist/autoFit/strategies/reduceGapAndPadding.js.map

@@ -1 +1 @@
-{"version":3,"file":"reduceGapAndPadding.js","names":[],"sources":["../../../src/autoFit/strategies/reduceGapAndPadding.ts"],"sourcesContent":["import type { POMNode } from \"../../types.ts\";\nimport { walkPOMTree } from \"../../shared/walkTree.ts\";\n\nconst MIN_GAP = 2;\nconst MIN_PADDING = 2;\nconst MIN_SCALE = 0.25;\n\n/**\n * gap と padding を縮小する。\n * @returns 変更があった場合 true\n */\nexport function reduceGapAndPadding(\n  node: POMNode,\n  targetRatio: number,\n): boolean {\n  const ratio = Math.max(targetRatio, MIN_SCALE);\n  let changed = false;\n\n  walkPOMTree(node, (n) => {\n    // gap の縮小（vstack, hstack）\n    if ((n.type === \"vstack\" || n.type === \"hstack\") && n.gap !== undefined) {\n      const newGap = Math.max(MIN_GAP, Math.round(n.gap * ratio));\n      if (newGap !== n.gap) {\n        n.gap = newGap;\n        changed = true;\n      }\n    }\n\n    // padding の縮小\n    if (n.padding !== undefined) {\n      if (typeof n.padding === \"number\") {\n        const newPadding = Math.max(MIN_PADDING, Math.round(n.padding * ratio));\n        if (newPadding !== n.padding) {\n          n.padding = newPadding;\n          changed = true;\n        }\n      } else {\n        const dirs = [\"top\", \"right\", \"bottom\", \"left\"] as const;\n        for (const dir of dirs) {\n          const val = n.padding[dir];\n          if (val !== undefined) {\n            const newVal = Math.max(MIN_PADDING, Math.round(val * ratio));\n            if (newVal !== val) {\n              n.padding[dir] = newVal;\n              changed = true;\n            }\n          }\n        }\n      }\n    }\n  });\n\n  return changed;\n}\n"],"mappings":";;AAGA,MAAM,UAAU;AAChB,MAAM,cAAc;AACpB,MAAM,YAAY;;;;;AAMlB,SAAgB,oBACd,MACA,aACS;CACT,MAAM,QAAQ,KAAK,IAAI,aAAa,SAAS;CAC7C,IAAI,UAAU;CAEd,YAAY,OAAO,MAAM;EAEvB,KAAK,EAAE,SAAS,YAAY,EAAE,SAAS,aAAa,EAAE,QAAQ,KAAA,GAAW;GACvE,MAAM,SAAS,KAAK,IAAI,SAAS,KAAK,MAAM,EAAE,MAAM,KAAK,CAAC;GAC1D,IAAI,WAAW,EAAE,KAAK;IACpB,EAAE,MAAM;IACR,UAAU;GACZ;EACF;EAGA,IAAI,EAAE,YAAY,KAAA,GAChB,IAAI,OAAO,EAAE,YAAY,UAAU;GACjC,MAAM,aAAa,KAAK,IAAI,aAAa,KAAK,MAAM,EAAE,UAAU,KAAK,CAAC;GACtE,IAAI,eAAe,EAAE,SAAS;IAC5B,EAAE,UAAU;IACZ,UAAU;GACZ;EACF,OAEE,KAAK,MAAM,OAAO;GADJ;GAAO;GAAS;GAAU;EACnB,GAAG;GACtB,MAAM,MAAM,EAAE,QAAQ;GACtB,IAAI,QAAQ,KAAA,GAAW;IACrB,MAAM,SAAS,KAAK,IAAI,aAAa,KAAK,MAAM,MAAM,KAAK,CAAC;IAC5D,IAAI,WAAW,KAAK;KAClB,EAAE,QAAQ,OAAO;KACjB,UAAU;IACZ;GACF;EACF;CAGN,CAAC;CAED,OAAO;AACT"}
+{"version":3,"file":"reduceGapAndPadding.js","names":[],"sources":["../../../src/autoFit/strategies/reduceGapAndPadding.ts"],"sourcesContent":["import type { POMNode } from \"../../types.ts\";\nimport { walkPOMTree } from \"../../shared/walkTree.ts\";\nimport { mapBoxSpacing } from \"../../shared/boxSpacing.ts\";\nimport type { AutoFitStrategyResult } from \"../strategyResult.ts\";\nimport { toStrategyResult } from \"../strategyResult.ts\";\n\nconst MIN_GAP = 2;\nconst MIN_PADDING = 2;\nconst MIN_SCALE = 0.25;\n\n/**\n * gap と padding を縮小する。\n */\nexport function reduceGapAndPadding(\n  node: POMNode,\n  targetRatio: number,\n): AutoFitStrategyResult {\n  const ratio = Math.max(targetRatio, MIN_SCALE);\n  let changed = false;\n  let sawTarget = false;\n\n  walkPOMTree(node, (n) => {\n    // gap の縮小（vstack, hstack）\n    if ((n.type === \"vstack\" || n.type === \"hstack\") && n.gap !== undefined) {\n      sawTarget = true;\n      const newGap = Math.max(MIN_GAP, Math.round(n.gap * ratio));\n      if (newGap !== n.gap) {\n        n.gap = newGap;\n        changed = true;\n      }\n    }\n\n    // padding の縮小\n    if (n.padding !== undefined) {\n      sawTarget = true;\n      const result = mapBoxSpacing(n.padding, (v) =>\n        Math.max(MIN_PADDING, Math.round(v * ratio)),\n      );\n      if (result.changed) {\n        n.padding = result.value;\n        changed = true;\n      }\n    }\n  });\n\n  return toStrategyResult({ changed, sawTarget });\n}\n"],"mappings":";;;;AAMA,MAAM,UAAU;AAChB,MAAM,cAAc;AACpB,MAAM,YAAY;;;;AAKlB,SAAgB,oBACd,MACA,aACuB;CACvB,MAAM,QAAQ,KAAK,IAAI,aAAa,SAAS;CAC7C,IAAI,UAAU;CACd,IAAI,YAAY;CAEhB,YAAY,OAAO,MAAM;EAEvB,KAAK,EAAE,SAAS,YAAY,EAAE,SAAS,aAAa,EAAE,QAAQ,KAAA,GAAW;GACvE,YAAY;GACZ,MAAM,SAAS,KAAK,IAAI,SAAS,KAAK,MAAM,EAAE,MAAM,KAAK,CAAC;GAC1D,IAAI,WAAW,EAAE,KAAK;IACpB,EAAE,MAAM;IACR,UAAU;GACZ;EACF;EAGA,IAAI,EAAE,YAAY,KAAA,GAAW;GAC3B,YAAY;GACZ,MAAM,SAAS,cAAc,EAAE,UAAU,MACvC,KAAK,IAAI,aAAa,KAAK,MAAM,IAAI,KAAK,CAAC,CAC7C;GACA,IAAI,OAAO,SAAS;IAClB,EAAE,UAAU,OAAO;IACnB,UAAU;GACZ;EACF;CACF,CAAC;CAED,OAAO,iBAAiB;EAAE;EAAS;CAAU,CAAC;AAChD"}

package/dist/autoFit/strategies/reduceTableRowHeight.js

@@ -1,17 +1,19 @@
 import { walkPOMTree } from "../../shared/walkTree.js";
+import { toStrategyResult } from "../strategyResult.js";
 //#region src/autoFit/strategies/reduceTableRowHeight.ts
 const MIN_ROW_HEIGHT = 20;
 const MIN_SCALE = .5;
 /**
 * テーブルの defaultRowHeight と各行の height を縮小する。
-* @returns 変更があった場合 true
 */
 function reduceTableRowHeight(node, targetRatio) {
 	const ratio = Math.max(targetRatio, MIN_SCALE);
 	let changed = false;
+	let sawTarget = false;
 	walkPOMTree(node, (n) => {
 		if (n.type !== "table") return;
 		if (n.defaultRowHeight !== void 0) {
+			sawTarget = true;
 			const newHeight = Math.max(MIN_ROW_HEIGHT, Math.round(n.defaultRowHeight * ratio));
 			if (newHeight !== n.defaultRowHeight) {
 				n.defaultRowHeight = newHeight;
@@ -19,6 +21,7 @@ function reduceTableRowHeight(node, targetRatio) {
 			}
 		}
 		for (const row of n.rows) if (row.height !== void 0) {
+			sawTarget = true;
 			const newHeight = Math.max(MIN_ROW_HEIGHT, Math.round(row.height * ratio));
 			if (newHeight !== row.height) {
 				row.height = newHeight;
@@ -26,7 +29,10 @@ function reduceTableRowHeight(node, targetRatio) {
 			}
 		}
 	});
-	return changed;
+	return toStrategyResult({
+		changed,
+		sawTarget
+	});
 }
 //#endregion
 export { reduceTableRowHeight };

package/dist/autoFit/strategies/reduceTableRowHeight.js.map

@@ -1 +1 @@
-{"version":3,"file":"reduceTableRowHeight.js","names":[],"sources":["../../../src/autoFit/strategies/reduceTableRowHeight.ts"],"sourcesContent":["import type { POMNode } from \"../../types.ts\";\nimport { walkPOMTree } from \"../../shared/walkTree.ts\";\n\nconst MIN_ROW_HEIGHT = 20;\nconst MIN_SCALE = 0.5;\n\n/**\n * テーブルの defaultRowHeight と各行の height を縮小する。\n * @returns 変更があった場合 true\n */\nexport function reduceTableRowHeight(\n  node: POMNode,\n  targetRatio: number,\n): boolean {\n  const ratio = Math.max(targetRatio, MIN_SCALE);\n  let changed = false;\n\n  walkPOMTree(node, (n) => {\n    if (n.type !== \"table\") return;\n\n    if (n.defaultRowHeight !== undefined) {\n      const newHeight = Math.max(\n        MIN_ROW_HEIGHT,\n        Math.round(n.defaultRowHeight * ratio),\n      );\n      if (newHeight !== n.defaultRowHeight) {\n        n.defaultRowHeight = newHeight;\n        changed = true;\n      }\n    }\n\n    for (const row of n.rows) {\n      if (row.height !== undefined) {\n        const newHeight = Math.max(\n          MIN_ROW_HEIGHT,\n          Math.round(row.height * ratio),\n        );\n        if (newHeight !== row.height) {\n          row.height = newHeight;\n          changed = true;\n        }\n      }\n    }\n  });\n\n  return changed;\n}\n"],"mappings":";;AAGA,MAAM,iBAAiB;AACvB,MAAM,YAAY;;;;;AAMlB,SAAgB,qBACd,MACA,aACS;CACT,MAAM,QAAQ,KAAK,IAAI,aAAa,SAAS;CAC7C,IAAI,UAAU;CAEd,YAAY,OAAO,MAAM;EACvB,IAAI,EAAE,SAAS,SAAS;EAExB,IAAI,EAAE,qBAAqB,KAAA,GAAW;GACpC,MAAM,YAAY,KAAK,IACrB,gBACA,KAAK,MAAM,EAAE,mBAAmB,KAAK,CACvC;GACA,IAAI,cAAc,EAAE,kBAAkB;IACpC,EAAE,mBAAmB;IACrB,UAAU;GACZ;EACF;EAEA,KAAK,MAAM,OAAO,EAAE,MAClB,IAAI,IAAI,WAAW,KAAA,GAAW;GAC5B,MAAM,YAAY,KAAK,IACrB,gBACA,KAAK,MAAM,IAAI,SAAS,KAAK,CAC/B;GACA,IAAI,cAAc,IAAI,QAAQ;IAC5B,IAAI,SAAS;IACb,UAAU;GACZ;EACF;CAEJ,CAAC;CAED,OAAO;AACT"}
+{"version":3,"file":"reduceTableRowHeight.js","names":[],"sources":["../../../src/autoFit/strategies/reduceTableRowHeight.ts"],"sourcesContent":["import type { POMNode } from \"../../types.ts\";\nimport { walkPOMTree } from \"../../shared/walkTree.ts\";\nimport type { AutoFitStrategyResult } from \"../strategyResult.ts\";\nimport { toStrategyResult } from \"../strategyResult.ts\";\n\nconst MIN_ROW_HEIGHT = 20;\nconst MIN_SCALE = 0.5;\n\n/**\n * テーブルの defaultRowHeight と各行の height を縮小する。\n */\nexport function reduceTableRowHeight(\n  node: POMNode,\n  targetRatio: number,\n): AutoFitStrategyResult {\n  const ratio = Math.max(targetRatio, MIN_SCALE);\n  let changed = false;\n  let sawTarget = false;\n\n  walkPOMTree(node, (n) => {\n    if (n.type !== \"table\") return;\n\n    if (n.defaultRowHeight !== undefined) {\n      sawTarget = true;\n      const newHeight = Math.max(\n        MIN_ROW_HEIGHT,\n        Math.round(n.defaultRowHeight * ratio),\n      );\n      if (newHeight !== n.defaultRowHeight) {\n        n.defaultRowHeight = newHeight;\n        changed = true;\n      }\n    }\n\n    for (const row of n.rows) {\n      if (row.height !== undefined) {\n        sawTarget = true;\n        const newHeight = Math.max(\n          MIN_ROW_HEIGHT,\n          Math.round(row.height * ratio),\n        );\n        if (newHeight !== row.height) {\n          row.height = newHeight;\n          changed = true;\n        }\n      }\n    }\n  });\n\n  return toStrategyResult({ changed, sawTarget });\n}\n"],"mappings":";;;AAKA,MAAM,iBAAiB;AACvB,MAAM,YAAY;;;;AAKlB,SAAgB,qBACd,MACA,aACuB;CACvB,MAAM,QAAQ,KAAK,IAAI,aAAa,SAAS;CAC7C,IAAI,UAAU;CACd,IAAI,YAAY;CAEhB,YAAY,OAAO,MAAM;EACvB,IAAI,EAAE,SAAS,SAAS;EAExB,IAAI,EAAE,qBAAqB,KAAA,GAAW;GACpC,YAAY;GACZ,MAAM,YAAY,KAAK,IACrB,gBACA,KAAK,MAAM,EAAE,mBAAmB,KAAK,CACvC;GACA,IAAI,cAAc,EAAE,kBAAkB;IACpC,EAAE,mBAAmB;IACrB,UAAU;GACZ;EACF;EAEA,KAAK,MAAM,OAAO,EAAE,MAClB,IAAI,IAAI,WAAW,KAAA,GAAW;GAC5B,YAAY;GACZ,MAAM,YAAY,KAAK,IACrB,gBACA,KAAK,MAAM,IAAI,SAAS,KAAK,CAC/B;GACA,IAAI,cAAc,IAAI,QAAQ;IAC5B,IAAI,SAAS;IACb,UAAU;GACZ;EACF;CAEJ,CAAC;CAED,OAAO,iBAAiB;EAAE;EAAS;CAAU,CAAC;AAChD"}

package/dist/autoFit/strategies/uniformScale.js

@@ -1,4 +1,6 @@
+import { mapBoxSpacing } from "../../shared/boxSpacing.js";
 import { walkPOMTree } from "../../shared/walkTree.js";
+import { toStrategyResult } from "../strategyResult.js";
 //#region src/autoFit/strategies/uniformScale.ts
 const MIN_SCALE = .5;
 function scaleNumber(value, ratio, min) {
@@ -6,13 +8,14 @@ function scaleNumber(value, ratio, min) {
 }
 /**
 * 全サイズ関連プロパティを一律スケーリングする（フォールバック）。
-* @returns 変更があった場合 true
 */
 function uniformScale(node, targetRatio) {
 	const ratio = Math.max(targetRatio, MIN_SCALE);
 	let changed = false;
+	let sawTarget = false;
 	walkPOMTree(node, (n) => {
 		if ("fontSize" in n && typeof n.fontSize === "number") {
+			sawTarget = true;
 			const newVal = scaleNumber(n.fontSize, ratio, 8);
 			if (newVal !== n.fontSize) {
 				n.fontSize = newVal;
@@ -20,35 +23,24 @@ function uniformScale(node, targetRatio) {
 			}
 		}
 		if ((n.type === "vstack" || n.type === "hstack") && n.gap !== void 0) {
+			sawTarget = true;
 			const newVal = scaleNumber(n.gap, ratio, 1);
 			if (newVal !== n.gap) {
 				n.gap = newVal;
 				changed = true;
 			}
 		}
-		if (n.padding !== void 0) if (typeof n.padding === "number") {
-			const newVal = scaleNumber(n.padding, ratio, 1);
-			if (newVal !== n.padding) {
-				n.padding = newVal;
+		if (n.padding !== void 0) {
+			sawTarget = true;
+			const result = mapBoxSpacing(n.padding, (v) => scaleNumber(v, ratio, 1));
+			if (result.changed) {
+				n.padding = result.value;
 				changed = true;
 			}
-		} else for (const dir of [
-			"top",
-			"right",
-			"bottom",
-			"left"
-		]) {
-			const val = n.padding[dir];
-			if (val !== void 0) {
-				const newVal = scaleNumber(val, ratio, 1);
-				if (newVal !== val) {
-					n.padding[dir] = newVal;
-					changed = true;
-				}
-			}
 		}
 		if (n.type === "table") {
 			if (n.defaultRowHeight !== void 0) {
+				sawTarget = true;
 				const newVal = scaleNumber(n.defaultRowHeight, ratio, 16);
 				if (newVal !== n.defaultRowHeight) {
 					n.defaultRowHeight = newVal;
@@ -56,6 +48,7 @@ function uniformScale(node, targetRatio) {
 				}
 			}
 			for (const row of n.rows) if (row.height !== void 0) {
+				sawTarget = true;
 				const newVal = scaleNumber(row.height, ratio, 16);
 				if (newVal !== row.height) {
 					row.height = newVal;
@@ -65,6 +58,7 @@ function uniformScale(node, targetRatio) {
 		}
 		if (n.type === "ul" || n.type === "ol") {
 			for (const item of n.items) if (item.fontSize !== void 0) {
+				sawTarget = true;
 				const newVal = scaleNumber(item.fontSize, ratio, 8);
 				if (newVal !== item.fontSize) {
 					item.fontSize = newVal;
@@ -73,6 +67,7 @@ function uniformScale(node, targetRatio) {
 			}
 		}
 		if (n.type === "icon" && n.size !== void 0) {
+			sawTarget = true;
 			const newVal = scaleNumber(n.size, ratio, 8);
 			if (newVal !== n.size) {
 				n.size = newVal;
@@ -81,6 +76,7 @@ function uniformScale(node, targetRatio) {
 		}
 		if (n.type === "table") {
 			for (const row of n.rows) for (const cell of row.cells) if (cell.fontSize !== void 0) {
+				sawTarget = true;
 				const newVal = scaleNumber(cell.fontSize, ratio, 8);
 				if (newVal !== cell.fontSize) {
 					cell.fontSize = newVal;
@@ -89,7 +85,10 @@ function uniformScale(node, targetRatio) {
 			}
 		}
 	});
-	return changed;
+	return toStrategyResult({
+		changed,
+		sawTarget
+	});
 }
 //#endregion
 export { uniformScale };

package/dist/autoFit/strategies/uniformScale.js.map

@@ -1 +1 @@
-{"version":3,"file":"uniformScale.js","names":[],"sources":["../../../src/autoFit/strategies/uniformScale.ts"],"sourcesContent":["import type { POMNode } from \"../../types.ts\";\nimport { walkPOMTree } from \"../../shared/walkTree.ts\";\n\nconst MIN_SCALE = 0.5;\n\nfunction scaleNumber(value: number, ratio: number, min: number): number {\n  return Math.max(min, Math.round(value * ratio));\n}\n\n/**\n * 全サイズ関連プロパティを一律スケーリングする（フォールバック）。\n * @returns 変更があった場合 true\n */\nexport function uniformScale(node: POMNode, targetRatio: number): boolean {\n  const ratio = Math.max(targetRatio, MIN_SCALE);\n  let changed = false;\n\n  walkPOMTree(node, (n) => {\n    // fontSize\n    if (\"fontSize\" in n && typeof n.fontSize === \"number\") {\n      const newVal = scaleNumber(n.fontSize, ratio, 8);\n      if (newVal !== n.fontSize) {\n        (n as { fontSize: number }).fontSize = newVal;\n        changed = true;\n      }\n    }\n\n    // gap (vstack/hstack)\n    if ((n.type === \"vstack\" || n.type === \"hstack\") && n.gap !== undefined) {\n      const newVal = scaleNumber(n.gap, ratio, 1);\n      if (newVal !== n.gap) {\n        n.gap = newVal;\n        changed = true;\n      }\n    }\n\n    // padding\n    if (n.padding !== undefined) {\n      if (typeof n.padding === \"number\") {\n        const newVal = scaleNumber(n.padding, ratio, 1);\n        if (newVal !== n.padding) {\n          n.padding = newVal;\n          changed = true;\n        }\n      } else {\n        const dirs = [\"top\", \"right\", \"bottom\", \"left\"] as const;\n        for (const dir of dirs) {\n          const val = n.padding[dir];\n          if (val !== undefined) {\n            const newVal = scaleNumber(val, ratio, 1);\n            if (newVal !== val) {\n              n.padding[dir] = newVal;\n              changed = true;\n            }\n          }\n        }\n      }\n    }\n\n    // table: defaultRowHeight, row.height\n    if (n.type === \"table\") {\n      if (n.defaultRowHeight !== undefined) {\n        const newVal = scaleNumber(n.defaultRowHeight, ratio, 16);\n        if (newVal !== n.defaultRowHeight) {\n          n.defaultRowHeight = newVal;\n          changed = true;\n        }\n      }\n      for (const row of n.rows) {\n        if (row.height !== undefined) {\n          const newVal = scaleNumber(row.height, ratio, 16);\n          if (newVal !== row.height) {\n            row.height = newVal;\n            changed = true;\n          }\n        }\n      }\n    }\n\n    // ul/ol items fontSize\n    if (n.type === \"ul\" || n.type === \"ol\") {\n      for (const item of n.items) {\n        if (item.fontSize !== undefined) {\n          const newVal = scaleNumber(item.fontSize, ratio, 8);\n          if (newVal !== item.fontSize) {\n            item.fontSize = newVal;\n            changed = true;\n          }\n        }\n      }\n    }\n\n    // icon size\n    if (n.type === \"icon\" && n.size !== undefined) {\n      const newVal = scaleNumber(n.size, ratio, 8);\n      if (newVal !== n.size) {\n        n.size = newVal;\n        changed = true;\n      }\n    }\n\n    // table cells fontSize\n    if (n.type === \"table\") {\n      for (const row of n.rows) {\n        for (const cell of row.cells) {\n          if (cell.fontSize !== undefined) {\n            const newVal = scaleNumber(cell.fontSize, ratio, 8);\n            if (newVal !== cell.fontSize) {\n              cell.fontSize = newVal;\n              changed = true;\n            }\n          }\n        }\n      }\n    }\n  });\n\n  return changed;\n}\n"],"mappings":";;AAGA,MAAM,YAAY;AAElB,SAAS,YAAY,OAAe,OAAe,KAAqB;CACtE,OAAO,KAAK,IAAI,KAAK,KAAK,MAAM,QAAQ,KAAK,CAAC;AAChD;;;;;AAMA,SAAgB,aAAa,MAAe,aAA8B;CACxE,MAAM,QAAQ,KAAK,IAAI,aAAa,SAAS;CAC7C,IAAI,UAAU;CAEd,YAAY,OAAO,MAAM;EAEvB,IAAI,cAAc,KAAK,OAAO,EAAE,aAAa,UAAU;GACrD,MAAM,SAAS,YAAY,EAAE,UAAU,OAAO,CAAC;GAC/C,IAAI,WAAW,EAAE,UAAU;IACzB,EAA4B,WAAW;IACvC,UAAU;GACZ;EACF;EAGA,KAAK,EAAE,SAAS,YAAY,EAAE,SAAS,aAAa,EAAE,QAAQ,KAAA,GAAW;GACvE,MAAM,SAAS,YAAY,EAAE,KAAK,OAAO,CAAC;GAC1C,IAAI,WAAW,EAAE,KAAK;IACpB,EAAE,MAAM;IACR,UAAU;GACZ;EACF;EAGA,IAAI,EAAE,YAAY,KAAA,GAChB,IAAI,OAAO,EAAE,YAAY,UAAU;GACjC,MAAM,SAAS,YAAY,EAAE,SAAS,OAAO,CAAC;GAC9C,IAAI,WAAW,EAAE,SAAS;IACxB,EAAE,UAAU;IACZ,UAAU;GACZ;EACF,OAEE,KAAK,MAAM,OAAO;GADJ;GAAO;GAAS;GAAU;EACnB,GAAG;GACtB,MAAM,MAAM,EAAE,QAAQ;GACtB,IAAI,QAAQ,KAAA,GAAW;IACrB,MAAM,SAAS,YAAY,KAAK,OAAO,CAAC;IACxC,IAAI,WAAW,KAAK;KAClB,EAAE,QAAQ,OAAO;KACjB,UAAU;IACZ;GACF;EACF;EAKJ,IAAI,EAAE,SAAS,SAAS;GACtB,IAAI,EAAE,qBAAqB,KAAA,GAAW;IACpC,MAAM,SAAS,YAAY,EAAE,kBAAkB,OAAO,EAAE;IACxD,IAAI,WAAW,EAAE,kBAAkB;KACjC,EAAE,mBAAmB;KACrB,UAAU;IACZ;GACF;GACA,KAAK,MAAM,OAAO,EAAE,MAClB,IAAI,IAAI,WAAW,KAAA,GAAW;IAC5B,MAAM,SAAS,YAAY,IAAI,QAAQ,OAAO,EAAE;IAChD,IAAI,WAAW,IAAI,QAAQ;KACzB,IAAI,SAAS;KACb,UAAU;IACZ;GACF;EAEJ;EAGA,IAAI,EAAE,SAAS,QAAQ,EAAE,SAAS;QAC3B,MAAM,QAAQ,EAAE,OACnB,IAAI,KAAK,aAAa,KAAA,GAAW;IAC/B,MAAM,SAAS,YAAY,KAAK,UAAU,OAAO,CAAC;IAClD,IAAI,WAAW,KAAK,UAAU;KAC5B,KAAK,WAAW;KAChB,UAAU;IACZ;GACF;;EAKJ,IAAI,EAAE,SAAS,UAAU,EAAE,SAAS,KAAA,GAAW;GAC7C,MAAM,SAAS,YAAY,EAAE,MAAM,OAAO,CAAC;GAC3C,IAAI,WAAW,EAAE,MAAM;IACrB,EAAE,OAAO;IACT,UAAU;GACZ;EACF;EAGA,IAAI,EAAE,SAAS;QACR,MAAM,OAAO,EAAE,MAClB,KAAK,MAAM,QAAQ,IAAI,OACrB,IAAI,KAAK,aAAa,KAAA,GAAW;IAC/B,MAAM,SAAS,YAAY,KAAK,UAAU,OAAO,CAAC;IAClD,IAAI,WAAW,KAAK,UAAU;KAC5B,KAAK,WAAW;KAChB,UAAU;IACZ;GACF;;CAIR,CAAC;CAED,OAAO;AACT"}
+{"version":3,"file":"uniformScale.js","names":[],"sources":["../../../src/autoFit/strategies/uniformScale.ts"],"sourcesContent":["import type { POMNode } from \"../../types.ts\";\nimport { walkPOMTree } from \"../../shared/walkTree.ts\";\nimport { mapBoxSpacing } from \"../../shared/boxSpacing.ts\";\nimport type { AutoFitStrategyResult } from \"../strategyResult.ts\";\nimport { toStrategyResult } from \"../strategyResult.ts\";\n\nconst MIN_SCALE = 0.5;\n\nfunction scaleNumber(value: number, ratio: number, min: number): number {\n  return Math.max(min, Math.round(value * ratio));\n}\n\n/**\n * 全サイズ関連プロパティを一律スケーリングする（フォールバック）。\n */\nexport function uniformScale(\n  node: POMNode,\n  targetRatio: number,\n): AutoFitStrategyResult {\n  const ratio = Math.max(targetRatio, MIN_SCALE);\n  let changed = false;\n  let sawTarget = false;\n\n  walkPOMTree(node, (n) => {\n    // fontSize\n    if (\"fontSize\" in n && typeof n.fontSize === \"number\") {\n      sawTarget = true;\n      const newVal = scaleNumber(n.fontSize, ratio, 8);\n      if (newVal !== n.fontSize) {\n        (n as { fontSize: number }).fontSize = newVal;\n        changed = true;\n      }\n    }\n\n    // gap (vstack/hstack)\n    if ((n.type === \"vstack\" || n.type === \"hstack\") && n.gap !== undefined) {\n      sawTarget = true;\n      const newVal = scaleNumber(n.gap, ratio, 1);\n      if (newVal !== n.gap) {\n        n.gap = newVal;\n        changed = true;\n      }\n    }\n\n    // padding\n    if (n.padding !== undefined) {\n      sawTarget = true;\n      const result = mapBoxSpacing(n.padding, (v) => scaleNumber(v, ratio, 1));\n      if (result.changed) {\n        n.padding = result.value;\n        changed = true;\n      }\n    }\n\n    // table: defaultRowHeight, row.height\n    if (n.type === \"table\") {\n      if (n.defaultRowHeight !== undefined) {\n        sawTarget = true;\n        const newVal = scaleNumber(n.defaultRowHeight, ratio, 16);\n        if (newVal !== n.defaultRowHeight) {\n          n.defaultRowHeight = newVal;\n          changed = true;\n        }\n      }\n      for (const row of n.rows) {\n        if (row.height !== undefined) {\n          sawTarget = true;\n          const newVal = scaleNumber(row.height, ratio, 16);\n          if (newVal !== row.height) {\n            row.height = newVal;\n            changed = true;\n          }\n        }\n      }\n    }\n\n    // ul/ol items fontSize\n    if (n.type === \"ul\" || n.type === \"ol\") {\n      for (const item of n.items) {\n        if (item.fontSize !== undefined) {\n          sawTarget = true;\n          const newVal = scaleNumber(item.fontSize, ratio, 8);\n          if (newVal !== item.fontSize) {\n            item.fontSize = newVal;\n            changed = true;\n          }\n        }\n      }\n    }\n\n    // icon size\n    if (n.type === \"icon\" && n.size !== undefined) {\n      sawTarget = true;\n      const newVal = scaleNumber(n.size, ratio, 8);\n      if (newVal !== n.size) {\n        n.size = newVal;\n        changed = true;\n      }\n    }\n\n    // table cells fontSize\n    if (n.type === \"table\") {\n      for (const row of n.rows) {\n        for (const cell of row.cells) {\n          if (cell.fontSize !== undefined) {\n            sawTarget = true;\n            const newVal = scaleNumber(cell.fontSize, ratio, 8);\n            if (newVal !== cell.fontSize) {\n              cell.fontSize = newVal;\n              changed = true;\n            }\n          }\n        }\n      }\n    }\n  });\n\n  return toStrategyResult({ changed, sawTarget });\n}\n"],"mappings":";;;;AAMA,MAAM,YAAY;AAElB,SAAS,YAAY,OAAe,OAAe,KAAqB;CACtE,OAAO,KAAK,IAAI,KAAK,KAAK,MAAM,QAAQ,KAAK,CAAC;AAChD;;;;AAKA,SAAgB,aACd,MACA,aACuB;CACvB,MAAM,QAAQ,KAAK,IAAI,aAAa,SAAS;CAC7C,IAAI,UAAU;CACd,IAAI,YAAY;CAEhB,YAAY,OAAO,MAAM;EAEvB,IAAI,cAAc,KAAK,OAAO,EAAE,aAAa,UAAU;GACrD,YAAY;GACZ,MAAM,SAAS,YAAY,EAAE,UAAU,OAAO,CAAC;GAC/C,IAAI,WAAW,EAAE,UAAU;IACzB,EAA4B,WAAW;IACvC,UAAU;GACZ;EACF;EAGA,KAAK,EAAE,SAAS,YAAY,EAAE,SAAS,aAAa,EAAE,QAAQ,KAAA,GAAW;GACvE,YAAY;GACZ,MAAM,SAAS,YAAY,EAAE,KAAK,OAAO,CAAC;GAC1C,IAAI,WAAW,EAAE,KAAK;IACpB,EAAE,MAAM;IACR,UAAU;GACZ;EACF;EAGA,IAAI,EAAE,YAAY,KAAA,GAAW;GAC3B,YAAY;GACZ,MAAM,SAAS,cAAc,EAAE,UAAU,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC;GACvE,IAAI,OAAO,SAAS;IAClB,EAAE,UAAU,OAAO;IACnB,UAAU;GACZ;EACF;EAGA,IAAI,EAAE,SAAS,SAAS;GACtB,IAAI,EAAE,qBAAqB,KAAA,GAAW;IACpC,YAAY;IACZ,MAAM,SAAS,YAAY,EAAE,kBAAkB,OAAO,EAAE;IACxD,IAAI,WAAW,EAAE,kBAAkB;KACjC,EAAE,mBAAmB;KACrB,UAAU;IACZ;GACF;GACA,KAAK,MAAM,OAAO,EAAE,MAClB,IAAI,IAAI,WAAW,KAAA,GAAW;IAC5B,YAAY;IACZ,MAAM,SAAS,YAAY,IAAI,QAAQ,OAAO,EAAE;IAChD,IAAI,WAAW,IAAI,QAAQ;KACzB,IAAI,SAAS;KACb,UAAU;IACZ;GACF;EAEJ;EAGA,IAAI,EAAE,SAAS,QAAQ,EAAE,SAAS;QAC3B,MAAM,QAAQ,EAAE,OACnB,IAAI,KAAK,aAAa,KAAA,GAAW;IAC/B,YAAY;IACZ,MAAM,SAAS,YAAY,KAAK,UAAU,OAAO,CAAC;IAClD,IAAI,WAAW,KAAK,UAAU;KAC5B,KAAK,WAAW;KAChB,UAAU;IACZ;GACF;;EAKJ,IAAI,EAAE,SAAS,UAAU,EAAE,SAAS,KAAA,GAAW;GAC7C,YAAY;GACZ,MAAM,SAAS,YAAY,EAAE,MAAM,OAAO,CAAC;GAC3C,IAAI,WAAW,EAAE,MAAM;IACrB,EAAE,OAAO;IACT,UAAU;GACZ;EACF;EAGA,IAAI,EAAE,SAAS;QACR,MAAM,OAAO,EAAE,MAClB,KAAK,MAAM,QAAQ,IAAI,OACrB,IAAI,KAAK,aAAa,KAAA,GAAW;IAC/B,YAAY;IACZ,MAAM,SAAS,YAAY,KAAK,UAAU,OAAO,CAAC;IAClD,IAAI,WAAW,KAAK,UAAU;KAC5B,KAAK,WAAW;KAChB,UAAU;IACZ;GACF;;CAIR,CAAC;CAED,OAAO,iBAAiB;EAAE;EAAS;CAAU,CAAC;AAChD"}

package/dist/autoFit/strategyResult.js

@@ -0,0 +1,15 @@
+//#region src/autoFit/strategyResult.ts
+/**
+* strategy 内部で集計した「変更有無」「調整対象の有無」から共通 result を組み立てる。
+*/
+function toStrategyResult(params) {
+	if (params.changed) return { changed: true };
+	return {
+		changed: false,
+		reason: params.sawTarget ? "no-effective-change" : "no-target"
+	};
+}
+//#endregion
+export { toStrategyResult };
+
+//# sourceMappingURL=strategyResult.js.map

package/dist/autoFit/strategyResult.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"strategyResult.js","names":[],"sources":["../../src/autoFit/strategyResult.ts"],"sourcesContent":["/** AutoFit strategy が変更を適用できなかった理由 */\nexport type AutoFitSkipReason =\n  /** 調整対象となる属性を持つノードが存在しない */\n  | \"no-target\"\n  /** 調整対象はあるが、下限値への到達や丸めにより値が変化しなかった */\n  | \"no-effective-change\";\n\n/** AutoFit strategy の適用結果 */\nexport type AutoFitStrategyResult =\n  | { changed: true }\n  | { changed: false; reason: AutoFitSkipReason };\n\n/**\n * strategy 内部で集計した「変更有無」「調整対象の有無」から共通 result を組み立てる。\n */\nexport function toStrategyResult(params: {\n  changed: boolean;\n  sawTarget: boolean;\n}): AutoFitStrategyResult {\n  if (params.changed) {\n    return { changed: true };\n  }\n  return {\n    changed: false,\n    reason: params.sawTarget ? \"no-effective-change\" : \"no-target\",\n  };\n}\n"],"mappings":";;;;AAeA,SAAgB,iBAAiB,QAGP;CACxB,IAAI,OAAO,SACT,OAAO,EAAE,SAAS,KAAK;CAEzB,OAAO;EACL,SAAS;EACT,QAAQ,OAAO,YAAY,wBAAwB;CACrD;AACF"}

package/dist/buildPptx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildPptx.d.ts","names":[],"sources":["../src/buildPptx.ts"],"mappings":";;;;;UAkBiB,eAAA;EACf,IAAA,sBAA0B,OAAA;EAC1B,WAAA,EAAa,UAAU;AAAA;AAAA,iBAGH,SAAA,CACpB,GAAA,UACA,SAAA;EAAa,CAAA;EAAW,CAAA;AAAA,GACxB,OAAA;EACE,MAAA,GAAS,kBAAA;EACT,UAAA,GAAa,WAAA,GAAc,UAAA;EAC3B,eAAA,GAAkB,mBAAA;EAClB,OAAA;EACA,MAAA;AAAA,IAED,OAAA,CAAQ,eAAA"}
+{"version":3,"file":"buildPptx.d.ts","names":[],"sources":["../src/buildPptx.ts"],"mappings":";;;;;UAmBiB,eAAA;EACf,IAAA,sBAA0B,OAAA;EAC1B,WAAA,EAAa,UAAU;AAAA;AAAA,iBAGH,SAAA,CACpB,GAAA,UACA,SAAA;EAAa,CAAA;EAAW,CAAA;AAAA,GACxB,OAAA;EACE,MAAA,GAAS,kBAAA;EACT,UAAA,GAAa,WAAA,GAAc,UAAA;EAC3B,eAAA,GAAkB,mBAAA;EAClB,OAAA;EACA,MAAA;AAAA,IAED,OAAA,CAAQ,eAAA"}

package/dist/buildPptx.js

@@ -1,5 +1,4 @@
 import { freeYogaTree } from "./shared/freeYogaTree.js";
-import { toPositioned } from "./toPositioned/toPositioned.js";
 import { calcYogaLayout } from "./calcYogaLayout/calcYogaLayout.js";
 import { autoFitSlide } from "./autoFit/autoFit.js";
 import { DiagnosticsError } from "./diagnostics.js";
@@ -9,6 +8,8 @@ import { extractLayoutResults } from "./calcYogaLayout/types.js";
 import { parseMasterPptx } from "./parseMasterPptx.js";
 import { parseXml } from "./parseXml/parseXml.js";
 import { renderPptx } from "./renderPptx/renderPptx.js";
+import { toPositioned } from "./toPositioned/toPositioned.js";
+import { validatePositioned } from "./validatePositioned/validatePositioned.js";
 //#region src/buildPptx.ts
 async function buildPptx(xml, slideSize, options) {
 	const ctx = createBuildContext(options?.textMeasurement ?? "auto");
@@ -16,12 +17,13 @@ async function buildPptx(xml, slideSize, options) {
 	if (options?.master) ctx.gradientFills.reserveColors(JSON.stringify(options.master));
 	const nodes = parseXml(xml);
 	const positionedPages = [];
-	for (const node of nodes) {
+	for (const [slideIndex, node] of nodes.entries()) {
 		let map;
 		try {
 			if (options?.autoFit !== false) map = await autoFitSlide(node, slideSize, ctx);
 			else map = await calcYogaLayout(node, slideSize, ctx);
 			const positioned = await toPositioned(node, ctx, extractLayoutResults(map));
+			validatePositioned(positioned, slideSize, ctx, slideIndex);
 			positionedPages.push(positioned);
 		} finally {
 			if (map) freeYogaTree(map);

package/dist/buildPptx.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildPptx.js","names":[],"sources":["../src/buildPptx.ts"],"sourcesContent":["import { autoFitSlide } from \"./autoFit/autoFit.ts\";\nimport { createBuildContext } from \"./buildContext.ts\";\nimport { calcYogaLayout } from \"./calcYogaLayout/calcYogaLayout.ts\";\nimport type { TextMeasurementMode } from \"./calcYogaLayout/measureText.ts\";\nimport type { YogaNodeMap } from \"./calcYogaLayout/types.ts\";\nimport { extractLayoutResults } from \"./calcYogaLayout/types.ts\";\nimport type { Diagnostic } from \"./diagnostics.ts\";\nimport { DiagnosticsError } from \"./diagnostics.ts\";\nimport { parseMasterPptx } from \"./parseMasterPptx.ts\";\nimport { parseXml } from \"./parseXml/parseXml.ts\";\nimport { patchPptxWriteForGradientFills } from \"./renderPptx/gradientFills.ts\";\nimport { renderPptx } from \"./renderPptx/renderPptx.ts\";\nimport { freeYogaTree } from \"./shared/freeYogaTree.ts\";\nimport { toPositioned } from \"./toPositioned/toPositioned.ts\";\nimport { PositionedNode, SlideMasterOptions } from \"./types.ts\";\n\nexport type { TextMeasurementMode };\n\nexport interface BuildPptxResult {\n  pptx: import(\"pptxgenjs\").default;\n  diagnostics: Diagnostic[];\n}\n\nexport async function buildPptx(\n  xml: string,\n  slideSize: { w: number; h: number },\n  options?: {\n    master?: SlideMasterOptions;\n    masterPptx?: ArrayBuffer | Uint8Array;\n    textMeasurement?: TextMeasurementMode;\n    autoFit?: boolean;\n    strict?: boolean;\n  },\n): Promise<BuildPptxResult> {\n  const ctx = createBuildContext(options?.textMeasurement ?? \"auto\");\n\n  // グラデーション後処理のマーカー色がユーザー指定色と衝突しないよう、\n  // 入力 XML / master オプション中に現れる色を予約しておく\n  ctx.gradientFills.reserveColors(xml);\n  if (options?.master) {\n    ctx.gradientFills.reserveColors(JSON.stringify(options.master));\n  }\n\n  const nodes = parseXml(xml);\n  const positionedPages: PositionedNode[] = [];\n\n  for (const node of nodes) {\n    let map: YogaNodeMap | undefined;\n    try {\n      if (options?.autoFit !== false) {\n        map = await autoFitSlide(node, slideSize, ctx);\n      } else {\n        map = await calcYogaLayout(node, slideSize, ctx);\n      }\n      const layoutMap = extractLayoutResults(map);\n      const positioned = await toPositioned(node, ctx, layoutMap);\n      positionedPages.push(positioned);\n    } finally {\n      if (map) freeYogaTree(map);\n    }\n  }\n\n  // masterPptx から背景を抽出し、master オプションにマージ\n  let master = options?.master;\n  if (options?.masterPptx) {\n    try {\n      const bg = await parseMasterPptx(options.masterPptx);\n      if (bg) {\n        if (master) {\n          // 明示的に background が指定されていない場合のみ、masterPptx の背景を使用\n          if (!master.background) {\n            master = { ...master, background: bg };\n          }\n        } else {\n          master = { background: bg };\n        }\n      }\n    } catch (e) {\n      const message =\n        e instanceof Error ? e.message : \"Unknown error parsing masterPptx\";\n      ctx.diagnostics.add(\"MASTER_PPTX_PARSE_FAILED\", message);\n    }\n  }\n\n  const pptx = await renderPptx(positionedPages, slideSize, ctx, master);\n\n  // backgroundGradient 使用時は write/writeFile に gradFill 置換の後処理を仕込む\n  patchPptxWriteForGradientFills(pptx, ctx.gradientFills);\n\n  const diagnostics = ctx.diagnostics.items;\n\n  if (options?.strict && diagnostics.length > 0) {\n    throw new DiagnosticsError(diagnostics);\n  }\n\n  return { pptx, diagnostics };\n}\n"],"mappings":";;;;;;;;;;;;AAuBA,eAAsB,UACpB,KACA,WACA,SAO0B;CAC1B,MAAM,MAAM,mBAAmB,SAAS,mBAAmB,MAAM;CAIjE,IAAI,cAAc,cAAc,GAAG;CACnC,IAAI,SAAS,QACX,IAAI,cAAc,cAAc,KAAK,UAAU,QAAQ,MAAM,CAAC;CAGhE,MAAM,QAAQ,SAAS,GAAG;CAC1B,MAAM,kBAAoC,CAAC;CAE3C,KAAK,MAAM,QAAQ,OAAO;EACxB,IAAI;EACJ,IAAI;GACF,IAAI,SAAS,YAAY,OACvB,MAAM,MAAM,aAAa,MAAM,WAAW,GAAG;QAE7C,MAAM,MAAM,eAAe,MAAM,WAAW,GAAG;GAGjD,MAAM,aAAa,MAAM,aAAa,MAAM,KAD1B,qBAAqB,GACkB,CAAC;GAC1D,gBAAgB,KAAK,UAAU;EACjC,UAAU;GACR,IAAI,KAAK,aAAa,GAAG;EAC3B;CACF;CAGA,IAAI,SAAS,SAAS;CACtB,IAAI,SAAS,YACX,IAAI;EACF,MAAM,KAAK,MAAM,gBAAgB,QAAQ,UAAU;EACnD,IAAI,IACF,IAAI;OAEE,CAAC,OAAO,YACV,SAAS;IAAE,GAAG;IAAQ,YAAY;GAAG;EAAA,OAGvC,SAAS,EAAE,YAAY,GAAG;CAGhC,SAAS,GAAG;EACV,MAAM,UACJ,aAAa,QAAQ,EAAE,UAAU;EACnC,IAAI,YAAY,IAAI,4BAA4B,OAAO;CACzD;CAGF,MAAM,OAAO,MAAM,WAAW,iBAAiB,WAAW,KAAK,MAAM;CAGrE,+BAA+B,MAAM,IAAI,aAAa;CAEtD,MAAM,cAAc,IAAI,YAAY;CAEpC,IAAI,SAAS,UAAU,YAAY,SAAS,GAC1C,MAAM,IAAI,iBAAiB,WAAW;CAGxC,OAAO;EAAE;EAAM;CAAY;AAC7B"}
+{"version":3,"file":"buildPptx.js","names":[],"sources":["../src/buildPptx.ts"],"sourcesContent":["import { autoFitSlide } from \"./autoFit/autoFit.ts\";\nimport { createBuildContext } from \"./buildContext.ts\";\nimport { calcYogaLayout } from \"./calcYogaLayout/calcYogaLayout.ts\";\nimport type { TextMeasurementMode } from \"./calcYogaLayout/measureText.ts\";\nimport type { YogaNodeMap } from \"./calcYogaLayout/types.ts\";\nimport { extractLayoutResults } from \"./calcYogaLayout/types.ts\";\nimport type { Diagnostic } from \"./diagnostics.ts\";\nimport { DiagnosticsError } from \"./diagnostics.ts\";\nimport { parseMasterPptx } from \"./parseMasterPptx.ts\";\nimport { parseXml } from \"./parseXml/parseXml.ts\";\nimport { patchPptxWriteForGradientFills } from \"./renderPptx/gradientFills.ts\";\nimport { renderPptx } from \"./renderPptx/renderPptx.ts\";\nimport { freeYogaTree } from \"./shared/freeYogaTree.ts\";\nimport { toPositioned } from \"./toPositioned/toPositioned.ts\";\nimport { PositionedNode, SlideMasterOptions } from \"./types.ts\";\nimport { validatePositioned } from \"./validatePositioned/validatePositioned.ts\";\n\nexport type { TextMeasurementMode };\n\nexport interface BuildPptxResult {\n  pptx: import(\"pptxgenjs\").default;\n  diagnostics: Diagnostic[];\n}\n\nexport async function buildPptx(\n  xml: string,\n  slideSize: { w: number; h: number },\n  options?: {\n    master?: SlideMasterOptions;\n    masterPptx?: ArrayBuffer | Uint8Array;\n    textMeasurement?: TextMeasurementMode;\n    autoFit?: boolean;\n    strict?: boolean;\n  },\n): Promise<BuildPptxResult> {\n  const ctx = createBuildContext(options?.textMeasurement ?? \"auto\");\n\n  // グラデーション後処理のマーカー色がユーザー指定色と衝突しないよう、\n  // 入力 XML / master オプション中に現れる色を予約しておく\n  ctx.gradientFills.reserveColors(xml);\n  if (options?.master) {\n    ctx.gradientFills.reserveColors(JSON.stringify(options.master));\n  }\n\n  const nodes = parseXml(xml);\n  const positionedPages: PositionedNode[] = [];\n\n  for (const [slideIndex, node] of nodes.entries()) {\n    let map: YogaNodeMap | undefined;\n    try {\n      if (options?.autoFit !== false) {\n        map = await autoFitSlide(node, slideSize, ctx);\n      } else {\n        map = await calcYogaLayout(node, slideSize, ctx);\n      }\n      const layoutMap = extractLayoutResults(map);\n      const positioned = await toPositioned(node, ctx, layoutMap);\n      validatePositioned(positioned, slideSize, ctx, slideIndex);\n      positionedPages.push(positioned);\n    } finally {\n      if (map) freeYogaTree(map);\n    }\n  }\n\n  // masterPptx から背景を抽出し、master オプションにマージ\n  let master = options?.master;\n  if (options?.masterPptx) {\n    try {\n      const bg = await parseMasterPptx(options.masterPptx);\n      if (bg) {\n        if (master) {\n          // 明示的に background が指定されていない場合のみ、masterPptx の背景を使用\n          if (!master.background) {\n            master = { ...master, background: bg };\n          }\n        } else {\n          master = { background: bg };\n        }\n      }\n    } catch (e) {\n      const message =\n        e instanceof Error ? e.message : \"Unknown error parsing masterPptx\";\n      ctx.diagnostics.add(\"MASTER_PPTX_PARSE_FAILED\", message);\n    }\n  }\n\n  const pptx = await renderPptx(positionedPages, slideSize, ctx, master);\n\n  // backgroundGradient 使用時は write/writeFile に gradFill 置換の後処理を仕込む\n  patchPptxWriteForGradientFills(pptx, ctx.gradientFills);\n\n  const diagnostics = ctx.diagnostics.items;\n\n  if (options?.strict && diagnostics.length > 0) {\n    throw new DiagnosticsError(diagnostics);\n  }\n\n  return { pptx, diagnostics };\n}\n"],"mappings":";;;;;;;;;;;;;AAwBA,eAAsB,UACpB,KACA,WACA,SAO0B;CAC1B,MAAM,MAAM,mBAAmB,SAAS,mBAAmB,MAAM;CAIjE,IAAI,cAAc,cAAc,GAAG;CACnC,IAAI,SAAS,QACX,IAAI,cAAc,cAAc,KAAK,UAAU,QAAQ,MAAM,CAAC;CAGhE,MAAM,QAAQ,SAAS,GAAG;CAC1B,MAAM,kBAAoC,CAAC;CAE3C,KAAK,MAAM,CAAC,YAAY,SAAS,MAAM,QAAQ,GAAG;EAChD,IAAI;EACJ,IAAI;GACF,IAAI,SAAS,YAAY,OACvB,MAAM,MAAM,aAAa,MAAM,WAAW,GAAG;QAE7C,MAAM,MAAM,eAAe,MAAM,WAAW,GAAG;GAGjD,MAAM,aAAa,MAAM,aAAa,MAAM,KAD1B,qBAAqB,GACkB,CAAC;GAC1D,mBAAmB,YAAY,WAAW,KAAK,UAAU;GACzD,gBAAgB,KAAK,UAAU;EACjC,UAAU;GACR,IAAI,KAAK,aAAa,GAAG;EAC3B;CACF;CAGA,IAAI,SAAS,SAAS;CACtB,IAAI,SAAS,YACX,IAAI;EACF,MAAM,KAAK,MAAM,gBAAgB,QAAQ,UAAU;EACnD,IAAI,IACF,IAAI;OAEE,CAAC,OAAO,YACV,SAAS;IAAE,GAAG;IAAQ,YAAY;GAAG;EAAA,OAGvC,SAAS,EAAE,YAAY,GAAG;CAGhC,SAAS,GAAG;EACV,MAAM,UACJ,aAAa,QAAQ,EAAE,UAAU;EACnC,IAAI,YAAY,IAAI,4BAA4B,OAAO;CACzD;CAGF,MAAM,OAAO,MAAM,WAAW,iBAAiB,WAAW,KAAK,MAAM;CAGrE,+BAA+B,MAAM,IAAI,aAAa;CAEtD,MAAM,cAAc,IAAI,YAAY;CAEpC,IAAI,SAAS,UAAU,YAAY,SAAS,GAC1C,MAAM,IAAI,iBAAiB,WAAW;CAGxC,OAAO;EAAE;EAAM;CAAY;AAC7B"}