ooxml.js 2.9.0 → 2.9.2

package/dist/typed/xlsx/build.cjs

@@ -3,7 +3,6 @@ const require_xml_fragment = require("../../xml/fragment.cjs");
 const require_xml_entities = require("../../xml/entities.cjs");
 require("../shared/units.cjs");
 const require_typed_xlsx_shared_strings = require("./shared-strings.cjs");
-const require_typed_xlsx_a1 = require("./a1.cjs");
 const require_typed_xlsx_defined_names = require("./defined-names.cjs");
 const require_typed_xlsx_number_format = require("./number-format.cjs");
 const require_typed_xlsx_util = require("./util.cjs");
@@ -11,6 +10,7 @@ const require_typed_xlsx_print_settings = require("./print-settings.cjs");
 const require_typed_xlsx_serial = require("./serial.cjs");
 const require_typed_xlsx_styles = require("./styles.cjs");
 const require_typed_xlsx_units = require("./units.cjs");
+let document_schema_js = require("document-schema.js");
 //#region src/typed/xlsx/build.ts
 const SML_NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
 const REL_NS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
@@ -289,7 +289,7 @@ function computeDimension(sheet) {
 		hasAny = true;
 		maxRow = Math.max(maxRow, row.index);
 	}
-	return hasAny ? require_typed_xlsx_a1.rangeReference({
+	return hasAny ? (0, document_schema_js.rangeReference)({
 		startRow: 0,
 		startColumn: 0,
 		endRow: maxRow,
@@ -371,7 +371,7 @@ function buildCellElement(cell, sharedStrings, cellFormats) {
 		id: 0
 	}, decoration);
 	const attrs = {
-		r: require_typed_xlsx_a1.cellReference(cell.row, cell.column),
+		r: (0, document_schema_js.cellReference)(cell.row, cell.column),
 		s: String(styleIndex)
 	};
 	if (cell.formula !== void 0) children.push(require_xml_fragment.el("f", {}, [require_xml_fragment.txt(require_xml_entities.encodeXmlText(cell.formula))]));
@@ -411,7 +411,7 @@ function buildMergeCellsElement(cells) {
 	const mergeCellElements = merges.map((cell) => {
 		const endRow = cell.row + (cell.rowSpan ?? 1) - 1;
 		const endColumn = cell.column + (cell.colSpan ?? 1) - 1;
-		return require_xml_fragment.el("mergeCell", { ref: require_typed_xlsx_a1.rangeReference({
+		return require_xml_fragment.el("mergeCell", { ref: (0, document_schema_js.rangeReference)({
 			startRow: cell.row,
 			startColumn: cell.column,
 			endRow,

package/dist/typed/xlsx/build.js

@@ -2,7 +2,6 @@ import { el, txt } from "../../xml/fragment.js";
 import { encodeXmlText } from "../../xml/entities.js";
 import "../shared/units.js";
 import { SharedStringTable } from "./shared-strings.js";
-import { cellReference, rangeReference } from "./a1.js";
 import { XLNM_PRINT_AREA, XLNM_PRINT_TITLES, buildPrintAreaValue, buildPrintTitlesValue } from "./defined-names.js";
 import { BOOLEAN_NUMBER_FORMAT, DATE_NUMBER_FORMAT, DATE_TIME_NUMBER_FORMAT, PERCENTAGE_NUMBER_FORMAT, TIME_NUMBER_FORMAT, currencyNumberFormat } from "./number-format.js";
 import { pageSizeToPaperSizeCode, ptToUniversalMeasure, writeXmlBool } from "./util.js";
@@ -10,6 +9,7 @@ import { DEFAULT_HEADER_FOOTER_MARGIN_PT } from "./print-settings.js";
 import { isoDateTimeToSerial, isoDateToSerial, isoTimeToSerial } from "./serial.js";
 import { CellFormatTable, RESERVED_BORDER_INDICES, RESERVED_FILL_INDICES } from "./styles.js";
 import { ptToColumnWidthChars } from "./units.js";
+import { cellReference, rangeReference } from "document-schema.js";
 //#region src/typed/xlsx/build.ts
 const SML_NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
 const REL_NS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";

package/dist/typed/xlsx/content.cjs

@@ -2,7 +2,6 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_typed_util = require("../util.cjs");
 const require_typed_shared_metadata = require("../shared/metadata.cjs");
 const require_typed_xlsx_shared_strings = require("./shared-strings.cjs");
-const require_typed_xlsx_a1 = require("./a1.cjs");
 const require_typed_xlsx_defined_names = require("./defined-names.cjs");
 const require_typed_xlsx_number_format = require("./number-format.cjs");
 const require_typed_xlsx_util = require("./util.cjs");
@@ -238,7 +237,7 @@ function readCellValue(cell, sharedStrings, numericFormats) {
 }
 function readCell(cell, sharedStrings, context) {
 	const reference = require_typed_util.attr(cell, "r");
-	const position = reference === void 0 ? void 0 : require_typed_xlsx_a1.parseCellReference(reference);
+	const position = reference === void 0 ? void 0 : (0, document_schema_js.parseCellReference)(reference);
 	if (position === void 0) return;
 	const formulaEl = require_typed_util.childrenWithTag(cell, "f")[0];
 	const formula = formulaEl === void 0 ? void 0 : require_typed_util.textContent(formulaEl);
@@ -276,7 +275,7 @@ function applyMergedRanges(worksheet, cells) {
 	for (const cell of cells) byPosition.set(`${cell.row}:${cell.column}`, cell);
 	for (const mergeCell of require_typed_util.childrenWithTag(mergeCellsEl, "mergeCell")) {
 		const ref = require_typed_util.attr(mergeCell, "ref");
-		const range = ref === void 0 ? void 0 : require_typed_xlsx_a1.parseRangeReference(ref);
+		const range = ref === void 0 ? void 0 : (0, document_schema_js.parseRangeReference)(ref);
 		if (range === void 0) continue;
 		const anchor = byPosition.get(`${range.startRow}:${range.startColumn}`);
 		if (anchor === void 0) continue;

package/dist/typed/xlsx/content.js

@@ -1,7 +1,6 @@
 import { attr, childrenWithTag, elementsWithTag, resolveRelationships, rootElement, textContent } from "../util.js";
 import { readCoreProperties } from "../shared/metadata.js";
 import { loadSharedStrings } from "./shared-strings.js";
-import { parseCellReference, parseRangeReference } from "./a1.js";
 import { readDefinedNamesBySheet } from "./defined-names.js";
 import { classifyNumberFormat } from "./number-format.js";
 import { readXmlBool } from "./util.js";
@@ -9,7 +8,7 @@ import { readPrintSettings } from "./print-settings.js";
 import { readDate1904, serialToIsoDate, serialToIsoDateTime, serialToIsoTime } from "./serial.js";
 import { readCellStyles } from "./styles.js";
 import { columnWidthCharsToPt } from "./units.js";
-import { CONTENT_FORMAT_VERSION } from "document-schema.js";
+import { CONTENT_FORMAT_VERSION, parseCellReference, parseRangeReference } from "document-schema.js";
 //#region src/typed/xlsx/content.ts
 const WORKBOOK_PATH = "xl/workbook.xml";
 function resolveSheetEntries(pkg) {

package/dist/typed/xlsx/defined-names.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_typed_util = require("../util.cjs");
-const require_typed_xlsx_a1 = require("./a1.cjs");
+let document_schema_js = require("document-schema.js");
 //#region src/typed/xlsx/defined-names.ts
 const XLNM_PRINT_AREA = "_xlnm.Print_Area";
 const XLNM_PRINT_TITLES = "_xlnm.Print_Titles";
@@ -32,7 +32,7 @@ function stripSheetPrefix(segment) {
 function parsePrintAreaValue(value) {
 	const first = value.split(",")[0]?.trim();
 	if (first === void 0 || first.length === 0) return;
-	return require_typed_xlsx_a1.parseRangeReference(stripSheetPrefix(first).replace(/\$/g, ""));
+	return (0, document_schema_js.parseRangeReference)(stripSheetPrefix(first).replace(/\$/g, ""));
 }
 function parsePrintTitlesValue(value) {
 	const result = {};
@@ -43,8 +43,8 @@ function parsePrintTitlesValue(value) {
 		const startSpec = segment.slice(0, separatorIndex);
 		const endSpec = segment.slice(separatorIndex + 1);
 		if (/^[A-Za-z]+$/.test(startSpec) && /^[A-Za-z]+$/.test(endSpec)) {
-			const start = require_typed_xlsx_a1.columnLettersToIndex(startSpec);
-			const end = require_typed_xlsx_a1.columnLettersToIndex(endSpec);
+			const start = (0, document_schema_js.columnLettersToIndex)(startSpec);
+			const end = (0, document_schema_js.columnLettersToIndex)(endSpec);
 			if (start !== void 0 && end !== void 0) result.repeatColumns = {
 				start: Math.min(start, end),
 				end: Math.max(start, end)
@@ -65,7 +65,7 @@ function quoteSheetNameIfNeeded(sheetName) {
 	return `'${sheetName.replace(/'/g, "''")}'`;
 }
 function buildPrintAreaValue(sheetName, range) {
-	const dollared = require_typed_xlsx_a1.rangeReference({
+	const dollared = (0, document_schema_js.rangeReference)({
 		startRow: range.startRow,
 		startColumn: range.startColumn,
 		endRow: range.endRow,
@@ -76,7 +76,7 @@ function buildPrintAreaValue(sheetName, range) {
 function buildPrintTitlesValue(sheetName, repeatRows, repeatColumns) {
 	const quotedName = quoteSheetNameIfNeeded(sheetName);
 	const segments = [];
-	if (repeatColumns !== void 0) segments.push(`${quotedName}!$${require_typed_xlsx_a1.columnIndexToLetters(repeatColumns.start)}:$${require_typed_xlsx_a1.columnIndexToLetters(repeatColumns.end)}`);
+	if (repeatColumns !== void 0) segments.push(`${quotedName}!$${(0, document_schema_js.columnIndexToLetters)(repeatColumns.start)}:$${(0, document_schema_js.columnIndexToLetters)(repeatColumns.end)}`);
 	if (repeatRows !== void 0) segments.push(`${quotedName}!$${repeatRows.start + 1}:$${repeatRows.end + 1}`);
 	return segments.length > 0 ? segments.join(",") : void 0;
 }

package/dist/typed/xlsx/defined-names.js

@@ -1,5 +1,5 @@
 import { attr, childrenWithTag, rootElement, textContent } from "../util.js";
-import { columnIndexToLetters, columnLettersToIndex, parseRangeReference, rangeReference } from "./a1.js";
+import { columnIndexToLetters, columnLettersToIndex, parseRangeReference, rangeReference } from "document-schema.js";
 //#region src/typed/xlsx/defined-names.ts
 const XLNM_PRINT_AREA = "_xlnm.Print_Area";
 const XLNM_PRINT_TITLES = "_xlnm.Print_Titles";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ooxml.js",
-  "version": "2.9.0",
+  "version": "2.9.2",
   "description": "Type-safe, lossless round-trip conversion between OOXML packages (docx, pptx, xlsx) and JSON, built on Zod 4 codecs.",
   "type": "module",
   "repository": {
@@ -78,7 +78,7 @@
   "license": "MIT",
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
-    "document-schema.js": "^2.5.0",
+    "document-schema.js": "^2.5.1",
     "fast-xml-parser": "^5.10.1",
     "fflate": "^0.8.3",
     "zod": "^4.4.3"

package/dist/typed/xlsx/a1.cjs

@@ -1,64 +0,0 @@
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-//#region src/typed/xlsx/a1.ts
-const CELL_REFERENCE_RE = /^([A-Za-z]+)(\d+)$/;
-function columnLettersToIndex(letters) {
-	if (letters.length === 0) return;
-	let index = 0;
-	for (const ch of letters.toUpperCase()) {
-		const code = ch.charCodeAt(0);
-		if (code < 65 || code > 90) return;
-		index = index * 26 + (code - 64);
-	}
-	return index - 1;
-}
-function columnIndexToLetters(index) {
-	let remaining = index + 1;
-	let letters = "";
-	while (remaining > 0) {
-		const digit = (remaining - 1) % 26;
-		letters = String.fromCharCode(65 + digit) + letters;
-		remaining = Math.trunc((remaining - 1) / 26);
-	}
-	return letters;
-}
-function parseCellReference(ref) {
-	const match = CELL_REFERENCE_RE.exec(ref);
-	if (match === null) return;
-	const letters = match[1];
-	const digits = match[2];
-	if (letters === void 0 || digits === void 0) return;
-	const column = columnLettersToIndex(letters);
-	const rowNumber = Number.parseInt(digits, 10);
-	if (column === void 0 || !Number.isInteger(rowNumber) || rowNumber < 1) return;
-	return {
-		row: rowNumber - 1,
-		column
-	};
-}
-function cellReference(row, column) {
-	return `${columnIndexToLetters(column)}${row + 1}`;
-}
-function parseRangeReference(ref) {
-	const separatorIndex = ref.indexOf(":");
-	const startRaw = separatorIndex === -1 ? ref : ref.slice(0, separatorIndex);
-	const endRaw = separatorIndex === -1 ? ref : ref.slice(separatorIndex + 1);
-	const start = parseCellReference(startRaw);
-	const end = parseCellReference(endRaw);
-	if (start === void 0 || end === void 0) return;
-	return {
-		startRow: Math.min(start.row, end.row),
-		startColumn: Math.min(start.column, end.column),
-		endRow: Math.max(start.row, end.row),
-		endColumn: Math.max(start.column, end.column)
-	};
-}
-function rangeReference(range) {
-	return `${cellReference(range.startRow, range.startColumn)}:${cellReference(range.endRow, range.endColumn)}`;
-}
-//#endregion
-exports.cellReference = cellReference;
-exports.columnIndexToLetters = columnIndexToLetters;
-exports.columnLettersToIndex = columnLettersToIndex;
-exports.parseCellReference = parseCellReference;
-exports.parseRangeReference = parseRangeReference;
-exports.rangeReference = rangeReference;

package/dist/typed/xlsx/a1.d.cts

@@ -1,19 +0,0 @@
-//#region src/typed/xlsx/a1.d.ts
-declare function columnLettersToIndex(letters: string): number | undefined;
-declare function columnIndexToLetters(index: number): string;
-interface CellPosition {
-  row: number;
-  column: number;
-}
-declare function parseCellReference(ref: string): CellPosition | undefined;
-declare function cellReference(row: number, column: number): string;
-interface CellRange {
-  startRow: number;
-  startColumn: number;
-  endRow: number;
-  endColumn: number;
-}
-declare function parseRangeReference(ref: string): CellRange | undefined;
-declare function rangeReference(range: CellRange): string;
-//#endregion
-export { CellPosition, CellRange, cellReference, columnIndexToLetters, columnLettersToIndex, parseCellReference, parseRangeReference, rangeReference };

package/dist/typed/xlsx/a1.d.ts

@@ -1,19 +0,0 @@
-//#region src/typed/xlsx/a1.d.ts
-declare function columnLettersToIndex(letters: string): number | undefined;
-declare function columnIndexToLetters(index: number): string;
-interface CellPosition {
-  row: number;
-  column: number;
-}
-declare function parseCellReference(ref: string): CellPosition | undefined;
-declare function cellReference(row: number, column: number): string;
-interface CellRange {
-  startRow: number;
-  startColumn: number;
-  endRow: number;
-  endColumn: number;
-}
-declare function parseRangeReference(ref: string): CellRange | undefined;
-declare function rangeReference(range: CellRange): string;
-//#endregion
-export { CellPosition, CellRange, cellReference, columnIndexToLetters, columnLettersToIndex, parseCellReference, parseRangeReference, rangeReference };

package/dist/typed/xlsx/a1.js

@@ -1,58 +0,0 @@
-//#region src/typed/xlsx/a1.ts
-const CELL_REFERENCE_RE = /^([A-Za-z]+)(\d+)$/;
-function columnLettersToIndex(letters) {
-	if (letters.length === 0) return;
-	let index = 0;
-	for (const ch of letters.toUpperCase()) {
-		const code = ch.charCodeAt(0);
-		if (code < 65 || code > 90) return;
-		index = index * 26 + (code - 64);
-	}
-	return index - 1;
-}
-function columnIndexToLetters(index) {
-	let remaining = index + 1;
-	let letters = "";
-	while (remaining > 0) {
-		const digit = (remaining - 1) % 26;
-		letters = String.fromCharCode(65 + digit) + letters;
-		remaining = Math.trunc((remaining - 1) / 26);
-	}
-	return letters;
-}
-function parseCellReference(ref) {
-	const match = CELL_REFERENCE_RE.exec(ref);
-	if (match === null) return;
-	const letters = match[1];
-	const digits = match[2];
-	if (letters === void 0 || digits === void 0) return;
-	const column = columnLettersToIndex(letters);
-	const rowNumber = Number.parseInt(digits, 10);
-	if (column === void 0 || !Number.isInteger(rowNumber) || rowNumber < 1) return;
-	return {
-		row: rowNumber - 1,
-		column
-	};
-}
-function cellReference(row, column) {
-	return `${columnIndexToLetters(column)}${row + 1}`;
-}
-function parseRangeReference(ref) {
-	const separatorIndex = ref.indexOf(":");
-	const startRaw = separatorIndex === -1 ? ref : ref.slice(0, separatorIndex);
-	const endRaw = separatorIndex === -1 ? ref : ref.slice(separatorIndex + 1);
-	const start = parseCellReference(startRaw);
-	const end = parseCellReference(endRaw);
-	if (start === void 0 || end === void 0) return;
-	return {
-		startRow: Math.min(start.row, end.row),
-		startColumn: Math.min(start.column, end.column),
-		endRow: Math.max(start.row, end.row),
-		endColumn: Math.max(start.column, end.column)
-	};
-}
-function rangeReference(range) {
-	return `${cellReference(range.startRow, range.startColumn)}:${cellReference(range.endRow, range.endColumn)}`;
-}
-//#endregion
-export { cellReference, columnIndexToLetters, columnLettersToIndex, parseCellReference, parseRangeReference, rangeReference };