@hirokisakabe/pom 0.3.0 → 1.1.0

package/dist/buildPptx.d.ts

@@ -1,11 +1,11 @@
 import { TextMeasurementMode } from "./calcYogaLayout/measureText";
-import { POMNode, MasterSlideOptions } from "./types";
+import { POMNode, SlideMasterOptions } from "./types";
 export type { TextMeasurementMode };
 export declare function buildPptx(nodes: POMNode[], slideSize: {
     w: number;
     h: number;
 }, options?: {
-    master?: MasterSlideOptions;
+    master?: SlideMasterOptions;
     textMeasurement?: TextMeasurementMode;
 }): Promise<import("pptxgenjs").default>;
 //# sourceMappingURL=buildPptx.d.ts.map

package/dist/buildPptx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildPptx.d.ts","sourceRoot":"","sources":["../src/buildPptx.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,OAAO,EAAkB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAEtE,YAAY,EAAE,mBAAmB,EAAE,CAAC;AA8FpC,wBAAsB,SAAS,CAC7B,KAAK,EAAE,OAAO,EAAE,EAChB,SAAS,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,EACnC,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,eAAe,CAAC,EAAE,mBAAmB,CAAC;CACvC,wCAsBF"}
+{"version":3,"file":"buildPptx.d.ts","sourceRoot":"","sources":["../src/buildPptx.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,OAAO,EAAkB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAEtE,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAEpC,wBAAsB,SAAS,CAC7B,KAAK,EAAE,OAAO,EAAE,EAChB,SAAS,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,EACnC,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,eAAe,CAAC,EAAE,mBAAmB,CAAC;CACvC,wCAoBF"}

package/dist/buildPptx.js

@@ -2,65 +2,6 @@ import { calcYogaLayout } from "./calcYogaLayout/calcYogaLayout";
 import { setTextMeasurementMode, } from "./calcYogaLayout/measureText";
 import { renderPptx } from "./renderPptx/renderPptx";
 import { toPositioned } from "./toPositioned/toPositioned";
-function replacePlaceholders(node, pageNumber, totalPages, date) {
-    if (node.type === "text") {
-        return {
-            ...node,
-            text: node.text
-                .replace(/\{\{page\}\}/g, String(pageNumber))
-                .replace(/\{\{totalPages\}\}/g, String(totalPages))
-                .replace(/\{\{date\}\}/g, date),
-        };
-    }
-    if (node.type === "box") {
-        return {
-            ...node,
-            children: replacePlaceholders(node.children, pageNumber, totalPages, date),
-        };
-    }
-    if (node.type === "vstack" || node.type === "hstack") {
-        return {
-            ...node,
-            children: node.children.map((child) => replacePlaceholders(child, pageNumber, totalPages, date)),
-        };
-    }
-    return node;
-}
-function composePage(content, master, pageNumber, totalPages) {
-    if (!master) {
-        return content;
-    }
-    const date = master.date?.value ?? "";
-    const children = [];
-    // ヘッダーを追加
-    if (master.header) {
-        children.push(replacePlaceholders(master.header, pageNumber, totalPages, date));
-    }
-    // コンテンツを追加
-    children.push(content);
-    // フッターを追加
-    if (master.footer) {
-        children.push(replacePlaceholders(master.footer, pageNumber, totalPages, date));
-    }
-    // ページ番号を追加
-    if (master.pageNumber) {
-        const pageNumberNode = {
-            type: "text",
-            text: String(pageNumber),
-            fontPx: 12,
-            alignText: master.pageNumber.position,
-        };
-        children.push(pageNumberNode);
-    }
-    return {
-        type: "vstack",
-        w: "100%",
-        h: "100%",
-        alignItems: "stretch",
-        justifyContent: "start",
-        children,
-    };
-}
 export async function buildPptx(nodes, slideSize, options) {
     // テキスト計測モードを設定（デフォルトは auto）
     if (options?.textMeasurement) {
@@ -70,14 +11,11 @@ export async function buildPptx(nodes, slideSize, options) {
         setTextMeasurementMode("auto");
     }
     const positionedPages = [];
-    const totalPages = nodes.length;
-    for (let i = 0; i < nodes.length; i++) {
-        const node = nodes[i];
-        const composedNode = composePage(node, options?.master, i + 1, totalPages);
-        await calcYogaLayout(composedNode, slideSize);
-        const positioned = toPositioned(composedNode);
+    for (const node of nodes) {
+        await calcYogaLayout(node, slideSize);
+        const positioned = toPositioned(node);
         positionedPages.push(positioned);
     }
-    const pptx = renderPptx(positionedPages, slideSize);
+    const pptx = renderPptx(positionedPages, slideSize, options?.master);
     return pptx;
 }

package/dist/calcYogaLayout/calcYogaLayout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calcYogaLayout.d.ts","sourceRoot":"","sources":["../../src/calcYogaLayout/calcYogaLayout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAA0B,MAAM,UAAU,CAAC;AAOhE;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,EACb,SAAS,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,iBAiBpC"}
+{"version":3,"file":"calcYogaLayout.d.ts","sourceRoot":"","sources":["../../src/calcYogaLayout/calcYogaLayout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAA0B,MAAM,UAAU,CAAC;AAchE;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,EACb,SAAS,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,iBAiBpC"}

package/dist/calcYogaLayout/calcYogaLayout.js

@@ -2,6 +2,7 @@ import { loadYoga } from "yoga-layout/load";
 import { measureText } from "./measureText";
 import { measureImage, prefetchImageSize } from "./measureImage";
 import { calcTableIntrinsicSize } from "../table/utils";
+import { measureProcessArrow, measureTimeline, measureMatrix, measureTree, measureFlow, } from "./measureCompositeNodes";
 /**
  * POMNode ツリーを Yoga でレイアウト計算する
  * POMNode ツリーの各ノードに yogaNode プロパティがセットされる
@@ -45,6 +46,11 @@ function collectImageSources(node) {
                 traverse(child);
             }
         }
+        else if (n.type === "layer") {
+            for (const child of n.children) {
+                traverse(child);
+            }
+        }
     }
     traverse(node);
     return sources;
@@ -84,6 +90,14 @@ async function buildPomWithYogaTree(node, parentYoga, parentNode) {
             }
             break;
         }
+        case "layer": {
+            // layer の子要素は絶対配置なので、各子要素のサイズ計算のみ行う
+            // x, y は toPositioned で適用される
+            for (const child of node.children) {
+                await buildPomWithYogaTree(child, yn, node);
+            }
+            break;
+        }
         case "text":
         case "image":
         case "table":
@@ -93,6 +107,7 @@ async function buildPomWithYogaTree(node, parentYoga, parentNode) {
         case "tree":
         case "flow":
         case "processArrow":
+        case "line":
             // 子要素なし
             break;
     }
@@ -268,12 +283,54 @@ async function applyStyleToYogaNode(node, yn) {
                 // テキストがない場合は、明示的にサイズが指定されていることを期待
             }
             break;
+        case "processArrow":
+            {
+                yn.setMeasureFunc(() => {
+                    const { width, height } = measureProcessArrow(node);
+                    return { width, height };
+                });
+            }
+            break;
         case "timeline":
+            {
+                yn.setMeasureFunc(() => {
+                    const { width, height } = measureTimeline(node);
+                    return { width, height };
+                });
+            }
+            break;
         case "matrix":
+            {
+                yn.setMeasureFunc(() => {
+                    const { width, height } = measureMatrix(node);
+                    return { width, height };
+                });
+            }
+            break;
         case "tree":
+            {
+                yn.setMeasureFunc(() => {
+                    const { width, height } = measureTree(node);
+                    return { width, height };
+                });
+            }
+            break;
         case "flow":
-        case "processArrow":
-            // 明示的にサイズが指定されていることを期待
+            {
+                yn.setMeasureFunc(() => {
+                    const { width, height } = measureFlow(node);
+                    return { width, height };
+                });
+            }
+            break;
+        case "line":
+            // line ノードは絶対座標を使用するため、Yoga レイアウトではサイズ 0 として扱う
+            yn.setWidth(0);
+            yn.setHeight(0);
+            break;
+        case "layer":
+            // layer は子を絶対配置するコンテナ
+            // サイズは明示的に指定されることを期待
             break;
     }
 }

package/dist/calcYogaLayout/measureCompositeNodes.d.ts

@@ -0,0 +1,49 @@
+import type { ProcessArrowNode, TimelineNode, MatrixNode, TreeNode, FlowNode } from "../types";
+/**
+ * ProcessArrow ノードの intrinsic size を計算する
+ */
+export declare function measureProcessArrow(node: ProcessArrowNode): {
+    width: number;
+    height: number;
+};
+/**
+ * Timeline ノードの intrinsic size を計算する
+ *
+ * Timeline の描画には以下の固定値が使用される：
+ * - nodeRadius: 12px (円のサイズ)
+ * - 日付ラベル領域: 上部 40px
+ * - タイトルラベル領域: 下部 24px
+ * - 説明ラベル領域: 下部 32px
+ */
+export declare function measureTimeline(node: TimelineNode): {
+    width: number;
+    height: number;
+};
+/**
+ * Matrix ノードの intrinsic size を計算する
+ *
+ * Matrix の描画には以下の固定値が使用される：
+ * - padding: 60px (軸ラベル用の余白)
+ * - itemSize: 24px (アイテムの円のサイズ)
+ */
+export declare function measureMatrix(_: MatrixNode): {
+    width: number;
+    height: number;
+};
+/**
+ * Tree ノードの intrinsic size を計算する
+ *
+ * ツリー構造を再帰的に走査し、必要なサイズを計算する
+ */
+export declare function measureTree(node: TreeNode): {
+    width: number;
+    height: number;
+};
+/**
+ * Flow ノードの intrinsic size を計算する
+ */
+export declare function measureFlow(node: FlowNode): {
+    width: number;
+    height: number;
+};
+//# sourceMappingURL=measureCompositeNodes.d.ts.map

package/dist/calcYogaLayout/measureCompositeNodes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"measureCompositeNodes.d.ts","sourceRoot":"","sources":["../../src/calcYogaLayout/measureCompositeNodes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,QAAQ,EAET,MAAM,UAAU,CAAC;AAElB;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,GAAG;IAC3D,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAsBA;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,YAAY,GAAG;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAoCA;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,UAAU,GAAG;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAQA;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAuCA;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAsBA"}

package/dist/calcYogaLayout/measureCompositeNodes.js

@@ -0,0 +1,143 @@
+/**
+ * ProcessArrow ノードの intrinsic size を計算する
+ */
+export function measureProcessArrow(node) {
+    const stepCount = node.steps.length;
+    if (stepCount === 0) {
+        return { width: 0, height: 0 };
+    }
+    const itemWidth = node.itemWidth ?? 150;
+    const itemHeight = node.itemHeight ?? 60;
+    const gap = node.gap ?? -15;
+    const direction = node.direction ?? "horizontal";
+    if (direction === "horizontal") {
+        return {
+            width: stepCount * itemWidth + (stepCount - 1) * gap,
+            height: itemHeight,
+        };
+    }
+    else {
+        return {
+            width: itemWidth,
+            height: stepCount * itemHeight + (stepCount - 1) * gap,
+        };
+    }
+}
+/**
+ * Timeline ノードの intrinsic size を計算する
+ *
+ * Timeline の描画には以下の固定値が使用される：
+ * - nodeRadius: 12px (円のサイズ)
+ * - 日付ラベル領域: 上部 40px
+ * - タイトルラベル領域: 下部 24px
+ * - 説明ラベル領域: 下部 32px
+ */
+export function measureTimeline(node) {
+    const itemCount = node.items.length;
+    if (itemCount === 0) {
+        return { width: 0, height: 0 };
+    }
+    const nodeRadius = 12;
+    const direction = node.direction ?? "horizontal";
+    if (direction === "horizontal") {
+        // 各アイテムの幅: 120px (ラベル幅)
+        // 最小幅: nodeRadius * 2 + (itemCount - 1) * 間隔
+        const minItemSpacing = 120; // 各アイテムの最小間隔
+        const minWidth = nodeRadius * 2 + (itemCount - 1) * minItemSpacing;
+        // 高さ: 上部ラベル(40) + nodeRadius*2 + 下部ラベル(24+32) + マージン
+        const height = 40 + nodeRadius * 2 + 8 + 24 + 32;
+        return {
+            width: minWidth,
+            height: height,
+        };
+    }
+    else {
+        // 垂直方向
+        // 各アイテムの高さ: 約 60px
+        const minItemSpacing = 60;
+        const minHeight = nodeRadius * 2 + (itemCount - 1) * minItemSpacing;
+        // 幅: lineX(40) + nodeRadius + ラベル幅
+        const width = 40 + nodeRadius * 2 + 16 + 100;
+        return {
+            width: width,
+            height: minHeight,
+        };
+    }
+}
+/**
+ * Matrix ノードの intrinsic size を計算する
+ *
+ * Matrix の描画には以下の固定値が使用される：
+ * - padding: 60px (軸ラベル用の余白)
+ * - itemSize: 24px (アイテムの円のサイズ)
+ */
+export function measureMatrix(_) {
+    const padding = 60;
+    const minAreaSize = 100; // 最小の内部描画領域サイズ
+    return {
+        width: padding * 2 + minAreaSize,
+        height: padding * 2 + minAreaSize,
+    };
+}
+/**
+ * Tree ノードの intrinsic size を計算する
+ *
+ * ツリー構造を再帰的に走査し、必要なサイズを計算する
+ */
+export function measureTree(node) {
+    const layout = node.layout ?? "vertical";
+    const nodeWidth = node.nodeWidth ?? 120;
+    const nodeHeight = node.nodeHeight ?? 40;
+    const levelGap = node.levelGap ?? 60;
+    const siblingGap = node.siblingGap ?? 20;
+    function calculateSubtreeSize(item) {
+        if (!item.children || item.children.length === 0) {
+            return { width: nodeWidth, height: nodeHeight };
+        }
+        const childSizes = item.children.map(calculateSubtreeSize);
+        if (layout === "vertical") {
+            const childrenWidth = childSizes.reduce((sum, s) => sum + s.width, 0) +
+                siblingGap * (childSizes.length - 1);
+            const childrenHeight = Math.max(...childSizes.map((s) => s.height));
+            return {
+                width: Math.max(nodeWidth, childrenWidth),
+                height: nodeHeight + levelGap + childrenHeight,
+            };
+        }
+        else {
+            const childrenHeight = childSizes.reduce((sum, s) => sum + s.height, 0) +
+                siblingGap * (childSizes.length - 1);
+            const childrenWidth = Math.max(...childSizes.map((s) => s.width));
+            return {
+                width: nodeWidth + levelGap + childrenWidth,
+                height: Math.max(nodeHeight, childrenHeight),
+            };
+        }
+    }
+    return calculateSubtreeSize(node.data);
+}
+/**
+ * Flow ノードの intrinsic size を計算する
+ */
+export function measureFlow(node) {
+    const nodeCount = node.nodes.length;
+    if (nodeCount === 0) {
+        return { width: 0, height: 0 };
+    }
+    const nodeWidth = node.nodeWidth ?? 120;
+    const nodeHeight = node.nodeHeight ?? 60;
+    const nodeGap = node.nodeGap ?? 80;
+    const direction = node.direction ?? "horizontal";
+    if (direction === "horizontal") {
+        return {
+            width: nodeCount * nodeWidth + (nodeCount - 1) * nodeGap,
+            height: nodeHeight,
+        };
+    }
+    else {
+        return {
+            width: nodeWidth,
+            height: nodeCount * nodeHeight + (nodeCount - 1) * nodeGap,
+        };
+    }
+}