@hirokisakabe/pom 6.4.0 → 7.1.0

package/README.md

@@ -36,11 +36,11 @@
 ## Features
 
 - **AI Friendly** — Simple XML structure designed for LLM code generation. Include [llm.txt](./website/public/llm.txt) in your system prompt for XML reference. Also available at `https://pom.pptx.app/llm.txt`.
-- **Declarative** — Describe slides as XML. No imperative API calls needed.
+- **Declarative** — Describe slides as XML. No imperative API calls needed — just data in, PPTX out.
 - **Flexible Layout** — Flexbox-style layout with VStack / HStack, powered by yoga-layout.
 - **Rich Nodes** — 18 built-in node types: charts, flowcharts, tables, timelines, org trees, and more.
 - **Schema-validated** — XML input is validated with Zod schemas at runtime with clear error messages.
-- **PowerPoint Native** — Full access to native PowerPoint shape features (roundRect, ellipse, arrows, etc.).
+- **PowerPoint Native** — Generates real editable PowerPoint shapes — not images. Recipients can modify everything.
 - **Pixel Units** — Intuitive pixel-based sizing (internally converted to inches at 96 DPI).
 - **Master Slide** — Define headers, footers, and page numbers once — applied to all slides automatically.
 - **Accurate Text Measurement** — Text width measured with opentype.js and bundled Noto Sans JP fonts for consistent layout.
@@ -142,16 +142,16 @@ For detailed node documentation, see [Nodes](./docs/nodes.md).
 
 ```xml
 <Table defaultRowHeight="36" cellBorder='{"color":"CBD5E1","width":1}'>
-  <TableColumn width="80" />
-  <TableColumn width="200" />
-  <TableRow>
-    <TableCell bold="true" backgroundColor="0F172A" color="FFFFFF">ID</TableCell>
-    <TableCell bold="true" backgroundColor="0F172A" color="FFFFFF">Name</TableCell>
-  </TableRow>
-  <TableRow>
-    <TableCell>001</TableCell>
-    <TableCell>Project Alpha</TableCell>
-  </TableRow>
+  <Col width="80" />
+  <Col width="200" />
+  <Tr>
+    <Td bold="true" backgroundColor="0F172A" color="FFFFFF">ID</Td>
+    <Td bold="true" backgroundColor="0F172A" color="FFFFFF">Name</Td>
+  </Tr>
+  <Tr>
+    <Td>001</Td>
+    <Td>Project Alpha</Td>
+  </Tr>
 </Table>
 ```
 

package/dist/buildPptx.d.ts

