@hirokisakabe/pom 0.3.0 → 1.1.0

package/dist/renderPptx/renderPptx.js

@@ -1,30 +1,211 @@
 import { createRequire } from "module";
 const require = createRequire(import.meta.url);
 const PptxGenJS = require("pptxgenjs");
-import { pxToIn } from "./units";
+import { pxToIn, pxToPt } from "./units";
 import { renderBackgroundAndBorder } from "./utils/backgroundBorder";
-import { renderTextNode, renderImageNode, renderTableNode, renderShapeNode, renderChartNode, renderTimelineNode, renderMatrixNode, renderTreeNode, renderFlowNode, renderProcessArrowNode, } from "./nodes";
+import { renderTextNode, renderImageNode, renderTableNode, renderShapeNode, renderChartNode, renderTimelineNode, renderMatrixNode, renderTreeNode, renderFlowNode, renderProcessArrowNode, renderLineNode, } from "./nodes";
 export { createTextOptions } from "./textOptions";
 export { PX_PER_IN, pxToIn, pxToPt } from "./units";
+const DEFAULT_MASTER_NAME = "POM_MASTER";
+/**
+ * MasterObject を pptxgenjs の objects 形式に変換する
+ */
+function convertMasterObject(obj) {
+    switch (obj.type) {
+        case "text":
+            return {
+                text: {
+                    text: obj.text,
+                    options: {
+                        x: pxToIn(obj.x),
+                        y: pxToIn(obj.y),
+                        w: pxToIn(obj.w),
+                        h: pxToIn(obj.h),
+                        fontSize: obj.fontPx ? pxToPt(obj.fontPx) : undefined,
+                        fontFace: obj.fontFamily,
+                        color: obj.color,
+                        bold: obj.bold,
+                        align: obj.alignText,
+                    },
+                },
+            };
+        case "image": {
+            const imageProps = {
+                x: pxToIn(obj.x),
+                y: pxToIn(obj.y),
+                w: pxToIn(obj.w),
+                h: pxToIn(obj.h),
+            };
+            // src が data URI かパスかを判定
+            if (obj.src.startsWith("data:")) {
+                imageProps.data = obj.src;
+            }
+            else {
+                imageProps.path = obj.src;
+            }
+            return { image: imageProps };
+        }
+        case "rect":
+            return {
+                rect: {
+                    x: pxToIn(obj.x),
+                    y: pxToIn(obj.y),
+                    w: pxToIn(obj.w),
+                    h: pxToIn(obj.h),
+                    fill: obj.fill
+                        ? { color: obj.fill.color, transparency: obj.fill.transparency }
+                        : undefined,
+                    line: obj.border
+                        ? {
+                            color: obj.border.color,
+                            width: obj.border.width,
+                            dashType: obj.border.dashType,
+                        }
+                        : undefined,
+                },
+            };
+        case "line":
+            return {
+                line: {
+                    x: pxToIn(obj.x),
+                    y: pxToIn(obj.y),
+                    w: pxToIn(obj.w),
+                    h: pxToIn(obj.h),
+                    line: obj.line
+                        ? {
+                            color: obj.line.color,
+                            width: obj.line.width,
+                            dashType: obj.line.dashType,
+                        }
+                        : { color: "000000", width: 1 },
+                },
+            };
+    }
+}
+/**
+ * SlideMasterOptions から pptxgenjs の defineSlideMaster を呼び出す
+ */
+function defineSlideMasterFromOptions(pptx, master) {
+    const masterName = master.title || DEFAULT_MASTER_NAME;
+    const masterProps = {
+        title: masterName,
+    };
+    // background の変換
+    if (master.background) {
+        if ("color" in master.background) {
+            masterProps.background = { color: master.background.color };
+        }
+        else if ("path" in master.background) {
+            masterProps.background = { path: master.background.path };
+        }
+        else if ("data" in master.background) {
+            masterProps.background = { data: master.background.data };
+        }
+    }
+    // margin の変換 (px -> inches)
+    if (master.margin !== undefined) {
+        if (typeof master.margin === "number") {
+            masterProps.margin = pxToIn(master.margin);
+        }
+        else {
+            masterProps.margin = [
+                pxToIn(master.margin.top ?? 0),
+                pxToIn(master.margin.right ?? 0),
+                pxToIn(master.margin.bottom ?? 0),
+                pxToIn(master.margin.left ?? 0),
+            ];
+        }
+    }
+    // objects の変換
+    if (master.objects && master.objects.length > 0) {
+        masterProps.objects = master.objects.map((obj) => convertMasterObject(obj));
+    }
+    // slideNumber の変換
+    if (master.slideNumber) {
+        masterProps.slideNumber = {
+            x: pxToIn(master.slideNumber.x),
+            y: pxToIn(master.slideNumber.y),
+            w: master.slideNumber.w ? pxToIn(master.slideNumber.w) : undefined,
+            h: master.slideNumber.h ? pxToIn(master.slideNumber.h) : undefined,
+            fontSize: master.slideNumber.fontPx
+                ? pxToPt(master.slideNumber.fontPx)
+                : undefined,
+            fontFace: master.slideNumber.fontFamily,
+            color: master.slideNumber.color,
+        };
+    }
+    pptx.defineSlideMaster(masterProps);
+    return masterName;
+}
 /**
  * PositionedNode ツリーを PptxGenJS スライドに変換する
  * @param pages PositionedNode ツリーの配列（各要素が1ページ）
  * @param slidePx スライド全体のサイズ（px）
+ * @param master スライドマスターオプション（省略可能）
  * @returns PptxGenJS インスタンス
  */
