@office-open/xml 0.9.3 → 0.9.4

package/dist/index.mjs

@@ -204,9 +204,14 @@ const ENTITY_MAP = {
 	""": "\"",
 	"'": "'"
 };
-const ENTITY_PATTERN = /&(amp|lt|gt|quot|apos);/g;
+const ENTITY_PATTERN = /&(?:amp|lt|gt|quot|apos|#x[0-9a-fA-F]+|#[0-9]+);/g;
 function unescapeXml(str) {
-	return str.replace(ENTITY_PATTERN, (match) => ENTITY_MAP[match]);
+	return str.replace(ENTITY_PATTERN, (match) => {
+		if (ENTITY_MAP[match] !== void 0) return ENTITY_MAP[match];
+		const body = match.slice(2, -1);
+		const code = body[0] === "x" || body[0] === "X" ? parseInt(body.slice(1), 16) : parseInt(body, 10);
+		return Number.isFinite(code) && code >= 0 ? String.fromCodePoint(code) : match;
+	});
 }
 function nativeTypeValue(value) {
 	if (value === "") return value;
@@ -231,10 +236,6 @@ function parse(xmlString, options) {
 	let i = 0;
 	const len = xmlString.length;
 	while (i < len) {
-		if (!captureSpaces && isWhitespace(xmlString.charCodeAt(i))) {
-			i++;
-			continue;
-		}
 		if (xmlString.charCodeAt(i) !== 60) {
 			const start = i;
 			while (i < len && xmlString.charCodeAt(i) !== 60) i++;
@@ -242,7 +243,7 @@ function parse(xmlString, options) {
 			if (trim) text = text.trim();
 			if (ignoreText) continue;
 			if (text.length > 0) {
-				if (captureSpaces || text.trim().length > 0) addField(stack[stack.length - 1], "text", text);
+				if (captureSpaces || text.trim().length > 0 || isPreserveContext(stack)) addField(stack[stack.length - 1], "text", text);
 			}
 			continue;
 		}
@@ -355,7 +356,7 @@ function parseAttributesFromXml(str, start) {
 		i++;
 		const valueStart = i;
 		while (i < len && str.charCodeAt(i) !== quote) i++;
-		attrs[name] = str.slice(valueStart, i);
+		attrs[name] = unescapeXml(str.slice(valueStart, i));
 		i++;
 	}
 	return {
@@ -385,17 +386,33 @@ function parseAttributes(str) {
 		i++;
 		const valueStart = i;
 		while (i < len && str.charCodeAt(i) !== quote) i++;
-		result[name] = str.slice(valueStart, i);
+		result[name] = unescapeXml(str.slice(valueStart, i));
 		i++;
 	}
 	return result;
 }
 function addField(parent, type, value) {
 	if (!parent.elements) parent.elements = [];
+	if (type === "text" || type === "cdata") {
+		const last = parent.elements[parent.elements.length - 1];
+		if (last && last.type === type) {
+			const key = type;
+			last[key] = last[key] + value;
+			return;
+		}
+	}
 	const element = { type };
 	element[type] = value;
 	parent.elements.push(element);
 }
+/** True when the nearest ancestor with an explicit xml:space sets "preserve". */
+function isPreserveContext(stack) {
+	for (let i = stack.length - 1; i >= 0; i--) {
+		const space = stack[i].attributes?.["xml:space"];
+		if (space !== void 0) return space === "preserve";
+	}
+	return false;
+}
 function isWhitespace(ch) {
 	return ch === 32 || ch === 9 || ch === 10 || ch === 13;
 }
@@ -455,8 +472,8 @@ function writeAttributes(attributes, elementName, element, attributeValueFn) {
 	for (const key of Object.keys(attributes)) {
 		const value = attributes[key];
 		if (value === null || value === void 0) continue;
-		let attr = String(value).replace(/"/g, "&quot;");
-		if (attributeValueFn) attr = attributeValueFn(attr, key, elementName, element);
+		const raw = String(value);
+		const attr = attributeValueFn ? attributeValueFn(raw, key, elementName, element) : escapeXml(raw);
 		parts.push(` ${key}="${attr}"`);
 	}
 	return parts.join("");

package/package.json

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