@hirokisakabe/pom 5.5.0 → 5.5.1

package/dist/calcYogaLayout/calcYogaLayout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calcYogaLayout.d.ts","sourceRoot":"","sources":["../../src/calcYogaLayout/calcYogaLayout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAO9C;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,EACb,SAAS,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,EACnC,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,WAAW,CAAC,CA0BtB"}
+{"version":3,"file":"calcYogaLayout.d.ts","sourceRoot":"","sources":["../../src/calcYogaLayout/calcYogaLayout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAc,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAO9C;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,EACb,SAAS,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,EACnC,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,WAAW,CAAC,CA0BtB"}

package/dist/calcYogaLayout/calcYogaLayout.js

@@ -83,10 +83,50 @@ async function getYoga() {
         yogaP = loadYoga();
     return yogaP;
 }
+/**
+ * ノードが交差軸方向（幅）で確定サイズを持つかを判定する
+ * - 明示的な w がある場合は確定
+ * - alignSelf で stretch 以外が指定されている場合は不確定
+ * - 親の alignItems で stretch（デフォルト）以外が指定されている場合は不確定
+ */
+function nodeHasDefiniteWidth(node, parentNode) {
+    // 明示的な幅がある
+    if (node.w !== undefined)
+        return true;
+    // alignSelf で stretch 以外が明示されている場合は不確定
+    if (node.alignSelf !== undefined &&
+        node.alignSelf !== "stretch" &&
+        node.alignSelf !== "auto") {
+        return false;
+    }
+    // 親がいない場合（ルートノード）は確定
+    if (!parentNode)
+        return true;
+    // 親の alignItems を取得（VStack/HStack のみ持つ、Box 等は undefined でデフォルト stretch）
+    let parentAlignItems;
+    if (parentNode.type === "vstack") {
+        parentAlignItems = parentNode.alignItems;
+    }
+    else if (parentNode.type === "hstack") {
+        parentAlignItems = parentNode.alignItems;
+    }
+    // VStack/Box（column 方向）の子の場合、交差軸は水平方向
+    // alignItems が stretch（デフォルト）なら子は親幅に伸長される
+    if (parentNode.type === "vstack" ||
+        parentNode.type === "box" ||
+        parentNode.type === "layer") {
+        return parentAlignItems === undefined || parentAlignItems === "stretch";
+    }
+    // HStack の子の場合、幅は主軸方向で flex により決まるため確定とみなす
+    if (parentNode.type === "hstack") {
+        return true;
+    }
+    return true;
+}
 /**
  * POMNode ツリーを再帰的に走査し、YogaNode ツリーを構築する
  */
-async function buildPomWithYogaTree(node, parentYoga, ctx, map, parentNode) {
+async function buildPomWithYogaTree(node, parentYoga, ctx, map, parentNode, grandparentNode) {
     const yoga = await getYoga();
     const yn = yoga.Node.create();
     map.set(node, yn); // 対応する YogaNode をマップに登録
@@ -105,21 +145,27 @@ async function buildPomWithYogaTree(node, parentYoga, ctx, map, parentNode) {
         node.type !== "table" &&
         node.type !== "icon") {
         yn.setFlexGrow(1);
-        yn.setFlexBasis(0);
+        // HStack が確定幅を持つ場合のみ flexBasis=0 で均等分割
+        // HStack が auto-sized（親の alignItems が center/start/end 等）の場合、
+        // flexBasis=0 だと子要素の自然な幅が失われてレイアウトが崩れるため、
+        // flexBasis=auto（デフォルト）のまま維持する
+        if (nodeHasDefiniteWidth(parentNode, grandparentNode)) {
+            yn.setFlexBasis(0);
+        }
     }
     parentYoga.insertChild(yn, parentYoga.getChildCount());
     const def = getNodeDef(node.type);
     switch (def.category) {
         case "single-child": {
             const boxNode = node;
-            await buildPomWithYogaTree(boxNode.children, yn, ctx, map, node);
+            await buildPomWithYogaTree(boxNode.children, yn, ctx, map, node, parentNode);
             break;
         }
         case "multi-child":
         case "absolute-child": {
             const containerNode = node;
             for (const child of containerNode.children) {
-                await buildPomWithYogaTree(child, yn, ctx, map, node);
+                await buildPomWithYogaTree(child, yn, ctx, map, node, parentNode);
             }
             break;
         }

package/dist/calcYogaLayout/fontLoader.d.ts

@@ -2,6 +2,10 @@
  * opentype.js を使用したフォント読み込みモジュール
  * Node.js とブラウザ両方で動作する
  */
+/**
+ * 指定されたフォントがバンドル済みかどうかを判定する
+ */
+export declare function isBundledFont(fontFamily: string): boolean;
 /**
  * 指定したテキストの幅を計測する
  * @param text 計測するテキスト

package/dist/calcYogaLayout/fontLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fontLoader.d.ts","sourceRoot":"","sources":["../../src/calcYogaLayout/fontLoader.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA2DH;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,QAAQ,GAAG,MAAM,GACxB,MAAM,CAGR;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAgB5E"}
+{"version":3,"file":"fontLoader.d.ts","sourceRoot":"","sources":["../../src/calcYogaLayout/fontLoader.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA8DH;;GAEG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,QAAQ,GAAG,MAAM,GACxB,MAAM,CAGR;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAgB5E"}

package/dist/calcYogaLayout/fontLoader.js

@@ -46,6 +46,14 @@ function getFont(weight) {
     fontCache.set(cacheKey, font);
     return font;
 }
+/** バンドル済みフォント名の一覧 */
+const BUNDLED_FONT_NAMES = new Set(["Noto Sans JP"]);
+/**
+ * 指定されたフォントがバンドル済みかどうかを判定する
+ */
+export function isBundledFont(fontFamily) {
+    return BUNDLED_FONT_NAMES.has(fontFamily);
+}
 /**
  * 指定したテキストの幅を計測する
  * @param text 計測するテキスト

package/dist/calcYogaLayout/measureText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"measureText.d.ts","sourceRoot":"","sources":["../../src/calcYogaLayout/measureText.ts"],"names":[],"mappings":"AAEA,KAAK,cAAc,GAAG;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,UAAU,GAAG,MAAM,CAAC;AA6HnE;;GAEG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,cAAc,EACpB,IAAI,GAAE,mBAA4B,GACjC;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAmBA"}
+{"version":3,"file":"measureText.d.ts","sourceRoot":"","sources":["../../src/calcYogaLayout/measureText.ts"],"names":[],"mappings":"AAKA,KAAK,cAAc,GAAG;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,UAAU,GAAG,MAAM,CAAC;AA6HnE;;GAEG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,cAAc,EACpB,IAAI,GAAE,mBAA4B,GACjC;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAoBA"}

package/dist/calcYogaLayout/measureText.js

@@ -1,4 +1,4 @@
-import { measureTextWidth as measureTextWidthOpentype } from "./fontLoader.js";
+import { measureTextWidth as measureTextWidthOpentype, isBundledFont, } from "./fontLoader.js";
 /**
  * 文字がCJK（日本語・中国語・韓国語）文字かどうかを判定する
  */
@@ -108,6 +108,8 @@ function normalizeFontWeight(weight) {
  */
 export function measureText(text, maxWidthPx, opts, mode = "auto") {
     // 計測方法を決定
+    // "opentype" / "fallback" が明示指定された場合はそれを優先
+    // "auto" の場合はバンドル外フォントならフォールバック計測を使用
     const shouldUseFallback = (() => {
         switch (mode) {
             case "opentype":
@@ -115,8 +117,7 @@ export function measureText(text, maxWidthPx, opts, mode = "auto") {
             case "fallback":
                 return true;
             case "auto":
-                // opentype.js はバンドルされたフォントを使うため常に利用可能
-                return false;
+                return !isBundledFont(opts.fontFamily);
         }
     })();
     if (shouldUseFallback) {

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/renderPptx/nodes/image.js

@@ -9,7 +9,7 @@ export function renderImageNode(node, ctx) {
         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,

package/dist/renderPptx/nodes/shape.js

@@ -23,7 +23,7 @@ export function renderShapeNode(node, ctx) {
             : undefined,
         shadow: node.shadow
             ? {
-                type: node.shadow.type,
+                type: node.shadow.type ?? "outer",
                 opacity: node.shadow.opacity,
                 blur: node.shadow.blur,
                 angle: node.shadow.angle,

package/dist/renderPptx/textOptions.d.ts

@@ -24,15 +24,15 @@ export declare function createTextOptions(node: TextNode): {
     valign: "top";
     margin: number;
     lineSpacingMultiple: number;
-    color: string;
-    bold: boolean;
-    italic: boolean;
+    color: string | undefined;
+    bold: boolean | undefined;
+    italic: boolean | undefined;
     underline: {
         style?: UnderlineStyle;
         color?: string;
-    };
-    strike: "sngStrike";
-    highlight: string;
+    } | undefined;
+    strike: "sngStrike" | undefined;
+    highlight: string | undefined;
 };
 export {};
 //# sourceMappingURL=textOptions.d.ts.map

package/dist/renderPptx/utils/backgroundBorder.js

@@ -2,7 +2,7 @@ import { getImageData } from "../../shared/measureImage.js";
 import { pxToIn, pxToPt } from "../units.js";
 function convertShadow(shadow) {
     return {
-        type: shadow.type,
+        type: shadow.type ?? "outer",
         opacity: shadow.opacity,
         blur: shadow.blur,
         angle: shadow.angle,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hirokisakabe/pom",
-  "version": "5.5.0",
+  "version": "5.5.1",
   "description": "AI-friendly PowerPoint generation with a Flexbox layout engine.",
   "type": "module",
   "main": "./dist/index.js",
@@ -88,7 +88,7 @@
     "prettier": "3.6.2",
     "size-limit": "^12.0.1",
     "tsx": "4.21.0",
-    "typescript": "5.9.3",
+    "typescript": "6.0.2",
     "typescript-eslint": "^8.47.0",
     "vitest": "^4.1.0"
   },