-export function renderPptx(pages, slidePx) {
+export function renderPptx(pages, slidePx, 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 });
     pptx.layout = "custom";
+    // マスターが指定されている場合、defineSlideMaster を呼び出す
+    const masterName = master
+        ? defineSlideMasterFromOptions(pptx, master)
+        : undefined;
     for (const data of pages) {
-        const slide = pptx.addSlide();
+        // マスターが指定されている場合は masterName を使用
+        const slide = masterName ? pptx.addSlide({ masterName }) : pptx.addSlide();
         const ctx = { slide, pptx };
+        // ルートノードの backgroundColor はスライドの background プロパティとして適用
+        // これにより、マスタースライドのオブジェクトを覆い隠さない
+        // line ノードは backgroundColor を持たないためスキップ
+        const rootBackgroundColor = data.type !== "line" ? data.backgroundColor : undefined;
+        if (rootBackgroundColor) {
+            slide.background = { color: rootBackgroundColor };
+        }
         /**
          * node をスライドにレンダリングする
+         * @param isRoot ルートノードかどうか（ルートノードの background は slide.background で処理済み）
          */
-        function renderNode(node) {
-            renderBackgroundAndBorder(node, ctx);
+        function renderNode(node, isRoot = false) {
+            // line ノードは backgroundColor/border を持たないため、background/border の描画をスキップ
+            if (node.type !== "line") {
+                // ルートノードの backgroundColor は既に slide.background に適用済みなのでスキップ
+                if (isRoot && rootBackgroundColor) {
+                    // border のみ描画（backgroundColor はスキップ）
+                    const { border, borderRadius } = node;
+                    const hasBorder = Boolean(border &&
+                        (border.color !== undefined ||
+                            border.width !== undefined ||
+                            border.dashType !== undefined));
+                    if (hasBorder) {
+                        const line = {
+                            color: border?.color ?? "000000",
+                            width: border?.width !== undefined ? pxToPt(border.width) : undefined,
+                            dashType: border?.dashType,
+                        };
+                        const shapeType = borderRadius
+                            ? ctx.pptx.ShapeType.roundRect
+                            : ctx.pptx.ShapeType.rect;
+                        const rectRadius = borderRadius
+                            ? Math.min((borderRadius / Math.min(node.w, node.h)) * 2, 1)
+                            : undefined;
+                        ctx.slide.addShape(shapeType, {
+                            x: pxToIn(node.x),
+                            y: pxToIn(node.y),
+                            w: pxToIn(node.w),
+                            h: pxToIn(node.h),
+                            fill: { type: "none" },
+                            line,
+                            rectRadius,
+                        });
+                    }
+                }
+                else {
+                    renderBackgroundAndBorder(node, ctx);
+                }
+            }
             switch (node.type) {
                 case "text":
                     renderTextNode(node, ctx);
@@ -67,9 +248,18 @@ export function renderPptx(pages, slidePx) {
                 case "processArrow":
                     renderProcessArrowNode(node, ctx);
                     break;
+                case "line":
+                    renderLineNode(node, ctx);
+                    break;
+                case "layer":
+                    // layer の子要素を配列順に描画（後の要素が上に来る）
+                    for (const child of node.children) {
+                        renderNode(child);
+                    }
+                    break;
             }
         }
-        renderNode(data);
+        renderNode(data, true); // ルートノードとして処理
     }
     return pptx;
 }

package/dist/schema.d.ts

@@ -18,6 +18,6 @@
  * }
  * ```
  */
-export { inputPomNodeSchema, inputTextNodeSchema, inputImageNodeSchema, inputTableNodeSchema, inputBoxNodeSchema, inputVStackNodeSchema, inputHStackNodeSchema, inputShapeNodeSchema, inputChartNodeSchema, inputMasterSlideOptionsSchema, inputBaseNodeSchema, type InputPOMNode, type InputTextNode, type InputImageNode, type InputTableNode, type InputBoxNode, type InputVStackNode, type InputHStackNode, type InputShapeNode, type InputChartNode, type InputMasterSlideOptions, } from "./inputSchema";
-export { lengthSchema, paddingSchema, borderStyleSchema, borderDashSchema, fillStyleSchema, shadowStyleSchema, alignItemsSchema, justifyContentSchema, shapeTypeSchema, chartTypeSchema, chartDataSchema, bulletOptionsSchema, bulletNumberTypeSchema, tableColumnSchema, tableRowSchema, tableCellSchema, pageNumberPositionSchema, type Length, type Padding, type BorderStyle, type BorderDash, type FillStyle, type ShadowStyle, type AlignItems, type JustifyContent, type ShapeType, type ChartType, type ChartData, type BulletOptions, type BulletNumberType, type TableColumn, type TableRow, type TableCell, type PageNumberPosition, } from "./types";
+export { inputPomNodeSchema, inputTextNodeSchema, inputImageNodeSchema, inputTableNodeSchema, inputBoxNodeSchema, inputVStackNodeSchema, inputHStackNodeSchema, inputShapeNodeSchema, inputChartNodeSchema, inputSlideMasterOptionsSchema, inputMasterTextObjectSchema, inputMasterImageObjectSchema, inputMasterRectObjectSchema, inputMasterLineObjectSchema, inputMasterObjectSchema, inputSlideNumberOptionsSchema, inputSlideMasterBackgroundSchema, inputSlideMasterMarginSchema, inputBaseNodeSchema, type InputPOMNode, type InputTextNode, type InputImageNode, type InputTableNode, type InputBoxNode, type InputVStackNode, type InputHStackNode, type InputShapeNode, type InputChartNode, type InputSlideMasterOptions, } from "./inputSchema";
+export { lengthSchema, paddingSchema, borderStyleSchema, borderDashSchema, fillStyleSchema, shadowStyleSchema, alignItemsSchema, justifyContentSchema, shapeTypeSchema, chartTypeSchema, chartDataSchema, bulletOptionsSchema, bulletNumberTypeSchema, tableColumnSchema, tableRowSchema, tableCellSchema, slideMasterOptionsSchema, masterTextObjectSchema, masterImageObjectSchema, masterRectObjectSchema, masterLineObjectSchema, masterObjectSchema, slideNumberOptionsSchema, slideMasterBackgroundSchema, slideMasterMarginSchema, type Length, type Padding, type BorderStyle, type BorderDash, type FillStyle, type ShadowStyle, type AlignItems, type JustifyContent, type ShapeType, type ChartType, type ChartData, type BulletOptions, type BulletNumberType, type TableColumn, type TableRow, type TableCell, type SlideMasterOptions, type MasterTextObject, type MasterImageObject, type MasterRectObject, type MasterLineObject, type MasterObject, type SlideNumberOptions, type SlideMasterBackground, type SlideMasterMargin, } from "./types";
 //# sourceMappingURL=schema.d.ts.map

package/dist/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAGH,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACpB,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,EACrB,oBAAoB,EACpB,oBAAoB,EACpB,6BAA6B,EAC7B,mBAAmB,EACnB,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,uBAAuB,GAC7B,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,YAAY,EACZ,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,cAAc,EACd,eAAe,EACf,wBAAwB,EACxB,KAAK,MAAM,EACX,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAChB,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,kBAAkB,GACxB,MAAM,SAAS,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAGH,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACpB,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,EACrB,oBAAoB,EACpB,oBAAoB,EACpB,6BAA6B,EAC7B,2BAA2B,EAC3B,4BAA4B,EAC5B,2BAA2B,EAC3B,2BAA2B,EAC3B,uBAAuB,EACvB,6BAA6B,EAC7B,gCAAgC,EAChC,4BAA4B,EAC5B,mBAAmB,EACnB,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,uBAAuB,GAC7B,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,YAAY,EACZ,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,cAAc,EACd,eAAe,EACf,wBAAwB,EACxB,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,sBAAsB,EACtB,kBAAkB,EAClB,wBAAwB,EACxB,2BAA2B,EAC3B,uBAAuB,EACvB,KAAK,MAAM,EACX,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAChB,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,iBAAiB,GACvB,MAAM,SAAS,CAAC"}

package/dist/schema.js

@@ -19,6 +19,6 @@
  * ```
  */
 // Input schemas for LLM/external input validation
