@hirokisakabe/pom 5.0.1 → 5.2.0

package/dist/parseXml/parseXml.js

@@ -1,7 +1,7 @@
 import { XMLParser } from "fast-xml-parser";
 import { z } from "zod";
 import { inputTextNodeSchema, inputUlNodeSchema, inputOlNodeSchema, inputLiNodeSchema, inputImageNodeSchema, inputTableNodeSchema, inputShapeNodeSchema, inputChartNodeSchema, inputTimelineNodeSchema, inputMatrixNodeSchema, inputTreeNodeSchema, inputFlowNodeSchema, inputProcessArrowNodeSchema, inputPyramidNodeSchema, inputLineNodeSchema, inputIconNodeSchema, inputBaseNodeSchema, } from "./inputSchema.js";
-import { alignItemsSchema, justifyContentSchema, shadowStyleSchema, processArrowStepSchema, pyramidLevelSchema, timelineItemSchema, matrixAxisSchema, matrixQuadrantsSchema, matrixItemSchema, flowNodeItemSchema, flowConnectionSchema, chartDataSchema, tableColumnSchema, tableCellSchema, } from "../types.js";
+import { alignItemsSchema, justifyContentSchema, shadowStyleSchema, processArrowStepSchema, pyramidLevelSchema, timelineItemSchema, matrixAxisSchema, matrixQuadrantsSchema, matrixItemSchema, flowNodeItemSchema, flowConnectionSchema, chartDataSchema, tableColumnSchema, tableCellSchema, flexWrapSchema, } from "../types.js";
 // ===== ParseXmlError =====
 export class ParseXmlError extends Error {
     errors;
@@ -62,11 +62,15 @@ const containerShapes = {
         gap: z.number().optional(),
         alignItems: alignItemsSchema.optional(),
         justifyContent: justifyContentSchema.optional(),
+        shadow: shadowStyleSchema.optional(),
+        flexWrap: flexWrapSchema.optional(),
     })),
     hstack: extractShape(inputBaseNodeSchema.extend({
         gap: z.number().optional(),
         alignItems: alignItemsSchema.optional(),
         justifyContent: justifyContentSchema.optional(),
+        shadow: shadowStyleSchema.optional(),
+        flexWrap: flexWrapSchema.optional(),
     })),
     layer: extractShape(inputBaseNodeSchema),
 };
@@ -371,6 +375,21 @@ function coerceFallback(value) {
     }
     return value;
 }
+// ===== Dot notation helpers =====
+/**
+ * Checks if a schema is a union containing both boolean and object types.
+ * Used to allow `endArrow="true" endArrow.type="triangle"` coexistence.
+ */
+function isBooleanObjectUnion(schema) {
+    const unwrapped = unwrapSchema(schema);
+    const typeName = getZodType(unwrapped);
+    if (typeName !== "union")
+        return false;
+    const def = getDef(unwrapped);
+    const options = def.options;
+    const typeNames = options.map((opt) => getZodType(unwrapSchema(opt)));
+    return typeNames.includes("boolean") && typeNames.includes("object");
+}
 // ===== Dot notation expansion =====
 function expandDotNotation(attrs) {
     const regular = {};
@@ -510,6 +529,15 @@ function coerceChildAttrs(parentTagName, tagName, attrs, errors) {
     // Process regular attributes
     for (const [key, value] of Object.entries(regularAttrs)) {
         if (key in dotGroups) {
+            // When the schema is a union of boolean and object,
+            // allow boolean shorthand to coexist with dot-notation by ignoring the boolean value.
+            if (shape &&
+                shape[key] &&
+                isBooleanObjectUnion(shape[key]) &&
+                (value === "true" || value === "false")) {
+                // Silently skip the boolean value; dot-notation takes priority
+                continue;
+            }
             errors.push(`<${parentTagName}>.<${tagName}>: Attribute "${key}" conflicts with dot-notation attributes. Use one or the other, not both`);
             continue;
         }
@@ -832,6 +860,15 @@ 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 schema is a union of boolean and object (e.g., endArrow),
+            // allow boolean shorthand to coexist with dot-notation by ignoring the boolean value.
+            const propSchemaForConflict = getPropertySchema(nodeType, key);
+            if (propSchemaForConflict &&
+                isBooleanObjectUnion(propSchemaForConflict) &&
+                (value === "true" || value === "false")) {
+                // Silently skip the boolean value; dot-notation takes priority
+                continue;
+            }
             errors.push(`<${tagName}>: Attribute "${key}" conflicts with dot-notation attributes (e.g., "${key}.xxx"). Use one or the other, not both`);
             continue;
         }

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;AAwBrB,KAAK,OAAO,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAqJxC;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,cAAc,EAAE,EACvB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,kBAAkB,+BAqL5B"}
+{"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;AAwBrB,KAAK,OAAO,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA+JxC;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,cAAc,EAAE,EACvB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,kBAAkB,+BAqL5B"}

package/dist/renderPptx/renderPptx.js

@@ -11,6 +11,16 @@ import { getImageData } from "../shared/measureImage.js";
 import { renderBackgroundAndBorder } from "./utils/backgroundBorder.js";
 import { renderTextNode, renderImageNode, renderTableNode, renderShapeNode, renderChartNode, renderTimelineNode, renderMatrixNode, renderTreeNode, renderFlowNode, renderProcessArrowNode, renderPyramidNode, renderLineNode, renderUlNode, renderOlNode, renderIconNode, } from "./nodes/index.js";
 const DEFAULT_MASTER_NAME = "POM_MASTER";
+/**
+ * zIndex でソートして描画順を制御する（安定ソート）
+ * zIndex が小さいノードが先に描画される（PowerPoint は追加順に重ねるため）
+ */
+function sortByZIndex(children) {
+    // すべての子要素に zIndex が未設定の場合はそのまま返す
+    if (children.every((c) => c.zIndex === undefined))
+        return children;
+    return [...children].sort((a, b) => (a.zIndex ?? 0) - (b.zIndex ?? 0));
+}
 /**
  * MasterObject を pptxgenjs の objects 形式に変換する
  */
@@ -256,8 +266,8 @@ export function renderPptx(pages, slidePx, master) {
                     break;
                 case "vstack":
                 case "hstack":
-                    // 子要素を再帰的に処理
-                    for (const child of node.children) {
+                    // zIndex でソートして描画順を制御（値が小さいものが先に描画される）
+                    for (const child of sortByZIndex(node.children)) {
                         renderNode(child);
                     }
                     break;
@@ -292,8 +302,8 @@ export function renderPptx(pages, slidePx, master) {
                     renderLineNode(node, ctx);
                     break;
                 case "layer":
-                    // layer の子要素を配列順に描画（後の要素が上に来る）
-                    for (const child of node.children) {
+                    // zIndex でソートして描画順を制御（値が小さいものが先に描画される）
+                    for (const child of sortByZIndex(node.children)) {
                         renderNode(child);
                     }
                     break;