@@ -11,6 +11,7 @@ export declare function buildPptx(xml: string, slideSize: {
     h: number;
 }, options?: {
     master?: SlideMasterOptions;
+    masterPptx?: ArrayBuffer | Uint8Array;
     textMeasurement?: TextMeasurementMode;
     autoFit?: boolean;
     strict?: boolean;

package/dist/buildPptx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildPptx.d.ts","sourceRoot":"","sources":["../src/buildPptx.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAMnD,OAAO,EAAkB,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhE,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAEpC,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,OAAO,WAAW,EAAE,OAAO,CAAC;IAClC,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B;AAED,wBAAsB,SAAS,CAC7B,GAAG,EAAE,MAAM,EACX,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;IACtC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GACA,OAAO,CAAC,eAAe,CAAC,CAmC1B"}
+{"version":3,"file":"buildPptx.d.ts","sourceRoot":"","sources":["../src/buildPptx.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAOnD,OAAO,EAAkB,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhE,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAEpC,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,OAAO,WAAW,EAAE,OAAO,CAAC;IAClC,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B;AAED,wBAAsB,SAAS,CAC7B,GAAG,EAAE,MAAM,EACX,SAAS,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,EACnC,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,UAAU,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC;IACtC,eAAe,CAAC,EAAE,mBAAmB,CAAC;IACtC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GACA,OAAO,CAAC,eAAe,CAAC,CAoD1B"}

package/dist/buildPptx.js

@@ -3,6 +3,7 @@ import { createBuildContext } from "./buildContext.js";
 import { calcYogaLayout } from "./calcYogaLayout/calcYogaLayout.js";
 import { extractLayoutResults } from "./calcYogaLayout/types.js";
 import { DiagnosticsError } from "./diagnostics.js";
+import { parseMasterPptx } from "./parseMasterPptx.js";
 import { parseXml } from "./parseXml/parseXml.js";
 import { renderPptx } from "./renderPptx/renderPptx.js";
 import { freeYogaTree } from "./shared/freeYogaTree.js";
@@ -29,7 +30,29 @@ export async function buildPptx(xml, slideSize, options) {
                 freeYogaTree(map);
         }
     }
-    const pptx = await renderPptx(positionedPages, slideSize, ctx, options?.master);
+    // masterPptx から背景を抽出し、master オプションにマージ
+    let master = options?.master;
+    if (options?.masterPptx) {
+        try {
+            const bg = await parseMasterPptx(options.masterPptx);
+            if (bg) {
+                if (master) {
+                    // 明示的に background が指定されていない場合のみ、masterPptx の背景を使用
+                    if (!master.background) {
+                        master = { ...master, background: bg };
+                    }
+                }
+                else {
+                    master = { background: bg };
+                }
+            }
+        }
+        catch (e) {
+            const message = e instanceof Error ? e.message : "Unknown error parsing masterPptx";
+            ctx.diagnostics.add("MASTER_PPTX_PARSE_FAILED", message);
+        }
+    }
+    const pptx = await renderPptx(positionedPages, slideSize, ctx, master);
     const diagnostics = ctx.diagnostics.items;
     if (options?.strict && diagnostics.length > 0) {
         throw new DiagnosticsError(diagnostics);

package/dist/diagnostics.d.ts

@@ -1,4 +1,4 @@
-export type DiagnosticCode = "IMAGE_MEASURE_FAILED" | "IMAGE_NOT_PREFETCHED" | "AUTOFIT_OVERFLOW" | "SCALE_BELOW_THRESHOLD";
+export type DiagnosticCode = "IMAGE_MEASURE_FAILED" | "IMAGE_NOT_PREFETCHED" | "AUTOFIT_OVERFLOW" | "SCALE_BELOW_THRESHOLD" | "MASTER_PPTX_PARSE_FAILED";
 export interface Diagnostic {
     code: DiagnosticCode;
     message: string;

package/dist/diagnostics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../src/diagnostics.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GACtB,sBAAsB,GACtB,sBAAsB,GACtB,kBAAkB,GAClB,uBAAuB,CAAC;AAE5B,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,mBAAmB;IAC9B,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,CAAM;IAElC,GAAG,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;CAGjD;AAED,qBAAa,gBAAiB,SAAQ,KAAK;aACb,WAAW,EAAE,UAAU,EAAE;gBAAzB,WAAW,EAAE,UAAU,EAAE;CAOtD"}
+{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../src/diagnostics.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GACtB,sBAAsB,GACtB,sBAAsB,GACtB,kBAAkB,GAClB,uBAAuB,GACvB,0BAA0B,CAAC;AAE/B,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,mBAAmB;IAC9B,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,CAAM;IAElC,GAAG,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;CAGjD;AAED,qBAAa,gBAAiB,SAAQ,KAAK;aACb,WAAW,EAAE,UAAU,EAAE;gBAAzB,WAAW,EAAE,UAAU,EAAE;CAOtD"}

package/dist/parseMasterPptx.d.ts

@@ -0,0 +1,16 @@
+import type { SlideMasterBackground } from "./types.ts";
+/**
+ * マスター PPTX のバッファからスライドマスターの背景情報を抽出する。
+ *
+ * 探索順序:
+ * 1. `ppt/slideMasters/slideMaster1.xml` の `p:bg > p:bgPr`
+ * 2. 各スライドレイアウト (`ppt/slideLayouts/slideLayoutN.xml`) の `p:bg > p:bgPr`
+ *
+ * サポートする背景:
+ * - 単色塗りつぶし (`a:solidFill` / `a:srgbClr`)
+ * - 画像背景 (`a:blipFill` / `a:blip`)
+ *
+ * @returns 背景情報。背景が設定されていない場合は `undefined`。
+ */
+export declare function parseMasterPptx(pptxBuffer: ArrayBuffer | Uint8Array): Promise<SlideMasterBackground | undefined>;
+//# sourceMappingURL=parseMasterPptx.d.ts.map

package/dist/parseMasterPptx.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseMasterPptx.d.ts","sourceRoot":"","sources":["../src/parseMasterPptx.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAqHxD;;;;;;;;;;;;GAYG;AACH,wBAAsB,eAAe,CACnC,UAAU,EAAE,WAAW,GAAG,UAAU,GACnC,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAqD5C"}

package/dist/parseMasterPptx.js

@@ -0,0 +1,152 @@
+import { XMLParser } from "fast-xml-parser";
+// JSZip は CJS パッケージのため動的 import で読み込む
+async function loadJSZip() {
+    const mod = await import("jszip");
+    /* eslint-disable @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return */
+    return mod.default ?? mod;
+    /* eslint-enable @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return */
+}
+const xmlParser = new XMLParser({
+    ignoreAttributes: false,
+    attributeNamePrefix: "@_",
+});
+/**
+ * MIME タイプを拡張子から判定する
+ */
+function mimeTypeFromExt(filePath) {
+    const ext = filePath.split(".").pop()?.toLowerCase();
+    switch (ext) {
+        case "png":
+            return "image/png";
+        case "jpg":
+        case "jpeg":
+            return "image/jpeg";
+        case "gif":
+            return "image/gif";
+        case "bmp":
+            return "image/bmp";
+        case "svg":
+            return "image/svg+xml";
+        case "tiff":
+        case "tif":
+            return "image/tiff";
+        case "webp":
+            return "image/webp";
+        default:
+            return "image/png";
+    }
+}
+/**
+ * rels XML から rId に対応するファイルパスを取得する
+ */
+function resolveRelId(relsXml, rId) {
+    /* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access */
+    const parsed = xmlParser.parse(relsXml);
+    const relationships = parsed?.Relationships?.Relationship;
+    if (!relationships)
+        return undefined;
+    const rels = Array.isArray(relationships) ? relationships : [relationships];
+    for (const rel of rels) {
+        if (rel["@_Id"] === rId) {
+            return rel["@_Target"];
+        }
+    }
+    /* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access */
+    return undefined;
+}
+/* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access */
+/**
+ * bgPr 要素から背景情報を抽出する
+ */
+async function extractBackgroundFromBgPr(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+bgPr, zip, relsPath, basePath) {
+    if (!bgPr)
+        return undefined;
+    // 単色塗りつぶし
+    const solidFill = bgPr["a:solidFill"];
+    if (solidFill) {
+        const srgbClr = solidFill["a:srgbClr"];
+        if (srgbClr) {
+            const color = srgbClr["@_val"] ?? undefined;
+            if (color)
+                return { color };
+        }
+    }
+    // 画像背景
+    const blipFill = bgPr["a:blipFill"];
+    if (blipFill) {
+        const blip = blipFill["a:blip"];
+        const rId = blip?.["@_r:embed"];
+        if (!rId)
+            return undefined;
+        const relsFile = zip.file(relsPath);
+        if (!relsFile)
+            return undefined;
+        const relsXml = await relsFile.async("text");
+        const target = resolveRelId(relsXml, rId);
+        if (!target)
+            return undefined;
+        // target は相対パスなので basePath からの相対パスとして解決
+        const imagePath = new URL(target, `file:///${basePath}dummy`).pathname.slice(1);
+        const imageFile = zip.file(imagePath);
+        if (!imageFile)
+            return undefined;
+        const imageData = await imageFile.async("base64");
+        const mimeType = mimeTypeFromExt(imagePath);
+        return { data: `data:${mimeType};base64,${imageData}` };
+    }
+    return undefined;
+}
+/* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access */
+/**
+ * マスター PPTX のバッファからスライドマスターの背景情報を抽出する。
+ *
+ * 探索順序:
+ * 1. `ppt/slideMasters/slideMaster1.xml` の `p:bg > p:bgPr`
+ * 2. 各スライドレイアウト (`ppt/slideLayouts/slideLayoutN.xml`) の `p:bg > p:bgPr`
+ *
+ * サポートする背景:
+ * - 単色塗りつぶし (`a:solidFill` / `a:srgbClr`)
+ * - 画像背景 (`a:blipFill` / `a:blip`)
+ *
+ * @returns 背景情報。背景が設定されていない場合は `undefined`。
+ */
+export async function parseMasterPptx(pptxBuffer) {
+    const JSZip = await loadJSZip();
+    const zip = await JSZip.loadAsync(pptxBuffer);
+    /* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access */
+    // 1. スライドマスター本体を探索
+    const masterFile = zip.file("ppt/slideMasters/slideMaster1.xml");
+    if (masterFile) {
+        const masterXml = await masterFile.async("text");
+        const parsed = xmlParser.parse(masterXml);
+        const bgPr = parsed?.["p:sldMaster"]?.["p:cSld"]?.["p:bg"]?.["p:bgPr"];
+        const result = await extractBackgroundFromBgPr(bgPr, zip, "ppt/slideMasters/_rels/slideMaster1.xml.rels", "ppt/slideMasters/");
+        if (result)
+            return result;
+    }
+    // 2. スライドレイアウトを探索
+    const layoutFiles = Object.keys(zip.files).filter((f) => f.startsWith("ppt/slideLayouts/slideLayout") && f.endsWith(".xml"));
+    // 番号順にソート（数値ソートで slideLayout2 < slideLayout10 の順序を保証）
+    layoutFiles.sort((a, b) => {
+        const numA = parseInt(a.match(/slideLayout(\d+)\.xml$/)?.[1] ?? "0", 10);
+        const numB = parseInt(b.match(/slideLayout(\d+)\.xml$/)?.[1] ?? "0", 10);
+        return numA - numB;
+    });
+    for (const layoutPath of layoutFiles) {
+        const layoutFile = zip.file(layoutPath);
+        if (!layoutFile)
+            continue;
+        const layoutXml = await layoutFile.async("text");
+        const parsed = xmlParser.parse(layoutXml);
+        const bgPr = parsed?.["p:sldLayout"]?.["p:cSld"]?.["p:bg"]?.["p:bgPr"];
+        const fileName = layoutPath.split("/").pop();
+        const relsPath = `ppt/slideLayouts/_rels/${fileName}.rels`;
+        const result = await extractBackgroundFromBgPr(bgPr, zip, relsPath, "ppt/slideLayouts/");
+        if (result)
+            return result;
+    }
+    /* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access */
+    return undefined;
+}

package/dist/parseXml/coercionRules.js

@@ -442,10 +442,10 @@ export const CHILD_ELEMENT_COERCION_MAP = {
         label: "string",
         color: "string",
     },
-    TableColumn: {
+    Col: {
         width: "number",
     },
-    TableCell: {
+    Td: {
         text: "string",
         fontSize: "number",
         color: "string",

package/dist/parseXml/parseXml.js

@@ -546,19 +546,19 @@ function convertTableChildren(childElements, result, errors) {
     for (const child of childElements) {
         const tag = getTagName(child);
         switch (tag) {
-            case "TableColumn":
+            case "Col":
                 columns.push(coerceChildAttrs("Table", tag, getAttributes(child), errors));
                 break;
-            case "TableRow": {
+            case "Tr": {
                 const rowAttrs = getAttributes(child);
                 const cells = [];
                 for (const cellEl of getChildElements(child)) {
                     const cellTag = getTagName(cellEl);
-                    if (cellTag !== "TableCell") {
-                        errors.push(`Unknown child element <${cellTag}> inside <TableRow>. Expected: <TableCell>`);
+                    if (cellTag !== "Td") {
+                        errors.push(`Unknown child element <${cellTag}> inside <Tr>. Expected: <Td>`);
                         continue;
                     }
-                    const cellAttrs = coerceChildAttrs("TableRow", cellTag, getAttributes(cellEl), errors);
+                    const cellAttrs = coerceChildAttrs("Tr", cellTag, getAttributes(cellEl), errors);
                     const runsResult = buildRunsAndText(cellEl);
                     if (runsResult) {
                         cellAttrs.runs = runsResult.runs;
@@ -576,7 +576,7 @@ function convertTableChildren(childElements, result, errors) {
                 if (rowAttrs.height !== undefined) {
                     const h = Number(rowAttrs.height);
                     if (isNaN(h)) {
-                        errors.push(`Cannot convert "${rowAttrs.height}" to number in <TableRow> "height" attribute`);
+                        errors.push(`Cannot convert "${rowAttrs.height}" to number in <Tr> "height" attribute`);
                     }
                     else {
                         row.height = h;
@@ -586,14 +586,14 @@ function convertTableChildren(childElements, result, errors) {
                 break;
             }
             default:
-                errors.push(`Unknown child element <${tag}> inside <Table>. Expected: <TableColumn> or <TableRow>`);
+                errors.push(`Unknown child element <${tag}> inside <Table>. Expected: <Col> or <Tr>`);
         }
     }
     if (columns.length > 0) {
         result.columns = columns;
     }
     else if (rows.length > 0) {
-        // TableColumn が未指定の場合、行のセル数（colspan 考慮）からデフォルトの columns を自動生成
+        // Col が未指定の場合、行のセル数（colspan 考慮）からデフォルトの columns を自動生成
         const maxCells = Math.max(...rows.map((row) => row.cells.reduce((sum, cell) => sum + (cell.colspan ?? 1), 0)));
         result.columns = Array.from({ length: maxCells }, () => ({}));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hirokisakabe/pom",
-  "version": "6.4.0",
+  "version": "7.1.0",
   "description": "AI-friendly PowerPoint generation with a Flexbox layout engine.",
   "type": "module",
   "main": "./dist/index.js",
@@ -62,6 +62,7 @@
     "@resvg/resvg-wasm": "^2.6.2",
     "fast-xml-parser": "^5.3.7",
     "image-size": "2.0.2",
+    "jszip": "^3.10.1",
     "opentype.js": "^1.3.4",
     "pptxgenjs": "4.0.1",
     "yoga-layout": "3.2.1",