@abraca/cli 2.4.0 → 2.6.0

package/dist/abracadabra-cli.esm.js

@@ -1409,6 +1409,23 @@ function parseFrontmatter(markdown) {
 		body
 	};
 }
+function pushNested(out, inner, wrap) {
+	const children = parseInline(inner);
+	if (children.length === 0) {
+		out.push({
+			text: inner,
+			attrs: { ...wrap }
+		});
+		return;
+	}
+	for (const child of children) out.push({
+		text: child.text,
+		attrs: {
+			...child.attrs ?? {},
+			...wrap
+		}
+	});
+}
 function parseInline(text) {
 	const stripped = text.replace(/\{lang="[^"]*"\}/g, "").replace(/:(?!badge|icon|kbd)(\w[\w-]*)\[([^\]]*)\](\{[^}]*\})?/g, "$2").replace(/:(?!badge|icon|kbd)(\w[\w-]*)(\{[^}]*\})/g, "");
 	const tokens = [];
@@ -1457,22 +1474,10 @@ function parseInline(text) {
 				text: label,
 				attrs: { docLink: { docId } }
 			});
-		} else if (match[10] !== void 0) tokens.push({
-			text: match[10],
-			attrs: { strike: true }
-		});
-		else if (match[11] !== void 0) tokens.push({
-			text: match[11],
-			attrs: { bold: true }
-		});
-		else if (match[12] !== void 0) tokens.push({
-			text: match[12],
-			attrs: { italic: true }
-		});
-		else if (match[13] !== void 0) tokens.push({
-			text: match[13],
-			attrs: { italic: true }
-		});
+		} else if (match[10] !== void 0) pushNested(tokens, match[10], { strike: true });
+		else if (match[11] !== void 0) pushNested(tokens, match[11], { bold: true });
+		else if (match[12] !== void 0) pushNested(tokens, match[12], { italic: true });
+		else if (match[13] !== void 0) pushNested(tokens, match[13], { italic: true });
 		else if (match[14] !== void 0) tokens.push({
 			text: match[14],
 			attrs: { code: true }
@@ -2008,11 +2013,19 @@ function parseBlocks(markdown) {
 function fillTextInto(el, tokens) {
 	const filtered = tokens.filter((t) => t.text.length > 0);
 	if (!filtered.length) return;
-	const xtNodes = filtered.map(() => new Y.XmlText());
-	el.insert(0, xtNodes);
+	const children = filtered.map((tok) => {
+		return (tok.attrs?.docLink)?.docId ? new Y.XmlElement("docLink") : new Y.XmlText();
+	});
+	el.insert(0, children);
 	filtered.forEach((tok, i) => {
-		if (tok.attrs) xtNodes[i].insert(0, tok.text, tok.attrs);
-		else xtNodes[i].insert(0, tok.text);
+		const node = children[i];
+		if (node instanceof Y.XmlElement) {
+			const dl = tok.attrs.docLink;
+			node.setAttribute("docId", dl.docId);
+			return;
+		}
+		if (tok.attrs) node.insert(0, tok.text, tok.attrs);
+		else node.insert(0, tok.text);
 	});
 }
 function blockElName(b) {
@@ -2368,6 +2381,15 @@ function populateYDocFromMarkdown(fragment, markdown, fallbackTitle = "Untitled"
 
 //#endregion
 //#region packages/convert/src/yjs-to-markdown.ts
+function isXElem(n) {
+	return !!n && typeof n.nodeName === "string";
+}
+function isXText(n) {
+	return !!n && typeof n.nodeName !== "string" && typeof n.toDelta === "function";
+}
+function localizeFragment(fragment) {
+	return fragment;
+}
 function serializeDelta(delta) {
 	let result = "";
 	for (const op of delta) {
@@ -2428,12 +2450,15 @@ function serializeDelta(delta) {
 }
 function serializeInline(el) {
 	const parts = [];
-	for (const child of el.toArray()) if (child instanceof Y.XmlText) parts.push(serializeDelta(child.toDelta()));
-	else if (child instanceof Y.XmlElement) parts.push(serializeInline(child));
+	for (const child of el.toArray()) if (isXText(child)) parts.push(serializeDelta(child.toDelta()));
+	else if (isXElem(child)) if (child.nodeName === "docLink") {
+		const docId = child.getAttribute("docId") ?? "";
+		parts.push(`[[${docId}]]`);
+	} else parts.push(serializeInline(child));
 	return parts.join("");
 }
 function serializeBlock(el, indent = "") {
-	if (el instanceof Y.XmlText) return serializeDelta(el.toDelta());
+	if (isXText(el)) return serializeDelta(el.toDelta());
 	switch (el.nodeName) {
 		case "documentHeader":
 		case "documentMeta": return "";
@@ -2453,7 +2478,7 @@ function serializeBlock(el, indent = "") {
 		}
 		case "blockquote": {
 			const lines = [];
-			for (const child of el.toArray()) if (child instanceof Y.XmlElement) {
+			for (const child of el.toArray()) if (isXElem(child)) {
 				const text = serializeBlock(child);
 				for (const line of text.split("\n")) lines.push(`> ${line}`);
 			}
@@ -2514,11 +2539,11 @@ function serializeBlock(el, indent = "") {
 			if (to) props.push(`to="${to}"`);
 			return `::card${props.length ? `{${props.join(" ")}}` : ""}\n${serializeChildren(el)}\n::`;
 		}
-		case "cardGroup": return `::card-group\n${el.toArray().filter((c) => c instanceof Y.XmlElement).map((c) => serializeBlock(c)).join("\n\n")}\n::`;
-		case "codeCollapse": return `::code-collapse\n${el.toArray().filter((c) => c instanceof Y.XmlElement && c.nodeName === "codeBlock").map((c) => serializeBlock(c)).join("\n\n")}\n::`;
-		case "codeGroup": return `::code-group\n${el.toArray().filter((c) => c instanceof Y.XmlElement && c.nodeName === "codeBlock").map((c) => serializeBlock(c)).join("\n\n")}\n::`;
+		case "cardGroup": return `::card-group\n${el.toArray().filter((c) => isXElem(c)).map((c) => serializeBlock(c)).join("\n\n")}\n::`;
+		case "codeCollapse": return `::code-collapse\n${el.toArray().filter((c) => isXElem(c) && c.nodeName === "codeBlock").map((c) => serializeBlock(c)).join("\n\n")}\n::`;
+		case "codeGroup": return `::code-group\n${el.toArray().filter((c) => isXElem(c) && c.nodeName === "codeBlock").map((c) => serializeBlock(c)).join("\n\n")}\n::`;
 		case "codePreview": {
-			const children = el.toArray().filter((c) => c instanceof Y.XmlElement);
+			const children = el.toArray().filter((c) => isXElem(c));
 			const nonCode = children.filter((c) => c.nodeName !== "codeBlock").map((c) => serializeBlock(c)).join("\n\n");
 			const code = children.filter((c) => c.nodeName === "codeBlock").map((c) => serializeBlock(c)).join("\n\n");
 			const parts = [nonCode];
@@ -2536,16 +2561,16 @@ function serializeBlock(el, indent = "") {
 			if (required === true || required === "true") props.push("required=\"true\"");
 			return `::field{${props.join(" ")}}\n${serializeChildren(el)}\n::`;
 		}
-		case "fieldGroup": return `::field-group\n${el.toArray().filter((c) => c instanceof Y.XmlElement).map((c) => serializeBlock(c)).join("\n\n")}\n::`;
+		case "fieldGroup": return `::field-group\n${el.toArray().filter((c) => isXElem(c)).map((c) => serializeBlock(c)).join("\n\n")}\n::`;
 		default: return serializeChildren(el);
 	}
 }
 function serializeChildren(el) {
 	const blocks = [];
-	for (const child of el.toArray()) if (child instanceof Y.XmlElement) {
+	for (const child of el.toArray()) if (isXElem(child)) {
 		const text = serializeBlock(child);
 		if (text) blocks.push(text);
-	} else if (child instanceof Y.XmlText) {
+	} else if (isXText(child)) {
 		const text = serializeDelta(child.toDelta());
 		if (text) blocks.push(text);
 	}
@@ -2555,11 +2580,11 @@ function serializeListItems(el, type, indent) {
 	const lines = [];
 	let counter = 1;
 	for (const child of el.toArray()) {
-		if (!(child instanceof Y.XmlElement) || child.nodeName !== "listItem") continue;
+		if (!isXElem(child) || child.nodeName !== "listItem") continue;
 		const prefix = type === "bullet" ? "- " : `${counter++}. `;
 		const subParts = [];
 		for (const sub of child.toArray()) {
-			if (!(sub instanceof Y.XmlElement)) continue;
+			if (!isXElem(sub)) continue;
 			if (sub.nodeName === "bulletList") subParts.push(serializeListItems(sub, "bullet", indent + "  "));
 			else if (sub.nodeName === "orderedList") subParts.push(serializeListItems(sub, "ordered", indent + "  "));
 			else subParts.push(serializeInline(sub));
@@ -2575,13 +2600,13 @@ function serializeListItems(el, type, indent) {
 function serializeTaskList(el, indent) {
 	const lines = [];
 	for (const child of el.toArray()) {
-		if (!(child instanceof Y.XmlElement) || child.nodeName !== "taskItem") continue;
+		if (!isXElem(child) || child.nodeName !== "taskItem") continue;
 		const checked = child.getAttribute("checked");
 		const marker = checked === true || checked === "true" ? "[x]" : "[ ]";
 		let header = "";
 		const nestedParts = [];
 		for (const sub of child.toArray()) {
-			if (!(sub instanceof Y.XmlElement)) continue;
+			if (!isXElem(sub)) continue;
 			if (sub.nodeName === "paragraph" && header === "") header = serializeInline(sub);
 			else if (sub.nodeName === "bulletList") nestedParts.push(serializeListItems(sub, "bullet", indent + "  "));
 			else if (sub.nodeName === "orderedList") nestedParts.push(serializeListItems(sub, "ordered", indent + "  "));
@@ -2594,16 +2619,16 @@ function serializeTaskList(el, indent) {
 	return lines.join("\n");
 }
 function getCodeBlockText(el) {
-	for (const child of el.toArray()) if (child instanceof Y.XmlText) return child.toString();
+	for (const child of el.toArray()) if (isXText(child)) return child.toString();
 	return "";
 }
 function serializeTable(el) {
-	const rows = el.toArray().filter((c) => c instanceof Y.XmlElement);
+	const rows = el.toArray().filter((c) => isXElem(c));
 	if (!rows.length) return "";
 	const serializedRows = [];
 	for (const row of rows) {
-		const cells = row.toArray().filter((c) => c instanceof Y.XmlElement).map((cell) => {
-			return cell.toArray().filter((c) => c instanceof Y.XmlElement).map((c) => serializeInline(c)).join(" ");
+		const cells = row.toArray().filter((c) => isXElem(c)).map((cell) => {
+			return cell.toArray().filter((c) => isXElem(c)).map((c) => serializeInline(c)).join(" ");
 		});
 		serializedRows.push(cells);
 	}
@@ -2622,7 +2647,7 @@ function serializeTable(el) {
 	].join("\n");
 }
 function serializeSlottedContainer(el, containerName, childName, slotPrefix) {
-	return `::${containerName}\n${el.toArray().filter((c) => c instanceof Y.XmlElement && c.nodeName === childName).map((item) => {
+	return `::${containerName}\n${el.toArray().filter((c) => isXElem(c) && c.nodeName === childName).map((item) => {
 		const label = item.getAttribute("label") ?? "";
 		const icon = item.getAttribute("icon") ?? "";
 		const props = [];
@@ -2672,6 +2697,7 @@ function escapeYaml(s) {
 	return s.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
 }
 function yjsToMarkdown(fragment, label, meta, type) {
+	fragment = localizeFragment(fragment);
 	const { text: headerText, source: titleSource } = readDocumentHeader(fragment);
 	const effectiveTitle = headerText || label;
 	const docMeta = readDocumentMeta(fragment);
@@ -2695,7 +2721,7 @@ function readDocumentMeta(fragment) {
 	const meta = {};
 	let type;
 	for (const child of fragment.toArray()) {
-		if (!(child instanceof Y.XmlElement) || child.nodeName !== "documentMeta") continue;
+		if (!isXElem(child) || child.nodeName !== "documentMeta") continue;
 		const attrs = child.getAttributes();
 		for (const k of Object.keys(attrs)) {
 			const v = attrs[k];
@@ -2715,8 +2741,8 @@ function readDocumentMeta(fragment) {
 }
 function readDocumentHeader(fragment) {
 	for (const child of fragment.toArray()) {
-		if (!(child instanceof Y.XmlElement) || child.nodeName !== "documentHeader") continue;
-		const text = child.toArray().find((c) => c instanceof Y.XmlText);
+		if (!isXElem(child) || child.nodeName !== "documentHeader") continue;
+		const text = child.toArray().find((c) => isXText(c));
 		const src = child.getAttribute("titleSource");
 		const source = src === "h1" || src === "frontmatter" ? src : void 0;
 		return {
@@ -2729,7 +2755,7 @@ function readDocumentHeader(fragment) {
 function collectBodyBlocks(fragment) {
 	const out = [];
 	for (const child of fragment.toArray()) {
-		if (!(child instanceof Y.XmlElement)) continue;
+		if (!isXElem(child)) continue;
 		if (child.nodeName === "documentHeader" || child.nodeName === "documentMeta") continue;
 		out.push(child);
 	}
@@ -3673,17 +3699,17 @@ registerCommand({
 		const docId = resolveDocument(conn, args.params, args.positional);
 		if (!docId) return "Document not found. Specify id=, name=, or path= to identify the document.";
 		try {
-			const { title, markdown } = yjsToMarkdown((await conn.getChildProvider(docId)).document.getXmlFragment("default"));
+			const markdown = yjsToMarkdown((await conn.getChildProvider(docId)).document.getXmlFragment("default"), "");
 			if (args.flags.has("json") || args.params["format"] === "json") {
 				const treeMap = conn.getTreeMap();
-				let label = title;
+				let label = "";
 				let type;
 				let meta;
 				let children = [];
 				if (treeMap) {
 					const entry = treeMap.get(docId);
 					if (entry) {
-						label = entry.label || title;
+						label = entry.label || label;
 						type = entry.type;
 						meta = entry.meta;
 					}
@@ -3998,7 +4024,7 @@ registerCommand({
 		try {
 			const doc = (await conn.getChildProvider(docId)).document;
 			const fragment = doc.getXmlFragment("default");
-			const { markdown: existing } = yjsToMarkdown(fragment);
+			const existing = yjsToMarkdown(fragment, "");
 			const text = content.replace(/\\n/g, "\n").replace(/\\t/g, "	");
 			const combined = args.flags.has("inline") ? text + existing : text + "\n" + existing;
 			doc.transact(() => {
@@ -4021,7 +4047,7 @@ registerCommand({
 		const docId = resolveDocument(conn, args.params, args.positional);
 		if (!docId) return "Document not found.";
 		try {
-			const { markdown } = yjsToMarkdown((await conn.getChildProvider(docId)).document.getXmlFragment("default"));
+			const markdown = yjsToMarkdown((await conn.getChildProvider(docId)).document.getXmlFragment("default"), "");
 			const words = markdown.split(/\s+/).filter(Boolean).length;
 			const chars = markdown.length;
 			if (args.flags.has("words")) return String(words);
@@ -4043,7 +4069,9 @@ registerCommand({
 		const outputPath = args.params["output"] || args.params["to"] || args.params["path"];
 		if (!outputPath) return "Missing required parameter: output=<filepath>";
 		try {
-			const { title, markdown } = yjsToMarkdown((await conn.getChildProvider(docId)).document.getXmlFragment("default"));
+			const fragment = (await conn.getChildProvider(docId)).document.getXmlFragment("default");
+			const title = (conn.getTreeMap()?.get(docId))?.label;
+			const markdown = yjsToMarkdown(fragment, title ?? "");
 			const resolvedPath = path.resolve(outputPath);
 			fs.writeFileSync(resolvedPath, markdown, "utf-8");
 			return `Exported "${title || "document"}" to ${resolvedPath} (${Buffer.byteLength(markdown)} bytes)`;