@office-open/xml 0.3.0 → 0.3.2

package/dist/_chunks/{utils-DlOOMr6B.d.mts → utils-BHmdH50s.d.mts}

@@ -159,6 +159,12 @@ declare function attrNum(element: Element | undefined, name: string): number | u
  * Get an attribute value as a boolean.
  */
 declare function attrBool(element: Element | undefined, name: string): boolean | undefined;
+/**
+ * Get a hex color attribute, handling nativeTypeValue coercion.
+ * nativeTypeAttributes converts "000000" → 0 (number); this recovers
+ * the original 6-digit hex string by zero-padding numeric values.
+ */
+declare function colorAttr(element: Element | undefined, name: string): string | undefined;
 /**
  * Check if an element has a specific child element.
  */
@@ -172,4 +178,4 @@ declare function findDeep(parent: Element | undefined, name: string): Element[];
  */
 declare function childCount(parent: Element | undefined): number;
 //#endregion
-export { XmlDesc as C, XmlOption as E, XmlAttrs as S, XmlObject as T, ElementObject as _, childCount as a, Xml2JsOptions as b, collectText as c, hasChild as d, textOf as f, ElementCompact as g, Element as h, attrNum as i, findChild as l, DeclarationAttributes as m, attr as n, childText as o, Attributes as p, attrBool as r, children as s, allChildren as t, findDeep as u, IgnoreOptions as v, XmlDescArray as w, XmlAtom as x, Js2XmlOptions as y };
+export { XmlAttrs as C, XmlOption as D, XmlObject as E, XmlAtom as S, XmlDescArray as T, ElementCompact as _, childCount as a, Js2XmlOptions as b, collectText as c, findDeep as d, hasChild as f, Element as g, DeclarationAttributes as h, attrNum as i, colorAttr as l, Attributes as m, attr as n, childText as o, textOf as p, attrBool as r, children as s, allChildren as t, findChild as u, ElementObject as v, XmlDesc as w, Xml2JsOptions as x, IgnoreOptions as y };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { C as XmlDesc, E as XmlOption, S as XmlAttrs, T as XmlObject, _ as ElementObject, a as childCount, b as Xml2JsOptions, c as collectText, d as hasChild, f as textOf, g as ElementCompact, h as Element, i as attrNum, l as findChild, m as DeclarationAttributes, n as attr, o as childText, p as Attributes, r as attrBool, s as children, t as allChildren, u as findDeep, v as IgnoreOptions, w as XmlDescArray, x as XmlAtom, y as Js2XmlOptions } from "./_chunks/utils-DlOOMr6B.mjs";
+import { C as XmlAttrs, D as XmlOption, E as XmlObject, S as XmlAtom, T as XmlDescArray, _ as ElementCompact, a as childCount, b as Js2XmlOptions, c as collectText, d as findDeep, f as hasChild, g as Element, h as DeclarationAttributes, i as attrNum, l as colorAttr, m as Attributes, n as attr, o as childText, p as textOf, r as attrBool, s as children, t as allChildren, u as findChild, v as ElementObject, w as XmlDesc, x as Xml2JsOptions, y as IgnoreOptions } from "./_chunks/utils-BHmdH50s.mjs";
 
 //#region src/serialize.d.ts
 declare function xml(input: Record<string, any> | Record<string, any>[], options?: boolean | string | {
@@ -32,9 +32,19 @@ declare function escapeXml(str: string): string;
  * Handles already-escaped entities to prevent double-escaping.
  */
 declare function escapeAttributeValue(str: string): string;
+/**
+ * Build an XML attribute string fragment from a record.
+ * `undefined` values are automatically skipped.
+ * String values are escaped via `escapeXml`.
+ *
+ * @example
+ * attrs({ id: 1, name: "foo", hidden: undefined })
+ * // => ' id="1" name="foo"'
+ */
+declare function attrs(record: Record<string, string | number | boolean | undefined>): string;
 //#endregion
 //#region src/json.d.ts
 /** Convert XML string to JSON string — xml-js compatible export */
 declare function xml2json(xml: string, options?: Xml2JsOptions): string;
 //#endregion
-export { Attributes, DeclarationAttributes, Element, ElementCompact, ElementObject, IgnoreOptions, Js2XmlOptions, Xml2JsOptions, XmlAtom, XmlAttrs, XmlDesc, XmlDescArray, XmlObject, XmlOption, allChildren, attr, attrBool, attrNum, childCount, childText, children, collectText, escapeAttributeValue, escapeXml, findChild, findDeep, hasChild, js2xml, json2xml, textOf, toElement, xml, xml2js, xml2json };
+export { Attributes, DeclarationAttributes, Element, ElementCompact, ElementObject, IgnoreOptions, Js2XmlOptions, Xml2JsOptions, XmlAtom, XmlAttrs, XmlDesc, XmlDescArray, XmlObject, XmlOption, allChildren, attr, attrBool, attrNum, attrs, childCount, childText, children, collectText, colorAttr, escapeAttributeValue, escapeXml, findChild, findDeep, hasChild, js2xml, json2xml, textOf, toElement, xml, xml2js, xml2json };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { allChildren, attr, attrBool, attrNum, childCount, childText, children, collectText, findChild, findDeep, hasChild, textOf } from "./utils.mjs";
+import { allChildren, attr, attrBool, attrNum, childCount, childText, children, collectText, colorAttr, findChild, findDeep, hasChild, textOf } from "./utils.mjs";
 //#region src/escape.ts
 const XML_CHAR_MAP = {
 	"&": "&",
@@ -19,6 +19,20 @@ function escapeXml(str) {
 function escapeAttributeValue(str) {
 	return String(str).replace(/&(?!amp;|lt;|gt;|quot;|apos;)/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
 }
+/**
+* Build an XML attribute string fragment from a record.
+* `undefined` values are automatically skipped.
+* String values are escaped via `escapeXml`.
+*
+* @example
+* attrs({ id: 1, name: "foo", hidden: undefined })
+* // => ' id="1" name="foo"'
+*/
+function attrs(record) {
+	let s = "";
+	for (const [k, v] of Object.entries(record)) if (v !== void 0) s += ` ${k}="${typeof v === "string" ? escapeXml(v) : v}"`;
+	return s;
+}
 //#endregion
 //#region src/serialize.ts
 const DEFAULT_INDENT = "    ";
@@ -37,7 +51,8 @@ function xml(input, options) {
 	}
 	const items = Array.isArray(input) ? input : [input];
 	for (let i = 0; i < items.length; i++) {
-		parts.push(formatElement(resolve(items[i], opts.indent, 0)));
+		const keys = Object.keys(items[i]);
+		parts.push(formatElement(keys[0], items[i][keys[0]], opts.indent, 0));
 		if (opts.indent && i < items.length - 1) parts.push("\n");
 	}
 	return parts.join("");
@@ -51,69 +66,50 @@ function normalizeOptions$1(options) {
 		declaration: opts.declaration
 	};
 }
-function resolve(data, indent, depth) {
-	const name = Object.keys(data)[0];
-	const values = data[name];
-	const attributes = [];
-	const content = [];
-	if (values == null) return {
-		name,
-		attributes,
-		content,
-		indent,
-		depth,
-		emptyArray: false
-	};
-	switch (typeof values) {
-		case "object":
-			if (values._attr) for (const key of Object.keys(values._attr)) attributes.push(`${key}="${escapeXml(String(values._attr[key]))}"`);
-			if (values._cdata) {
-				const escaped = String(values._cdata).replace(/\]\]>/g, "]]]]><![CDATA[>");
-				content.push(`<![CDATA[${escaped}]]>`);
-			}
-			if (Array.isArray(values)) {
-				if (values.length === 0) return {
-					name,
-					attributes,
-					content,
-					indent,
-					depth,
-					emptyArray: true
-				};
-				for (const value of values) if (value && typeof value === "object" && "_attr" in value) for (const key of Object.keys(value._attr)) attributes.push(`${key}="${escapeXml(String(value._attr[key]))}"`);
-				else if (value && typeof value === "object") content.push(resolve(value, indent, depth + 1));
-				else if (value != null) content.push(escapeXml(String(value)));
-			}
-			break;
-		default: content.push(escapeXml(String(values)));
+/**
+* Single-pass XML formatter: directly converts IXmlableObject to string,
+* eliminating the intermediate ResolvedElement tree.
+*/
+function formatElement(name, values, indent, depth) {
+	const attrParts = [];
+	const textParts = [];
+	const elemParts = [];
+	let emptyArray = false;
+	if (values == null) {
+		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
+		return `${indent ? indent.repeat(depth) : ""}<${name}${attrStr}/>`;
 	}
-	return {
-		name,
-		attributes,
-		content,
-		indent,
-		depth,
-		emptyArray: false
-	};
-}
-function formatElement(elem) {
-	const { name, attributes, content, indent, depth } = elem;
-	const hasChildren = content.length > 0;
+	if (typeof values === "object") {
+		if (values._attr) for (const key of Object.keys(values._attr)) attrParts.push(`${key}="${escapeXml(String(values._attr[key]))}"`);
+		if (values._attributes) for (const key of Object.keys(values._attributes)) attrParts.push(`${key}="${escapeXml(String(values._attributes[key]))}"`);
+		if (values._cdata) {
+			const escaped = String(values._cdata).replace(/\]\]>/g, "]]]]><![CDATA[>");
+			textParts.push(`<![CDATA[${escaped}]]>`);
+		}
+		if (Array.isArray(values)) {
+			if (values.length === 0) emptyArray = true;
+			else for (const value of values) if (value && typeof value === "object" && "_attr" in value) for (const key of Object.keys(value._attr)) attrParts.push(`${key}="${escapeXml(String(value._attr[key]))}"`);
+			else if (value && typeof value === "object" && "_attributes" in value) for (const key of Object.keys(value._attributes)) attrParts.push(`${key}="${escapeXml(String(value._attributes[key]))}"`);
+			else if (value && typeof value === "object") {
+				const childKeys = Object.keys(value);
+				elemParts.push(formatElement(childKeys[0], value[childKeys[0]], indent, depth + 1));
+			} else if (value != null) textParts.push(escapeXml(String(value)));
+		}
+	} else textParts.push(escapeXml(String(values)));
 	const ind = indent ? indent.repeat(depth) : "";
-	const attrStr = attributes.length ? " " + attributes.join(" ") : "";
-	if (!hasChildren) {
-		if (elem.emptyArray) return `${ind}<${name}${attrStr}></${name}>`;
-		return `${ind}<${name}${attrStr}/>`;
-	}
-	const textContent = content.length === 1 && typeof content[0] === "string" ? content[0] : null;
-	if (textContent !== null && !indent) return `<${name}${attrStr}>${textContent}</${name}>`;
-	if (textContent !== null) return `${ind}<${name}${attrStr}>${textContent}</${name}>`;
+	const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
+	if (textParts.length + elemParts.length === 0) return emptyArray ? `${ind}<${name}${attrStr}></${name}>` : `${ind}<${name}${attrStr}/>`;
+	if (elemParts.length === 0 && textParts.length === 1) return indent ? `${ind}<${name}${attrStr}>${textParts[0]}</${name}>` : `<${name}${attrStr}>${textParts[0]}</${name}>`;
 	const parts = [];
 	parts.push(`${ind}<${name}${attrStr}>`);
 	if (indent) parts.push("\n");
-	for (const child of content) {
-		if (typeof child === "string") parts.push(`${indent.repeat(depth + 1)}${child}`);
-		else parts.push(formatElement(child));
+	const childIndent = indent ? indent.repeat(depth + 1) : "";
+	for (const t of textParts) {
+		parts.push(`${childIndent}${t}`);
+		if (indent) parts.push("\n");
+	}
+	for (const e of elemParts) {
+		parts.push(e);
 		if (indent) parts.push("\n");
 	}
 	parts.push(`${ind}</${name}>`);
@@ -500,4 +496,4 @@ function xml2json(xml, options) {
 	return JSON.stringify(xml2js(xml, options));
 }
 //#endregion
-export { allChildren, attr, attrBool, attrNum, childCount, childText, children, collectText, escapeAttributeValue, escapeXml, findChild, findDeep, hasChild, js2xml, json2xml, textOf, toElement, xml, xml2js, xml2json };
+export { allChildren, attr, attrBool, attrNum, attrs, childCount, childText, children, collectText, colorAttr, escapeAttributeValue, escapeXml, findChild, findDeep, hasChild, js2xml, json2xml, textOf, toElement, xml, xml2js, xml2json };

package/dist/utils.d.mts

@@ -1,2 +1,2 @@
-import { a as childCount, c as collectText, d as hasChild, f as textOf, i as attrNum, l as findChild, n as attr, o as childText, r as attrBool, s as children, t as allChildren, u as findDeep } from "./_chunks/utils-DlOOMr6B.mjs";
-export { allChildren, attr, attrBool, attrNum, childCount, childText, children, collectText, findChild, findDeep, hasChild, textOf };
+import { a as childCount, c as collectText, d as findDeep, f as hasChild, i as attrNum, l as colorAttr, n as attr, o as childText, p as textOf, r as attrBool, s as children, t as allChildren, u as findChild } from "./_chunks/utils-BHmdH50s.mjs";
+export { allChildren, attr, attrBool, attrNum, childCount, childText, children, collectText, colorAttr, findChild, findDeep, hasChild, textOf };

package/dist/utils.mjs

@@ -75,6 +75,20 @@ function attrBool(element, name) {
 	if (lower === "false" || lower === "0") return false;
 }
 /**
+* Get a hex color attribute, handling nativeTypeValue coercion.
+* nativeTypeAttributes converts "000000" → 0 (number); this recovers
+* the original 6-digit hex string by zero-padding numeric values.
+*/
+function colorAttr(element, name) {
+	const raw = element?.attributes?.[name];
+	if (raw === void 0 || raw === "") return void 0;
+	if (typeof raw === "boolean") return void 0;
+	if (typeof raw === "number") return String(raw).padStart(6, "0");
+	if (raw === "auto") return "auto";
+	if (/^[0-9A-Fa-f]{6}$/.test(raw)) return raw;
+	return raw;
+}
+/**
 * Check if an element has a specific child element.
 */
 function hasChild(parent, name) {
@@ -99,4 +113,4 @@ function childCount(parent) {
 	return parent?.elements?.length ?? 0;
 }
 //#endregion
-export { allChildren, attr, attrBool, attrNum, childCount, childText, children, collectText, findChild, findDeep, hasChild, textOf };
+export { allChildren, attr, attrBool, attrNum, childCount, childText, children, collectText, colorAttr, findChild, findDeep, hasChild, textOf };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-open/xml",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "XML parsing and serialization for Office Open XML. Zero dependencies, drop-in replacement for xml + xml-js.",
   "keywords": [
     "office-open",