@haklex/rich-litexml 0.41.0 → 0.42.0

package/dist/browser.mjs

@@ -1,4 +1,4 @@
-import { a as createDefaultRegistry, c as LitexmlRegistry, d as registerParseHTML, i as deserializeNodesFromXml, l as registerCustomReaders, n as serializeToXml, o as registerCustomWriters, r as deserializeFromXml, s as registerBuiltinWriters, t as serializeNodesToXml, u as registerBuiltinReaders } from "./src-D18H2iDy.js";
+import { a as createDefaultRegistry, c as LitexmlRegistry, d as registerParseHTML, i as deserializeNodesFromXml, l as registerCustomReaders, n as serializeToXml, o as registerCustomWriters, r as deserializeFromXml, s as registerBuiltinWriters, t as serializeNodesToXml, u as registerBuiltinReaders } from "./src-DY5NNS6M.js";
 //#region src/index-browser.ts
 registerParseHTML((html) => new DOMParser().parseFromString(html, "text/html"));
 //#endregion

package/dist/node.mjs

@@ -1,4 +1,4 @@
-import { a as createDefaultRegistry, c as LitexmlRegistry, d as registerParseHTML, i as deserializeNodesFromXml, l as registerCustomReaders, n as serializeToXml, o as registerCustomWriters, r as deserializeFromXml, s as registerBuiltinWriters, t as serializeNodesToXml, u as registerBuiltinReaders } from "./src-D18H2iDy.js";
+import { a as createDefaultRegistry, c as LitexmlRegistry, d as registerParseHTML, i as deserializeNodesFromXml, l as registerCustomReaders, n as serializeToXml, o as registerCustomWriters, r as deserializeFromXml, s as registerBuiltinWriters, t as serializeNodesToXml, u as registerBuiltinReaders } from "./src-DY5NNS6M.js";
 import { parseHTML } from "linkedom";
 //#region src/index-node.ts
 registerParseHTML((html) => parseHTML(html).document);

package/dist/{src-D18H2iDy.js → src-DY5NNS6M.js}

@@ -1134,8 +1134,11 @@ var FORMAT_TAG_TO_BIT = {
 };
 /** Wrap text content with nested format tags based on bitmask. */
 function wrapWithFormatTags(text, format) {
-	if (format === 0) return [text];
-	let content = [text];
+	return wrapContentWithFormatTags([text], format);
+}
+/** Wrap already-serialized inline content with nested format tags based on bitmask. */
+function wrapContentWithFormatTags(content, format) {
+	if (format === 0) return content;
 	for (let idx = FORMAT_BIT_TO_TAG.length - 1; idx >= 0; idx--) {
 		const [bit, tag] = FORMAT_BIT_TO_TAG[idx];
 		if (format & bit) content = [{
@@ -1488,10 +1491,58 @@ function serializeNodesToXml(nodes, registry, options = {}) {
 	const ctx = createWriterContext(registry);
 	return renderXml(nodes.flatMap((node) => ctx.serializeNode(node)), 0, options);
 }
+function isTextRun(node) {
+	return node.type === "text";
+}
+function serializeTextRun(run) {
+	if (run.length === 1) return wrapWithFormatTags(run[0].text, run[0].format);
+	const common = run.reduce((acc, node) => acc & node.format, -1);
+	if (common !== 0) return wrapContentWithFormatTags(serializeTextRun(run.map((node) => ({
+		...node,
+		format: node.format & ~common
+	}))), common);
+	const groups = [];
+	let current;
+	let previous;
+	for (const node of run) {
+		if (current && previous && (previous.format & node.format) !== 0) current.push(node);
+		else {
+			current = [node];
+			groups.push(current);
+		}
+		previous = node;
+	}
+	if (groups.length === 1) return run.flatMap((node) => wrapWithFormatTags(node.text, node.format));
+	return groups.flatMap((group) => serializeTextRun(group));
+}
+function serializeSiblings(nodes, ctx) {
+	const out = [];
+	let run = [];
+	const flush = () => {
+		if (run.length > 0) out.push(...serializeTextRun(run));
+		run = [];
+	};
+	for (const node of nodes) {
+		if (isTextRun(node)) {
+			const n = node;
+			run.push({
+				text: n.text ?? "",
+				format: n.format ?? 0
+			});
+			continue;
+		}
+		flush();
+		const result = ctx.serializeNode(node);
+		if (Array.isArray(result)) out.push(...result);
+		else out.push(result);
+	}
+	flush();
+	return out;
+}
 function createWriterContext(registry) {
 	const ctx = {
 		serializeChildren(children) {
-			return children.flatMap((child) => ctx.serializeNode(child));
+			return serializeSiblings(children, ctx);
 		},
 		serializeNode(node) {
 			const n = node;
@@ -1508,7 +1559,7 @@ function createWriterContext(registry) {
 			return serializeFallback(node);
 		},
 		serializeNestedState(state) {
-			return (state.root.children ?? []).flatMap((child) => ctx.serializeNode(child));
+			return serializeSiblings(state.root.children ?? [], ctx);
 		}
 	};
 	return ctx;

package/dist/text-format.d.ts

@@ -14,6 +14,8 @@ export declare const FORMAT_BITS: {
 export declare const FORMAT_TAG_TO_BIT: Record<string, number>;
 /** Wrap text content with nested format tags based on bitmask. */
 export declare function wrapWithFormatTags(text: string, format: number): XmlContent[];
+/** Wrap already-serialized inline content with nested format tags based on bitmask. */
+export declare function wrapContentWithFormatTags(content: XmlContent[], format: number): XmlContent[];
 /** Check if a tag name is a known text format tag. */
 export declare function isFormatTag(tagName: string): boolean;
 /** Get the format bit for a tag name. Returns 0 if not a format tag. */

package/dist/text-format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"text-format.d.ts","sourceRoot":"","sources":["../src/text-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,SAAS,CAAC;AAEtD,yCAAyC;AACzC,eAAO,MAAM,WAAW;;;;;;;;;CASd,CAAC;AAcX,+DAA+D;AAC/D,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAapD,CAAC;AAEF,kEAAkE;AAClE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,EAAE,CAa7E;AAED,sDAAsD;AACtD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEpD;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEpD"}
+{"version":3,"file":"text-format.d.ts","sourceRoot":"","sources":["../src/text-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,SAAS,CAAC;AAEtD,yCAAyC;AACzC,eAAO,MAAM,WAAW;;;;;;;;;CASd,CAAC;AAcX,+DAA+D;AAC/D,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAapD,CAAC;AAEF,kEAAkE;AAClE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,EAAE,CAE7E;AAED,uFAAuF;AACvF,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,EAAE,CAW7F;AAED,sDAAsD;AACtD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEpD;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEpD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haklex/rich-litexml",
-  "version": "0.41.0",
+  "version": "0.42.0",
   "description": "Bidirectional Lexical SerializedNode <-> XML conversion with plugin registry",
   "repository": {
     "type": "git",