npm - @mx-space/cli - Versions diffs - 0.7.1 → 0.7.3 - Mend

@mx-space/cli 0.7.1 → 0.7.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/bin/mxs.mjs +1 -1
package/dist/index.mjs +1 -1
package/dist/{mxs-ClNF0UNu.mjs → mxs-DFe4-jre.mjs} +85 -15
package/package.json +3 -3

package/dist/bin/mxs.mjs CHANGED Viewed

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-import { t as run } from "../mxs-ClNF0UNu.mjs";
+import { t as run } from "../mxs-DFe4-jre.mjs";
 export { run };

package/dist/index.mjs CHANGED Viewed

@@ -1,2 +1,2 @@
-import { a as defaultMessageFor, c as tagToCode, i as codeForTag, l as toErrorEnvelope, n as defaultGlobalFlags, o as exitCodeForError, r as parseGlobalFlags, s as exitCodeForTag, t as run } from "./mxs-ClNF0UNu.mjs";
+import { a as defaultMessageFor, c as tagToCode, i as codeForTag, l as toErrorEnvelope, n as defaultGlobalFlags, o as exitCodeForError, r as parseGlobalFlags, s as exitCodeForTag, t as run } from "./mxs-DFe4-jre.mjs";
 export { codeForTag, defaultGlobalFlags, defaultMessageFor, exitCodeForError, exitCodeForTag, parseGlobalFlags, run, tagToCode, toErrorEnvelope };

package/dist/{mxs-ClNF0UNu.mjs → mxs-DFe4-jre.mjs} RENAMED Viewed

