@office-open/xml 0.6.8 → 0.6.10

package/README.md

@@ -103,31 +103,31 @@ Performance comparison against original `xml` (1.0.1) and `xml-js` (1.6.11) pack
 
 | Scenario                | @office-open/xml |        xml |   Speedup |
 | ----------------------- | ---------------: | ---------: | --------: |
-| Simple element          |     5,177,260 hz | 788,296 hz | **6.57x** |
-| Nested element          |       931,473 hz | 283,093 hz | **3.29x** |
-| Nested with declaration |       871,188 hz | 252,580 hz | **3.45x** |
+| Simple element          |     5,069,751 hz | 724,533 hz | **7.00x** |
+| Nested element          |     1,122,376 hz | 279,423 hz | **4.02x** |
+| Nested with declaration |     1,050,046 hz | 248,678 hz | **4.22x** |
 
 ### Parsing (xml2js)
 
 | Scenario           | @office-open/xml |    xml-js |    Speedup |
 | ------------------ | ---------------: | --------: | ---------: |
-| Simple XML         |     1,007,094 hz | 91,782 hz | **10.97x** |
-| Complex OOXML      |       340,595 hz | 49,733 hz |  **6.85x** |
-| With captureSpaces |       314,648 hz | 44,190 hz |  **7.12x** |
+| Simple XML         |     1,000,869 hz | 90,488 hz | **11.06x** |
+| Complex OOXML      |       310,266 hz | 42,938 hz |  **7.23x** |
+| With captureSpaces |       313,183 hz | 41,814 hz |  **7.49x** |
 
 ### Stringifying (js2xml)
 
 | Scenario       | @office-open/xml |     xml-js |   Speedup |
 | -------------- | ---------------: | ---------: | --------: |
-| Simple element |       712,314 hz | 182,865 hz | **3.90x** |
-| Complex OOXML  |       333,739 hz | 125,132 hz | **2.67x** |
+| Simple element |       975,878 hz | 198,953 hz | **4.90x** |
+| Complex OOXML  |       492,220 hz | 107,815 hz | **4.57x** |
 
 ### Direct Conversion (toElement vs bridge)
 
 | Scenario |   toElement() | xml() + xml2js() bridge |    Speedup |
 | -------- | ------------: | ----------------------: | ---------: |
-| Simple   | 13,922,735 hz |            1,083,869 hz | **12.85x** |
-| Nested   |  3,799,372 hz |              436,241 hz |  **8.71x** |
+| Simple   | 13,199,415 hz |              805,104 hz | **16.40x** |
+| Nested   |  4,207,319 hz |              458,333 hz |  **9.18x** |
 
 ## Bundle Size
 

package/dist/index.d.mts

@@ -1,7 +1,7 @@
-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 "./utils-DTU54qj_.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 "./utils-DJSm61Ws.mjs";
 
 //#region src/serialize.d.ts
