@hirokisakabe/pom 9.1.1 → 10.0.0

package/dist/renderPptx/utils/straightLine.js

@@ -1,7 +1,9 @@
-import { pxToIn, pxToPt } from "../units.js";
+import { pxToEmu } from "../units.js";
+import { addGlimpseShape, arrowEndpoint, createShapeBoundsInput, noneShapeFill, solidShapeFill } from "./glimpseShape.js";
+import { asEmu } from "@pptx-glimpse/document";
 //#region src/renderPptx/utils/straightLine.ts
 /**
-* boolean | LineArrowOptions から pptxgenjs の arrow type を取得
+* boolean | LineArrowOptions から arrow type を取得
 */
 function resolveArrowType(arrow) {
 	if (arrow === void 0) return;
@@ -12,27 +14,43 @@ function resolveArrowType(arrow) {
 /**
 * 始点 (x1, y1) から終点 (x2, y2) への直線を描画する
 */
-function addStraightLine(ctx, { x1, y1, x2, y2 }, { color, lineWidth, dashType, beginArrow, endArrow }) {
+function addStraightLine(ctx, { x1, y1, x2, y2 }, { color, lineWidth, dashType, beginArrow, endArrow, lineGradient, lineGradientOpacity }) {
 	const minX = Math.min(x1, x2);
 	const minY = Math.min(y1, y2);
 	const lineW = Math.abs(x2 - x1);
 	const lineH = Math.abs(y2 - y1);
 	const flipH = x2 < x1;
 	const flipV = y2 < y1;
-	ctx.slide.addShape(ctx.pptx.ShapeType.line, {
-		x: pxToIn(minX),
-		y: pxToIn(minY),
-		w: pxToIn(lineW),
-		h: pxToIn(lineH),
+	addGlimpseShape(ctx, {
+		geometry: {
+			kind: "preset",
+			preset: "line"
+		},
+		...createShapeBoundsInput({
+			x: minX,
+			y: minY,
+			w: lineW,
+			h: lineH
+		}),
+		fill: noneShapeFill(),
+		outline: {
+			fill: solidShapeFill(color ?? "000000"),
+			width: lineWidth !== void 0 ? asEmu(Math.round(pxToEmu(lineWidth))) : asEmu(12700),
+			dash: dashType === "lgDashDotDot" ? void 0 : dashType,
+			headEnd: arrowEndpoint(resolveArrowType(beginArrow)),
+			tailEnd: arrowEndpoint(resolveArrowType(endArrow))
+		}
+	}, {
+		x: minX,
+		y: minY,
+		w: lineW,
+		h: lineH
+	}, {
 		flipH,
 		flipV,
-		line: {
-			color: color ?? "000000",
-			width: lineWidth !== void 0 ? pxToPt(lineWidth) : 1,
-			dashType,
-			beginArrowType: resolveArrowType(beginArrow),
-			endArrowType: resolveArrowType(endArrow)
-		}
+		dashType,
+		outlineGradient: lineGradient,
+		outlineOpacity: lineGradientOpacity
 	});
 }
 //#endregion

package/dist/renderPptx/utils/straightLine.js.map

@@ -1 +1 @@
-{"version":3,"file":"straightLine.js","names":[],"sources":["../../../src/renderPptx/utils/straightLine.ts"],"sourcesContent":["/**\n * 2 点間の直線を pptxgenjs の line shape に変換する共通描画処理。\n *\n * pptxgenjs の line shape は左上座標 (x, y) + サイズ (w, h) で表現され、\n * 線の向き (始点→終点) は flipH / flipV で表すため、端点座標からの\n * 変換ロジックを Line / Arrow ノードで共有する。\n */\nimport type { LineArrow, LineNode } from \"../../types.ts\";\nimport type { RenderContext } from \"../types.ts\";\nimport { pxToIn, pxToPt } from \"../units.ts\";\n\n/**\n * boolean | LineArrowOptions から pptxgenjs の arrow type を取得\n */\nexport function resolveArrowType(\n  arrow: LineArrow | undefined,\n): \"none\" | \"arrow\" | \"diamond\" | \"oval\" | \"stealth\" | \"triangle\" | undefined {\n  if (arrow === undefined) {\n    return undefined;\n  }\n  if (arrow === false) {\n    return \"none\";\n  }\n  if (arrow === true) {\n    return \"triangle\"; // デフォルト\n  }\n  return arrow.type ?? \"triangle\";\n}\n\ntype StraightLinePoints = { x1: number; y1: number; x2: number; y2: number };\n\ntype StraightLineStyle = Pick<\n  LineNode,\n  \"color\" | \"lineWidth\" | \"dashType\" | \"beginArrow\" | \"endArrow\"\n>;\n\n/**\n * 始点 (x1, y1) から終点 (x2, y2) への直線を描画する\n */\nexport function addStraightLine(\n  ctx: RenderContext,\n  { x1, y1, x2, y2 }: StraightLinePoints,\n  { color, lineWidth, dashType, beginArrow, endArrow }: StraightLineStyle,\n): void {\n  const minX = Math.min(x1, x2);\n  const minY = Math.min(y1, y2);\n  const lineW = Math.abs(x2 - x1);\n  const lineH = Math.abs(y2 - y1);\n\n  // 線の方向を判定して flip を決定\n  // flipH: 右から左へ向かう線\n  // flipV: 下から上へ向かう線\n  const flipH = x2 < x1;\n  const flipV = y2 < y1;\n\n  ctx.slide.addShape(ctx.pptx.ShapeType.line, {\n    x: pxToIn(minX),\n    y: pxToIn(minY),\n    w: pxToIn(lineW),\n    h: pxToIn(lineH),\n    flipH,\n    flipV,\n    line: {\n      color: color ?? \"000000\",\n      width: lineWidth !== undefined ? pxToPt(lineWidth) : 1,\n      dashType,\n      beginArrowType: resolveArrowType(beginArrow),\n      endArrowType: resolveArrowType(endArrow),\n    },\n  });\n}\n"],"mappings":";;;;;AAcA,SAAgB,iBACd,OAC4E;CAC5E,IAAI,UAAU,KAAA,GACZ;CAEF,IAAI,UAAU,OACZ,OAAO;CAET,IAAI,UAAU,MACZ,OAAO;CAET,OAAO,MAAM,QAAQ;AACvB;;;;AAYA,SAAgB,gBACd,KACA,EAAE,IAAI,IAAI,IAAI,MACd,EAAE,OAAO,WAAW,UAAU,YAAY,YACpC;CACN,MAAM,OAAO,KAAK,IAAI,IAAI,EAAE;CAC5B,MAAM,OAAO,KAAK,IAAI,IAAI,EAAE;CAC5B,MAAM,QAAQ,KAAK,IAAI,KAAK,EAAE;CAC9B,MAAM,QAAQ,KAAK,IAAI,KAAK,EAAE;CAK9B,MAAM,QAAQ,KAAK;CACnB,MAAM,QAAQ,KAAK;CAEnB,IAAI,MAAM,SAAS,IAAI,KAAK,UAAU,MAAM;EAC1C,GAAG,OAAO,IAAI;EACd,GAAG,OAAO,IAAI;EACd,GAAG,OAAO,KAAK;EACf,GAAG,OAAO,KAAK;EACf;EACA;EACA,MAAM;GACJ,OAAO,SAAS;GAChB,OAAO,cAAc,KAAA,IAAY,OAAO,SAAS,IAAI;GACrD;GACA,gBAAgB,iBAAiB,UAAU;GAC3C,cAAc,iBAAiB,QAAQ;EACzC;CACF,CAAC;AACH"}
+{"version":3,"file":"straightLine.js","names":[],"sources":["../../../src/renderPptx/utils/straightLine.ts"],"sourcesContent":["/**\n * 2 点間の直線を line shape に変換する共通描画処理。\n *\n * line shape は左上座標 (x, y) + サイズ (w, h) で表現され、\n * 線の向き (始点→終点) は flipH / flipV で表すため、端点座標からの\n * 変換ロジックを Line / Arrow ノードで共有する。\n */\nimport type { LineArrow, LineNode } from \"../../types.ts\";\nimport type { RenderContext } from \"../types.ts\";\nimport { asEmu } from \"@pptx-glimpse/document\";\nimport { pxToEmu } from \"../units.ts\";\nimport {\n  addGlimpseShape,\n  arrowEndpoint,\n  createShapeBoundsInput,\n  noneShapeFill,\n  solidShapeFill,\n} from \"./glimpseShape.ts\";\n\n/**\n * boolean | LineArrowOptions から arrow type を取得\n */\nexport function resolveArrowType(\n  arrow: LineArrow | undefined,\n): \"none\" | \"arrow\" | \"diamond\" | \"oval\" | \"stealth\" | \"triangle\" | undefined {\n  if (arrow === undefined) {\n    return undefined;\n  }\n  if (arrow === false) {\n    return \"none\";\n  }\n  if (arrow === true) {\n    return \"triangle\"; // デフォルト\n  }\n  return arrow.type ?? \"triangle\";\n}\n\ntype StraightLinePoints = { x1: number; y1: number; x2: number; y2: number };\n\ntype StraightLineStyle = Pick<\n  LineNode,\n  \"color\" | \"lineWidth\" | \"dashType\" | \"beginArrow\" | \"endArrow\"\n> & {\n  lineGradient?: string;\n  lineGradientOpacity?: number;\n};\n\n/**\n * 始点 (x1, y1) から終点 (x2, y2) への直線を描画する\n */\nexport function addStraightLine(\n  ctx: RenderContext,\n  { x1, y1, x2, y2 }: StraightLinePoints,\n  {\n    color,\n    lineWidth,\n    dashType,\n    beginArrow,\n    endArrow,\n    lineGradient,\n    lineGradientOpacity,\n  }: StraightLineStyle,\n): void {\n  const minX = Math.min(x1, x2);\n  const minY = Math.min(y1, y2);\n  const lineW = Math.abs(x2 - x1);\n  const lineH = Math.abs(y2 - y1);\n\n  // 線の方向を判定して flip を決定\n  // flipH: 右から左へ向かう線\n  // flipV: 下から上へ向かう線\n  const flipH = x2 < x1;\n  const flipV = y2 < y1;\n\n  addGlimpseShape(\n    ctx,\n    {\n      geometry: { kind: \"preset\", preset: \"line\" },\n      ...createShapeBoundsInput({ x: minX, y: minY, w: lineW, h: lineH }),\n      fill: noneShapeFill(),\n      outline: {\n        fill: solidShapeFill(color ?? \"000000\"),\n        width:\n          lineWidth !== undefined\n            ? asEmu(Math.round(pxToEmu(lineWidth)))\n            : asEmu(12700),\n        dash: dashType === \"lgDashDotDot\" ? undefined : dashType,\n        headEnd: arrowEndpoint(resolveArrowType(beginArrow)),\n        tailEnd: arrowEndpoint(resolveArrowType(endArrow)),\n      },\n    },\n    { x: minX, y: minY, w: lineW, h: lineH },\n    {\n      flipH,\n      flipV,\n      dashType,\n      outlineGradient: lineGradient,\n      outlineOpacity: lineGradientOpacity,\n    },\n  );\n}\n"],"mappings":";;;;;;;AAsBA,SAAgB,iBACd,OAC4E;CAC5E,IAAI,UAAU,KAAA,GACZ;CAEF,IAAI,UAAU,OACZ,OAAO;CAET,IAAI,UAAU,MACZ,OAAO;CAET,OAAO,MAAM,QAAQ;AACvB;;;;AAeA,SAAgB,gBACd,KACA,EAAE,IAAI,IAAI,IAAI,MACd,EACE,OACA,WACA,UACA,YACA,UACA,cACA,uBAEI;CACN,MAAM,OAAO,KAAK,IAAI,IAAI,EAAE;CAC5B,MAAM,OAAO,KAAK,IAAI,IAAI,EAAE;CAC5B,MAAM,QAAQ,KAAK,IAAI,KAAK,EAAE;CAC9B,MAAM,QAAQ,KAAK,IAAI,KAAK,EAAE;CAK9B,MAAM,QAAQ,KAAK;CACnB,MAAM,QAAQ,KAAK;CAEnB,gBACE,KACA;EACE,UAAU;GAAE,MAAM;GAAU,QAAQ;EAAO;EAC3C,GAAG,uBAAuB;GAAE,GAAG;GAAM,GAAG;GAAM,GAAG;GAAO,GAAG;EAAM,CAAC;EAClE,MAAM,cAAc;EACpB,SAAS;GACP,MAAM,eAAe,SAAS,QAAQ;GACtC,OACE,cAAc,KAAA,IACV,MAAM,KAAK,MAAM,QAAQ,SAAS,CAAC,CAAC,IACpC,MAAM,KAAK;GACjB,MAAM,aAAa,iBAAiB,KAAA,IAAY;GAChD,SAAS,cAAc,iBAAiB,UAAU,CAAC;GACnD,SAAS,cAAc,iBAAiB,QAAQ,CAAC;EACnD;CACF,GACA;EAAE,GAAG;EAAM,GAAG;EAAM,GAAG;EAAO,GAAG;CAAM,GACvC;EACE;EACA;EACA;EACA,iBAAiB;EACjB,gBAAgB;CAClB,CACF;AACF"}

package/dist/renderPptx/utils/visualStyle.js

@@ -1,28 +1,12 @@
-import { pxToPt } from "../units.js";
 //#region src/renderPptx/utils/visualStyle.ts
 /**
-* 色文字列から "#" を 1 つ取り除き、pptxgenjs が受け付ける HEX 文字列にする。
+* 色文字列から "#" を 1 つ取り除き、OOXML 向けの HEX 文字列にする。
 * undefined はそのまま返すため `stripHash(color) ?? fallback` の形で使える。
 */
 function stripHash(color) {
 	return color?.replace("#", "");
 }
 /**
-* ShadowStyle を pptxgenjs の shadow オプションに変換する
-* type 未指定時は outer をデフォルトとする
-*/
-function convertShadow(shadow) {
-	if (!shadow) return void 0;
-	return {
-		type: shadow.type ?? "outer",
-		opacity: shadow.opacity,
-		blur: shadow.blur,
-		angle: shadow.angle,
-		offset: shadow.offset,
-		color: shadow.color
-	};
-}
-/**
 * border が描画対象となる指定 (color / width / dashType のいずれか) を
 * 持つかを判定する
 */
@@ -64,50 +48,13 @@ function resolvePerSideBorders(style) {
 	return result;
 }
 /**
-* BorderStyle を pptxgenjs の line オプションに変換する
-* width はユーザー入力 px、pptxgenjs の line.width は pt
-*
-* @param fallbackColor color 未指定時に使う色。省略時は color を
-*   undefined のまま渡し pptxgenjs のデフォルトに任せる
-*/
-function convertBorderLine(border, fallbackColor) {
-	return {
-		color: border.color ?? fallbackColor,
-		width: border.width !== void 0 ? pxToPt(border.width) : void 0,
-		dashType: border.dashType
-	};
-}
-/**
-* ノードの opacity (0-1、1 = 不透明) を pptxgenjs の
-* transparency (0-100、100 = 透明) に変換する
-*/
-function opacityToTransparency(opacity) {
-	return opacity !== void 0 ? (1 - opacity) * 100 : void 0;
-}
-/**
-* backgroundColor / opacity / グラデーションマーカー色から
-* pptxgenjs の fill オプションを解決する
-*
-* gradientMarker がある場合はマーカー色の単色塗りとして描画し、
-* 出力時の後処理で gradFill に置換される (gradientFills.ts 参照)。
-* opacity はマーカー側ではなく gradFill のカラーストップの alpha で
-* 表現するため、マーカー fill には transparency を付与しない。
-*/
-function resolveBackgroundFill(backgroundColor, opacity, gradientMarker) {
-	if (gradientMarker) return { color: gradientMarker };
-	return {
-		color: backgroundColor,
-		transparency: opacityToTransparency(opacity)
-	};
-}
-/**
 * borderRadius (px) をノードサイズに対する 0-1 の正規化値
-* (pptxgenjs roundRect の rectRadius) に変換する
+* (roundRect の rectRadius) に変換する
 */
 function resolveRectRadius(borderRadius, w, h) {
 	return borderRadius ? Math.min(borderRadius / Math.min(w, h) * 2, 1) : void 0;
 }
 //#endregion
-export { BORDER_SIDES, convertBorderLine, convertShadow, hasVisibleBorder, opacityToTransparency, resolveBackgroundFill, resolvePerSideBorders, resolveRectRadius, stripHash };
+export { BORDER_SIDES, hasVisibleBorder, resolvePerSideBorders, resolveRectRadius, stripHash };
 
 //# sourceMappingURL=visualStyle.js.map

package/dist/renderPptx/utils/visualStyle.js.map

@@ -1 +1 @@
-{"version":3,"file":"visualStyle.js","names":[],"sources":["../../../src/renderPptx/utils/visualStyle.ts"],"sourcesContent":["/**\n * 見た目属性 (fill / border / shadow / opacity / borderRadius) を\n * pptxgenjs のオプションへ変換する共通 resolver 群。\n *\n * ノードごとに変換ロジックが重複・乖離すると、XML 上は同じ指定でも\n * 描画結果が異なるリスクがあるため、属性値 → pptxgenjs オプションの\n * 純粋変換をここに集約する。\n *\n * 共通化対象の属性カテゴリ:\n * - fill (背景色 + opacity): resolveBackgroundFill / opacityToTransparency\n * - border / line (枠線): hasVisibleBorder / convertBorderLine\n * - shadow (影): convertShadow\n * - borderRadius (角丸): resolveRectRadius\n *\n * 既存 helper との責務境界:\n * - gradientFills.ts: backgroundGradient のマーカー登録と出力時の gradFill 置換。\n *   グラデーションはマーカー色 1 色の単色塗りに帰着するため本モジュールでは\n *   解釈せず、マーカー色を resolveBackgroundFill で単色 fill として扱う。\n * - utils/backgroundBorder.ts: 背景色 → 背景画像 → ボーダーの描画順序の\n *   オーケストレーション。個々の属性値の変換は本モジュールに委譲する。\n * - textOptions.ts: テキスト系属性 (font / underline / strike など) の変換。\n */\nimport type { BorderStyle, ShadowStyle } from \"../../types.ts\";\nimport { pxToPt } from \"../units.ts\";\n\n/**\n * 色文字列から \"#\" を 1 つ取り除き、pptxgenjs が受け付ける HEX 文字列にする。\n * undefined はそのまま返すため `stripHash(color) ?? fallback` の形で使える。\n */\nexport function stripHash(color: string | undefined): string | undefined {\n  return color?.replace(\"#\", \"\");\n}\n\n/**\n * ShadowStyle を pptxgenjs の shadow オプションに変換する\n * type 未指定時は outer をデフォルトとする\n */\nexport function convertShadow(shadow: ShadowStyle | undefined):\n  | {\n      type: \"outer\" | \"inner\";\n      opacity?: number;\n      blur?: number;\n      angle?: number;\n      offset?: number;\n      color?: string;\n    }\n  | undefined {\n  if (!shadow) return undefined;\n  return {\n    type: shadow.type ?? \"outer\",\n    opacity: shadow.opacity,\n    blur: shadow.blur,\n    angle: shadow.angle,\n    offset: shadow.offset,\n    color: shadow.color,\n  };\n}\n\n/**\n * border が描画対象となる指定 (color / width / dashType のいずれか) を\n * 持つかを判定する\n */\nexport function hasVisibleBorder(\n  border: BorderStyle | undefined,\n): border is BorderStyle {\n  return Boolean(\n    border &&\n    (border.color !== undefined ||\n      border.width !== undefined ||\n      border.dashType !== undefined),\n  );\n}\n\nexport const BORDER_SIDES = [\"top\", \"right\", \"bottom\", \"left\"] as const;\nexport type BorderSide = (typeof BORDER_SIDES)[number];\n\nexport type PerSideBorders = Partial<Record<BorderSide, BorderStyle>>;\n\n/**\n * 4 辺一律の border と辺ごとの borderTop / borderRight / borderBottom /\n * borderLeft をマージし、描画対象となる辺ごとの BorderStyle を返す。\n *\n * - 辺ごとの指定が 1 つも無い場合は undefined を返し、呼び出し側は\n *   従来の 4 辺一律描画 (shape の line オプション) にフォールバックする\n * - 辺ごとの指定がある場合、各辺は border をベースに辺ごとの指定で\n *   フィールド単位に上書きした BorderStyle になる (辺ごとの指定が優先)\n * - マージ結果が描画対象とならない辺 (指定なし) は結果に含まれない\n */\nexport function resolvePerSideBorders(style: {\n  border?: BorderStyle;\n  borderTop?: BorderStyle;\n  borderRight?: BorderStyle;\n  borderBottom?: BorderStyle;\n  borderLeft?: BorderStyle;\n}): PerSideBorders | undefined {\n  const overrides: Partial<Record<BorderSide, BorderStyle | undefined>> = {\n    top: style.borderTop,\n    right: style.borderRight,\n    bottom: style.borderBottom,\n    left: style.borderLeft,\n  };\n\n  const hasPerSideOverride = Object.values(overrides).some(hasVisibleBorder);\n  if (!hasPerSideOverride) return undefined;\n\n  const result: PerSideBorders = {};\n  for (const side of BORDER_SIDES) {\n    const merged = { ...style.border, ...overrides[side] };\n    if (hasVisibleBorder(merged)) {\n      result[side] = merged;\n    }\n  }\n  return result;\n}\n\n/**\n * BorderStyle を pptxgenjs の line オプションに変換する\n * width はユーザー入力 px、pptxgenjs の line.width は pt\n *\n * @param fallbackColor color 未指定時に使う色。省略時は color を\n *   undefined のまま渡し pptxgenjs のデフォルトに任せる\n */\nexport function convertBorderLine(\n  border: BorderStyle,\n  fallbackColor?: string,\n): { color?: string; width?: number; dashType?: BorderStyle[\"dashType\"] } {\n  return {\n    color: border.color ?? fallbackColor,\n    width: border.width !== undefined ? pxToPt(border.width) : undefined,\n    dashType: border.dashType,\n  };\n}\n\n/**\n * ノードの opacity (0-1、1 = 不透明) を pptxgenjs の\n * transparency (0-100、100 = 透明) に変換する\n */\nexport function opacityToTransparency(\n  opacity: number | undefined,\n): number | undefined {\n  return opacity !== undefined ? (1 - opacity) * 100 : undefined;\n}\n\n/**\n * backgroundColor / opacity / グラデーションマーカー色から\n * pptxgenjs の fill オプションを解決する\n *\n * gradientMarker がある場合はマーカー色の単色塗りとして描画し、\n * 出力時の後処理で gradFill に置換される (gradientFills.ts 参照)。\n * opacity はマーカー側ではなく gradFill のカラーストップの alpha で\n * 表現するため、マーカー fill には transparency を付与しない。\n */\nexport function resolveBackgroundFill(\n  backgroundColor: string | undefined,\n  opacity: number | undefined,\n  gradientMarker: string | undefined,\n): { color?: string; transparency?: number } {\n  if (gradientMarker) return { color: gradientMarker };\n  return {\n    color: backgroundColor,\n    transparency: opacityToTransparency(opacity),\n  };\n}\n\n/**\n * borderRadius (px) をノードサイズに対する 0-1 の正規化値\n * (pptxgenjs roundRect の rectRadius) に変換する\n */\nexport function resolveRectRadius(\n  borderRadius: number | undefined,\n  w: number,\n  h: number,\n): number | undefined {\n  return borderRadius\n    ? Math.min((borderRadius / Math.min(w, h)) * 2, 1)\n    : undefined;\n}\n"],"mappings":";;;;;;AA6BA,SAAgB,UAAU,OAA+C;CACvE,OAAO,OAAO,QAAQ,KAAK,EAAE;AAC/B;;;;;AAMA,SAAgB,cAAc,QAShB;CACZ,IAAI,CAAC,QAAQ,OAAO,KAAA;CACpB,OAAO;EACL,MAAM,OAAO,QAAQ;EACrB,SAAS,OAAO;EAChB,MAAM,OAAO;EACb,OAAO,OAAO;EACd,QAAQ,OAAO;EACf,OAAO,OAAO;CAChB;AACF;;;;;AAMA,SAAgB,iBACd,QACuB;CACvB,OAAO,QACL,WACC,OAAO,UAAU,KAAA,KAChB,OAAO,UAAU,KAAA,KACjB,OAAO,aAAa,KAAA,EACxB;AACF;AAEA,MAAa,eAAe;CAAC;CAAO;CAAS;CAAU;AAAM;;;;;;;;;;;AAe7D,SAAgB,sBAAsB,OAMP;CAC7B,MAAM,YAAkE;EACtE,KAAK,MAAM;EACX,OAAO,MAAM;EACb,QAAQ,MAAM;EACd,MAAM,MAAM;CACd;CAGA,IAAI,CADuB,OAAO,OAAO,SAAS,CAAC,CAAC,KAAK,gBACnC,GAAG,OAAO,KAAA;CAEhC,MAAM,SAAyB,CAAC;CAChC,KAAK,MAAM,QAAQ,cAAc;EAC/B,MAAM,SAAS;GAAE,GAAG,MAAM;GAAQ,GAAG,UAAU;EAAM;EACrD,IAAI,iBAAiB,MAAM,GACzB,OAAO,QAAQ;CAEnB;CACA,OAAO;AACT;;;;;;;;AASA,SAAgB,kBACd,QACA,eACwE;CACxE,OAAO;EACL,OAAO,OAAO,SAAS;EACvB,OAAO,OAAO,UAAU,KAAA,IAAY,OAAO,OAAO,KAAK,IAAI,KAAA;EAC3D,UAAU,OAAO;CACnB;AACF;;;;;AAMA,SAAgB,sBACd,SACoB;CACpB,OAAO,YAAY,KAAA,KAAa,IAAI,WAAW,MAAM,KAAA;AACvD;;;;;;;;;;AAWA,SAAgB,sBACd,iBACA,SACA,gBAC2C;CAC3C,IAAI,gBAAgB,OAAO,EAAE,OAAO,eAAe;CACnD,OAAO;EACL,OAAO;EACP,cAAc,sBAAsB,OAAO;CAC7C;AACF;;;;;AAMA,SAAgB,kBACd,cACA,GACA,GACoB;CACpB,OAAO,eACH,KAAK,IAAK,eAAe,KAAK,IAAI,GAAG,CAAC,IAAK,GAAG,CAAC,IAC/C,KAAA;AACN"}
+{"version":3,"file":"visualStyle.js","names":[],"sources":["../../../src/renderPptx/utils/visualStyle.ts"],"sourcesContent":["/**\n * 見た目属性 (fill / border / shadow / opacity / borderRadius) を\n * PPTX 描画用の中間オプションへ変換する共通 resolver 群。\n *\n * ノードごとに変換ロジックが重複・乖離すると、XML 上は同じ指定でも\n * 描画結果が異なるリスクがあるため、属性値から描画オプションへの\n * 純粋変換をここに集約する。\n *\n * 共通化対象の属性カテゴリ:\n * - fill (背景色 + opacity): resolveBackgroundFill / opacityToTransparency\n * - border / line (枠線): hasVisibleBorder / convertBorderLine\n * - shadow (影): convertShadow\n * - borderRadius (角丸): resolveRectRadius\n *\n * 既存 helper との責務境界:\n * - utils/glimpseShape.ts: backgroundGradient を writer 生成 XML の native\n *   gradFill として出力する。\n * - utils/backgroundBorder.ts: 背景色 → 背景画像 → ボーダーの描画順序の\n *   オーケストレーション。個々の属性値の変換は本モジュールに委譲する。\n * - textOptions.ts: テキスト系属性 (font / underline / strike など) の変換。\n */\nimport type { BorderStyle, ShadowStyle } from \"../../types.ts\";\nimport { pxToPt } from \"../units.ts\";\n\n/**\n * 色文字列から \"#\" を 1 つ取り除き、OOXML 向けの HEX 文字列にする。\n * undefined はそのまま返すため `stripHash(color) ?? fallback` の形で使える。\n */\nexport function stripHash(color: string | undefined): string | undefined {\n  return color?.replace(\"#\", \"\");\n}\n\n/**\n * ShadowStyle を描画用の shadow オプションに変換する\n * type 未指定時は outer をデフォルトとする\n */\nexport function convertShadow(shadow: ShadowStyle | undefined):\n  | {\n      type: \"outer\" | \"inner\";\n      opacity?: number;\n      blur?: number;\n      angle?: number;\n      offset?: number;\n      color?: string;\n    }\n  | undefined {\n  if (!shadow) return undefined;\n  return {\n    type: shadow.type ?? \"outer\",\n    opacity: shadow.opacity,\n    blur: shadow.blur,\n    angle: shadow.angle,\n    offset: shadow.offset,\n    color: shadow.color,\n  };\n}\n\n/**\n * border が描画対象となる指定 (color / width / dashType のいずれか) を\n * 持つかを判定する\n */\nexport function hasVisibleBorder(\n  border: BorderStyle | undefined,\n): border is BorderStyle {\n  return Boolean(\n    border &&\n    (border.color !== undefined ||\n      border.width !== undefined ||\n      border.dashType !== undefined),\n  );\n}\n\nexport const BORDER_SIDES = [\"top\", \"right\", \"bottom\", \"left\"] as const;\nexport type BorderSide = (typeof BORDER_SIDES)[number];\n\nexport type PerSideBorders = Partial<Record<BorderSide, BorderStyle>>;\n\n/**\n * 4 辺一律の border と辺ごとの borderTop / borderRight / borderBottom /\n * borderLeft をマージし、描画対象となる辺ごとの BorderStyle を返す。\n *\n * - 辺ごとの指定が 1 つも無い場合は undefined を返し、呼び出し側は\n *   従来の 4 辺一律描画 (shape の line オプション) にフォールバックする\n * - 辺ごとの指定がある場合、各辺は border をベースに辺ごとの指定で\n *   フィールド単位に上書きした BorderStyle になる (辺ごとの指定が優先)\n * - マージ結果が描画対象とならない辺 (指定なし) は結果に含まれない\n */\nexport function resolvePerSideBorders(style: {\n  border?: BorderStyle;\n  borderTop?: BorderStyle;\n  borderRight?: BorderStyle;\n  borderBottom?: BorderStyle;\n  borderLeft?: BorderStyle;\n}): PerSideBorders | undefined {\n  const overrides: Partial<Record<BorderSide, BorderStyle | undefined>> = {\n    top: style.borderTop,\n    right: style.borderRight,\n    bottom: style.borderBottom,\n    left: style.borderLeft,\n  };\n\n  const hasPerSideOverride = Object.values(overrides).some(hasVisibleBorder);\n  if (!hasPerSideOverride) return undefined;\n\n  const result: PerSideBorders = {};\n  for (const side of BORDER_SIDES) {\n    const merged = { ...style.border, ...overrides[side] };\n    if (hasVisibleBorder(merged)) {\n      result[side] = merged;\n    }\n  }\n  return result;\n}\n\n/**\n * BorderStyle を描画用の line オプションに変換する\n * width はユーザー入力 px、描画用の line.width は pt\n *\n * @param fallbackColor color 未指定時に使う色。省略時は color を\n *   undefined のまま渡し呼び出し側のデフォルトに任せる\n */\nexport function convertBorderLine(\n  border: BorderStyle,\n  fallbackColor?: string,\n): { color?: string; width?: number; dashType?: BorderStyle[\"dashType\"] } {\n  return {\n    color: border.color ?? fallbackColor,\n    width: border.width !== undefined ? pxToPt(border.width) : undefined,\n    dashType: border.dashType,\n  };\n}\n\n/**\n * ノードの opacity (0-1、1 = 不透明) を描画用の\n * transparency (0-100、100 = 透明) に変換する\n */\nexport function opacityToTransparency(\n  opacity: number | undefined,\n): number | undefined {\n  return opacity !== undefined ? (1 - opacity) * 100 : undefined;\n}\n\n/**\n * backgroundColor / opacity / 互換用のグラデーション fallback 色から\n * fill オプションを解決する\n *\n * gradientMarker は既存 helper の互換引数として残している。\n * backgroundGradient は utils/glimpseShape.ts 側で native\n * gradFill に変換する。\n */\nexport function resolveBackgroundFill(\n  backgroundColor: string | undefined,\n  opacity: number | undefined,\n  gradientMarker: string | undefined,\n): { color?: string; transparency?: number } {\n  if (gradientMarker) return { color: gradientMarker };\n  return {\n    color: backgroundColor,\n    transparency: opacityToTransparency(opacity),\n  };\n}\n\n/**\n * borderRadius (px) をノードサイズに対する 0-1 の正規化値\n * (roundRect の rectRadius) に変換する\n */\nexport function resolveRectRadius(\n  borderRadius: number | undefined,\n  w: number,\n  h: number,\n): number | undefined {\n  return borderRadius\n    ? Math.min((borderRadius / Math.min(w, h)) * 2, 1)\n    : undefined;\n}\n"],"mappings":";;;;;AA4BA,SAAgB,UAAU,OAA+C;CACvE,OAAO,OAAO,QAAQ,KAAK,EAAE;AAC/B;;;;;AA+BA,SAAgB,iBACd,QACuB;CACvB,OAAO,QACL,WACC,OAAO,UAAU,KAAA,KAChB,OAAO,UAAU,KAAA,KACjB,OAAO,aAAa,KAAA,EACxB;AACF;AAEA,MAAa,eAAe;CAAC;CAAO;CAAS;CAAU;AAAM;;;;;;;;;;;AAe7D,SAAgB,sBAAsB,OAMP;CAC7B,MAAM,YAAkE;EACtE,KAAK,MAAM;EACX,OAAO,MAAM;EACb,QAAQ,MAAM;EACd,MAAM,MAAM;CACd;CAGA,IAAI,CADuB,OAAO,OAAO,SAAS,CAAC,CAAC,KAAK,gBACnC,GAAG,OAAO,KAAA;CAEhC,MAAM,SAAyB,CAAC;CAChC,KAAK,MAAM,QAAQ,cAAc;EAC/B,MAAM,SAAS;GAAE,GAAG,MAAM;GAAQ,GAAG,UAAU;EAAM;EACrD,IAAI,iBAAiB,MAAM,GACzB,OAAO,QAAQ;CAEnB;CACA,OAAO;AACT;;;;;AAsDA,SAAgB,kBACd,cACA,GACA,GACoB;CACpB,OAAO,eACH,KAAK,IAAK,eAAe,KAAK,IAAI,GAAG,CAAC,IAAK,GAAG,CAAC,IAC/C,KAAA;AACN"}

package/dist/renderPptx/writablePptx.d.ts

@@ -0,0 +1,23 @@
+import { Buffer } from "node:buffer";
+
+//#region src/renderPptx/writablePptx.d.ts
+type PptxOutputType = "arraybuffer" | "base64" | "binarystring" | "blob" | "nodebuffer" | "uint8array";
+type PptxWriteOptions = {
+  outputType?: PptxOutputType;
+};
+type PptxWriteFileOptions = {
+  fileName?: string;
+};
+type PptxWriteOutput<T extends PptxOutputType | undefined> = T extends "arraybuffer" ? ArrayBuffer : T extends "base64" | "binarystring" ? string : T extends "nodebuffer" ? Buffer : T extends "uint8array" ? Uint8Array : Blob;
+interface WritablePptx {
+  write(): Promise<Blob>;
+  write<T extends PptxOutputType>(options: PptxWriteOptions & {
+    outputType: T;
+  }): Promise<PptxWriteOutput<T>>;
+  write(options: PptxWriteOptions): Promise<PptxWriteOutput<PptxOutputType | undefined>>;
+  stream(): Promise<Uint8Array>;
+  writeFile(options?: PptxWriteFileOptions | string): Promise<string>;
+}
+//#endregion
+export { PptxOutputType, PptxWriteFileOptions, PptxWriteOptions, PptxWriteOutput, WritablePptx };
+//# sourceMappingURL=writablePptx.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"writablePptx.d.ts","names":[],"sources":["../../src/renderPptx/writablePptx.ts"],"mappings":";;;KAGY,cAAA;AAAA,KAQA,gBAAA;EACV,UAAA,GAAa,cAAc;AAAA;AAAA,KAGjB,oBAAA;EACV,QAAQ;AAAA;AAAA,KAGE,eAAA,WAA0B,cAAA,gBACpC,CAAA,yBACI,WAAA,GACA,CAAA,8CAEE,CAAA,wBACE,MAAA,GACA,CAAA,wBACE,UAAA,GACA,IAAA;AAAA,UAEK,YAAA;EACf,KAAA,IAAS,OAAA,CAAQ,IAAA;EACjB,KAAA,WAAgB,cAAA,EACd,OAAA,EAAS,gBAAA;IAAqB,UAAA,EAAY,CAAA;EAAA,IACzC,OAAA,CAAQ,eAAA,CAAgB,CAAA;EAC3B,KAAA,CACE,OAAA,EAAS,gBAAA,GACR,OAAA,CAAQ,eAAA,CAAgB,cAAA;EAC3B,MAAA,IAAU,OAAA,CAAQ,UAAA;EAClB,SAAA,CAAU,OAAA,GAAU,oBAAA,YAAgC,OAAA;AAAA"}

package/dist/renderPptx/writablePptx.js

@@ -0,0 +1,74 @@
+import { writePptx } from "@pptx-glimpse/document";
+//#region src/renderPptx/writablePptx.ts
+function toArrayBuffer(bytes) {
+	return bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
+}
+function toBinaryString(bytes) {
+	let result = "";
+	for (const byte of bytes) result += String.fromCharCode(byte);
+	return result;
+}
+function toBase64(bytes) {
+	if (typeof Buffer !== "undefined") return Buffer.from(bytes).toString("base64");
+	return btoa(toBinaryString(bytes));
+}
+function normalizeFileName(fileName) {
+	return fileName.toLowerCase().endsWith(".pptx") ? fileName : `${fileName}.pptx`;
+}
+function downloadInBrowser(fileName, bytes) {
+	const blob = new Blob([toArrayBuffer(bytes)], { type: "application/vnd.openxmlformats-officedocument.presentationml.presentation" });
+	const url = URL.createObjectURL(blob);
+	let anchor;
+	const cleanup = () => {
+		try {
+			anchor?.remove();
+		} finally {
+			URL.revokeObjectURL(url);
+		}
+	};
+	let cleanupScheduled = false;
+	try {
+		anchor = document.createElement("a");
+		anchor.href = url;
+		anchor.download = fileName;
+		document.body.append(anchor);
+		anchor.click();
+		setTimeout(cleanup, 0);
+		cleanupScheduled = true;
+	} finally {
+		if (!cleanupScheduled) cleanup();
+	}
+}
+function createWritablePptx(getSource) {
+	function write(options) {
+		return Promise.resolve().then(() => {
+			const bytes = writePptx(getSource());
+			switch (options?.outputType) {
+				case "arraybuffer": return toArrayBuffer(bytes);
+				case "base64": return toBase64(bytes);
+				case "binarystring": return toBinaryString(bytes);
+				case "nodebuffer": return Buffer.from(bytes);
+				case "uint8array": return bytes;
+				case "blob":
+				case void 0: return new Blob([toArrayBuffer(bytes)], { type: "application/vnd.openxmlformats-officedocument.presentationml.presentation" });
+			}
+		});
+	}
+	return {
+		write,
+		stream() {
+			return Promise.resolve().then(() => writePptx(getSource()));
+		},
+		async writeFile(options) {
+			const fileName = normalizeFileName(typeof options === "string" ? options : options?.fileName ?? "Presentation.pptx");
+			const bytes = writePptx(getSource());
+			if (typeof document !== "undefined") downloadInBrowser(fileName, bytes);
+			else await (await import("node:fs/promises")).writeFile(fileName, bytes);
+			return fileName;
+		}
+	};
+}
+//#endregion
+export { createWritablePptx };
+
+//# sourceMappingURL=writablePptx.js.map

package/dist/renderPptx/writablePptx.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"writablePptx.js","names":[],"sources":["../../src/renderPptx/writablePptx.ts"],"sourcesContent":["import { writePptx, type PptxSourceModel } from \"@pptx-glimpse/document\";\nimport type { Buffer as NodeBuffer } from \"node:buffer\";\n\nexport type PptxOutputType =\n  | \"arraybuffer\"\n  | \"base64\"\n  | \"binarystring\"\n  | \"blob\"\n  | \"nodebuffer\"\n  | \"uint8array\";\n\nexport type PptxWriteOptions = {\n  outputType?: PptxOutputType;\n};\n\nexport type PptxWriteFileOptions = {\n  fileName?: string;\n};\n\nexport type PptxWriteOutput<T extends PptxOutputType | undefined> =\n  T extends \"arraybuffer\"\n    ? ArrayBuffer\n    : T extends \"base64\" | \"binarystring\"\n      ? string\n      : T extends \"nodebuffer\"\n        ? NodeBuffer\n        : T extends \"uint8array\"\n          ? Uint8Array\n          : Blob;\n\nexport interface WritablePptx {\n  write(): Promise<Blob>;\n  write<T extends PptxOutputType>(\n    options: PptxWriteOptions & { outputType: T },\n  ): Promise<PptxWriteOutput<T>>;\n  write(\n    options: PptxWriteOptions,\n  ): Promise<PptxWriteOutput<PptxOutputType | undefined>>;\n  stream(): Promise<Uint8Array>;\n  writeFile(options?: PptxWriteFileOptions | string): Promise<string>;\n}\n\nfunction toArrayBuffer(bytes: Uint8Array): ArrayBuffer {\n  return bytes.buffer.slice(\n    bytes.byteOffset,\n    bytes.byteOffset + bytes.byteLength,\n  ) as ArrayBuffer;\n}\n\nfunction toBinaryString(bytes: Uint8Array): string {\n  let result = \"\";\n  for (const byte of bytes) result += String.fromCharCode(byte);\n  return result;\n}\n\nfunction toBase64(bytes: Uint8Array): string {\n  if (typeof Buffer !== \"undefined\")\n    return Buffer.from(bytes).toString(\"base64\");\n  return btoa(toBinaryString(bytes));\n}\n\nfunction normalizeFileName(fileName: string): string {\n  return fileName.toLowerCase().endsWith(\".pptx\")\n    ? fileName\n    : `${fileName}.pptx`;\n}\n\nfunction downloadInBrowser(fileName: string, bytes: Uint8Array): void {\n  const blob = new Blob([toArrayBuffer(bytes)], {\n    type: \"application/vnd.openxmlformats-officedocument.presentationml.presentation\",\n  });\n  const url = URL.createObjectURL(blob);\n  let anchor: HTMLAnchorElement | undefined;\n  const cleanup = () => {\n    try {\n      anchor?.remove();\n    } finally {\n      URL.revokeObjectURL(url);\n    }\n  };\n  let cleanupScheduled = false;\n  try {\n    anchor = document.createElement(\"a\");\n    anchor.href = url;\n    anchor.download = fileName;\n    document.body.append(anchor);\n    anchor.click();\n    setTimeout(cleanup, 0);\n    cleanupScheduled = true;\n  } finally {\n    if (!cleanupScheduled) cleanup();\n  }\n}\n\nexport function createWritablePptx(\n  getSource: () => PptxSourceModel,\n): WritablePptx {\n  function write(options?: PptxWriteOptions): Promise<unknown> {\n    return Promise.resolve().then(() => {\n      const bytes = writePptx(getSource());\n      switch (options?.outputType) {\n        case \"arraybuffer\":\n          return toArrayBuffer(bytes);\n        case \"base64\":\n          return toBase64(bytes);\n        case \"binarystring\":\n          return toBinaryString(bytes);\n        case \"nodebuffer\":\n          return Buffer.from(bytes);\n        case \"uint8array\":\n          return bytes;\n        case \"blob\":\n        case undefined:\n          return new Blob([toArrayBuffer(bytes)], {\n            type: \"application/vnd.openxmlformats-officedocument.presentationml.presentation\",\n          });\n      }\n    });\n  }\n\n  return {\n    write: write as WritablePptx[\"write\"],\n    stream() {\n      return Promise.resolve().then(() => writePptx(getSource()));\n    },\n    async writeFile(options) {\n      const fileName = normalizeFileName(\n        typeof options === \"string\"\n          ? options\n          : (options?.fileName ?? \"Presentation.pptx\"),\n      );\n      const bytes = writePptx(getSource());\n      if (typeof document !== \"undefined\") {\n        downloadInBrowser(fileName, bytes);\n      } else {\n        const fs = await import(\"node:fs/promises\");\n        await fs.writeFile(fileName, bytes);\n      }\n      return fileName;\n    },\n  };\n}\n"],"mappings":";;AA0CA,SAAS,cAAc,OAAgC;CACrD,OAAO,MAAM,OAAO,MAClB,MAAM,YACN,MAAM,aAAa,MAAM,UAC3B;AACF;AAEA,SAAS,eAAe,OAA2B;CACjD,IAAI,SAAS;CACb,KAAK,MAAM,QAAQ,OAAO,UAAU,OAAO,aAAa,IAAI;CAC5D,OAAO;AACT;AAEA,SAAS,SAAS,OAA2B;CAC3C,IAAI,OAAO,WAAW,aACpB,OAAO,OAAO,KAAK,KAAK,CAAC,CAAC,SAAS,QAAQ;CAC7C,OAAO,KAAK,eAAe,KAAK,CAAC;AACnC;AAEA,SAAS,kBAAkB,UAA0B;CACnD,OAAO,SAAS,YAAY,CAAC,CAAC,SAAS,OAAO,IAC1C,WACA,GAAG,SAAS;AAClB;AAEA,SAAS,kBAAkB,UAAkB,OAAyB;CACpE,MAAM,OAAO,IAAI,KAAK,CAAC,cAAc,KAAK,CAAC,GAAG,EAC5C,MAAM,4EACR,CAAC;CACD,MAAM,MAAM,IAAI,gBAAgB,IAAI;CACpC,IAAI;CACJ,MAAM,gBAAgB;EACpB,IAAI;GACF,QAAQ,OAAO;EACjB,UAAU;GACR,IAAI,gBAAgB,GAAG;EACzB;CACF;CACA,IAAI,mBAAmB;CACvB,IAAI;EACF,SAAS,SAAS,cAAc,GAAG;EACnC,OAAO,OAAO;EACd,OAAO,WAAW;EAClB,SAAS,KAAK,OAAO,MAAM;EAC3B,OAAO,MAAM;EACb,WAAW,SAAS,CAAC;EACrB,mBAAmB;CACrB,UAAU;EACR,IAAI,CAAC,kBAAkB,QAAQ;CACjC;AACF;AAEA,SAAgB,mBACd,WACc;CACd,SAAS,MAAM,SAA8C;EAC3D,OAAO,QAAQ,QAAQ,CAAC,CAAC,WAAW;GAClC,MAAM,QAAQ,UAAU,UAAU,CAAC;GACnC,QAAQ,SAAS,YAAjB;IACE,KAAK,eACH,OAAO,cAAc,KAAK;IAC5B,KAAK,UACH,OAAO,SAAS,KAAK;IACvB,KAAK,gBACH,OAAO,eAAe,KAAK;IAC7B,KAAK,cACH,OAAO,OAAO,KAAK,KAAK;IAC1B,KAAK,cACH,OAAO;IACT,KAAK;IACL,KAAK,KAAA,GACH,OAAO,IAAI,KAAK,CAAC,cAAc,KAAK,CAAC,GAAG,EACtC,MAAM,4EACR,CAAC;GACL;EACF,CAAC;CACH;CAEA,OAAO;EACE;EACP,SAAS;GACP,OAAO,QAAQ,QAAQ,CAAC,CAAC,WAAW,UAAU,UAAU,CAAC,CAAC;EAC5D;EACA,MAAM,UAAU,SAAS;GACvB,MAAM,WAAW,kBACf,OAAO,YAAY,WACf,UACC,SAAS,YAAY,mBAC5B;GACA,MAAM,QAAQ,UAAU,UAAU,CAAC;GACnC,IAAI,OAAO,aAAa,aACtB,kBAAkB,UAAU,KAAK;QAGjC,OAAM,MADW,OAAO,oBAAA,CACf,UAAU,UAAU,KAAK;GAEpC,OAAO;EACT;CACF;AACF"}

package/dist/shared/measureImage.js.map

@@ -1 +1 @@
-{"version":3,"file":"measureImage.js","names":[],"sources":["../../src/shared/measureImage.ts"],"sourcesContent":["import * as fs from \"fs\";\nimport { imageSize } from \"image-size\";\nimport type { DiagnosticCollector } from \"../diagnostics.ts\";\n\ntype ImageSizeCache = Map<string, { widthPx: number; heightPx: number }>;\ntype ImageDataCache = Map<string, string>;\n\n/**\n * キャッシュされた画像データ（Base64）を取得する\n * @param src 画像のパス\n * @param cache 画像データキャッシュ\n * @returns Base64形式の画像データ、またはキャッシュがない場合はundefined\n */\nexport function getImageData(\n  src: string,\n  cache: ImageDataCache,\n): string | undefined {\n  return cache.get(src);\n}\n\n/**\n * 画像サイズを事前取得してキャッシュする（非同期）\n * HTTPS URLの画像を処理する際に使用\n * @param src 画像のパス（ローカルパス、base64データ、またはHTTPS URL）\n * @param sizeCache 画像サイズキャッシュ\n * @param dataCache 画像データキャッシュ\n * @returns 画像の幅と高さ（px）\n */\nexport async function prefetchImageSize(\n  src: string,\n  sizeCache: ImageSizeCache,\n  dataCache: ImageDataCache,\n  diagnostics: DiagnosticCollector,\n): Promise<{\n  widthPx: number;\n  heightPx: number;\n}> {\n  // キャッシュにあればそれを返す\n  const cached = sizeCache.get(src);\n  if (cached) {\n    return cached;\n  }\n\n  try {\n    let buffer: Uint8Array;\n\n    // base64データの場合\n    if (src.startsWith(\"data:\")) {\n      const base64Data = src.split(\",\")[1];\n      buffer = new Uint8Array(Buffer.from(base64Data, \"base64\"));\n    }\n    // HTTPS/HTTP URLの場合\n    else if (src.startsWith(\"https://\") || src.startsWith(\"http://\")) {\n      const response = await fetch(src);\n      if (!response.ok) {\n        throw new Error(`Failed to fetch image: ${response.status}`);\n      }\n      const arrayBuffer = await response.arrayBuffer();\n      buffer = new Uint8Array(arrayBuffer);\n\n      // 画像データをBase64形式でキャッシュ（pptxgenjs用）\n      const contentType = response.headers.get(\"content-type\") || \"image/png\";\n      const base64 = Buffer.from(arrayBuffer).toString(\"base64\");\n      dataCache.set(src, `${contentType};base64,${base64}`);\n    }\n    // ローカルファイルパスの場合\n    else {\n      buffer = new Uint8Array(fs.readFileSync(src));\n    }\n\n    const dimensions = imageSize(buffer);\n\n    const width = dimensions.width ?? 100; // デフォルト100px\n    const height = dimensions.height ?? 100; // デフォルト100px\n\n    const result = {\n      widthPx: width,\n      heightPx: height,\n    };\n\n    // キャッシュに保存\n    sizeCache.set(src, result);\n\n    return result;\n  } catch (error) {\n    // エラーが発生した場合はデフォルトサイズを返す\n    diagnostics.add(\n      \"IMAGE_MEASURE_FAILED\",\n      `Failed to measure image size for ${src}: ${String(error)}`,\n    );\n    const result = {\n      widthPx: 100,\n      heightPx: 100,\n    };\n    sizeCache.set(src, result);\n    return result;\n  }\n}\n\n/**\n * 画像ファイルのサイズを取得する（同期）\n * 事前にprefetchImageSizeでキャッシュしておくこと\n * @param src 画像のパス（ローカルパス、base64データ、またはHTTPS URL）\n * @param sizeCache 画像サイズキャッシュ\n * @returns 画像の幅と高さ（px）\n */\nexport function measureImage(\n  src: string,\n  sizeCache: ImageSizeCache,\n  diagnostics: DiagnosticCollector,\n): {\n  widthPx: number;\n  heightPx: number;\n} {\n  // キャッシュにあればそれを返す\n  const cached = sizeCache.get(src);\n  if (cached) {\n    return cached;\n  }\n\n  // キャッシュにない場合（ローカルファイルやbase64のみ同期処理可能）\n  try {\n    let buffer: Uint8Array;\n\n    // base64データの場合\n    if (src.startsWith(\"data:\")) {\n      const base64Data = src.split(\",\")[1];\n      buffer = new Uint8Array(Buffer.from(base64Data, \"base64\"));\n    }\n    // HTTPS/HTTP URLの場合はキャッシュがないとデフォルト値を返す\n    else if (src.startsWith(\"https://\") || src.startsWith(\"http://\")) {\n      diagnostics.add(\n        \"IMAGE_NOT_PREFETCHED\",\n        `Image size for URL ${src} was not prefetched. Using default size.`,\n      );\n      return {\n        widthPx: 100,\n        heightPx: 100,\n      };\n    }\n    // ローカルファイルパスの場合\n    else {\n      buffer = new Uint8Array(fs.readFileSync(src));\n    }\n\n    const dimensions = imageSize(buffer);\n\n    const width = dimensions.width ?? 100; // デフォルト100px\n    const height = dimensions.height ?? 100; // デフォルト100px\n\n    const result = {\n      widthPx: width,\n      heightPx: height,\n    };\n\n    // キャッシュに保存\n    sizeCache.set(src, result);\n\n    return result;\n  } catch (error) {\n    // エラーが発生した場合はデフォルトサイズを返す\n    diagnostics.add(\n      \"IMAGE_MEASURE_FAILED\",\n      `Failed to measure image size for ${src}: ${String(error)}`,\n    );\n    return {\n      widthPx: 100,\n      heightPx: 100,\n    };\n  }\n}\n"],"mappings":";;;;;;;;;AAaA,SAAgB,aACd,KACA,OACoB;CACpB,OAAO,MAAM,IAAI,GAAG;AACtB;;;;;;;;;AAUA,eAAsB,kBACpB,KACA,WACA,WACA,aAIC;CAED,MAAM,SAAS,UAAU,IAAI,GAAG;CAChC,IAAI,QACF,OAAO;CAGT,IAAI;EACF,IAAI;EAGJ,IAAI,IAAI,WAAW,OAAO,GAAG;GAC3B,MAAM,aAAa,IAAI,MAAM,GAAG,CAAC,CAAC;GAClC,SAAS,IAAI,WAAW,OAAO,KAAK,YAAY,QAAQ,CAAC;EAC3D,OAEK,IAAI,IAAI,WAAW,UAAU,KAAK,IAAI,WAAW,SAAS,GAAG;GAChE,MAAM,WAAW,MAAM,MAAM,GAAG;GAChC,IAAI,CAAC,SAAS,IACZ,MAAM,IAAI,MAAM,0BAA0B,SAAS,QAAQ;GAE7D,MAAM,cAAc,MAAM,SAAS,YAAY;GAC/C,SAAS,IAAI,WAAW,WAAW;GAGnC,MAAM,cAAc,SAAS,QAAQ,IAAI,cAAc,KAAK;GAC5D,MAAM,SAAS,OAAO,KAAK,WAAW,CAAC,CAAC,SAAS,QAAQ;GACzD,UAAU,IAAI,KAAK,GAAG,YAAY,UAAU,QAAQ;EACtD,OAGE,SAAS,IAAI,WAAW,GAAG,aAAa,GAAG,CAAC;EAG9C,MAAM,aAAa,UAAU,MAAM;EAKnC,MAAM,SAAS;GACb,SAJY,WAAW,SAAS;GAKhC,UAJa,WAAW,UAAU;EAKpC;EAGA,UAAU,IAAI,KAAK,MAAM;EAEzB,OAAO;CACT,SAAS,OAAO;EAEd,YAAY,IACV,wBACA,oCAAoC,IAAI,IAAI,OAAO,KAAK,GAC1D;EACA,MAAM,SAAS;GACb,SAAS;GACT,UAAU;EACZ;EACA,UAAU,IAAI,KAAK,MAAM;EACzB,OAAO;CACT;AACF;;;;;;;;AASA,SAAgB,aACd,KACA,WACA,aAIA;CAEA,MAAM,SAAS,UAAU,IAAI,GAAG;CAChC,IAAI,QACF,OAAO;CAIT,IAAI;EACF,IAAI;EAGJ,IAAI,IAAI,WAAW,OAAO,GAAG;GAC3B,MAAM,aAAa,IAAI,MAAM,GAAG,CAAC,CAAC;GAClC,SAAS,IAAI,WAAW,OAAO,KAAK,YAAY,QAAQ,CAAC;EAC3D,OAEK,IAAI,IAAI,WAAW,UAAU,KAAK,IAAI,WAAW,SAAS,GAAG;GAChE,YAAY,IACV,wBACA,sBAAsB,IAAI,yCAC5B;GACA,OAAO;IACL,SAAS;IACT,UAAU;GACZ;EACF,OAGE,SAAS,IAAI,WAAW,GAAG,aAAa,GAAG,CAAC;EAG9C,MAAM,aAAa,UAAU,MAAM;EAKnC,MAAM,SAAS;GACb,SAJY,WAAW,SAAS;GAKhC,UAJa,WAAW,UAAU;EAKpC;EAGA,UAAU,IAAI,KAAK,MAAM;EAEzB,OAAO;CACT,SAAS,OAAO;EAEd,YAAY,IACV,wBACA,oCAAoC,IAAI,IAAI,OAAO,KAAK,GAC1D;EACA,OAAO;GACL,SAAS;GACT,UAAU;EACZ;CACF;AACF"}
+{"version":3,"file":"measureImage.js","names":[],"sources":["../../src/shared/measureImage.ts"],"sourcesContent":["import * as fs from \"fs\";\nimport { imageSize } from \"image-size\";\nimport type { DiagnosticCollector } from \"../diagnostics.ts\";\n\ntype ImageSizeCache = Map<string, { widthPx: number; heightPx: number }>;\ntype ImageDataCache = Map<string, string>;\n\n/**\n * キャッシュされた画像データ（Base64）を取得する\n * @param src 画像のパス\n * @param cache 画像データキャッシュ\n * @returns Base64形式の画像データ、またはキャッシュがない場合はundefined\n */\nexport function getImageData(\n  src: string,\n  cache: ImageDataCache,\n): string | undefined {\n  return cache.get(src);\n}\n\n/**\n * 画像サイズを事前取得してキャッシュする（非同期）\n * HTTPS URLの画像を処理する際に使用\n * @param src 画像のパス（ローカルパス、base64データ、またはHTTPS URL）\n * @param sizeCache 画像サイズキャッシュ\n * @param dataCache 画像データキャッシュ\n * @returns 画像の幅と高さ（px）\n */\nexport async function prefetchImageSize(\n  src: string,\n  sizeCache: ImageSizeCache,\n  dataCache: ImageDataCache,\n  diagnostics: DiagnosticCollector,\n): Promise<{\n  widthPx: number;\n  heightPx: number;\n}> {\n  // キャッシュにあればそれを返す\n  const cached = sizeCache.get(src);\n  if (cached) {\n    return cached;\n  }\n\n  try {\n    let buffer: Uint8Array;\n\n    // base64データの場合\n    if (src.startsWith(\"data:\")) {\n      const base64Data = src.split(\",\")[1];\n      buffer = new Uint8Array(Buffer.from(base64Data, \"base64\"));\n    }\n    // HTTPS/HTTP URLの場合\n    else if (src.startsWith(\"https://\") || src.startsWith(\"http://\")) {\n      const response = await fetch(src);\n      if (!response.ok) {\n        throw new Error(`Failed to fetch image: ${response.status}`);\n      }\n      const arrayBuffer = await response.arrayBuffer();\n      buffer = new Uint8Array(arrayBuffer);\n\n      // 画像データを Base64 形式でキャッシュ（PPTX authoring 用）\n      const contentType = response.headers.get(\"content-type\") || \"image/png\";\n      const base64 = Buffer.from(arrayBuffer).toString(\"base64\");\n      dataCache.set(src, `${contentType};base64,${base64}`);\n    }\n    // ローカルファイルパスの場合\n    else {\n      buffer = new Uint8Array(fs.readFileSync(src));\n    }\n\n    const dimensions = imageSize(buffer);\n\n    const width = dimensions.width ?? 100; // デフォルト100px\n    const height = dimensions.height ?? 100; // デフォルト100px\n\n    const result = {\n      widthPx: width,\n      heightPx: height,\n    };\n\n    // キャッシュに保存\n    sizeCache.set(src, result);\n\n    return result;\n  } catch (error) {\n    // エラーが発生した場合はデフォルトサイズを返す\n    diagnostics.add(\n      \"IMAGE_MEASURE_FAILED\",\n      `Failed to measure image size for ${src}: ${String(error)}`,\n    );\n    const result = {\n      widthPx: 100,\n      heightPx: 100,\n    };\n    sizeCache.set(src, result);\n    return result;\n  }\n}\n\n/**\n * 画像ファイルのサイズを取得する（同期）\n * 事前にprefetchImageSizeでキャッシュしておくこと\n * @param src 画像のパス（ローカルパス、base64データ、またはHTTPS URL）\n * @param sizeCache 画像サイズキャッシュ\n * @returns 画像の幅と高さ（px）\n */\nexport function measureImage(\n  src: string,\n  sizeCache: ImageSizeCache,\n  diagnostics: DiagnosticCollector,\n): {\n  widthPx: number;\n  heightPx: number;\n} {\n  // キャッシュにあればそれを返す\n  const cached = sizeCache.get(src);\n  if (cached) {\n    return cached;\n  }\n\n  // キャッシュにない場合（ローカルファイルやbase64のみ同期処理可能）\n  try {\n    let buffer: Uint8Array;\n\n    // base64データの場合\n    if (src.startsWith(\"data:\")) {\n      const base64Data = src.split(\",\")[1];\n      buffer = new Uint8Array(Buffer.from(base64Data, \"base64\"));\n    }\n    // HTTPS/HTTP URLの場合はキャッシュがないとデフォルト値を返す\n    else if (src.startsWith(\"https://\") || src.startsWith(\"http://\")) {\n      diagnostics.add(\n        \"IMAGE_NOT_PREFETCHED\",\n        `Image size for URL ${src} was not prefetched. Using default size.`,\n      );\n      return {\n        widthPx: 100,\n        heightPx: 100,\n      };\n    }\n    // ローカルファイルパスの場合\n    else {\n      buffer = new Uint8Array(fs.readFileSync(src));\n    }\n\n    const dimensions = imageSize(buffer);\n\n    const width = dimensions.width ?? 100; // デフォルト100px\n    const height = dimensions.height ?? 100; // デフォルト100px\n\n    const result = {\n      widthPx: width,\n      heightPx: height,\n    };\n\n    // キャッシュに保存\n    sizeCache.set(src, result);\n\n    return result;\n  } catch (error) {\n    // エラーが発生した場合はデフォルトサイズを返す\n    diagnostics.add(\n      \"IMAGE_MEASURE_FAILED\",\n      `Failed to measure image size for ${src}: ${String(error)}`,\n    );\n    return {\n      widthPx: 100,\n      heightPx: 100,\n    };\n  }\n}\n"],"mappings":";;;;;;;;;AAaA,SAAgB,aACd,KACA,OACoB;CACpB,OAAO,MAAM,IAAI,GAAG;AACtB;;;;;;;;;AAUA,eAAsB,kBACpB,KACA,WACA,WACA,aAIC;CAED,MAAM,SAAS,UAAU,IAAI,GAAG;CAChC,IAAI,QACF,OAAO;CAGT,IAAI;EACF,IAAI;EAGJ,IAAI,IAAI,WAAW,OAAO,GAAG;GAC3B,MAAM,aAAa,IAAI,MAAM,GAAG,CAAC,CAAC;GAClC,SAAS,IAAI,WAAW,OAAO,KAAK,YAAY,QAAQ,CAAC;EAC3D,OAEK,IAAI,IAAI,WAAW,UAAU,KAAK,IAAI,WAAW,SAAS,GAAG;GAChE,MAAM,WAAW,MAAM,MAAM,GAAG;GAChC,IAAI,CAAC,SAAS,IACZ,MAAM,IAAI,MAAM,0BAA0B,SAAS,QAAQ;GAE7D,MAAM,cAAc,MAAM,SAAS,YAAY;GAC/C,SAAS,IAAI,WAAW,WAAW;GAGnC,MAAM,cAAc,SAAS,QAAQ,IAAI,cAAc,KAAK;GAC5D,MAAM,SAAS,OAAO,KAAK,WAAW,CAAC,CAAC,SAAS,QAAQ;GACzD,UAAU,IAAI,KAAK,GAAG,YAAY,UAAU,QAAQ;EACtD,OAGE,SAAS,IAAI,WAAW,GAAG,aAAa,GAAG,CAAC;EAG9C,MAAM,aAAa,UAAU,MAAM;EAKnC,MAAM,SAAS;GACb,SAJY,WAAW,SAAS;GAKhC,UAJa,WAAW,UAAU;EAKpC;EAGA,UAAU,IAAI,KAAK,MAAM;EAEzB,OAAO;CACT,SAAS,OAAO;EAEd,YAAY,IACV,wBACA,oCAAoC,IAAI,IAAI,OAAO,KAAK,GAC1D;EACA,MAAM,SAAS;GACb,SAAS;GACT,UAAU;EACZ;EACA,UAAU,IAAI,KAAK,MAAM;EACzB,OAAO;CACT;AACF;;;;;;;;AASA,SAAgB,aACd,KACA,WACA,aAIA;CAEA,MAAM,SAAS,UAAU,IAAI,GAAG;CAChC,IAAI,QACF,OAAO;CAIT,IAAI;EACF,IAAI;EAGJ,IAAI,IAAI,WAAW,OAAO,GAAG;GAC3B,MAAM,aAAa,IAAI,MAAM,GAAG,CAAC,CAAC;GAClC,SAAS,IAAI,WAAW,OAAO,KAAK,YAAY,QAAQ,CAAC;EAC3D,OAEK,IAAI,IAAI,WAAW,UAAU,KAAK,IAAI,WAAW,SAAS,GAAG;GAChE,YAAY,IACV,wBACA,sBAAsB,IAAI,yCAC5B;GACA,OAAO;IACL,SAAS;IACT,UAAU;GACZ;EACF,OAGE,SAAS,IAAI,WAAW,GAAG,aAAa,GAAG,CAAC;EAG9C,MAAM,aAAa,UAAU,MAAM;EAKnC,MAAM,SAAS;GACb,SAJY,WAAW,SAAS;GAKhC,UAJa,WAAW,UAAU;EAKpC;EAGA,UAAU,IAAI,KAAK,MAAM;EAEzB,OAAO;CACT,SAAS,OAAO;EAEd,YAAY,IACV,wBACA,oCAAoC,IAAI,IAAI,OAAO,KAAK,GAC1D;EACA,OAAO;GACL,SAAS;GACT,UAAU;EACZ;CACF;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hirokisakabe/pom",
-  "version": "9.1.1",
+  "version": "10.0.0",
   "description": "AI-friendly PowerPoint generation with a Flexbox layout engine.",
   "type": "module",
   "main": "./dist/index.js",
@@ -50,7 +50,6 @@
   },
   "devDependencies": {
     "@size-limit/file": "^12.1.0",
-    "@types/node": "^26.1.0",
     "@types/opentype.js": "^1.3.10",
     "@types/pngjs": "6.0.5",
     "@vitest/coverage-v8": "^4.1.10",
@@ -64,13 +63,13 @@
     "tsx": "4.23.0"
   },
   "dependencies": {
-    "@pptx-glimpse/document": "0.5.0",
+    "@pptx-glimpse/document": "0.9.1",
     "@resvg/resvg-wasm": "^2.6.2",
-    "fast-xml-parser": "^5.9.3",
+    "@types/node": "^26.1.0",
+    "fast-xml-parser": "^5.10.0",
     "image-size": "2.0.2",
     "jszip": "^3.10.1",
     "opentype.js": "^2.0.0",
-    "pptxgenjs": "4.0.1",
     "yoga-layout": "3.2.1",
     "zod": "^4.4.3"
   },