@openpresentation/opf 0.18.4 → 0.20.1

package/dist/{chunk-K5EG3UMS.js → chunk-JMYM44I4.js}

@@ -1,8 +1,8 @@
-import { OPFApiError, parseSlideSelection, OPFExportError, asApiError, OPFImportError } from './chunk-IM337HP5.js';
-import { defaultCatalog } from './chunk-WCG3THTD.js';
-import { deckFormatOf, readDeckReport, stringify } from './chunk-GVOLSWAJ.js';
-import { paginate } from './chunk-FO3WGS4R.js';
-import { validate, OPFValidationError } from './chunk-KA3ZPFVT.js';
+import { defaultCatalogs } from './chunk-BYEIFHWS.js';
+import { OPFApiError, parseSlideSelection, OPFExportError, asApiError, OPFImportError } from './chunk-2AGWO7RM.js';
+import { deckFormatOf, readDeckReport, stringify } from './chunk-NZDWCYDI.js';
+import { paginate } from './chunk-BDXJYO6R.js';
+import { validate, OPFValidationError } from './chunk-7QUAOKS6.js';
 import { stat, readdir, lstat, mkdir, writeFile, rename, unlink, readFile } from 'fs/promises';
 import path6 from 'path';
 import { readFileSync, realpathSync, statSync } from 'fs';
@@ -11,8 +11,6 @@ import { createRequire } from 'module';
 import { randomUUID } from 'crypto';
 import { crc32 } from 'zlib';
 
-// 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);
@@ -95,7 +93,7 @@ function createImageResolver(root, reporter, passDirectory = "pass --asset-dir")
 }
 var RENDER_PACKAGE = "@openpresentation/opf-render";
 var PPTX_PACKAGE = "@openpresentation/opf-pptx";
-var PEER_RANGES = { [RENDER_PACKAGE]: "^0.18.0", [PPTX_PACKAGE]: "^0.18.0" };
+var PEER_RANGES = { [RENDER_PACKAGE]: "^0.20.0", [PPTX_PACKAGE]: "^0.20.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"],
@@ -316,6 +314,26 @@ function deckStem(deck, input) {
   const slug = (value) => value.replace(/[^\p{L}\p{N}_-]+/gu, "-").replace(/-{2,}/g, "-").replace(/^-|-$/g, "");
   return clean(text(root.filename).trim().replace(/\.(pptx|pdf|png|svg)$/i, "")) || slug(text(root.name)) || stemOf(input);
 }