-export { inputPomNodeSchema, inputTextNodeSchema, inputImageNodeSchema, inputTableNodeSchema, inputBoxNodeSchema, inputVStackNodeSchema, inputHStackNodeSchema, inputShapeNodeSchema, inputChartNodeSchema, inputMasterSlideOptionsSchema, inputBaseNodeSchema, } from "./inputSchema";
+export { inputPomNodeSchema, inputTextNodeSchema, inputImageNodeSchema, inputTableNodeSchema, inputBoxNodeSchema, inputVStackNodeSchema, inputHStackNodeSchema, inputShapeNodeSchema, inputChartNodeSchema, inputSlideMasterOptionsSchema, inputMasterTextObjectSchema, inputMasterImageObjectSchema, inputMasterRectObjectSchema, inputMasterLineObjectSchema, inputMasterObjectSchema, inputSlideNumberOptionsSchema, inputSlideMasterBackgroundSchema, inputSlideMasterMarginSchema, inputBaseNodeSchema, } from "./inputSchema";
 // Basic type schemas (browser-compatible)
-export { lengthSchema, paddingSchema, borderStyleSchema, borderDashSchema, fillStyleSchema, shadowStyleSchema, alignItemsSchema, justifyContentSchema, shapeTypeSchema, chartTypeSchema, chartDataSchema, bulletOptionsSchema, bulletNumberTypeSchema, tableColumnSchema, tableRowSchema, tableCellSchema, pageNumberPositionSchema, } from "./types";
+export { lengthSchema, paddingSchema, borderStyleSchema, borderDashSchema, fillStyleSchema, shadowStyleSchema, alignItemsSchema, justifyContentSchema, shapeTypeSchema, chartTypeSchema, chartDataSchema, bulletOptionsSchema, bulletNumberTypeSchema, tableColumnSchema, tableRowSchema, tableCellSchema, slideMasterOptionsSchema, masterTextObjectSchema, masterImageObjectSchema, masterRectObjectSchema, masterLineObjectSchema, masterObjectSchema, slideNumberOptionsSchema, slideMasterBackgroundSchema, slideMasterMarginSchema, } from "./types";

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,UAAU,CAAC;AAGxD;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,OAAO,SAAI,EACX,OAAO,SAAI,GACV,cAAc,CAyIhB"}
+{"version":3,"file":"toPositioned.d.ts","sourceRoot":"","sources":["../../src/toPositioned/toPositioned.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAGxD;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,OAAO,SAAI,EACX,OAAO,SAAI,GACV,cAAc,CAyMhB"}

package/dist/toPositioned/toPositioned.js

@@ -136,5 +136,65 @@ export function toPositioned(pom, parentX = 0, parentY = 0) {
                 children: pom.children.map((child) => toPositioned(child, absoluteX, absoluteY)),
             };
         }
