@office-open/core 0.6.7 → 0.6.9

package/dist/{xml-components-ctIqansl.mjs → xml-components-BWnF8xox.mjs}

@@ -2,11 +2,6 @@ import { hpsMeasureValue } from "./values.mjs";
 import { escapeXml, xml, xml2js } from "@office-open/xml";
 //#region src/xml-components/base.ts
 /**
-* Base XML Component infrastructure for OOXML document generation.
-*
-* @module
-*/
-/**
 * Abstract base class for all XML components.
 */
 var BaseXmlComponent = class {
@@ -16,12 +11,14 @@ var BaseXmlComponent = class {
 		this.rootKey = rootKey;
 	}
 	/**
+	* @deprecated Use `toXml()` instead.
+	*/
+	prepForXml(_context) {}
+	/**
 	* Direct XML serialization. Override in subclasses for zero-allocation output.
-	* Default falls back to prepForXml() + xml().
 	*/
-	toXml(context) {
-		const obj = this.prepForXml(context);
-		return obj ? xml(obj) : "";
+	toXml(_context) {
+		return "";
 	}
 };
 //#endregion
@@ -55,7 +52,7 @@ var XmlComponent = class extends BaseXmlComponent {
 		this.root = [];
 	}
 	/**
-	* Prepares this component and its children for XML serialization.
+	* @deprecated Use `toXml()` instead.
 	*/
 	prepForXml(context) {
 		context.stack.push(this);
@@ -77,21 +74,12 @@ var XmlComponent = class extends BaseXmlComponent {
 		for (const child of this.root) if (child instanceof BaseXmlComponent) {
 			const s = child.toXml(context);
 			if (s) childParts.push(s);
-			if (!s && child.constructor.name === "NextAttributeComponent") {
-				const prepped = child.prepForXml(context);
-				if (prepped && typeof prepped === "object" && "_attr" in prepped) {
-					const a = prepped._attr;
-					for (const key of Object.keys(a)) attrParts.push(`${key}="${escapeXml(String(a[key]))}"`);
-				}
-			}
 		} else if (typeof child === "string") childParts.push(escapeXml(child));
-		else if (child != null && typeof child === "object") if ("_attr" in child) {
-			const a = child._attr;
-			for (const key of Object.keys(a)) attrParts.push(`${key}="${escapeXml(String(a[key]))}"`);
-		} else if ("_attributes" in child) {
-			const a = child._attributes;
-			for (const key of Object.keys(a)) attrParts.push(`${key}="${escapeXml(String(a[key]))}"`);
-		} else childParts.push(xml(child));
+		else if (child != null && typeof child === "object") {
+			const a = "_attr" in child ? child._attr : "_attributes" in child ? child._attributes : null;
+			if (a) for (const key of Object.keys(a)) attrParts.push(`${key}="${escapeXml(String(a[key]))}"`);
+			else childParts.push(xml(child));
+		}
 		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
 		const body = childParts.join("");
 		return body.length === 0 ? `<${this.rootKey}${attrStr}/>` : `<${this.rootKey}${attrStr}>${body}</${this.rootKey}>`;
@@ -113,10 +101,13 @@ var IgnoreIfEmptyXmlComponent = class extends XmlComponent {
 		super(rootKey);
 		this.includeIfEmpty = includeIfEmpty;
 	}
+	/**
+	* @deprecated Use `toXml()` instead.
+	*/
 	prepForXml(context) {
+		if (this.includeIfEmpty) return super.prepForXml(context);
 		const result = super.prepForXml(context);
-		if (this.includeIfEmpty) return result;
-		if (result && (typeof result[this.rootKey] !== "object" || Object.keys(result[this.rootKey]).length)) return result;
+		return result && result[this.rootKey] === EMPTY_OBJECT ? void 0 : result;
 	}
 	/**
 	* Suppress empty elements — super.toXml() produces a self-closing tag
@@ -131,56 +122,6 @@ var IgnoreIfEmptyXmlComponent = class extends XmlComponent {
 	}
 };
 //#endregion
-//#region src/xml-components/attributes.ts
-/**
-* XML attribute components for OOXML document generation.
-*
-* @module
-*/
-/**
-* Base class for creating XML attributes with automatic name mapping.
-*/
-var XmlAttributeComponent = class extends BaseXmlComponent {
-	/** Optional mapping from property names to XML attribute names. */
-	xmlKeys;
-	constructor(root) {
-		super("_attr");
-		this.root = root;
-	}
-	prepForXml(_) {
-		const attrs = {};
-		Object.entries(this.root).forEach(([key, value]) => {
-			if (value !== void 0) {
-				const newKey = this.xmlKeys && this.xmlKeys[key] || key;
-				attrs[newKey] = value;
-			}
-		});
-		return { _attr: attrs };
-	}
-};
-/**
-* Next-generation attribute component with explicit key-value pairs.
-*/
-var NextAttributeComponent = class extends BaseXmlComponent {
-	constructor(root) {
-		super("_attr");
-		this.root = root;
-	}
-	prepForXml(_) {
-		const attrs = {};
-		const values = Object.values(this.root);
-		for (let i = 0; i < values.length; i++) {
-			const { key, value } = values[i];
-			if (value !== void 0) attrs[key] = value;
-		}
-		return { _attr: attrs };
-	}
-	/** Attribute components produce no XML output — attrs are inlined by the parent. */
-	toXml(_context) {
-		return "";
-	}
-};
-//#endregion
 //#region src/xml-components/elements.ts
 /**
 * Simple XML element types for common OOXML patterns.
@@ -269,12 +210,17 @@ var BuilderElement = class extends XmlComponent {
 	}
 };
 /**
-* Creates a NextAttributeComponent with explicit XML attribute keys.
+* Builds an attribute-only IXmlableObject from a plain key-value record.
 */
-const chartAttr = (attrs) => new NextAttributeComponent(Object.fromEntries(Object.entries(attrs).map(([key, value]) => [key, {
-	key,
-	value
-}])));
+function buildAttrObject(attrs) {
+	const result = {};
+	for (const [key, value] of Object.entries(attrs)) if (value !== void 0) result[key] = value;
+	return Object.keys(result).length > 0 ? { _attr: result } : EMPTY_OBJECT;
+}
+/**
+* Creates an attribute IXmlableObject for chart elements.
+*/
+const chartAttr = (attrs) => buildAttrObject(attrs);
 /**
 * Wraps a component in a named XmlComponent element.
 */
@@ -340,15 +286,24 @@ var ImportedXmlComponent = class extends XmlComponent {
 };
 /**
 * Represents attributes for imported root elements.
+* The { _attr } in root is consumed by the parent's toXml() serialization.
 */
 var ImportedRootElementAttributes = class extends XmlComponent {
+	_attr;
 	constructor(_attr) {
 		super("");
 		this._attr = _attr;
+		if (_attr) this.root.push({ _attr });
 	}
-	prepForXml(_) {
+	/**
+	* @deprecated Use `toXml()` instead.
+	*/
+	prepForXml(_context) {
 		return { _attr: this._attr };
 	}
+	toXml(_context) {
+		return "";
+	}
 };
 //#endregion
 //#region src/xml-components/initializable.ts
@@ -367,4 +322,4 @@ var InitializableXmlComponent = class extends XmlComponent {
 	}
 };
 //#endregion
-export { XmlAttributeComponent as _, BuilderElement as a, XmlComponent as b, chartAttr as c, onOffObj as d, stringContainerObj as f, NextAttributeComponent as g, wrapEl as h, convertToXmlComponent as i, hpsMeasureObj as l, stringValObj as m, ImportedRootElementAttributes as n, EmptyElement as o, stringEnumValObj as p, ImportedXmlComponent as r, attrObj as s, InitializableXmlComponent as t, numberValObj as u, EMPTY_OBJECT as v, BaseXmlComponent as x, IgnoreIfEmptyXmlComponent as y };
+export { EMPTY_OBJECT as _, BuilderElement as a, BaseXmlComponent as b, buildAttrObject as c, numberValObj as d, onOffObj as f, wrapEl as g, stringValObj as h, convertToXmlComponent as i, chartAttr as l, stringEnumValObj as m, ImportedRootElementAttributes as n, EmptyElement as o, stringContainerObj as p, ImportedXmlComponent as r, attrObj as s, InitializableXmlComponent as t, hpsMeasureObj as u, IgnoreIfEmptyXmlComponent as v, XmlComponent as y };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-open/core",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "description": "Shared OOXML infrastructure: XmlComponent, value validators, unit converters",
   "keywords": [
     "core",
@@ -55,7 +55,7 @@
     "fflate": "0.8.3",
     "hash.js": "1.1.7",
     "nanoid": "5.1.11",
-    "@office-open/xml": "0.6.7"
+    "@office-open/xml": "0.6.9"
   },
   "scripts": {
     "dev": "basis build --stub",