+function padNumber(value, largest) {
+  return String(value).padStart(String(largest).length, "0");
+}
+var PLACEHOLDER = /\{([^{}]*)\}/g;
+function outputKeys(output) {
+  return [...output.matchAll(PLACEHOLDER)].map((match) => match[1]);
+}
+function checkOutputPattern(output, perSlide) {
+  const keys = outputKeys(output);
+  if (!perSlide) {
+    if (keys.includes("n")) throw new OPFApiError(`{n} numbers the files of a .png or .svg output, one per slide; ${output} is a single file. Name the file without {n}.`, "invalid-option", { details: { path: output } });
+    return false;
+  }
+  const unknown = keys.find((key) => key !== "n");
+  if (unknown !== void 0) throw new OPFApiError(`Unknown {${unknown}} in the output ${output}: the only placeholder is {n}, the slide number.`, "invalid-option", { details: { path: output, key: unknown } });
+  return keys.length > 0;
+}
+function expandOutputPattern(output, slide, largest) {
+  return output.replace(PLACEHOLDER, () => padNumber(slide, largest));
+}
 async function checkDestinations(files, overwrite, flags = true) {
   for (const file of files) {
     try {
@@ -577,7 +595,7 @@ var MEDIA2 = { svg: "image/svg+xml", png: "image/png", pdf: "application/pdf", p
 async function runExport(presentation, options, ctx) {
   const { format, scale } = options;
   const reporter = ctx.reporter;
-  const catalogs = options.catalogs ?? DEFAULT_CATALOGS;
+  const catalogs = options.catalogs ?? defaultCatalogs();
   const date = checkDate(options.date);
   const renderer = ctx.renderer ?? await loadRenderer();
   const pptx = format === "pptx" ? ctx.pptx ?? await loadPptx() : void 0;
@@ -658,8 +676,8 @@ async function drawWith(presentation, handle, options, ctx, environment) {
       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}`;
+    const largest = Math.max(...selected);
+    const name = (slide, extension) => `${stem}-${padNumber(slide, largest)}.${extension}`;
     if (format === "pdf") {
       const mode = options.raster ? "raster" : "vector";
       const title = typeof deck.name === "string" ? deck.name : void 0;
@@ -706,11 +724,12 @@ async function runImport(bytes, options, reporter, loaded) {
   const pptx = loaded ?? await loadPptx();
   try {
     const onDiagnostic = (diagnostic) => reporter.add("import", diagnostic);
+    const catalogOptions = options.catalogs === void 0 ? {} : { catalogs: options.catalogs };
     if (options.signals) {
-      const result = await pptx.module.fromPptx(bytes, { onDiagnostic, signals: true });
+      const result = await pptx.module.fromPptx(bytes, { ...catalogOptions, onDiagnostic, signals: true });
       return { presentation: result.presentation, signals: result.signals, pptx };
     }
-    return { presentation: await pptx.module.fromPptx(bytes, { onDiagnostic }), pptx };
+    return { presentation: await pptx.module.fromPptx(bytes, { ...catalogOptions, onDiagnostic }), pptx };
   } catch (error) {
     reportThrown(reporter, "import", error);
     const failure = error;
@@ -719,7 +738,7 @@ async function runImport(bytes, options, reporter, loaded) {
 }
 
 // src/node/pipeline.ts
-var checkOptions = (catalogs) => ({ only: ["format", "references"], catalogs: catalogs ?? DEFAULT_CATALOGS });
+var checkOptions = (catalogs) => ({ only: ["format", "references"], catalogs: catalogs ?? defaultCatalogs() });
 var firstError = (findings) => {
   const first = findings.find((found) => found.severity === "error");
   return first ? `${first.message} [${first.ruleId}]` : "see findings.";
@@ -755,7 +774,7 @@ async function runPreparedExport(prepared, presentation, checked) {
 async function importPresentation(bytes, options, loaded) {
   const pptx = loaded ?? await loadPptx();
   const reporter = new Reporter();
-  const run = await runImport(bytes, { signals: options.signals === true }, reporter, pptx);
+  const run = await runImport(bytes, { catalogs: options.catalogs ?? defaultCatalogs(), signals: options.signals === true }, reporter, pptx);
   if (run.failure || !run.presentation) throw new OPFApiError(run.failure?.message ?? "The file could not be read.", "import-failed", { details: { reason: run.failure?.code }, findings: reporter.findings });
   const check = validate(run.presentation, checkOptions(options.catalogs));
   for (const found of check.findings) reporter.addFinding(found);
@@ -808,6 +827,7 @@ function targetOf(output, options, flags) {
   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.`);
+    checkOutputPattern(output, false);
     return { kind: "export", format: format ?? "png", zip: true };
   }
   const exported = exportFormatOf(output);
@@ -815,6 +835,7 @@ function targetOf(output, options, flags) {
   const named = exported ?? deck;
   if (!named) throw invalid2(`${flags ? "opf convert" : "convert"} writes ${OUTPUTS} files; ${output} is none of them.`, { path: output });
   if (format !== void 0 && format !== named) throw invalid2(`${formatLabel} ${format} does not match the output ${output}, which is ${named}.`);
+  checkOutputPattern(output, exported === "png" || exported === "svg");
   return exported ? { kind: "export", format: exported, zip: false } : { kind: "deck", format: deck };
 }
 var EXPORT_ONLY = ["slides", "includeHidden", "paginate", "scale", "raster", "text", "charts", "provenance", "images", "date", "fonts", "assetDir"];
@@ -874,7 +895,7 @@ async function planConversion(input, output, options = {}, flags = false) {
   const source = sourceOf(input, flags);
   const target = targetOf(output, options, flags);
   checkApplicable(source, target, options, flags);
-  const catalogs = options.catalogs ?? DEFAULT_CATALOGS;
+  const catalogs = options.catalogs ?? defaultCatalogs();
   const ExportClass = target.kind === "export" ? OPFExportError : OPFApiError;
   const inputFile = typeof input === "string" ? input : void 0;
   let prepared;
@@ -932,12 +953,21 @@ async function planConversion(input, output, options = {}, flags = false) {
   if (output === void 0) return done(drawn.map((file) => ({ name: file.name, type: file.type, bytes: file.bytes, ...facts(file) })));
   const single = (file) => done([{ name: path6.basename(output), path: output, type: file.type, bytes: file.bytes, ...facts(file) }]);
   if (target.format === "pdf" || target.format === "pptx") return single(drawn[0]);
+  const largest = Math.max(...drawn.map((file) => file.slide ?? 0));
   const stem = path6.basename(output, path6.extname(output));
-  const numbered = (file) => `${stem}-${/-(\d+)\.(?:png|svg)$/.exec(file.name)?.[1] ?? String(file.slide).padStart(3, "0")}.${target.format}`;
+  const numbered = (file) => `${stem}-${padNumber(file.slide, largest)}.${target.format}`;
   if (target.zip) {
     const entries = drawn.map((file) => ({ name: numbered(file), bytes: file.bytes }));
     return done([{ name: path6.basename(output), path: output, type: ZIP_MEDIA, bytes: createZip(entries), entries: entries.map((entry) => entry.name).sort() }]);
   }
+  if (checkOutputPattern(output, true)) {
+    return done(
+      drawn.map((file) => {
+        const written = expandOutputPattern(output, file.slide, largest);
+        return { name: path6.basename(written), path: written, type: file.type, bytes: file.bytes, ...facts(file) };
+      })
+    );
+  }
   if (drawn.length === 1) return single(drawn[0]);
   const folder = path6.dirname(output);
   return done(drawn.map((file) => ({ name: numbered(file), path: path6.join(folder, numbered(file)), type: file.type, bytes: file.bytes, ...facts(file) })));
@@ -961,7 +991,7 @@ async function convertFiles(input, output, options = {}) {
   return { files: plan.files, findings: plan.findings, ...plan.imported?.signals ? { signals: plan.imported.signals } : {} };
 }
 async function openDeck(input, options = {}) {
-  const catalogs = options.catalogs ?? DEFAULT_CATALOGS;
+  const catalogs = options.catalogs ?? defaultCatalogs();
   if (input instanceof Uint8Array || input instanceof ArrayBuffer || typeof input === "string" && /\.pptx$/i.test(input)) {
     const bytes = typeof input === "string" ? await readInput(input) : input instanceof Uint8Array ? input : new Uint8Array(input);
     return (await inStep(OPFImportError, "import-failed", () => importPresentation(bytes, { catalogs }))).result.presentation;
@@ -980,7 +1010,7 @@ async function saveDeck(presentation, file, options = {}) {
   const format = deckFileFormat(file);
   if (!format) throw invalid2(`save writes ${DECKS} files; ${file} is none of them.${exportFormatOf(file) || /\.zip$/i.test(file) ? ` Export with convert(deck, "${file}").` : ""}`, { path: file });
   if (options.validate !== false) {
-    const report = validate(presentation, checkOptions(options.catalogs ?? DEFAULT_CATALOGS));
+    const report = validate(presentation, checkOptions(options.catalogs ?? defaultCatalogs()));
     if (!report.valid) throw new OPFValidationError(report);
   }
   const bytes = new TextEncoder().encode(deckText(presentation, format, options.schemaComment === true));
@@ -988,4 +1018,4 @@ async function saveDeck(presentation, file, options = {}) {
   return { path: file, format };
 }
 
-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 };
+export { EXPORT_FORMATS, EXPORT_TEXT, PEER_RANGES, PPTX_PACKAGE, RENDER_EXTRAS, RENDER_PACKAGE, Reporter, VERSIONS, checkDate, checkDestinations, checkOptions, checkOutputPattern, checkRenamedOptions, checkScale, convertFiles, createZip, deckFileFormat, deckStem, embeddedFor, exportFormatOf, finishReport, importPresentation, leaseSharedFonts, listFontDirectories, loadPptx, loadRenderer, locatePackage, missingPeerFrom, openDeck, padNumber, planConversion, pointerOf, prepareExport, prepareFonts, reaches, readInput, reportThrown, resolveExportOptions, runExport, runImport, runPreparedExport, saveDeck, stemOf, writeFiles, writePlanned };

package/dist/{chunk-L5YACLWK.js → chunk-L6RRLN6Q.js}

@@ -1,5 +1,5 @@
-import { jsonEqual, formatPointer } from './chunk-WHHLGDCQ.js';
-import { annotationText } from './chunk-MBU42S5Y.js';
+import { jsonEqual, formatPointer } from './chunk-2XJUXMBS.js';
+import { annotationText } from './chunk-UAXSW6VV.js';
 
 // src/diff-match.ts
 var DEFAULT_MATCH_THRESHOLD = 0.5;

package/dist/{chunk-GVOLSWAJ.js → chunk-NZDWCYDI.js}

@@ -1,8 +1,8 @@
-import { fromMarkdown, toMarkdown } from './chunk-MSFE2HUK.js';
-import { fromYaml, toYaml } from './chunk-ECP7QPGK.js';
-import { NOT_CHECKED } from './chunk-R7KIASS4.js';
-import { parseSource, validate, OPFValidationError } from './chunk-KA3ZPFVT.js';
-import { checkCatalogsOption } from './chunk-SPFV27O5.js';
+import { fromMarkdown, toMarkdown } from './chunk-RFJ5TR3V.js';
+import { fromYaml, toYaml } from './chunk-4FBXVST6.js';
+import { NOT_CHECKED } from './chunk-P6LMWUXV.js';
+import { parseSource, validate, OPFValidationError } from './chunk-7QUAOKS6.js';
+import { checkCatalogsOption } from './chunk-UAXSW6VV.js';
 
 // src/deck-report.ts
 var DECK_FORMATS = ["json", "yaml", "markdown"];

package/dist/{chunk-R7KIASS4.js → chunk-P6LMWUXV.js}

@@ -1,4 +1,4 @@
-import { isRecord, same } from './chunk-TRELE6I6.js';
+import { isRecord, same } from './chunk-ZU5EQ23T.js';
 import { parseDocument, YAMLMap, Scalar, stringify } from 'yaml';
 
 // src/not-checked.ts

package/dist/{chunk-MSFE2HUK.js → chunk-RFJ5TR3V.js}

@@ -1,8 +1,8 @@
-import { Ctx, splitLines, lineRange, readYamlMapping, NOT_CHECKED, OPFMarkdownError, writeYaml, readCsv, DECIMAL, csvField, scalarText } from './chunk-R7KIASS4.js';
-import { parseQuoteLines, levelsFromIndents, parseCodeFence, splitWhen, fenceCode } from './chunk-PNINP5IF.js';
-import { same, isRecord, runText, isPlainRun, FORMATTING } from './chunk-TRELE6I6.js';
-import { validate } from './chunk-KA3ZPFVT.js';
-import { checkCatalogsOption } from './chunk-SPFV27O5.js';
+import { Ctx, splitLines, lineRange, readYamlMapping, NOT_CHECKED, OPFMarkdownError, writeYaml, readCsv, DECIMAL, csvField, scalarText } from './chunk-P6LMWUXV.js';
+import { parseQuoteLines, levelsFromIndents, parseCodeFence, splitWhen, fenceCode } from './chunk-UA5EROLC.js';
+import { same, isRecord, runText, isPlainRun, FORMATTING } from './chunk-ZU5EQ23T.js';
+import { validate } from './chunk-7QUAOKS6.js';
+import { checkCatalogsOption, PROMOTED_REGION_KEY } from './chunk-UAXSW6VV.js';
 
 // src/markdown/canon.ts
 var FORMAT_KEYS = FORMATTING;
@@ -1340,10 +1340,11 @@ var SlideParser = class {
     set("tag", options.tag);
     set("title", this.title);
     set("subtitle", this.subtitle);
-    const content = this.blocks.filter((block) => block.options?.region === void 0);
-    const regions = this.blocks.filter((block) => block.options?.region !== void 0);
+    const promoted = (block) => typeof block.options?.region === "string" && PROMOTED_REGION_KEY.test(block.options.region);
+    const content = this.blocks.filter((block) => !promoted(block));
+    const regions = this.blocks.filter(promoted);
     const [only2] = content;
-    if (content.length === 1 && only2?.key !== void 0 && only2.options?.id === void 0 && only2.options?.type === void 0 && isContentKey(only2.key) && Object.keys(only2.payload).length === 1) {
+    if (content.length === 1 && only2?.key !== void 0 && only2.options?.id === void 0 && only2.options?.type === void 0 && only2.options?.region === void 0 && isContentKey(only2.key) && Object.keys(only2.payload).length === 1) {
       slide[only2.key] = only2.payload[only2.key];
       ctx.ranges.set(`${path}/${only2.key}`, only2.range);
     } else if (content.length) {
@@ -1352,6 +1353,7 @@ var SlideParser = class {
         const out = {};
         if (block.options?.id !== void 0) out.id = block.options.id;
         if (block.options?.type !== void 0) out.type = block.options.type;
+        if (block.options?.region !== void 0) out.region = block.options.region;
         return Object.assign(out, block.payload);
       });
     }
@@ -1596,7 +1598,7 @@ function nativeLines(key, canon, marker) {
 }
 function blockOptionsLine(spec, as) {
   const parts = [];
-  for (const [key, value] of [["id", spec.id], ["type", spec.type], ["as", as], ["region", spec.region]]) {
+  for (const [key, value] of [["id", spec.id], ["type", spec.type], ["as", as], ["region", spec.region ?? spec.pin]]) {
     if (value === void 0) continue;
     const text = typeof value === "string" ? optionValue(value) : void 0;
     if (text === void 0) return void 0;
@@ -1615,7 +1617,7 @@ function nativeBlock(spec, marker) {
     const all = options ? [options, ...lines] : lines;
     const { slide, clean } = parseSlideText(all.join("\n"));
     if (!slide || !clean) continue;
-    const target = spec.region !== void 0 ? slide[spec.region] : spec.id !== void 0 || spec.type !== void 0 ? slide.blocks?.[0] : slide;
+    const target = spec.region !== void 0 ? slide[spec.region] : spec.id !== void 0 || spec.type !== void 0 || spec.pin !== void 0 ? slide.blocks?.[0] : slide;
     if (target && same(target[spec.key], canon)) return all;
   }
   return void 0;
@@ -1695,9 +1697,10 @@ function emitSlide(slide, index, mode) {
     slide.blocks.forEach((block, i) => {
       const where = `${path}/blocks/${i}`;
       if (!isRecord(block)) return;
-      const keys = Object.keys(block).filter((key) => key !== "id" && key !== "type");
+      const pin = typeof block.region === "string" ? block.region : void 0;
+      const keys = Object.keys(block).filter((key) => key !== "id" && key !== "type" && !(key === "region" && pin !== void 0));
       const only3 = keys.length === 1 && isContent(keys[0]) ? keys[0] : void 0;
-      specs.push({ spec: { key: only3 ?? "", value: only3 ? block[only3] : void 0, id: block.id, type: block.type }, where, payload: block });
+      specs.push({ spec: { key: only3 ?? "", value: only3 ? block[only3] : void 0, id: block.id, type: block.type, ...pin !== void 0 ? { pin } : {} }, where, payload: block });
     });
     for (const key of CONTENT2) if (slide[key] !== void 0) extras[key] = slide[key];
   } else {
@@ -1716,7 +1719,7 @@ function emitSlide(slide, index, mode) {
     const lines2 = spec.key ? nativeBlock(spec, marker) : void 0;
     if (lines2) {
       sections.push({ lines: lines2 });
-      const written = { ...spec.id !== void 0 ? { id: spec.id } : {}, ...spec.type !== void 0 ? { type: spec.type } : {}, [spec.key]: canonContent(spec.key, spec.value) };
+      const written = { ...spec.id !== void 0 ? { id: spec.id } : {}, ...spec.type !== void 0 ? { type: spec.type } : {}, ...spec.pin !== void 0 ? { region: spec.pin } : {}, [spec.key]: canonContent(spec.key, spec.value) };
       if (spec.region !== void 0) exp[spec.region] = written;
       else expBlocks.push(written);
       const list = spec.key === "items" || spec.key === "bullets";

package/dist/{chunk-PNINP5IF.js → chunk-UA5EROLC.js}

@@ -1,4 +1,4 @@
-import { runText } from './chunk-TRELE6I6.js';
+import { runText } from './chunk-ZU5EQ23T.js';
 
 // src/convert/text-lines.ts
 var LIST_PREFIX = /^([ \t]*)(?:([-*•+]|\d{1,3}[.)])[ \t]+)?/;