@openpresentation/cli 0.2.0 → 0.3.0

package/README.md

@@ -13,7 +13,7 @@ npm install -g @openpresentation/cli
 opf --version
 ```
 
-Or install it as a development dependency and use `npx --no-install opf`. This checkout prepares CLI 0.2.0 with bundled OPF 0.5.0; that version supports rich table cells and headers during validation and pagination. Until 0.2.0 is published, the registry's latest release has the previous schema.
+Or install it as a development dependency and use `npx --no-install opf`. CLI 0.2.0 bundles OPF 0.5.0 and supports rich table cells and headers during validation and pagination.
 
 To verify the standalone package from source, run `pnpm install` and `pnpm test:cli:packed`. This creates `artifacts/cli/openpresentation-cli-0.2.0.tgz`, which can be installed using its absolute path. For source development, run `pnpm --filter @openpresentation/cli build` and `node packages/cli/dist/index.js --help`.
 

package/dist/index.js

@@ -8163,7 +8163,7 @@ function createDataContent(input, options) {
   return { chart: { type: options.chartType ?? "column", data: { columns: names, rows: rows2 } } };
 }
 
-// ../javascript/dist/chunk-WG5A4KZG.js
+// ../javascript/dist/chunk-C7GKRLI6.js
 var MAX_COMPOSITION_DEPTH = 32;
 function resolveFontFamilies(input) {
   const scheme = record(input);
@@ -8325,6 +8325,16 @@ function richTextLayouter(input, box, requestedSize, options) {
       y += height;
       return line;
     });
+    if (options.uniformLineHeight) {
+      const height = Math.max(...richLines.map((line) => line.height));
+      y = 0;
+      for (const line of richLines) {
+        line.baseline += y - line.y;
+        line.y = y;
+        line.height = height;
+        y += height;
+      }
+    }
     return { lines: ranges.map((range) => whole.slice(range.start, range.end)), fontSize, lineHeight: Math.max(fontSize * 1.22, ...richLines.map((line) => line.height)), richLines, height: y, overflow: y > box.height + 0.01 || richLines.some((line) => line.width > box.width + 0.01) };
   };
   return layout2;
@@ -8399,17 +8409,48 @@ ${flatten(entry.description)}` : ""}`;
   if (field === "quote") return flatten(record(value).text ?? value);
   return void 0;
 }
-function tableOverflows(value, box, scale, settings, options) {
-  const table = record(value), rows2 = Array.isArray(table.rows) ? table.rows : [];
-  const allRows = Array.isArray(table.columns) && table.columns.length ? [table.columns, ...rows2] : rows2;
-  const columns2 = Math.max(1, ...allRows.map((row) => row.length));
-  const width = box.width / columns2 - 20 * scale;
-  const height = Math.min(54 * scale, box.height / Math.max(1, allRows.length)) - 12 * scale;
-  return width <= 0 || height <= 0 || allRows.some((row, index2) => row.some((value2) => {
-    const style = { fontFamily: options.fonts?.body ?? "sans-serif", fontWeight: index2 === 0 && table.columns?.length ? 700 : 400 };
-    const cell2 = { width, height }, minimum = (settings.minFontSize ?? 16) * scale;
-    return (Array.isArray(value2) ? fitRichText(value2, cell2, 15 * scale, minimum, { style, textMeasurement: options.textMeasurement }) : fitText(flatten(value2), cell2, 15 * scale, minimum, textWidthMeasurer(resolveTextStyle(style, options.textMeasurement), options.textMeasurement))).overflow;
-  }));
+function layoutTable(value, box, options = {}) {
+  const scale = options.scale ?? 1, requested = 15 * scale, minimum = (options.minFontSize ?? 16) * scale;
+  if (![box.x, box.y, box.width, box.height, scale, minimum].every(Number.isFinite) || box.width <= 0 || box.height <= 0 || scale <= 0 || minimum <= 0) throw new RangeError("Table dimensions, scale and font sizes must be finite and positive.");
+  const table = record(value), headers = Array.isArray(table.columns) && table.columns.length > 0;
+  const values = [...headers ? [table.columns] : [], ...Array.isArray(table.rows) ? table.rows : []];
+  const columnCount = Math.max(1, ...values.map((row) => row.length)), cellWidth = box.width / columnCount;
+  const width = Math.max(scale, cellWidth - 20 * scale), padding = 12 * scale;
+  const fitCell = (cell2, height, min) => {
+    const textBox = { width, height: Math.max(scale, height) };
+    return Array.isArray(cell2.value) ? fitRichText(cell2.value, textBox, requested, min, { style: cell2.style, textMeasurement: options.textMeasurement, uniformLineHeight: true }) : fitText(flatten(cell2.value), textBox, requested, min, textWidthMeasurer(resolveTextStyle(cell2.style, options.textMeasurement), options.textMeasurement));
+  };
+  const textHeight = (fit) => "height" in fit ? fit.height : fit.lines.length * fit.lineHeight;
+  const measured = values.map((row, index2) => {
+    const header = headers && index2 === 0;
+    const cells = Array.from({ length: columnCount }, (_, column) => {
+      const path2 = `${options.path ?? "table"}.${header ? "columns" : `rows.${index2 - Number(headers)}`}.${column}`;
+      return { value: row[column], path: path2, header, style: { fontFamily: options.fontFamily ?? "sans-serif", fontWeight: header ? 700 : 400, italic: false, path: path2 } };
+    });
+    const natural2 = Math.max(...cells.map((cell2) => textHeight(fitCell(cell2, scale, requested)) + padding));
+    const preferred2 = Math.max(54 * scale, natural2);
+    const needed2 = Math.min(preferred2, Math.max(...cells.map((cell2) => textHeight(fitCell(cell2, scale, minimum)) + padding)));
+    return { cells, preferred: preferred2, natural: natural2, needed: needed2 };
+  });
+  const preferred = measured.reduce((sum, row) => sum + row.preferred, 0), natural = measured.reduce((sum, row) => sum + row.natural, 0), needed = measured.reduce((sum, row) => sum + row.needed, 0);
+  let y = box.y, overflow = cellWidth <= 20 * scale;
+  const rows2 = measured.map((row) => {
+    const height = preferred <= box.height ? row.preferred : natural <= box.height ? row.natural + (row.preferred - row.natural) * (box.height - natural) / Math.max(Number.EPSILON, preferred - natural) : needed <= box.height ? row.needed + (row.natural - row.needed) * (box.height - needed) / Math.max(Number.EPSILON, natural - needed) : row.needed * box.height / needed;
+    const rowBox = { x: box.x, y, width: box.width, height };
+    const cells = row.cells.map((cell2, column) => {
+      const cellBox = { x: box.x + column * cellWidth, y, width: cellWidth, height };
+      const textBox = { x: cellBox.x + 10 * scale, y: y + 8 * scale, width, height: Math.max(scale, height - padding) };
+      const fit = fitCell(cell2, textBox.height, minimum);
+      overflow ||= height <= padding || fit.overflow;
+      return { value: cell2.value, path: cell2.path, header: cell2.header, rich: Array.isArray(cell2.value), box: cellBox, textBox, textStyle: resolveTextStyle(cell2.style, options.textMeasurement), fit };
+    });
+    y += height;
+    return { box: rowBox, cells };
+  });
+  return { rows: rows2, columnCount, height: y - box.y, overflow };
+}
+function tableOverflows(value, box, scale, settings, options, path2) {
+  return box.width <= 0 || box.height <= 0 || layoutTable(value, box, { scale, minFontSize: settings.minFontSize, fontFamily: options.fonts?.body, textMeasurement: options.textMeasurement, path: path2 }).overflow;
 }
 function flatten(value) {
   if (value == null) return "";
@@ -8538,7 +8579,7 @@ function composeSlide(input, options = {}) {
       const fit = fitContent(node.field, node.value, text, box, 25 * scale, (settings.minFontSize ?? 16) * scale, node.path);
       score += (25 * scale - fit.fontSize) / scale + (fit.overflow ? 1e3 : 0);
     }
-    if (node.field === "table" && tableOverflows(node.value, box, scale, settings, options)) score += 1e3;
+    if (node.field === "table" && tableOverflows(node.value, box, scale, settings, options, node.path)) score += 1e3;
     if (box.width < 100 * scale || box.height < 60 * scale) score += 100;
     return score;
   };
@@ -8593,7 +8634,7 @@ function composeSlide(input, options = {}) {
   arrange(pending, contentBox, rootSettings, composition.mode ? 0 : placeholders.length);
   for (const item of items) {
     for (const key of ["x", "y", "width", "height"]) item.box[key] = round(item.box[key]);
-    if (item.field === "table" && tableOverflows(item.value, item.box, scale, item.composition, options)) diagnostics.push({ code: "text-overflow", path: item.path, message: "Table cells do not fit; use fewer rows, fewer columns, or split the table across slides." });
+    if (item.field === "table" && tableOverflows(item.value, item.box, scale, item.composition, options, item.path)) diagnostics.push({ code: "text-overflow", path: item.path, message: "Table cells do not fit; use fewer rows, fewer columns, or split the table across slides." });
     if (item.text?.overflow) diagnostics.push({ code: "text-overflow", path: item.path, message: "Text exceeds its cell at the minimum font size; shorten it, increase its space, or split the slide." });
   }
   for (const group of groups) for (const box of [group.box, group.contentBox]) for (const key of ["x", "y", "width", "height"]) box[key] = round(box[key]);
@@ -33698,7 +33739,7 @@ var catalogEntries = [
   ], records: fontSchemes, index: catalogIndexes.fontSchemes }
 ];
 
-// ../javascript/dist/chunk-PFJE2IW4.js
+// ../javascript/dist/chunk-23MXJL2K.js
 var import__ = __toESM(require__(), 1);
 var import_ajv_formats = __toESM(require_dist(), 1);
 var catalogIds = {
@@ -34692,7 +34733,7 @@ function assertValidPresentation(value) {
   assertValid(value, "presentation");
 }
 
-// ../javascript/dist/chunk-YLORKB63.js
+// ../javascript/dist/chunk-C6U7LLBT.js
 var OPFPaginationError = class extends Error {
   constructor(message, diagnostics = []) {
     super(message);
@@ -35132,7 +35173,7 @@ async function main(argv) {
     return;
   }
   if (argv.length === 1 && argv[0] === "--version") {
-    print({ cli: "0.2.0", opf: "0.5.0" });
+    print({ cli: "0.3.0", opf: "0.6.0" });
     return;
   }
   const [command, ...args] = argv;