@hirokisakabe/pom 5.1.0 → 5.2.0

package/dist/parseXml/inputSchema.js

@@ -5,7 +5,7 @@
  * Used by `parseXml` to validate parsed XML input.
  */
 import { z } from "zod";
-import { lengthSchema, paddingSchema, borderStyleSchema, borderDashSchema, fillStyleSchema, shadowStyleSchema, alignItemsSchema, justifyContentSchema, shapeTypeSchema, tableColumnSchema, tableRowSchema, chartTypeSchema, chartDataSchema, liNodeSchema, radarStyleSchema, bulletNumberTypeSchema, timelineDirectionSchema, timelineItemSchema, matrixAxisSchema, matrixQuadrantsSchema, matrixItemSchema, treeLayoutSchema, treeNodeShapeSchema, treeConnectorStyleSchema, flowDirectionSchema, flowNodeItemSchema, flowConnectionSchema, flowConnectorStyleSchema, processArrowDirectionSchema, processArrowStepSchema, pyramidDirectionSchema, pyramidLevelSchema, lineArrowSchema, underlineSchema, backgroundImageSchema, iconNameSchema, iconColorSchema, } from "../types.js";
+import { lengthSchema, paddingSchema, borderStyleSchema, borderDashSchema, fillStyleSchema, shadowStyleSchema, alignItemsSchema, justifyContentSchema, shapeTypeSchema, tableColumnSchema, tableRowSchema, chartTypeSchema, chartDataSchema, liNodeSchema, radarStyleSchema, bulletNumberTypeSchema, timelineDirectionSchema, timelineItemSchema, matrixAxisSchema, matrixQuadrantsSchema, matrixItemSchema, treeLayoutSchema, treeNodeShapeSchema, treeConnectorStyleSchema, flowDirectionSchema, flowNodeItemSchema, flowConnectionSchema, flowConnectorStyleSchema, processArrowDirectionSchema, processArrowStepSchema, pyramidDirectionSchema, pyramidLevelSchema, lineArrowSchema, underlineSchema, backgroundImageSchema, iconNameSchema, iconColorSchema, alignSelfSchema, positionTypeSchema, flexWrapSchema, } from "../types.js";
 // ===== Base Node Schema =====
 export const inputBaseNodeSchema = z.object({
     w: lengthSchema.optional(),
@@ -15,11 +15,19 @@ export const inputBaseNodeSchema = z.object({
     minH: z.number().optional(),
     maxH: z.number().optional(),
     padding: paddingSchema.optional(),
+    margin: paddingSchema.optional(),
     backgroundColor: z.string().optional(),
     backgroundImage: backgroundImageSchema.optional(),
     border: borderStyleSchema.optional(),
     borderRadius: z.number().optional(),
     opacity: z.number().min(0).max(1).optional(),
+    zIndex: z.number().optional(),
+    position: positionTypeSchema.optional(),
+    top: z.number().optional(),
+    right: z.number().optional(),
+    bottom: z.number().optional(),
+    left: z.number().optional(),
+    alignSelf: alignSelfSchema.optional(),
 });
 // ===== Node Schemas =====
 export const inputTextNodeSchema = inputBaseNodeSchema.extend({
@@ -204,6 +212,7 @@ const inputVStackNodeSchemaBase = inputBaseNodeSchema.extend({
     alignItems: alignItemsSchema.optional(),
     justifyContent: justifyContentSchema.optional(),
     shadow: shadowStyleSchema.optional(),
+    flexWrap: flexWrapSchema.optional(),
 });
 const inputHStackNodeSchemaBase = inputBaseNodeSchema.extend({
     type: z.literal("hstack"),
@@ -212,6 +221,7 @@ const inputHStackNodeSchemaBase = inputBaseNodeSchema.extend({
     alignItems: alignItemsSchema.optional(),
     justifyContent: justifyContentSchema.optional(),
     shadow: shadowStyleSchema.optional(),
+    flexWrap: flexWrapSchema.optional(),
 });
 const inputLayerChildSchemaBase = z.lazy(() => inputPomNodeSchema.and(z.object({
     x: z.number(),

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,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAsC3C,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAgB,MAAM,EAAE,MAAM,EAAE,CAAC;gBACrB,MAAM,EAAE,MAAM,EAAE;CAM7B;AA2qCD;;;;;;;;;;;;;;;;;;;;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,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAuC3C,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAgB,MAAM,EAAE,MAAM,EAAE,CAAC;gBACrB,MAAM,EAAE,MAAM,EAAE;CAM7B;AA6qCD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,EAAE,CAiCrD"}

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;
@@ -63,12 +63,14 @@ const containerShapes = {
         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),
 };

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;