@office-open/xml 0.6.5 → 0.6.7

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          |     4,823,128 hz | 781,207 hz | **6.17x** |
-| Nested element          |       947,678 hz | 313,665 hz | **3.02x** |
-| Nested with declaration |       899,301 hz | 266,551 hz | **3.37x** |
+| 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** |
 
 ### Parsing (xml2js)
 
-| Scenario           | @office-open/xml |     xml-js |    Speedup |
-| ------------------ | ---------------: | ---------: | ---------: |
-| Simple XML         |     1,083,833 hz | 100,053 hz | **10.83x** |
-| Complex OOXML      |       364,581 hz |  51,730 hz |  **7.05x** |
-| With captureSpaces |       375,042 hz |  51,373 hz |  **7.30x** |
+| 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** |
 
 ### Stringifying (js2xml)
 
 | Scenario       | @office-open/xml |     xml-js |   Speedup |
 | -------------- | ---------------: | ---------: | --------: |
-| Simple element |       767,535 hz | 194,930 hz | **3.94x** |
-| Complex OOXML  |       367,936 hz | 130,716 hz | **2.81x** |
+| Simple element |       712,314 hz | 182,865 hz | **3.90x** |
+| Complex OOXML  |       333,739 hz | 125,132 hz | **2.67x** |
 
 ### Direct Conversion (toElement vs bridge)
 
 | Scenario |   toElement() | xml() + xml2js() bridge |    Speedup |
 | -------- | ------------: | ----------------------: | ---------: |
-| Simple   | 15,895,382 hz |            1,079,249 hz | **14.72x** |
-| Nested   |  4,077,988 hz |              465,743 hz |  **8.76x** |
+| Simple   | 13,922,735 hz |            1,083,869 hz | **12.85x** |
+| Nested   |  3,799,372 hz |              436,241 hz |  **8.71x** |
 
 ## Bundle Size
 

package/dist/index.d.mts

@@ -30,11 +30,6 @@ declare function toElement(xmlObject: Record<string, any>): Element;
 //#region src/escape.d.ts
 /** Escape text content for XML. Fast path returns original string when no special chars. */
 declare function escapeXml(str: string): string;
-/**
- * Escape attribute value matching xml-js's js2xml behavior.
- * 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.
@@ -45,9 +40,14 @@ declare function escapeAttributeValue(str: string): string;
  * // => ' id="1" name="foo"'
  */
 declare function attrs(record: Record<string, string | number | boolean | undefined>): string;
+/**
+ * Build a self-closing XML element: `<tag attrStr/>`.
+ * `attrStr` is a pre-serialized attribute string (from `attrs()`) or undefined.
+ */
+declare function selfCloseElement(tag: string, attrStr?: string): 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, attrs, childCount, childText, children, collectText, colorAttr, escapeAttributeValue, escapeXml, findChild, findDeep, hasChild, js2xml, json2xml, nativeTypeValue, parseAttributes, textOf, toElement, unescapeXml, 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, escapeXml, findChild, findDeep, hasChild, js2xml, json2xml, nativeTypeValue, parseAttributes, selfCloseElement, textOf, toElement, unescapeXml, xml, xml2js, xml2json };

package/dist/index.mjs

@@ -1,29 +1,37 @@
 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 = {
-	"&": "&",
-	"\"": """,
-	"'": "'",
-	"<": "&lt;",
-	">": "&gt;"
-};
-const XML_CHAR_PATTERN = /([&"<>'])/g;
 /** Escape text content for XML. Fast path returns original string when no special chars. */
 function escapeXml(str) {
 	for (let i = 0; i < str.length; i++) {
 		const c = str.charCodeAt(i);
-		if (c === 38 || c === 34 || c === 39 || c === 60 || c === 62) return str.replace(XML_CHAR_PATTERN, (ch) => XML_CHAR_MAP[ch]);
+		if (c === 38 || c === 34 || c === 39 || c === 60 || c === 62) {
+			let s = "";
+			let last = 0;
+			for (let j = i; j < str.length; j++) {
+				const cj = str.charCodeAt(j);
+				if (cj === 38) {
+					s += str.slice(last, j) + "&amp;";
+					last = j + 1;
+				} else if (cj === 34) {
+					s += str.slice(last, j) + "&quot;";
+					last = j + 1;
+				} else if (cj === 39) {
+					s += str.slice(last, j) + "&apos;";
+					last = j + 1;
+				} else if (cj === 60) {
+					s += str.slice(last, j) + "&lt;";
+					last = j + 1;
+				} else if (cj === 62) {
+					s += str.slice(last, j) + "&gt;";
+					last = j + 1;
+				}
+			}
+			return s + str.slice(last);
+		}
 	}
 	return str;
 }
 /**
-* Escape attribute value matching xml-js's js2xml behavior.
-* Handles already-escaped entities to prevent double-escaping.
-*/
-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`.
@@ -34,9 +42,20 @@ function escapeAttributeValue(str) {
 */
 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}"`;
+	const keys = Object.keys(record);
+	for (let i = 0; i < keys.length; i++) {
+		const v = record[keys[i]];
+		if (v !== void 0) s += ` ${keys[i]}="${typeof v === "string" ? escapeXml(v) : v}"`;
+	}
 	return s;
 }
+/**
+* Build a self-closing XML element: `<tag attrStr/>`.
+* `attrStr` is a pre-serialized attribute string (from `attrs()`) or undefined.
+*/
+function selfCloseElement(tag, attrStr) {
+	return attrStr ? `<${tag}${attrStr}/>` : `<${tag}/>`;
+}
 //#endregion
 //#region src/serialize.ts
 const DEFAULT_INDENT = "    ";
@@ -435,7 +454,29 @@ function writeElements(elements, opts, depth, firstLine) {
 }
 function writeText(text) {
 	if (text == null) return "";
-	return String(text).replace(/&amp;/g, "&").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+	const str = String(text);
+	for (let i = 0; i < str.length; i++) {
+		const c = str.charCodeAt(i);
+		if (c === 38 || c === 60 || c === 62) {
+			let s = "";
+			let last = 0;
+			for (let j = i; j < str.length; j++) {
+				const cj = str.charCodeAt(j);
+				if (cj === 38) {
+					s += str.slice(last, j) + "&amp;";
+					last = j + 1;
+				} else if (cj === 60) {
+					s += str.slice(last, j) + "&lt;";
+					last = j + 1;
+				} else if (cj === 62) {
+					s += str.slice(last, j) + "&gt;";
+					last = j + 1;
+				}
+			}
+			return s + str.slice(last);
+		}
+	}
+	return str;
 }
 function writeCdata(cdata) {
 	if (cdata == null) return "";
@@ -501,4 +542,4 @@ function xml2json(xml, options) {
 	return JSON.stringify(xml2js(xml, options));
 }
 //#endregion
-export { allChildren, attr, attrBool, attrNum, attrs, childCount, childText, children, collectText, colorAttr, escapeAttributeValue, escapeXml, findChild, findDeep, hasChild, js2xml, json2xml, nativeTypeValue, parseAttributes, textOf, toElement, unescapeXml, xml, xml2js, xml2json };
+export { 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/package.json

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