@hirokisakabe/pom 1.1.3 → 1.3.0

package/dist/inputSchema.js

@@ -17,7 +17,7 @@
  * ```
  */
 import { z } from "zod";
-import { lengthSchema, paddingSchema, borderStyleSchema, borderDashSchema, fillStyleSchema, shadowStyleSchema, alignItemsSchema, justifyContentSchema, shapeTypeSchema, tableColumnSchema, tableRowSchema, chartTypeSchema, chartDataSchema, bulletOptionsSchema, radarStyleSchema, timelineDirectionSchema, timelineItemSchema, matrixAxisSchema, matrixQuadrantsSchema, matrixItemSchema, treeLayoutSchema, treeNodeShapeSchema, treeConnectorStyleSchema, flowDirectionSchema, flowNodeItemSchema, flowConnectionSchema, flowConnectorStyleSchema, processArrowDirectionSchema, processArrowStepSchema, lineArrowSchema, } from "./types.js";
+import { lengthSchema, paddingSchema, borderStyleSchema, borderDashSchema, fillStyleSchema, shadowStyleSchema, alignItemsSchema, justifyContentSchema, shapeTypeSchema, tableColumnSchema, tableRowSchema, chartTypeSchema, chartDataSchema, bulletOptionsSchema, radarStyleSchema, timelineDirectionSchema, timelineItemSchema, matrixAxisSchema, matrixQuadrantsSchema, matrixItemSchema, treeLayoutSchema, treeNodeShapeSchema, treeConnectorStyleSchema, flowDirectionSchema, flowNodeItemSchema, flowConnectionSchema, flowConnectorStyleSchema, processArrowDirectionSchema, processArrowStepSchema, lineArrowSchema, underlineSchema, backgroundImageSchema, } from "./types.js";
 // ===== Base Node Schema =====
 export const inputBaseNodeSchema = z.object({
     w: lengthSchema.optional(),
@@ -28,8 +28,10 @@ export const inputBaseNodeSchema = z.object({
     maxH: z.number().optional(),
     padding: paddingSchema.optional(),
     backgroundColor: z.string().optional(),
+    backgroundImage: backgroundImageSchema.optional(),
     border: borderStyleSchema.optional(),
     borderRadius: z.number().optional(),
+    opacity: z.number().min(0).max(1).optional(),
 });
 // ===== Node Schemas =====
 export const inputTextNodeSchema = inputBaseNodeSchema.extend({
@@ -39,13 +41,26 @@ export const inputTextNodeSchema = inputBaseNodeSchema.extend({
     color: z.string().optional(),
     alignText: z.enum(["left", "center", "right"]).optional(),
     bold: z.boolean().optional(),
+    italic: z.boolean().optional(),
+    underline: underlineSchema.optional(),
+    strike: z.boolean().optional(),
+    highlight: z.string().optional(),
     fontFamily: z.string().optional(),
     lineSpacingMultiple: z.number().optional(),
     bullet: z.union([z.boolean(), bulletOptionsSchema]).optional(),
 });
+export const inputImageSizingSchema = z.object({
+    type: z.enum(["contain", "cover", "crop"]),
+    w: z.number().optional(),
+    h: z.number().optional(),
+    x: z.number().optional(),
+    y: z.number().optional(),
+});
 export const inputImageNodeSchema = inputBaseNodeSchema.extend({
     type: z.literal("image"),
     src: z.string(),
+    sizing: inputImageSizingSchema.optional(),
+    shadow: shadowStyleSchema.optional(),
 });
 export const inputTableNodeSchema = inputBaseNodeSchema.extend({
     type: z.literal("table"),
@@ -63,6 +78,11 @@ export const inputShapeNodeSchema = inputBaseNodeSchema.extend({
     fontPx: z.number().optional(),
     color: z.string().optional(),
     alignText: z.enum(["left", "center", "right"]).optional(),
+    bold: z.boolean().optional(),
+    italic: z.boolean().optional(),
+    underline: underlineSchema.optional(),
+    strike: z.boolean().optional(),
+    highlight: z.string().optional(),
 });
 export const inputChartNodeSchema = inputBaseNodeSchema.extend({
     type: z.literal("chart"),
@@ -121,6 +141,10 @@ export const inputProcessArrowNodeSchema = inputBaseNodeSchema.extend({
     gap: z.number().optional(),
     fontPx: z.number().optional(),
     bold: z.boolean().optional(),
+    italic: z.boolean().optional(),
+    underline: underlineSchema.optional(),
+    strike: z.boolean().optional(),
+    highlight: z.string().optional(),
 });
 export const inputLineNodeSchema = inputBaseNodeSchema.extend({
     type: z.literal("line"),
@@ -138,6 +162,7 @@ export const inputLineNodeSchema = inputBaseNodeSchema.extend({
 const inputBoxNodeSchemaBase = inputBaseNodeSchema.extend({
     type: z.literal("box"),
     children: z.lazy(() => inputPomNodeSchema),
+    shadow: shadowStyleSchema.optional(),
 });
 const inputVStackNodeSchemaBase = inputBaseNodeSchema.extend({
     type: z.literal("vstack"),
@@ -212,6 +237,10 @@ export const inputMasterTextObjectSchema = z.object({
     fontFamily: z.string().optional(),
     color: z.string().optional(),
     bold: z.boolean().optional(),
+    italic: z.boolean().optional(),
+    underline: underlineSchema.optional(),
+    strike: z.boolean().optional(),
+    highlight: z.string().optional(),
     alignText: z.enum(["left", "center", "right"]).optional(),
 });
 export const inputMasterImageObjectSchema = z.object({
@@ -258,6 +287,7 @@ export const inputSlideMasterBackgroundSchema = z.union([
     z.object({ color: z.string() }),
     z.object({ path: z.string() }),
     z.object({ data: z.string() }),
+    z.object({ image: z.string() }),
 ]);
 export const inputSlideMasterMarginSchema = z.union([
     z.number(),

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

@@ -1 +1 @@
-{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/image.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,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,CAeN"}
+{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/image.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,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,CAmCN"}

package/dist/renderPptx/nodes/image.js

@@ -5,7 +5,26 @@ export function renderImageNode(node, ctx) {
         y: pxToIn(node.y),
         w: pxToIn(node.w),
         h: pxToIn(node.h),
+        shadow: node.shadow
+            ? {
+                type: node.shadow.type,
+                opacity: node.shadow.opacity,
+                blur: node.shadow.blur,
+                angle: node.shadow.angle,
+                offset: node.shadow.offset,
+                color: node.shadow.color,
+            }
+            : undefined,
     };
+    if (node.sizing) {
+        imageOptions.sizing = {
+            type: node.sizing.type,
+            w: pxToIn(node.sizing.w ?? node.w),
+            h: pxToIn(node.sizing.h ?? node.h),
+            ...(node.sizing.x !== undefined && { x: pxToIn(node.sizing.x) }),
+            ...(node.sizing.y !== undefined && { y: pxToIn(node.sizing.y) }),
+        };
+    }
     if (node.imageData) {
         // Base64 データがある場合は data プロパティを使用（リモート画像）
         ctx.slide.addImage({ ...imageOptions, data: node.imageData });

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

@@ -1 +1 @@
-{"version":3,"file":"processArrow.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/processArrow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,KAAK,0BAA0B,GAAG,OAAO,CACvC,cAAc,EACd;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CACzB,CAAC;AAEF,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,0BAA0B,EAChC,GAAG,EAAE,aAAa,GACjB,IAAI,CAsCN"}
+{"version":3,"file":"processArrow.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/processArrow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,KAAK,0BAA0B,GAAG,OAAO,CACvC,cAAc,EACd;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CACzB,CAAC;AAEF,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,0BAA0B,EAChC,GAAG,EAAE,aAAa,GACjB,IAAI,CAsCN"}

package/dist/renderPptx/nodes/processArrow.js

@@ -1,4 +1,5 @@
 import { pxToIn, pxToPt } from "../units.js";
+import { convertUnderline, convertStrike } from "../textOptions.js";
 export function renderProcessArrowNode(node, ctx) {
     const direction = node.direction ?? "horizontal";
     const steps = node.steps;
@@ -40,6 +41,10 @@ function renderHorizontalProcessArrow(node, ctx, steps, stepCount, itemWidth, it
             fontFace: "Noto Sans JP",
             color: textColor,
             bold: node.bold ?? false,
+            italic: node.italic,
+            underline: convertUnderline(node.underline),
+            strike: convertStrike(node.strike),
+            highlight: node.highlight,
             align: "center",
             valign: "middle",
         });
@@ -68,6 +73,10 @@ function renderVerticalProcessArrow(node, ctx, steps, stepCount, itemWidth, item
             fontFace: "Noto Sans JP",
             color: textColor,
             bold: node.bold ?? false,
+            italic: node.italic,
+            underline: convertUnderline(node.underline),
+            strike: convertStrike(node.strike),
+            highlight: node.highlight,
             align: "center",
             valign: "middle",
         });

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;AAGjD,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,CAgDN"}
+{"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"}

package/dist/renderPptx/nodes/shape.js

@@ -1,4 +1,5 @@
 import { pxToIn, pxToPt } from "../units.js";
+import { convertUnderline, convertStrike } from "../textOptions.js";
 export function renderShapeNode(node, ctx) {
     const shapeOptions = {
         x: pxToIn(node.x),
@@ -37,6 +38,11 @@ export function renderShapeNode(node, ctx) {
             fontSize: pxToPt(node.fontPx ?? 24),
             fontFace: "Noto Sans JP",
             color: node.color,
+            bold: node.bold,
+            italic: node.italic,
+            underline: convertUnderline(node.underline),
+            strike: convertStrike(node.strike),
+            highlight: node.highlight,
             align: node.alignText ?? "center",
             valign: "middle",
             lineSpacingMultiple: 1.3,

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;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,CA+BN"}
+{"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;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,CAmCN"}

package/dist/renderPptx/nodes/table.js

@@ -1,11 +1,16 @@
 import { resolveColumnWidths, resolveRowHeights } from "../../table/utils.js";
 import { pxToIn, pxToPt } from "../units.js";
+import { convertUnderline, convertStrike } from "../textOptions.js";
 export function renderTableNode(node, ctx) {
     const tableRows = node.rows.map((row) => row.cells.map((cell) => {
         const cellOptions = {
             fontSize: pxToPt(cell.fontPx ?? 18),
             color: cell.color,
             bold: cell.bold,
+            italic: cell.italic,
+            underline: convertUnderline(cell.underline),
+            strike: convertStrike(cell.strike),
+            highlight: cell.highlight,
             align: cell.alignText ?? "left",
             fill: cell.backgroundColor
                 ? { color: cell.backgroundColor }

package/dist/renderPptx/renderPptx.d.ts

@@ -3,7 +3,7 @@ type SlidePx = {
     w: number;
     h: number;
 };
-export { createTextOptions } from "./textOptions.ts";
+export { createTextOptions, convertUnderline, convertStrike, } from "./textOptions.ts";
 export { PX_PER_IN, pxToIn, pxToPt } from "./units.ts";
 /**
  * PositionedNode ツリーを PptxGenJS スライドに変換する

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;AAkBrB,KAAK,OAAO,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AA+IvD;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,cAAc,EAAE,EACvB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,kBAAkB,+BAgJ5B"}
+{"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;AAoBrB,KAAK,OAAO,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AACxC,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,GACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAqJvD;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,cAAc,EAAE,EACvB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,kBAAkB,+BAqK5B"}

package/dist/renderPptx/renderPptx.js

@@ -6,9 +6,11 @@ const pptxModule = require("pptxgenjs");
 /* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access */
 const PptxGenJS = pptxModule.default ?? pptxModule;
 import { pxToIn, pxToPt } from "./units.js";
+import { convertUnderline, convertStrike } from "./textOptions.js";
+import { getImageData } from "../calcYogaLayout/measureImage.js";
 import { renderBackgroundAndBorder } from "./utils/backgroundBorder.js";
 import { renderTextNode, renderImageNode, renderTableNode, renderShapeNode, renderChartNode, renderTimelineNode, renderMatrixNode, renderTreeNode, renderFlowNode, renderProcessArrowNode, renderLineNode, } from "./nodes/index.js";
-export { createTextOptions } from "./textOptions.js";
+export { createTextOptions, convertUnderline, convertStrike, } from "./textOptions.js";
 export { PX_PER_IN, pxToIn, pxToPt } from "./units.js";
 const DEFAULT_MASTER_NAME = "POM_MASTER";
 /**
@@ -29,6 +31,10 @@ function convertMasterObject(obj) {
                         fontFace: obj.fontFamily,
                         color: obj.color,
                         bold: obj.bold,
+                        italic: obj.italic,
+                        underline: convertUnderline(obj.underline),
+                        strike: convertStrike(obj.strike),
+                        highlight: obj.highlight,
                         align: obj.alignText,
                     },
                 },
@@ -105,6 +111,9 @@ function defineSlideMasterFromOptions(pptx, master) {
         else if ("data" in master.background) {
             masterProps.background = { data: master.background.data };
         }
+        else if ("image" in master.background) {
+            masterProps.background = { path: master.background.image };
+        }
     }
     // margin の変換 (px -> inches)
     if (master.margin !== undefined) {
@@ -164,10 +173,25 @@ export function renderPptx(pages, slidePx, master) {
         // ルートノードの backgroundColor はスライドの background プロパティとして適用
         // これにより、マスタースライドのオブジェクトを覆い隠さない
         // line ノードは backgroundColor を持たないためスキップ
+        // ただし opacity が指定されている場合は slide.background では透過を表現できないため、
+        // renderBackgroundAndBorder で描画する
         const rootBackgroundColor = data.type !== "line" ? data.backgroundColor : undefined;
-        if (rootBackgroundColor) {
+        const rootHasOpacity = data.type !== "line" && "opacity" in data && data.opacity !== undefined;
+        if (rootBackgroundColor && !rootHasOpacity) {
             slide.background = { color: rootBackgroundColor };
         }
+        // ルートノードの backgroundImage はスライドの background プロパティとして適用
+        // backgroundColor と backgroundImage の両方がある場合、backgroundImage が優先
+        const rootBackgroundImage = data.type !== "line" ? data.backgroundImage : undefined;
+        if (rootBackgroundImage) {
+            const cachedData = getImageData(rootBackgroundImage.src);
+            if (cachedData) {
+                slide.background = { data: cachedData };
+            }
+            else {
+                slide.background = { path: rootBackgroundImage.src };
+            }
+        }
         /**
          * node をスライドにレンダリングする
          * @param isRoot ルートノードかどうか（ルートノードの background は slide.background で処理済み）
@@ -175,9 +199,11 @@ export function renderPptx(pages, slidePx, master) {
         function renderNode(node, isRoot = false) {
             // line ノードは backgroundColor/border を持たないため、background/border の描画をスキップ
             if (node.type !== "line") {
-                // ルートノードの backgroundColor は既に slide.background に適用済みなのでスキップ
-                if (isRoot && rootBackgroundColor) {
-                    // border のみ描画（backgroundColor はスキップ）
+                // ルートノードの backgroundColor/backgroundImage は既に slide.background に適用済みなのでスキップ
+                // ただし opacity がある場合は slide.background では透過を表現できないため通常描画
+                if (isRoot &&
+                    (rootBackgroundImage || (rootBackgroundColor && !rootHasOpacity))) {
+                    // border のみ描画（backgroundColor/backgroundImage はスキップ）
                     const { border, borderRadius } = node;
                     const hasBorder = Boolean(border &&
                         (border.color !== undefined ||

package/dist/renderPptx/textOptions.d.ts

@@ -1,7 +1,18 @@
-import type { PositionedNode, BulletOptions } from "../types.ts";
+import type { PositionedNode, BulletOptions, Underline, UnderlineStyle } from "../types.ts";
 type TextNode = Extract<PositionedNode, {
     type: "text";
 }>;
+/**
+ * underline プロパティを pptxgenjs 形式に変換する
+ */
+export declare function convertUnderline(underline: Underline | undefined): {
+    style?: UnderlineStyle;
+    color?: string;
+} | undefined;
+/**
+ * strike プロパティを pptxgenjs 形式に変換する
+ */
+export declare function convertStrike(strike: boolean | undefined): "sngStrike" | undefined;
 type PptxBulletOptions = {
     type?: "bullet" | "number";
     indent?: number;
@@ -22,6 +33,13 @@ export declare function createTextOptions(node: TextNode): {
     lineSpacingMultiple: number;
     color: string;
     bold: boolean;
+    italic: boolean;
+    underline: {
+        style?: UnderlineStyle;
+        color?: string;
+    };
+    strike: "sngStrike";
+    highlight: string;
 } | {
     bullet: boolean | PptxBulletOptions;
     x: number;
@@ -36,6 +54,13 @@ export declare function createTextOptions(node: TextNode): {
     lineSpacingMultiple: number;
     color: string;
     bold: boolean;
+    italic: boolean;
+    underline: {
+        style?: UnderlineStyle;
+        color?: string;
+    };
+    strike: "sngStrike";
+    highlight: string;
 };
 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,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjE,KAAK,QAAQ,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAE1D,KAAK,iBAAiB,GAAG;IACvB,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,OAAO,GAAG,aAAa,GAC9B,iBAAiB,GAAG,OAAO,CAqB7B;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4B/C"}
+{"version":3,"file":"textOptions.d.ts","sourceRoot":"","sources":["../../src/renderPptx/textOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,SAAS,EACT,cAAc,EACf,MAAM,aAAa,CAAC;AAGrB,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,KAAK,iBAAiB,GAAG;IACvB,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,OAAO,GAAG,aAAa,GAC9B,iBAAiB,GAAG,OAAO,CAqB7B;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ;;;;;;;;;;;;;;;gBApDnC,cAAc;gBAAU,MAAM;;;;;;;;;;;;;;;;;;;;gBAA9B,cAAc;gBAAU,MAAM;;;;EAoF1C"}

package/dist/renderPptx/textOptions.js

@@ -1,4 +1,27 @@
 import { pxToIn, pxToPt } from "./units.js";
+/**
+ * underline プロパティを pptxgenjs 形式に変換する
+ */
+export function convertUnderline(underline) {
+    if (underline === undefined)
+        return undefined;
+    if (underline === false)
+        return undefined;
+    if (underline === true)
+        return { style: "sng" };
+    return {
+        style: underline.style,
+        color: underline.color,
+    };
+}
+/**
+ * strike プロパティを pptxgenjs 形式に変換する
+ */
+export function convertStrike(strike) {
+    if (strike)
+        return "sngStrike";
+    return undefined;
+}
 export function createBulletOptions(bullet) {
     if (typeof bullet === "boolean") {
         return bullet;
@@ -35,6 +58,10 @@ export function createTextOptions(node) {
         lineSpacingMultiple,
         color: node.color,
         bold: node.bold,
+        italic: node.italic,
+        underline: convertUnderline(node.underline),
+        strike: convertStrike(node.strike),
+        highlight: node.highlight,
     };
     if (node.bullet !== undefined) {
         return {

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

@@ -1,8 +1,10 @@
 import type { PositionedNode } from "../../types.ts";
 import type { RenderContext } from "../types.ts";
 /**
- * ノードの背景色とボーダーを描画する
+ * ノードの背景色・背景画像・ボーダー・影を描画する
  * 全ノードタイプで最初に呼び出される共通処理
+ *
+ * 描画順序: 背景色 → 背景画像 → ボーダー
  */
 export declare function renderBackgroundAndBorder(node: PositionedNode, ctx: RenderContext): void;
 //# sourceMappingURL=backgroundBorder.d.ts.map

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;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,aAAa,GACjB,IAAI,CA+CN"}
+{"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"}

package/dist/renderPptx/utils/backgroundBorder.js

@@ -1,28 +1,34 @@
+import { getImageData } from "../../calcYogaLayout/measureImage.js";
 import { pxToIn, pxToPt } from "../units.js";
+function convertShadow(shadow) {
+    return {
+        type: shadow.type,
+        opacity: shadow.opacity,
+        blur: shadow.blur,
+        angle: shadow.angle,
+        offset: shadow.offset,
+        color: shadow.color,
+    };
+}
 /**
- * ノードの背景色とボーダーを描画する
+ * ノードの背景色・背景画像・ボーダー・影を描画する
  * 全ノードタイプで最初に呼び出される共通処理
+ *
+ * 描画順序: 背景色 → 背景画像 → ボーダー
  */
 export function renderBackgroundAndBorder(node, ctx) {
-    const { backgroundColor, border, borderRadius } = node;
+    const { backgroundColor, backgroundImage, border, borderRadius } = node;
+    const shadow = "shadow" in node ? node.shadow : undefined;
     const hasBackground = Boolean(backgroundColor);
+    const hasBackgroundImage = Boolean(backgroundImage);
     const hasBorder = Boolean(border &&
         (border.color !== undefined ||
             border.width !== undefined ||
             border.dashType !== undefined));
-    if (!hasBackground && !hasBorder) {
+    const hasShadow = Boolean(shadow);
+    if (!hasBackground && !hasBackgroundImage && !hasBorder && !hasShadow) {
         return;
     }
-    const fill = hasBackground
-        ? { color: backgroundColor }
-        : { type: "none" };
-    const line = hasBorder
-        ? {
-            color: border?.color ?? "000000",
-            width: border?.width !== undefined ? pxToPt(border.width) : undefined,
-            dashType: border?.dashType,
-        }
-        : { type: "none" };
     // borderRadius がある場合は roundRect を使用し、rectRadius を計算
     const shapeType = borderRadius
         ? ctx.pptx.ShapeType.roundRect
@@ -31,14 +37,88 @@ export function renderBackgroundAndBorder(node, ctx) {
     const rectRadius = borderRadius
         ? Math.min((borderRadius / Math.min(node.w, node.h)) * 2, 1)
         : undefined;
-    const shapeOptions = {
-        x: pxToIn(node.x),
-        y: pxToIn(node.y),
-        w: pxToIn(node.w),
-        h: pxToIn(node.h),
-        fill,
-        line,
-        rectRadius,
-    };
-    ctx.slide.addShape(shapeType, shapeOptions);
+    // backgroundImage がない場合は従来通り1回の addShape で処理
+    if (!hasBackgroundImage) {
+        const fill = hasBackground
+            ? {
+                color: backgroundColor,
+                transparency: node.opacity !== undefined ? (1 - node.opacity) * 100 : undefined,
+            }
+            : { type: "none" };
+        const line = hasBorder
+            ? {
+                color: border?.color ?? "000000",
+                width: border?.width !== undefined ? pxToPt(border.width) : undefined,
+                dashType: border?.dashType,
+            }
+            : { type: "none" };
+        ctx.slide.addShape(shapeType, {
+            x: pxToIn(node.x),
+            y: pxToIn(node.y),
+            w: pxToIn(node.w),
+            h: pxToIn(node.h),
+            fill,
+            line,
+            rectRadius,
+            shadow: shadow ? convertShadow(shadow) : undefined,
+        });
+        return;
+    }
+    // backgroundImage がある場合は分割描画: 背景色 → 背景画像 → ボーダー
+    // 1. 背景色
+    if (hasBackground) {
+        ctx.slide.addShape(shapeType, {
+            x: pxToIn(node.x),
+            y: pxToIn(node.y),
+            w: pxToIn(node.w),
+            h: pxToIn(node.h),
+            fill: {
+                color: backgroundColor,
+                transparency: node.opacity !== undefined ? (1 - node.opacity) * 100 : undefined,
+            },
+            line: { type: "none" },
+            rectRadius,
+        });
+    }
+    // 2. 背景画像
+    if (backgroundImage) {
+        const sizing = backgroundImage.sizing ?? "cover";
+        const imageOptions = {
+            x: pxToIn(node.x),
+            y: pxToIn(node.y),
+            w: pxToIn(node.w),
+            h: pxToIn(node.h),
+            sizing: {
+                type: sizing,
+                w: pxToIn(node.w),
+                h: pxToIn(node.h),
+            },
+        };
+        const cachedData = getImageData(backgroundImage.src);
+        if (cachedData) {
+            ctx.slide.addImage({ ...imageOptions, data: cachedData });
+        }
+        else {
+            ctx.slide.addImage({ ...imageOptions, path: backgroundImage.src });
+        }
+    }
+    // 3. ボーダー
+    if (hasBorder || hasShadow) {
+        ctx.slide.addShape(shapeType, {
+            x: pxToIn(node.x),
+            y: pxToIn(node.y),
+            w: pxToIn(node.w),
+            h: pxToIn(node.h),
+            fill: { type: "none" },
+            line: hasBorder
+                ? {
+                    color: border?.color ?? "000000",
+                    width: border?.width !== undefined ? pxToPt(border.width) : undefined,
+                    dashType: border?.dashType,
+                }
+                : { type: "none" },
+            rectRadius,
+            shadow: shadow ? convertShadow(shadow) : undefined,
+        });
+    }
 }

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

@@ -1,3 +1,4 @@
+import type { Underline } from "../../types.ts";
 import type { RenderContext } from "../types.ts";
 export type SimpleTextOptions = {
     x: number;
@@ -9,6 +10,10 @@ export type SimpleTextOptions = {
     fontFace?: string;
     color?: string;
     bold?: boolean;
+    italic?: boolean;
+    underline?: Underline;
+    strike?: boolean;
+    highlight?: string;
     align?: "left" | "center" | "right";
     valign?: "top" | "middle" | "bottom";
 };

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

@@ -1 +1 @@
-{"version":3,"file":"textDrawing.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/utils/textDrawing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IACpC,MAAM,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAC;CACtC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,iBAAiB,GACzB,IAAI,CA2BN"}
+{"version":3,"file":"textDrawing.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/utils/textDrawing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IACpC,MAAM,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAC;CACtC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,iBAAiB,GACzB,IAAI,CAmCN"}

package/dist/renderPptx/utils/textDrawing.js

@@ -1,10 +1,11 @@
 import { pxToIn, pxToPt } from "../units.js";
+import { convertUnderline, convertStrike } from "../textOptions.js";
 /**
  * シンプルなテキストを描画する
  * timeline, matrix, tree, flow などの複雑ノードで使用
  */
 export function drawSimpleText(ctx, options) {
-    const { x, y, w, h, text, fontSize = 12, fontFace = "Noto Sans JP", color = "000000", bold, align = "left", valign = "top", } = options;
+    const { x, y, w, h, text, fontSize = 12, fontFace = "Noto Sans JP", color = "000000", bold, italic, underline, strike, highlight, align = "left", valign = "top", } = options;
     ctx.slide.addText(text, {
         x: pxToIn(x),
         y: pxToIn(y),
@@ -14,6 +15,10 @@ export function drawSimpleText(ctx, options) {
         fontFace,
         color,
         bold,
+        italic,
+        underline: convertUnderline(underline),
+        strike: convertStrike(strike),
+        highlight,
         align,
         valign,
     });