@hirokisakabe/pom 5.4.0 → 5.5.1

package/dist/parseXml/parseXml.js

@@ -1,5 +1,5 @@
 import { XMLParser } from "fast-xml-parser";
-import { inputTextNodeSchema, inputUlNodeSchema, inputOlNodeSchema, inputImageNodeSchema, inputTableNodeSchema, inputShapeNodeSchema, inputChartNodeSchema, inputTimelineNodeSchema, inputMatrixNodeSchema, inputTreeNodeSchema, inputFlowNodeSchema, inputProcessArrowNodeSchema, inputPyramidNodeSchema, inputLineNodeSchema, inputIconNodeSchema, } from "./inputSchema.js";
+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";
 // ===== ParseXmlError =====
 export class ParseXmlError extends Error {
@@ -85,21 +85,21 @@ function getKnownChildAttributes(tagName) {
 }
 // ===== Leaf node Zod validation schemas =====
 const leafNodeValidationSchemas = {
-    text: inputTextNodeSchema,
-    image: inputImageNodeSchema,
-    table: inputTableNodeSchema,
-    shape: inputShapeNodeSchema,
-    chart: inputChartNodeSchema,
-    timeline: inputTimelineNodeSchema,
-    matrix: inputMatrixNodeSchema,
-    tree: inputTreeNodeSchema,
-    flow: inputFlowNodeSchema,
-    processArrow: inputProcessArrowNodeSchema,
-    pyramid: inputPyramidNodeSchema,
-    line: inputLineNodeSchema,
-    ul: inputUlNodeSchema,
-    ol: inputOlNodeSchema,
-    icon: inputIconNodeSchema,
+    text: textNodeSchema,
+    image: imageNodeSchema,
+    table: tableNodeSchema,
+    shape: shapeNodeSchema,
+    chart: chartNodeSchema,
+    timeline: timelineNodeSchema,
+    matrix: matrixNodeSchema,
+    tree: treeNodeSchema,
+    flow: flowNodeSchema,
+    processArrow: processArrowNodeSchema,
+    pyramid: pyramidNodeSchema,
+    line: lineNodeSchema,
+    ul: ulNodeSchema,
+    ol: olNodeSchema,
+    icon: iconNodeSchema,
 };
 function formatZodIssue(issue, tagName) {
     const path = issue.path;

package/dist/registry/definitions/icon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"icon.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/icon.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAKlD,eAAO,MAAM,WAAW,EAAE,cAwDzB,CAAC"}
+{"version":3,"file":"icon.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/icon.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAKlD,eAAO,MAAM,WAAW,EAAE,cAqEzB,CAAC"}

package/dist/registry/definitions/icon.js

@@ -1,6 +1,6 @@
 import { rasterizeIcon } from "../../icons/index.js";
-import { omitYogaNode } from "../../toPositioned/toPositioned.js";
 import { renderIconNode } from "../../renderPptx/nodes/icon.js";
+import { getContentArea } from "../../renderPptx/utils/contentArea.js";
 export const iconNodeDef = {
     type: "icon",
     category: "leaf",
@@ -14,11 +14,19 @@ export const iconNodeDef = {
     toPositioned(pom, absoluteX, absoluteY, layout, ctx) {
         const n = pom;
         const iconSize = n.size ?? 24;
-        const rasterSize = Math.max(Math.ceil(n.variant ? iconSize : layout.width), Math.ceil(n.variant ? iconSize : layout.height), iconSize);
+        // padding を考慮したコンテンツ領域で bg/icon の座標を計算
+        const content = getContentArea({
+            x: absoluteX,
+            y: absoluteY,
+            w: layout.width,
+            h: layout.height,
+            padding: n.padding,
+        });
+        // 実描画サイズに合わせてラスタライズ（不要に大きい PNG を防ぐ）
+        const rasterSize = Math.max(Math.ceil(n.variant ? iconSize : Math.min(content.w, content.h)), iconSize);
         const iconImageData = rasterizeIcon(n.name, rasterSize, n.color ?? "#000000", ctx.iconRasterCache);
-        // variant 指定時はアイコンを中央に配置
         const positioned = {
-            ...omitYogaNode(n),
+            ...n,
             x: absoluteX,
             y: absoluteY,
             w: layout.width,
@@ -27,21 +35,25 @@ export const iconNodeDef = {
         };
         if (n.variant) {
             const totalSize = Math.ceil(iconSize * 1.75);
-            // 背景図形は totalSize の正方形として、layout 領域の中央に配置
-            const bgOffsetX = (layout.width - totalSize) / 2;
-            const bgOffsetY = (layout.height - totalSize) / 2;
-            positioned.bgX = absoluteX + bgOffsetX;
-            positioned.bgY = absoluteY + bgOffsetY;
+            // 背景図形は totalSize の正方形として、コンテンツ領域の中央に配置
+            positioned.bgX = content.x + (content.w - totalSize) / 2;
+            positioned.bgY = content.y + (content.h - totalSize) / 2;
             positioned.bgW = totalSize;
             positioned.bgH = totalSize;
-            // アイコンは背景図形の中央に配置
-            const iconOffsetX = (layout.width - iconSize) / 2;
-            const iconOffsetY = (layout.height - iconSize) / 2;
-            positioned.iconX = absoluteX + iconOffsetX;
-            positioned.iconY = absoluteY + iconOffsetY;
+            // アイコンはコンテンツ領域の中央に配置
+            positioned.iconX = content.x + (content.w - iconSize) / 2;
+            positioned.iconY = content.y + (content.h - iconSize) / 2;
             positioned.iconW = iconSize;
             positioned.iconH = iconSize;
         }
+        else {
+            // variant なしの場合もアスペクト比を維持し、コンテンツ領域の中央に配置
+            const iconSide = Math.min(content.w, content.h);
+            positioned.iconX = content.x + (content.w - iconSide) / 2;
+            positioned.iconY = content.y + (content.h - iconSide) / 2;
+            positioned.iconW = iconSide;
+            positioned.iconH = iconSide;
+        }
         return positioned;
     },
     render(node, ctx) {

package/dist/registry/definitions/image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/image.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAQ,MAAM,aAAa,CAAC;AAOxD,eAAO,MAAM,YAAY,EAAE,cA+B1B,CAAC"}
+{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/image.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAQ,MAAM,aAAa,CAAC;AAMxD,eAAO,MAAM,YAAY,EAAE,cAmC1B,CAAC"}

package/dist/registry/definitions/image.js

@@ -1,6 +1,5 @@
 import { measureImage, getImageData } from "../../shared/measureImage.js";
 import { renderImageNode } from "../../renderPptx/nodes/image.js";
-import { omitYogaNode } from "../../toPositioned/toPositioned.js";
 export const imageNodeDef = {
     type: "image",
     category: "leaf",
@@ -8,7 +7,7 @@ export const imageNodeDef = {
         const n = node;
         const src = n.src;
         yn.setMeasureFunc(() => {
-            const { widthPx, heightPx } = measureImage(src, ctx.imageSizeCache);
+            const { widthPx, heightPx } = measureImage(src, ctx.imageSizeCache, ctx.diagnostics);
             return { width: widthPx, height: heightPx };
         });
     },
@@ -16,7 +15,7 @@ export const imageNodeDef = {
         const n = pom;
         const imageData = getImageData(n.src, ctx.imageDataCache);
         return {
-            ...omitYogaNode(n),
+            ...n,
             x: absoluteX,
             y: absoluteY,
             w: layout.width,

package/dist/registry/definitions/layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layer.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/layer.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD,eAAO,MAAM,YAAY,EAAE,cAwD1B,CAAC"}
+{"version":3,"file":"layer.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/layer.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD,eAAO,MAAM,YAAY,EAAE,cA4D1B,CAAC"}

package/dist/registry/definitions/layer.js

@@ -1,14 +1,14 @@
-import { toPositioned, omitYogaNode } from "../../toPositioned/toPositioned.js";
+import { toPositioned } from "../../toPositioned/toPositioned.js";
 export const layerNodeDef = {
     type: "layer",
     category: "absolute-child",
     // applyYogaStyle: layer は子を絶対配置するコンテナ。サイズは明示的に指定されることを期待
-    toPositioned(pom, absoluteX, absoluteY, layout, ctx) {
+    toPositioned(pom, absoluteX, absoluteY, layout, ctx, map) {
         const n = pom;
         // layer の子要素は layer 内の相対座標（child.x, child.y）を持つ
         // layer の絶対座標に加算してスライド上の絶対座標に変換
         return {
-            ...omitYogaNode(n),
+            ...n,
             x: absoluteX,
             y: absoluteY,
             w: layout.width,
@@ -26,7 +26,7 @@ export const layerNodeDef = {
                     const adjustedX2 = child.x2 + lineAbsoluteX;
                     const adjustedY2 = child.y2 + lineAbsoluteY;
                     return {
-                        ...omitYogaNode(child),
+                        ...child,
                         x1: adjustedX1,
                         y1: adjustedY1,
                         x2: adjustedX2,
@@ -38,10 +38,13 @@ export const layerNodeDef = {
                     };
                 }
                 // その他のノードは通常の処理
-                const childLayout = child.yogaNode.getComputedLayout();
+                const childLayout = map.get(child);
+                if (!childLayout) {
+                    throw new Error("Layout result not found in map for layer child");
+                }
                 const adjustedParentX = absoluteX + childX - childLayout.left;
                 const adjustedParentY = absoluteY + childY - childLayout.top;
-                return toPositioned(child, ctx, adjustedParentX, adjustedParentY);
+                return toPositioned(child, ctx, map, adjustedParentX, adjustedParentY);
             }),
         };
     },

package/dist/registry/definitions/line.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"line.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/line.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAIlD,eAAO,MAAM,WAAW,EAAE,cAuBzB,CAAC"}
+{"version":3,"file":"line.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/line.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD,eAAO,MAAM,WAAW,EAAE,cAuBzB,CAAC"}

package/dist/registry/definitions/line.js

@@ -1,5 +1,4 @@
 import { renderLineNode } from "../../renderPptx/nodes/line.js";
-import { omitYogaNode } from "../../toPositioned/toPositioned.js";
 export const lineNodeDef = {
     type: "line",
     category: "leaf",
@@ -13,7 +12,7 @@ export const lineNodeDef = {
         // line ノードは絶対座標（x1, y1, x2, y2）を持つため、
         // yogaNode の座標ではなく自身の座標からバウンディングボックスを計算
         return {
-            ...omitYogaNode(n),
+            ...n,
             x: Math.min(n.x1, n.x2),
             y: Math.min(n.y1, n.y2),
             w: Math.abs(n.x2 - n.x1),

package/dist/registry/definitions/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/list.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAQ,MAAM,aAAa,CAAC;AA0DxD,eAAO,MAAM,SAAS,EAAE,cAOvB,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,cAOvB,CAAC"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/list.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAQ,MAAM,aAAa,CAAC;AA4DxD,eAAO,MAAM,SAAS,EAAE,cAOvB,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,cAOvB,CAAC"}

package/dist/registry/definitions/list.js

@@ -5,7 +5,7 @@ function applyListYogaStyle(node, yn, yoga, ctx) {
     const n = node;
     const combinedText = n.items.map((item) => item.text).join("\n");
     const fontSizePx = n.fontSize ?? 24;
-    const fontFamily = "Noto Sans JP";
+    const fontFamily = n.fontFamily ?? "Noto Sans JP";
     const fontWeight = n.bold ? "bold" : "normal";
     const spacingMultiple = n.lineHeight ?? 1.3;
     const fontMetricsRatio = measureFontLineHeightRatio(fontWeight);
@@ -20,6 +20,8 @@ function applyListYogaStyle(node, yn, yoga, ctx) {
                 case yoga.MEASURE_MODE_EXACTLY:
                 case yoga.MEASURE_MODE_AT_MOST:
                     return width;
+                default:
+                    return Number.POSITIVE_INFINITY;
             }
         })();
         const textMaxWidthPx = Math.max(0, maxWidthPx - bulletIndentPx);

package/dist/registry/definitions/shape.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shape.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/shape.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAQ,MAAM,aAAa,CAAC;AAMxD,eAAO,MAAM,YAAY,EAAE,cA0C1B,CAAC"}
+{"version":3,"file":"shape.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/shape.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAQ,MAAM,aAAa,CAAC;AAMxD,eAAO,MAAM,YAAY,EAAE,cA4C1B,CAAC"}

package/dist/registry/definitions/shape.js

@@ -19,6 +19,8 @@ export const shapeNodeDef = {
                         case yoga.MEASURE_MODE_EXACTLY:
                         case yoga.MEASURE_MODE_AT_MOST:
                             return width;
+                        default:
+                            return Number.POSITIVE_INFINITY;
                     }
                 })();
                 const { widthPx, heightPx } = measureText(text, maxWidthPx, {

package/dist/registry/definitions/text.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/text.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAQ,MAAM,aAAa,CAAC;AAMxD,eAAO,MAAM,WAAW,EAAE,cAwCzB,CAAC"}
+{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/text.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAQ,MAAM,aAAa,CAAC;AAMxD,eAAO,MAAM,WAAW,EAAE,cA0CzB,CAAC"}

package/dist/registry/definitions/text.js

@@ -7,7 +7,7 @@ export const textNodeDef = {
         const n = node;
         const text = n.text;
         const fontSizePx = n.fontSize ?? 24;
-        const fontFamily = "Noto Sans JP";
+        const fontFamily = n.fontFamily ?? "Noto Sans JP";
         const fontWeight = n.bold ? "bold" : "normal";
         const lineHeight = 1.3;
         yn.setMeasureFunc((width, widthMode) => {
@@ -18,6 +18,8 @@ export const textNodeDef = {
                     case yoga.MEASURE_MODE_EXACTLY:
                     case yoga.MEASURE_MODE_AT_MOST:
                         return width;
+                    default:
+                        return Number.POSITIVE_INFINITY;
                 }
             })();
             const { widthPx, heightPx } = measureText(text, maxWidthPx, {

package/dist/registry/types.d.ts

@@ -3,6 +3,7 @@ import type { Node as YogaNode } from "yoga-layout";
 import type { RenderContext } from "../renderPptx/types.ts";
 import type { loadYoga } from "yoga-layout/load";
 import type { BuildContext } from "../buildContext.ts";
+import type { LayoutResultMap } from "../calcYogaLayout/types.ts";
 export type Yoga = Awaited<ReturnType<typeof loadYoga>>;
 /** ノードのカテゴリ。子要素の扱い方を決定する */
 export type NodeCategory = "leaf" | "single-child" | "multi-child" | "absolute-child";
@@ -17,7 +18,7 @@ export interface NodeDefinition {
     toPositioned?: (pom: POMNode, absoluteX: number, absoluteY: number, layout: {
         width: number;
         height: number;
-    }, ctx: BuildContext) => PositionedNode;
+    }, ctx: BuildContext, map: LayoutResultMap) => PositionedNode;
     /** PositionedNode をスライドにレンダリングする（リーフノード用） */
     render?: (node: PositionedNode, ctx: RenderContext) => void;
     /** 画像ソース収集（prefetch 用） */

package/dist/registry/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/registry/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC;AAExD,4BAA4B;AAC5B,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,cAAc,GACd,aAAa,GACb,gBAAgB,CAAC;AAErB,MAAM,WAAW,cAAc;IAC7B,cAAc;IACd,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAEtB,cAAc;IACd,QAAQ,EAAE,YAAY,CAAC;IAEvB,6CAA6C;IAC7C,cAAc,CAAC,EAAE,CACf,IAAI,EAAE,OAAO,EACb,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,YAAY,KACd,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B,kEAAkE;IAClE,YAAY,CAAC,EAAE,CACb,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EACzC,GAAG,EAAE,YAAY,KACd,cAAc,CAAC;IAEpB,6CAA6C;IAC7C,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IAE5D,0BAA0B;IAC1B,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,EAAE,CAAC;CACnD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/registry/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE,MAAM,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC;AAExD,4BAA4B;AAC5B,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,cAAc,GACd,aAAa,GACb,gBAAgB,CAAC;AAErB,MAAM,WAAW,cAAc;IAC7B,cAAc;IACd,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAEtB,cAAc;IACd,QAAQ,EAAE,YAAY,CAAC;IAEvB,6CAA6C;IAC7C,cAAc,CAAC,EAAE,CACf,IAAI,EAAE,OAAO,EACb,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,YAAY,KACd,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B,kEAAkE;IAClE,YAAY,CAAC,EAAE,CACb,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EACzC,GAAG,EAAE,YAAY,EACjB,GAAG,EAAE,eAAe,KACjB,cAAc,CAAC;IAEpB,6CAA6C;IAC7C,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IAE5D,0BAA0B;IAC1B,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,EAAE,CAAC;CACnD"}

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

@@ -1 +1 @@
-{"version":3,"file":"chart.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/chart.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,CAwBN"}
+{"version":3,"file":"chart.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/chart.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,CAyBN"}

package/dist/renderPptx/nodes/chart.js

@@ -1,15 +1,17 @@
 import { pxToIn } from "../units.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderChartNode(node, ctx) {
     const chartData = node.data.map((d) => ({
         name: d.name,
         labels: d.labels,
         values: d.values,
     }));
+    const content = getContentArea(node);
     const chartOptions = {
-        x: pxToIn(node.x),
-        y: pxToIn(node.y),
-        w: pxToIn(node.w),
-        h: pxToIn(node.h),
+        x: pxToIn(content.x),
+        y: pxToIn(content.y),
+        w: pxToIn(content.w),
+        h: pxToIn(content.h),
         showLegend: node.showLegend ?? false,
         showTitle: node.showTitle ?? false,
         title: node.title,

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

@@ -1 +1 @@
-{"version":3,"file":"flow.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/flow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,KAAK,kBAAkB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAWpE,wBAAgB,cAAc,CAC5B,IAAI,EAAE,kBAAkB,EACxB,GAAG,EAAE,aAAa,GACjB,IAAI,CA6HN"}
+{"version":3,"file":"flow.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/flow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAMjD,KAAK,kBAAkB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAWpE,wBAAgB,cAAc,CAC5B,IAAI,EAAE,kBAAkB,EACxB,GAAG,EAAE,aAAa,GACjB,IAAI,CAwIN"}

package/dist/renderPptx/nodes/flow.js

@@ -1,6 +1,7 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { measureFlow } from "../../calcYogaLayout/measureCompositeNodes.js";
 import { calcScaleFactor } from "../utils/scaleToFit.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderFlowNode(node, ctx) {
     const direction = node.direction ?? "horizontal";
     const nodeWidth = node.nodeWidth ?? 120;
@@ -8,20 +9,29 @@ export function renderFlowNode(node, ctx) {
     const nodeGap = node.nodeGap ?? 80;
     const connectorStyle = node.connectorStyle ?? {};
     const defaultColor = "1D4ED8";
-    // スケール係数を計算
+    // スケール係数を計算（コンテンツ領域基準）
+    const content = getContentArea(node);
     const intrinsic = measureFlow(node);
-    const scaleFactor = calcScaleFactor(node.w, node.h, intrinsic.width, intrinsic.height, "flow");
+    const scaleFactor = calcScaleFactor(content.w, content.h, intrinsic.width, intrinsic.height, "flow", ctx.buildContext.diagnostics);
     const scaledNodeWidth = nodeWidth * scaleFactor;
     const scaledNodeHeight = nodeHeight * scaleFactor;
     const scaledNodeGap = nodeGap * scaleFactor;
     const layouts = new Map();
     const nodeCount = node.nodes.length;
+    // コンテンツ領域を使用するための仮想ノードを作成
+    const contentNode = {
+        ...node,
+        x: content.x,
+        y: content.y,
+        w: content.w,
+        h: content.h,
+    };
     // ノードのレイアウトを計算
     if (direction === "horizontal") {
-        calculateHorizontalLayout(node, layouts, nodeCount, scaledNodeWidth, scaledNodeHeight, scaledNodeGap, scaleFactor);
+        calculateHorizontalLayout(contentNode, layouts, nodeCount, scaledNodeWidth, scaledNodeHeight, scaledNodeGap, scaleFactor);
     }
     else {
-        calculateVerticalLayout(node, layouts, nodeCount, scaledNodeWidth, scaledNodeHeight, scaledNodeGap, scaleFactor);
+        calculateVerticalLayout(contentNode, layouts, nodeCount, scaledNodeWidth, scaledNodeHeight, scaledNodeGap, scaleFactor);
     }
     // 接続線を描画（ノードより先に描画して背面に配置）
     for (const conn of node.connections) {

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

package/dist/renderPptx/nodes/image.js

@@ -1,13 +1,15 @@
 import { pxToIn } from "../units.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderImageNode(node, ctx) {
+    const content = getContentArea(node);
     const imageOptions = {
-        x: pxToIn(node.x),
-        y: pxToIn(node.y),
-        w: pxToIn(node.w),
-        h: pxToIn(node.h),
+        x: pxToIn(content.x),
+        y: pxToIn(content.y),
+        w: pxToIn(content.w),
+        h: pxToIn(content.h),
         shadow: node.shadow
             ? {
-                type: node.shadow.type,
+                type: node.shadow.type ?? "outer",
                 opacity: node.shadow.opacity,
                 blur: node.shadow.blur,
                 angle: node.shadow.angle,
@@ -19,8 +21,8 @@ export function renderImageNode(node, ctx) {
     if (node.sizing) {
         imageOptions.sizing = {
             type: node.sizing.type,
-            w: pxToIn(node.sizing.w ?? node.w),
-            h: pxToIn(node.sizing.h ?? node.h),
+            w: pxToIn(node.sizing.w ?? content.w),
+            h: pxToIn(node.sizing.h ?? content.h),
             ...(node.sizing.x !== undefined && { x: pxToIn(node.sizing.x) }),
             ...(node.sizing.y !== undefined && { y: pxToIn(node.sizing.y) }),
         };

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

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/list.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAU,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,KAAK,gBAAgB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC;AAChE,KAAK,gBAAgB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC;AA6BhE,wBAAgB,YAAY,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CA2D7E;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CAiE7E"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/list.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAU,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,KAAK,gBAAgB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC;AAChE,KAAK,gBAAgB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC;AA6BhE,wBAAgB,YAAY,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CA4D7E;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CAkE7E"}

package/dist/renderPptx/nodes/list.js

@@ -1,5 +1,6 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { convertUnderline, convertStrike } from "../textOptions.js";
+import { getContentArea } from "../utils/contentArea.js";
 function resolveStyle(li, parent) {
     return {
         fontSize: li.fontSize ?? parent.fontSize ?? 24,
@@ -26,6 +27,7 @@ export function renderUlNode(node, ctx) {
     const fontSizePx = node.fontSize ?? 24;
     const fontFamily = node.fontFamily ?? "Noto Sans JP";
     const lineHeight = node.lineHeight ?? 1.3;
+    const content = getContentArea(node);
     if (hasItemStyleOverride(node.items)) {
         // Li に個別スタイルがある場合は配列形式を使用
         const textItems = node.items.map((li, i) => {
@@ -46,10 +48,10 @@ export function renderUlNode(node, ctx) {
             };
         });
         ctx.slide.addText(textItems, {
-            x: pxToIn(node.x),
-            y: pxToIn(node.y),
-            w: pxToIn(node.w),
-            h: pxToIn(node.h),
+            x: pxToIn(content.x),
+            y: pxToIn(content.y),
+            w: pxToIn(content.w),
+            h: pxToIn(content.h),
             align: node.textAlign ?? "left",
             valign: "top",
             margin: 0,
@@ -60,10 +62,10 @@ export function renderUlNode(node, ctx) {
         // Li にスタイルオーバーライドがない場合は単一文字列形式を使用
         const text = node.items.map((li) => li.text).join("\n");
         ctx.slide.addText(text, {
-            x: pxToIn(node.x),
-            y: pxToIn(node.y),
-            w: pxToIn(node.w),
-            h: pxToIn(node.h),
+            x: pxToIn(content.x),
+            y: pxToIn(content.y),
+            w: pxToIn(content.w),
+            h: pxToIn(content.h),
             fontSize: pxToPt(fontSizePx),
             fontFace: fontFamily,
             align: node.textAlign ?? "left",
@@ -84,6 +86,7 @@ export function renderOlNode(node, ctx) {
     const fontSizePx = node.fontSize ?? 24;
     const fontFamily = node.fontFamily ?? "Noto Sans JP";
     const lineHeight = node.lineHeight ?? 1.3;
+    const content = getContentArea(node);
     const bulletOptions = { type: "number" };
     if (node.numberType !== undefined) {
         bulletOptions.numberType = node.numberType;
@@ -110,10 +113,10 @@ export function renderOlNode(node, ctx) {
             };
         });
         ctx.slide.addText(textItems, {
-            x: pxToIn(node.x),
-            y: pxToIn(node.y),
-            w: pxToIn(node.w),
-            h: pxToIn(node.h),
+            x: pxToIn(content.x),
+            y: pxToIn(content.y),
+            w: pxToIn(content.w),
+            h: pxToIn(content.h),
             align: node.textAlign ?? "left",
             valign: "top",
             margin: 0,
@@ -123,10 +126,10 @@ export function renderOlNode(node, ctx) {
     else {
         const text = node.items.map((li) => li.text).join("\n");
         ctx.slide.addText(text, {
-            x: pxToIn(node.x),
-            y: pxToIn(node.y),
-            w: pxToIn(node.w),
-            h: pxToIn(node.h),
+            x: pxToIn(content.x),
+            y: pxToIn(content.y),
+            w: pxToIn(content.w),
+            h: pxToIn(content.h),
             fontSize: pxToPt(fontSizePx),
             fontFace: fontFamily,
             align: node.textAlign ?? "left",

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

@@ -1 +1 @@
-{"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/matrix.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,KAAK,oBAAoB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC;AAExE,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,oBAAoB,EAC1B,GAAG,EAAE,aAAa,GACjB,IAAI,CAsIN"}
+{"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/matrix.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAMjD,KAAK,oBAAoB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC;AAExE,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,oBAAoB,EAC1B,GAAG,EAAE,aAAa,GACjB,IAAI,CAwIN"}

package/dist/renderPptx/nodes/matrix.js

@@ -1,6 +1,7 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { measureMatrix } from "../../calcYogaLayout/measureCompositeNodes.js";
 import { calcScaleFactor } from "../utils/scaleToFit.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderMatrixNode(node, ctx) {
     const items = node.items;
     const axes = node.axes;
@@ -9,17 +10,18 @@ export function renderMatrixNode(node, ctx) {
     const baseItemSize = 24; // px
     const baseLineWidth = 2; // px
     const axisColor = "E2E8F0";
-    // スケール係数を計算
+    // スケール係数を計算（コンテンツ領域基準）
+    const content = getContentArea(node);
     const intrinsic = measureMatrix(node);
-    const scaleFactor = calcScaleFactor(node.w, node.h, intrinsic.width, intrinsic.height, "matrix");
+    const scaleFactor = calcScaleFactor(content.w, content.h, intrinsic.width, intrinsic.height, "matrix", ctx.buildContext.diagnostics);
     const itemSize = baseItemSize * scaleFactor;
     const lineWidth = baseLineWidth * scaleFactor;
-    // マトリクスの描画領域（パディングを考慮）
-    const padding = 60 * scaleFactor; // 軸ラベル用の余白
-    const areaX = node.x + padding;
-    const areaY = node.y + padding;
-    const areaW = node.w - padding * 2;
-    const areaH = node.h - padding * 2;
+    // マトリクスの描画領域（軸ラベル用の余白を考慮）
+    const axisMargin = 60 * scaleFactor; // 軸ラベル用の余白
+    const areaX = content.x + axisMargin;
+    const areaY = content.y + axisMargin;
+    const areaW = content.w - axisMargin * 2;
+    const areaH = content.h - axisMargin * 2;
     // 中心座標
     const centerX = areaX + areaW / 2;
     const centerY = areaY + areaH / 2;
@@ -57,7 +59,7 @@ export function renderMatrixNode(node, ctx) {
     });
     // Y軸ラベル（左部中央）
     ctx.slide.addText(axes.y, {
-        x: pxToIn(node.x + 4 * scaleFactor),
+        x: pxToIn(content.x + 4 * scaleFactor),
         y: pxToIn(centerY - 12 * scaleFactor),
         w: pxToIn(48 * scaleFactor),
         h: pxToIn(axisLabelH),

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;AAWjD,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,CA0DN"}
+{"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;AAYjD,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,CAqEN"}

package/dist/renderPptx/nodes/processArrow.js

@@ -3,6 +3,7 @@ import { convertUnderline, convertStrike } from "../textOptions.js";
 import { measureProcessArrow } from "../../calcYogaLayout/measureCompositeNodes.js";
 import { calcScaleFactor } from "../utils/scaleToFit.js";
 import { ARROW_DEPTH_RATIO, DEFAULT_PROCESS_ARROW_ITEM_WIDTH, DEFAULT_PROCESS_ARROW_ITEM_HEIGHT, } from "../../shared/processArrowConstants.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderProcessArrowNode(node, ctx) {
     const direction = node.direction ?? "horizontal";
     const steps = node.steps;
@@ -15,18 +16,27 @@ export function renderProcessArrowNode(node, ctx) {
     const itemHeight = node.itemHeight ?? DEFAULT_PROCESS_ARROW_ITEM_HEIGHT;
     const arrowDepth = itemHeight * ARROW_DEPTH_RATIO;
     const gap = node.gap ?? -arrowDepth;
-    // スケール係数を計算
+    // スケール係数を計算（コンテンツ領域基準）
+    const content = getContentArea(node);
     const intrinsic = measureProcessArrow(node);
-    const scaleFactor = calcScaleFactor(node.w, node.h, intrinsic.width, intrinsic.height, "processArrow");
+    const scaleFactor = calcScaleFactor(content.w, content.h, intrinsic.width, intrinsic.height, "processArrow", ctx.buildContext.diagnostics);
     const scaledItemWidth = itemWidth * scaleFactor;
     const scaledItemHeight = itemHeight * scaleFactor;
     const scaledGap = gap * scaleFactor;
     const scaledArrowDepth = arrowDepth * scaleFactor;
+    // コンテンツ領域を使用するための仮想ノードを作成
+    const contentNode = {
+        ...node,
+        x: content.x,
+        y: content.y,
+        w: content.w,
+        h: content.h,
+    };
     if (direction === "horizontal") {
-        renderHorizontalProcessArrow(node, ctx, steps, stepCount, scaledItemWidth, scaledItemHeight, scaledGap, scaledArrowDepth, defaultColor, defaultTextColor, scaleFactor);
+        renderHorizontalProcessArrow(contentNode, ctx, steps, stepCount, scaledItemWidth, scaledItemHeight, scaledGap, scaledArrowDepth, defaultColor, defaultTextColor, scaleFactor);
     }
     else {
-        renderVerticalProcessArrow(node, ctx, steps, stepCount, scaledItemWidth, scaledItemHeight, scaledGap, scaledArrowDepth, defaultColor, defaultTextColor, scaleFactor);
+        renderVerticalProcessArrow(contentNode, ctx, steps, stepCount, scaledItemWidth, scaledItemHeight, scaledGap, scaledArrowDepth, defaultColor, defaultTextColor, scaleFactor);
     }
 }
 function renderHorizontalProcessArrow(node, ctx, steps, stepCount, itemWidth, itemHeight, gap, arrowDepth, defaultColor, defaultTextColor, scaleFactor) {

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

@@ -1 +1 @@
-{"version":3,"file":"pyramid.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/pyramid.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,KAAK,qBAAqB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,CAAC;AAE1E,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,qBAAqB,EAC3B,GAAG,EAAE,aAAa,GACjB,IAAI,CAgGN"}
+{"version":3,"file":"pyramid.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/pyramid.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAMjD,KAAK,qBAAqB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,CAAC;AAE1E,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,qBAAqB,EAC3B,GAAG,EAAE,aAAa,GACjB,IAAI,CAkGN"}