@hirokisakabe/pom 9.1.0 → 9.1.2

package/dist/buildContext.js

@@ -1,6 +1,5 @@
-import { GradientFillRegistry } from "./renderPptx/gradientFills.js";
+import { GlimpseTextBoxRegistry } from "./renderPptx/glimpseTextBoxes.js";
 import { DiagnosticCollector } from "./diagnostics.js";
-import { GlowEffectRegistry } from "./renderPptx/glowEffects.js";
 //#region src/buildContext.ts
 function createBuildContext(textMeasurementMode = "auto") {
 	return {
@@ -9,8 +8,7 @@ function createBuildContext(textMeasurementMode = "auto") {
 		imageDataCache: /* @__PURE__ */ new Map(),
 		iconRasterCache: /* @__PURE__ */ new Map(),
 		diagnostics: new DiagnosticCollector(),
-		gradientFills: new GradientFillRegistry(),
-		glowEffects: new GlowEffectRegistry()
+		glimpseTextBoxes: new GlimpseTextBoxRegistry()
 	};
 }
 //#endregion

package/dist/buildContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildContext.js","names":[],"sources":["../src/buildContext.ts"],"sourcesContent":["import type { TextMeasurementMode } from \"./calcYogaLayout/measureText.ts\";\nimport { DiagnosticCollector } from \"./diagnostics.ts\";\nimport { GlowEffectRegistry } from \"./renderPptx/glowEffects.ts\";\nimport { GradientFillRegistry } from \"./renderPptx/gradientFills.ts\";\n\nexport interface BuildContext {\n  textMeasurementMode: TextMeasurementMode;\n  imageSizeCache: Map<string, { widthPx: number; heightPx: number }>;\n  imageDataCache: Map<string, string>;\n  iconRasterCache: Map<string, string>;\n  diagnostics: DiagnosticCollector;\n  gradientFills: GradientFillRegistry;\n  glowEffects: GlowEffectRegistry;\n}\n\nexport function createBuildContext(\n  textMeasurementMode: TextMeasurementMode = \"auto\",\n): BuildContext {\n  return {\n    textMeasurementMode,\n    imageSizeCache: new Map(),\n    imageDataCache: new Map(),\n    iconRasterCache: new Map(),\n    diagnostics: new DiagnosticCollector(),\n    gradientFills: new GradientFillRegistry(),\n    glowEffects: new GlowEffectRegistry(),\n  };\n}\n"],"mappings":";;;;AAeA,SAAgB,mBACd,sBAA2C,QAC7B;CACd,OAAO;EACL;EACA,gCAAgB,IAAI,IAAI;EACxB,gCAAgB,IAAI,IAAI;EACxB,iCAAiB,IAAI,IAAI;EACzB,aAAa,IAAI,oBAAoB;EACrC,eAAe,IAAI,qBAAqB;EACxC,aAAa,IAAI,mBAAmB;CACtC;AACF"}
+{"version":3,"file":"buildContext.js","names":[],"sources":["../src/buildContext.ts"],"sourcesContent":["import type { TextMeasurementMode } from \"./calcYogaLayout/measureText.ts\";\nimport { DiagnosticCollector } from \"./diagnostics.ts\";\nimport { GlimpseTextBoxRegistry } from \"./renderPptx/glimpseTextBoxes.ts\";\n\nexport interface BuildContext {\n  textMeasurementMode: TextMeasurementMode;\n  imageSizeCache: Map<string, { widthPx: number; heightPx: number }>;\n  imageDataCache: Map<string, string>;\n  iconRasterCache: Map<string, string>;\n  diagnostics: DiagnosticCollector;\n  glimpseTextBoxes: GlimpseTextBoxRegistry;\n}\n\nexport function createBuildContext(\n  textMeasurementMode: TextMeasurementMode = \"auto\",\n): BuildContext {\n  return {\n    textMeasurementMode,\n    imageSizeCache: new Map(),\n    imageDataCache: new Map(),\n    iconRasterCache: new Map(),\n    diagnostics: new DiagnosticCollector(),\n    glimpseTextBoxes: new GlimpseTextBoxRegistry(),\n  };\n}\n"],"mappings":";;;AAaA,SAAgB,mBACd,sBAA2C,QAC7B;CACd,OAAO;EACL;EACA,gCAAgB,IAAI,IAAI;EACxB,gCAAgB,IAAI,IAAI;EACxB,iCAAiB,IAAI,IAAI;EACzB,aAAa,IAAI,oBAAoB;EACrC,kBAAkB,IAAI,uBAAuB;CAC/C;AACF"}

