@harbour-enterprises/superdoc 1.17.0-next.1 → 1.17.0-next.10

package/dist/chunks/{SuperConverter-BNtgL-OA.cjs → SuperConverter-BQs6tZ2x.cjs}

@@ -6529,7 +6529,7 @@ const translator$71 = NodeTranslator.from({
 		return Object.keys(decodedAttrs).length > 0 ? { attributes: decodedAttrs } : void 0;
 	}
 });
-const translator$76 = NodeTranslator.from(createSingleAttrPropertyHandler("w:jc", "justification"));
+const translator$76 = NodeTranslator.from(createSingleAttrPropertyHandler("w:jc", "justification", "w:val", (v$1) => v$1 === "both" ? "justify" : v$1, (v$1) => v$1 === "justify" ? "both" : v$1));
 const translator$77 = NodeTranslator.from(createSingleBooleanPropertyHandler("w:keepLines"));
 const translator$78 = NodeTranslator.from(createSingleBooleanPropertyHandler("w:keepNext"));
 const translator$80 = NodeTranslator.from(createSingleBooleanPropertyHandler("w:kinsoku"));
@@ -16167,6 +16167,15 @@ const preProcessPageFieldsOnly = (nodes = [], depth = 0) => {
 				i++;
 				continue;
 			}
+			const childElements = node.elements || [];
+			if (childElements.length > 0) {
+				for (const child of childElements) {
+					if (Array.isArray(child.elements)) child.elements = preProcessPageFieldsOnly(child.elements, depth + 1).processedNodes;
+					processedNodes.push(child);
+				}
+				i++;
+				continue;
+			}
 		}
 		if (fldType === "begin") {
 			const fieldInfo = scanFieldSequence(nodes, i);
@@ -16187,6 +16196,12 @@ const preProcessPageFieldsOnly = (nodes = [], depth = 0) => {
 				continue;
 			}
 		}
+		if (node.name === "w:r" && node.elements?.some((el) => el.name === "w:pgNum")) {
+			const processedField = preProcessPageInstruction([], "", node.elements.find((el) => el.name === "w:rPr") || null);
+			processedNodes.push(...processedField);
+			i++;
+			continue;
+		}
 		if (Array.isArray(node.elements)) node.elements = preProcessPageFieldsOnly(node.elements, depth + 1).processedNodes;
 		processedNodes.push(node);
 		i++;
@@ -27608,85 +27623,6 @@ const config$16 = {
 	attributes: validXmlAttributes$3
 };
 const translator$7 = NodeTranslator.from(config$16);
