markdown-codec 6.7.5 → 6.7.6

package/dist/inline/gfm-autolink.cjs

@@ -37,7 +37,7 @@ const OPAQUE_KINDS = /* @__PURE__ */ new Set([
 	"autolink"
 ]);
 function isWhitespace(char) {
-	return char === "" || char === " " || char === "	" || char === "\n" || char === "\r" || char === "\f";
+	return char === " " || char === "	" || char === "\n" || char === "\r" || char === "\f";
 }
 function isValidStartBoundary(text, index) {
 	if (index === 0) return true;
@@ -54,28 +54,31 @@ function trimTrailingPunctuation(candidate) {
 	let end = candidate.length;
 	for (;;) {
 		const before = end;
-		while (end > 0 && TRAILING_PUNCTUATION.has(candidate.charAt(end - 1))) end -= 1;
-		if (end > 0 && candidate.charAt(end - 1) === ")") {
+		while (TRAILING_PUNCTUATION.has(candidate.charAt(end - 1))) end -= 1;
+		if (candidate.charAt(end - 1) === ")") {
 			const slice = candidate.slice(0, end);
 			if (slice.split(")").length > slice.split("(").length) end -= 1;
 		}
-		if (end > 0 && candidate.charAt(end - 1) === ";") {
-			const entityTail = ENTITY_TAIL_PATTERN.exec(candidate.slice(0, end));
-			if (entityTail !== null) end -= entityTail[0].length;
-		}
+		const entityTail = ENTITY_TAIL_PATTERN.exec(candidate.slice(0, end));
+		if (entityTail !== null) end -= entityTail[0].length;
 		if (end === before) return candidate.slice(0, end);
 	}
 }
 function scanRawCandidate(text, start) {
 	let end = start;
-	while (end < text.length && !isWhitespace(text.charAt(end)) && text.charAt(end) !== "<") end += 1;
-	return text.slice(start, end);
+	for (;;) {
+		const char = text.charAt(end);
+		if (char === "" || isWhitespace(char) || char === "<") return text.slice(start, end);
+		end += 1;
+	}
 }
 function matchPrefixed(text, index, prefixLength, destinationPrefix, requireValidDomain) {
 	const trimmed = trimTrailingPunctuation(scanRawCandidate(text, index));
-	if (trimmed.length <= prefixLength) return;
+	const afterPrefix = trimmed.slice(prefixLength);
+	if (afterPrefix === "") return;
 	if (requireValidDomain) {
-		if (!isValidDomain(trimmed.slice(prefixLength).split(/[/?#]/)[0] ?? "")) return;
+		const domain = afterPrefix.split(/[/?#]/)[0];
+		if (!isValidDomain(domain)) return;
 	}
 	return {
 		text: trimmed,
@@ -85,17 +88,17 @@ function matchPrefixed(text, index, prefixLength, destinationPrefix, requireVali
 }
 function scanEmailDomain(text, start) {
 	let end = start;
-	while (end < text.length && EMAIL_DOMAIN_PATTERN.test(text.charAt(end))) end += 1;
+	while (EMAIL_DOMAIN_PATTERN.test(text.charAt(end))) end += 1;
 	return text.slice(start, end);
 }
 function matchEmailAt(text, atIndex) {
 	let start = atIndex;
-	while (start > 0 && EMAIL_LOCAL_PART_PATTERN.test(text.charAt(start - 1))) start -= 1;
+	while (EMAIL_LOCAL_PART_PATTERN.test(text.charAt(start - 1))) start -= 1;
 	if (start === atIndex || !isValidStartBoundary(text, start)) return;
 	const local = text.slice(start, atIndex);
 	if (local.startsWith(".") || local.endsWith(".")) return;
 	const domain = scanEmailDomain(text, atIndex + 1).replace(/\.+$/, "");
-	if (domain.endsWith("-") || domain.endsWith("_") || !isValidDomain(domain)) return;
+	if (domain.endsWith("-") || !isValidDomain(domain)) return;
 	const address = `${local}@${domain}`;
 	return {
 		text: address,
@@ -117,11 +120,10 @@ function expandTextNode(node) {
 	const text = node.literal;
 	let cursor = 0;
 	let anchor = node;
-	let matches = 0;
 	let index = 0;
-	while (index < text.length) {
+	while (text.charAt(index) !== "") {
 		const found = findAutolinkAt(text, index);
-		if (found === void 0 || found.start < cursor) {
+		if (found === void 0) {
 			index += 1;
 			continue;
 		}
@@ -136,10 +138,9 @@ function expandTextNode(node) {
 		anchor.insertAfter(link);
 		anchor = link;
 		cursor = found.start + found.text.length;
-		matches += 1;
 		index = cursor;
 	}
-	if (matches === 0) return;
+	if (anchor === node) return;
 	if (cursor < text.length) anchor.insertAfter(require_inline_node.createTextNode(text.slice(cursor)));
 	node.unlink();
 }

package/dist/inline/gfm-autolink.js

@@ -36,7 +36,7 @@ const OPAQUE_KINDS = /* @__PURE__ */ new Set([
 	"autolink"
 ]);
 function isWhitespace(char) {
-	return char === "" || char === " " || char === "	" || char === "\n" || char === "\r" || char === "\f";
+	return char === " " || char === "	" || char === "\n" || char === "\r" || char === "\f";
 }
 function isValidStartBoundary(text, index) {
 	if (index === 0) return true;
@@ -53,28 +53,31 @@ function trimTrailingPunctuation(candidate) {
 	let end = candidate.length;
 	for (;;) {
 		const before = end;
-		while (end > 0 && TRAILING_PUNCTUATION.has(candidate.charAt(end - 1))) end -= 1;
-		if (end > 0 && candidate.charAt(end - 1) === ")") {
+		while (TRAILING_PUNCTUATION.has(candidate.charAt(end - 1))) end -= 1;
+		if (candidate.charAt(end - 1) === ")") {
 			const slice = candidate.slice(0, end);
 			if (slice.split(")").length > slice.split("(").length) end -= 1;
 		}
-		if (end > 0 && candidate.charAt(end - 1) === ";") {
-			const entityTail = ENTITY_TAIL_PATTERN.exec(candidate.slice(0, end));
-			if (entityTail !== null) end -= entityTail[0].length;
-		}
+		const entityTail = ENTITY_TAIL_PATTERN.exec(candidate.slice(0, end));
+		if (entityTail !== null) end -= entityTail[0].length;
 		if (end === before) return candidate.slice(0, end);
 	}
 }
 function scanRawCandidate(text, start) {
 	let end = start;
-	while (end < text.length && !isWhitespace(text.charAt(end)) && text.charAt(end) !== "<") end += 1;
-	return text.slice(start, end);
+	for (;;) {
+		const char = text.charAt(end);
+		if (char === "" || isWhitespace(char) || char === "<") return text.slice(start, end);
+		end += 1;
+	}
 }
 function matchPrefixed(text, index, prefixLength, destinationPrefix, requireValidDomain) {
 	const trimmed = trimTrailingPunctuation(scanRawCandidate(text, index));
-	if (trimmed.length <= prefixLength) return;
+	const afterPrefix = trimmed.slice(prefixLength);
+	if (afterPrefix === "") return;
 	if (requireValidDomain) {
-		if (!isValidDomain(trimmed.slice(prefixLength).split(/[/?#]/)[0] ?? "")) return;
+		const domain = afterPrefix.split(/[/?#]/)[0];
+		if (!isValidDomain(domain)) return;
 	}
 	return {
 		text: trimmed,
@@ -84,17 +87,17 @@ function matchPrefixed(text, index, prefixLength, destinationPrefix, requireVali
 }
 function scanEmailDomain(text, start) {
 	let end = start;
-	while (end < text.length && EMAIL_DOMAIN_PATTERN.test(text.charAt(end))) end += 1;
+	while (EMAIL_DOMAIN_PATTERN.test(text.charAt(end))) end += 1;
 	return text.slice(start, end);
 }
 function matchEmailAt(text, atIndex) {
 	let start = atIndex;
-	while (start > 0 && EMAIL_LOCAL_PART_PATTERN.test(text.charAt(start - 1))) start -= 1;
+	while (EMAIL_LOCAL_PART_PATTERN.test(text.charAt(start - 1))) start -= 1;
 	if (start === atIndex || !isValidStartBoundary(text, start)) return;
 	const local = text.slice(start, atIndex);
 	if (local.startsWith(".") || local.endsWith(".")) return;
 	const domain = scanEmailDomain(text, atIndex + 1).replace(/\.+$/, "");
-	if (domain.endsWith("-") || domain.endsWith("_") || !isValidDomain(domain)) return;
+	if (domain.endsWith("-") || !isValidDomain(domain)) return;
 	const address = `${local}@${domain}`;
 	return {
 		text: address,
@@ -116,11 +119,10 @@ function expandTextNode(node) {
 	const text = node.literal;
 	let cursor = 0;
 	let anchor = node;
-	let matches = 0;
 	let index = 0;
-	while (index < text.length) {
+	while (text.charAt(index) !== "") {
 		const found = findAutolinkAt(text, index);
-		if (found === void 0 || found.start < cursor) {
+		if (found === void 0) {
 			index += 1;
 			continue;
 		}
@@ -135,10 +137,9 @@ function expandTextNode(node) {
 		anchor.insertAfter(link);
 		anchor = link;
 		cursor = found.start + found.text.length;
-		matches += 1;
 		index = cursor;
 	}
-	if (matches === 0) return;
+	if (anchor === node) return;
 	if (cursor < text.length) anchor.insertAfter(createTextNode(text.slice(cursor)));
 	node.unlink();
 }

package/dist/inline/inline.cjs

@@ -12,7 +12,7 @@ const require_inline_math = require("./math.cjs");
 const PLAIN_TEXT_PATTERN = /[^\n`[\]\\!<&*_~]+/y;
 const URI_AUTOLINK_PATTERN = /<[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>]*>/y;
 const EMAIL_AUTOLINK_PATTERN = /<([a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/y;
-const HARD_BREAK_SPACES = "  ";
+const HARD_BREAK_SPACE_COUNT = 2;
 const EMPTY_LABEL_LENGTH = 2;
 function stripOneSurroundingSpace(content) {
 	if (content.startsWith(" ") && content.endsWith(" ") && /[^ ]/.test(content)) return content.slice(1, content.length - 1);
@@ -45,6 +45,13 @@ var InlineParser = class {
 		return this.container;
 	}
 	step() {
+		PLAIN_TEXT_PATTERN.lastIndex = this.pos;
+		const plain = PLAIN_TEXT_PATTERN.exec(this.text);
+		if (plain !== null) {
+			this.appendText(plain[0]);
+			this.pos += plain[0].length;
+			return;
+		}
 		const char = this.text.charAt(this.pos);
 		switch (char) {
 			case "\n":
@@ -71,12 +78,9 @@ var InlineParser = class {
 			case "]":
 				this.parseCloseBracket();
 				return;
-			default:
-				if (require_inline_delimiter.isDelimiterChar(char)) {
-					this.parseDelimiterRun(char);
-					return;
-				}
-				this.parsePlainText();
+			case "*":
+			case "_":
+			case "~": this.parseDelimiterRun(char);
 		}
 	}
 	appendText(literal) {
@@ -84,25 +88,16 @@ var InlineParser = class {
 		this.container.appendChild(node);
 		return node;
 	}
-	parsePlainText() {
-		PLAIN_TEXT_PATTERN.lastIndex = this.pos;
-		const match = PLAIN_TEXT_PATTERN.exec(this.text);
-		if (match === null) {
-			this.appendText(this.text.charAt(this.pos));
-			this.pos += 1;
-			return;
-		}
-		this.appendText(match[0]);
-		this.pos += match[0].length;
-	}
 	parseLineBreak() {
 		this.pos += 1;
 		const last = this.container.lastChild;
-		if (last?.kind === "text" && last.literal.endsWith(" ")) {
-			const hard = last.literal.endsWith(HARD_BREAK_SPACES);
-			last.literal = last.literal.replace(/ +$/, "");
-			this.container.appendChild(new require_inline_node.InlineNode(hard ? "hardBreak" : "softBreak"));
-		} else this.container.appendChild(new require_inline_node.InlineNode("softBreak"));
+		let hard = false;
+		if (last?.kind === "text") {
+			const withoutTrailingSpaces = last.literal.replace(/ +$/, "");
+			hard = last.literal.length - withoutTrailingSpaces.length >= HARD_BREAK_SPACE_COUNT;
+			last.literal = withoutTrailingSpaces;
+		}
+		this.container.appendChild(new require_inline_node.InlineNode(hard ? "hardBreak" : "softBreak"));
 		while (this.text.charAt(this.pos) === " ") this.pos += 1;
 	}
 	parseBackslash() {
@@ -114,15 +109,13 @@ var InlineParser = class {
 			this.container.appendChild(new require_inline_node.InlineNode("hardBreak"));
 			return;
 		}
-		if (next === "(") {
-			const span = require_inline_math.matchMathInlineSpan(this.text, backslashIndex);
-			if (span !== void 0) {
-				const node = new require_inline_node.InlineNode("mathInline");
-				node.literal = span.slice(2, span.length - 2);
-				this.container.appendChild(node);
-				this.pos = backslashIndex + span.length;
-				return;
-			}
+		const span = require_inline_math.matchMathInlineSpan(this.text, backslashIndex);
+		if (span !== void 0) {
+			const node = new require_inline_node.InlineNode("mathInline");
+			node.literal = span.slice(2, span.length - 2);
+			this.container.appendChild(node);
+			this.pos = backslashIndex + span.length;
+			return;
 		}
 		if (require_inline_chars.isAsciiPunctuation(next)) {
 			this.appendText(next);
@@ -137,7 +130,7 @@ var InlineParser = class {
 		while (this.text.charAt(start + openLength) === "`") openLength += 1;
 		const afterOpen = start + openLength;
 		let scan = afterOpen;
-		while (scan < this.text.length) {
+		while (this.text.charAt(scan) !== "") {
 			if (this.text.charAt(scan) !== "`") {
 				scan += 1;
 				continue;
@@ -219,7 +212,7 @@ var InlineParser = class {
 		}
 		const node = this.appendText(this.text.slice(this.pos, this.pos + run.count));
 		this.pos += run.count;
-		if (run.canOpen || run.canClose) this.delimiters.push(char, run, node);
+		this.delimiters.push(char, run, node);
 	}
 	parseLiteralRun(char) {
 		let length = 0;
@@ -343,7 +336,7 @@ var InlineParser = class {
 		let label;
 		if (labelLength > EMPTY_LABEL_LENGTH) label = this.text.slice(labelStart, labelStart + labelLength);
 		else if (!opener.bracketAfter) label = this.text.slice(opener.index, afterCloseBracket);
-		if (labelLength > 0) this.pos = labelStart + labelLength;
+		this.pos = labelStart + labelLength;
 		if (label === void 0) return;
 		const definition = this.references.get(require_inline_link.normalizeLinkLabel(label));
 		if (definition === void 0) {
@@ -488,10 +481,7 @@ function toAstNode(node) {
 }
 function parseInlines(content, references, footnotes, options = {}) {
 	const root = new InlineParser(content, references, footnotes, options).parse();
-	if (options.gfmAutolinks ?? true) {
-		require_inline_gfm_autolink.applyGfmAutolinks(root);
-		mergeAdjacentText(root);
-	}
+	if (options.gfmAutolinks ?? true) require_inline_gfm_autolink.applyGfmAutolinks(root);
 	return toChildAstNodes(root);
 }
 //#endregion

package/dist/inline/inline.js

@@ -2,7 +2,7 @@ import { matchFootnoteLabel } from "./footnote.js";
 import { matchHtmlTag } from "../html/html.js";
 import { containsAsciiControlOrSpace, isAsciiPunctuation } from "./chars.js";
 import { matchEntity } from "./entity.js";
-import { DelimiterStack, isDelimiterChar, processEmphasis, scanDelimiterRun } from "./delimiter.js";
+import { DelimiterStack, processEmphasis, scanDelimiterRun } from "./delimiter.js";
 import { InlineNode, createTextNode } from "./node.js";
 import { applyGfmAutolinks } from "./gfm-autolink.js";
 import { matchLinkLabel, normalizeLinkLabel, parseLinkDestination, parseLinkTitle, skipInlineWhitespace } from "./link.js";
@@ -11,7 +11,7 @@ import { matchMathInlineSpan } from "./math.js";
 const PLAIN_TEXT_PATTERN = /[^\n`[\]\\!<&*_~]+/y;
 const URI_AUTOLINK_PATTERN = /<[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>]*>/y;
 const EMAIL_AUTOLINK_PATTERN = /<([a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/y;
-const HARD_BREAK_SPACES = "  ";
+const HARD_BREAK_SPACE_COUNT = 2;
 const EMPTY_LABEL_LENGTH = 2;
 function stripOneSurroundingSpace(content) {
 	if (content.startsWith(" ") && content.endsWith(" ") && /[^ ]/.test(content)) return content.slice(1, content.length - 1);
@@ -44,6 +44,13 @@ var InlineParser = class {
 		return this.container;
 	}
 	step() {
+		PLAIN_TEXT_PATTERN.lastIndex = this.pos;
+		const plain = PLAIN_TEXT_PATTERN.exec(this.text);
+		if (plain !== null) {
+			this.appendText(plain[0]);
+			this.pos += plain[0].length;
+			return;
+		}
 		const char = this.text.charAt(this.pos);
 		switch (char) {
 			case "\n":
@@ -70,12 +77,9 @@ var InlineParser = class {
 			case "]":
 				this.parseCloseBracket();
 				return;
-			default:
-				if (isDelimiterChar(char)) {
-					this.parseDelimiterRun(char);
-					return;
-				}
-				this.parsePlainText();
+			case "*":
+			case "_":
+			case "~": this.parseDelimiterRun(char);
 		}
 	}
 	appendText(literal) {
@@ -83,25 +87,16 @@ var InlineParser = class {
 		this.container.appendChild(node);
 		return node;
 	}
-	parsePlainText() {
-		PLAIN_TEXT_PATTERN.lastIndex = this.pos;
-		const match = PLAIN_TEXT_PATTERN.exec(this.text);
-		if (match === null) {
-			this.appendText(this.text.charAt(this.pos));
-			this.pos += 1;
-			return;
-		}
-		this.appendText(match[0]);
-		this.pos += match[0].length;
-	}
 	parseLineBreak() {
 		this.pos += 1;
 		const last = this.container.lastChild;
-		if (last?.kind === "text" && last.literal.endsWith(" ")) {
-			const hard = last.literal.endsWith(HARD_BREAK_SPACES);
-			last.literal = last.literal.replace(/ +$/, "");
-			this.container.appendChild(new InlineNode(hard ? "hardBreak" : "softBreak"));
-		} else this.container.appendChild(new InlineNode("softBreak"));
+		let hard = false;
+		if (last?.kind === "text") {
+			const withoutTrailingSpaces = last.literal.replace(/ +$/, "");
+			hard = last.literal.length - withoutTrailingSpaces.length >= HARD_BREAK_SPACE_COUNT;
+			last.literal = withoutTrailingSpaces;
+		}
+		this.container.appendChild(new InlineNode(hard ? "hardBreak" : "softBreak"));
 		while (this.text.charAt(this.pos) === " ") this.pos += 1;
 	}
 	parseBackslash() {
@@ -113,15 +108,13 @@ var InlineParser = class {
 			this.container.appendChild(new InlineNode("hardBreak"));
 			return;
 		}
-		if (next === "(") {
-			const span = matchMathInlineSpan(this.text, backslashIndex);
-			if (span !== void 0) {
-				const node = new InlineNode("mathInline");
-				node.literal = span.slice(2, span.length - 2);
-				this.container.appendChild(node);
-				this.pos = backslashIndex + span.length;
-				return;
-			}
+		const span = matchMathInlineSpan(this.text, backslashIndex);
+		if (span !== void 0) {
+			const node = new InlineNode("mathInline");
+			node.literal = span.slice(2, span.length - 2);
+			this.container.appendChild(node);
+			this.pos = backslashIndex + span.length;
+			return;
 		}
 		if (isAsciiPunctuation(next)) {
 			this.appendText(next);
@@ -136,7 +129,7 @@ var InlineParser = class {
 		while (this.text.charAt(start + openLength) === "`") openLength += 1;
 		const afterOpen = start + openLength;
 		let scan = afterOpen;
-		while (scan < this.text.length) {
+		while (this.text.charAt(scan) !== "") {
 			if (this.text.charAt(scan) !== "`") {
 				scan += 1;
 				continue;
@@ -218,7 +211,7 @@ var InlineParser = class {
 		}
 		const node = this.appendText(this.text.slice(this.pos, this.pos + run.count));
 		this.pos += run.count;
-		if (run.canOpen || run.canClose) this.delimiters.push(char, run, node);
+		this.delimiters.push(char, run, node);
 	}
 	parseLiteralRun(char) {
 		let length = 0;
@@ -342,7 +335,7 @@ var InlineParser = class {
 		let label;
 		if (labelLength > EMPTY_LABEL_LENGTH) label = this.text.slice(labelStart, labelStart + labelLength);
 		else if (!opener.bracketAfter) label = this.text.slice(opener.index, afterCloseBracket);
-		if (labelLength > 0) this.pos = labelStart + labelLength;
+		this.pos = labelStart + labelLength;
 		if (label === void 0) return;
 		const definition = this.references.get(normalizeLinkLabel(label));
 		if (definition === void 0) {
@@ -487,10 +480,7 @@ function toAstNode(node) {
 }
 function parseInlines(content, references, footnotes, options = {}) {
 	const root = new InlineParser(content, references, footnotes, options).parse();
-	if (options.gfmAutolinks ?? true) {
-		applyGfmAutolinks(root);
-		mergeAdjacentText(root);
-	}
+	if (options.gfmAutolinks ?? true) applyGfmAutolinks(root);
 	return toChildAstNodes(root);
 }
 //#endregion

package/dist/lower/lower.cjs

@@ -49,8 +49,8 @@ function lowerParagraph(node, context) {
 	const blocks = [];
 	const inlineCtx = inlineContext(context);
 	let segment = [];
-	const flushSegment = (force) => {
-		if (segment.length === 0 && !force) return;
+	const flushSegment = () => {
+		if (segment.length === 0) return;
 		const inline = require_lower_inline.lowerInlineNodes(segment, inlineCtx);
 		blocks.push(decorateParagraph({
 			kind: "paragraph",
@@ -76,7 +76,7 @@ function lowerParagraph(node, context) {
 			segment.push(child);
 			continue;
 		}
-		flushSegment(false);
+		flushSegment();
 		if (context.list !== void 0) context.sink({
 			code: require_diagnostics_diagnostics.MarkdownDiagnosticCodes.LIST_ITEM_BLOCK_UNLISTED,
 			severity: "info",
@@ -106,7 +106,7 @@ function lowerParagraph(node, context) {
 			}
 		}, image, { kind: "constructEnd" });
 	}
-	flushSegment(blocks.length === 0);
+	flushSegment();
 	return blocks;
 }
 function splitInfoString(infoString) {
@@ -176,10 +176,9 @@ function lowerHtmlBlock(node, context, contentWidthPt) {
 		severity: "info",
 		message: "block-level raw HTML was preserved as literal text (styleId \"HTMLPreformatted\"); it will not be rendered as HTML by any consumer of the resulting ContentDocument, and its verbatim original rides the paragraph's own markdown residue for this package's writer to re-emit as-is"
 	});
-	const literal = node.literal.replace(/\n+$/, "");
 	return [decorateParagraph({
 		kind: "paragraph",
-		runs: literal.length === 0 ? [] : [{ text: literal }],
+		runs: [{ text: node.literal }],
 		styleId: require_shared_style_constants.HTML_PREFORMATTED_STYLE_ID,
 		source: {
 			format: "markdown",
@@ -242,7 +241,6 @@ function lowerListItem(item, numId, level, context, contentWidthPt) {
 		list: membership
 	};
 	const blocks = [];
-	let ownLevelBlockCount = 0;
 	let firstOwnBlock;
 	for (const child of item.children) {
 		if (child.type === "list") {
@@ -250,11 +248,10 @@ function lowerListItem(item, numId, level, context, contentWidthPt) {
 			continue;
 		}
 		const childBlocks = lowerBlock(child, itemContext, contentWidthPt);
-		ownLevelBlockCount += childBlocks.length;
 		firstOwnBlock ??= childBlocks[0];
 		blocks.push(...childBlocks);
 	}
-	if (ownLevelBlockCount === 0 || firstOwnBlock?.kind === "constructStart") blocks.unshift(decorateParagraph({
+	if (firstOwnBlock === void 0 || firstOwnBlock.kind === "constructStart") blocks.unshift(decorateParagraph({
 		kind: "paragraph",
 		runs: []
 	}, itemContext));
@@ -274,7 +271,7 @@ function lowerList(node, ancestorNumId, level, context, contentWidthPt) {
 	} else {
 		numId = ancestorNumId;
 		const mintedType = require_shared_list_id.mintedListType(numId);
-		if (mintedType !== void 0 && mintedType !== node.markerType) context.sink({
+		if (mintedType === (node.markerType === "bullet" ? "ordered" : "bullet")) context.sink({
 			code: require_diagnostics_diagnostics.MarkdownDiagnosticCodes.LIST_MARKER_TYPE_CONFLICT,
 			severity: "warning",
 			message: `a nested ${node.markerType} list sits under a list minted as ${mintedType}; the enclosing list's own marker type is kept (first-wins) and this nested list's own type is not separately represented`

package/dist/lower/lower.js

@@ -48,8 +48,8 @@ function lowerParagraph(node, context) {
 	const blocks = [];
 	const inlineCtx = inlineContext(context);
 	let segment = [];
-	const flushSegment = (force) => {
-		if (segment.length === 0 && !force) return;
+	const flushSegment = () => {
+		if (segment.length === 0) return;
 		const inline = lowerInlineNodes(segment, inlineCtx);
 		blocks.push(decorateParagraph({
 			kind: "paragraph",
@@ -75,7 +75,7 @@ function lowerParagraph(node, context) {
 			segment.push(child);
 			continue;
 		}
-		flushSegment(false);
+		flushSegment();
 		if (context.list !== void 0) context.sink({
 			code: MarkdownDiagnosticCodes.LIST_ITEM_BLOCK_UNLISTED,
 			severity: "info",
@@ -105,7 +105,7 @@ function lowerParagraph(node, context) {
 			}
 		}, image, { kind: "constructEnd" });
 	}
-	flushSegment(blocks.length === 0);
+	flushSegment();
 	return blocks;
 }
 function splitInfoString(infoString) {
@@ -175,10 +175,9 @@ function lowerHtmlBlock(node, context, contentWidthPt) {
 		severity: "info",
 		message: "block-level raw HTML was preserved as literal text (styleId \"HTMLPreformatted\"); it will not be rendered as HTML by any consumer of the resulting ContentDocument, and its verbatim original rides the paragraph's own markdown residue for this package's writer to re-emit as-is"
 	});
-	const literal = node.literal.replace(/\n+$/, "");
 	return [decorateParagraph({
 		kind: "paragraph",
-		runs: literal.length === 0 ? [] : [{ text: literal }],
+		runs: [{ text: node.literal }],
 		styleId: HTML_PREFORMATTED_STYLE_ID,
 		source: {
 			format: "markdown",
@@ -241,7 +240,6 @@ function lowerListItem(item, numId, level, context, contentWidthPt) {
 		list: membership
 	};
 	const blocks = [];
-	let ownLevelBlockCount = 0;
 	let firstOwnBlock;
 	for (const child of item.children) {
 		if (child.type === "list") {
@@ -249,11 +247,10 @@ function lowerListItem(item, numId, level, context, contentWidthPt) {
 			continue;
 		}
 		const childBlocks = lowerBlock(child, itemContext, contentWidthPt);
-		ownLevelBlockCount += childBlocks.length;
 		firstOwnBlock ??= childBlocks[0];
 		blocks.push(...childBlocks);
 	}
-	if (ownLevelBlockCount === 0 || firstOwnBlock?.kind === "constructStart") blocks.unshift(decorateParagraph({
+	if (firstOwnBlock === void 0 || firstOwnBlock.kind === "constructStart") blocks.unshift(decorateParagraph({
 		kind: "paragraph",
 		runs: []
 	}, itemContext));
@@ -273,7 +270,7 @@ function lowerList(node, ancestorNumId, level, context, contentWidthPt) {
 	} else {
 		numId = ancestorNumId;
 		const mintedType = mintedListType(numId);
-		if (mintedType !== void 0 && mintedType !== node.markerType) context.sink({
+		if (mintedType === (node.markerType === "bullet" ? "ordered" : "bullet")) context.sink({
 			code: MarkdownDiagnosticCodes.LIST_MARKER_TYPE_CONFLICT,
 			severity: "warning",
 			message: `a nested ${node.markerType} list sits under a list minted as ${mintedType}; the enclosing list's own marker type is kept (first-wins) and this nested list's own type is not separately represented`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdown-codec",
-  "version": "6.7.5",
+  "version": "6.7.6",
   "description": "Hand-written CommonMark+GFM <-> DocumentTree codec, built on document-schema.js",
   "type": "module",
   "repository": {