package/dist/buildPptx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildPptx.d.ts","names":[],"sources":["../src/buildPptx.ts"],"mappings":";;;;;UAoBiB,eAAA;EACf,IAAA,sBAA0B,OAAA;EAC1B,WAAA,EAAa,UAAU;AAAA;AAAA,iBAGH,SAAA,CACpB,GAAA,UACA,SAAA;EAAa,CAAA;EAAW,CAAA;AAAA,GACxB,OAAA;EACE,MAAA,GAAS,kBAAA;EACT,UAAA,GAAa,WAAA,GAAc,UAAA;EAC3B,eAAA,GAAkB,mBAAA;EAClB,OAAA;EACA,MAAA;AAAA,IAED,OAAA,CAAQ,eAAA"}
+{"version":3,"file":"buildPptx.d.ts","names":[],"sources":["../src/buildPptx.ts"],"mappings":";;;;;UAmBiB,eAAA;EACf,IAAA,sBAA0B,OAAA;EAC1B,WAAA,EAAa,UAAU;AAAA;AAAA,iBAGH,SAAA,CACpB,GAAA,UACA,SAAA;EAAa,CAAA;EAAW,CAAA;AAAA,GACxB,OAAA;EACE,MAAA,GAAS,kBAAA;EACT,UAAA,GAAa,WAAA,GAAc,UAAA;EAC3B,eAAA,GAAkB,mBAAA;EAClB,OAAA;EACA,MAAA;AAAA,IAED,OAAA,CAAQ,eAAA"}

package/dist/buildPptx.js

@@ -1,9 +1,8 @@
 import { freeYogaTree } from "./shared/freeYogaTree.js";
-import { patchPptxWriteForGradientFills } from "./renderPptx/gradientFills.js";
+import { patchPptxWriteForGlimpseTextBoxes } from "./renderPptx/glimpseTextBoxes.js";
 import { calcYogaLayout } from "./calcYogaLayout/calcYogaLayout.js";
 import { autoFitSlide } from "./autoFit/autoFit.js";
 import { DiagnosticsError } from "./diagnostics.js";
-import { patchPptxWriteForGlowEffects } from "./renderPptx/glowEffects.js";
 import { createBuildContext } from "./buildContext.js";
 import { extractLayoutResults } from "./calcYogaLayout/types.js";
 import { parseMasterPptx } from "./parseMasterPptx.js";