-var getColspan = (cell) => {
-	const rawColspan = cell?.attrs?.colspan;
-	const numericColspan = typeof rawColspan === "string" ? parseInt(rawColspan, 10) : rawColspan;
-	return Number.isFinite(numericColspan) && numericColspan > 0 ? numericColspan : 1;
-};
-var resolveGridBefore = (row) => {
-	const rawGridBefore = row?.attrs?.tableRowProperties?.gridBefore ?? row?.attrs?.gridBefore;
-	const numericGridBefore = typeof rawGridBefore === "string" ? parseInt(rawGridBefore, 10) : rawGridBefore;
-	if (!Number.isFinite(numericGridBefore) || numericGridBefore <= 0) return 0;
-	const cells = Array.isArray(row.content) ? row.content : [];
-	let leadingGridBefore = 0;
-	while (leadingGridBefore < cells.length && cells[leadingGridBefore]?.attrs?.__placeholder === "gridBefore") leadingGridBefore += 1;
-	return leadingGridBefore > 0 ? 0 : numericGridBefore;
-};
-var advanceColumnsForCell = (columnIndex, cell) => columnIndex + getColspan(cell);
-var getCellStartColumn = (row, targetCell) => {
-	const cells = Array.isArray(row.content) ? row.content : [];
-	let columnIndex = resolveGridBefore(row);
-	for (const cell of cells) {
-		if (cell === targetCell) return columnIndex;
-		columnIndex = advanceColumnsForCell(columnIndex, cell);
-	}
-	return columnIndex;
-};
-var findCellCoveringColumn = (row, targetColumn) => {
-	const cells = Array.isArray(row.content) ? row.content : [];
-	let columnIndex = resolveGridBefore(row);
-	for (const cell of cells) {
-		const colspan = getColspan(cell);
-		if (targetColumn >= columnIndex && targetColumn < columnIndex + colspan) return cell;
-		columnIndex = advanceColumnsForCell(columnIndex, cell);
-	}
-	return null;
-};
-var findInsertionIndexForColumn = (row, targetColumn) => {
-	const cells = Array.isArray(row.content) ? row.content : [];
-	let columnIndex = resolveGridBefore(row);
-	for (let index = 0; index < cells.length; index++) {
-		if (columnIndex >= targetColumn) return index;
-		columnIndex = advanceColumnsForCell(columnIndex, cells[index]);
-	}
-	return cells.length;
-};
-function preProcessVerticalMergeCells(table, { editorSchema }) {
-	if (!table || !Array.isArray(table.content)) return table;
-	const rows = table.content;
-	for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
-		const row = rows[rowIndex];
-		if (!row) continue;
-		if (!Array.isArray(row.content)) row.content = [];
-		for (let cellIndex = 0; cellIndex < row.content.length; cellIndex++) {
-			const cell = row.content[cellIndex];
-			if (!cell) continue;
-			const attrs = cell.attrs || {};
-			const rawRowspan = typeof attrs.rowspan === "string" ? parseInt(attrs.rowspan, 10) : attrs.rowspan;
-			if (!Number.isFinite(rawRowspan) || rawRowspan <= 1) continue;
-			const maxRowspan = Math.min(rawRowspan, rows.length - rowIndex);
-			const startColumn = getCellStartColumn(row, cell);
-			for (let offset = 1; offset < maxRowspan; offset++) {
-				const rowToChange = rows[rowIndex + offset];
-				if (!rowToChange) continue;
-				if (!Array.isArray(rowToChange.content)) rowToChange.content = [];
-				if (findCellCoveringColumn(rowToChange, startColumn)?.attrs?.continueMerge) continue;
-				const mergedCell = {
-					type: cell.type,
-					content: [editorSchema.nodes.paragraph.createAndFill().toJSON()],
-					attrs: {
-						...cell.attrs,
-						rowspan: null,
-						continueMerge: true
-					}
-				};
-				const insertionIndex = findInsertionIndexForColumn(rowToChange, startColumn);
-				rowToChange.content.splice(insertionIndex, 0, mergedCell);
-			}
-		}
-	}
-	return table;
-}
 const translator$39 = NodeTranslator.from({
 	xmlName: "w:bidiVisual",
 	sdNodeOrKeyName: "rightToLeft",
@@ -27800,7 +27736,94 @@ var propertyTranslators$3 = [
 	translator$145
 ];
 const translator$154 = NodeTranslator.from(createNestedPropertiesTranslator("w:tblPr", "tableProperties", propertyTranslators$3));
-const translator$60 = NodeTranslator.from(createSingleAttrPropertyHandler("w:gridCol", "col", "w:w", parseInteger, integerToString));
+var propertyTranslators$2 = [
+	translator$117,
+	translator$120,
+	translator$154,
+	translator$162,
+	translator$180
+];
+var attributeHandlers$1 = [createAttributeHandler("w:type")];
+const translator$191 = NodeTranslator.from(createNestedPropertiesTranslator("w:tblStylePr", "tableStyleProperties", propertyTranslators$2, {}, attributeHandlers$1));
+var getColspan = (cell) => {
+	const rawColspan = cell?.attrs?.colspan;
+	const numericColspan = typeof rawColspan === "string" ? parseInt(rawColspan, 10) : rawColspan;
+	return Number.isFinite(numericColspan) && numericColspan > 0 ? numericColspan : 1;
+};
+var resolveGridBefore = (row) => {
+	const rawGridBefore = row?.attrs?.tableRowProperties?.gridBefore ?? row?.attrs?.gridBefore;
+	const numericGridBefore = typeof rawGridBefore === "string" ? parseInt(rawGridBefore, 10) : rawGridBefore;
+	if (!Number.isFinite(numericGridBefore) || numericGridBefore <= 0) return 0;
+	const cells = Array.isArray(row.content) ? row.content : [];
+	let leadingGridBefore = 0;
+	while (leadingGridBefore < cells.length && cells[leadingGridBefore]?.attrs?.__placeholder === "gridBefore") leadingGridBefore += 1;
+	return leadingGridBefore > 0 ? 0 : numericGridBefore;
+};
+var advanceColumnsForCell = (columnIndex, cell) => columnIndex + getColspan(cell);
+var getCellStartColumn = (row, targetCell) => {
+	const cells = Array.isArray(row.content) ? row.content : [];
+	let columnIndex = resolveGridBefore(row);
+	for (const cell of cells) {
+		if (cell === targetCell) return columnIndex;
+		columnIndex = advanceColumnsForCell(columnIndex, cell);
+	}
+	return columnIndex;
+};
+var findCellCoveringColumn = (row, targetColumn) => {
+	const cells = Array.isArray(row.content) ? row.content : [];
+	let columnIndex = resolveGridBefore(row);
+	for (const cell of cells) {
+		const colspan = getColspan(cell);
+		if (targetColumn >= columnIndex && targetColumn < columnIndex + colspan) return cell;
+		columnIndex = advanceColumnsForCell(columnIndex, cell);
+	}
+	return null;
+};
+var findInsertionIndexForColumn = (row, targetColumn) => {
+	const cells = Array.isArray(row.content) ? row.content : [];
+	let columnIndex = resolveGridBefore(row);
+	for (let index = 0; index < cells.length; index++) {
+		if (columnIndex >= targetColumn) return index;
+		columnIndex = advanceColumnsForCell(columnIndex, cells[index]);
+	}
+	return cells.length;
+};
+function preProcessVerticalMergeCells(table, { editorSchema }) {
+	if (!table || !Array.isArray(table.content)) return table;
+	const rows = table.content;
+	for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
+		const row = rows[rowIndex];
+		if (!row) continue;
+		if (!Array.isArray(row.content)) row.content = [];
+		for (let cellIndex = 0; cellIndex < row.content.length; cellIndex++) {
+			const cell = row.content[cellIndex];
+			if (!cell) continue;
+			const attrs = cell.attrs || {};
+			const rawRowspan = typeof attrs.rowspan === "string" ? parseInt(attrs.rowspan, 10) : attrs.rowspan;
+			if (!Number.isFinite(rawRowspan) || rawRowspan <= 1) continue;
+			const maxRowspan = Math.min(rawRowspan, rows.length - rowIndex);
+			const startColumn = getCellStartColumn(row, cell);
+			for (let offset = 1; offset < maxRowspan; offset++) {
+				const rowToChange = rows[rowIndex + offset];
+				if (!rowToChange) continue;
+				if (!Array.isArray(rowToChange.content)) rowToChange.content = [];
+				if (findCellCoveringColumn(rowToChange, startColumn)?.attrs?.continueMerge) continue;
+				const mergedCell = {
+					type: cell.type,
+					content: [editorSchema.nodes.paragraph.createAndFill().toJSON()],
+					attrs: {
+						...cell.attrs,
+						rowspan: null,
+						continueMerge: true
+					}
+				};
+				const insertionIndex = findInsertionIndexForColumn(rowToChange, startColumn);
+				rowToChange.content.splice(insertionIndex, 0, mergedCell);
+			}
+		}
+	}
+	return table;
+}
 const DEFAULT_COLUMN_WIDTH_PX = 100;
 const normalizeTwipWidth = (value) => {
 	if (value == null) return null;
@@ -27837,6 +27860,58 @@ const resolveFallbackColumnWidthTwips = (params, totalColumns, cellMinWidthTwips
 	if (!Number.isFinite(fallbackWidthTwips) || Number.isNaN(fallbackWidthTwips) || fallbackWidthTwips <= 0) return Math.max(require_constants.pixelsToTwips(safeDefaultPx), cellMinWidthTwips);
 	return Math.max(fallbackWidthTwips, cellMinWidthTwips);
 };
+const DEFAULT_PAGE_WIDTH_TWIPS = 12240;
+const DEFAULT_PAGE_MARGIN_TWIPS = 1440;
+const DEFAULT_CONTENT_WIDTH_TWIPS = DEFAULT_PAGE_WIDTH_TWIPS - 2 * DEFAULT_PAGE_MARGIN_TWIPS;
+const MIN_COLUMN_WIDTH_TWIPS = require_constants.pixelsToTwips(10);
+const pctToPercent = (value) => {
+	if (value == null) return null;
+	return value / 50;
+};
+const resolveContentWidthTwips = () => DEFAULT_CONTENT_WIDTH_TWIPS;
+const resolveMeasurementWidthPx = (measurement) => {
+	if (!measurement || typeof measurement.value !== "number" || measurement.value <= 0) return null;
+	const { value, type } = measurement;
+	if (!type || type === "auto") return null;
+	if (type === "dxa") return require_constants.twipsToPixels(value);
+	if (type === "pct") {
+		const percent = pctToPercent(value);
+		if (percent == null || percent <= 0) return null;
+		return require_constants.twipsToPixels(resolveContentWidthTwips() * percent / 100);
+	}
+	return null;
+};
+const countColumnsInRow = (row) => {
+	if (!row?.elements?.length) return 0;
+	return row.elements.reduce((count, element) => {
+		if (element.name !== "w:tc") return count;
+		const gridSpan = (element.elements?.find((el) => el.name === "w:tcPr"))?.elements?.find((el) => el.name === "w:gridSpan");
+		const spanValue = parseInt(gridSpan?.attributes?.["w:val"] || "1", 10);
+		return count + (Number.isFinite(spanValue) && spanValue > 0 ? spanValue : 1);
+	}, 0);
+};
+var clampColumnWidthTwips = (value) => Math.max(Math.round(value), MIN_COLUMN_WIDTH_TWIPS);
+var createFallbackGrid = (columnCount, columnWidthTwips) => Array.from({ length: columnCount }, () => ({ col: clampColumnWidthTwips(columnWidthTwips) }));
+const buildFallbackGridForTable = ({ params, rows, tableWidth, tableWidthMeasurement }) => {
+	const columnCount = countColumnsInRow(rows.find((row) => row.elements?.some((el) => el.name === "w:tc")));
+	if (!columnCount) return null;
+	const schemaDefaultPx = getSchemaDefaultColumnWidthPx(params);
+	const minimumColumnWidthPx = Number.isFinite(schemaDefaultPx) && schemaDefaultPx > 0 ? schemaDefaultPx : 100;
+	let totalWidthPx;
+	if (tableWidthMeasurement) {
+		const resolved = resolveMeasurementWidthPx(tableWidthMeasurement);
+		if (resolved != null) totalWidthPx = resolved;
+	}
+	if (totalWidthPx == null && tableWidth?.width && tableWidth.width > 0) totalWidthPx = tableWidth.width;
+	if (totalWidthPx == null) totalWidthPx = require_constants.twipsToPixels(DEFAULT_CONTENT_WIDTH_TWIPS);
+	const columnWidthTwips = clampColumnWidthTwips(require_constants.pixelsToTwips(Math.max(totalWidthPx / columnCount, minimumColumnWidthPx)));
+	const fallbackColumnWidthPx = require_constants.twipsToPixels(columnWidthTwips);
+	return {
+		grid: createFallbackGrid(columnCount, columnWidthTwips),
+		columnWidths: Array(columnCount).fill(fallbackColumnWidthPx)
+	};
+};
+const translator$60 = NodeTranslator.from(createSingleAttrPropertyHandler("w:gridCol", "col", "w:w", parseInteger, integerToString));
 var XML_NODE_NAME$16 = "w:tblGrid";
 var SD_ATTR_KEY$1 = "grid";
 var cellMinWidth = require_constants.pixelsToTwips(10);
@@ -27915,66 +27990,6 @@ var config$15 = {
 	decode: decode$33
 };
 const translator$148 = NodeTranslator.from(config$15);
-var propertyTranslators$2 = [
-	translator$117,
-	translator$120,
-	translator$154,
-	translator$162,
-	translator$180
-];
-var attributeHandlers$1 = [createAttributeHandler("w:type")];
-const translator$191 = NodeTranslator.from(createNestedPropertiesTranslator("w:tblStylePr", "tableStyleProperties", propertyTranslators$2, {}, attributeHandlers$1));
-const DEFAULT_PAGE_WIDTH_TWIPS = 12240;
-const DEFAULT_PAGE_MARGIN_TWIPS = 1440;
-const DEFAULT_CONTENT_WIDTH_TWIPS = DEFAULT_PAGE_WIDTH_TWIPS - 2 * DEFAULT_PAGE_MARGIN_TWIPS;
-const MIN_COLUMN_WIDTH_TWIPS = require_constants.pixelsToTwips(10);
-const pctToPercent = (value) => {
-	if (value == null) return null;
-	return value / 50;
-};
-const resolveContentWidthTwips = () => DEFAULT_CONTENT_WIDTH_TWIPS;
-const resolveMeasurementWidthPx = (measurement) => {
-	if (!measurement || typeof measurement.value !== "number" || measurement.value <= 0) return null;
-	const { value, type } = measurement;
-	if (!type || type === "auto") return null;
-	if (type === "dxa") return require_constants.twipsToPixels(value);
-	if (type === "pct") {
-		const percent = pctToPercent(value);
-		if (percent == null || percent <= 0) return null;
-		return require_constants.twipsToPixels(resolveContentWidthTwips() * percent / 100);
-	}
-	return null;
-};
-const countColumnsInRow = (row) => {
-	if (!row?.elements?.length) return 0;
-	return row.elements.reduce((count, element) => {
-		if (element.name !== "w:tc") return count;
-		const gridSpan = (element.elements?.find((el) => el.name === "w:tcPr"))?.elements?.find((el) => el.name === "w:gridSpan");
-		const spanValue = parseInt(gridSpan?.attributes?.["w:val"] || "1", 10);
-		return count + (Number.isFinite(spanValue) && spanValue > 0 ? spanValue : 1);
-	}, 0);
-};
-var clampColumnWidthTwips = (value) => Math.max(Math.round(value), MIN_COLUMN_WIDTH_TWIPS);
-var createFallbackGrid = (columnCount, columnWidthTwips) => Array.from({ length: columnCount }, () => ({ col: clampColumnWidthTwips(columnWidthTwips) }));
-const buildFallbackGridForTable = ({ params, rows, tableWidth, tableWidthMeasurement }) => {
-	const columnCount = countColumnsInRow(rows.find((row) => row.elements?.some((el) => el.name === "w:tc")));
-	if (!columnCount) return null;
-	const schemaDefaultPx = getSchemaDefaultColumnWidthPx(params);
-	const minimumColumnWidthPx = Number.isFinite(schemaDefaultPx) && schemaDefaultPx > 0 ? schemaDefaultPx : 100;
-	let totalWidthPx;
-	if (tableWidthMeasurement) {
-		const resolved = resolveMeasurementWidthPx(tableWidthMeasurement);
-		if (resolved != null) totalWidthPx = resolved;
-	}
-	if (totalWidthPx == null && tableWidth?.width && tableWidth.width > 0) totalWidthPx = tableWidth.width;
-	if (totalWidthPx == null) totalWidthPx = minimumColumnWidthPx * columnCount;
-	const columnWidthTwips = clampColumnWidthTwips(require_constants.pixelsToTwips(Math.max(totalWidthPx / columnCount, minimumColumnWidthPx)));
-	const fallbackColumnWidthPx = require_constants.twipsToPixels(columnWidthTwips);
-	return {
-		grid: createFallbackGrid(columnCount, columnWidthTwips),
-		columnWidths: Array(columnCount).fill(fallbackColumnWidthPx)
-	};
-};
 var XML_NODE_NAME$15 = "w:tbl";
 var SD_NODE_NAME$14 = "table";
 var INDENT_TWIPS_TOLERANCE = 5;
@@ -28072,7 +28087,7 @@ var encode$30 = (params, encodedAttrs) => {
 	const rowTcWTwipsTotal = hasExplicitGrid && hasIndent ? getFirstRowCellWidthSumTwips(rows) : null;
 	const indentDiff = rowTcWTwipsTotal != null && gridTwipsTotal != null ? rowTcWTwipsTotal - gridTwipsTotal : null;
 	const preferTableGridWidths = hasExplicitGrid && hasIndent && gridTwipsTotal != null && rowTcWTwipsTotal != null && Math.sign(indentDiff) === Math.sign(tableIndentTwips) && Math.abs(indentDiff - tableIndentTwips) <= INDENT_TWIPS_TOLERANCE;
-	if (!columnWidths.length) {
+	if (!(columnWidths.length > 0 && columnWidths.some((w$1) => w$1 > 0))) {
 		const fallback = buildFallbackGridForTable({
 			params,
 			rows,
@@ -28083,6 +28098,11 @@ var encode$30 = (params, encodedAttrs) => {
 			encodedAttrs.grid = fallback.grid;
 			columnWidths = fallback.columnWidths;
 		}
+		const tw = encodedAttrs.tableWidth;
+		if (!(tw && tw.type !== "auto" && (tw.width > 0 || tw.value > 0))) encodedAttrs.tableWidth = {
+			value: 5e3,
+			type: "pct"
+		};
 	}
 	const content = [];
 	const totalColumns = columnWidths.length;
@@ -33833,7 +33853,7 @@ var SuperConverter = class SuperConverter {
 	static getStoredSuperdocVersion(docx) {
 		return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
 	}
-	static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.17.0-next.1") {
+	static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.17.0-next.10") {
 		return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
 	}
 	static generateWordTimestamp() {