@hirokisakabe/pom 0.1.6 → 0.1.8

package/dist/calcYogaLayout/measureText.js

@@ -1,10 +1,122 @@
 import { createCanvas } from "canvas";
 const canvas = createCanvas(1, 1);
 const ctx = canvas.getContext("2d");
+// フォント利用可否のキャッシュ
+const fontAvailabilityCache = new Map();
+/**
+ * 指定されたフォントが利用可能かどうかをチェックする
+ * 既知のフォントと未知のフォントで同じ幅になるかチェックし、
+ * 同じなら「フォントが利用できない」と判定する
+ */
+function isFontAvailable(fontFamily, fontSizePx) {
+    const cacheKey = `${fontFamily}:${fontSizePx}`;
+    const cached = fontAvailabilityCache.get(cacheKey);
+    if (cached !== undefined) {
+        return cached;
+    }
+    // テスト文字列（日本語と英語を含む）
+    const testString = "あいうABC123";
+    // 存在しないフォント名でテスト
+    const nonExistentFont = "NonExistentFont_12345_XYZ";
+    ctx.font = `${fontSizePx}px "${fontFamily}"`;
+    const targetWidth = ctx.measureText(testString).width;
+    ctx.font = `${fontSizePx}px "${nonExistentFont}"`;
+    const fallbackWidth = ctx.measureText(testString).width;
+    // 幅が同じなら、フォントが利用できない（フォールバックされている）
+    const isAvailable = Math.abs(targetWidth - fallbackWidth) > 0.1;
+    fontAvailabilityCache.set(cacheKey, isAvailable);
+    return isAvailable;
+}
+/**
+ * 文字がCJK（日本語・中国語・韓国語）文字かどうかを判定する
+ */
+function isCJKChar(char) {
+    const code = char.codePointAt(0);
+    if (code === undefined)
+        return false;
+    // CJK統合漢字
+    if (code >= 0x4e00 && code <= 0x9fff)
+        return true;
+    // CJK統合漢字拡張A
+    if (code >= 0x3400 && code <= 0x4dbf)
+        return true;
+    // CJK統合漢字拡張B-F
+    if (code >= 0x20000 && code <= 0x2ebef)
+        return true;
+    // ひらがな
+    if (code >= 0x3040 && code <= 0x309f)
+        return true;
+    // カタカナ
+    if (code >= 0x30a0 && code <= 0x30ff)
+        return true;
+    // 全角英数字・記号
+    if (code >= 0xff00 && code <= 0xffef)
+        return true;
+    // CJK記号
+    if (code >= 0x3000 && code <= 0x303f)
+        return true;
+    return false;
+}
+/**
+ * フォールバック計算で文字の幅を推定する
+ * - CJK文字: 1em（= fontSizePx）
+ * - 英数字・半角記号: 0.5em
+ */
+function estimateCharWidth(char, fontSizePx) {
+    if (isCJKChar(char)) {
+        return fontSizePx; // 1em
+    }
+    return fontSizePx * 0.5; // 0.5em
+}
+/**
+ * フォールバック計算でテキスト幅を推定する
+ */
+function estimateTextWidth(text, fontSizePx) {
+    let width = 0;
+    for (const char of text) {
+        width += estimateCharWidth(char, fontSizePx);
+    }
+    return width;
+}
+// 現在のテキスト計測モード
+let currentMode = "auto";
+/**
+ * テキスト計測モードを設定する
+ */
+export function setTextMeasurementMode(mode) {
+    currentMode = mode;
+}
+/**
+ * 現在のテキスト計測モードを取得する
+ */
+export function getTextMeasurementMode() {
+    return currentMode;
+}
 /**
  * テキストを折り返し付きでレイアウトし、そのサイズを測定する
  */
 export function measureText(text, maxWidthPx, opts) {
+    const { fontFamily, fontSizePx } = opts;
+    // 計測方法を決定
+    const shouldUseFallback = (() => {
+        switch (currentMode) {
+            case "canvas":
+                return false;
+            case "fallback":
+                return true;
+            case "auto":
+                return !isFontAvailable(fontFamily, fontSizePx);
+        }
+    })();
+    if (shouldUseFallback) {
+        return measureTextFallback(text, maxWidthPx, opts);
+    }
+    return measureTextCanvas(text, maxWidthPx, opts);
+}
+/**
+ * canvas を使ったテキスト計測
+ */
+function measureTextCanvas(text, maxWidthPx, opts) {
     applyFontStyle(opts);
     // まず改行で段落に分割
     const paragraphs = text.split("\n");
@@ -44,6 +156,49 @@ export function measureText(text, maxWidthPx, opts) {
     // 端数切り上げ＋余裕分 10px を足す
     return { widthPx: widthPx + 10, heightPx };
 }
+/**
+ * フォールバック計算を使ったテキスト計測
+ */
+function measureTextFallback(text, maxWidthPx, opts) {
+    const { fontSizePx } = opts;
+    // まず改行で段落に分割
+    const paragraphs = text.split("\n");
+    const lines = [];
+    for (const paragraph of paragraphs) {
+        // 空の段落（連続した改行）も1行としてカウント
+        if (paragraph === "") {
+            lines.push({ widthPx: 0 });
+            continue;
+        }
+        const words = splitForWrap(paragraph);
+        let current = "";
+        let currentWidth = 0;
+        for (const word of words) {
+            const candidate = current ? current + word : word;
+            const w = estimateTextWidth(candidate, fontSizePx);
+            if (w <= maxWidthPx || !current) {
+                // まだ詰められる
+                current = candidate;
+                currentWidth = w;
+            }
+            else {
+                // 折り返す
+                lines.push({ widthPx: currentWidth });
+                current = word;
+                currentWidth = estimateTextWidth(word, fontSizePx);
+            }
+        }
+        if (current) {
+            lines.push({ widthPx: currentWidth });
+        }
+    }
+    const lineHeightRatio = opts.lineHeight ?? 1.3;
+    const lineHeightPx = fontSizePx * lineHeightRatio;
+    const widthPx = lines.length ? Math.max(...lines.map((l) => l.widthPx)) : 0;
+    const heightPx = lines.length * lineHeightPx;
+    // 端数切り上げ＋余裕分 10px を足す
+    return { widthPx: widthPx + 10, heightPx };
+}
 function applyFontStyle(opts) {
     const { fontFamily, fontSizePx, fontWeight = "normal" } = opts;
     ctx.font = `${fontWeight} ${fontSizePx}px "${fontFamily}"`;

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./types";
 export * from "./inputSchema";
 export { buildPptx } from "./buildPptx";
+export type { TextMeasurementMode } from "./buildPptx";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,YAAY,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC"}

package/dist/inputSchema.d.ts

@@ -88,6 +88,32 @@ export declare const inputTextNodeSchema: z.ZodObject<{
     bold: z.ZodOptional<z.ZodBoolean>;
     fontFamily: z.ZodOptional<z.ZodString>;
     lineSpacingMultiple: z.ZodOptional<z.ZodNumber>;
+    bullet: z.ZodOptional<z.ZodUnion<readonly [z.ZodBoolean, z.ZodObject<{
+        type: z.ZodOptional<z.ZodEnum<{
+            number: "number";
+            bullet: "bullet";
+        }>>;
+        indent: z.ZodOptional<z.ZodNumber>;
+        numberType: z.ZodOptional<z.ZodEnum<{
+            alphaLcParenBoth: "alphaLcParenBoth";
+            alphaLcParenR: "alphaLcParenR";
+            alphaLcPeriod: "alphaLcPeriod";
+            alphaUcParenBoth: "alphaUcParenBoth";
+            alphaUcParenR: "alphaUcParenR";
+            alphaUcPeriod: "alphaUcPeriod";
+            arabicParenBoth: "arabicParenBoth";
+            arabicParenR: "arabicParenR";
+            arabicPeriod: "arabicPeriod";
+            arabicPlain: "arabicPlain";
+            romanLcParenBoth: "romanLcParenBoth";
+            romanLcParenR: "romanLcParenR";
+            romanLcPeriod: "romanLcPeriod";
+            romanUcParenBoth: "romanUcParenBoth";
+            romanUcParenR: "romanUcParenR";
+            romanUcPeriod: "romanUcPeriod";
+        }>>;
+        numberStartAt: z.ZodOptional<z.ZodNumber>;
+    }, z.core.$strip>]>>;
 }, z.core.$strip>;
 export declare const inputImageNodeSchema: z.ZodObject<{
     w: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodLiteral<"max">, z.ZodString]>>;
@@ -150,7 +176,7 @@ export declare const inputTableNodeSchema: z.ZodObject<{
     }, z.core.$strip>>;
     type: z.ZodLiteral<"table">;
     columns: z.ZodArray<z.ZodObject<{
-        width: z.ZodNumber;
+        width: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>>;
     rows: z.ZodArray<z.ZodObject<{
         cells: z.ZodArray<z.ZodObject<{
@@ -409,17 +435,62 @@ export declare const inputShapeNodeSchema: z.ZodObject<{
         color: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
     fontPx: z.ZodOptional<z.ZodNumber>;
-    fontColor: z.ZodOptional<z.ZodString>;
+    color: z.ZodOptional<z.ZodString>;
     alignText: z.ZodOptional<z.ZodEnum<{
         right: "right";
         left: "left";
         center: "center";
     }>>;
 }, z.core.$strip>;
+export declare const inputChartNodeSchema: z.ZodObject<{
+    w: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodLiteral<"max">, z.ZodString]>>;
+    h: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodLiteral<"max">, z.ZodString]>>;
+    minW: z.ZodOptional<z.ZodNumber>;
+    maxW: z.ZodOptional<z.ZodNumber>;
+    minH: z.ZodOptional<z.ZodNumber>;
+    maxH: z.ZodOptional<z.ZodNumber>;
+    padding: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodObject<{
+        top: z.ZodOptional<z.ZodNumber>;
+        right: z.ZodOptional<z.ZodNumber>;
+        bottom: z.ZodOptional<z.ZodNumber>;
+        left: z.ZodOptional<z.ZodNumber>;
+    }, z.core.$strip>]>>;
+    backgroundColor: z.ZodOptional<z.ZodString>;
+    border: z.ZodOptional<z.ZodObject<{
+        color: z.ZodOptional<z.ZodString>;
+        width: z.ZodOptional<z.ZodNumber>;
+        dashType: z.ZodOptional<z.ZodEnum<{
+            solid: "solid";
+            dash: "dash";
+            dashDot: "dashDot";
+            lgDash: "lgDash";
+            lgDashDot: "lgDashDot";
+            lgDashDotDot: "lgDashDotDot";
+            sysDash: "sysDash";
+            sysDot: "sysDot";
+        }>>;
+    }, z.core.$strip>>;
+    type: z.ZodLiteral<"chart">;
+    chartType: z.ZodEnum<{
+        line: "line";
+        pie: "pie";
+        bar: "bar";
+    }>;
+    data: z.ZodArray<z.ZodObject<{
+        name: z.ZodOptional<z.ZodString>;
+        labels: z.ZodArray<z.ZodString>;
+        values: z.ZodArray<z.ZodNumber>;
+    }, z.core.$strip>>;
+    showLegend: z.ZodOptional<z.ZodBoolean>;
+    showTitle: z.ZodOptional<z.ZodBoolean>;
+    title: z.ZodOptional<z.ZodString>;
+    chartColors: z.ZodOptional<z.ZodArray<z.ZodString>>;
+}, z.core.$strip>;
 export type InputTextNode = z.infer<typeof inputTextNodeSchema>;
 export type InputImageNode = z.infer<typeof inputImageNodeSchema>;
 export type InputTableNode = z.infer<typeof inputTableNodeSchema>;
 export type InputShapeNode = z.infer<typeof inputShapeNodeSchema>;
+export type InputChartNode = z.infer<typeof inputChartNodeSchema>;
 export type InputBoxNode = InputBaseNode & {
     type: "box";
     children: InputPOMNode;
@@ -438,7 +509,7 @@ export type InputHStackNode = InputBaseNode & {
     alignItems?: AlignItems;
     justifyContent?: JustifyContent;
 };
-export type InputPOMNode = InputTextNode | InputImageNode | InputTableNode | InputBoxNode | InputVStackNode | InputHStackNode | InputShapeNode;
+export type InputPOMNode = InputTextNode | InputImageNode | InputTableNode | InputBoxNode | InputVStackNode | InputHStackNode | InputShapeNode | InputChartNode;
 export declare const inputBoxNodeSchema: z.ZodType<InputBoxNode>;
 export declare const inputVStackNodeSchema: z.ZodType<InputVStackNode>;
 export declare const inputHStackNodeSchema: z.ZodType<InputHStackNode>;
@@ -472,10 +543,7 @@ export declare const inputMasterSlideOptionsSchema: z.ZodObject<{
         }>;
     }, z.core.$strip>>;
     date: z.ZodOptional<z.ZodObject<{
-        format: z.ZodEnum<{
-            "YYYY/MM/DD": "YYYY/MM/DD";
-            locale: "locale";
-        }>;
+        value: z.ZodString;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export type InputMasterSlideOptions = z.infer<typeof inputMasterSlideOptionsSchema>;

package/dist/inputSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inputSchema.d.ts","sourceRoot":"","sources":["../src/inputSchema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inputSchema.d.ts","sourceRoot":"","sources":["../src/inputSchema.ts"],"names":[],"mappings":"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"}

package/dist/inputSchema.js

@@ -17,7 +17,7 @@
  * ```
  */
 import { z } from "zod";
-import { lengthSchema, paddingSchema, borderStyleSchema, fillStyleSchema, shadowStyleSchema, alignItemsSchema, justifyContentSchema, shapeTypeSchema, tableColumnSchema, tableRowSchema, pageNumberPositionSchema, dateFormatSchema, } from "./types";
+import { lengthSchema, paddingSchema, borderStyleSchema, fillStyleSchema, shadowStyleSchema, alignItemsSchema, justifyContentSchema, shapeTypeSchema, tableColumnSchema, tableRowSchema, pageNumberPositionSchema, chartTypeSchema, chartDataSchema, bulletOptionsSchema, } from "./types";
 // ===== Base Node Schema =====
 export const inputBaseNodeSchema = z.object({
     w: lengthSchema.optional(),
@@ -40,6 +40,7 @@ export const inputTextNodeSchema = inputBaseNodeSchema.extend({
     bold: z.boolean().optional(),
     fontFamily: z.string().optional(),
     lineSpacingMultiple: z.number().optional(),
+    bullet: z.union([z.boolean(), bulletOptionsSchema]).optional(),
 });
 export const inputImageNodeSchema = inputBaseNodeSchema.extend({
     type: z.literal("image"),
@@ -59,9 +60,18 @@ export const inputShapeNodeSchema = inputBaseNodeSchema.extend({
     line: borderStyleSchema.optional(),
     shadow: shadowStyleSchema.optional(),
     fontPx: z.number().optional(),
-    fontColor: z.string().optional(),
+    color: z.string().optional(),
     alignText: z.enum(["left", "center", "right"]).optional(),
 });
+export const inputChartNodeSchema = inputBaseNodeSchema.extend({
+    type: z.literal("chart"),
+    chartType: chartTypeSchema,
+    data: z.array(chartDataSchema),
+    showLegend: z.boolean().optional(),
+    showTitle: z.boolean().optional(),
+    title: z.string().optional(),
+    chartColors: z.array(z.string()).optional(),
+});
 // ===== Recursive Node Schemas =====
 const inputBoxNodeSchemaBase = inputBaseNodeSchema.extend({
     type: z.literal("box"),
@@ -110,6 +120,7 @@ export const inputPomNodeSchema = z.lazy(() => z.discriminatedUnion("type", [
     inputVStackNodeSchemaBase,
     inputHStackNodeSchemaBase,
     inputShapeNodeSchema,
+    inputChartNodeSchema,
 ]));
 // ===== Master Slide Options Schema =====
 export const inputMasterSlideOptionsSchema = z.object({
@@ -122,7 +133,7 @@ export const inputMasterSlideOptionsSchema = z.object({
         .optional(),
     date: z
         .object({
-        format: dateFormatSchema,
+        value: z.string(),
     })
         .optional(),
 });

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

@@ -1 +1 @@
-{"version":3,"file":"renderPptx.d.ts","sourceRoot":"","sources":["../../src/renderPptx/renderPptx.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,aAAa,MAAM,WAAW,CAAC;AAE3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAK/C,KAAK,OAAO,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEpD;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,OAAO,EAAE,OAAO,iBAsLnE"}
+{"version":3,"file":"renderPptx.d.ts","sourceRoot":"","sources":["../../src/renderPptx/renderPptx.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,aAAa,MAAM,WAAW,CAAC;AAE3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAK/C,KAAK,OAAO,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEpD;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,OAAO,EAAE,OAAO,iBA8MnE"}

package/dist/renderPptx/renderPptx.js

@@ -1,7 +1,7 @@
 import { createRequire } from "module";
 const require = createRequire(import.meta.url);
 const PptxGenJS = require("pptxgenjs");
-import { resolveRowHeights } from "../table/utils";
+import { resolveColumnWidths, resolveRowHeights } from "../table/utils";
 import { createTextOptions } from "./textOptions";
 import { pxToIn, pxToPt } from "./units";
 export { createTextOptions } from "./textOptions";
@@ -104,7 +104,7 @@ export function renderPptx(pages, slidePx) {
                         y: pxToIn(node.y),
                         w: pxToIn(node.w),
                         h: pxToIn(node.h),
-                        colW: node.columns.map((column) => pxToIn(column.width)),
+                        colW: resolveColumnWidths(node, node.w).map((width) => pxToIn(width)),
                         rowH: resolveRowHeights(node).map((height) => pxToIn(height)),
                         margin: 0,
                     };
@@ -150,7 +150,7 @@ export function renderPptx(pages, slidePx) {
                             shape: node.shapeType,
                             fontSize: pxToPt(node.fontPx ?? 24),
                             fontFace: "Noto Sans JP",
-                            color: node.fontColor,
+                            color: node.color,
                             align: node.alignText ?? "center",
                             valign: "middle",
                             lineSpacingMultiple: 1.3,
@@ -162,6 +162,25 @@ export function renderPptx(pages, slidePx) {
                     }
                     break;
                 }
+                case "chart": {
+                    const chartData = node.data.map((d) => ({
+                        name: d.name,
+                        labels: d.labels,
+                        values: d.values,
+                    }));
+                    const chartOptions = {
+                        x: pxToIn(node.x),
+                        y: pxToIn(node.y),
+                        w: pxToIn(node.w),
+                        h: pxToIn(node.h),
+                        showLegend: node.showLegend ?? false,
+                        showTitle: node.showTitle ?? false,
+                        title: node.title,
+                        chartColors: node.chartColors,
+                    };
+                    slide.addChart(node.chartType, chartData, chartOptions);
+                    break;
+                }
             }
         }
         renderNode(data);

package/dist/renderPptx/textOptions.d.ts

@@ -1,7 +1,14 @@
-import type { PositionedNode } from "../types";
+import type { PositionedNode, BulletOptions } from "../types";
 type TextNode = Extract<PositionedNode, {
     type: "text";
 }>;
+type PptxBulletOptions = {
+    type?: "bullet" | "number";
+    indent?: number;
+    numberType?: BulletOptions["numberType"];
+    numberStartAt?: number;
+};
+export declare function createBulletOptions(bullet: boolean | BulletOptions): PptxBulletOptions | boolean;
 export declare function createTextOptions(node: TextNode): {
     x: number;
     y: number;
@@ -15,6 +22,20 @@ export declare function createTextOptions(node: TextNode): {
     lineSpacingMultiple: number;
     color: string;
     bold: boolean;
+} | {
+    bullet: boolean | PptxBulletOptions;
+    x: number;
+    y: number;
+    w: number;
+    h: number;
+    fontSize: number;
+    fontFace: string;
+    align: "right" | "left" | "center";
+    valign: "top";
+    margin: number;
+    lineSpacingMultiple: number;
+    color: string;
+    bold: boolean;
 };
 export {};
 //# sourceMappingURL=textOptions.d.ts.map

package/dist/renderPptx/textOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"textOptions.d.ts","sourceRoot":"","sources":["../../src/renderPptx/textOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG/C,KAAK,QAAQ,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAE1D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ;;;;;;;;;;;;;EAmB/C"}
+{"version":3,"file":"textOptions.d.ts","sourceRoot":"","sources":["../../src/renderPptx/textOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAG9D,KAAK,QAAQ,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAE1D,KAAK,iBAAiB,GAAG;IACvB,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,OAAO,GAAG,aAAa,GAC9B,iBAAiB,GAAG,OAAO,CAqB7B;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4B/C"}

package/dist/renderPptx/textOptions.js

@@ -1,9 +1,28 @@
 import { pxToIn, pxToPt } from "./units";
+export function createBulletOptions(bullet) {
+    if (typeof bullet === "boolean") {
+        return bullet;
+    }
+    const options = {};
+    if (bullet.type !== undefined) {
+        options.type = bullet.type;
+    }
+    if (bullet.indent !== undefined) {
+        options.indent = bullet.indent;
+    }
+    if (bullet.numberType !== undefined) {
+        options.numberType = bullet.numberType;
+    }
+    if (bullet.numberStartAt !== undefined) {
+        options.numberStartAt = bullet.numberStartAt;
+    }
+    return options;
+}
 export function createTextOptions(node) {
     const fontSizePx = node.fontPx ?? 24;
     const fontFamily = node.fontFamily ?? "Noto Sans JP";
     const lineSpacingMultiple = node.lineSpacingMultiple ?? 1.3;
-    return {
+    const baseOptions = {
         x: pxToIn(node.x),
         y: pxToIn(node.y),
         w: pxToIn(node.w),
@@ -17,4 +36,11 @@ export function createTextOptions(node) {
         color: node.color,
         bold: node.bold,
     };
+    if (node.bullet !== undefined) {
+        return {
+            ...baseOptions,
+            bullet: createBulletOptions(node.bullet),
+        };
+    }
+    return baseOptions;
 }

package/dist/table/utils.d.ts

@@ -1,8 +1,18 @@
 import type { TableNode } from "../types";
 export declare const DEFAULT_TABLE_ROW_HEIGHT = 32;
+export declare const DEFAULT_TABLE_COLUMN_WIDTH = 100;
 export declare function calcTableIntrinsicSize(node: TableNode): {
     width: number;
     height: number;
 };
 export declare function resolveRowHeights(node: TableNode): number[];
+/**
+ * テーブルの各カラム幅を解決する
+ * - 幅が指定されているカラムはその値を使用
+ * - 幅が未指定のカラムは、残りの幅を均等分割
+ *
+ * @param node テーブルノード
+ * @param tableWidth テーブル全体の幅（レイアウト計算後の確定値）
+ */
+export declare function resolveColumnWidths(node: TableNode, tableWidth: number): number[];
 //# sourceMappingURL=utils.d.ts.map

package/dist/table/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/table/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAE3C,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,SAAS;;;EAKrD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,YAGhD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/table/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAC3C,eAAO,MAAM,0BAA0B,MAAM,CAAC;AAE9C,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,SAAS;;;EAQrD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,YAGhD;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,SAAS,EACf,UAAU,EAAE,MAAM,GACjB,MAAM,EAAE,CAeV"}

package/dist/table/utils.js

@@ -1,6 +1,7 @@
 export const DEFAULT_TABLE_ROW_HEIGHT = 32;
+export const DEFAULT_TABLE_COLUMN_WIDTH = 100;
 export function calcTableIntrinsicSize(node) {
-    const width = node.columns.reduce((sum, column) => sum + column.width, 0);
+    const width = node.columns.reduce((sum, column) => sum + (column.width ?? DEFAULT_TABLE_COLUMN_WIDTH), 0);
     const height = resolveRowHeights(node).reduce((sum, h) => sum + h, 0);
     return { width, height };
 }
@@ -8,3 +9,19 @@ export function resolveRowHeights(node) {
     const fallbackRowHeight = node.defaultRowHeight ?? DEFAULT_TABLE_ROW_HEIGHT;
     return node.rows.map((row) => row.height ?? fallbackRowHeight);
 }
+/**
+ * テーブルの各カラム幅を解決する
+ * - 幅が指定されているカラムはその値を使用
+ * - 幅が未指定のカラムは、残りの幅を均等分割
+ *
+ * @param node テーブルノード
+ * @param tableWidth テーブル全体の幅（レイアウト計算後の確定値）
+ */
+export function resolveColumnWidths(node, tableWidth) {
+    const specifiedTotal = node.columns.reduce((sum, col) => sum + (col.width ?? 0), 0);
+    const unspecifiedCount = node.columns.filter((col) => col.width === undefined).length;
+    // 未指定カラムがない場合、または未指定カラムに割り当てる幅を計算
+    const remainingWidth = Math.max(0, tableWidth - specifiedTotal);
+    const widthPerUnspecified = unspecifiedCount > 0 ? remainingWidth / unspecifiedCount : 0;
+    return node.columns.map((col) => col.width ?? widthPerUnspecified);
+}

package/dist/toPositioned/toPositioned.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toPositioned.d.ts","sourceRoot":"","sources":["../../src/toPositioned/toPositioned.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAExD;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,OAAO,SAAI,EACX,OAAO,SAAI,GACV,cAAc,CAiFhB"}
+{"version":3,"file":"toPositioned.d.ts","sourceRoot":"","sources":["../../src/toPositioned/toPositioned.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAExD;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,OAAO,SAAI,EACX,OAAO,SAAI,GACV,cAAc,CA0FhB"}

package/dist/toPositioned/toPositioned.js

@@ -49,6 +49,15 @@ export function toPositioned(pom, parentX = 0, parentY = 0) {
                 h: layout.height,
             };
         }
+        case "chart": {
+            return {
+                ...pom,
+                x: absoluteX,
+                y: absoluteY,
+                w: layout.width,
+                h: layout.height,
+            };
+        }
         case "box": {
             return {
                 ...pom,