pptx2js 0.4.0 → 0.4.3

package/lib/codegen.js

@@ -1,6 +1,7 @@
 /**
  * ⑤ 代码生成器 — IR → PptxGenJS 脚本
  */
+const { compressRunOptions } = require('./run-utils');
 
 function generateScript(ir, options = {}) {
   const lines = [];
@@ -80,7 +81,10 @@ function emitElement(el, slideVar, indent, options) {
   if (el.type === 'chart') {
     const dataLit = JSON.stringify(el.data);
     const opts = [`${pos}`];
-    if (el.title) opts.push(`title: '${escapeJs(el.title)}'`);
+    if (el.title) {
+      opts.push('showTitle: true');
+      opts.push(`title: '${escapeJs(el.title)}'`);
+    }
     return [
       `${indent(1)}${slideVar}.addChart(pptx.charts.${el.chartType}, ${dataLit}, { ${opts.join(', ')} });`,
     ];
@@ -90,7 +94,13 @@ function emitElement(el, slideVar, indent, options) {
     const shapeRef = `pptx.shapes.${el.shape}`;
     const opts = [pos];
     if (el.fill) opts.push(`fill: { color: '${escapeJs(el.fill)}' }`);
-    if (el.line) opts.push(`line: { color: '${escapeJs(el.line)}', width: 1 }`);
+    if (el.line) {
+      const linePt = el.lineWidth ?? 1;
+      const dash = el.lineDash ? `, dashType: '${escapeJs(el.lineDash)}'` : '';
+      opts.push(`line: { color: '${escapeJs(el.line)}', width: ${linePt}${dash} }`);
+    }
+    if (el.flipH) opts.push('flipH: true');
+    if (el.flipV) opts.push('flipV: true');
     return [`${indent(1)}${slideVar}.addShape(${shapeRef}, { ${opts.join(', ')} });`];
   }
 
@@ -100,10 +110,13 @@ function emitElement(el, slideVar, indent, options) {
 function formatTableRows(rows) {
   const mapped = rows.map((row) =>
     row.map((cell) => {
-      const parts = [`text: '${escapeJs(cell.text ?? '')}'`];
-      const optKeys = Object.keys(cell.options ?? {});
-      if (optKeys.length) {
-        parts.push(`options: ${JSON.stringify(cell.options)}`);
+      const textLit = Array.isArray(cell.text)
+        ? formatTextRuns(cell.text)
+        : `'${escapeJs(cell.text ?? '')}'`;
+      const parts = [`text: ${textLit}`];
+      const opts = compressTableCellOptions(cell.options ?? {});
+      if (Object.keys(opts).length) {
+        parts.push(`options: ${formatOptionsObject(opts)}`);
       }
       return `{ ${parts.join(', ')} }`;
     })
@@ -111,6 +124,47 @@ function formatTableRows(rows) {
   return `[\n    ${mapped.map((r) => `[${r.join(', ')}]`).join(',\n    ')}\n  ]`;
 }
 
+/**
+ * @param {object} opts
+ */
+function compressTableCellOptions(opts) {
+  const copy = compressRunOptions({ ...opts });
+  return copy;
+}
+
+/**
+ * 生成可读的 options 字面量（避免 JSON 双引号风格）
+ * @param {object} opts
+ */
+function formatBorderObject(border) {
+  if (border.type === 'solid' && border.color) {
+    const parts = [`type: 'solid'`, `color: '${escapeJs(border.color)}'`];
+    if (border.pt != null) parts.push(`pt: ${border.pt}`);
+    return `{ ${parts.join(', ')} }`;
+  }
+  return JSON.stringify(border);
+}
+
+function formatOptionsObject(opts) {
+  const entries = [];
+  for (const [key, val] of Object.entries(opts)) {
+    if (key === 'border' && val && typeof val === 'object') {
+      entries.push(`border: ${formatBorderObject(val)}`);
+    } else if (val === true) {
+      entries.push(`${key}: true`);
+    } else if (val === false) {
+      entries.push(`${key}: false`);
+    } else if (typeof val === 'number') {
+      entries.push(`${key}: ${val}`);
+    } else if (typeof val === 'string') {
+      entries.push(`${key}: '${escapeJs(val)}'`);
+    } else {
+      entries.push(`${key}: ${JSON.stringify(val)}`);
+    }
+  }
+  return `{ ${entries.join(', ')} }`;
+}
+
 function formatTextRuns(runs) {
   if (!runs?.length) return "''";
 
@@ -131,7 +185,7 @@ function formatTextRuns(runs) {
 }
 
 function formatRunOptions(options) {
-  const copy = { ...options };
+  const copy = compressRunOptions({ ...options });
   delete copy._degraded;
   const entries = [];
   if (copy.fontSize != null) entries.push(`fontSize: ${copy.fontSize}`);
@@ -146,6 +200,11 @@ function formatRunOptions(options) {
   if (copy.hyperlink?.url) {
     entries.push(`hyperlink: { url: '${escapeJs(copy.hyperlink.url)}' }`);
   }
+  if (copy.underline === true) {
+    entries.push('underline: true');
+  } else if (copy.underline && typeof copy.underline === 'object') {
+    entries.push(`underline: { style: '${escapeJs(copy.underline.style ?? 'sng')}' }`);
+  }
   if (copy.align) entries.push(`align: '${escapeJs(String(copy.align))}'`);
   if (copy.indentLevel != null && copy.indentLevel > 0) {
     entries.push(`indentLevel: ${copy.indentLevel}`);

package/lib/color.js

@@ -0,0 +1,275 @@
+/**
+ * 颜色规范化（srgbClr、schemeClr、渐变首色标）
+ */
+const { attr, child, children, documentRoot } = require('./xml-utils');
+
+/** OOXML a:prstClr val → 6 位 RGB（源 PPT 主要使用 black / white） */
+const PRST_COLOR_MAP = {
+  black: '000000',
+  white: 'FFFFFF',
+  red: 'FF0000',
+  green: '00FF00',
+  blue: '0000FF',
+  yellow: 'FFFF00',
+  gray: '808080',
+  grey: '808080',
+  silver: 'C0C0C0',
+  navy: '000080',
+  teal: '008080',
+  lime: '00FF00',
+  olive: '808000',
+  maroon: '800000',
+  aqua: '00FFFF',
+  fuchsia: 'FF00FF',
+  orange: 'FFA500',
+  purple: '800080',
+  brown: 'A52A2A',
+  pink: 'FFC0CB',
+  dkGreen: '006400',
+  dkBlue: '00008B',
+  dkRed: '8B0000',
+  dkGray: 'A9A9A9',
+  dkGrey: 'A9A9A9',
+  ltGray: 'D3D3D3',
+  ltGrey: 'D3D3D3',
+};
+
+/** @type {Record<string, string>} */
+const DEFAULT_SCHEME = {
+  dk1: '000000',
+  lt1: 'FFFFFF',
+  dk2: '44546A',
+  lt2: 'E7E6E6',
+  accent1: '4472C4',
+  accent2: 'ED7D31',
+  accent3: 'A5A5A5',
+  accent4: 'FFC000',
+  accent5: '5B9BD5',
+  accent6: '70AD47',
+  hlink: '0563C1',
+  folHlink: '954F72',
+};
+
+/**
+ * @param {Record<string, object>|null} parsed
+ * @param {string|null} themePath
+ * @returns {Record<string, string>}
+ */
+function loadColorScheme(parsed, themePath) {
+  if (!themePath || !parsed[themePath]) return { ...DEFAULT_SCHEME };
+
+  const theme = documentRoot(parsed[themePath], 'a:theme');
+  const clrScheme = child(child(theme, 'a:themeElements'), 'a:clrScheme');
+  if (!clrScheme) return { ...DEFAULT_SCHEME };
+
+  const scheme = { ...DEFAULT_SCHEME };
+  for (const name of Object.keys(DEFAULT_SCHEME)) {
+    const slot = child(clrScheme, `a:${name}`);
+    const rgb = extractRgbFromColorNode(slot);
+    if (rgb) scheme[name] = rgb;
+  }
+  return scheme;
+}
+
+/**
+ * @param {object|null|undefined} colorNode a:srgbClr / a:schemeClr 的父级
+ * @returns {string|null}
+ */
+function extractRgbFromColorNode(colorNode) {
+  if (!colorNode) return null;
+
+  const srgb = child(colorNode, 'a:srgbClr');
+  if (srgb) {
+    const val = attr(srgb, 'val');
+    return val ? val.toUpperCase() : null;
+  }
+
+  const sys = child(colorNode, 'a:sysClr');
+  if (sys) {
+    const last = attr(sys, 'lastClr');
+    return last ? applyColorModifiers(last.toUpperCase(), sys) : null;
+  }
+
+  return null;
+}
+
+/**
+ * @param {object|null|undefined} fillNode a:solidFill | a:gradFill 等
+ * @param {Record<string, string>} scheme
+ * @returns {{ color: string|null, degraded: boolean }}
+ */
+function resolveFillColor(fillNode, scheme) {
+  if (!fillNode) return { color: null, degraded: false };
+
+  const solid =
+    fillNode.tag === 'a:solidFill' ? fillNode : child(fillNode, 'a:solidFill');
+  if (solid) {
+    return { color: resolveColorFromContainer(solid, scheme), degraded: false };
+  }
+
+  const grad =
+    fillNode.tag === 'a:gradFill' ? fillNode : child(fillNode, 'a:gradFill');
+  if (grad) {
+    const gs = firstGradientStop(grad);
+    return {
+      color: gs ? resolveColorFromContainer(gs, scheme) : null,
+      degraded: true,
+    };
+  }
+
+  const ptn =
+    fillNode.tag === 'a:ptnFill' ? fillNode : child(fillNode, 'a:ptnFill');
+  if (ptn) {
+    const fgClr = child(ptn, 'a:fgClr');
+    return {
+      color: fgClr ? resolveColorFromContainer(fgClr, scheme) : null,
+      degraded: true,
+    };
+  }
+
+  return { color: null, degraded: false };
+}
+
+/**
+ * 渐变色标按 pos 升序，取最小 pos 对应色标（OOXML 0–100000）
+ * @param {object} grad a:gradFill
+ * @returns {object|null}
+ */
+function firstGradientStop(grad) {
+  const gsLst = child(grad, 'a:gsLst');
+  if (!gsLst) return null;
+  const stops = children(gsLst, 'a:gs');
+  if (!stops.length) return null;
+  return [...stops].sort(
+    (a, b) => parseInt(attr(a, 'pos') ?? '0', 10) - parseInt(attr(b, 'pos') ?? '0', 10)
+  )[0];
+}
+
+/**
+ * @param {object|null|undefined} container 含 a:srgbClr / a:schemeClr
+ * @param {Record<string, string>} scheme
+ * @returns {string|null}
+ */
+function resolveColorFromContainer(container, scheme) {
+  if (!container) return null;
+
+  const srgb = child(container, 'a:srgbClr');
+  if (srgb) {
+    const val = attr(srgb, 'val');
+    if (!val) return null;
+    return applyColorModifiers(val.toUpperCase(), srgb);
+  }
+
+  const schemeClr = child(container, 'a:schemeClr');
+  if (schemeClr) {
+    const name = attr(schemeClr, 'val');
+    const base = name ? scheme[name] ?? DEFAULT_SCHEME[name] ?? null : null;
+    return base ? applyColorModifiers(base, schemeClr) : null;
+  }
+
+  const prstClr = child(container, 'a:prstClr');
+  if (prstClr) {
+    const val = attr(prstClr, 'val');
+    const base = val ? PRST_COLOR_MAP[val] ?? PRST_COLOR_MAP[val.toLowerCase()] ?? '000000' : null;
+    return base ? applyColorModifiers(base, prstClr) : null;
+  }
+
+  const sysClr = child(container, 'a:sysClr');
+  if (sysClr) {
+    const last = attr(sysClr, 'lastClr');
+    return last ? applyColorModifiers(last.toUpperCase(), sysClr) : null;
+  }
+
+  return extractRgbFromColorNode(container);
+}
+
+/**
+ * @param {string} hex 6 位 RGB
+ */
+function hexToRgb(hex) {
+  const h = String(hex).replace(/^#/, '');
+  if (h.length !== 6) return { r: 0, g: 0, b: 0 };
+  return {
+    r: parseInt(h.slice(0, 2), 16),
+    g: parseInt(h.slice(2, 4), 16),
+    b: parseInt(h.slice(4, 6), 16),
+  };
+}
+
+/**
+ * @param {{ r: number, g: number, b: number }} rgb
+ */
+function rgbToHex(rgb) {
+  const clamp = (n) => Math.max(0, Math.min(255, Math.round(n)));
+  return [rgb.r, rgb.g, rgb.b]
+    .map((c) => clamp(c).toString(16).padStart(2, '0'))
+    .join('')
+    .toUpperCase();
+}
+
+/**
+ * srgbClr / schemeClr 上的 lumMod / shade / tint 等修饰（OOXML 比例 1/100000）
+ * @param {string} hex
+ * @param {object} clrNode
+ */
+function applyColorModifiers(hex, clrNode) {
+  let { r, g, b } = hexToRgb(hex);
+
+  const lumMod = child(clrNode, 'a:lumMod');
+  if (lumMod) {
+    const pct = parseInt(attr(lumMod, 'val') ?? '100000', 10) / 100000;
+    r *= pct;
+    g *= pct;
+    b *= pct;
+  }
+
+  const lumOff = child(clrNode, 'a:lumOff');
+  if (lumOff) {
+    const pct = parseInt(attr(lumOff, 'val') ?? '0', 10) / 100000;
+    const delta = 255 * pct;
+    r += delta;
+    g += delta;
+    b += delta;
+  }
+
+  const shade = child(clrNode, 'a:shade');
+  if (shade) {
+    const pct = parseInt(attr(shade, 'val') ?? '0', 10) / 100000;
+    r *= pct;
+    g *= pct;
+    b *= pct;
+  }
+
+  const tint = child(clrNode, 'a:tint');
+  if (tint) {
+    const pct = parseInt(attr(tint, 'val') ?? '0', 10) / 100000;
+    r += (255 - r) * pct;
+    g += (255 - g) * pct;
+    b += (255 - b) * pct;
+  }
+
+  return rgbToHex({ r, g, b });
+}
+
+/** @deprecated 使用 applyColorModifiers */
+const applySchemeClrModifiers = applyColorModifiers;
+
+/**
+ * @param {Record<string, string>} scheme
+ * @param {object|null|undefined} clrNode
+ * @returns {string|null}
+ */
+function resolveColor(scheme, clrNode) {
+  return resolveColorFromContainer(clrNode, scheme);
+}
+
+module.exports = {
+  DEFAULT_SCHEME,
+  loadColorScheme,
+  resolveFillColor,
+  resolveColor,
+  resolveColorFromContainer,
+  firstGradientStop,
+  applyColorModifiers,
+  applySchemeClrModifiers,
+};

package/lib/convert.js

@@ -46,8 +46,11 @@ async function convert(filePath, options = {}) {
   }
 
   const stat = fs.statSync(resolvedPath);
-  if (stat.size > (options.maxFileSize ?? DEFAULT_MAX_FILE_SIZE)) {
-    // 大文件流式解析 — 实现阶段补充
+  const maxSize = options.maxFileSize ?? DEFAULT_MAX_FILE_SIZE;
+  if (stat.size > maxSize) {
+    throw new Error(
+      `源文件超过大小限制 (${stat.size} > ${maxSize} 字节)。请拆分 PPT 或使用 --max-file-size 提高上限。`
+    );
   }
 
   const outputDir = path.resolve(options.outputDir ?? DEFAULT_OUTPUT);
@@ -59,8 +62,8 @@ async function convert(filePath, options = {}) {
   const parsed = {};
   for (const [entryPath, content] of archive.files) {
     if (content === '__binary__') continue;
-    if (entryPath.endsWith('.xml') || entryPath.endsWith('.rels')) {
-      parsed[entryPath] = await parseXml(content);
+    if (/\.(xml|rels)$/i.test(entryPath)) {
+      parsed[entryPath] = parseXml(content);
     }
   }
 
@@ -68,15 +71,16 @@ async function convert(filePath, options = {}) {
   const ctx = { relIndex, parsed, sourcePath: resolvedPath };
   const entities = extractEntities(ctx);
   const ir = mapToIR(entities, ctx);
-  const script = generateScript(ir, options);
-
-  const scriptPath = path.join(outputDir, 'output.js');
-  fs.writeFileSync(scriptPath, script, 'utf8');
 
+  // packageMedia 会就地更新 ir 中的 mediaPath，generateScript 必须在其之后调用
   await packageMedia({ archive, ir }, outputDir, {
     noMedia: options.noMedia,
   });
 
+  const script = generateScript(ir, options);
+  const scriptPath = path.join(outputDir, 'output.js');
+  fs.writeFileSync(scriptPath, script, 'utf8');
+
   const log = buildConversionLog(resolvedPath, stat, entities, ir);
   writeConversionLog(outputDir, log);
   writeOutputReadme(outputDir, {