@@ -14,8 +13,6 @@ import { validatePositioned } from "./validatePositioned/validatePositioned.js";
 //#region src/buildPptx.ts
 async function buildPptx(xml, slideSize, options) {
 	const ctx = createBuildContext(options?.textMeasurement ?? "auto");
-	ctx.gradientFills.reserveColors(xml);
-	if (options?.master) ctx.gradientFills.reserveColors(JSON.stringify(options.master));
 	const nodes = parseXml(xml);
 	const positionedPages = [];
 	for (const [slideIndex, node] of nodes.entries()) {
@@ -44,8 +41,7 @@ async function buildPptx(xml, slideSize, options) {
 		ctx.diagnostics.add("MASTER_PPTX_PARSE_FAILED", message);
 	}
 	const pptx = await renderPptx(positionedPages, slideSize, ctx, master);
-	patchPptxWriteForGradientFills(pptx, ctx.gradientFills);
-	patchPptxWriteForGlowEffects(pptx, ctx.glowEffects);
+	patchPptxWriteForGlimpseTextBoxes(pptx, ctx.glimpseTextBoxes);
 	const diagnostics = ctx.diagnostics.items;
 	if (options?.strict && diagnostics.length > 0) throw new DiagnosticsError(diagnostics);
 	return {

package/dist/buildPptx.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildPptx.js","names":[],"sources":["../src/buildPptx.ts"],"sourcesContent":["import { autoFitSlide } from \"./autoFit/autoFit.ts\";\nimport { createBuildContext } from \"./buildContext.ts\";\nimport { calcYogaLayout } from \"./calcYogaLayout/calcYogaLayout.ts\";\nimport type { TextMeasurementMode } from \"./calcYogaLayout/measureText.ts\";\nimport type { YogaNodeMap } from \"./calcYogaLayout/types.ts\";\nimport { extractLayoutResults } from \"./calcYogaLayout/types.ts\";\nimport type { Diagnostic } from \"./diagnostics.ts\";\nimport { DiagnosticsError } from \"./diagnostics.ts\";\nimport { parseMasterPptx } from \"./parseMasterPptx.ts\";\nimport { parseXml } from \"./parseXml/parseXml.ts\";\nimport { patchPptxWriteForGlowEffects } from \"./renderPptx/glowEffects.ts\";\nimport { patchPptxWriteForGradientFills } from \"./renderPptx/gradientFills.ts\";\nimport { renderPptx } from \"./renderPptx/renderPptx.ts\";\nimport { freeYogaTree } from \"./shared/freeYogaTree.ts\";\nimport { toPositioned } from \"./toPositioned/toPositioned.ts\";\nimport { PositionedNode, SlideMasterOptions } from \"./types.ts\";\nimport { validatePositioned } from \"./validatePositioned/validatePositioned.ts\";\n\nexport type { TextMeasurementMode };\n\nexport interface BuildPptxResult {\n  pptx: import(\"pptxgenjs\").default;\n  diagnostics: Diagnostic[];\n}\n\nexport async function buildPptx(\n  xml: string,\n  slideSize: { w: number; h: number },\n  options?: {\n    master?: SlideMasterOptions;\n    masterPptx?: ArrayBuffer | Uint8Array;\n    textMeasurement?: TextMeasurementMode;\n    autoFit?: boolean;\n    strict?: boolean;\n  },\n): Promise<BuildPptxResult> {\n  const ctx = createBuildContext(options?.textMeasurement ?? \"auto\");\n\n  // グラデーション後処理のマーカー色がユーザー指定色と衝突しないよう、\n  // 入力 XML / master オプション中に現れる色を予約しておく\n  ctx.gradientFills.reserveColors(xml);\n  if (options?.master) {\n    ctx.gradientFills.reserveColors(JSON.stringify(options.master));\n  }\n\n  const nodes = parseXml(xml);\n  const positionedPages: PositionedNode[] = [];\n\n  for (const [slideIndex, node] of nodes.entries()) {\n    let map: YogaNodeMap | undefined;\n    try {\n      if (options?.autoFit !== false) {\n        map = await autoFitSlide(node, slideSize, ctx);\n      } else {\n        map = await calcYogaLayout(node, slideSize, ctx);\n      }\n      const layoutMap = extractLayoutResults(map);\n      const positioned = await toPositioned(node, ctx, layoutMap);\n      validatePositioned(positioned, slideSize, ctx, slideIndex);\n      positionedPages.push(positioned);\n    } finally {\n      if (map) freeYogaTree(map);\n    }\n  }\n\n  // masterPptx から背景を抽出し、master オプションにマージ\n  let master = options?.master;\n  if (options?.masterPptx) {\n    try {\n      const bg = await parseMasterPptx(options.masterPptx);\n      if (bg) {\n        if (master) {\n          // 明示的に background が指定されていない場合のみ、masterPptx の背景を使用\n          if (!master.background) {\n            master = { ...master, background: bg };\n          }\n        } else {\n          master = { background: bg };\n        }\n      }\n    } catch (e) {\n      const message =\n        e instanceof Error ? e.message : \"Unknown error parsing masterPptx\";\n      ctx.diagnostics.add(\"MASTER_PPTX_PARSE_FAILED\", message);\n    }\n  }\n\n  const pptx = await renderPptx(positionedPages, slideSize, ctx, master);\n\n  // backgroundGradient / textGradient 使用時は write/writeFile に gradFill 置換の後処理を仕込む\n  patchPptxWriteForGradientFills(pptx, ctx.gradientFills);\n\n  // Shape / Icon の glow 指定がある場合は write/writeFile に effectLst 挿入の\n  // 後処理を仕込む (gradientFills の patch 後にチェーンする)\n  patchPptxWriteForGlowEffects(pptx, ctx.glowEffects);\n\n  const diagnostics = ctx.diagnostics.items;\n\n  if (options?.strict && diagnostics.length > 0) {\n    throw new DiagnosticsError(diagnostics);\n  }\n\n  return { pptx, diagnostics };\n}\n"],"mappings":";;;;;;;;;;;;;;AAyBA,eAAsB,UACpB,KACA,WACA,SAO0B;CAC1B,MAAM,MAAM,mBAAmB,SAAS,mBAAmB,MAAM;CAIjE,IAAI,cAAc,cAAc,GAAG;CACnC,IAAI,SAAS,QACX,IAAI,cAAc,cAAc,KAAK,UAAU,QAAQ,MAAM,CAAC;CAGhE,MAAM,QAAQ,SAAS,GAAG;CAC1B,MAAM,kBAAoC,CAAC;CAE3C,KAAK,MAAM,CAAC,YAAY,SAAS,MAAM,QAAQ,GAAG;EAChD,IAAI;EACJ,IAAI;GACF,IAAI,SAAS,YAAY,OACvB,MAAM,MAAM,aAAa,MAAM,WAAW,GAAG;QAE7C,MAAM,MAAM,eAAe,MAAM,WAAW,GAAG;GAGjD,MAAM,aAAa,MAAM,aAAa,MAAM,KAD1B,qBAAqB,GACkB,CAAC;GAC1D,mBAAmB,YAAY,WAAW,KAAK,UAAU;GACzD,gBAAgB,KAAK,UAAU;EACjC,UAAU;GACR,IAAI,KAAK,aAAa,GAAG;EAC3B;CACF;CAGA,IAAI,SAAS,SAAS;CACtB,IAAI,SAAS,YACX,IAAI;EACF,MAAM,KAAK,MAAM,gBAAgB,QAAQ,UAAU;EACnD,IAAI,IACF,IAAI;OAEE,CAAC,OAAO,YACV,SAAS;IAAE,GAAG;IAAQ,YAAY;GAAG;EAAA,OAGvC,SAAS,EAAE,YAAY,GAAG;CAGhC,SAAS,GAAG;EACV,MAAM,UACJ,aAAa,QAAQ,EAAE,UAAU;EACnC,IAAI,YAAY,IAAI,4BAA4B,OAAO;CACzD;CAGF,MAAM,OAAO,MAAM,WAAW,iBAAiB,WAAW,KAAK,MAAM;CAGrE,+BAA+B,MAAM,IAAI,aAAa;CAItD,6BAA6B,MAAM,IAAI,WAAW;CAElD,MAAM,cAAc,IAAI,YAAY;CAEpC,IAAI,SAAS,UAAU,YAAY,SAAS,GAC1C,MAAM,IAAI,iBAAiB,WAAW;CAGxC,OAAO;EAAE;EAAM;CAAY;AAC7B"}
+{"version":3,"file":"buildPptx.js","names":[],"sources":["../src/buildPptx.ts"],"sourcesContent":["import { autoFitSlide } from \"./autoFit/autoFit.ts\";\nimport { createBuildContext } from \"./buildContext.ts\";\nimport { calcYogaLayout } from \"./calcYogaLayout/calcYogaLayout.ts\";\nimport type { TextMeasurementMode } from \"./calcYogaLayout/measureText.ts\";\nimport type { YogaNodeMap } from \"./calcYogaLayout/types.ts\";\nimport { extractLayoutResults } from \"./calcYogaLayout/types.ts\";\nimport type { Diagnostic } from \"./diagnostics.ts\";\nimport { DiagnosticsError } from \"./diagnostics.ts\";\nimport { parseMasterPptx } from \"./parseMasterPptx.ts\";\nimport { parseXml } from \"./parseXml/parseXml.ts\";\nimport { patchPptxWriteForGlimpseTextBoxes } from \"./renderPptx/glimpseTextBoxes.ts\";\nimport { renderPptx } from \"./renderPptx/renderPptx.ts\";\nimport { freeYogaTree } from \"./shared/freeYogaTree.ts\";\nimport { toPositioned } from \"./toPositioned/toPositioned.ts\";\nimport { PositionedNode, SlideMasterOptions } from \"./types.ts\";\nimport { validatePositioned } from \"./validatePositioned/validatePositioned.ts\";\n\nexport type { TextMeasurementMode };\n\nexport interface BuildPptxResult {\n  pptx: import(\"pptxgenjs\").default;\n  diagnostics: Diagnostic[];\n}\n\nexport async function buildPptx(\n  xml: string,\n  slideSize: { w: number; h: number },\n  options?: {\n    master?: SlideMasterOptions;\n    masterPptx?: ArrayBuffer | Uint8Array;\n    textMeasurement?: TextMeasurementMode;\n    autoFit?: boolean;\n    strict?: boolean;\n  },\n): Promise<BuildPptxResult> {\n  const ctx = createBuildContext(options?.textMeasurement ?? \"auto\");\n\n  const nodes = parseXml(xml);\n  const positionedPages: PositionedNode[] = [];\n\n  for (const [slideIndex, node] of nodes.entries()) {\n    let map: YogaNodeMap | undefined;\n    try {\n      if (options?.autoFit !== false) {\n        map = await autoFitSlide(node, slideSize, ctx);\n      } else {\n        map = await calcYogaLayout(node, slideSize, ctx);\n      }\n      const layoutMap = extractLayoutResults(map);\n      const positioned = await toPositioned(node, ctx, layoutMap);\n      validatePositioned(positioned, slideSize, ctx, slideIndex);\n      positionedPages.push(positioned);\n    } finally {\n      if (map) freeYogaTree(map);\n    }\n  }\n\n  // masterPptx から背景を抽出し、master オプションにマージ\n  let master = options?.master;\n  if (options?.masterPptx) {\n    try {\n      const bg = await parseMasterPptx(options.masterPptx);\n      if (bg) {\n        if (master) {\n          // 明示的に background が指定されていない場合のみ、masterPptx の背景を使用\n          if (!master.background) {\n            master = { ...master, background: bg };\n          }\n        } else {\n          master = { background: bg };\n        }\n      }\n    } catch (e) {\n      const message =\n        e instanceof Error ? e.message : \"Unknown error parsing masterPptx\";\n      ctx.diagnostics.add(\"MASTER_PPTX_PARSE_FAILED\", message);\n    }\n  }\n\n  const pptx = await renderPptx(positionedPages, slideSize, ctx, master);\n\n  // glimpse writer で生成した Text / Shape / Picture XML で marker shape を置換する\n  patchPptxWriteForGlimpseTextBoxes(pptx, ctx.glimpseTextBoxes);\n\n  const diagnostics = ctx.diagnostics.items;\n\n  if (options?.strict && diagnostics.length > 0) {\n    throw new DiagnosticsError(diagnostics);\n  }\n\n  return { pptx, diagnostics };\n}\n"],"mappings":";;;;;;;;;;;;;AAwBA,eAAsB,UACpB,KACA,WACA,SAO0B;CAC1B,MAAM,MAAM,mBAAmB,SAAS,mBAAmB,MAAM;CAEjE,MAAM,QAAQ,SAAS,GAAG;CAC1B,MAAM,kBAAoC,CAAC;CAE3C,KAAK,MAAM,CAAC,YAAY,SAAS,MAAM,QAAQ,GAAG;EAChD,IAAI;EACJ,IAAI;GACF,IAAI,SAAS,YAAY,OACvB,MAAM,MAAM,aAAa,MAAM,WAAW,GAAG;QAE7C,MAAM,MAAM,eAAe,MAAM,WAAW,GAAG;GAGjD,MAAM,aAAa,MAAM,aAAa,MAAM,KAD1B,qBAAqB,GACkB,CAAC;GAC1D,mBAAmB,YAAY,WAAW,KAAK,UAAU;GACzD,gBAAgB,KAAK,UAAU;EACjC,UAAU;GACR,IAAI,KAAK,aAAa,GAAG;EAC3B;CACF;CAGA,IAAI,SAAS,SAAS;CACtB,IAAI,SAAS,YACX,IAAI;EACF,MAAM,KAAK,MAAM,gBAAgB,QAAQ,UAAU;EACnD,IAAI,IACF,IAAI;OAEE,CAAC,OAAO,YACV,SAAS;IAAE,GAAG;IAAQ,YAAY;GAAG;EAAA,OAGvC,SAAS,EAAE,YAAY,GAAG;CAGhC,SAAS,GAAG;EACV,MAAM,UACJ,aAAa,QAAQ,EAAE,UAAU;EACnC,IAAI,YAAY,IAAI,4BAA4B,OAAO;CACzD;CAGF,MAAM,OAAO,MAAM,WAAW,iBAAiB,WAAW,KAAK,MAAM;CAGrE,kCAAkC,MAAM,IAAI,gBAAgB;CAE5D,MAAM,cAAc,IAAI,YAAY;CAEpC,IAAI,SAAS,UAAU,YAAY,SAAS,GAC1C,MAAM,IAAI,iBAAiB,WAAW;CAGxC,OAAO;EAAE;EAAM;CAAY;AAC7B"}

package/dist/extractSlideMastersAsPptx.js

@@ -1,6 +1,6 @@
 import { getMasterLayoutPartPaths, getPresentationMasterPartPaths, isVisibleLayout, toUint8Array } from "./pptxLayoutEnumeration.js";
-import { XMLBuilder, XMLParser } from "fast-xml-parser";
 import { readPptx } from "@pptx-glimpse/document";
+import { XMLBuilder, XMLParser } from "fast-xml-parser";
 //#region src/extractSlideMastersAsPptx.ts
 const SLIDE_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide";
 const SLIDE_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.presentationml.slide+xml";