@hirokisakabe/pom 5.1.0 → 5.2.1

package/dist/registry/definitions/layer.js

@@ -0,0 +1,49 @@
+import { toPositioned, omitYogaNode } from "../../toPositioned/toPositioned.js";
+export const layerNodeDef = {
+    type: "layer",
+    category: "absolute-child",
+    // applyYogaStyle: layer は子を絶対配置するコンテナ。サイズは明示的に指定されることを期待
+    toPositioned(pom, absoluteX, absoluteY, layout, ctx) {
+        const n = pom;
+        // layer の子要素は layer 内の相対座標（child.x, child.y）を持つ
+        // layer の絶対座標に加算してスライド上の絶対座標に変換
+        return {
+            ...omitYogaNode(n),
+            x: absoluteX,
+            y: absoluteY,
+            w: layout.width,
+            h: layout.height,
+            children: n.children.map((child) => {
+                const childX = child.x ?? 0;
+                const childY = child.y ?? 0;
+                // line ノードは特別な処理が必要
+                // x1, y1, x2, y2 は layer 内の相対座標として扱い、layer の座標を加算
+                if (child.type === "line") {
+                    const lineAbsoluteX = absoluteX + childX;
+                    const lineAbsoluteY = absoluteY + childY;
+                    const adjustedX1 = child.x1 + lineAbsoluteX;
+                    const adjustedY1 = child.y1 + lineAbsoluteY;
+                    const adjustedX2 = child.x2 + lineAbsoluteX;
+                    const adjustedY2 = child.y2 + lineAbsoluteY;
+                    return {
+                        ...omitYogaNode(child),
+                        x1: adjustedX1,
+                        y1: adjustedY1,
+                        x2: adjustedX2,
+                        y2: adjustedY2,
+                        x: Math.min(adjustedX1, adjustedX2),
+                        y: Math.min(adjustedY1, adjustedY2),
+                        w: Math.abs(adjustedX2 - adjustedX1),
+                        h: Math.abs(adjustedY2 - adjustedY1),
+                    };
+                }
+                // その他のノードは通常の処理
+                const childLayout = child.yogaNode.getComputedLayout();
+                const adjustedParentX = absoluteX + childX - childLayout.left;
+                const adjustedParentY = absoluteY + childY - childLayout.top;
+                return toPositioned(child, ctx, adjustedParentX, adjustedParentY);
+            }),
+        };
+    },
+    // render: category ベースの子要素再帰で対応
+};

package/dist/registry/definitions/line.d.ts

@@ -0,0 +1,3 @@
+import type { NodeDefinition } from "../types.ts";
+export declare const lineNodeDef: NodeDefinition;
+//# sourceMappingURL=line.d.ts.map

package/dist/registry/definitions/line.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"line.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/line.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAIlD,eAAO,MAAM,WAAW,EAAE,cAuBzB,CAAC"}

package/dist/registry/definitions/line.js

@@ -0,0 +1,26 @@
+import { renderLineNode } from "../../renderPptx/nodes/line.js";
+import { omitYogaNode } from "../../toPositioned/toPositioned.js";
+export const lineNodeDef = {
+    type: "line",
+    category: "leaf",
+    applyYogaStyle(_node, yn) {
+        // line ノードは絶対座標を使用するため、Yoga レイアウトではサイズ 0 として扱う
+        yn.setWidth(0);
+        yn.setHeight(0);
+    },
+    toPositioned(pom, _absoluteX, _absoluteY, _layout) {
+        const n = pom;
+        // line ノードは絶対座標（x1, y1, x2, y2）を持つため、
+        // yogaNode の座標ではなく自身の座標からバウンディングボックスを計算
+        return {
+            ...omitYogaNode(n),
+            x: Math.min(n.x1, n.x2),
+            y: Math.min(n.y1, n.y2),
+            w: Math.abs(n.x2 - n.x1),
+            h: Math.abs(n.y2 - n.y1),
+        };
+    },
+    render(node, ctx) {
+        renderLineNode(node, ctx);
+    },
+};

package/dist/registry/definitions/list.d.ts

@@ -0,0 +1,4 @@
+import type { NodeDefinition } from "../types.ts";
+export declare const ulNodeDef: NodeDefinition;
+export declare const olNodeDef: NodeDefinition;
+//# sourceMappingURL=list.d.ts.map

