doculi 5.11.38 → 5.11.40

package/dist/cli.js

@@ -1195,7 +1195,7 @@ function registerSetMetadataCommand(program) {
 }
 //#endregion
 //#region package.json
-var version = "5.11.38";
+var version = "5.11.40";
 //#endregion
 //#region src/program.ts
 function createProgram() {
@@ -1223,7 +1223,7 @@ function createProgram() {
 //#region src/cli-main.ts
 async function launchTui(startPath, signal) {
 	try {
-		const { runTui } = await import("./tui-3Ib43SWz.js");
+		const { runTui } = await import("./tui-B2SvQVHR.js");
 		await runTui({
 			startPath,
 			signal

package/dist/index.cjs

@@ -1546,7 +1546,7 @@ function registerSetMetadataCommand(program) {
 }
 //#endregion
 //#region package.json
-var version = "5.11.38";
+var version = "5.11.40";
 //#endregion
 //#region src/program.ts
 function createProgram() {

package/dist/index.js

@@ -1545,7 +1545,7 @@ function registerSetMetadataCommand(program) {
 }
 //#endregion
 //#region package.json
-var version = "5.11.38";
+var version = "5.11.40";
 //#endregion
 //#region src/program.ts
 function createProgram() {

package/dist/{tui-3Ib43SWz.js → tui-B2SvQVHR.js}

@@ -3,6 +3,7 @@ import { readFile, writeFile } from "node:fs/promises";
 import { basename, dirname, extname, join } from "node:path";
 import { bytesToBase64, cellReference, columnIndexToLetters, convertDocument, createDoc, createDocx, createMarkdownEditor, createOdg, createOdp, createOds, createOdt, createPdf, createPpt, createPptx, createXls, csvToPdf, decodeMarkdownText, decodeOdbPackage, docToPdf, docxToPdf, encodeMarkdownText, epubToPdf, hsqldbCellDisplayText, markdownToPdf, odbReportToDocx, odbReportToOdt, odbReportToPdf, odgToPdf, odpToPdf, odsToPdf, odtToPdf, openDoc, openDocx, openMarkdown, openOdg, openOdp, openOds, openOdt, openPdf, openPpt, openPptx, openXls, parseXml, pptToPdf, pptxToPdf, readDocxContent, readDocxExtras, readMarkdownContent, readOdbForms, readOdbReportContent, readOdbReports, readOdbTables, readOdgContent, readOdpContent, readOdsContent, readOdtContent, readPdf, readPptxContent, rgbHexToColor, rtfToPdf, svgToPdf, xlsToPdf, xlsxToPdf } from "documents.js";
 import { readdirSync } from "node:fs";
+import { tableCellColumnSpan, tableGridColumnCount, walkTableGrid } from "document-schema.js";
 import { Box, Text, render, useApp, useInput, useWindowSize } from "ink";
 import { createContext, useContext, useEffect, useReducer, useState } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
@@ -678,6 +679,7 @@ function mergePptxTableCells(table, startRow, startColumn, rowSpan, colSpan) {
 			}
 			if (columnOffset > 0) cell.horizontalMerge = true;
 			if (rowOffset > 0) cell.verticalMerge = true;
+			cell.setParagraphs([{ runs: [] }]);
 		}
 	}
 }
@@ -5621,16 +5623,70 @@ function ShapeEditorScreen(props) {
 //#endregion
 //#region src/tui/screens/shared/slide-table.ts
 function resolveSlideTable(doc, slideIndex, tableIndex) {
+	return readSlideTables(doc, slideIndex)[tableIndex];
+}
+function readSlideTables(doc, slideIndex) {
 	const content = doc.format === "odp" ? readOdpContent(doc.editor.toPackage()) : readPptxContent(doc.editor.toPackage());
 	if (content.kind !== "presentation") throw new Error("readPptxContent/readOdpContent always resolve a presentation package to the presentation ContentDocument variant.");
 	const slide = content.slides[slideIndex];
-	if (slide === void 0) return;
-	return slide.shapes.flatMap((shape) => shape.blocks.filter((block) => block.kind === "table"))[tableIndex];
+	if (slide === void 0) return [];
+	return slide.shapes.flatMap((shape) => shape.blocks.filter((block) => block.kind === "table"));
 }
 function slideTableCellText(cell) {
 	return cell.blocks.filter((block) => block.kind === "paragraph").map((paragraph) => paragraph.runs.map((run) => run.text).join("")).join("\n");
 }
-function summarizeGridTable(table, index) {
+/**
+* The boxes to draw for each row of a slide table. A ContentTable row is dense (one entry per grid column, a merged region's covered positions being real, block-less entries), so drawing every entry would show a merged region as several separate empty cells. Instead a region's anchor is drawn once at its full width, and the positions it covers to its right in the same row are absorbed into that box. Positions a region covers in later rows are drawn as continuation boxes, adjacent positions of one region sharing one box, so the region reads as one block spanning the rows it occupies. Grid columns stay addressable by index: a cursor on any covered position lies within the box that contains it.
+*/
+function slideTableRowSegments(table) {
+	return walkTableGrid(table).map((positions, rowIndex) => {
+		const segments = [];
+		let continuedFrom;
+		for (const position of positions) {
+			if (position.anchorRowIndex === void 0) {
+				continuedFrom = void 0;
+				segments.push({
+					rowIndex,
+					columnIndex: position.columnIndex,
+					columnSpan: tableCellColumnSpan(position.cell),
+					cell: position.cell
+				});
+				continue;
+			}
+			if (position.anchorRowIndex === rowIndex) continue;
+			const previous = segments[segments.length - 1];
+			if (previous !== void 0 && continuedFrom?.row === position.anchorRowIndex && continuedFrom.column === position.anchorColumnIndex) {
+				segments[segments.length - 1] = {
+					...previous,
+					columnSpan: previous.columnSpan + 1
+				};
+				continue;
+			}
+			continuedFrom = {
+				row: position.anchorRowIndex,
+				column: position.anchorColumnIndex
+			};
+			segments.push({
+				rowIndex,
+				columnIndex: position.columnIndex,
+				columnSpan: 1,
+				cell: void 0
+			});
+		}
+		return segments;
+	});
+}
+/**
+* The text drawn inside a box that is `width` terminal columns wide, borders excluded. An anchor or unmerged cell shows its own text, truncated to fit; a continuation box shows an up arrow, since the region's text is displayed once, at its anchor.
+*/
+function segmentText(segment, width) {
+	return segment.cell === void 0 ? "↑" : truncatePreview(slideTableCellText(segment.cell), width);
+}
+/** Whether a grid position lies inside a box: on the box's own row and in one of the grid columns it occupies. A cursor on any position a merged region covers therefore selects the region's whole box. */
+function segmentContains(segment, position) {
+	return position?.row === segment.rowIndex && position.column >= segment.columnIndex && position.column < segment.columnIndex + segment.columnSpan;
+}
+function summarizePptxTable(table, index) {
 	const rows = table.rows();
 	return {
 		index,
@@ -5639,8 +5695,12 @@ function summarizeGridTable(table, index) {
 	};
 }
 function summarizeSlideTables(doc, slideIndex) {
-	if (doc.format === "odp") return (doc.editor.slides()[slideIndex]?.tables() ?? []).map((entry, index) => summarizeGridTable(entry.table, index));
-	return (doc.editor.slides()[slideIndex]?.tables() ?? []).map((table, index) => summarizeGridTable(table, index));
+	if (doc.format === "odp") return readSlideTables(doc, slideIndex).map((table, index) => ({
+		index,
+		rowCount: table.rows.length,
+		columnCount: tableGridColumnCount(table)
+	}));
+	return (doc.editor.slides()[slideIndex]?.tables() ?? []).map((table, index) => summarizePptxTable(table, index));
 }
 //#endregion
 //#region src/tui/screens/editors/pptx/slide-detail.tsx
@@ -6107,6 +6167,7 @@ function SlideDetailScreen(props) {
 //#endregion
 //#region src/tui/screens/editors/pptx/slide-table-detail.tsx
 const CELL_WIDTH$1 = 16;
+const BORDER_COLUMNS = 2;
 function SlideTableDetailScreen(props) {
 	const state = useAppState();
 	const dispatch = useAppDispatch();
@@ -6226,19 +6287,22 @@ function SlideTableDetailScreen(props) {
 			rows.length === 0 ? /* @__PURE__ */ jsx(Text, {
 				dimColor: true,
 				children: "This table has no rows."
-			}) : rows.map((row, rowIndex) => /* @__PURE__ */ jsx(Box, { children: row.cells.map((cell, columnIndex) => {
-				const isCursor = rowIndex === clampedRow && columnIndex === clampedColumn;
-				const isAnchor = rowIndex === mergeAnchor?.row && columnIndex === mergeAnchor.column;
+			}) : slideTableRowSegments(table).map((segments, rowIndex) => /* @__PURE__ */ jsx(Box, { children: segments.map((segment) => {
+				const isCursor = segmentContains(segment, {
+					row: clampedRow,
+					column: clampedColumn
+				});
+				const isAnchor = segmentContains(segment, mergeAnchor);
 				return /* @__PURE__ */ jsx(Box, {
-					width: CELL_WIDTH$1,
+					width: CELL_WIDTH$1 * segment.columnSpan,
 					borderStyle: "single",
 					borderColor: isCursor ? "cyan" : isAnchor ? "yellow" : "gray",
 					children: /* @__PURE__ */ jsx(Text, {
 						color: isCursor ? "cyan" : void 0,
 						inverse: isCursor,
-						children: truncatePreview(slideTableCellText(cell), 14)
+						children: segmentText(segment, CELL_WIDTH$1 * segment.columnSpan - BORDER_COLUMNS)
 					})
-				}, columnIndex);
+				}, segment.columnIndex);
 			}) }, rowIndex)),
 			/* @__PURE__ */ jsx(Text, {
 				dimColor: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doculi",
-  "version": "5.11.38",
+  "version": "5.11.40",
   "description": "CLI and interactive Ink TUI for documents.js: every docx/pptx/odt/odp/ods/odg/odf/pdf/odm/odb/xlsx/csv/svg/markdown/rtf conversion, bridge, and editor as a scriptable command or a terminal app.",
   "type": "module",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "MIT",
   "dependencies": {
     "commander": "15.0.0",
-    "document-outline.js": "3.9.18",
-    "document-schema.js": "7.11.5",
-    "documents.js": "7.20.36",
+    "document-outline.js": "3.9.20",
+    "document-schema.js": "7.12.0",
+    "documents.js": "8.0.1",
     "ink": "7.1.1",
     "ink-text-input": "6.0.0",
     "react": "19.2.8"
@@ -87,7 +87,7 @@
     "eslint": "10.8.1",
     "husky": "9.1.7",
     "ink-testing-library": "4.0.0",
-    "odf.js": "8.0.1",
+    "odf.js": "8.0.3",
     "publint": "0.3.22",
     "semantic-release": "25.0.9",
     "tsdown": "0.22.14",