+        case "line": {
+            // line ノードは絶対座標（x1, y1, x2, y2）を持つため、
+            // yogaNode の座標ではなく自身の座標からバウンディングボックスを計算
+            return {
+                ...pom,
+                x: Math.min(pom.x1, pom.x2),
+                y: Math.min(pom.y1, pom.y2),
+                w: Math.abs(pom.x2 - pom.x1),
+                h: Math.abs(pom.y2 - pom.y1),
+            };
+        }
+        case "layer": {
+            // layer の子要素は layer 内の相対座標（child.x, child.y）を持つ
+            // layer の絶対座標に加算してスライド上の絶対座標に変換
+            return {
+                ...pom,
+                x: absoluteX,
+                y: absoluteY,
+                w: layout.width,
+                h: layout.height,
+                children: pom.children.map((child) => {
+                    // layer 内での子要素の絶対座標（child.x, child.y がない場合は 0）
+                    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 {
+                            ...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),
+                        };
+                    }
+                    // その他のノードは通常の処理
+                    // Yoga で計算された子要素の相対座標を取得
+                    const childLayout = child.yogaNode.getComputedLayout();
+                    // 正しい親座標を計算: layer の座標 + child.x - Yoga の相対座標
+                    // こうすることで toPositioned 内で:
+                    // absoluteX = adjustedParentX + childLayout.left
+                    //           = (absoluteX + child.x - childLayout.left) + childLayout.left
+                    //           = absoluteX + child.x
+                    // となり、子要素とその内部の子要素が正しい座標で配置される
+                    const adjustedParentX = absoluteX + childX - childLayout.left;
+                    const adjustedParentY = absoluteY + childY - childLayout.top;
+                    return toPositioned(child, adjustedParentX, adjustedParentY);
+                }),
+            };
+        }
     }
 }