package/dist/registry/definitions/list.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/list.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAQ,MAAM,aAAa,CAAC;AA0DxD,eAAO,MAAM,SAAS,EAAE,cAOvB,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,cAOvB,CAAC"}

package/dist/registry/definitions/list.js

@@ -0,0 +1,53 @@
+import { measureText } from "../../calcYogaLayout/measureText.js";
+import { measureFontLineHeightRatio } from "../../calcYogaLayout/fontLoader.js";
+import { renderUlNode, renderOlNode } from "../../renderPptx/nodes/list.js";
+function applyListYogaStyle(node, yn, yoga, ctx) {
+    const n = node;
+    const combinedText = n.items.map((item) => item.text).join("\n");
+    const fontSizePx = n.fontSize ?? 24;
+    const fontFamily = "Noto Sans JP";
+    const fontWeight = n.bold ? "bold" : "normal";
+    const spacingMultiple = n.lineHeight ?? 1.3;
+    const fontMetricsRatio = measureFontLineHeightRatio(fontWeight);
+    const lineHeight = fontMetricsRatio * spacingMultiple;
+    // バレット/番号のインデント幅（pptxgenjs DEF_BULLET_MARGIN = 27pt = 36px @96dpi）
+    const bulletIndentPx = 36;
+    yn.setMeasureFunc((width, widthMode) => {
+        const maxWidthPx = (() => {
+            switch (widthMode) {
+                case yoga.MEASURE_MODE_UNDEFINED:
+                    return Number.POSITIVE_INFINITY;
+                case yoga.MEASURE_MODE_EXACTLY:
+                case yoga.MEASURE_MODE_AT_MOST:
+                    return width;
+            }
+        })();
+        const textMaxWidthPx = Math.max(0, maxWidthPx - bulletIndentPx);
+        const { widthPx, heightPx } = measureText(combinedText, textMaxWidthPx, {
+            fontFamily,
+            fontSizePx,
+            lineHeight,
+            fontWeight,
+        }, ctx.textMeasurementMode);
+        return {
+            width: widthPx + bulletIndentPx,
+            height: heightPx,
+        };
+    });
+}
+export const ulNodeDef = {
+    type: "ul",
+    category: "leaf",
+    applyYogaStyle: applyListYogaStyle,
+    render(node, ctx) {
+        renderUlNode(node, ctx);
+    },
+};
+export const olNodeDef = {
+    type: "ol",
+    category: "leaf",
+    applyYogaStyle: applyListYogaStyle,
+    render(node, ctx) {
+        renderOlNode(node, ctx);
+    },
+};

package/dist/registry/definitions/shape.d.ts

@@ -0,0 +1,3 @@
+import type { NodeDefinition } from "../types.ts";
+export declare const shapeNodeDef: NodeDefinition;
+//# sourceMappingURL=shape.d.ts.map

package/dist/registry/definitions/shape.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shape.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/shape.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAQ,MAAM,aAAa,CAAC;AAMxD,eAAO,MAAM,YAAY,EAAE,cA0C1B,CAAC"}

package/dist/registry/definitions/shape.js

@@ -0,0 +1,37 @@
+import { measureText } from "../../calcYogaLayout/measureText.js";
+import { renderShapeNode } from "../../renderPptx/nodes/shape.js";
+export const shapeNodeDef = {
+    type: "shape",
+    category: "leaf",
+    applyYogaStyle(node, yn, yoga, ctx) {
+        const n = node;
+        if (n.text) {
+            const text = n.text;
+            const fontSizePx = n.fontSize ?? 24;
+            const fontFamily = n.fontFamily ?? "Noto Sans JP";
+            const fontWeight = n.bold ? "bold" : "normal";
+            const lineHeight = n.lineHeight ?? 1.3;
+            yn.setMeasureFunc((width, widthMode) => {
+                const maxWidthPx = (() => {
+                    switch (widthMode) {
+                        case yoga.MEASURE_MODE_UNDEFINED:
+                            return Number.POSITIVE_INFINITY;
+                        case yoga.MEASURE_MODE_EXACTLY:
+                        case yoga.MEASURE_MODE_AT_MOST:
+                            return width;
+                    }
+                })();
+                const { widthPx, heightPx } = measureText(text, maxWidthPx, {
+                    fontFamily,
+                    fontSizePx,
+                    lineHeight,
+                    fontWeight,
+                }, ctx.textMeasurementMode);
+                return { width: widthPx, height: heightPx };
+            });
+        }
+    },
+    render(node, ctx) {
+        renderShapeNode(node, ctx);
+    },
+};

