ooxml.js 6.3.3 → 6.3.4

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_defined_names = require("./defined-names.cjs");
-const require_typed_xlsx_number_format = require("./number-format.cjs");
 const require_typed_xlsx_util = require("./util.cjs");
 const require_typed_xlsx_print_settings = require("./print-settings.cjs");
 const require_typed_xlsx_units = require("./units.cjs");
@@ -12,6 +11,7 @@ const require_typed_xlsx_shared_strings = require("./shared-strings.cjs");
 const require_typed_xlsx_styles = require("./styles.cjs");
 const require_typed_xlsx_conditional_format = require("./conditional-format.cjs");
 const require_typed_xlsx_data_validation = require("./data-validation.cjs");
+const require_typed_xlsx_number_format = require("./number-format.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";

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 { 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";
 import { DEFAULT_HEADER_FOOTER_MARGIN_PT } from "./print-settings.js";
 import { ptToColumnWidthChars } from "./units.js";
@@ -11,6 +10,7 @@ import { SharedStringTable } from "./shared-strings.js";
 import { CellFormatTable, RESERVED_BORDER_INDICES, RESERVED_FILL_INDICES } from "./styles.js";
 import { DxfTable, buildConditionalFormattingElements } from "./conditional-format.js";
 import { buildDataValidationsElement } from "./data-validation.js";
+import { BOOLEAN_NUMBER_FORMAT, DATE_NUMBER_FORMAT, DATE_TIME_NUMBER_FORMAT, PERCENTAGE_NUMBER_FORMAT, TIME_NUMBER_FORMAT, currencyNumberFormat } from "./number-format.js";
 import { cellReference, rangeReference } from "document-schema.js";
 //#region src/typed/xlsx/build.ts
 const SML_NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";

package/dist/typed/xlsx/content.cjs

@@ -3,7 +3,6 @@ const require_xml_build = require("../../xml/build.cjs");
 const require_typed_util = require("../util.cjs");
 const require_typed_shared_metadata = require("../shared/metadata.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");
 const require_typed_xlsx_print_settings = require("./print-settings.cjs");
 const require_typed_xlsx_units = require("./units.cjs");
@@ -15,6 +14,7 @@ const require_typed_xlsx_comments = require("./comments.cjs");
 const require_typed_xlsx_conditional_format = require("./conditional-format.cjs");
 const require_typed_xlsx_data_validation = require("./data-validation.cjs");
 let document_schema_js = require("document-schema.js");
+let excel_number_format = require("excel-number-format");
 //#region src/typed/xlsx/content.ts
 const WORKBOOK_PATH = "xl/workbook.xml";
 function resolveSheetEntries(pkg) {
@@ -116,7 +116,7 @@ function entryOf(cell, context) {
 function numberFormatOf(cell, context) {
 	const entry = entryOf(cell, context);
 	if (entry?.numberFormatCode === void 0) return PLAIN_NUMBER;
-	return require_typed_xlsx_number_format.classifyNumberFormat(entry.numberFormatCode);
+	return (0, excel_number_format.classifyNumberFormat)(entry.numberFormatCode);
 }
 function resolveNumericValue(num, cell, context) {
 	const format = numberFormatOf(cell, context);

package/dist/typed/xlsx/content.js

@@ -2,7 +2,6 @@ import { buildXml } from "../../xml/build.js";
 import { attr, childrenWithTag, elementsWithTag, resolveRelationships, rootElement, textContent } from "../util.js";
 import { readCoreProperties } from "../shared/metadata.js";
 import { readDefinedNamesBySheet } from "./defined-names.js";
-import { classifyNumberFormat } from "./number-format.js";
 import { readXmlBool } from "./util.js";
 import { readPrintSettings } from "./print-settings.js";
 import { columnWidthCharsToPt } from "./units.js";
@@ -14,6 +13,7 @@ import { readSheetCellComments } from "./comments.js";
 import { readConditionalFormats } from "./conditional-format.js";
 import { readDataValidations } from "./data-validation.js";
 import { parseCellReference, parseRangeReference } from "document-schema.js";
+import { classifyNumberFormat } from "excel-number-format";
 //#region src/typed/xlsx/content.ts
 const WORKBOOK_PATH = "xl/workbook.xml";
 function resolveSheetEntries(pkg) {

package/dist/typed/xlsx/number-format.cjs

@@ -1,283 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+let excel_number_format = require("excel-number-format");
 //#region src/typed/xlsx/number-format.ts
-const MAX_NUMBER_FORMAT_SECTIONS = 4;
-function at(chars, index) {
-	return chars[index] ?? "";
-}
-function tokenizeNumberFormat(formatCode) {
-	const chars = [...formatCode];
-	const tokens = [];
-	let index = 0;
-	while (index < chars.length) {
-		const char = at(chars, index);
-		if (char === "\"") {
-			let text = "";
-			index += 1;
-			while (index < chars.length && at(chars, index) !== "\"") {
-				text += at(chars, index);
-				index += 1;
-			}
-			index += 1;
-			tokens.push({
-				kind: "literal",
-				text
-			});
-			continue;
-		}
-		if (char === "\\" || char === "_" || char === "*") {
-			tokens.push({
-				kind: "literal",
-				text: at(chars, index + 1)
-			});
-			index += 2;
-			continue;
-		}
-		if (char === "[") {
-			let body = "";
-			index += 1;
-			while (index < chars.length && at(chars, index) !== "]") {
-				body += at(chars, index);
-				index += 1;
-			}
-			index += 1;
-			tokens.push({
-				kind: "bracket",
-				body
-			});
-			continue;
-		}
-		if (char === ";") {
-			tokens.push({ kind: "separator" });
-			index += 1;
-			continue;
-		}
-		tokens.push({
-			kind: "code",
-			char
-		});
-		index += 1;
-	}
-	return tokens;
-}
-function splitNumberFormatSections(tokens) {
-	const sections = [];
-	let current = [];
-	for (const token of tokens) {
-		if (token.kind === "separator") {
-			sections.push(current);
-			current = [];
-			continue;
-		}
-		current.push(token);
-	}
-	sections.push(current);
-	return sections.slice(0, 4);
-}
-const CURRENCY_SYMBOL = /\p{Sc}/u;
-function containsCurrencySymbol(text) {
-	return CURRENCY_SYMBOL.test(text);
-}
-function isIsoCurrencyCodeShape(marker) {
-	if (marker.length !== 3) return false;
-	for (const char of marker) {
-		const upper = char.toUpperCase();
-		if (upper < "A" || upper > "Z") return false;
-	}
-	return true;
-}
-function isElapsedBracketBody(body) {
-	let letter;
-	for (const char of body) {
-		const lower = char.toLowerCase();
-		if (letter === void 0) {
-			if (lower !== "h" && lower !== "m" && lower !== "s") return false;
-			letter = lower;
-		} else if (lower !== letter) return false;
-	}
-	return letter !== void 0;
-}
-function classifyBracket(body) {
-	if (body.startsWith("$")) {
-		const rest = body.slice(1);
-		const dashIndex = rest.indexOf("-");
-		const marker = dashIndex === -1 ? rest : rest.slice(0, dashIndex);
-		if (marker === "") return { kind: "none" };
-		return isIsoCurrencyCodeShape(marker) ? {
-			kind: "currency",
-			code: marker.toUpperCase()
-		} : { kind: "currency" };
-	}
-	return isElapsedBracketBody(body) ? { kind: "elapsed" } : { kind: "none" };
-}
-const AMPM_MARKERS = ["am/pm", "a/p"];
-const AMPM_LETTER = "ampm";
-function matchesAt(chars, index, marker) {
-	return [...marker].every((char, offset) => at(chars, index + offset).toLowerCase() === char);
-}
-function codeRunsOf(section) {
-	const chars = [];
-	for (const token of section) if (token.kind === "code") chars.push(token.char);
-	const runs = [];
-	let index = 0;
-	while (index < chars.length) {
-		const marker = AMPM_MARKERS.find((candidate) => matchesAt(chars, index, candidate));
-		if (marker !== void 0) {
-			runs.push({
-				letter: AMPM_LETTER,
-				length: marker.length
-			});
-			index += marker.length;
-			continue;
-		}
-		const char = at(chars, index).toLowerCase();
-		let length = 0;
-		while (index + length < chars.length && at(chars, index + length).toLowerCase() === char) length += 1;
-		runs.push({
-			letter: char,
-			length
-		});
-		index += length;
-	}
-	return runs;
-}
-const RESOLVING_LETTERS = [
-	"y",
-	"d",
-	"h",
-	"s"
-];
-function nearestResolvingLetter(runs, from, step) {
-	for (let index = from + step; index >= 0 && index < runs.length; index += step) {
-		const run = runs[index];
-		if (run !== void 0 && RESOLVING_LETTERS.includes(run.letter)) return run.letter;
-	}
-}
-function monthRunIsMinutes(runs, index) {
-	return nearestResolvingLetter(runs, index, -1) === "h" || nearestResolvingLetter(runs, index, 1) === "s";
-}
-const PLAIN_NUMBER = { kind: "number" };
-const NUMERIC_CODES = [
-	"0",
-	"#",
-	"?",
-	".",
-	","
-];
-function collectSignals(section) {
-	const signals = {
-		hasDate: false,
-		hasTime: false,
-		hasElapsed: false,
-		hasPercent: false,
-		hasNumeric: false,
-		hasText: false,
-		hasCurrency: false
-	};
-	for (const token of section) {
-		if (token.kind === "literal" && containsCurrencySymbol(token.text)) signals.hasCurrency = true;
-		if (token.kind === "bracket") {
-			const meaning = classifyBracket(token.body);
-			if (meaning.kind === "elapsed") signals.hasElapsed = true;
-			if (meaning.kind === "currency") {
-				signals.hasCurrency = true;
-				if (signals.currencyCode === void 0 && meaning.code !== void 0) signals.currencyCode = meaning.code;
-			}
-		}
-	}
-	const runs = codeRunsOf(section);
-	runs.forEach((run, index) => {
-		if (run.letter === "y" || run.letter === "d") {
-			signals.hasDate = true;
-			return;
-		}
-		if (run.letter === "h" || run.letter === "s" || run.letter === AMPM_LETTER) {
-			signals.hasTime = true;
-			return;
-		}
-		if (run.letter === "m") {
-			if (run.length <= 2 && monthRunIsMinutes(runs, index)) signals.hasTime = true;
-			else signals.hasDate = true;
-			return;
-		}
-		if (run.letter === "e") {
-			const next = runs[index + 1];
-			signals.hasNumeric = signals.hasNumeric || next?.letter === "+" || next?.letter === "-";
-			return;
-		}
-		if (run.letter === "%") {
-			signals.hasPercent = true;
-			return;
-		}
-		if (run.letter === "@") {
-			signals.hasText = true;
-			return;
-		}
-		if (NUMERIC_CODES.includes(run.letter)) {
-			signals.hasNumeric = true;
-			return;
-		}
-		if (containsCurrencySymbol(run.letter)) signals.hasCurrency = true;
-	});
-	return signals;
-}
-function classifySection(section) {
-	const signals = collectSignals(section);
-	if (signals.hasElapsed) return { kind: "elapsedTime" };
-	if (signals.hasDate) return signals.hasTime ? { kind: "dateTime" } : { kind: "date" };
-	if (signals.hasTime) return { kind: "time" };
-	if (signals.hasPercent) return { kind: "percentage" };
-	if (signals.hasCurrency) {
-		const code = signals.currencyCode;
-		return code === void 0 ? { kind: "currency" } : {
-			kind: "currency",
-			code
-		};
-	}
-	if (signals.hasText && !signals.hasNumeric) return { kind: "text" };
-	return PLAIN_NUMBER;
-}
-function classifyNumberFormat(formatCode) {
-	const first = splitNumberFormatSections(tokenizeNumberFormat(formatCode))[0];
-	return first === void 0 ? PLAIN_NUMBER : classifySection(first);
-}
-const BUILTIN_NUMBER_FORMATS = /* @__PURE__ */ new Map([
-	[0, "General"],
-	[1, "0"],
-	[2, "0.00"],
-	[3, "#,##0"],
-	[4, "#,##0.00"],
-	[5, "$#,##0_);($#,##0)"],
-	[6, "$#,##0_);[Red]($#,##0)"],
-	[7, "$#,##0.00_);($#,##0.00)"],
-	[8, "$#,##0.00_);[Red]($#,##0.00)"],
-	[9, "0%"],
-	[10, "0.00%"],
-	[11, "0.00E+00"],
-	[12, "# ?/?"],
-	[13, "# ??/??"],
-	[14, "mm-dd-yy"],
-	[15, "d-mmm-yy"],
-	[16, "d-mmm"],
-	[17, "mmm-yy"],
-	[18, "h:mm AM/PM"],
-	[19, "h:mm:ss AM/PM"],
-	[20, "h:mm"],
-	[21, "h:mm:ss"],
-	[22, "m/d/yy h:mm"],
-	[37, "#,##0 ;(#,##0)"],
-	[38, "#,##0 ;[Red](#,##0)"],
-	[39, "#,##0.00;(#,##0.00)"],
-	[40, "#,##0.00;[Red](#,##0.00)"],
-	[41, "_(* #,##0_);_(* \\(#,##0\\);_(* \"-\"_);_(@_)"],
-	[42, "_(\"$\"* #,##0_);_(\"$\"* \\(#,##0\\);_(\"$\"* \"-\"_);_(@_)"],
-	[43, "_(* #,##0.00_);_(* \\(#,##0.00\\);_(* \"-\"??_);_(@_)"],
-	[44, "_(\"$\"* #,##0.00_);_(\"$\"* \\(#,##0.00\\);_(\"$\"* \"-\"??_);_(@_)"],
-	[45, "mm:ss"],
-	[46, "[h]:mm:ss"],
-	[47, "mmss.0"],
-	[48, "##0.0E+0"],
-	[49, "@"]
-]);
 const PERCENTAGE_NUMBER_FORMAT = {
 	kind: "builtin",
 	id: 10
@@ -303,7 +26,7 @@ const BOOLEAN_NUMBER_FORMAT = {
 	code: "\"TRUE\";\"TRUE\";\"FALSE\""
 };
 function currencyNumberFormat(code) {
-	if (code === void 0 || !isIsoCurrencyCodeShape(code)) return AMOUNT_NUMBER_FORMAT;
+	if (code === void 0 || !(0, excel_number_format.isIsoCurrencyCodeShape)(code)) return AMOUNT_NUMBER_FORMAT;
 	return {
 		kind: "custom",
 		code: `[$${code.toUpperCase()}]#,##0.00`
@@ -312,13 +35,8 @@ function currencyNumberFormat(code) {
 //#endregion
 exports.AMOUNT_NUMBER_FORMAT = AMOUNT_NUMBER_FORMAT;
 exports.BOOLEAN_NUMBER_FORMAT = BOOLEAN_NUMBER_FORMAT;
-exports.BUILTIN_NUMBER_FORMATS = BUILTIN_NUMBER_FORMATS;
 exports.DATE_NUMBER_FORMAT = DATE_NUMBER_FORMAT;
 exports.DATE_TIME_NUMBER_FORMAT = DATE_TIME_NUMBER_FORMAT;
-exports.MAX_NUMBER_FORMAT_SECTIONS = MAX_NUMBER_FORMAT_SECTIONS;
 exports.PERCENTAGE_NUMBER_FORMAT = PERCENTAGE_NUMBER_FORMAT;
 exports.TIME_NUMBER_FORMAT = TIME_NUMBER_FORMAT;
-exports.classifyNumberFormat = classifyNumberFormat;
 exports.currencyNumberFormat = currencyNumberFormat;
-exports.splitNumberFormatSections = splitNumberFormatSections;
-exports.tokenizeNumberFormat = tokenizeNumberFormat;

package/dist/typed/xlsx/number-format.d.cts

@@ -1,39 +1,4 @@
 //#region src/typed/xlsx/number-format.d.ts
-type NumberFormatToken = {
-  kind: "literal";
-  text: string;
-} | {
-  kind: "bracket";
-  body: string;
-} | {
-  kind: "separator";
-} | {
-  kind: "code";
-  char: string;
-};
-declare const MAX_NUMBER_FORMAT_SECTIONS = 4;
-declare function tokenizeNumberFormat(formatCode: string): NumberFormatToken[];
-declare function splitNumberFormatSections(tokens: readonly NumberFormatToken[]): NumberFormatToken[][];
-type NumberFormatClass = {
-  kind: "number";
-} | {
-  kind: "text";
-} | {
-  kind: "percentage";
-} | {
-  kind: "currency";
-  code?: string;
-} | {
-  kind: "date";
-} | {
-  kind: "time";
-} | {
-  kind: "dateTime";
-} | {
-  kind: "elapsedTime";
-};
-declare function classifyNumberFormat(formatCode: string): NumberFormatClass;
-declare const BUILTIN_NUMBER_FORMATS: ReadonlyMap<number, string>;
 type CellNumberFormat = {
   kind: "builtin";
   id: number;
@@ -49,4 +14,4 @@ declare const DATE_TIME_NUMBER_FORMAT: CellNumberFormat;
 declare const BOOLEAN_NUMBER_FORMAT: CellNumberFormat;
 declare function currencyNumberFormat(code: string | undefined): CellNumberFormat;
 //#endregion
-export { AMOUNT_NUMBER_FORMAT, BOOLEAN_NUMBER_FORMAT, BUILTIN_NUMBER_FORMATS, CellNumberFormat, DATE_NUMBER_FORMAT, DATE_TIME_NUMBER_FORMAT, MAX_NUMBER_FORMAT_SECTIONS, NumberFormatClass, NumberFormatToken, PERCENTAGE_NUMBER_FORMAT, TIME_NUMBER_FORMAT, classifyNumberFormat, currencyNumberFormat, splitNumberFormatSections, tokenizeNumberFormat };
+export { AMOUNT_NUMBER_FORMAT, BOOLEAN_NUMBER_FORMAT, CellNumberFormat, DATE_NUMBER_FORMAT, DATE_TIME_NUMBER_FORMAT, PERCENTAGE_NUMBER_FORMAT, TIME_NUMBER_FORMAT, currencyNumberFormat };

package/dist/typed/xlsx/number-format.d.ts

@@ -1,39 +1,4 @@
 //#region src/typed/xlsx/number-format.d.ts
-type NumberFormatToken = {
-  kind: "literal";
-  text: string;
-} | {
-  kind: "bracket";
-  body: string;
-} | {
-  kind: "separator";
-} | {
-  kind: "code";
-  char: string;
-};
-declare const MAX_NUMBER_FORMAT_SECTIONS = 4;
-declare function tokenizeNumberFormat(formatCode: string): NumberFormatToken[];
-declare function splitNumberFormatSections(tokens: readonly NumberFormatToken[]): NumberFormatToken[][];
-type NumberFormatClass = {
-  kind: "number";
-} | {
-  kind: "text";
-} | {
-  kind: "percentage";
-} | {
-  kind: "currency";
-  code?: string;
-} | {
-  kind: "date";
-} | {
-  kind: "time";
-} | {
-  kind: "dateTime";
-} | {
-  kind: "elapsedTime";
-};
-declare function classifyNumberFormat(formatCode: string): NumberFormatClass;
-declare const BUILTIN_NUMBER_FORMATS: ReadonlyMap<number, string>;
 type CellNumberFormat = {
   kind: "builtin";
   id: number;
@@ -49,4 +14,4 @@ declare const DATE_TIME_NUMBER_FORMAT: CellNumberFormat;
 declare const BOOLEAN_NUMBER_FORMAT: CellNumberFormat;
 declare function currencyNumberFormat(code: string | undefined): CellNumberFormat;
 //#endregion
-export { AMOUNT_NUMBER_FORMAT, BOOLEAN_NUMBER_FORMAT, BUILTIN_NUMBER_FORMATS, CellNumberFormat, DATE_NUMBER_FORMAT, DATE_TIME_NUMBER_FORMAT, MAX_NUMBER_FORMAT_SECTIONS, NumberFormatClass, NumberFormatToken, PERCENTAGE_NUMBER_FORMAT, TIME_NUMBER_FORMAT, classifyNumberFormat, currencyNumberFormat, splitNumberFormatSections, tokenizeNumberFormat };
+export { AMOUNT_NUMBER_FORMAT, BOOLEAN_NUMBER_FORMAT, CellNumberFormat, DATE_NUMBER_FORMAT, DATE_TIME_NUMBER_FORMAT, PERCENTAGE_NUMBER_FORMAT, TIME_NUMBER_FORMAT, currencyNumberFormat };

package/dist/typed/xlsx/number-format.js

@@ -1,282 +1,5 @@
+import { isIsoCurrencyCodeShape } from "excel-number-format";
 //#region src/typed/xlsx/number-format.ts
-const MAX_NUMBER_FORMAT_SECTIONS = 4;
-function at(chars, index) {
-	return chars[index] ?? "";
-}
-function tokenizeNumberFormat(formatCode) {
-	const chars = [...formatCode];
-	const tokens = [];
-	let index = 0;
-	while (index < chars.length) {
-		const char = at(chars, index);
-		if (char === "\"") {
-			let text = "";
-			index += 1;
-			while (index < chars.length && at(chars, index) !== "\"") {
-				text += at(chars, index);
-				index += 1;
-			}
-			index += 1;
-			tokens.push({
-				kind: "literal",
-				text
-			});
-			continue;
-		}
-		if (char === "\\" || char === "_" || char === "*") {
-			tokens.push({
-				kind: "literal",
-				text: at(chars, index + 1)
-			});
-			index += 2;
-			continue;
-		}
-		if (char === "[") {
-			let body = "";
-			index += 1;
-			while (index < chars.length && at(chars, index) !== "]") {
-				body += at(chars, index);
-				index += 1;
-			}
-			index += 1;
-			tokens.push({
-				kind: "bracket",
-				body
-			});
-			continue;
-		}
-		if (char === ";") {
-			tokens.push({ kind: "separator" });
-			index += 1;
-			continue;
-		}
-		tokens.push({
-			kind: "code",
-			char
-		});
-		index += 1;
-	}
-	return tokens;
-}
-function splitNumberFormatSections(tokens) {
-	const sections = [];
-	let current = [];
-	for (const token of tokens) {
-		if (token.kind === "separator") {
-			sections.push(current);
-			current = [];
-			continue;
-		}
-		current.push(token);
-	}
-	sections.push(current);
-	return sections.slice(0, 4);
-}
-const CURRENCY_SYMBOL = /\p{Sc}/u;
-function containsCurrencySymbol(text) {
-	return CURRENCY_SYMBOL.test(text);
-}
-function isIsoCurrencyCodeShape(marker) {
-	if (marker.length !== 3) return false;
-	for (const char of marker) {
-		const upper = char.toUpperCase();
-		if (upper < "A" || upper > "Z") return false;
-	}
-	return true;
-}
-function isElapsedBracketBody(body) {
-	let letter;
-	for (const char of body) {
-		const lower = char.toLowerCase();
-		if (letter === void 0) {
-			if (lower !== "h" && lower !== "m" && lower !== "s") return false;
-			letter = lower;
-		} else if (lower !== letter) return false;
-	}
-	return letter !== void 0;
-}
-function classifyBracket(body) {
-	if (body.startsWith("$")) {
-		const rest = body.slice(1);
-		const dashIndex = rest.indexOf("-");
-		const marker = dashIndex === -1 ? rest : rest.slice(0, dashIndex);
-		if (marker === "") return { kind: "none" };
-		return isIsoCurrencyCodeShape(marker) ? {
-			kind: "currency",
-			code: marker.toUpperCase()
-		} : { kind: "currency" };
-	}
-	return isElapsedBracketBody(body) ? { kind: "elapsed" } : { kind: "none" };
-}
-const AMPM_MARKERS = ["am/pm", "a/p"];
-const AMPM_LETTER = "ampm";
-function matchesAt(chars, index, marker) {
-	return [...marker].every((char, offset) => at(chars, index + offset).toLowerCase() === char);
-}
-function codeRunsOf(section) {
-	const chars = [];
-	for (const token of section) if (token.kind === "code") chars.push(token.char);
-	const runs = [];
-	let index = 0;
-	while (index < chars.length) {
-		const marker = AMPM_MARKERS.find((candidate) => matchesAt(chars, index, candidate));
-		if (marker !== void 0) {
-			runs.push({
-				letter: AMPM_LETTER,
-				length: marker.length
-			});
-			index += marker.length;
-			continue;
-		}
-		const char = at(chars, index).toLowerCase();
-		let length = 0;
-		while (index + length < chars.length && at(chars, index + length).toLowerCase() === char) length += 1;
-		runs.push({
-			letter: char,
-			length
-		});
-		index += length;
-	}
-	return runs;
-}
-const RESOLVING_LETTERS = [
-	"y",
-	"d",
-	"h",
-	"s"
-];
-function nearestResolvingLetter(runs, from, step) {
-	for (let index = from + step; index >= 0 && index < runs.length; index += step) {
-		const run = runs[index];
-		if (run !== void 0 && RESOLVING_LETTERS.includes(run.letter)) return run.letter;
-	}
-}
-function monthRunIsMinutes(runs, index) {
-	return nearestResolvingLetter(runs, index, -1) === "h" || nearestResolvingLetter(runs, index, 1) === "s";
-}
-const PLAIN_NUMBER = { kind: "number" };
-const NUMERIC_CODES = [
-	"0",
-	"#",
-	"?",
-	".",
-	","
-];
-function collectSignals(section) {
-	const signals = {
-		hasDate: false,
-		hasTime: false,
-		hasElapsed: false,
-		hasPercent: false,
-		hasNumeric: false,
-		hasText: false,
-		hasCurrency: false
-	};
-	for (const token of section) {
-		if (token.kind === "literal" && containsCurrencySymbol(token.text)) signals.hasCurrency = true;
-		if (token.kind === "bracket") {
-			const meaning = classifyBracket(token.body);
-			if (meaning.kind === "elapsed") signals.hasElapsed = true;
-			if (meaning.kind === "currency") {
-				signals.hasCurrency = true;
-				if (signals.currencyCode === void 0 && meaning.code !== void 0) signals.currencyCode = meaning.code;
-			}
-		}
-	}
-	const runs = codeRunsOf(section);
-	runs.forEach((run, index) => {
-		if (run.letter === "y" || run.letter === "d") {
-			signals.hasDate = true;
-			return;
-		}
-		if (run.letter === "h" || run.letter === "s" || run.letter === AMPM_LETTER) {
-			signals.hasTime = true;
-			return;
-		}
-		if (run.letter === "m") {
-			if (run.length <= 2 && monthRunIsMinutes(runs, index)) signals.hasTime = true;
-			else signals.hasDate = true;
-			return;
-		}
-		if (run.letter === "e") {
-			const next = runs[index + 1];
-			signals.hasNumeric = signals.hasNumeric || next?.letter === "+" || next?.letter === "-";
-			return;
-		}
-		if (run.letter === "%") {
-			signals.hasPercent = true;
-			return;
-		}
-		if (run.letter === "@") {
-			signals.hasText = true;
-			return;
-		}
-		if (NUMERIC_CODES.includes(run.letter)) {
-			signals.hasNumeric = true;
-			return;
-		}
-		if (containsCurrencySymbol(run.letter)) signals.hasCurrency = true;
-	});
-	return signals;
-}
-function classifySection(section) {
-	const signals = collectSignals(section);
-	if (signals.hasElapsed) return { kind: "elapsedTime" };
-	if (signals.hasDate) return signals.hasTime ? { kind: "dateTime" } : { kind: "date" };
-	if (signals.hasTime) return { kind: "time" };
-	if (signals.hasPercent) return { kind: "percentage" };
-	if (signals.hasCurrency) {
-		const code = signals.currencyCode;
-		return code === void 0 ? { kind: "currency" } : {
-			kind: "currency",
-			code
-		};
-	}
-	if (signals.hasText && !signals.hasNumeric) return { kind: "text" };
-	return PLAIN_NUMBER;
-}
-function classifyNumberFormat(formatCode) {
-	const first = splitNumberFormatSections(tokenizeNumberFormat(formatCode))[0];
-	return first === void 0 ? PLAIN_NUMBER : classifySection(first);
-}
-const BUILTIN_NUMBER_FORMATS = /* @__PURE__ */ new Map([
-	[0, "General"],
-	[1, "0"],
-	[2, "0.00"],
-	[3, "#,##0"],
-	[4, "#,##0.00"],
-	[5, "$#,##0_);($#,##0)"],
-	[6, "$#,##0_);[Red]($#,##0)"],
-	[7, "$#,##0.00_);($#,##0.00)"],
-	[8, "$#,##0.00_);[Red]($#,##0.00)"],
-	[9, "0%"],
-	[10, "0.00%"],
-	[11, "0.00E+00"],
-	[12, "# ?/?"],
-	[13, "# ??/??"],
-	[14, "mm-dd-yy"],
-	[15, "d-mmm-yy"],
-	[16, "d-mmm"],
-	[17, "mmm-yy"],
-	[18, "h:mm AM/PM"],
-	[19, "h:mm:ss AM/PM"],
-	[20, "h:mm"],
-	[21, "h:mm:ss"],
-	[22, "m/d/yy h:mm"],
-	[37, "#,##0 ;(#,##0)"],
-	[38, "#,##0 ;[Red](#,##0)"],
-	[39, "#,##0.00;(#,##0.00)"],
-	[40, "#,##0.00;[Red](#,##0.00)"],
-	[41, "_(* #,##0_);_(* \\(#,##0\\);_(* \"-\"_);_(@_)"],
-	[42, "_(\"$\"* #,##0_);_(\"$\"* \\(#,##0\\);_(\"$\"* \"-\"_);_(@_)"],
-	[43, "_(* #,##0.00_);_(* \\(#,##0.00\\);_(* \"-\"??_);_(@_)"],
-	[44, "_(\"$\"* #,##0.00_);_(\"$\"* \\(#,##0.00\\);_(\"$\"* \"-\"??_);_(@_)"],
-	[45, "mm:ss"],
-	[46, "[h]:mm:ss"],
-	[47, "mmss.0"],
-	[48, "##0.0E+0"],
-	[49, "@"]
-]);
 const PERCENTAGE_NUMBER_FORMAT = {
 	kind: "builtin",
 	id: 10
@@ -309,4 +32,4 @@ function currencyNumberFormat(code) {
 	};
 }
 //#endregion
-export { AMOUNT_NUMBER_FORMAT, BOOLEAN_NUMBER_FORMAT, BUILTIN_NUMBER_FORMATS, DATE_NUMBER_FORMAT, DATE_TIME_NUMBER_FORMAT, MAX_NUMBER_FORMAT_SECTIONS, PERCENTAGE_NUMBER_FORMAT, TIME_NUMBER_FORMAT, classifyNumberFormat, currencyNumberFormat, splitNumberFormatSections, tokenizeNumberFormat };
+export { AMOUNT_NUMBER_FORMAT, BOOLEAN_NUMBER_FORMAT, DATE_NUMBER_FORMAT, DATE_TIME_NUMBER_FORMAT, PERCENTAGE_NUMBER_FORMAT, TIME_NUMBER_FORMAT, currencyNumberFormat };

package/dist/typed/xlsx/styles.cjs

@@ -1,12 +1,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_typed_util = require("../util.cjs");
-const require_typed_xlsx_number_format = require("./number-format.cjs");
 let document_schema_js = require("document-schema.js");
+let excel_number_format = require("excel-number-format");
 //#region src/typed/xlsx/styles.ts
 const STYLES_PATH = "xl/styles.xml";
 const GENERAL_NUM_FMT_ID = 0;
 function readNumberFormatCodesById(styleSheet) {
-	const codes = new Map(require_typed_xlsx_number_format.BUILTIN_NUMBER_FORMATS);
+	const codes = new Map(excel_number_format.BUILTIN_NUMBER_FORMATS);
 	const numFmtsEl = require_typed_util.childrenWithTag(styleSheet, "numFmts")[0];
 	if (numFmtsEl === void 0) return codes;
 	for (const numFmt of require_typed_util.childrenWithTag(numFmtsEl, "numFmt")) {
@@ -18,12 +18,6 @@ function readNumberFormatCodesById(styleSheet) {
 	}
 	return codes;
 }
-const BORDER_WIDTH_PT = {
-	hair: .5,
-	thin: .75,
-	medium: 1.5,
-	thick: 2.25
-};
 const XLSX_BORDER_STYLE = {
 	thin: {
 		weight: "thin",
@@ -78,11 +72,6 @@ const XLSX_BORDER_STYLE = {
 		pattern: "dashed"
 	}
 };
-const BORDER_WEIGHT_UPPER_PT = {
-	hair: .625,
-	thin: 1.125,
-	medium: 1.875
-};
 function colorFromElement(colorEl) {
 	if (colorEl === void 0) return;
 	const raw = require_typed_util.attr(colorEl, "rgb");
@@ -119,7 +108,7 @@ function readBorderEdge(border, edge) {
 	if (color === void 0) return;
 	const result = {
 		color,
-		widthPt: BORDER_WIDTH_PT[resolved.weight]
+		widthPt: document_schema_js.BORDER_WIDTH_PT[resolved.weight]
 	};
 	if (resolved.pattern !== "solid") result.style = resolved.pattern;
 	return result;
@@ -231,13 +220,9 @@ function borderToXlsxStyle(border) {
 	switch (border.style) {
 		case "double": return "double";
 		case "dotted": return "dotted";
-		case "dashed": return border.widthPt >= BORDER_WEIGHT_UPPER_PT.thin ? "mediumDashed" : "dashed";
+		case "dashed": return (0, document_schema_js.dashedBorderWeightForWidthPt)(border.widthPt) === "medium" ? "mediumDashed" : "dashed";
 		case "solid":
-		case void 0:
-			if (border.widthPt < BORDER_WEIGHT_UPPER_PT.hair) return "hair";
-			if (border.widthPt < BORDER_WEIGHT_UPPER_PT.thin) return "thin";
-			if (border.widthPt < BORDER_WEIGHT_UPPER_PT.medium) return "medium";
-			return "thick";
+		case void 0: return (0, document_schema_js.borderWeightForWidthPt)(border.widthPt);
 	}
 }
 var CellFormatTable = class {

package/dist/typed/xlsx/styles.js

@@ -1,6 +1,6 @@
 import { attr, childrenWithTag, decodeEntities, rootElement } from "../util.js";
-import { BUILTIN_NUMBER_FORMATS } from "./number-format.js";
-import { colorToRgbHex, rgbHexToColor } from "document-schema.js";
+import { BORDER_WIDTH_PT, borderWeightForWidthPt, colorToRgbHex, dashedBorderWeightForWidthPt, rgbHexToColor } from "document-schema.js";
+import { BUILTIN_NUMBER_FORMATS } from "excel-number-format";
 //#region src/typed/xlsx/styles.ts
 const STYLES_PATH = "xl/styles.xml";
 const GENERAL_NUM_FMT_ID = 0;
@@ -17,12 +17,6 @@ function readNumberFormatCodesById(styleSheet) {
 	}
 	return codes;
 }
-const BORDER_WIDTH_PT = {
-	hair: .5,
-	thin: .75,
-	medium: 1.5,
-	thick: 2.25
-};
 const XLSX_BORDER_STYLE = {
 	thin: {
 		weight: "thin",
@@ -77,11 +71,6 @@ const XLSX_BORDER_STYLE = {
 		pattern: "dashed"
 	}
 };
-const BORDER_WEIGHT_UPPER_PT = {
-	hair: .625,
-	thin: 1.125,
-	medium: 1.875
-};
 function colorFromElement(colorEl) {
 	if (colorEl === void 0) return;
 	const raw = attr(colorEl, "rgb");
@@ -230,13 +219,9 @@ function borderToXlsxStyle(border) {
 	switch (border.style) {
 		case "double": return "double";
 		case "dotted": return "dotted";
-		case "dashed": return border.widthPt >= BORDER_WEIGHT_UPPER_PT.thin ? "mediumDashed" : "dashed";
+		case "dashed": return dashedBorderWeightForWidthPt(border.widthPt) === "medium" ? "mediumDashed" : "dashed";
 		case "solid":
-		case void 0:
-			if (border.widthPt < BORDER_WEIGHT_UPPER_PT.hair) return "hair";
-			if (border.widthPt < BORDER_WEIGHT_UPPER_PT.thin) return "thin";
-			if (border.widthPt < BORDER_WEIGHT_UPPER_PT.medium) return "medium";
-			return "thick";
+		case void 0: return borderWeightForWidthPt(border.widthPt);
 	}
 }
 var CellFormatTable = class {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ooxml.js",
-  "version": "6.3.3",
+  "version": "6.3.4",
   "description": "Type-safe, lossless round-trip conversion between OOXML packages (docx, pptx, xlsx) and JSON, built on Zod 4 codecs.",
   "type": "module",
   "repository": {
@@ -80,8 +80,9 @@
   "license": "MIT",
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
-    "archive-codec": "^1.3.0",
-    "document-schema.js": "^5.5.0",
+    "archive-codec": "^1.4.0",
+    "document-schema.js": "^5.5.1",
+    "excel-number-format": "^1.0.0",
     "fast-xml-parser": "^5.10.1",
     "fflate": "^0.8.3",
     "zod": "^4.4.3"