@effected/yaml 0.7.0 → 0.9.0

package/index.js

@@ -4,6 +4,9 @@ import { Yaml, YamlParseError, YamlParseOptions, YamlStringifyError, YamlStringi
 import { YamlDirective, YamlDocument } from "./YamlDocument.js";
 import { YamlEdit, YamlRange } from "./YamlEdit.js";
 import { YamlFormat, YamlFormattingOptions, YamlModificationError } from "./YamlFormat.js";
+import { YamlLintDiagnostic, YamlLintSeverity } from "./YamlLintRule.js";
+import { YamlToken, YamlTokenKind, YamlTokens } from "./YamlToken.js";
+import { YamlLint, YamlLintConfig, YamlLintRuleSetting } from "./YamlLint.js";
 import { YamlVisitor, YamlVisitorEvent } from "./YamlVisitor.js";
 
-export { CollectionStyle, QuoteStyle, ScalarChomp, ScalarStyle, Yaml, YamlAlias, YamlComposerErrorCode, YamlDiagnostic, YamlDirective, YamlDocument, YamlEdit, YamlErrorCode, YamlFormat, YamlFormattingOptions, YamlLexErrorCode, YamlMap, YamlModificationError, YamlModifyErrorCode, YamlNode, YamlPair, YamlParseError, YamlParseErrorCode, YamlParseOptions, YamlRange, YamlScalar, YamlSeq, YamlStringifyError, YamlStringifyErrorCode, YamlStringifyOptions, YamlVisitor, YamlVisitorEvent };
+export { CollectionStyle, QuoteStyle, ScalarChomp, ScalarStyle, Yaml, YamlAlias, YamlComposerErrorCode, YamlDiagnostic, YamlDirective, YamlDocument, YamlEdit, YamlErrorCode, YamlFormat, YamlFormattingOptions, YamlLexErrorCode, YamlLint, YamlLintConfig, YamlLintDiagnostic, YamlLintRuleSetting, YamlLintSeverity, YamlMap, YamlModificationError, YamlModifyErrorCode, YamlNode, YamlPair, YamlParseError, YamlParseErrorCode, YamlParseOptions, YamlRange, YamlScalar, YamlSeq, YamlStringifyError, YamlStringifyErrorCode, YamlStringifyOptions, YamlToken, YamlTokenKind, YamlTokens, YamlVisitor, YamlVisitorEvent };

package/internal/composer/anchors.js

@@ -1,4 +1,4 @@
-import { YamlAlias, YamlMap, YamlScalar, YamlSeq } from "../../YamlNode.js";
+import { YamlAlias } from "../../YamlNode.js";
 
 //#region src/internal/composer/anchors.ts
 /**
@@ -67,31 +67,6 @@ function scanName(text, start) {
 	}
 	return text.slice(start, end);
 }
-/**
-* Build an anchor map by walking the AST, collecting nodes that have anchors.
-* Used to resolve aliases when extracting plain JavaScript values from
-* parsed YAML documents.
-*/
-function buildAnchorMap(node) {
-	const anchors = /* @__PURE__ */ new Map();
-	collectAnchors(node, anchors);
-	return anchors;
-}
-function collectAnchors(node, anchors) {
-	if (node === null) return;
-	if (node instanceof YamlScalar) {
-		if (node.anchor !== void 0) anchors.set(node.anchor, node);
-	} else if (node instanceof YamlMap) {
-		if (node.anchor !== void 0) anchors.set(node.anchor, node);
-		for (const pair of node.items) {
-			collectAnchors(pair.key, anchors);
-			collectAnchors(pair.value, anchors);
-		}
-	} else if (node instanceof YamlSeq) {
-		if (node.anchor !== void 0) anchors.set(node.anchor, node);
-		for (const item of node.items) collectAnchors(item, anchors);
-	}
-}
 
 //#endregion
-export { buildAnchorMap, checkAnchorOnAlias, getAliasName, getAnchorName, makeAlias, registerAnchor, scanName };
+export { checkAnchorOnAlias, getAliasName, getAnchorName, makeAlias, registerAnchor, scanName };

package/internal/composer/block.js

@@ -1,5 +1,6 @@
-import { YamlMap, YamlPair, YamlScalar, YamlSeq } from "../../YamlNode.js";
+import { YamlAlias, YamlMap, YamlPair, YamlScalar, YamlSeq } from "../../YamlNode.js";
 import { checkAnchorOnAlias, getAnchorName, makeAlias, registerAnchor } from "./anchors.js";
+import { blankAboveIsKeepChompContent, columnAt, hasBlankLineAbove, isAfterIndicatorOnly, isOwnLineAt, joinComments, rawCommentText, sameLineSpan, withCommentFields } from "./comments.js";
 import { enterNesting, exitNesting, hasMeta, hasNonWhitespaceBeforeOnLine, lineCol, lineIndentColumn, sameLine } from "./state.js";
 import { blockMapStartsWithValueSep, classifyPlainNumeric, collectMultilineKey, collectMultilinePlainScalar, findFirstContent, findLastContent, findNextContentInList, findNextSignificantChild, findValueSepOffset, getScalarStyle, hasValueSepAfterInList, hasValueSepBetween, hasValueSepThroughPlainScalars, makeScalar, resolveScalar, shouldPreserveRaw } from "./scalars.js";
 
@@ -35,11 +36,12 @@ function composeBlockMapInner(blockMapCst, state, externalFirstKey, meta) {
 		kind: "key",
 		node: externalFirstKey
 	});
