@hirokisakabe/pom 5.4.0 → 5.5.1

package/dist/renderPptx/nodes/pyramid.js

@@ -1,6 +1,7 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { measurePyramid } from "../../calcYogaLayout/measureCompositeNodes.js";
 import { calcScaleFactor } from "../utils/scaleToFit.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderPyramidNode(node, ctx) {
     const direction = node.direction ?? "up";
     const levels = node.levels;
@@ -9,15 +10,16 @@ export function renderPyramidNode(node, ctx) {
         return;
     const defaultColor = "4472C4";
     const defaultTextColor = "FFFFFF";
-    // スケール係数を計算
+    // スケール係数を計算（コンテンツ領域基準）
+    const content = getContentArea(node);
     const intrinsic = measurePyramid(node);
-    const scaleFactor = calcScaleFactor(node.w, node.h, intrinsic.width, intrinsic.height, "pyramid");
+    const scaleFactor = calcScaleFactor(content.w, content.h, intrinsic.width, intrinsic.height, "pyramid", ctx.buildContext.diagnostics);
     const baseWidth = 400 * scaleFactor;
     const layerHeight = 50 * scaleFactor;
     const gap = 2 * scaleFactor;
     const totalHeight = levelCount * layerHeight + (levelCount - 1) * gap;
-    const startX = node.x + (node.w - baseWidth) / 2;
-    const startY = node.y + (node.h - totalHeight) / 2;
+    const startX = content.x + (content.w - baseWidth) / 2;
+    const startY = content.y + (content.h - totalHeight) / 2;
     for (let i = 0; i < levelCount; i++) {
         const level = levels[i];
         const fillColor = level.color?.replace("#", "") ?? defaultColor;

package/dist/renderPptx/nodes/shape.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shape.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/shape.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,KAAK,mBAAmB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAEtE,wBAAgB,eAAe,CAC7B,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,aAAa,GACjB,IAAI,CAqDN"}
+{"version":3,"file":"shape.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/shape.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,KAAK,mBAAmB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAEtE,wBAAgB,eAAe,CAC7B,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,aAAa,GACjB,IAAI,CAsDN"}

package/dist/renderPptx/nodes/shape.js

@@ -1,11 +1,13 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { convertUnderline, convertStrike } from "../textOptions.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderShapeNode(node, ctx) {
+    const content = getContentArea(node);
     const shapeOptions = {
-        x: pxToIn(node.x),
-        y: pxToIn(node.y),
-        w: pxToIn(node.w),
-        h: pxToIn(node.h),
+        x: pxToIn(content.x),
+        y: pxToIn(content.y),
+        w: pxToIn(content.w),
+        h: pxToIn(content.h),
         fill: node.fill
             ? {
                 color: node.fill.color,
@@ -21,7 +23,7 @@ export function renderShapeNode(node, ctx) {
             : undefined,
         shadow: node.shadow
             ? {
-                type: node.shadow.type,
+                type: node.shadow.type ?? "outer",
                 opacity: node.shadow.opacity,
                 blur: node.shadow.blur,
                 angle: node.shadow.angle,

package/dist/renderPptx/nodes/table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAQjD,KAAK,mBAAmB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAEtE,wBAAgB,eAAe,CAC7B,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,aAAa,GACjB,IAAI,CAqCN"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AASjD,KAAK,mBAAmB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAEtE,wBAAgB,eAAe,CAC7B,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,aAAa,GACjB,IAAI,CAsCN"}

package/dist/renderPptx/nodes/table.js

@@ -1,6 +1,7 @@
 import { resolveColumnWidths, resolveRowHeights, } from "../../shared/tableUtils.js";
 import { pxToIn, pxToPt } from "../units.js";
 import { convertUnderline, convertStrike } from "../textOptions.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderTableNode(node, ctx) {
     const tableRows = node.rows.map((row) => row.cells.map((cell) => {
         const cellOptions = {
@@ -23,12 +24,13 @@ export function renderTableNode(node, ctx) {
             options: cellOptions,
         };
     }));
+    const content = getContentArea(node);
     const tableOptions = {
-        x: pxToIn(node.x),
-        y: pxToIn(node.y),
-        w: pxToIn(node.w),
-        h: pxToIn(node.h),
-        colW: resolveColumnWidths(node, node.w).map((width) => pxToIn(width)),
+        x: pxToIn(content.x),
+        y: pxToIn(content.y),
+        w: pxToIn(content.w),
+        h: pxToIn(content.h),
+        colW: resolveColumnWidths(node, content.w).map((width) => pxToIn(width)),
         rowH: resolveRowHeights(node).map((height) => pxToIn(height)),
         margin: 0,
     };

package/dist/renderPptx/nodes/timeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timeline.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/timeline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,KAAK,sBAAsB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,CAAC;AAE5E,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,sBAAsB,EAC5B,GAAG,EAAE,aAAa,GACjB,IAAI,CA6CN"}
+{"version":3,"file":"timeline.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/timeline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAMjD,KAAK,sBAAsB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,CAAC;AAE5E,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,sBAAsB,EAC5B,GAAG,EAAE,aAAa,GACjB,IAAI,CAwDN"}

package/dist/renderPptx/nodes/timeline.js

@@ -1,6 +1,7 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { measureTimeline } from "../../calcYogaLayout/measureCompositeNodes.js";
 import { calcScaleFactor } from "../utils/scaleToFit.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderTimelineNode(node, ctx) {
     const direction = node.direction ?? "horizontal";
     const items = node.items;
@@ -10,16 +11,25 @@ export function renderTimelineNode(node, ctx) {
     const defaultColor = "1D4ED8"; // blue
     const baseNodeRadius = 12; // px
     const baseLineWidth = 4; // px
-    // スケール係数を計算
+    // スケール係数を計算（コンテンツ領域基準）
+    const content = getContentArea(node);
     const intrinsic = measureTimeline(node);
-    const scaleFactor = calcScaleFactor(node.w, node.h, intrinsic.width, intrinsic.height, "timeline");
+    const scaleFactor = calcScaleFactor(content.w, content.h, intrinsic.width, intrinsic.height, "timeline", ctx.buildContext.diagnostics);
     const nodeRadius = baseNodeRadius * scaleFactor;
     const lineWidth = baseLineWidth * scaleFactor;
+    // コンテンツ領域を使用するための仮想ノードを作成
+    const contentNode = {
+        ...node,
+        x: content.x,
+        y: content.y,
+        w: content.w,
+        h: content.h,
+    };
     if (direction === "horizontal") {
-        renderHorizontalTimeline(node, ctx, items, defaultColor, nodeRadius, lineWidth, scaleFactor);
+        renderHorizontalTimeline(contentNode, ctx, items, defaultColor, nodeRadius, lineWidth, scaleFactor);
     }
     else {
-        renderVerticalTimeline(node, ctx, items, defaultColor, nodeRadius, lineWidth, scaleFactor);
+        renderVerticalTimeline(contentNode, ctx, items, defaultColor, nodeRadius, lineWidth, scaleFactor);
     }
 }
 function renderHorizontalTimeline(node, ctx, items, defaultColor, nodeRadius, lineWidth, scaleFactor) {

package/dist/renderPptx/nodes/tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/tree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EAIf,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,KAAK,kBAAkB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAWpE,wBAAgB,cAAc,CAC5B,IAAI,EAAE,kBAAkB,EACxB,GAAG,EAAE,aAAa,GACjB,IAAI,CAwSN"}
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/tree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EAIf,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,KAAK,kBAAkB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAWpE,wBAAgB,cAAc,CAC5B,IAAI,EAAE,kBAAkB,EACxB,GAAG,EAAE,aAAa,GACjB,IAAI,CA0SN"}

package/dist/renderPptx/nodes/tree.js

@@ -1,5 +1,6 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { calcScaleFactor } from "../utils/scaleToFit.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderTreeNode(node, ctx) {
     const layout = node.layout ?? "vertical";
     const nodeShape = node.nodeShape ?? "rect";
@@ -217,13 +218,14 @@ export function renderTreeNode(node, ctx) {
     }
     // ツリーのサイズを計算
     const treeSize = calculateSubtreeSize(node.data);
-    // スケール係数を計算
-    const scaleFactor = calcScaleFactor(node.w, node.h, treeSize.width, treeSize.height, "tree");
+    // スケール係数を計算（コンテンツ領域基準）
+    const content = getContentArea(node);
+    const scaleFactor = calcScaleFactor(content.w, content.h, treeSize.width, treeSize.height, "tree", ctx.buildContext.diagnostics);
     // スケール後のサイズで中央配置オフセットを計算
     const scaledW = treeSize.width * scaleFactor;
     const scaledH = treeSize.height * scaleFactor;
-    const offsetX = node.x + (node.w - scaledW) / 2;
-    const offsetY = node.y + (node.h - scaledH) / 2;
+    const offsetX = content.x + (content.w - scaledW) / 2;
+    const offsetY = content.y + (content.h - scaledH) / 2;
     // レイアウト計算（原点(0,0)からの相対座標）
     const rootLayout = calculateTreeLayout(node.data, 0, 0);
     // 描画（接続線を先に、ノードを後に描画）

package/dist/renderPptx/textOptions.d.ts

@@ -24,15 +24,15 @@ export declare function createTextOptions(node: TextNode): {
     valign: "top";
     margin: number;
     lineSpacingMultiple: number;
-    color: string;
-    bold: boolean;
-    italic: boolean;
+    color: string | undefined;
+    bold: boolean | undefined;
+    italic: boolean | undefined;
     underline: {
         style?: UnderlineStyle;
         color?: string;
-    };
-    strike: "sngStrike";
-    highlight: string;
+    } | undefined;
+    strike: "sngStrike" | undefined;
+    highlight: string | undefined;
 };
 export {};
 //# sourceMappingURL=textOptions.d.ts.map

package/dist/renderPptx/textOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"textOptions.d.ts","sourceRoot":"","sources":["../../src/renderPptx/textOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAG7E,KAAK,QAAQ,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAE1D;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,SAAS,GAAG,SAAS,GAC/B;IAAE,KAAK,CAAC,EAAE,cAAc,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAQxD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,OAAO,GAAG,SAAS,GAC1B,WAAW,GAAG,SAAS,CAGzB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ;;;;;;;;;;;;;;;gBApBnC,cAAc;gBAAU,MAAM;;;;EA2C1C"}
+{"version":3,"file":"textOptions.d.ts","sourceRoot":"","sources":["../../src/renderPptx/textOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAI7E,KAAK,QAAQ,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAE1D;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,SAAS,GAAG,SAAS,GAC/B;IAAE,KAAK,CAAC,EAAE,cAAc,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAQxD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,OAAO,GAAG,SAAS,GAC1B,WAAW,GAAG,SAAS,CAGzB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ;;;;;;;;;;;;;;;gBApBnC,cAAc;gBAAU,MAAM;;;;EA4C1C"}

package/dist/renderPptx/textOptions.js

@@ -1,4 +1,5 @@
 import { pxToIn, pxToPt } from "./units.js";
+import { getContentArea } from "./utils/contentArea.js";
 /**
  * underline プロパティを pptxgenjs 形式に変換する
  */
@@ -26,11 +27,12 @@ export function createTextOptions(node) {
     const fontSizePx = node.fontSize ?? 24;
     const fontFamily = node.fontFamily ?? "Noto Sans JP";
     const lineHeight = node.lineHeight ?? 1.3;
+    const content = getContentArea(node);
     return {
-        x: pxToIn(node.x),
-        y: pxToIn(node.y),
-        w: pxToIn(node.w),
-        h: pxToIn(node.h),
+        x: pxToIn(content.x),
+        y: pxToIn(content.y),
+        w: pxToIn(content.w),
+        h: pxToIn(content.h),
         fontSize: pxToPt(fontSizePx),
         fontFace: fontFamily,
         align: node.textAlign ?? "left",

package/dist/renderPptx/utils/backgroundBorder.js

@@ -2,7 +2,7 @@ import { getImageData } from "../../shared/measureImage.js";
 import { pxToIn, pxToPt } from "../units.js";
 function convertShadow(shadow) {
     return {
-        type: shadow.type,
+        type: shadow.type ?? "outer",
         opacity: shadow.opacity,
         blur: shadow.blur,
         angle: shadow.angle,

package/dist/renderPptx/utils/contentArea.d.ts

@@ -0,0 +1,26 @@
+type Padding = number | {
+    top?: number;
+    right?: number;
+    bottom?: number;
+    left?: number;
+};
+interface ContentArea {
+    x: number;
+    y: number;
+    w: number;
+    h: number;
+}
+/**
+ * ノードの padding を考慮したコンテンツ描画領域を計算する。
+ * background/border はノード全体の領域 (node.x/y/w/h) に描画し、
+ * コンテンツはこの関数で返される領域に描画する。
+ */
+export declare function getContentArea(node: {
+    x: number;
+    y: number;
+    w: number;
+    h: number;
+    padding?: Padding;
+}): ContentArea;
+export {};
+//# sourceMappingURL=contentArea.d.ts.map

package/dist/renderPptx/utils/contentArea.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contentArea.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/utils/contentArea.ts"],"names":[],"mappings":"AAAA,KAAK,OAAO,GACR,MAAM,GACN;IACE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,UAAU,WAAW;IACnB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE;IACnC,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,WAAW,CAsBd"}

package/dist/renderPptx/utils/contentArea.js

@@ -0,0 +1,26 @@
+/**
+ * ノードの padding を考慮したコンテンツ描画領域を計算する。
+ * background/border はノード全体の領域 (node.x/y/w/h) に描画し、
+ * コンテンツはこの関数で返される領域に描画する。
+ */
+export function getContentArea(node) {
+    if (node.padding === undefined) {
+        return { x: node.x, y: node.y, w: node.w, h: node.h };
+    }
+    let top, right, bottom, left;
+    if (typeof node.padding === "number") {
+        top = right = bottom = left = node.padding;
+    }
+    else {
+        top = node.padding.top ?? 0;
+        right = node.padding.right ?? 0;
+        bottom = node.padding.bottom ?? 0;
+        left = node.padding.left ?? 0;
+    }
+    return {
+        x: node.x + left,
+        y: node.y + top,
+        w: Math.max(0, node.w - left - right),
+        h: Math.max(0, node.h - top - bottom),
+    };
+}

package/dist/renderPptx/utils/scaleToFit.d.ts

@@ -1,8 +1,9 @@
+import type { DiagnosticCollector } from "../../diagnostics.ts";
 /**
  * 割り当てサイズと固有サイズからスケール係数を計算する。
  *
  * - scaleFactor = min(allocatedW / intrinsicW, allocatedH / intrinsicH, 1.0)
- * - scaleFactor < MIN_SCALE_THRESHOLD の場合、閾値でクランプして console.warn
+ * - scaleFactor < MIN_SCALE_THRESHOLD の場合、閾値でクランプして diagnostics に記録
  */
-export declare function calcScaleFactor(allocatedW: number, allocatedH: number, intrinsicW: number, intrinsicH: number, nodeType: string): number;
+export declare function calcScaleFactor(allocatedW: number, allocatedH: number, intrinsicW: number, intrinsicH: number, nodeType: string, diagnostics: DiagnosticCollector): number;
 //# sourceMappingURL=scaleToFit.d.ts.map

package/dist/renderPptx/utils/scaleToFit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scaleToFit.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/utils/scaleToFit.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM,CAeR"}
+{"version":3,"file":"scaleToFit.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/utils/scaleToFit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAIhE;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,mBAAmB,GAC/B,MAAM,CAgBR"}

package/dist/renderPptx/utils/scaleToFit.js

@@ -3,16 +3,16 @@ const MIN_SCALE_THRESHOLD = 0.5;
  * 割り当てサイズと固有サイズからスケール係数を計算する。
  *
  * - scaleFactor = min(allocatedW / intrinsicW, allocatedH / intrinsicH, 1.0)
- * - scaleFactor < MIN_SCALE_THRESHOLD の場合、閾値でクランプして console.warn
+ * - scaleFactor < MIN_SCALE_THRESHOLD の場合、閾値でクランプして diagnostics に記録
  */
-export function calcScaleFactor(allocatedW, allocatedH, intrinsicW, intrinsicH, nodeType) {
+export function calcScaleFactor(allocatedW, allocatedH, intrinsicW, intrinsicH, nodeType, diagnostics) {
     if (intrinsicW <= 0 || intrinsicH <= 0)
         return 1.0;
     const scaleX = allocatedW / intrinsicW;
     const scaleY = allocatedH / intrinsicH;
     let scaleFactor = Math.min(scaleX, scaleY, 1.0);
     if (scaleFactor < MIN_SCALE_THRESHOLD) {
-        console.warn(`[pom] ${nodeType} node: scale factor ${scaleFactor.toFixed(2)} is below threshold ${MIN_SCALE_THRESHOLD}. Content may overflow.`);
+        diagnostics.add("SCALE_BELOW_THRESHOLD", `${nodeType} node: scale factor ${scaleFactor.toFixed(2)} is below threshold ${MIN_SCALE_THRESHOLD}. Content may overflow.`);
         scaleFactor = MIN_SCALE_THRESHOLD;
     }
     return scaleFactor;

package/dist/shared/freeYogaTree.d.ts

@@ -1,7 +1,7 @@
-import type { POMNode } from "../types.ts";
+import type { YogaNodeMap } from "../calcYogaLayout/types.ts";
 /**
- * POMNode ツリー内の全 yogaNode を解放し、参照をクリアする。
+ * YogaNodeMap 内の全 YogaNode を解放する。
  * calcYogaLayout を再実行する前に呼び出すこと。
  */
-export declare function freeYogaTree(node: POMNode): void;
+export declare function freeYogaTree(map: YogaNodeMap): void;
 //# sourceMappingURL=freeYogaTree.d.ts.map

package/dist/shared/freeYogaTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"freeYogaTree.d.ts","sourceRoot":"","sources":["../../src/shared/freeYogaTree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAG3C;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAwBhD"}
+{"version":3,"file":"freeYogaTree.d.ts","sourceRoot":"","sources":["../../src/shared/freeYogaTree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAqBnD"}

package/dist/shared/freeYogaTree.js

@@ -1,29 +1,24 @@
-import { walkPOMTree } from "./walkTree.js";
 /**
- * POMNode ツリー内の全 yogaNode を解放し、参照をクリアする。
+ * YogaNodeMap 内の全 YogaNode を解放する。
  * calcYogaLayout を再実行する前に呼び出すこと。
  */
-export function freeYogaTree(node) {
-    // 子から先に解放する（yoga-layout は親が子を参照しているため）
-    const nodes = [];
-    walkPOMTree(node, (n) => nodes.push(n));
-    // 逆順（リーフから）で解放
-    for (let i = nodes.length - 1; i >= 0; i--) {
-        const n = nodes[i];
-        if (n.yogaNode) {
-            // 親から切り離してから解放
-            const owner = n.yogaNode.getParent();
-            if (owner) {
-                const childCount = owner.getChildCount();
-                for (let j = 0; j < childCount; j++) {
-                    if (owner.getChild(j) === n.yogaNode) {
-                        owner.removeChild(n.yogaNode);
-                        break;
-                    }
+export function freeYogaTree(map) {
+    // Map の insertion order は親→子なので、逆順（リーフから）で解放する
+    const yogaNodes = Array.from(map.values());
+    for (let i = yogaNodes.length - 1; i >= 0; i--) {
+        const yn = yogaNodes[i];
+        // 親から切り離してから解放
+        const owner = yn.getParent();
+        if (owner) {
+            const childCount = owner.getChildCount();
+            for (let j = 0; j < childCount; j++) {
+                if (owner.getChild(j) === yn) {
+                    owner.removeChild(yn);
+                    break;
                 }
             }
-            n.yogaNode.free();
-            n.yogaNode = undefined;
         }
+        yn.free();
     }
+    map.clear();
 }

package/dist/shared/measureImage.d.ts

@@ -1,3 +1,4 @@
+import type { DiagnosticCollector } from "../diagnostics.ts";
 type ImageSizeCache = Map<string, {
     widthPx: number;
     heightPx: number;
@@ -18,7 +19,7 @@ export declare function getImageData(src: string, cache: ImageDataCache): string
  * @param dataCache 画像データキャッシュ
  * @returns 画像の幅と高さ（px）
  */
-export declare function prefetchImageSize(src: string, sizeCache: ImageSizeCache, dataCache: ImageDataCache): Promise<{
+export declare function prefetchImageSize(src: string, sizeCache: ImageSizeCache, dataCache: ImageDataCache, diagnostics: DiagnosticCollector): Promise<{
     widthPx: number;
     heightPx: number;
 }>;
@@ -29,7 +30,7 @@ export declare function prefetchImageSize(src: string, sizeCache: ImageSizeCache
  * @param sizeCache 画像サイズキャッシュ
  * @returns 画像の幅と高さ（px）
  */
-export declare function measureImage(src: string, sizeCache: ImageSizeCache): {
+export declare function measureImage(src: string, sizeCache: ImageSizeCache, diagnostics: DiagnosticCollector): {
     widthPx: number;
     heightPx: number;
 };

package/dist/shared/measureImage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"measureImage.d.ts","sourceRoot":"","sources":["../../src/shared/measureImage.ts"],"names":[],"mappings":"AAYA,KAAK,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AACzE,KAAK,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAE1C;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,cAAc,GACpB,MAAM,GAAG,SAAS,CAEpB;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,cAAc,EACzB,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC,CA0DD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,cAAc,GACxB;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAqDA"}
+{"version":3,"file":"measureImage.d.ts","sourceRoot":"","sources":["../../src/shared/measureImage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAW7D,KAAK,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AACzE,KAAK,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAE1C;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,cAAc,GACpB,MAAM,GAAG,SAAS,CAEpB;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,cAAc,EACzB,SAAS,EAAE,cAAc,EACzB,WAAW,EAAE,mBAAmB,GAC/B,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC,CA6DD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,cAAc,EACzB,WAAW,EAAE,mBAAmB,GAC/B;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAyDA"}

package/dist/shared/measureImage.js

@@ -23,7 +23,7 @@ export function getImageData(src, cache) {
  * @param dataCache 画像データキャッシュ
  * @returns 画像の幅と高さ（px）
  */
-export async function prefetchImageSize(src, sizeCache, dataCache) {
+export async function prefetchImageSize(src, sizeCache, dataCache, diagnostics) {
     // キャッシュにあればそれを返す
     const cached = sizeCache.get(src);
     if (cached) {
@@ -66,7 +66,7 @@ export async function prefetchImageSize(src, sizeCache, dataCache) {
     }
     catch (error) {
         // エラーが発生した場合はデフォルトサイズを返す
-        console.warn(`Failed to measure image size for ${src}:`, error);
+        diagnostics.add("IMAGE_MEASURE_FAILED", `Failed to measure image size for ${src}: ${String(error)}`);
         const result = {
             widthPx: 100,
             heightPx: 100,
@@ -82,7 +82,7 @@ export async function prefetchImageSize(src, sizeCache, dataCache) {
  * @param sizeCache 画像サイズキャッシュ
  * @returns 画像の幅と高さ（px）
  */
-export function measureImage(src, sizeCache) {
+export function measureImage(src, sizeCache, diagnostics) {
     // キャッシュにあればそれを返す
     const cached = sizeCache.get(src);
     if (cached) {
@@ -98,7 +98,7 @@ export function measureImage(src, sizeCache) {
         }
         // HTTPS/HTTP URLの場合はキャッシュがないとデフォルト値を返す
         else if (src.startsWith("https://") || src.startsWith("http://")) {
-            console.warn(`Image size for URL ${src} was not prefetched. Using default size.`);
+            diagnostics.add("IMAGE_NOT_PREFETCHED", `Image size for URL ${src} was not prefetched. Using default size.`);
             return {
                 widthPx: 100,
                 heightPx: 100,
@@ -121,7 +121,7 @@ export function measureImage(src, sizeCache) {
     }
     catch (error) {
         // エラーが発生した場合はデフォルトサイズを返す
-        console.warn(`Failed to measure image size for ${src}:`, error);
+        diagnostics.add("IMAGE_MEASURE_FAILED", `Failed to measure image size for ${src}: ${String(error)}`);
         return {
             widthPx: 100,
             heightPx: 100,

package/dist/toPositioned/toPositioned.d.ts

@@ -1,17 +1,14 @@
 import type { POMNode, PositionedNode } from "../types.ts";
 import type { BuildContext } from "../buildContext.ts";
-/**
- * POMNode から yogaNode を除外したオブジェクトを返す。
- * PositionedNode に yogaNode 参照が残らないようにするため。
- */
-export declare function omitYogaNode<T extends POMNode>(pom: T): Omit<T, "yogaNode">;
+import type { LayoutResultMap } from "../calcYogaLayout/types.ts";
 /**
  * POMNode ツリーを絶対座標付きの PositionedNode ツリーに変換する
  * @param pom 入力 POMNode
  * @param ctx BuildContext
+ * @param map LayoutResultMap（POMNode → 計算済みレイアウト結果のマッピング）
  * @param parentX 親ノードの絶対X座標
  * @param parentY 親ノードの絶対Y座標
  * @returns PositionedNode ツリー
  */
-export declare function toPositioned(pom: POMNode, ctx: BuildContext, parentX?: number, parentY?: number): PositionedNode;
+export declare function toPositioned(pom: POMNode, ctx: BuildContext, map: LayoutResultMap, parentX?: number, parentY?: number): PositionedNode;
 //# sourceMappingURL=toPositioned.d.ts.map

package/dist/toPositioned/toPositioned.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toPositioned.d.ts","sourceRoot":"","sources":["../../src/toPositioned/toPositioned.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAI3E;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,YAAY,EACjB,OAAO,SAAI,EACX,OAAO,SAAI,GACV,cAAc,CA8DhB"}
+{"version":3,"file":"toPositioned.d.ts","sourceRoot":"","sources":["../../src/toPositioned/toPositioned.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAGlE;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,YAAY,EACjB,GAAG,EAAE,eAAe,EACpB,OAAO,SAAI,EACX,OAAO,SAAI,GACV,cAAc,CAmEhB"}

package/dist/toPositioned/toPositioned.js

@@ -1,38 +1,30 @@
 import { getNodeDef } from "../registry/index.js";
-/**
- * POMNode から yogaNode を除外したオブジェクトを返す。
- * PositionedNode に yogaNode 参照が残らないようにするため。
- */
-export function omitYogaNode(pom) {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { yogaNode, ...rest } = pom;
-    return rest;
-}
 /**
  * POMNode ツリーを絶対座標付きの PositionedNode ツリーに変換する
  * @param pom 入力 POMNode
  * @param ctx BuildContext
+ * @param map LayoutResultMap（POMNode → 計算済みレイアウト結果のマッピング）
  * @param parentX 親ノードの絶対X座標
  * @param parentY 親ノードの絶対Y座標
  * @returns PositionedNode ツリー
  */
-export function toPositioned(pom, ctx, parentX = 0, parentY = 0) {
-    if (!pom.yogaNode) {
-        throw new Error("yogaNode not set on POMNode");
+export function toPositioned(pom, ctx, map, parentX = 0, parentY = 0) {
+    const layout = map.get(pom);
+    if (!layout) {
+        throw new Error("Layout result not found in map for POMNode");
     }
-    const layout = pom.yogaNode.getComputedLayout();
     const absoluteX = parentX + layout.left;
     const absoluteY = parentY + layout.top;
     const def = getNodeDef(pom.type);
     // ノード固有のカスタム変換がある場合はそれを使用
     if (def.toPositioned) {
-        return def.toPositioned(pom, absoluteX, absoluteY, layout, ctx);
+        return def.toPositioned(pom, absoluteX, absoluteY, layout, ctx, map);
     }
     // category ベースのデフォルト処理
     switch (def.category) {
         case "leaf":
             return {
-                ...omitYogaNode(pom),
+                ...pom,
                 x: absoluteX,
                 y: absoluteY,
                 w: layout.width,
@@ -41,23 +33,23 @@ export function toPositioned(pom, ctx, parentX = 0, parentY = 0) {
         case "single-child": {
             const boxNode = pom;
             return {
-                ...omitYogaNode(boxNode),
+                ...boxNode,
                 x: absoluteX,
                 y: absoluteY,
                 w: layout.width,
                 h: layout.height,
-                children: toPositioned(boxNode.children, ctx, absoluteX, absoluteY),
+                children: toPositioned(boxNode.children, ctx, map, absoluteX, absoluteY),
             };
         }
         case "multi-child": {
             const containerNode = pom;
             return {
-                ...omitYogaNode(containerNode),
+                ...containerNode,
                 x: absoluteX,
                 y: absoluteY,
                 w: layout.width,
                 h: layout.height,
-                children: containerNode.children.map((child) => toPositioned(child, ctx, absoluteX, absoluteY)),
+                children: containerNode.children.map((child) => toPositioned(child, ctx, map, absoluteX, absoluteY)),
             };
         }
         case "absolute-child":