@openpresentation/opf 0.17.0 → 0.18.1

package/dist/{chunk-IPW5BS3X.js → chunk-KXBZ6ZSB.js}

@@ -1,41 +1,101 @@
+import { OPFApiError, parseSlideSelection, OPFExportError, asApiError, OPFImportError } from './chunk-QLFWWHRF.js';
 import { defaultCatalog } from './chunk-WCG3THTD.js';
-import { deckFormatOf, readDeckReport, stringify } from './chunk-N4EVOFEA.js';
-import { paginate } from './chunk-O2CX5NEH.js';
-import { validate, OPFValidationError } from './chunk-NLNYNBTS.js';
-import { readFileSync, realpathSync, statSync } from 'fs';
-import { createRequire } from 'module';
+import { deckFormatOf, readDeckReport, stringify } from './chunk-ZOHFLP3O.js';
+import { paginate } from './chunk-64YSJZDH.js';
+import { validate, OPFValidationError } from './chunk-JT3QXA22.js';
+import { stat, readdir, lstat, mkdir, writeFile, rename, unlink, readFile } from 'fs/promises';
 import path6 from 'path';
+import { readFileSync, realpathSync, statSync } from 'fs';
 import { pathToFileURL, fileURLToPath } from 'url';
-import { stat, readdir, lstat, mkdir, writeFile, rename, unlink, readFile } from 'fs/promises';
+import { createRequire } from 'module';
 import { randomUUID } from 'crypto';
 import { crc32 } from 'zlib';
 