package/dist/registry/definitions/stack.d.ts

@@ -0,0 +1,4 @@
+import type { NodeDefinition } from "../types.ts";
+export declare const vstackNodeDef: NodeDefinition;
+export declare const hstackNodeDef: NodeDefinition;
+//# sourceMappingURL=stack.d.ts.map

package/dist/registry/definitions/stack.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stack.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/stack.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAQ,MAAM,aAAa,CAAC;AAuExD,eAAO,MAAM,aAAa,EAAE,cAQ3B,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,cAQ3B,CAAC"}

package/dist/registry/definitions/stack.js

@@ -0,0 +1,78 @@
+/**
+ * vstack/hstack 共通の Flex プロパティを適用する
+ */
+function applyFlexProperties(node, yn, yoga) {
+    if (node.gap !== undefined) {
+        yn.setGap(yoga.GUTTER_ROW, node.gap);
+        yn.setGap(yoga.GUTTER_COLUMN, node.gap);
+    }
+    if (node.alignItems !== undefined) {
+        switch (node.alignItems) {
+            case "start":
+                yn.setAlignItems(yoga.ALIGN_FLEX_START);
+                break;
+            case "center":
+                yn.setAlignItems(yoga.ALIGN_CENTER);
+                break;
+            case "end":
+                yn.setAlignItems(yoga.ALIGN_FLEX_END);
+                break;
+            case "stretch":
+                yn.setAlignItems(yoga.ALIGN_STRETCH);
+                break;
+        }
+    }
+    if (node.justifyContent !== undefined) {
+        switch (node.justifyContent) {
+            case "start":
+                yn.setJustifyContent(yoga.JUSTIFY_FLEX_START);
+                break;
+            case "center":
+                yn.setJustifyContent(yoga.JUSTIFY_CENTER);
+                break;
+            case "end":
+                yn.setJustifyContent(yoga.JUSTIFY_FLEX_END);
+                break;
+            case "spaceBetween":
+                yn.setJustifyContent(yoga.JUSTIFY_SPACE_BETWEEN);
+                break;
+            case "spaceAround":
+                yn.setJustifyContent(yoga.JUSTIFY_SPACE_AROUND);
+                break;
+            case "spaceEvenly":
+                yn.setJustifyContent(yoga.JUSTIFY_SPACE_EVENLY);
+                break;
+        }
+    }
+    if (node.flexWrap !== undefined) {
+        switch (node.flexWrap) {
+            case "nowrap":
+                yn.setFlexWrap(yoga.WRAP_NO_WRAP);
+                break;
+            case "wrap":
+                yn.setFlexWrap(yoga.WRAP_WRAP);
+                break;
+            case "wrapReverse":
+                yn.setFlexWrap(yoga.WRAP_WRAP_REVERSE);
+                break;
+        }
+    }
+}
+export const vstackNodeDef = {
+    type: "vstack",
+    category: "multi-child",
+    applyYogaStyle(node, yn, yoga) {
+        yn.setFlexDirection(yoga.FLEX_DIRECTION_COLUMN);
+        applyFlexProperties(node, yn, yoga);
+    },
+    // render: category ベースの子要素再帰で対応
+};
+export const hstackNodeDef = {
+    type: "hstack",
+    category: "multi-child",
+    applyYogaStyle(node, yn, yoga) {
+        yn.setFlexDirection(yoga.FLEX_DIRECTION_ROW);
+        applyFlexProperties(node, yn, yoga);
+    },
+    // render: category ベースの子要素再帰で対応
+};

package/dist/registry/definitions/table.d.ts

@@ -0,0 +1,3 @@
+import type { NodeDefinition } from "../types.ts";
+export declare const tableNodeDef: NodeDefinition;
+//# sourceMappingURL=table.d.ts.map