@@ -12618,7 +12618,7 @@ function customAlphabet(alphabet, size = 21) {
 	return customRandom(alphabet, size, random);
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@haklex+rich-litexml@0.15.3/node_modules/@haklex/rich-litexml/dist/src-Chu1pfGY.js
+//#region ../../node_modules/.pnpm/@haklex+rich-litexml@0.15.6/node_modules/@haklex/rich-litexml/dist/src-z3l9E6En.js
 var impl = null;
 function registerParseHTML(fn) {
 	impl = fn;
@@ -13628,8 +13628,66 @@ function isFormatTag(tagName) {
 function getFormatBit(tagName) {
 	return FORMAT_TAG_TO_BIT[tagName.toLowerCase()] ?? 0;
 }
+/**
+* HTML5 void elements — tags the HTML parser already treats as self-closing
+* regardless of `/>` syntax. Custom or non-void tags written as `<tag … />`
+* are otherwise interpreted as opening tags by the HTML parser, which then
+* swallows all following siblings as children until a matching close tag (or
+* end of document) is found. We expand those into explicit `<tag …></tag>`
+* before handing the string to linkedom / DOMParser.
+*/
+var HTML_VOID_ELEMENTS = new Set([
+	"area",
+	"base",
+	"br",
+	"col",
+	"embed",
+	"hr",
+	"img",
+	"input",
+	"link",
+	"meta",
+	"param",
+	"source",
+	"track",
+	"wbr"
+]);
+var SELF_CLOSING_RE = /<([\w-]+)((?:\s+[\w-]+(?:\s*=\s*(?:"[^"]*"|'[^']*'))?)*)\s*\/>/g;
+var CDATA_OPEN = "<![CDATA[";
+var CDATA_CLOSE = "]]>";
+function expandSelfClosing(chunk) {
+	return chunk.replaceAll(SELF_CLOSING_RE, (match, tag, attrs) => {
+		if (HTML_VOID_ELEMENTS.has(tag.toLowerCase())) return match;
+		return `<${tag}${attrs}></${tag}>`;
+	});
+}
+/**
+* Expand `<custom-tag … />` to `<custom-tag …></custom-tag>` outside CDATA.
+* Leaves HTML void elements and already-paired tags untouched. CDATA content
+* is sliced out verbatim with `indexOf` to avoid regex pitfalls around `]]>`.
+*/
+function normalizeSelfClosingTags(xml) {
+	const out = [];
+	let cursor = 0;
+	while (cursor < xml.length) {
+		const start = xml.indexOf(CDATA_OPEN, cursor);
+		if (start < 0) {
+			out.push(expandSelfClosing(xml.slice(cursor)));
+			break;
+		}
+		out.push(expandSelfClosing(xml.slice(cursor, start)));
+		const end = xml.indexOf(CDATA_CLOSE, start + 9);
+		if (end < 0) {
+			out.push(xml.slice(start));
+			break;
+		}
+		out.push(xml.slice(start, end + 3));
+		cursor = end + 3;
+	}
+	return out.join("");
+}
 function parseXml(xml) {
-	return parseHTML$1(`<!DOCTYPE html><html><body>${xml}</body></html>`);
+	return parseHTML$1(`<!DOCTYPE html><html><body>${normalizeSelfClosingTags(xml)}</body></html>`);
 }
 function deserializeFromXml(xml, registry) {
 	const doc = parseXml(xml);
@@ -13645,7 +13703,6 @@ function deserializeFromXml(xml, registry) {
 }
 /** Structural containers whose whitespace-only text nodes are layout artifacts, not content */
 var BLOCK_TAGS = new Set([
-	"body",
 	"doc",
 	"fragment",
 	"root",
@@ -13674,16 +13731,24 @@ function createReaderContext(registry) {
 		parseChildren(element) {
 			const blockLevel = isBlockContainer(element);
 			const nodes = [];
-			for (const child of element.childNodes) if (child.nodeType === 3) {
-				const text = child.textContent ?? "";
-				if (blockLevel && text.trim() === "") continue;
-				if (text === "") continue;
-				nodes.push(makeTextNode(text, 0));
-			} else if (child.nodeType === 1) {
+			let pendingText = "";
+			const flushText = () => {
+				if (pendingText === "") return;
+				if (blockLevel && pendingText.trim() === "") {
+					pendingText = "";
+					return;
+				}
+				nodes.push(makeTextNode(pendingText, 0));
+				pendingText = "";
+			};
+			for (const child of element.childNodes) if (child.nodeType === 3) pendingText += child.textContent ?? "";
+			else if (child.nodeType === 1) {
+				flushText();
 				const parsed = parseElement(child, registry, ctx, 0);
 				if (parsed) if (Array.isArray(parsed)) nodes.push(...parsed);
 				else nodes.push(parsed);
 			}
+			flushText();
 			return nodes;
 		},
 		parseNestedState(xml) {
@@ -13709,15 +13774,20 @@ function parseElement(element, registry, ctx, inheritedFormat) {
 }
 function parseInlineChildren(element, registry, ctx, format) {
 	const nodes = [];
-	for (const child of element.childNodes) if (child.nodeType === 3) {
-		const text = child.textContent ?? "";
-		if (text === "") continue;
-		nodes.push(makeTextNode(text, format));
-	} else if (child.nodeType === 1) {
+	let pendingText = "";
+	const flushText = () => {
+		if (pendingText === "") return;
+		nodes.push(makeTextNode(pendingText, format));
+		pendingText = "";
+	};
+	for (const child of element.childNodes) if (child.nodeType === 3) pendingText += child.textContent ?? "";
+	else if (child.nodeType === 1) {
+		flushText();
 		const parsed = parseElement(child, registry, ctx, format);
 		if (parsed) if (Array.isArray(parsed)) nodes.push(...parsed);
 		else nodes.push(parsed);
 	}
+	flushText();
 	return nodes;
 }
 function parseFallbackNode(element) {
@@ -24886,7 +24956,7 @@ function Document() {
 }
 setPrototypeOf(Document, Document$1).prototype = Document$1.prototype;
 //#endregion
-//#region ../../node_modules/.pnpm/@haklex+rich-litexml@0.15.3/node_modules/@haklex/rich-litexml/dist/node.mjs
+//#region ../../node_modules/.pnpm/@haklex+rich-litexml@0.15.6/node_modules/@haklex/rich-litexml/dist/node.mjs
 registerParseHTML((html) => parseHTML(html).document);
 //#endregion
 //#region src/services/Renderer/content.ts

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@mx-space/cli",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Command line interface for mx-space (mx-core) — auth, content, configuration",
   "keywords": [
     "mx-space",
@@ -53,8 +53,8 @@
     "@effect/platform": "0.96.1",
     "@effect/platform-node": "0.106.0",
     "@haklex/rich-headless": "0.13.0",
-    "@haklex/rich-litexml": "0.15.3",
-    "@haklex/rich-litexml-cli": "0.15.3",
+    "@haklex/rich-litexml": "0.15.6",
+    "@haklex/rich-litexml-cli": "0.15.6",
     "@lexical/headless": "^0.44.0",
     "better-auth": "^1.6.9",
     "effect": "3.21.2",