@hirokisakabe/pom 7.0.0 → 7.2.0

package/README.md

@@ -36,11 +36,12 @@
 ## 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.
+- **Shorthand + Dot Notation** — Layout/style attributes (e.g. `padding`, `margin`, `border`, `fill`, `shadow`) can mix shorthand and dot notation on the same node. Shorthand sets defaults and dot notation overrides specific keys.
 - **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.

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.d.ts

@@ -30,6 +30,24 @@ export declare function getObjectShapeFromRule(rule: CoercionRule): Record<strin
  * endArrow="true" と endArrow.type="triangle" の共存を許可するために使用。
  */
 export declare function isBooleanObjectUnionRule(rule: CoercionRule): boolean;
+type ResolvedMixedNotationShorthand = {
+    mode: "merge";
+    value: Record<string, unknown>;
+} | {
+    mode: "ignore";
+} | {
+    mode: "conflict";
+};
+/**
+ * 同一属性で shorthand と dot notation を併用したときに、
+ * shorthand 側をどのように扱うかを解決する。
+ *
+ * - merge: shorthand をオブジェクト化して dot notation 側で上書き
+ * - ignore: boolean shorthand を無視して dot notation を優先
+ * - conflict: 併用不可（従来どおりエラー）
+ */
+export declare function resolveMixedNotationShorthand(value: string, rule: CoercionRule): ResolvedMixedNotationShorthand;
 export declare const NODE_COERCION_MAP: Record<string, Record<string, CoercionRule>>;
 export declare const CHILD_ELEMENT_COERCION_MAP: Record<string, Record<string, CoercionRule>>;
+export {};
 //# sourceMappingURL=coercionRules.d.ts.map

