@haklex/rich-litexml 0.39.3 → 0.39.4

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-h5Q0X5zw.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-D18H2iDy.js";
 //#region src/index-browser.ts
 registerParseHTML((html) => new DOMParser().parseFromString(html, "text/html"));
 //#endregion

package/dist/deserializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deserializer.d.ts","sourceRoot":"","sources":["../src/deserializer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAG5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAwElD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,GAAG,qBAAqB,CAkBhG;AAED,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,eAAe,GACxB,qBAAqB,EAAE,CAKzB"}
+{"version":3,"file":"deserializer.d.ts","sourceRoot":"","sources":["../src/deserializer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAG5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAyElD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,GAAG,qBAAqB,CAkBhG;AAED,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,eAAe,GACxB,qBAAqB,EAAE,CAKzB"}

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-h5Q0X5zw.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-D18H2iDy.js";
 import { parseHTML } from "linkedom";
 //#region src/index-node.ts
 registerParseHTML((html) => parseHTML(html).document);

package/dist/readers/builtin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builtin.d.ts","sourceRoot":"","sources":["../../src/readers/builtin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAgBnD,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI,CAiLtE"}
+{"version":3,"file":"builtin.d.ts","sourceRoot":"","sources":["../../src/readers/builtin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAgBnD,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI,CA0LtE"}

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

@@ -38,14 +38,15 @@ function registerBuiltinReaders(registry) {
 	}));
 	registry.registerReader("blockquote", (el, ctx) => {
 		const attribution = el.getAttribute("attribution");
+		const isRichQuote = el.getAttribute("rich") !== null || attribution !== null;
 		const base = {
 			...extractBlockId$1(el),
 			children: ctx.parseChildren(el),
 			...ELEMENT_DEFAULTS
 		};
-		if (attribution !== null) return {
+		if (isRichQuote) return {
 			type: "rich-quote",
-			attribution,
+			attribution: attribution?.trim() ? attribution : null,
 			...base
 		};
 		return {
@@ -100,7 +101,7 @@ function registerBuiltinReaders(registry) {
 		url: el.getAttribute("href") ?? "",
 		target: el.getAttribute("target") ?? null,
 		title: el.getAttribute("title") ?? null,
-		rel: null,
+		rel: el.getAttribute("rel"),
 		children: ctx.parseChildren(el),
 		direction: "ltr",
 		format: "",
@@ -621,7 +622,10 @@ function registerBuiltinWriters(registry) {
 	const writeQuote = (node, ctx) => {
 		const n = node;
 		const attrs = { ...blockId$1(n) };
-		if (typeof n.attribution === "string" && n.attribution.trim() !== "") attrs.attribution = n.attribution;
+		if (n.type === "rich-quote") {
+			if ((typeof n.attribution === "string" ? n.attribution.trim() : "") !== "") attrs.attribution = n.attribution;
+			else attrs.rich = "true";
+		}
 		return {
 			tag: "blockquote",
 			attrs,
@@ -660,9 +664,10 @@ function registerBuiltinWriters(registry) {
 	});
 	registry.registerWriter("link", (node, ctx) => {
 		const n = node;
-		const attrs = { href: n.url ?? "" };
-		if (n.target) attrs.target = n.target;
-		if (n.title) attrs.title = n.title;
+		const attrs = { href: typeof n.url === "string" ? n.url : "" };
+		if (typeof n.target === "string" && n.target !== "") attrs.target = n.target;
+		if (typeof n.title === "string" && n.title !== "") attrs.title = n.title;
+		if (typeof n.rel === "string" && n.rel !== "") attrs.rel = n.rel;
 		return {
 			tag: "a",
 			attrs,
@@ -1149,6 +1154,114 @@ function getFormatBit(tagName) {
 	return FORMAT_TAG_TO_BIT[tagName.toLowerCase()] ?? 0;
 }
 //#endregion
+//#region src/xml-utils.ts
+var ESCAPE_MAP = {
+	"&": "&",
+	"<": "&lt;",
+	">": "&gt;",
+	"\"": "&quot;",
+	"'": "&apos;"
+};
+function escapeXml(text) {
+	return text.replaceAll(/["&'<>]/g, (ch) => ESCAPE_MAP[ch]);
+}
+function buildAttrs(attrs) {
+	return Object.entries(attrs).filter(([, v]) => v !== void 0 && v !== "").map(([k, v]) => ` ${k}="${escapeXml(v)}"`).join("");
+}
+function isCdata(item) {
+	return typeof item === "object" && "cdata" in item;
+}
+function renderCdata(item) {
+	return `<![CDATA[${item.cdata}]]>`;
+}
+/** Render XmlContent tree to XML string. */
+function renderXml(content, indent = 0, options = {}) {
+	const lines = [];
+	for (const item of content) if (typeof item === "string") lines.push(escapeXml(item));
+	else if (isCdata(item)) lines.push(renderCdata(item));
+	else lines.push(renderElement(item, indent, options));
+	return lines.join("");
+}
+function renderElement(el, indent, options) {
+	const attrs = el.attrs ? buildAttrs(el.attrs) : "";
+	const compact = options.compact === true;
+	if (el.selfClosing) return compact ? `<${el.tag}${attrs} />` : `${pad(indent)}<${el.tag}${attrs} />\n`;
+	if (!el.children || el.children.length === 0) return compact ? `<${el.tag}${attrs} />` : `${pad(indent)}<${el.tag}${attrs} />\n`;
+	if (el.children.every((c) => typeof c === "string" || isCdata(c) || isInlineElement(c))) {
+		const inner = el.children.map((c) => {
+			if (typeof c === "string") return escapeXml(c);
+			if (isCdata(c)) return renderCdata(c);
+			return renderInline(c);
+		}).join("");
+		return compact ? `<${el.tag}${attrs}>${inner}</${el.tag}>` : `${pad(indent)}<${el.tag}${attrs}>${inner}</${el.tag}>\n`;
+	}
+	if (compact) {
+		const inner = el.children.map((c) => {
+			if (typeof c === "string") return escapeXml(c);
+			if (isCdata(c)) return renderCdata(c);
+			return renderElement(c, indent + 1, options);
+		}).join("");
+		return `<${el.tag}${attrs}>${inner}</${el.tag}>`;
+	}
+	const inner = el.children.map((c) => {
+		if (typeof c === "string") return `${pad(indent + 1)}${escapeXml(c)}\n`;
+		if (isCdata(c)) return `${pad(indent + 1)}${renderCdata(c)}\n`;
+		return renderElement(c, indent + 1, options);
+	}).join("");
+	return `${pad(indent)}<${el.tag}${attrs}>\n${inner}${pad(indent)}</${el.tag}>\n`;
+}
+function renderInline(el) {
+	const attrs = el.attrs ? buildAttrs(el.attrs) : "";
+	if (el.selfClosing || !el.children || el.children.length === 0) return `<${el.tag}${attrs} />`;
+	const inner = el.children.map((c) => {
+		if (typeof c === "string") return escapeXml(c);
+		if (isCdata(c)) return renderCdata(c);
+		return renderInline(c);
+	}).join("");
+	return `<${el.tag}${attrs}>${inner}</${el.tag}>`;
+}
+/**
+* Elements that sit inside a text run without forcing a line break, so the
+* serializer keeps them on the same line as their siblings and the reader does
+* not mistake the surrounding indentation for content.
+*
+* The void elements (`br`, `img`) belong here: a paragraph holding a line break
+* or an inline image is still a single line of prose.
+*/
+var INLINE_TAGS = /* @__PURE__ */ new Set([
+	"b",
+	"i",
+	"u",
+	"s",
+	"code",
+	"sub",
+	"sup",
+	"mark",
+	"strong",
+	"em",
+	"del",
+	"a",
+	"mention",
+	"tag",
+	"spoiler",
+	"ruby",
+	"math",
+	"footnote",
+	"comment",
+	"br",
+	"img"
+]);
+/** Tags rendered inline (no line break between siblings). */
+function isInlineTag(tag) {
+	return INLINE_TAGS.has(tag.toLowerCase());
+}
+function isInlineElement(el) {
+	return isInlineTag(el.tag);
+}
+function pad(indent) {
+	return "  ".repeat(indent);
+}
+//#endregion
 //#region src/deserializer.ts
 /**
 * HTML5 void elements — tags the HTML parser already treats as self-closing
@@ -1256,7 +1369,8 @@ function isBlockContainer(element) {
 function createReaderContext(registry) {
 	const ctx = {
 		parseChildren(element) {
-			const blockLevel = isBlockContainer(element);
+			const holdsBlockChild = [...element.children].some((child) => !isInlineTag(child.tagName));
+			const blockLevel = isBlockContainer(element) || holdsBlockChild;
 			const nodes = [];
 			let pendingText = "";
 			const flushText = () => {
@@ -1345,99 +1459,6 @@ function makeTextNode(text, format) {
 	};
 }
 //#endregion
-//#region src/xml-utils.ts
-var ESCAPE_MAP = {
-	"&": "&amp;",
-	"<": "&lt;",
-	">": "&gt;",
-	"\"": "&quot;",
-	"'": "&apos;"
-};
-function escapeXml(text) {
-	return text.replaceAll(/["&'<>]/g, (ch) => ESCAPE_MAP[ch]);
-}
-function buildAttrs(attrs) {
-	return Object.entries(attrs).filter(([, v]) => v !== void 0 && v !== "").map(([k, v]) => ` ${k}="${escapeXml(v)}"`).join("");
-}
-function isCdata(item) {
-	return typeof item === "object" && "cdata" in item;
-}
-function renderCdata(item) {
-	return `<![CDATA[${item.cdata}]]>`;
-}
-/** Render XmlContent tree to XML string. */
-function renderXml(content, indent = 0, options = {}) {
-	const lines = [];
-	for (const item of content) if (typeof item === "string") lines.push(escapeXml(item));
-	else if (isCdata(item)) lines.push(renderCdata(item));
-	else lines.push(renderElement(item, indent, options));
-	return lines.join("");
-}
-function renderElement(el, indent, options) {
-	const attrs = el.attrs ? buildAttrs(el.attrs) : "";
-	const compact = options.compact === true;
-	if (el.selfClosing) return compact ? `<${el.tag}${attrs} />` : `${pad(indent)}<${el.tag}${attrs} />\n`;
-	if (!el.children || el.children.length === 0) return compact ? `<${el.tag}${attrs} />` : `${pad(indent)}<${el.tag}${attrs} />\n`;
-	if (el.children.every((c) => typeof c === "string" || isCdata(c) || isInlineElement(c))) {
-		const inner = el.children.map((c) => {
-			if (typeof c === "string") return escapeXml(c);
-			if (isCdata(c)) return renderCdata(c);
-			return renderInline(c);
-		}).join("");
-		return compact ? `<${el.tag}${attrs}>${inner}</${el.tag}>` : `${pad(indent)}<${el.tag}${attrs}>${inner}</${el.tag}>\n`;
-	}
-	if (compact) {
-		const inner = el.children.map((c) => {
-			if (typeof c === "string") return escapeXml(c);
-			if (isCdata(c)) return renderCdata(c);
-			return renderElement(c, indent + 1, options);
-		}).join("");
-		return `<${el.tag}${attrs}>${inner}</${el.tag}>`;
-	}
-	const inner = el.children.map((c) => {
-		if (typeof c === "string") return `${pad(indent + 1)}${escapeXml(c)}\n`;
-		if (isCdata(c)) return `${pad(indent + 1)}${renderCdata(c)}\n`;
-		return renderElement(c, indent + 1, options);
-	}).join("");
-	return `${pad(indent)}<${el.tag}${attrs}>\n${inner}${pad(indent)}</${el.tag}>\n`;
-}
-function renderInline(el) {
-	const attrs = el.attrs ? buildAttrs(el.attrs) : "";
-	if (el.selfClosing || !el.children || el.children.length === 0) return `<${el.tag}${attrs} />`;
-	const inner = el.children.map((c) => {
-		if (typeof c === "string") return escapeXml(c);
-		if (isCdata(c)) return renderCdata(c);
-		return renderInline(c);
-	}).join("");
-	return `<${el.tag}${attrs}>${inner}</${el.tag}>`;
-}
-function isInlineElement(el) {
-	return (/* @__PURE__ */ new Set([
-		"b",
-		"i",
-		"u",
-		"s",
-		"code",
-		"sub",
-		"sup",
-		"mark",
-		"strong",
-		"em",
-		"del",
-		"a",
-		"mention",
-		"tag",
-		"spoiler",
-		"ruby",
-		"math",
-		"footnote",
-		"comment"
-	])).has(el.tag);
-}
-function pad(indent) {
-	return "  ".repeat(indent);
-}
-//#endregion
 //#region src/serializer.ts
 function serializeToXml(state, registry, options = {}) {
 	const children = state.root.children ?? [];

package/dist/writers/builtin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builtin.d.ts","sourceRoot":"","sources":["../../src/writers/builtin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAOnD,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI,CAwHtE"}
+{"version":3,"file":"builtin.d.ts","sourceRoot":"","sources":["../../src/writers/builtin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAOnD,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI,CAoJtE"}

package/dist/xml-utils.d.ts

@@ -6,4 +6,6 @@ export declare function escapeXml(text: string): string;
 export declare function buildAttrs(attrs: Record<string, string>): string;
 /** Render XmlContent tree to XML string. */
 export declare function renderXml(content: XmlContent[], indent?: number, options?: XmlRenderOptions): string;
+/** Tags rendered inline (no line break between siblings). */
+export declare function isInlineTag(tag: string): boolean;
 //# sourceMappingURL=xml-utils.d.ts.map

package/dist/xml-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xml-utils.d.ts","sourceRoot":"","sources":["../src/xml-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,UAAU,EAAc,MAAM,SAAS,CAAC;AAEhE,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAUD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAKhE;AAUD,4CAA4C;AAC5C,wBAAgB,SAAS,CACvB,OAAO,EAAE,UAAU,EAAE,EACrB,MAAM,GAAE,MAAU,EAClB,OAAO,GAAE,gBAAqB,GAC7B,MAAM,CAYR"}
+{"version":3,"file":"xml-utils.d.ts","sourceRoot":"","sources":["../src/xml-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,UAAU,EAAc,MAAM,SAAS,CAAC;AAEhE,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAUD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAKhE;AAUD,4CAA4C;AAC5C,wBAAgB,SAAS,CACvB,OAAO,EAAE,UAAU,EAAE,EACrB,MAAM,GAAE,MAAU,EAClB,OAAO,GAAE,gBAAqB,GAC7B,MAAM,CAYR;AAqGD,6DAA6D;AAC7D,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEhD"}

package/package.json

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