-// src/node/errors.ts
-var OPFApiError = class extends Error {
-  code;
-  details;
-  findings;
-  constructor(message, code, extra = {}) {
-    super(message, extra.cause === void 0 ? void 0 : { cause: extra.cause });
-    this.name = new.target.name;
-    this.code = code;
-    this.details = extra.details ?? {};
-    this.findings = extra.findings ?? [];
+// src/node/catalogs.ts
+var DEFAULT_CATALOGS = [defaultCatalog];
+var MEDIA = { ".png": "image/png", ".jpg": "image/jpeg", ".jpeg": "image/jpeg", ".gif": "image/gif", ".webp": "image/webp", ".svg": "image/svg+xml" };
+var MAX_BYTES = 32 * 1024 * 1024;
+var startsWith = (bytes, signature, offset = 0) => signature.every((value, index) => bytes[offset + index] === value);
+function looksLike(type, bytes) {
+  switch (type) {
+    case "image/png":
+      return startsWith(bytes, [137, 80, 78, 71]);
+    case "image/jpeg":
+      return startsWith(bytes, [255, 216, 255]);
+    case "image/gif":
+      return startsWith(bytes, [71, 73, 70, 56]);
+    case "image/webp":
+      return startsWith(bytes, [82, 73, 70, 70]) && startsWith(bytes, [87, 69, 66, 80], 8);
+    default:
+      return /<svg[\s>]/i.test(new TextDecoder().decode(bytes.subarray(0, 4096)));
   }
+}
+var AssetError = class extends Error {
+  constructor(message, details) {
+    super(message);
+    this.details = details;
+  }
+  details;
+  code = "asset-unresolved";
 };
-var OPFExportError = class extends OPFApiError {
-};
-var OPFImportError = class extends OPFApiError {
-};
-function asApiError(Class, error, fallbackCode) {
-  if (error instanceof Class) return error;
-  if (error instanceof OPFApiError) return new Class(error.message, error.code, { details: error.details, findings: error.findings, cause: error });
-  const failure = error;
-  return new Class(failure?.message ?? String(error), typeof failure?.code === "string" ? failure.code : fallbackCode, { cause: error });
+function createImageResolver(root, reporter, passDirectory = "pass --asset-dir") {
+  const base = root === void 0 ? void 0 : realpathSync(root);
+  const cache2 = /* @__PURE__ */ new Map();
+  const shown = (source) => source.length > 80 ? `${source.slice(0, 77)}...` : source;
+  function load(source) {
+    if (/^[a-z][a-z0-9+.-]*:/i.test(source) && !/^file:/i.test(source) && !/^[a-z]:[\\/]/i.test(source)) return { skipped: true };
+    if (base === void 0) return { problem: "blocked", reason: "no asset directory was given, so no local file is read." };
+    let file;
+    try {
+      file = /^file:/i.test(source) ? fileURLToPath(source) : path6.resolve(base, source);
+    } catch {
+      return { problem: "blocked", reason: "the path is not valid." };
+    }
+    let real;
+    try {
+      real = realpathSync(file);
+    } catch {
+      return { problem: "missing", reason: `no such file under ${base}.` };
+    }
+    const relative = path6.relative(base, real);
+    if (relative.startsWith("..") || path6.isAbsolute(relative)) return { problem: "blocked", reason: `it is outside the asset directory ${base}.` };
+    const mediaType = MEDIA[path6.extname(real).toLowerCase()];
+    if (!mediaType) return { problem: "blocked", reason: "only .png, .jpg, .jpeg, .gif, .webp and .svg files are read." };
+    const info = statSync(real);
+    if (!info.isFile() || info.size > MAX_BYTES) return { problem: "blocked", reason: `it is not a regular file under ${MAX_BYTES / 1024 / 1024} MB.` };
+    const bytes = new Uint8Array(readFileSync(real));
+    if (!looksLike(mediaType, bytes)) return { problem: "blocked", reason: `the content is not a ${mediaType} image.` };
+    return { image: { bytes, mediaType } };
+  }
+  function read(source) {
+    let outcome = cache2.get(source);
+    if (!outcome) {
+      outcome = load(source);
+      cache2.set(source, outcome);
+    }
+    return outcome;
+  }
+  return {
+    /** opf-render: a data URI string, or null for the placeholder (a missing file is reported by the renderer as unresolved-asset). */
+    forSvg: (source, context) => {
+      if (!source) return null;
+      const outcome = read(source);
+      if ("image" in outcome) return `data:${outcome.image.mediaType};base64,${Buffer.from(outcome.image.bytes).toString("base64")}`;
+      if ("problem" in outcome && outcome.problem === "blocked") reporter.add("cli", { code: "asset-blocked", path: context.path, message: `Image "${shown(source)}" was not read: ${outcome.reason}` });
+      return null;
+    },
+    /** opf-pptx: bytes and media type; null for URLs and references it handles itself. An unreadable local file stops the export. */
+    forPptx: (source, context) => {
+      const outcome = read(source);
+      if ("image" in outcome) return { data: outcome.image.bytes, mediaType: outcome.image.mediaType };
+      if ("skipped" in outcome) return null;
+      throw new AssetError(`Image "${shown(source)}" was not read: ${outcome.reason} Fix the path, embed the image as a data URI, or ${passDirectory}.`, { path: context.path });
+    }
+  };
 }
 var RENDER_PACKAGE = "@openpresentation/opf-render";
 var PPTX_PACKAGE = "@openpresentation/opf-pptx";
-var PEER_RANGES = { [RENDER_PACKAGE]: "^0.17.0", [PPTX_PACKAGE]: "^0.17.0" };
+var PEER_RANGES = { [RENDER_PACKAGE]: "^0.18.0", [PPTX_PACKAGE]: "^0.18.0" };
 var RENDER_EXTRAS = {
   /** The faces of the office pack, which the CLI and `convert` always load (every format). */
   fonts: ["@expo-google-fonts/roboto@0.4.3", "@expo-google-fonts/roboto-mono@0.4.2", "@expo-google-fonts/caladea@0.4.2", "@expo-google-fonts/arimo@0.4.3", "@expo-google-fonts/tinos@0.4.2", "@expo-google-fonts/cousine@0.4.3", "@expo-google-fonts/gelasio@0.4.1", "@expo-google-fonts/noto-sans@0.4.2"],
@@ -50,9 +110,9 @@ var renderHint = () => `  ${RENDER_PACKAGE} also needs its optional peers, by ou
     png:                   npm install ${RENDER_EXTRAS.png.join(" ")}
     pdf:                   npm install ${RENDER_EXTRAS.pdfRaster.join(" ")}  (raster mode), ${RENDER_EXTRAS.pdfPictures.join(" ")}  (when the deck has pictures)
     svg:                   fonts only`;
-var hint = (name) => `${name} is not installed. It is an optional peer of @openpresentation/opf, loaded only by @openpresentation/opf/node and the opf commands that need it. Install it next to the CLI or in your project:
+var hint = (name) => `${name} is not installed. It is an optional peer of @openpresentation/opf, loaded only by the file API of @openpresentation/opf in Node (convert, open) and the opf commands that need it. Install it next to the CLI or in your project:
   npm install -g ${name}@${PEER_RANGES[name]}      (global CLI)
-  npm install ${name}@${PEER_RANGES[name]}      (project that imports @openpresentation/opf/node or depends on the CLI)
+  npm install ${name}@${PEER_RANGES[name]}      (project that calls convert or open of @openpresentation/opf, or depends on the CLI)
   npx -p @openpresentation/cli -p @openpresentation/opf-render -p @openpresentation/opf-pptx opf <command> ...      (one run)` + (name === RENDER_PACKAGE ? `
 ${renderHint()}` : "");
 function bases() {
@@ -69,6 +129,40 @@ function locate(specifier) {
   }
   return void 0;
 }
+function locatePackage(name, from) {
+  const starts = [...bases(), ...from === void 0 ? [] : [pathToFileURL(from).href]];
+  for (const base of starts) {
+    const manifest = manifestFrom(name, base);
+    if (!manifest) continue;
+    try {
+      return { manifest, version: JSON.parse(readFileSync(manifest, "utf8")).version ?? "unknown" };
+    } catch {
+      return { manifest, version: "unknown" };
+    }
+  }
+  return void 0;
+}
+function manifestFrom(name, base) {
+  const require2 = createRequire(base);
+  try {
+    return require2.resolve(`${name}/package.json`);
+  } catch {
+  }
+  let entry;
+  try {
+    entry = require2.resolve(name);
+  } catch {
+    return void 0;
+  }
+  for (let folder = path6.dirname(entry); folder !== path6.dirname(folder); folder = path6.dirname(folder)) {
+    const candidate = path6.join(folder, "package.json");
+    try {
+      if (JSON.parse(readFileSync(candidate, "utf8")).name === name) return candidate;
+    } catch {
+    }
+  }
+  return void 0;
+}
 var cache = /* @__PURE__ */ new Map();
 async function loadPeer(name, subpath = "") {
   const key = `${name}${subpath}`;
@@ -106,7 +200,7 @@ function missingPeerFrom(error) {
 }
 async function loadRenderer() {
   const render = await loadPeer(RENDER_PACKAGE);
-  requireFeature(render, ["renderSlideSvg", "svgToPng", "svgToPdf"]);
+  requireFeature(render, ["toSvg", "toPng", "toPdf"]);
   const fonts = await loadPeer(RENDER_PACKAGE, "/fonts-node");
   requireFeature(fonts, ["loadFonts"]);
   return { render, fonts: fonts.module };
@@ -116,8 +210,10 @@ async function loadPptx() {
   requireFeature(pptx, ["toPptx", "fromPptx", "inventoryTypefaces"]);
   return pptx;
 }
+
+// src/node/fonts.ts
 var FONT_FILE = /\.(ttf|otf)$/i;
-async function listFontDirectories(directories, label = "--font-dir") {
+async function listFontDirectories(directories, label = "--fonts") {
   const files = [];
   for (const directory of directories) {
     const resolved = path6.resolve(directory);
@@ -198,8 +294,8 @@ function scriptDiagnostic(diagnostic) {
   const name = typeof diagnostic.package === "string" ? diagnostic.package : "the Noto script package";
   return { ...diagnostic, message: `${diagnostic.message} Install ${name} next to the CLI (npm install -g ${name}) to draw this script with a bundled open font.` };
 }
-function embeddedFor(handle, mode) {
-  return mode === "none" ? [] : handle.embeddedFonts.map((face) => ({ ...face, embed: "used" }));
+function embeddedFor(handle, text = "fonts") {
+  return text === "fonts" ? handle.embeddedFonts.map((face) => ({ ...face, embed: "used" })) : [];
 }
 function substitutionRows(handle) {
   const rows = /* @__PURE__ */ new Map();
@@ -209,22 +305,6 @@ function substitutionRows(handle) {
   }
   return [...rows.values()].sort((a, b) => a.requested + a.resolved < b.requested + b.resolved ? -1 : 1);
 }
-function parseSlideSelection(spec, total, label = "--slides") {
-  if (total < 1) throw new OPFApiError("The presentation has no slides.", "no-slides");
-  const chosen = /* @__PURE__ */ new Set();
-  for (const part of spec.split(",")) {
-    const text = part.trim();
-    const match = /^(\d*)(-?)(\d*)$/.exec(text);
-    if (!text || !match || !match[1] && !match[3]) throw new OPFApiError(`${label} needs numbers like 1,3-5 (got "${spec}").`, "invalid-option");
-    const [, from, dash, to] = match;
-    const first = from ? Number(from) : 1;
-    const last = dash ? to ? Number(to) : total : first;
-    if (first < 1 || last < first) throw new OPFApiError(`${label} range "${text}" is not valid (slides count from 1).`, "invalid-option");
-    if (last > total) throw new OPFApiError(`${label} ${text} is outside the presentation, which has ${total} slide${total === 1 ? "" : "s"}.`, "invalid-option");
-    for (let n = first; n <= last; n++) chosen.add(n);
-  }
-  return [...chosen].sort((a, b) => a - b);
-}
 function stemOf(input) {
   if (input === "-") return "deck";
   return path6.basename(input).replace(/\.opf\.json$/i, "").replace(/\.(json|pptx|potx)$/i, "") || "deck";
@@ -292,7 +372,7 @@ var HELP = {
   "unresolved-asset": "Embed the image as a data URI, or keep the file inside the deck folder (see --asset-dir). URLs are never fetched.",
   "asset-blocked": "Move the file under the deck folder or pass --asset-dir <directory> that contains it.",
   "script-font-not-installed": "Install the Noto script package named in the message next to the CLI, then run the command again.",
-  "font-glyph-fallback": "The chosen font lacks these characters; a bundled font draws them. Supply a font with --font-dir to change that.",
+  "font-glyph-fallback": "The chosen font lacks these characters; a bundled font draws them. Supply a font with --fonts to change that.",
   "unresolved-reference": "Use an id from opf catalog <kind>, define the record in catalogs.custom, or run opf embed to embed what the deck references.",
   "unresolved-content": "Check the content at this path; it could not be drawn.",
   "chart-data-adapted": "The chart data was reshaped to export a native chart; see the message.",
@@ -300,9 +380,9 @@ var HELP = {
   "content-placeholder": "This content has no PowerPoint form; a placeholder frame stands in for it.",
   "unsupported-image-treatment": "Remove or change the image treatment at this path.",
   "date-needs-value": "Pass --date YYYY-MM-DD. The CLI never reads a clock, so output stays reproducible.",
-  "font-unavailable": "Pass --font-dir with the font files, or choose a font the bundled pack covers (opf catalog fontSchemes).",
-  "missing-glyph": "Install the script font package named by script-font-not-installed, or supply a covering font with --font-dir.",
-  "duplicate-font-face": "A --font-dir face repeats a bundled family, weight and style; remove it or rename the family."
+  "font-unavailable": "Pass --fonts with the font files, or choose a font the bundled pack covers (opf catalog fontSchemes).",
+  "missing-glyph": "Install the script font package named by script-font-not-installed, or supply a covering font with --fonts.",
+  "duplicate-font-face": "A --fonts face repeats a bundled family, weight and style; remove it or rename the family."
 };
 var Reporter = class {
   findings = [];
@@ -415,92 +495,10 @@ function createZip(entries) {
   end.setUint32(16, offset, true);
   return Buffer.concat([...chunks, ...central, new Uint8Array(end.buffer)]);
 }
-var MEDIA = { ".png": "image/png", ".jpg": "image/jpeg", ".jpeg": "image/jpeg", ".gif": "image/gif", ".webp": "image/webp", ".svg": "image/svg+xml" };
-var MAX_BYTES = 32 * 1024 * 1024;
-var startsWith = (bytes, signature, offset = 0) => signature.every((value, index) => bytes[offset + index] === value);
-function looksLike(type, bytes) {
-  switch (type) {
-    case "image/png":
-      return startsWith(bytes, [137, 80, 78, 71]);
-    case "image/jpeg":
-      return startsWith(bytes, [255, 216, 255]);
-    case "image/gif":
-      return startsWith(bytes, [71, 73, 70, 56]);
-    case "image/webp":
-      return startsWith(bytes, [82, 73, 70, 70]) && startsWith(bytes, [87, 69, 66, 80], 8);
-    default:
-      return /<svg[\s>]/i.test(new TextDecoder().decode(bytes.subarray(0, 4096)));
-  }
-}
-var AssetError = class extends Error {
-  constructor(message, details) {
-    super(message);
-    this.details = details;
-  }
-  details;
-  code = "asset-unresolved";
-};
-function createImageResolver(root, reporter, passDirectory = "pass --asset-dir") {
-  const base = root === void 0 ? void 0 : realpathSync(root);
-  const cache2 = /* @__PURE__ */ new Map();
-  const shown = (source) => source.length > 80 ? `${source.slice(0, 77)}...` : source;
-  function load(source) {
-    if (/^[a-z][a-z0-9+.-]*:/i.test(source) && !/^file:/i.test(source) && !/^[a-z]:[\\/]/i.test(source)) return { skipped: true };
-    if (base === void 0) return { problem: "blocked", reason: "no asset directory was given, so no local file is read." };
-    let file;
-    try {
-      file = /^file:/i.test(source) ? fileURLToPath(source) : path6.resolve(base, source);
-    } catch {
-      return { problem: "blocked", reason: "the path is not valid." };
-    }
-    let real;
-    try {
-      real = realpathSync(file);
-    } catch {
-      return { problem: "missing", reason: `no such file under ${base}.` };
-    }
-    const relative = path6.relative(base, real);
-    if (relative.startsWith("..") || path6.isAbsolute(relative)) return { problem: "blocked", reason: `it is outside the asset directory ${base}.` };
-    const mediaType = MEDIA[path6.extname(real).toLowerCase()];
-    if (!mediaType) return { problem: "blocked", reason: "only .png, .jpg, .jpeg, .gif, .webp and .svg files are read." };
-    const info = statSync(real);
-    if (!info.isFile() || info.size > MAX_BYTES) return { problem: "blocked", reason: `it is not a regular file under ${MAX_BYTES / 1024 / 1024} MB.` };
-    const bytes = new Uint8Array(readFileSync(real));
-    if (!looksLike(mediaType, bytes)) return { problem: "blocked", reason: `the content is not a ${mediaType} image.` };
-    return { image: { bytes, mediaType } };
-  }
-  function read(source) {
-    let outcome = cache2.get(source);
-    if (!outcome) {
-      outcome = load(source);
-      cache2.set(source, outcome);
-    }
-    return outcome;
-  }
-  return {
-    /** opf-render: a data URI string, or null for the placeholder (a missing file is reported by the renderer as unresolved-asset). */
-    forSvg: (source, context) => {
-      if (!source) return null;
-      const outcome = read(source);
-      if ("image" in outcome) return `data:${outcome.image.mediaType};base64,${Buffer.from(outcome.image.bytes).toString("base64")}`;
-      if ("problem" in outcome && outcome.problem === "blocked") reporter.add("cli", { code: "asset-blocked", path: context.path, message: `Image "${shown(source)}" was not read: ${outcome.reason}` });
-      return null;
-    },
-    /** opf-pptx: bytes and media type; null for URLs and references it handles itself. An unreadable local file stops the export. */
-    forPptx: (source, context) => {
-      const outcome = read(source);
-      if ("image" in outcome) return { data: outcome.image.bytes, mediaType: outcome.image.mediaType };
-      if ("skipped" in outcome) return null;
-      throw new AssetError(`Image "${shown(source)}" was not read: ${outcome.reason} Fix the path, embed the image as a data URI, or ${passDirectory}.`, { path: context.path });
-    }
-  };
-}
-
-// src/node/catalogs.ts
-var DEFAULT_CATALOGS = [defaultCatalog];
 
 // src/node/export.ts
 var EXPORT_FORMATS = ["svg", "png", "pdf", "pptx"];
+var EXPORT_TEXT = ["fonts", "system", "paths"];
 var NO_FONTS = { fontFiles: [], useBundledFonts: false, loadSystemFonts: false };
 var invalid = (message) => new OPFApiError(message, "invalid-option");
 var oneOf = (name, value, allowed) => {
@@ -521,27 +519,42 @@ function checkScale(value, label = "scale") {
   if (typeof value === "boolean" || !Number.isFinite(scale) || scale < 0.1 || scale > 8) throw invalid(`${label} must be a number from 0.1 to 8 (1 draws the 1280 x 720 reference slide at 1280 x 720 pixels).`);
   return scale;
 }
+var RENAMED = {
+  svgFonts: 'text ("fonts", "system" or "paths")',
+  pdfMode: "raster (true for a picture PDF)",
+  chartex: 'charts ("auto", "native" or "picture")',
+  imageFormat: "images",
+  fontDirs: "fonts (a folder or a list of folders)",
+  filename: "name"
+};
+function checkRenamedOptions(options) {
+  for (const [old, replacement] of Object.entries(RENAMED)) if (old in options) throw invalid(`${old} was renamed ${replacement} in 0.18.`);
+}
+var isHandle = (value) => !!value && typeof value === "object" && !Array.isArray(value);
 function resolveExportOptions(options) {
   if (!options || typeof options !== "object") throw invalid("An export needs options with a format: svg, png, pdf or pptx.");
+  checkRenamedOptions(options);
   const format = oneOf("format", options.format, EXPORT_FORMATS);
   if (!format) throw invalid("An export needs options.format: svg, png, pdf or pptx.");
-  const pdfMode = oneOf("pdfMode", options.pdfMode, ["vector", "raster"]);
-  const chartex = oneOf("chartex", options.chartex, ["auto", "native", "fallback"]);
+  if (options.raster !== void 0 && typeof options.raster !== "boolean") throw invalid("raster must be true or false.");
+  const charts = oneOf("charts", options.charts, ["auto", "native", "picture"]);
   const provenance = oneOf("provenance", options.provenance, ["full", "references-only", "none"]);
-  const imageFormat = oneOf("imageFormat", options.imageFormat, ["compatible", "preserve"]);
-  const svgFonts = oneOf("svgFonts", options.svgFonts, ["used", "none"]);
-  if (pdfMode !== void 0 && format !== "pdf") throw invalid("pdfMode applies to format pdf.");
-  if ((chartex !== void 0 || provenance !== void 0 || imageFormat !== void 0) && format !== "pptx") throw invalid("chartex, provenance and imageFormat apply to format pptx.");
+  const images = oneOf("images", options.images, ["compatible", "preserve"]);
+  const text = oneOf("text", options.text, EXPORT_TEXT);
+  if (options.raster && format !== "pdf") throw invalid("raster applies to format pdf.");
+  if ((charts !== void 0 || provenance !== void 0 || images !== void 0) && format !== "pptx") throw invalid("charts, provenance and images apply to format pptx.");
   if (options.scale !== void 0 && format !== "png" && format !== "pdf") throw invalid("scale applies to format png (and raster pdf).");
   if (options.includeHidden && format === "pptx") throw invalid("includeHidden applies to per-slide image and PDF output; the PPTX keeps a hidden slide as a hidden slide.");
   if (options.slides !== void 0 && format === "pptx") throw invalid("slides is not available for pptx: the whole presentation is exported.");
-  if (svgFonts !== void 0 && format !== "svg") throw invalid("svgFonts applies to format svg.");
+  if (text !== void 0 && format !== "svg") throw invalid("text applies to format svg.");
   if (options.zip && format !== "svg" && format !== "png") throw invalid("zip applies to format svg and png.");
-  if (options.slides !== void 0 && typeof options.slides !== "string" && !(Array.isArray(options.slides) && options.slides.every((n) => Number.isInteger(n) && n >= 1))) throw invalid('slides must be a selection such as "1,3-5" or an array of slide numbers counted from 1.');
+  if (options.slides !== void 0 && typeof options.slides !== "string" && !(typeof options.slides === "number" && Number.isInteger(options.slides) && options.slides >= 1) && !(Array.isArray(options.slides) && options.slides.every((n) => Number.isInteger(n) && n >= 1))) throw invalid('slides must be a slide number, an array of slide numbers counted from 1, or a selection such as "1,3-5".');
   const scale = checkScale(options.scale);
   checkDate(options.date);
-  if (options.fonts !== void 0 && options.fontDirs?.length) throw invalid("Give fonts or fontDirs, not both: fontDirs loads font files into the handle that fonts already is.");
-  return { ...options, format, svgFonts: svgFonts ?? "used", scale };
+  const { fonts, ...rest } = options;
+  if (fonts !== void 0 && typeof fonts !== "string" && !isHandle(fonts) && !(Array.isArray(fonts) && fonts.every((folder) => typeof folder === "string"))) throw invalid("fonts must be a fonts handle (loadFonts() of @openpresentation/opf-render/fonts-node), a folder of font files or a list of folders.");
+  const folders = typeof fonts === "string" ? [fonts] : Array.isArray(fonts) ? [...fonts] : [];
+  return { ...rest, format, text: text ?? "fonts", scale, ...isHandle(fonts) ? { fonts } : {}, fontFolders: folders };
 }
 function assetRoot(directory, flags = false) {
   if (directory === void 0) return void 0;
@@ -568,9 +581,9 @@ async function runExport(presentation, options, ctx) {
   const date = checkDate(options.date);
   const renderer = ctx.renderer ?? await loadRenderer();
   const pptx = format === "pptx" ? ctx.pptx ?? await loadPptx() : void 0;
-  const userFonts = options.fonts ? [] : ctx.userFonts ?? await listFontDirectories([...options.fontDirs ?? []], ctx.flags ? "--font-dir" : "fontDirs");
+  const userFonts = options.fonts ? [] : ctx.userFonts ?? await listFontDirectories(options.fontFolders, ctx.flags ? "--fonts" : "fonts");
   const resolver = createImageResolver(assetRoot(options.assetDir, ctx.flags), reporter, ctx.flags ? "pass --asset-dir" : "pass assetDir");
-  const embedScripts = format === "svg" && options.svgFonts === "used";
+  const embedScripts = format === "svg" && options.text === "fonts";
   const lease = options.fonts ? void 0 : await leaseSharedFonts(renderer, presentation, userFonts, reporter, embedScripts);
   try {
     const handle = options.fonts ?? lease?.handle ?? (await prepareFonts(renderer, presentation, userFonts, reporter, embedScripts)).handle;
@@ -605,12 +618,12 @@ async function drawWith(presentation, handle, options, ctx, environment) {
   const isHidden = (number) => deck.slides?.[number - 1]?.hidden === true;
   const everySlide = Array.from({ length: slideCount }, (_, index) => index + 1);
   const slidesLabel = ctx.flags ? "--slides" : "slides";
-  const named = typeof options.slides === "string" ? parseSlideSelection(options.slides, slideCount, slidesLabel) : options.slides === void 0 ? void 0 : parseSlideSelection(options.slides.join(","), slideCount, slidesLabel);
+  const named = options.slides === void 0 ? void 0 : parseSlideSelection(options.slides, slideCount, slidesLabel);
   const selected = format === "pptx" ? [] : named ?? (options.includeHidden ? everySlide : everySlide.filter((number) => !isHidden(number)));
   const skippedHidden = format === "pptx" || named || options.includeHidden ? [] : everySlide.filter(isHidden);
   if (format !== "pptx" && !selected.length)
     throw new OPFApiError(skippedHidden.length ? ctx.flags ? "Every slide is hidden. Use --include-hidden to write them, or --slides to name slides." : "Every slide is hidden. Use includeHidden to write them, or slides to name slides." : "The presentation has no slides.", skippedHidden.length ? "all-slides-hidden" : "no-slides");
-  const stem = deckStem(deck, options.filename ?? "-");
+  const stem = deckStem(options.name === void 0 ? deck : { filename: options.name }, "-");
   const run = (extra) => ({ fonts: fontSummary(), ...pagination ? { pagination } : {}, skippedHidden, ...extra });
   try {
     if (format === "pptx") {
@@ -620,19 +633,21 @@ async function drawWith(presentation, handle, options, ctx, environment) {
         imageResolver: resolver.forPptx,
         // The PNG fallback of an SVG picture is drawn by the same renderer the preview uses, with the same fonts handle,
         // so SVG pictures export whichever way opf-pptx would find opf-render. A picture without text needs no faces.
-        svgRasterizer: async (svg, size) => new Uint8Array(await renderer.render.module.svgToPng(svg, { scale: size.scale, background: "rgba(0, 0, 0, 0)", fonts: size.text ? handle : NO_FONTS })),
+        svgRasterizer: async (svg, size) => new Uint8Array(await renderer.render.module.toPng(svg, { scale: size.scale, background: "rgba(0, 0, 0, 0)", fonts: size.text ? handle : NO_FONTS })),
         onDiagnostic: (diagnostic) => reporter.add("pptx", diagnostic),
         catalogs,
-        ...options.chartex ? { chartex: options.chartex } : {},
+        // opf-pptx still names its option `chartex` and its picture choice `fallback`.
+        ...options.charts ? { chartex: options.charts === "picture" ? "fallback" : options.charts } : {},
         ...options.provenance ? { provenance: options.provenance === "none" ? false : options.provenance } : {},
-        ...options.imageFormat ? { imageFormat: options.imageFormat } : {},
+        ...options.images ? { imageFormat: options.images } : {},
         ...date ? { date } : {}
       });
       return run({ files: [{ name: `${stem}.pptx`, type: MEDIA2.pptx, bytes }], skippedHidden: [] });
     }
-    const embedded = format === "svg" ? embeddedFor(handle, options.svgFonts) : [];
+    const embedded = format === "svg" ? embeddedFor(handle, options.text) : [];
     const svgOptions = {
-      fonts: { textMeasurement: handle.textMeasurement, embeddedFonts: embedded },
+      fonts: options.text === "paths" && format === "svg" ? handle : { textMeasurement: handle.textMeasurement, embeddedFonts: embedded },
+      ...format === "svg" && options.text !== "fonts" ? { text: options.text } : {},
       imageResolver: resolver.forSvg,
       onDiagnostic: (diagnostic) => reporter.add("render", diagnostic),
       catalogs,
@@ -640,17 +655,17 @@ async function drawWith(presentation, handle, options, ctx, environment) {
     };
     const svgs = [];
     for (const number of selected) {
-      const svg = renderer.render.module.renderSlideSvg(deck, number - 1, svgOptions);
+      const svg = renderer.render.module.toSvg(deck, number, svgOptions);
       svgs.push({ slide: number, id: deck.slides[number - 1]?.id, svg });
     }
     const width = Math.max(3, String(slideCount).length);
     const name = (slide, extension) => `${stem}-${String(slide).padStart(width, "0")}.${extension}`;
     if (format === "pdf") {
-      const mode = options.pdfMode ?? "vector";
+      const mode = options.raster ? "raster" : "vector";
       const title = typeof deck.name === "string" ? deck.name : void 0;
-      const bytes = await renderer.render.module.svgToPdf(
+      const bytes = await renderer.render.module.toPdf(
         svgs.map((item) => item.svg),
-        { fonts: handle, scale, ...options.pdfMode ? { mode: options.pdfMode } : {}, ...mode === "vector" && title ? { metadata: { title } } : {}, onDiagnostic: (diagnostic) => reporter.add("pdf", diagnostic) }
+        { fonts: handle, scale, ...options.raster ? { raster: true } : {}, ...mode === "vector" && title ? { metadata: { title } } : {}, onDiagnostic: (diagnostic) => reporter.add("pdf", diagnostic) }
       );
       return run({ files: [{ name: `${stem}.pdf`, type: MEDIA2.pdf, bytes, pages: svgs.length, slides: selected }], pdf: { mode } });
     }
@@ -660,7 +675,7 @@ async function drawWith(presentation, handle, options, ctx, environment) {
         const bytes = new TextEncoder().encode(item.svg);
         items.push({ name: name(item.slide, "svg"), type: MEDIA2.svg, bytes, slide: item.slide, ...item.id === void 0 ? {} : { id: item.id }, ...svgSize(item.svg) });
       } else {
-        const bytes = await renderer.render.module.svgToPng(item.svg, { fonts: handle, scale });
+        const bytes = await renderer.render.module.toPng(item.svg, { fonts: handle, scale });
         items.push({ name: name(item.slide, "png"), type: MEDIA2.png, bytes, slide: item.slide, ...item.id === void 0 ? {} : { id: item.id }, ...pngSize(bytes) });
       }
     }
@@ -713,7 +728,7 @@ async function prepareExport(options, flags = false) {
   const resolved = resolveExportOptions(options);
   const renderer = await loadRenderer();
   const pptx = resolved.format === "pptx" ? await loadPptx() : void 0;
-  const userFonts = resolved.fonts ? [] : await listFontDirectories([...resolved.fontDirs ?? []], flags ? "--font-dir" : "fontDirs");
+  const userFonts = resolved.fonts ? [] : await listFontDirectories(resolved.fontFolders, flags ? "--fonts" : "fonts");
   return { options: resolved, renderer, ...pptx ? { pptx } : {}, userFonts, flags };
 }
 async function runPreparedExport(prepared, presentation, checked) {
@@ -747,6 +762,8 @@ async function importPresentation(bytes, options, loaded) {
   if (!check.valid) throw new OPFApiError(`The imported presentation is not valid OPF: ${firstError(check.findings)}`, "invalid-presentation", { findings: reporter.findings });
   return { result: { presentation: run.presentation, findings: reporter.findings, ...run.signals ? { signals: run.signals } : {}, pptx: { package: PPTX_PACKAGE, version: pptx.version } }, check };
 }
+
+// src/node/conversion.ts
 var EXPORT_EXTENSIONS = { ".pdf": "pdf", ".pptx": "pptx", ".png": "png", ".svg": "svg" };
 var FORMATS = ["pdf", "pptx", "png", "svg", "json", "yaml", "markdown"];
 var DECK_MEDIA = { json: "application/json", yaml: "application/yaml", markdown: "text/markdown" };
@@ -787,11 +804,12 @@ function targetOf(output, options, flags) {
     return format === "json" || format === "yaml" || format === "markdown" ? { kind: "deck", format } : { kind: "export", format, zip: options.zip === true };
   }
   if (typeof output !== "string" || !output) throw invalid2(`${flags ? "opf convert" : "convert"} needs an output file path ending ${OUTPUTS}.`);
+  if (options.zip) throw invalid2(`${flags ? "--zip" : "zip"} is for output without a path; a .zip output path makes the archive.`);
+  if (options.name !== void 0) throw invalid2(`${flags ? "--name" : "name"} is for output without a path; the output path names the file.`);
   if (path6.extname(output).toLowerCase() === ".zip") {
     if (format !== void 0 && format !== "png" && format !== "svg") throw invalid2(`A .zip output holds png or svg slides; ${formatLabel} ${format} is neither.`);
     return { kind: "export", format: format ?? "png", zip: true };
   }
-  if (options.zip) throw invalid2(`${flags ? "--zip" : "zip"} writes one archive: give an output ending .zip.`);
   const exported = exportFormatOf(output);
   const deck = exported ? void 0 : deckFileFormat(output);
   const named = exported ?? deck;
@@ -799,10 +817,10 @@ function targetOf(output, options, flags) {
   if (format !== void 0 && format !== named) throw invalid2(`${formatLabel} ${format} does not match the output ${output}, which is ${named}.`);
   return exported ? { kind: "export", format: exported, zip: false } : { kind: "deck", format: deck };
 }
-var EXPORT_ONLY = ["slides", "includeHidden", "paginate", "scale", "pdfMode", "svgFonts", "chartex", "provenance", "imageFormat", "date", "fonts", "fontDirs", "assetDir"];
+var EXPORT_ONLY = ["slides", "includeHidden", "paginate", "scale", "raster", "text", "charts", "provenance", "images", "date", "fonts", "assetDir"];
 var given = (value) => value !== void 0 && value !== false && !(Array.isArray(value) && value.length === 0);
 function checkApplicable(source, target, options, flags) {
-  const name = (key) => flags ? `--${key.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`).replace(/^font-dirs$/, "font-dir")}` : key;
+  const name = (key) => flags ? `--${key.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`)}` : key;
   const names = (...keys) => keys.map(name).join(", ").replace(/, ([^,]*)$/, " and $1");
   if (given(options.signals) && source.kind !== "pptx") throw invalid2(`${name("signals")} applies to a .pptx input.`);
   if (target.kind === "deck") {
@@ -811,12 +829,12 @@ function checkApplicable(source, target, options, flags) {
     return;
   }
   const format = target.format;
-  if (options.pdfMode !== void 0 && format !== "pdf") throw invalid2(`${name("pdfMode")} applies to pdf output.`);
-  if ((options.chartex !== void 0 || options.provenance !== void 0 || options.imageFormat !== void 0) && format !== "pptx") throw invalid2(`${names("chartex", "provenance", "imageFormat")} apply to pptx output.`);
+  if (given(options.raster) && format !== "pdf") throw invalid2(`${name("raster")} applies to pdf output.`);
+  if ((options.charts !== void 0 || options.provenance !== void 0 || options.images !== void 0) && format !== "pptx") throw invalid2(`${names("charts", "provenance", "images")} apply to pptx output.`);
   if (options.scale !== void 0 && format !== "png" && format !== "pdf") throw invalid2(`${name("scale")} applies to png output (and raster pdf).`);
   if (given(options.includeHidden) && format === "pptx") throw invalid2(`${name("includeHidden")} applies to per-slide image and PDF output; the PPTX keeps a hidden slide as a hidden slide.`);
   if (options.slides !== void 0 && format === "pptx") throw invalid2(`${name("slides")} is not available for pptx output: the whole presentation is exported.`);
-  if (options.svgFonts !== void 0 && format !== "svg") throw invalid2(`${name("svgFonts")} applies to svg output.`);
+  if (options.text !== void 0 && format !== "svg") throw invalid2(`${name("text")} applies to svg output.`);
   checkScale(options.scale, name("scale"));
   checkDate(options.date, name("date"));
 }
@@ -852,6 +870,7 @@ function stemOfDeck(presentation) {
 }
 async function planConversion(input, output, options = {}, flags = false) {
   if (!options || typeof options !== "object") throw invalid2("convert takes options as an object.");
+  checkRenamedOptions(options);
   const source = sourceOf(input, flags);
   const target = targetOf(output, options, flags);
   checkApplicable(source, target, options, flags);
@@ -860,14 +879,12 @@ async function planConversion(input, output, options = {}, flags = false) {
   const inputFile = typeof input === "string" ? input : void 0;
   let prepared;
   if (target.kind === "export") {
-    const { format: _format, zip: _zip, signals: _signals, overwrite: _overwrite, ...rest } = options;
+    const { format: _format, zip: _zip, name: _name, signals: _signals, overwrite: _overwrite, ...rest } = options;
     const assetDir = options.assetDir ?? (inputFile === void 0 ? void 0 : path6.dirname(path6.resolve(inputFile)));
     const exportOptions = {
       ...rest,
       format: target.format,
       ...assetDir === void 0 ? {} : { assetDir },
-      // Without an output path the files are named as the commands name them: by the deck, else by the input file.
-      ...output === void 0 && inputFile !== void 0 ? { filename: fileStem(inputFile) } : {},
       ...output === void 0 && target.zip ? { zip: true } : {}
     };
     prepared = await inStep(OPFExportError, "export-failed", () => prepareExport(exportOptions, flags));
@@ -897,9 +914,10 @@ async function planConversion(input, output, options = {}, flags = false) {
   if (target.kind === "deck") {
     const bytes = new TextEncoder().encode(deckText(presentation, target.format));
     const extension = `opf.${target.format === "markdown" ? "md" : target.format}`;
-    const name = output === void 0 ? `${inputFile === void 0 ? stemOfDeck(presentation) : fileStem(inputFile)}.${extension}` : path6.basename(output);
+    const name = output === void 0 ? `${options.name ?? (inputFile === void 0 ? stemOfDeck(presentation) : fileStem(inputFile))}.${extension}` : path6.basename(output);
     return { ...base, files: [{ name, ...output === void 0 ? {} : { path: output }, type: DECK_MEDIA[target.format], bytes }], findings };
   }
+  if (output === void 0 && prepared) prepared.options = { ...prepared.options, name: options.name ?? deckStem(presentation, inputFile === void 0 ? "-" : fileStem(inputFile)) };
   const exported = await inStep(OPFExportError, "export-failed", () => runPreparedExport(prepared, presentation, findings));
   const drawn = exported.files;
   const facts = (file) => ({
@@ -970,4 +988,4 @@ async function saveDeck(presentation, file, options = {}) {
   return { path: file, format };
 }
 
-export { EXPORT_FORMATS, OPFApiError, OPFExportError, OPFImportError, PEER_RANGES, PPTX_PACKAGE, RENDER_PACKAGE, Reporter, VERSIONS, asApiError, checkDate, checkDestinations, checkOptions, checkScale, convertFiles, createZip, deckFileFormat, deckStem, embeddedFor, exportFormatOf, finishReport, importPresentation, leaseSharedFonts, listFontDirectories, loadPptx, loadRenderer, missingPeerFrom, openDeck, parseSlideSelection, planConversion, pointerOf, prepareExport, prepareFonts, reaches, readInput, reportThrown, resolveExportOptions, runExport, runImport, runPreparedExport, saveDeck, stemOf, writeFiles, writePlanned };
+export { DEFAULT_CATALOGS, EXPORT_FORMATS, EXPORT_TEXT, PEER_RANGES, PPTX_PACKAGE, RENDER_EXTRAS, RENDER_PACKAGE, Reporter, VERSIONS, checkDate, checkDestinations, checkOptions, checkRenamedOptions, checkScale, convertFiles, createZip, deckFileFormat, deckStem, embeddedFor, exportFormatOf, finishReport, importPresentation, leaseSharedFonts, listFontDirectories, loadPptx, loadRenderer, locatePackage, missingPeerFrom, openDeck, planConversion, pointerOf, prepareExport, prepareFonts, reaches, readInput, reportThrown, resolveExportOptions, runExport, runImport, runPreparedExport, saveDeck, stemOf, writeFiles, writePlanned };