-declare function xml(input: Record<string, any> | Record<string, any>[], options?: boolean | string | {
+declare function xml(input: Record<string, unknown> | Record<string, unknown>[], options?: boolean | string | {
   indent?: boolean | string;
   declaration?: boolean | {
     encoding?: string;
@@ -50,4 +50,4 @@ declare function selfCloseElement(tag: string, attrStr?: string): string;
 /** 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, attrs, childCount, childText, children, collectText, colorAttr, escapeXml, findChild, findDeep, hasChild, js2xml, json2xml, nativeTypeValue, parseAttributes, selfCloseElement, textOf, toElement, unescapeXml, xml, xml2js, xml2json };
+export { type Attributes, type DeclarationAttributes, type Element, type ElementCompact, type ElementObject, type IgnoreOptions, type Js2XmlOptions, type Xml2JsOptions, type XmlAtom, type XmlAttrs, type XmlDesc, type XmlDescArray, type XmlObject, type XmlOption, allChildren, attr, attrBool, attrNum, attrs, childCount, childText, children, collectText, colorAttr, escapeXml, findChild, findDeep, hasChild, js2xml, json2xml, nativeTypeValue, parseAttributes, selfCloseElement, textOf, toElement, unescapeXml, xml, xml2js, xml2json };

package/dist/index.mjs

@@ -103,17 +103,28 @@ function formatElement(name, values, indent, depth) {
 		return `${indent ? indent.repeat(depth) : ""}<${name}${attrStr}/>`;
 	}
 	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[>");
+		const obj = values;
+		if (obj._attr) {
+			const attr = obj._attr;
+			for (const key of Object.keys(attr)) attrParts.push(`${key}="${escapeXml(String(attr[key]))}"`);
+		}
+		if (obj._attributes) {
+			const attr = obj._attributes;
+			for (const key of Object.keys(attr)) attrParts.push(`${key}="${escapeXml(String(attr[key]))}"`);
+		}
+		if (obj._cdata) {
+			const escaped = String(obj._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") {
+			else for (const value of values) if (value && typeof value === "object" && "_attr" in value) {
+				const attr = value._attr;
+				for (const key of Object.keys(attr)) attrParts.push(`${key}="${escapeXml(String(attr[key]))}"`);
+			} else if (value && typeof value === "object" && "_attributes" in value) {
+				const attr = value._attributes;
+				for (const key of Object.keys(attr)) attrParts.push(`${key}="${escapeXml(String(attr[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)));
@@ -418,39 +429,39 @@ function writeElement(element, opts, depth) {
 	return parts.join("");
 }
 function writeElements(elements, opts, depth, firstLine) {
-	let result = "";
+	const parts = [];
 	for (let i = 0; i < elements.length; i++) {
 		const element = elements[i];
 		const isFirst = firstLine && i === 0;
 		switch (element.type) {
 			case "element":
-				result += writeIndentation(opts.spaces, depth, isFirst);
-				result += writeElement(element, opts, depth);
+				parts.push(writeIndentation(opts.spaces, depth, isFirst));
+				parts.push(writeElement(element, opts, depth));
 				break;
 			case "text":
 				if (opts.ignoreText) continue;
-				if (opts.indentText) result += writeIndentation(opts.spaces, depth, isFirst);
-				result += writeText(element.text);
+				if (opts.indentText) parts.push(writeIndentation(opts.spaces, depth, isFirst));
+				parts.push(writeText(element.text));
 				break;
 			case "cdata":
 				if (opts.ignoreCdata) continue;
-				if (opts.indentCdata) result += writeIndentation(opts.spaces, depth, isFirst);
-				result += writeCdata(element.cdata);
+				if (opts.indentCdata) parts.push(writeIndentation(opts.spaces, depth, isFirst));
+				parts.push(writeCdata(element.cdata));
 				break;
 			case "comment":
 				if (opts.ignoreComment) continue;
-				result += writeIndentation(opts.spaces, depth, isFirst);
-				result += writeComment(element.comment);
+				parts.push(writeIndentation(opts.spaces, depth, isFirst));
+				parts.push(writeComment(element.comment));
 				break;
 			case "doctype":
 				if (opts.ignoreDoctype) continue;
-				result += writeIndentation(opts.spaces, depth, isFirst);
-				result += writeDoctype(element.doctype);
+				parts.push(writeIndentation(opts.spaces, depth, isFirst));
+				parts.push(writeDoctype(element.doctype));
 				break;
 			default: break;
 		}
 	}
-	return result;
+	return parts.join("");
 }
 function writeText(text) {
 	if (text == null) return "";

package/dist/{utils-DTU54qj_.d.mts → utils-DJSm61Ws.d.mts}

@@ -23,7 +23,7 @@ interface Element {
   parent?: Element;
 }
 interface ElementCompact {
-  [key: string]: any;
+  [key: string]: unknown;
   _declaration?: {
     _attributes?: DeclarationAttributes;
   };

package/dist/utils.d.mts

@@ -1,2 +1,2 @@
-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 "./utils-DTU54qj_.mjs";
+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 "./utils-DJSm61Ws.mjs";
 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.6.8",
+  "version": "0.6.10",
   "description": "XML parsing and serialization for Office Open XML. Zero dependencies, drop-in replacement for xml + xml-js.",
   "keywords": [
     "office-open",