package/dist/registry/definitions/table.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/table.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAIlD,eAAO,MAAM,YAAY,EAAE,cAa1B,CAAC"}

package/dist/registry/definitions/table.js

@@ -0,0 +1,16 @@
+import { calcTableIntrinsicSize } from "../../shared/tableUtils.js";
+import { renderTableNode } from "../../renderPptx/nodes/table.js";
+export const tableNodeDef = {
+    type: "table",
+    category: "leaf",
+    applyYogaStyle(node, yn) {
+        const n = node;
+        yn.setMeasureFunc(() => {
+            const { width, height } = calcTableIntrinsicSize(n);
+            return { width, height };
+        });
+    },
+    render(node, ctx) {
+        renderTableNode(node, ctx);
+    },
+};

package/dist/registry/definitions/text.d.ts

@@ -0,0 +1,3 @@
+import type { NodeDefinition } from "../types.ts";
+export declare const textNodeDef: NodeDefinition;
+//# sourceMappingURL=text.d.ts.map

package/dist/registry/definitions/text.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/text.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAQ,MAAM,aAAa,CAAC;AAMxD,eAAO,MAAM,WAAW,EAAE,cAwCzB,CAAC"}

package/dist/registry/definitions/text.js

@@ -0,0 +1,35 @@
+import { measureText } from "../../calcYogaLayout/measureText.js";
+import { renderTextNode } from "../../renderPptx/nodes/text.js";
+export const textNodeDef = {
+    type: "text",
+    category: "leaf",
+    applyYogaStyle(node, yn, yoga, ctx) {
+        const n = node;
+        const text = n.text;
+        const fontSizePx = n.fontSize ?? 24;
+        const fontFamily = "Noto Sans JP";
+        const fontWeight = n.bold ? "bold" : "normal";
+        const lineHeight = 1.3;
+        yn.setMeasureFunc((width, widthMode) => {
+            const maxWidthPx = (() => {
+                switch (widthMode) {
+                    case yoga.MEASURE_MODE_UNDEFINED:
+                        return Number.POSITIVE_INFINITY;
+                    case yoga.MEASURE_MODE_EXACTLY:
+                    case yoga.MEASURE_MODE_AT_MOST:
+                        return width;
+                }
+            })();
+            const { widthPx, heightPx } = measureText(text, maxWidthPx, {
+                fontFamily,
+                fontSizePx,
+                lineHeight,
+                fontWeight,
+            }, ctx.textMeasurementMode);
+            return { width: widthPx, height: heightPx };
+        });
+    },
+    render(node, ctx) {
+        renderTextNode(node, ctx);
+    },
+};

package/dist/registry/index.d.ts

@@ -0,0 +1,2 @@
+export { getNodeDef } from "./nodeRegistry.ts";
+//# sourceMappingURL=index.d.ts.map

package/dist/registry/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/registry/index.ts"],"names":[],"mappings":"AA0CA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/registry/index.js

@@ -0,0 +1,34 @@
+import { registerNode } from "./nodeRegistry.js";
+import { textNodeDef } from "./definitions/text.js";
+import { ulNodeDef, olNodeDef } from "./definitions/list.js";
+import { imageNodeDef } from "./definitions/image.js";
+import { tableNodeDef } from "./definitions/table.js";
+import { shapeNodeDef } from "./definitions/shape.js";
+import { chartNodeDef } from "./definitions/chart.js";
+import { iconNodeDef } from "./definitions/icon.js";
+import { lineNodeDef } from "./definitions/line.js";
+import { timelineNodeDef, matrixNodeDef, treeNodeDef, flowNodeDef, processArrowNodeDef, pyramidNodeDef, } from "./definitions/compositeNodes.js";
+import { boxNodeDef } from "./definitions/box.js";
+import { vstackNodeDef, hstackNodeDef } from "./definitions/stack.js";
+import { layerNodeDef } from "./definitions/layer.js";
+// 全ノード定義を登録
+registerNode(textNodeDef);
+registerNode(ulNodeDef);
+registerNode(olNodeDef);
+registerNode(imageNodeDef);
+registerNode(tableNodeDef);
+registerNode(shapeNodeDef);
+registerNode(chartNodeDef);
+registerNode(iconNodeDef);
+registerNode(lineNodeDef);
+registerNode(timelineNodeDef);
+registerNode(matrixNodeDef);
+registerNode(treeNodeDef);
+registerNode(flowNodeDef);
+registerNode(processArrowNodeDef);
+registerNode(pyramidNodeDef);
+registerNode(boxNodeDef);
+registerNode(vstackNodeDef);
+registerNode(hstackNodeDef);
+registerNode(layerNodeDef);
+export { getNodeDef } from "./nodeRegistry.js";