-	buildPairs(items, pairs, state.text);
+	const trailingComment = buildPairs(items, pairs, state.text, state.escapedComments);
 	if (state.options.uniqueKeys) checkDuplicateKeys(pairs, state);
 	checkMultilineImplicitKeys(pairs, state);
 	const offset = externalFirstKey ? "offset" in externalFirstKey ? externalFirstKey.offset : blockMapCst.offset : blockMapCst.offset;
 	const length = blockMapCst.offset + blockMapCst.length - offset;
+	const mapComment = meta?.comment !== void 0 ? trailingComment !== void 0 ? `${meta.comment}\n${trailingComment}` : meta.comment : trailingComment;
 	const map = new YamlMap({
 		items: pairs,
 		style: "block",
@@ -47,7 +49,7 @@ function composeBlockMapInner(blockMapCst, state, externalFirstKey, meta) {
 		length,
 		...meta?.tag !== void 0 ? { tag: meta.tag } : {},
 		...meta?.anchor !== void 0 ? { anchor: meta.anchor } : {},
-		...meta?.comment !== void 0 ? { comment: meta.comment } : {}
+		...mapComment !== void 0 ? { comment: mapComment } : {}
 	});
 	if (meta?.anchor) registerAnchor(map, meta.anchor, state, offset);
 	return map;
@@ -104,6 +106,14 @@ function flattenBlockMapChildren(children, state, externalKeyColumn, externalKey
 			kind: "node",
 			node
 		});
+		if (state.escapedComments.length > 0) {
+			for (const ec of state.escapedComments) items.push({
+				kind: "comment",
+				comment: ec.text,
+				offset: ec.offset
+			});
+			state.escapedComments.length = 0;
+		}
 		afterValueSep = false;
 	}
 	for (let i = 0; i < children.length; i++) {
@@ -132,7 +142,7 @@ function flattenBlockMapChildren(children, state, externalKeyColumn, externalKey
 					const sliceChildren = children.slice(i + 1, lookahead.endIdx);
 					const innerItems = flattenBlockMapChildren(sliceChildren, state);
 					const innerPairs = [];
-					buildPairs(innerItems, innerPairs, state.text);
+					const innerTrailing = buildPairs(innerItems, innerPairs, state.text);
 					const firstC = findFirstContent(sliceChildren);
 					const lastC = findLastContent(sliceChildren);
 					const innerOffset = firstC ? firstC.offset : child.offset;
@@ -141,7 +151,8 @@ function flattenBlockMapChildren(children, state, externalKeyColumn, externalKey
 						items: innerPairs,
 						style: "block",
 						offset: innerOffset,
-						length: innerEnd - innerOffset
+						length: innerEnd - innerOffset,
+						...innerTrailing !== void 0 ? { comment: innerTrailing } : {}
 					}), innerOffset);
 					i = lookahead.endIdx - 1;
 					continue;
