@meowdown/core 0.68.3 → 0.69.0

package/dist/index.d.ts

@@ -513,6 +513,7 @@ interface ReferenceDefinitionIndex {
   definitions: ReferenceDefinitions;
   nodes: ReadonlySet<EditorNode>;
 }
+export declare function isReferenceDefinitionNode(node: EditorNode, parent: EditorNode | null, index: number): boolean;
 export declare function collectReferenceDefinitions(doc: EditorNode): ReferenceDefinitionIndex;
 //#endregion
 //#region src/extensions/wiki-embed.d.ts

package/dist/index.js

@@ -1318,7 +1318,8 @@ function definePlainTextPaste() {
 function docToMarkdown(node, options = {}) {
 	const out = new MdOut();
 	if (options.frontmatter) emitFrontmatter(node.attrs.frontmatter, out);
-	emit$1(node, out);
+	const child = node.childCount === 1 ? node.child(0) : void 0;
+	if (!(child && isNodeOfType(child, "paragraph") && child.childCount === 0)) emit$1(node, out);
 	return out.finish();
 }
 /**
@@ -1373,6 +1374,7 @@ var MdOut = class {
 		this.pendingFirst = null;
 		this.atLineStart = true;
 		this.deferredBlankPrefix = null;
+		this.contentEnd = 0;
 	}
 	/**
 	* Write `text`, opening each embedded line with the current line prefix.
@@ -1407,20 +1409,30 @@ var MdOut = class {
 		}
 	}
 	/**
-	* End a block that owns no line of its own (an empty paragraph): flush the
-	* blank line owed by the previous block now and owe the next block a fresh
-	* one, so each empty block yields one extra blank line. A marker-bearing
-	* block (an empty list item's `- `) still owns its first line and falls
-	* through to `closeBlock`. At the very start of the output there is no
-	* blank line to flush or owe - leading empty blocks vanish, mirroring the
-	* parser, which materializes empty paragraphs only between sibling blocks.
+	* End a block that owns no line of its own (an empty paragraph): it is one
+	* blank line. After another block, the blank line that block owes is this
+	* one, and the next block is owed a fresh one, so each empty block adds a
+	* blank line to the separator. With nothing owed (the start of the output)
+	* the line is written directly and nothing is owed after it: a leading empty
+	* block is a blank line, not a separator. A marker-bearing block (an empty
+	* list item's `- `, an empty quote line's `>`) writes its marker as the line.
 	*/
 	closeEmptyBlock() {
-		if (!this.atLineStart || this.pendingFirst !== null) {
+		if (!this.atLineStart) {
 			this.closeBlock();
 			return;
 		}
-		if (this.parts.length === 0) return;
+		if (this.pendingFirst !== null) {
+			this.emitDeferredBlankLine();
+			const marker = this.pendingFirst;
+			this.parts.push(marker.endsWith("] ") ? marker : marker.trimEnd(), "\n");
+			this.pendingFirst = null;
+			return;
+		}
+		if (this.deferredBlankPrefix === null) {
+			this.parts.push(this.linePrefix.trimEnd(), "\n");
+			return;
+		}
 		this.emitDeferredBlankLine();
 		this.deferredBlankPrefix = this.linePrefix;
 	}
@@ -1435,7 +1447,10 @@ var MdOut = class {
 			this.pendingFirst = null;
 			this.atLineStart = false;
 		}
-		if (!this.atLineStart) this.parts.push("\n");
+		if (!this.atLineStart) {
+			this.parts.push("\n");
+			this.contentEnd = this.parts.length;
+		}
 		this.atLineStart = true;
 		this.deferredBlankPrefix = this.linePrefix;
 	}
@@ -1486,14 +1501,14 @@ var MdOut = class {
 		this.pendingFirst = firstLine !== null ? null : savedFirst;
 	}
 	finish() {
-		const text = this.parts.join("");
+		const text = this.parts.slice(0, this.contentEnd).join("");
 		let cut = text.length;
 		for (let i = text.length - 1; i >= 0; i--) {
 			const code = text.charCodeAt(i);
 			if (code === 10) cut = i;
 			else if (code !== 32 && code !== 9) break;
 		}
-		return text.slice(0, cut) + "\n";
+		return (cut === 0 ? "" : text.slice(0, cut) + "\n") + this.parts.slice(this.contentEnd).join("") || "\n";
 	}
 	emitDeferredBlankLine() {
 		const prefix = this.deferredBlankPrefix;
@@ -6157,7 +6172,7 @@ function markdownToDoc(markdown, options = {}) {
 		frontmatterBody = body;
 		if (matchLength) rest = markdown.slice(matchLength);
 	}
-	const blocks = collectBlocks(nodes, gfmBlockOnlyParser.parse(rest).cursor(), rest, 0);
+	const blocks = collectBlocks(nodes, gfmBlockOnlyParser.parse(rest).cursor(), rest, 0, rest !== markdown);
 	return nodes.doc(frontmatterBody === void 0 ? {} : { frontmatter: frontmatterBody }, blocks);
 }
 /**
@@ -6175,13 +6190,19 @@ function matchFrontmatter(markdown) {
 	return [(match[1] ?? "").replace(/\r?\n$/, ""), match[0].length];
 }
 /**
-* Walk the current node's children, converting each block-level child
-* and flattening any node converter that returns multiple siblings
-* (lists are the main case).
+* Walk the document's children, converting each block-level child and
+* flattening any node converter that returns multiple siblings (lists are the
+* main case). Blank lines before the first block and after the last one are
+* content too, one empty paragraph each; when a frontmatter block was peeled
+* off ahead of `text`, the first leading blank line is that block's separator.
 */
-function collectBlocks(nodes, cursor, text, column) {
+function collectBlocks(nodes, cursor, text, column, afterFrontmatter) {
 	const out = [];
-	if (!cursor.firstChild()) return out;
+	if (!cursor.firstChild()) {
+		appendEmptyParagraphs(out, nodes, Math.max(1, countNewlines(text, 0, text.length)));
+		return out;
+	}
+	appendEmptyParagraphs(out, nodes, countNewlines(text, 0, cursor.from) - (afterFrontmatter ? 1 : 0));
 	let previousTo;
 	do {
 		if (previousTo != null) appendGapParagraphs(out, nodes, text, previousTo, cursor.from);
@@ -6189,6 +6210,8 @@ function collectBlocks(nodes, cursor, text, column) {
 		appendBlocks(out, nodes, convertBlock(nodes, cursor, text, column));
 	} while (cursor.nextSibling());
 	cursor.parent();
+	const end = text.endsWith("\n") ? text.length - 1 : text.length;
+	appendEmptyParagraphs(out, nodes, countNewlines(text, previousTo, end));
 	return out;
 }
 /**
@@ -6218,9 +6241,15 @@ function appendBlocks(out, nodes, blocks) {
 * of them (the previous block's own terminator plus one per blank line).
 */
 function appendGapParagraphs(out, nodes, text, gapFrom, gapTo) {
-	let newlineCount = 0;
-	for (let i = gapFrom; i < gapTo; i++) if (text.charCodeAt(i) === 10) newlineCount++;
-	for (let i = 2; i < newlineCount; i++) out.push(nodes.paragraph());
+	appendEmptyParagraphs(out, nodes, countNewlines(text, gapFrom, gapTo) - 2);
+}
+function appendEmptyParagraphs(out, nodes, count) {
+	for (let i = 0; i < count; i++) out.push(nodes.paragraph());
+}
+function countNewlines(text, from, to) {
+	let count = 0;
+	for (let i = from; i < to; i++) if (text.charCodeAt(i) === 10) count++;
+	return count;
 }
 function convertBlock(nodes, cursor, text, column) {
 	switch (cursor.type.id) {
@@ -6459,30 +6488,44 @@ function convertHTMLComment(nodes, cursor, text, column) {
 /**
 * A blockquote's children start at column 0: every column an enclosing container
 * wrote sits in front of the `> ` marker on the line, and comes off with it.
+*
+* Blank quote lines before the first block and after the last one are empty
+* paragraphs, like the document's own edges. The quote's range ends on its last
+* line rather than after it, so every newline in the trailing slice is a blank
+* line, and a quote made of markers only has one more line than newlines.
 */
 function convertBlockquote(nodes, cursor, text) {
 	const content = [];
+	const from = cursor.from;
+	const to = cursor.to;
+	let previousTo;
 	if (cursor.firstChild()) {
-		let previousTo;
 		do {
 			if (cursor.type.id === LEZER_NODE_IDS.QuoteMark) continue;
-			if (previousTo != null) appendGapParagraphs(content, nodes, text, previousTo, cursor.from);
+			if (previousTo == null) appendEmptyParagraphs(content, nodes, countNewlines(text, from, cursor.from));
+			else appendGapParagraphs(content, nodes, text, previousTo, cursor.from);
 			previousTo = cursor.to;
 			appendBlocks(content, nodes, convertBlock(nodes, cursor, text, 0));
 		} while (cursor.nextSibling());
 		cursor.parent();
 	}
+	appendEmptyParagraphs(content, nodes, previousTo == null ? countNewlines(text, from, to) + 1 : countNewlines(text, previousTo, to));
 	return nodes.blockquote(content);
 }
 function convertList(nodes, cursor, text, column, kind) {
-	const items = [];
+	const out = [];
 	if (cursor.firstChild()) {
-		do
-			if (cursor.type.id === LEZER_NODE_IDS.ListItem) items.push(convertListItem(nodes, cursor, text, column, kind));
-		while (cursor.nextSibling());
+		let previousContentEnd;
+		do {
+			if (cursor.type.id !== LEZER_NODE_IDS.ListItem) continue;
+			if (previousContentEnd != null) appendGapParagraphs(out, nodes, text, previousContentEnd, cursor.from);
+			const [item, contentEnd] = convertListItem(nodes, cursor, text, column, kind);
+			out.push(item);
+			previousContentEnd = contentEnd;
+		} while (cursor.nextSibling());
 		cursor.parent();
 	}
-	return items;
+	return out;
 }
 /**
 * The marker style at `cursor`, plus the start number of an ordered item.
@@ -6536,6 +6579,19 @@ function convertTaskItem(nodes, cursor, text, column) {
 		paragraph
 	};
 }
+/**
+* The gap between a list marker ending at `markTo` and the item's first content
+* at `contentFrom`. Only content that opens on the marker's own line measures a
+* gap; an item whose content starts on the next line takes the canonical single
+* space, the column its own continuation lines are indented to. A gap of 5+ is
+* indented code (a different node, so the content's column would be the code
+* block's), and 1 is the canonical default; only a 2-4 space gap is a faithful,
+* content-preserving variation.
+*/
+function measureMarkerGap(text, contentFrom, markTo, markEndColumn) {
+	const gap = markTo != null && text.lastIndexOf("\n", contentFrom - 1) < markTo ? measureContentColumn(text, contentFrom) - markEndColumn : 1;
+	return gap >= 2 && gap <= 4 ? gap : 1;
+}
 function convertListItem(nodes, cursor, text, column, kind) {
 	const content = [];
 	let taskChecked;
@@ -6547,7 +6603,7 @@ function convertListItem(nodes, cursor, text, column, kind) {
 	let markEndColumn = 0;
 	let markerGap = 1;
 	let contentColumn = column + markWidth + markerGap;
-	let sawContent = false;
+	let previousTo;
 	if (cursor.firstChild()) {
 		do {
 			if (cursor.type.id === LEZER_NODE_IDS.QuoteMark) continue;
@@ -6560,12 +6616,11 @@ function convertListItem(nodes, cursor, text, column, kind) {
 				markEndColumn = measureContentColumn(text, cursor.to);
 				continue;
 			}
-			if (!sawContent) {
-				sawContent = true;
-				const gap = markTo != null && text.lastIndexOf("\n", cursor.from - 1) < markTo ? measureContentColumn(text, cursor.from) - markEndColumn : 1;
-				markerGap = gap >= 2 && gap <= 4 ? gap : 1;
+			if (previousTo == null) {
+				markerGap = measureMarkerGap(text, cursor.from, markTo, markEndColumn);
 				contentColumn = column + markWidth + markerGap;
-			}
+			} else appendGapParagraphs(content, nodes, text, previousTo, cursor.from);
+			previousTo = cursor.to;
 			if (kind === "bullet" && cursor.type.id === LEZER_NODE_IDS.Task) {
 				const task = convertTaskItem(nodes, cursor, text, contentColumn);
 				taskChecked = task.checked;
@@ -6588,7 +6643,7 @@ function convertListItem(nodes, cursor, text, column, kind) {
 		taskMarker,
 		markerGap
 	};
-	return nodes.list(attrs, content);
+	return [nodes.list(attrs, content), previousTo ?? cursor.to];
 }
 function convertCodeBlock(nodes, cursor, text) {
 	const indented = cursor.type.id === LEZER_NODE_IDS.CodeBlock;
@@ -8809,4 +8864,4 @@ function getVirtualElementFromRange(view, range) {
 }
 
 //#endregion
-export { EDITOR_KEY_BINDINGS, Priority, buildFileMarkdown, checkRoundTrip, codeBlockLanguages, collectReferenceDefinitions, defaultResolveImageUrl, defineBulletAfterHeading, defineCodeBlockPreviewPlugin, defineCodeBlockSyntaxHighlight, defineEditorExtension, defineEmbedPaste, defineExitBoundaryHandler, defineFileClickHandler, defineFilePaste, defineFileView, defineFollowLinkHandler, defineHTMLComment, defineImage, defineImageClickHandler, defineLinkClickHandler, defineLinkCommands, defineLinkEditKeymap, defineLinkHoverHandler, defineLinkPaste, defineMath, definePendingReplacementHandler, definePlaceholder, defineReadonly, defineSearchStatusHandler, defineSubstitution, defineTagClickHandler, defineViewAttributes, defineVirtualCaret, defineWikilinkClickHandler, defineWikilinkHoverHandler, defineWikilinkTrigger, docToMarkdown, formatFileSize, formatSizedWikiEmbed, getCodeTokens, getFileKind, getIsComposing, getLinkText, getLinkUnitAt, getMarkBuilders, getPendingReplacement, getSearchStatus, getSelectedText, getTableColumnAlign, getTextblockDisplayText, getVirtualElementFromRange, inlineTextToMarkChunks, inlineTextToMarkChunksWithContext, insertLink, isCodeBlockPreviewHiddenDecoration, isLinkTextForHref, isMarkOfType, isModEvent, isNodeOfType, isSelectionInTableCell, listenForTweetHeight, loadKaTeX, markdownToDoc, matchEmbed, normalizeHref, parseWikiEmbed, removeLink, renderMathInto, updateLink, wikiEmbedBasename, withPriority };
+export { EDITOR_KEY_BINDINGS, Priority, buildFileMarkdown, checkRoundTrip, codeBlockLanguages, collectReferenceDefinitions, defaultResolveImageUrl, defineBulletAfterHeading, defineCodeBlockPreviewPlugin, defineCodeBlockSyntaxHighlight, defineEditorExtension, defineEmbedPaste, defineExitBoundaryHandler, defineFileClickHandler, defineFilePaste, defineFileView, defineFollowLinkHandler, defineHTMLComment, defineImage, defineImageClickHandler, defineLinkClickHandler, defineLinkCommands, defineLinkEditKeymap, defineLinkHoverHandler, defineLinkPaste, defineMath, definePendingReplacementHandler, definePlaceholder, defineReadonly, defineSearchStatusHandler, defineSubstitution, defineTagClickHandler, defineViewAttributes, defineVirtualCaret, defineWikilinkClickHandler, defineWikilinkHoverHandler, defineWikilinkTrigger, docToMarkdown, formatFileSize, formatSizedWikiEmbed, getCodeTokens, getFileKind, getIsComposing, getLinkText, getLinkUnitAt, getMarkBuilders, getPendingReplacement, getSearchStatus, getSelectedText, getTableColumnAlign, getTextblockDisplayText, getVirtualElementFromRange, inlineTextToMarkChunks, inlineTextToMarkChunksWithContext, insertLink, isCodeBlockPreviewHiddenDecoration, isLinkTextForHref, isMarkOfType, isModEvent, isNodeOfType, isReferenceDefinitionNode, isSelectionInTableCell, listenForTweetHeight, loadKaTeX, markdownToDoc, matchEmbed, normalizeHref, parseWikiEmbed, removeLink, renderMathInto, updateLink, wikiEmbedBasename, withPriority };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@meowdown/core",
   "type": "module",
-  "version": "0.68.3",
+  "version": "0.69.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -43,7 +43,7 @@
     "remark-stringify": "^11.0.0",
     "unicode-by-name": "^0.2.0",
     "unified": "^11.0.5",
-    "@meowdown/markdown": "^0.68.3"
+    "@meowdown/markdown": "^0.69.0"
   },
   "devDependencies": {
     "@ocavue/tsconfig": "^0.7.1",