package/dist/registry/nodeRegistry.d.ts

@@ -0,0 +1,7 @@
+import type { POMNode } from "../types.ts";
+import type { NodeDefinition } from "./types.ts";
+type NodeType = POMNode["type"];
+export declare function registerNode(def: NodeDefinition): void;
+export declare function getNodeDef(type: NodeType): NodeDefinition;
+export {};
+//# sourceMappingURL=nodeRegistry.d.ts.map

package/dist/registry/nodeRegistry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nodeRegistry.d.ts","sourceRoot":"","sources":["../../src/registry/nodeRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,KAAK,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAIhC,wBAAgB,YAAY,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI,CAKtD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,GAAG,cAAc,CAIzD"}

package/dist/registry/nodeRegistry.js

@@ -0,0 +1,13 @@
+const registry = new Map();
+export function registerNode(def) {
+    if (registry.has(def.type)) {
+        throw new Error(`Duplicate node registration: ${def.type}`);
+    }
+    registry.set(def.type, def);
+}
+export function getNodeDef(type) {
+    const def = registry.get(type);
+    if (!def)
+        throw new Error(`Unknown node type: ${type}`);
+    return def;
+}

package/dist/registry/types.d.ts

@@ -0,0 +1,26 @@
+import type { POMNode, PositionedNode } from "../types.ts";
+import type { Node as YogaNode } from "yoga-layout";
+import type { RenderContext } from "../renderPptx/types.ts";
+import type { loadYoga } from "yoga-layout/load";
+import type { BuildContext } from "../buildContext.ts";
+export type Yoga = Awaited<ReturnType<typeof loadYoga>>;
+/** ノードのカテゴリ。子要素の扱い方を決定する */
+export type NodeCategory = "leaf" | "single-child" | "multi-child" | "absolute-child";
+export interface NodeDefinition {
+    /** ノードタイプ名 */
+    type: POMNode["type"];
+    /** ノードカテゴリ */
+    category: NodeCategory;
+    /** YogaNode にノード固有のスタイル/measureFunc を適用する */
+    applyYogaStyle?: (node: POMNode, yn: YogaNode, yoga: Yoga, ctx: BuildContext) => void | Promise<void>;
+    /** POMNode → PositionedNode へのカスタム変換（未定義なら category ベースのデフォルト） */
+    toPositioned?: (pom: POMNode, absoluteX: number, absoluteY: number, layout: {
+        width: number;
+        height: number;
+    }, ctx: BuildContext) => PositionedNode;
+    /** PositionedNode をスライドにレンダリングする（リーフノード用） */
+    render?: (node: PositionedNode, ctx: RenderContext) => void;
+    /** 画像ソース収集（prefetch 用） */
+    collectImageSources?: (node: POMNode) => string[];
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/registry/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/registry/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC;AAExD,4BAA4B;AAC5B,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,cAAc,GACd,aAAa,GACb,gBAAgB,CAAC;AAErB,MAAM,WAAW,cAAc;IAC7B,cAAc;IACd,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAEtB,cAAc;IACd,QAAQ,EAAE,YAAY,CAAC;IAEvB,6CAA6C;IAC7C,cAAc,CAAC,EAAE,CACf,IAAI,EAAE,OAAO,EACb,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,YAAY,KACd,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B,kEAAkE;IAClE,YAAY,CAAC,EAAE,CACb,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EACzC,GAAG,EAAE,YAAY,KACd,cAAc,CAAC;IAEpB,6CAA6C;IAC7C,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IAE5D,0BAA0B;IAC1B,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,EAAE,CAAC;CACnD"}

package/dist/registry/types.js

@@ -0,0 +1 @@
+export {};

package/dist/renderPptx/renderPptx.d.ts

@@ -1,4 +1,5 @@
 import type { PositionedNode, SlideMasterOptions } from "../types.ts";
+import type { BuildContext } from "../buildContext.ts";
 type SlidePx = {
     w: number;
     h: number;
@@ -10,6 +11,6 @@ type SlidePx = {
  * @param master スライドマスターオプション（省略可能）
  * @returns PptxGenJS インスタンス
  */
-export declare function renderPptx(pages: PositionedNode[], slidePx: SlidePx, master?: SlideMasterOptions): import("pptxgenjs").default;
+export declare function renderPptx(pages: PositionedNode[], slidePx: SlidePx, buildContext: BuildContext, master?: SlideMasterOptions): import("pptxgenjs").default;
 export {};
 //# sourceMappingURL=renderPptx.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"renderPptx.d.ts","sourceRoot":"","sources":["../../src/renderPptx/renderPptx.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAEnB,MAAM,aAAa,CAAC;AAwBrB,KAAK,OAAO,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAqJxC;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,cAAc,EAAE,EACvB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,kBAAkB,+BAqL5B"}
+{"version":3,"file":"renderPptx.d.ts","sourceRoot":"","sources":["../../src/renderPptx/renderPptx.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAEnB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAQvD,KAAK,OAAO,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA+JxC;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,cAAc,EAAE,EACvB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,MAAM,CAAC,EAAE,kBAAkB,+BAsI5B"}

package/dist/renderPptx/renderPptx.js

@@ -9,8 +9,18 @@ import { pxToIn, pxToPt } from "./units.js";
 import { convertUnderline, convertStrike } from "./textOptions.js";
 import { getImageData } from "../shared/measureImage.js";
 import { renderBackgroundAndBorder } from "./utils/backgroundBorder.js";
-import { renderTextNode, renderImageNode, renderTableNode, renderShapeNode, renderChartNode, renderTimelineNode, renderMatrixNode, renderTreeNode, renderFlowNode, renderProcessArrowNode, renderPyramidNode, renderLineNode, renderUlNode, renderOlNode, renderIconNode, } from "./nodes/index.js";
+import { getNodeDef } from "../registry/index.js";
 const DEFAULT_MASTER_NAME = "POM_MASTER";
+/**
+ * zIndex でソートして描画順を制御する（安定ソート）
+ * zIndex が小さいノードが先に描画される（PowerPoint は追加順に重ねるため）
+ */
+function sortByZIndex(children) {
+    // すべての子要素に zIndex が未設定の場合はそのまま返す
+    if (children.every((c) => c.zIndex === undefined))
+        return children;
+    return [...children].sort((a, b) => (a.zIndex ?? 0) - (b.zIndex ?? 0));
+}
 /**
  * MasterObject を pptxgenjs の objects 形式に変換する
  */
@@ -155,7 +165,7 @@ function defineSlideMasterFromOptions(pptx, master) {
  * @param master スライドマスターオプション（省略可能）
  * @returns PptxGenJS インスタンス
  */
-export function renderPptx(pages, slidePx, master) {
+export function renderPptx(pages, slidePx, buildContext, master) {
     const slideIn = { w: pxToIn(slidePx.w), h: pxToIn(slidePx.h) }; // layout(=px) → PptxGenJS(=inch) への最終変換
     const pptx = new PptxGenJS();
     pptx.defineLayout({ name: "custom", width: slideIn.w, height: slideIn.h });
@@ -167,7 +177,7 @@ export function renderPptx(pages, slidePx, master) {
     for (const data of pages) {
         // マスターが指定されている場合は masterName を使用
         const slide = masterName ? pptx.addSlide({ masterName }) : pptx.addSlide();
-        const ctx = { slide, pptx };
+        const ctx = { slide, pptx, buildContext };
         // ルートノードの backgroundColor はスライドの background プロパティとして適用
         // これにより、マスタースライドのオブジェクトを覆い隠さない
         // line ノードは backgroundColor を持たないためスキップ
@@ -182,7 +192,7 @@ export function renderPptx(pages, slidePx, master) {
         // backgroundColor と backgroundImage の両方がある場合、backgroundImage が優先
         const rootBackgroundImage = data.type !== "line" ? data.backgroundImage : undefined;
         if (rootBackgroundImage) {
-            const cachedData = getImageData(rootBackgroundImage.src);
+            const cachedData = getImageData(rootBackgroundImage.src, buildContext.imageDataCache);
             if (cachedData) {
                 slide.background = { data: cachedData };
             }
@@ -234,69 +244,28 @@ export function renderPptx(pages, slidePx, master) {
                     renderBackgroundAndBorder(node, ctx);
                 }
             }
-            switch (node.type) {
-                case "text":
-                    renderTextNode(node, ctx);
-                    break;
-                case "ul":
-                    renderUlNode(node, ctx);
-                    break;
-                case "ol":
-                    renderOlNode(node, ctx);
-                    break;
-                case "image":
-                    renderImageNode(node, ctx);
-                    break;
-                case "icon":
-                    renderIconNode(node, ctx);
-                    break;
-                case "box":
-                    // 子要素を再帰的に処理
-                    renderNode(node.children);
-                    break;
-                case "vstack":
-                case "hstack":
-                    // 子要素を再帰的に処理
-                    for (const child of node.children) {
-                        renderNode(child);
+            const def = getNodeDef(node.type);
+            switch (def.category) {
+                case "leaf":
+                    if (!def.render) {
+                        throw new Error(`No render function registered for leaf node: ${node.type}`);
                     }
+                    def.render(node, ctx);
                     break;
-                case "table":
-                    renderTableNode(node, ctx);
-                    break;
-                case "shape":
-                    renderShapeNode(node, ctx);
+                case "single-child": {
+                    const boxNode = node;
+                    renderNode(boxNode.children);
                     break;
-                case "chart":
-                    renderChartNode(node, ctx);
-                    break;
-                case "timeline":
-                    renderTimelineNode(node, ctx);
-                    break;
-                case "matrix":
-                    renderMatrixNode(node, ctx);
-                    break;
-                case "tree":
-                    renderTreeNode(node, ctx);
-                    break;
-                case "flow":
-                    renderFlowNode(node, ctx);
-                    break;
-                case "processArrow":
-                    renderProcessArrowNode(node, ctx);
-                    break;
-                case "pyramid":
-                    renderPyramidNode(node, ctx);
-                    break;
-                case "line":
-                    renderLineNode(node, ctx);
-                    break;
-                case "layer":
-                    // layer の子要素を配列順に描画（後の要素が上に来る）
-                    for (const child of node.children) {
+                }
+                case "multi-child":
+                case "absolute-child": {
+                    const containerNode = node;
+                    // zIndex でソートして描画順を制御（値が小さいものが先に描画される）
+                    for (const child of sortByZIndex(containerNode.children)) {
                         renderNode(child);
                     }
                     break;
+                }
             }
         }
         renderNode(data, true); // ルートノードとして処理

package/dist/renderPptx/types.d.ts

@@ -1,9 +1,11 @@
+import type { BuildContext } from "../buildContext.ts";
 type PptxGenJSClass = import("pptxgenjs").default;
 export type SlideInstance = ReturnType<PptxGenJSClass["addSlide"]>;
 export type PptxInstance = PptxGenJSClass;
 export type RenderContext = {
     slide: SlideInstance;
     pptx: PptxInstance;
+    buildContext: BuildContext;
 };
 export {};
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/renderPptx/types.ts"],"names":[],"mappings":"AAAA,KAAK,cAAc,GAAG,OAAO,WAAW,EAAE,OAAO,CAAC;AAClD,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;AACnE,MAAM,MAAM,YAAY,GAAG,cAAc,CAAC;AAE1C,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/renderPptx/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,KAAK,cAAc,GAAG,OAAO,WAAW,EAAE,OAAO,CAAC;AAClD,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;AACnE,MAAM,MAAM,YAAY,GAAG,cAAc,CAAC;AAE1C,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,YAAY,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"backgroundBorder.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/utils/backgroundBorder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAe,MAAM,gBAAgB,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAcjD;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,aAAa,GACjB,IAAI,CAyHN"}
+{"version":3,"file":"backgroundBorder.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/utils/backgroundBorder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAe,MAAM,gBAAgB,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAcjD;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,aAAa,GACjB,IAAI,CA4HN"}