@@ -187,10 +198,10 @@ function flattenBlockMapChildren(children, state, externalKeyColumn, externalKey
 			continue;
 		}
 		if (child.type === "comment") {
-			const text = child.source.startsWith("#") ? child.source.slice(1).trim() : child.source;
 			items.push({
 				kind: "comment",
-				comment: text
+				comment: rawCommentText(child.source),
+				offset: child.offset
 			});
 			continue;
 		}
@@ -479,9 +490,74 @@ function flattenBlockMapChildren(children, state, externalKeyColumn, externalKey
 * Pattern: node, value-sep, node produces a key:value pair.
 * Pattern: node, value-sep (no node) produces a key:null pair.
 * Pattern: value-sep, node produces a null:value pair.
+*
+* Comment attribution (#127): a comment on the same line as the end of the
+* previous pair attaches to it as the trailing `comment`; an own-line
+* comment attaches FORWARD to the next pair as `commentBefore` (consecutive
+* lines join with `\n`); a blank line before a pair (or before its
+* `commentBefore` block) sets `spaceBefore`. Own-line comments left over
+* after the last pair are returned so the caller can attach them as the
+* containing collection's trailing `comment`.
 */
-function buildPairs(items, pairs, text) {
+function buildPairs(items, pairs, text, escaped) {
 	let i = 0;
+	let pending = [];
+	let pendingSpace = false;
+	let lastEnd = -1;
+	let lastNode;
+	let contentColumn = -1;
+	const nodeEnd = (n) => n.offset + n.length;
+	/**
+	* Rebuild `pair` with `text` appended to the trailing comment of whichever
+	* node owns the pair's last line: the value when present, otherwise the key.
+	*/
+	const withTrailingComment = (pair, text, onKey = false) => pair.value !== null && !onKey ? new YamlPair({
+		key: pair.key,
+		value: withCommentFields(pair.value, { comment: text })
+	}) : new YamlPair({
+		key: withCommentFields(pair.key, { comment: text }),
+		value: pair.value
+	});
+	/**
+	* Finish a pair: the pending leading fields go to its KEY node, the entry's
+	* trailing comment to whichever node owns the last line. The one place the
+	* node-level split is applied, so no construction site has to know it.
+	*/
+	const pushPair = (pair, leading, trailing, trailingOnKey = false) => {
+		const withLeading = Object.keys(leading).length === 0 ? pair : new YamlPair({
+			key: withCommentFields(pair.key, leading),
+			value: pair.value
+		});
+		return trailing === void 0 ? withLeading : withTrailingComment(withLeading, trailing, trailingOnKey);
+	};
+	const noteContentColumn = (offset) => {
+		if (contentColumn < 0 && offset >= 0) contentColumn = columnAt(text, offset);
+	};
+	/** Join pending parts: `\n` between lines, an extra `\n` per embedded blank. */
+	const joinPending = (parts) => {
+		if (parts.length === 0) return void 0;
+		let out = parts[0].text;
+		for (let k = 1; k < parts.length; k++) {
+			const part = parts[k];
+			out += part.blankAbove ? `\n\n${part.text}` : `\n${part.text}`;
+		}
+		return out;
+	};
+	/** The pending comment fields for the pair being constructed, then reset. */
+	const takePendingFields = (anchorOffset) => {
+		let commentBefore = joinPending(pending);
+		if (anchorOffset >= 0 && hasBlankLineAbove(text, anchorOffset)) {
+			if (commentBefore !== void 0) commentBefore = `${commentBefore}\n`;
+			else if (!pendingSpace && lastEnd >= 0 && !blankAboveIsKeepChompContent(text, anchorOffset, lastNode)) pendingSpace = true;
+		}
+		const fields = {
+			...commentBefore !== void 0 ? { commentBefore } : {},
+			...pendingSpace ? { spaceBefore: true } : {}
+		};
+		pending = [];
+		pendingSpace = false;
+		return fields;
+	};
 	while (i < items.length) {
 		const item = items[i];
 		if (!item) {
@@ -489,12 +565,18 @@ function buildPairs(items, pairs, text) {
 			continue;
 		}
 		if (item.kind === "comment") {
-			if (pairs.length > 0) {
+			const cOff = item.offset ?? -1;
+			const cText = item.comment ?? "";
+			if (!(cOff < 0 ? true : isOwnLineAt(text, cOff) || isAfterIndicatorOnly(text, cOff)) && pairs.length > 0) {
 				const last = pairs[pairs.length - 1];
-				if (last) pairs[pairs.length - 1] = new YamlPair({
-					key: last.key,
-					value: last.value,
-					...item.comment !== void 0 ? { comment: item.comment } : {}
+				if (last) pairs[pairs.length - 1] = withTrailingComment(last, cText);
+			} else {
+				const blankAbove = cOff >= 0 && hasBlankLineAbove(text, cOff) && !blankAboveIsKeepChompContent(text, cOff, lastNode);
+				if (blankAbove && pending.length === 0 && lastEnd >= 0) pendingSpace = true;
+				pending.push({
+					text: cText,
+					offset: cOff,
+					blankAbove: blankAbove && pending.length > 0
 				});
 			}
 			i++;
@@ -503,30 +585,30 @@ function buildPairs(items, pairs, text) {
 		if (item.kind === "value-sep") {
 			const valueSepOffset = item.offset ?? 0;
 			i++;
+			const pendingFields = takePendingFields(valueSepOffset);
+			noteContentColumn(valueSepOffset);
 			const valueNode = consumeValueNodeForNullKey(items, i, text, valueSepOffset);
+			const nullKey = new YamlScalar({
+				value: null,
+				style: "plain",
+				offset: valueSepOffset,
+				length: 0
+			});
 			if (valueNode) {
-				const nullKey = new YamlScalar({
-					value: null,
-					style: "plain",
-					offset: valueSepOffset,
-					length: 0
-				});
-				pairs.push(new YamlPair({
+				pairs.push(pushPair(new YamlPair({
 					key: nullKey,
 					value: valueNode.node ?? null
-				}));
+				}), pendingFields, void 0));
 				i = valueNode.nextIdx;
+				lastEnd = valueNode.node ? nodeEnd(valueNode.node) : valueSepOffset + 1;
+				lastNode = valueNode.node ?? void 0;
 			} else {
-				const nullKey = new YamlScalar({
-					value: null,
-					style: "plain",
-					offset: valueSepOffset,
-					length: 0
-				});
-				pairs.push(new YamlPair({
+				pairs.push(pushPair(new YamlPair({
 					key: nullKey,
 					value: null
-				}));
+				}), pendingFields, void 0));
+				lastEnd = valueSepOffset + 1;
+				lastNode = void 0;
 			}
 			continue;
 		}
@@ -540,62 +622,124 @@ function buildPairs(items, pairs, text) {
 					i++;
 				}
 			}
-			while (i < items.length && items[i]?.kind === "comment") i++;
+			if (keyNode) noteContentColumn(keyNode.offset);
+			const pendingFields = takePendingFields(keyNode ? keyNode.offset : -1);
+			let pairTrailing;
+			while (i < items.length && items[i]?.kind === "comment") {
+				const c = items[i]?.comment;
+				if (c !== void 0) pairTrailing = joinComments(pairTrailing, c);
+				i++;
+			}
+			const keyOrNull = () => keyNode ?? new YamlScalar({
+				value: null,
+				style: "plain",
+				offset: 0,
+				length: 0
+			});
 			if (i < items.length && items[i]?.kind === "value-sep") {
+				const sepOffset = items[i]?.offset ?? (keyNode ? nodeEnd(keyNode) : 0);
 				i++;
-				const valueResult = consumeValueNode(items, i);
+				const valueResult = consumeValueNode(items, i, text, sepOffset);
 				if (valueResult) {
-					pairs.push(new YamlPair({
-						key: keyNode ?? new YamlScalar({
-							value: null,
-							style: "plain",
-							offset: 0,
-							length: 0
-						}),
-						value: valueResult.node ?? null
-					}));
+					for (const c of valueResult.sameLineComments) pairTrailing = joinComments(pairTrailing, c);
+					let valNode = valueResult.node;
+					if (valNode !== null && valueResult.leadingComments.length > 0) valNode = withCommentFields(valNode, { commentBefore: valueResult.leadingComments.join("\n") });
+					pairs.push(pushPair(new YamlPair({
+						key: keyOrNull(),
+						value: valNode
+					}), pendingFields, pairTrailing, keyIsSimple(keyNode) && (valNode === null || !sameLineSpan(text, sepOffset, valNode.offset))));
 					i = valueResult.nextIdx;
-				} else pairs.push(new YamlPair({
-					key: keyNode ?? new YamlScalar({
-						value: null,
-						style: "plain",
-						offset: 0,
-						length: 0
-					}),
+					lastEnd = valNode ? nodeEnd(valNode) : sepOffset + 1;
+					lastNode = valNode ?? void 0;
+				} else {
+					pairs.push(pushPair(new YamlPair({
+						key: keyOrNull(),
+						value: null
+					}), pendingFields, pairTrailing));
+					lastEnd = sepOffset + 1;
+					lastNode = void 0;
+				}
+			} else {
+				pairs.push(pushPair(new YamlPair({
+					key: keyOrNull(),
 					value: null
-				}));
-			} else pairs.push(new YamlPair({
-				key: keyNode ?? new YamlScalar({
-					value: null,
-					style: "plain",
-					offset: 0,
-					length: 0
-				}),
-				value: null
-			}));
+				}), pendingFields, pairTrailing));
+				lastEnd = keyNode ? nodeEnd(keyNode) : lastEnd;
+				if (keyNode) lastNode = keyNode;
+			}
 			continue;
 		}
 		i++;
 	}
+	if (pending.length === 0) return void 0;
+	const withLeadingBlank = (parts) => {
+		const joined = joinPending(parts);
+		const first = parts[0];
+		return joined !== void 0 && first !== void 0 && lastEnd >= 0 && first.offset >= 0 && hasBlankLineAbove(text, first.offset) && !blankAboveIsKeepChompContent(text, first.offset, lastNode) ? `\n${joined}` : joined;
+	};
+	if (escaped !== void 0 && contentColumn > 0) {
+		const kept = [];
+		for (const part of pending) if (part.offset >= 0 && columnAt(text, part.offset) < contentColumn) escaped.push({
+			text: part.text,
+			offset: part.offset
+		});
+		else kept.push(part);
+		return withLeadingBlank(kept);
+	}
+	return withLeadingBlank(pending);
 }
-function consumeValueNode(items, startIdx) {
+/**
+* True when a key renders in implicit `key: value` form, so the `:` sits on
+* the key's own line. A multi-line or block-scalar key forces the explicit
+* `? key` / `: value` spelling, where the `:` gets a line of its own.
+*/
+function keyIsSimple(keyNode) {
+	if (keyNode instanceof YamlAlias) return true;
+	if (!(keyNode instanceof YamlScalar)) return false;
+	if (typeof keyNode.value === "string" && keyNode.value.includes("\n")) return false;
+	return keyNode.style !== "block-literal" && keyNode.style !== "block-folded";
+}
+function consumeValueNode(items, startIdx, text, sepOffset) {
+	let peek = startIdx;
+	while (peek < items.length && items[peek]?.kind === "comment") peek++;
+	const candidate = peek < items.length ? items[peek] : void 0;
+	if (candidate?.kind === "node" && peek + 1 < items.length && items[peek + 1]?.kind === "value-sep" && candidate.node !== void 0 && text.slice(sepOffset, candidate.node.offset).includes("\n")) return null;
 	let i = startIdx;
+	const sameLineComments = [];
+	const leadingComments = [];
+	let firstOwnLineIdx = -1;
 	while (i < items.length) {
 		const item = items[i];
 		if (!item) break;
 		if (item.kind === "comment") {
+			const cText = item.comment ?? "";
+			if (item.offset !== void 0 && sameLineSpan(text, sepOffset, item.offset)) sameLineComments.push(cText);
+			else {
+				if (firstOwnLineIdx < 0) firstOwnLineIdx = i;
+				leadingComments.push(cText);
+			}
 			i++;
 			continue;
 		}
 		if (item.kind === "node") return {
 			node: item.node ?? null,
-			nextIdx: i + 1
+			nextIdx: i + 1,
+			sameLineComments,
+			leadingComments
 		};
 		break;
 	}
+	if (firstOwnLineIdx >= 0) return {
+		node: null,
+		nextIdx: firstOwnLineIdx,
+		sameLineComments,
+		leadingComments: []
+	};
 	return i > startIdx ? {
 		node: null,
-		nextIdx: i
+		nextIdx: i,
+		sameLineComments,
+		leadingComments
 	} : null;
 }
 /**
@@ -609,10 +753,12 @@ function consumeValueNode(items, startIdx) {
 */
 function consumeValueNodeForNullKey(items, startIdx, text, valueSepOffset) {
 	let i = startIdx;
+	let firstOwnLineIdx = -1;
 	while (i < items.length) {
 		const item = items[i];
 		if (!item) break;
 		if (item.kind === "comment") {
+			if (firstOwnLineIdx < 0 && item.offset !== void 0 && !sameLineSpan(text, valueSepOffset, item.offset)) firstOwnLineIdx = i;
 			i++;
 			continue;
 		}
@@ -628,6 +774,10 @@ function consumeValueNodeForNullKey(items, startIdx, text, valueSepOffset) {
 		}
 		break;
 	}
+	if (firstOwnLineIdx >= 0) return {
+		node: null,
+		nextIdx: firstOwnLineIdx
+	};
 	return i > startIdx ? {
 		node: null,
 		nextIdx: i
@@ -950,11 +1100,59 @@ function composeBlockSeq(cst, state, meta) {
 }
 function composeBlockSeqInner(cst, state, meta) {
 	const children = cst.children ?? [];
-	const items = [];
+	const rawItems = [];
 	let pendingMeta = {};
 	let sawEntry = false;
 	const seqIndent = lineIndentColumn(state.text, cst.offset);
 	let sawNewlineSincePending = false;
+	let pending = [];
+	let pendingSpace = false;
+	let lastItemEnd = -1;
+	let lastItemNode;
+	const joinPending = (parts) => {
+		if (parts.length === 0) return void 0;
+		let out = parts[0].text;
+		for (let k = 1; k < parts.length; k++) {
+			const part = parts[k];
+			out += part.blankAbove ? `\n\n${part.text}` : `\n${part.text}`;
+		}
+		return out;
+	};
+	const acceptOwnLineComment = (cText, cOff) => {
+		const blankAbove = cOff >= 0 && hasBlankLineAbove(state.text, cOff) && !blankAboveIsKeepChompContent(state.text, cOff, lastItemNode);
+		if (blankAbove && pending.length === 0 && lastItemEnd >= 0) pendingSpace = true;
+		pending.push({
+			text: cText,
+			offset: cOff,
+			blankAbove: blankAbove && pending.length > 0
+		});
+	};
+	const items = {
+		get length() {
+			return rawItems.length;
+		},
+		push(node) {
+			let commentBefore = joinPending(pending);
+			if (node.length > 0 && hasBlankLineAbove(state.text, node.offset)) {
+				if (commentBefore !== void 0) commentBefore = `${commentBefore}\n`;
+				else if (!pendingSpace && lastItemEnd >= 0 && !blankAboveIsKeepChompContent(state.text, node.offset, lastItemNode)) pendingSpace = true;
+			}
+			let decorated = node;
+			if (commentBefore !== void 0 || pendingSpace) decorated = withCommentFields(node, {
+				...commentBefore !== void 0 ? { commentBefore } : {},
+				...pendingSpace ? { spaceBefore: true } : {}
+			});
+			pending = [];
+			pendingSpace = false;
+			rawItems.push(decorated);
+			lastItemEnd = node.offset + node.length;
+			lastItemNode = node;
+			if (state.escapedComments.length > 0) {
+				for (const ec of state.escapedComments) acceptOwnLineComment(ec.text, ec.offset);
+				state.escapedComments.length = 0;
+			}
+		}
+	};
 	for (let ci = 0; ci < children.length; ci++) {
 		const child = children[ci];
 		if (!child) continue;
@@ -962,7 +1160,14 @@ function composeBlockSeqInner(cst, state, meta) {
 			if (hasMeta(pendingMeta)) sawNewlineSincePending = true;
 			continue;
 		}
-		if (child.type === "comment") continue;
+		if (child.type === "comment") {
+			const cText = rawCommentText(child.source);
+			if (rawItems.length > 0 && !isOwnLineAt(state.text, child.offset)) {
+				const prev = rawItems[rawItems.length - 1];
+				if (prev) rawItems[rawItems.length - 1] = withCommentFields(prev, { comment: cText });
+			} else acceptOwnLineComment(cText, child.offset);
+			continue;
+		}
 		if (child.type === "whitespace") {
 			if (child.source.trim() === "-") {
 				if (sawEntry) {
@@ -1121,14 +1326,32 @@ function composeBlockSeqInner(cst, state, meta) {
 		if (pendingMeta.anchor) registerAnchor(scalar, pendingMeta.anchor, state, 0);
 		items.push(scalar);
 	}
+	const withLeadingBlank = (parts) => {
+		const joined = joinPending(parts);
+		const first = parts[0];
+		return joined !== void 0 && first !== void 0 && lastItemEnd >= 0 && first.offset >= 0 && hasBlankLineAbove(state.text, first.offset) && !blankAboveIsKeepChompContent(state.text, first.offset, lastItemNode) ? `\n${joined}` : joined;
+	};
+	let seqTrailing;
+	if (pending.length > 0) {
+		if (seqIndent > 0) {
+			const kept = [];
+			for (const part of pending) if (part.offset >= 0 && columnAt(state.text, part.offset) < seqIndent) state.escapedComments.push({
+				text: part.text,
+				offset: part.offset
+			});
+			else kept.push(part);
+			seqTrailing = withLeadingBlank(kept);
+		} else seqTrailing = withLeadingBlank(pending);
+	}
+	const seqComment = meta?.comment !== void 0 ? seqTrailing !== void 0 ? `${meta.comment}\n${seqTrailing}` : meta.comment : seqTrailing;
 	const seq = new YamlSeq({
-		items,
+		items: rawItems,
 		style: "block",
 		offset: cst.offset,
 		length: cst.length,
 		...meta?.tag !== void 0 ? { tag: meta.tag } : {},
 		...meta?.anchor !== void 0 ? { anchor: meta.anchor } : {},
-		...meta?.comment !== void 0 ? { comment: meta.comment } : {}
+		...seqComment !== void 0 ? { comment: seqComment } : {}
 	});
 	if (meta?.anchor) registerAnchor(seq, meta.anchor, state, cst.offset);
 	return seq;
@@ -1144,11 +1367,12 @@ function composeFlatBlockMap(children, startIdx, parentCst, state, externalFirst
 		node: externalFirstKey
 	});
 	const pairs = [];
-	buildPairs(items, pairs, state.text);
+	const trailingComment = buildPairs(items, pairs, state.text, state.escapedComments);
 	if (state.options.uniqueKeys) checkDuplicateKeys(pairs, state);
 	checkMultilineImplicitKeys(pairs, state);
 	const offset = "offset" in externalFirstKey ? externalFirstKey.offset : parentCst.offset;
 	const end = parentCst.offset + parentCst.length;
+	const mapComment = meta?.comment !== void 0 ? trailingComment !== void 0 ? `${meta.comment}\n${trailingComment}` : meta.comment : trailingComment;
 	const map = new YamlMap({
 		items: pairs,
 		style: "block",
@@ -1156,11 +1380,11 @@ function composeFlatBlockMap(children, startIdx, parentCst, state, externalFirst
 		length: end - offset,
 		...meta?.tag !== void 0 ? { tag: meta.tag } : {},
 		...meta?.anchor !== void 0 ? { anchor: meta.anchor } : {},
-		...meta?.comment !== void 0 ? { comment: meta.comment } : {}
+		...mapComment !== void 0 ? { comment: mapComment } : {}
 	});
 	if (meta?.anchor) registerAnchor(map, meta.anchor, state, offset);
 	return map;
 }
 
 //#endregion
-export { buildPairs, checkDuplicateKeys, checkMultilineImplicitKeys, checkTrailingContentOnSameLine, composeBlockMap, composeBlockSeq, composeFlatBlockMap, flattenBlockMapChildren };
+export { buildPairs, checkDuplicateKeys, checkMultilineImplicitKeys, checkTrailingContentOnSameLine, composeBlockMap, composeBlockSeq, composeFlatBlockMap, flattenBlockMapChildren, keyIdentity };