package/dist/parseXml/coercionRules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coercionRules.d.ts","sourceRoot":"","sources":["../../src/parseXml/coercionRules.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,MAAM,MAAM,YAAY,GACpB,QAAQ,GACR,SAAS,GACT,QAAQ,GACR,MAAM,GACN;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,YAAY,EAAE,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;CAAE,CAAC;AAI5D,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,YAAY,GACjB;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAyD1C;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EAAE,GACtB,OAAO,CAuCT;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAarD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,YAAY,GACjB,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,SAAS,CAY1C;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAQpE;AA8HD,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CA2I1E,CAAC;AAGF,eAAO,MAAM,0BAA0B,EAAE,MAAM,CAC7C,MAAM,EACN,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAgF7B,CAAC"}
+{"version":3,"file":"coercionRules.d.ts","sourceRoot":"","sources":["../../src/parseXml/coercionRules.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,MAAM,MAAM,YAAY,GACpB,QAAQ,GACR,SAAS,GACT,QAAQ,GACR,MAAM,GACN;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,YAAY,EAAE,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;CAAE,CAAC;AAI5D,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,YAAY,GACjB;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAyD1C;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EAAE,GACtB,OAAO,CAuCT;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAarD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,YAAY,GACjB,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,SAAS,CAY1C;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAQpE;AAED,KAAK,8BAA8B,GAC/B;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC;AAiBzB;;;;;;;GAOG;AACH,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,YAAY,GACjB,8BAA8B,CA+BhC;AA8HD,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CA2I1E,CAAC;AAGF,eAAO,MAAM,0BAA0B,EAAE,MAAM,CAC7C,MAAM,EACN,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAgF7B,CAAC"}

package/dist/parseXml/coercionRules.js

@@ -143,6 +143,52 @@ export function isBooleanObjectUnionRule(rule) {
     const hasObject = rule.options.some((opt) => typeof opt === "object" && opt.type === "object");
     return hasBoolean && hasObject;
 }
+function isPlainObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isDirectionalBoxShape(shape) {
+    const keys = Object.keys(shape).sort();
+    return (keys.length === 4 &&
+        keys[0] === "bottom" &&
+        keys[1] === "left" &&
+        keys[2] === "right" &&
+        keys[3] === "top");
+}
+/**
+ * 同一属性で shorthand と dot notation を併用したときに、
+ * shorthand 側をどのように扱うかを解決する。
+ *
+ * - merge: shorthand をオブジェクト化して dot notation 側で上書き
+ * - ignore: boolean shorthand を無視して dot notation を優先
+ * - conflict: 併用不可（従来どおりエラー）
+ */
+export function resolveMixedNotationShorthand(value, rule) {
+    const objectShape = getObjectShapeFromRule(rule);
+    if (!objectShape)
+        return { mode: "conflict" };
+    if (isBooleanObjectUnionRule(rule) &&
+        (value === "true" || value === "false")) {
+        return { mode: "ignore" };
+    }
+    const coerced = coerceWithRule(value, rule);
+    if (coerced.error !== null)
+        return { mode: "conflict" };
+    if (isPlainObject(coerced.value)) {
+        return { mode: "merge", value: coerced.value };
+    }
+    if (typeof coerced.value === "number" && isDirectionalBoxShape(objectShape)) {
+        return {
+            mode: "merge",
+            value: {
+                top: coerced.value,
+                right: coerced.value,
+                bottom: coerced.value,
+                left: coerced.value,
+            },
+        };
+    }
+    return { mode: "conflict" };
+}
 // ===== 共通変換ルール =====
 const LENGTH_RULE = {
     type: "union",

package/dist/parseXml/parseXml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseXml.d.ts","sourceRoot":"","sources":["../../src/parseXml/parseXml.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,OAAO,EAgBb,MAAM,aAAa,CAAC;AAYrB,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAgB,MAAM,EAAE,MAAM,EAAE,CAAC;gBACrB,MAAM,EAAE,MAAM,EAAE;CAM7B;AAGD,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAmB9C,CAAC;AA2oCF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,EAAE,CAiCrD"}
+{"version":3,"file":"parseXml.d.ts","sourceRoot":"","sources":["../../src/parseXml/parseXml.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,OAAO,EAgBb,MAAM,aAAa,CAAC;AAYrB,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAgB,MAAM,EAAE,MAAM,EAAE,CAAC;gBACrB,MAAM,EAAE,MAAM,EAAE;CAM7B;AAGD,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAmB9C,CAAC;AAgpCF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,EAAE,CAiCrD"}

package/dist/parseXml/parseXml.js

@@ -1,6 +1,6 @@
 import { XMLBuilder, XMLParser } from "fast-xml-parser";
 import { textNodeSchema, ulNodeSchema, olNodeSchema, imageNodeSchema, tableNodeSchema, shapeNodeSchema, chartNodeSchema, timelineNodeSchema, matrixNodeSchema, treeNodeSchema, flowNodeSchema, processArrowNodeSchema, pyramidNodeSchema, lineNodeSchema, iconNodeSchema, } from "../types.js";
-import { NODE_COERCION_MAP, CHILD_ELEMENT_COERCION_MAP, coerceWithRule, coerceFallback, getObjectShapeFromRule, isBooleanObjectUnionRule, } from "./coercionRules.js";
+import { NODE_COERCION_MAP, CHILD_ELEMENT_COERCION_MAP, coerceWithRule, coerceFallback, getObjectShapeFromRule, resolveMixedNotationShorthand, } from "./coercionRules.js";
 // ===== ParseXmlError =====
 export class ParseXmlError extends Error {
     errors;
@@ -381,14 +381,18 @@ function coerceChildAttrs(parentTagName, tagName, attrs, errors) {
     // Process regular attributes
     for (const [key, value] of Object.entries(regularAttrs)) {
         if (key in dotGroups) {
-            // When the rule is a union of boolean and object,
-            // allow boolean shorthand to coexist with dot-notation by ignoring the boolean value.
-            if (rules &&
-                rules[key] &&
-                isBooleanObjectUnionRule(rules[key]) &&
-                (value === "true" || value === "false")) {
-                // Silently skip the boolean value; dot-notation takes priority
-                continue;
+            if (rules && rules[key]) {
+                const resolved = resolveMixedNotationShorthand(value, rules[key]);
+                if (resolved.mode === "ignore") {
+                    continue;
+                }
+                if (resolved.mode === "merge") {
+                    result[key] = {
+                        ...resolved.value,
+                        ...result[key],
+                    };
+                    continue;
+                }
             }
             errors.push(`<${parentTagName}>.<${tagName}>: Attribute "${key}" conflicts with dot-notation attributes. Use one or the other, not both`);
             continue;
@@ -765,14 +769,19 @@ function convertPomNode(nodeType, tagName, attrs, childElements, textContent, er
             continue;
         // Conflict check: dot-notation and regular attribute for the same key
         if (key in dotGroups) {
-            // When the rule is a union of boolean and object (e.g., endArrow),
-            // allow boolean shorthand to coexist with dot-notation by ignoring the boolean value.
             const ruleForConflict = getCoercionRule(nodeType, key);
-            if (ruleForConflict &&
-                isBooleanObjectUnionRule(ruleForConflict) &&
-                (value === "true" || value === "false")) {
-                // Silently skip the boolean value; dot-notation takes priority
-                continue;
+            if (ruleForConflict) {
+                const resolved = resolveMixedNotationShorthand(value, ruleForConflict);
+                if (resolved.mode === "ignore") {
+                    continue;
+                }
+                if (resolved.mode === "merge") {
+                    result[key] = {
+                        ...resolved.value,
+                        ...result[key],
+                    };
+                    continue;
+                }
             }
             errors.push(`<${tagName}>: Attribute "${key}" conflicts with dot-notation attributes (e.g., "${key}.xxx"). Use one or the other, not both`);
             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hirokisakabe/pom",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "AI-friendly PowerPoint generation with a Flexbox layout engine.",
   "type": "module",
   "main": "./dist/index.js",
@@ -46,22 +46,23 @@
   },
   "devDependencies": {
     "@size-limit/file": "^12.0.1",
-    "@types/node": "^25.5.0",
+    "@types/node": "^25.5.2",
     "@types/opentype.js": "^1.3.8",
     "@types/pngjs": "6.0.5",
-    "@vitest/coverage-v8": "^4.1.0",
-    "@vitest/ui": "^4.1.0",
-    "lucide-static": "^0.577.0",
+    "@vitest/coverage-v8": "^4.1.2",
+    "@vitest/ui": "^4.1.2",
+    "lucide-static": "^1.7.0",
     "pixelmatch": "7.1.0",
     "pngjs": "7.0.0",
     "size-limit": "^12.0.1",
     "tsx": "4.21.0",
-    "typescript-eslint": "^8.47.0"
+    "typescript-eslint": "^8.58.0"
   },
   "dependencies": {
     "@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",