@effected/yaml 0.7.0 → 0.9.0

package/internal/composer/comments.js

@@ -0,0 +1,217 @@
+import { YamlAlias, YamlMap, YamlScalar, YamlSeq } from "../../YamlNode.js";
+
+//#region src/internal/composer/comments.ts
+/** True when there is no line break between `start` and `end` in `text`. */
+function sameLineSpan(text, start, end) {
+	if (start < 0) return false;
+	return !text.slice(Math.max(0, start), Math.max(0, end)).includes("\n");
+}
+/**
+* True when only horizontal whitespace precedes `offset` on its line — i.e.
+* the token at `offset` starts its own line. Purely local, so it stays
+* correct even when a preceding node's span over-extends past line ends.
+*/
+function isOwnLineAt(text, offset) {
+	let i = offset - 1;
+	while (i >= 0) {
+		const ch = text[i];
+		if (ch === " " || ch === "	") {
+			i--;
+			continue;
+		}
+		return ch === "\n" || ch === "\r";
+	}
+	return true;
+}
+/**
+* True when the only thing before `offset` on its line is a block indicator —
+* `?`, `:` or `-` — plus whitespace. Such a comment sits on an indicator line
+* with its node BELOW, so it leads that node rather than trailing whatever
+* came before (`? # c` / ` - seq1`). Without this, the `? ` prefix makes the
+* comment look like a trailing comment on the previous entry.
+*/
+function isAfterIndicatorOnly(text, offset) {
+	let i = offset - 1;
+	let sawIndicator = false;
+	while (i >= 0) {
+		const ch = text[i];
+		if (ch === " " || ch === "	") {
+			i--;
+			continue;
+		}
+		if (!sawIndicator && (ch === "?" || ch === "-" || ch === ":")) {
+			sawIndicator = true;
+			i--;
+			continue;
+		}
+		return sawIndicator && (ch === "\n" || ch === "\r");
+	}
+	return sawIndicator;
+}
+/**
+* True when the line immediately above the line containing `offset` is blank
+* (empty or horizontal whitespace only). Purely local — see
+* {@link isOwnLineAt} for why span-based gap checks are not used.
+*/
+function hasBlankLineAbove(text, offset) {
+	return blankLineAboveStart(text, offset) >= 0;
+}
+/**
+* Start offset of the blank line immediately above the line containing
+* `offset`, or `-1` when that line is not blank. The offset form of
+* {@link hasBlankLineAbove}, for callers that must locate the blank line
+* (e.g. to test whether it falls inside a preceding scalar token's span).
+*/
+function blankLineAboveStart(text, offset) {
+	const lineBreak = text.lastIndexOf("\n", Math.max(0, offset - 1));
+	if (lineBreak < 0) return -1;
+	const prevBreak = text.lastIndexOf("\n", lineBreak - 1);
+	return text.slice(prevBreak + 1, lineBreak).trim() === "" ? prevBreak + 1 : -1;
+}
+/**
+* The deepest trailing scalar reached by descending last-child edges from
+* `node` (a map's last pair's value, a seq's last item) — the node whose
+* token span a textually-following blank line could fall inside.
+*/
+function deepestTrailingScalar(node) {
+	let current = node;
+	for (;;) {
+		if (current instanceof YamlScalar) return current;
+		if (current instanceof YamlMap) {
+			const last = current.items[current.items.length - 1];
+			if (last === void 0) return void 0;
+			current = last.value ?? last.key;
+			continue;
+		}
+		if (current instanceof YamlSeq) {
+			const last = current.items[current.items.length - 1];
+			if (last === void 0) return void 0;
+			current = last;
+			continue;
+		}
+		return;
+	}
+}
+/**
+* True when the blank line immediately above `offset` is CONTENT of the
+* preceding keep-chomp block scalar, not a stylistic blank. Under `+`
+* chomping the trailing line breaks are part of the scalar's VALUE (the
+* composer already stores them there), so recording the same blank line as
+* `spaceBefore` (or a leading-blank embed on a terminal comment run) would
+* double-count it: emission renders both the kept newline and the stylistic
+* blank, growing the document on every format pass. Clip/strip scalars are
+* deliberately NOT excluded — their emission drops the trailing blank from
+* the value, so the `spaceBefore` capture is exactly what re-creates it.
+*
+* `prev` is the last composed node before `offset` (a pair's value, a seq
+* item); the check descends to its deepest trailing scalar and requires the
+* blank line to start inside that scalar's token span.
+*/
+function blankAboveIsKeepChompContent(text, offset, prev) {
+	if (prev === void 0) return false;
+	const scalar = deepestTrailingScalar(prev);
+	if (scalar === void 0 || scalar.chomp !== "keep") return false;
+	if (scalar.style !== "block-literal" && scalar.style !== "block-folded") return false;
+	const start = blankLineAboveStart(text, offset);
+	return start >= scalar.offset && start < scalar.offset + scalar.length;
+}
+/**
+* True when the line immediately below the line containing `offset` is blank
+* (empty or horizontal whitespace only) AND is itself followed by another
+* line. Purely local, the mirror of {@link hasBlankLineAbove} — used to embed
+* a blank line AFTER a comment run as a trailing empty line in the stored
+* comment string.
+*/
+function hasBlankLineBelow(text, offset) {
+	const lineEnd = text.indexOf("\n", Math.max(0, offset));
+	if (lineEnd < 0) return false;
+	const nextEnd = text.indexOf("\n", lineEnd + 1);
+	if (nextEnd < 0) return false;
+	return text.slice(lineEnd + 1, nextEnd).trim() === "";
+}
+/**
+* The stored text of a comment token: the RAW post-`#` slice, reference
+* parity with the `yaml` npm package — `# section` stores `" section"`,
+* `#no-space` stores `"no-space"`, `#   aligned` keeps its alignment.
+*
+* The one reserved string is `""`, which encodes an embedded blank line
+* inside a joined comment run — so a spaces-only raw slice stores with ONE
+* extra trailing space and the renderers strip it back off. A bare `#`
+* (raw `""`) stores `" "`, `# ` (raw `" "`) stores `"  "`, and so on; the
+* escape is injective, so every comment spelling roundtrips byte-intact.
+* Raw storage is what makes byte-intact roundtrip possible; trimming would
+* canonicalize every comment to `# text`.
+*/
+function rawCommentText(source) {
+	const raw = source.startsWith("#") ? source.slice(1) : source;
+	return /^ *$/.test(raw) ? `${raw} ` : raw;
+}
+/** Join two optional comment blocks with a newline. */
+function joinComments(a, b) {
+	return a === void 0 ? b : `${a}\n${b}`;
+}
+/** Zero-based column of `offset` within its line. */
+function columnAt(text, offset) {
+	if (offset <= 0) return 0;
+	return offset - (text.lastIndexOf("\n", offset - 1) + 1);
+}
+/**
+* Rebuild `node` with the given comment fields merged in (existing fields are
+* kept unless overridden; `commentBefore`/`comment` join with a newline when
+* both sides are present). Every node class carries the triple, aliases
+* included.
+*/
+function withCommentFields(node, fields) {
+	if (node instanceof YamlScalar) return new YamlScalar({
+		value: node.value,
+		style: node.style,
+		...node.tag !== void 0 ? { tag: node.tag } : {},
+		...node.anchor !== void 0 ? { anchor: node.anchor } : {},
+		...mergedCommentFields(node, fields),
+		...node.chomp !== void 0 ? { chomp: node.chomp } : {},
+		...node.blockIndent !== void 0 ? { blockIndent: node.blockIndent } : {},
+		...node.raw !== void 0 ? { raw: node.raw } : {},
+		...node.sourceMultiline !== void 0 ? { sourceMultiline: node.sourceMultiline } : {},
+		offset: node.offset,
+		length: node.length
+	});
+	if (node instanceof YamlMap) return new YamlMap({
+		items: node.items,
+		style: node.style,
+		...node.tag !== void 0 ? { tag: node.tag } : {},
+		...node.anchor !== void 0 ? { anchor: node.anchor } : {},
+		...mergedCommentFields(node, fields),
+		...node.sourceMultiline !== void 0 ? { sourceMultiline: node.sourceMultiline } : {},
+		offset: node.offset,
+		length: node.length
+	});
+	if (node instanceof YamlSeq) return new YamlSeq({
+		items: node.items,
+		style: node.style,
+		...node.tag !== void 0 ? { tag: node.tag } : {},
+		...node.anchor !== void 0 ? { anchor: node.anchor } : {},
+		...mergedCommentFields(node, fields),
+		...node.sourceMultiline !== void 0 ? { sourceMultiline: node.sourceMultiline } : {},
+		offset: node.offset,
+		length: node.length
+	});
+	return new YamlAlias({
+		name: node.name,
+		...mergedCommentFields(node, fields),
+		offset: node.offset,
+		length: node.length
+	});
+}
+function mergedCommentFields(existing, incoming) {
+	const commentBefore = incoming.commentBefore !== void 0 ? existing.commentBefore !== void 0 ? `${existing.commentBefore}\n${incoming.commentBefore}` : incoming.commentBefore : existing.commentBefore;
+	const comment = incoming.comment !== void 0 ? existing.comment !== void 0 ? `${existing.comment}\n${incoming.comment}` : incoming.comment : existing.comment;
+	const spaceBefore = incoming.spaceBefore ?? existing.spaceBefore;
+	return {
+		...commentBefore !== void 0 ? { commentBefore } : {},
+		...comment !== void 0 ? { comment } : {},
+		...spaceBefore !== void 0 ? { spaceBefore } : {}
+	};
+}
+
+//#endregion
+export { blankAboveIsKeepChompContent, blankLineAboveStart, columnAt, hasBlankLineAbove, hasBlankLineBelow, isAfterIndicatorOnly, isOwnLineAt, joinComments, rawCommentText, sameLineSpan, withCommentFields };

package/internal/composer/document.js

@@ -1,7 +1,8 @@
 import { YamlAlias, YamlMap, YamlPair, YamlScalar, YamlSeq } from "../../YamlNode.js";
-import { checkAnchorOnAlias, getAnchorName, makeAlias, registerAnchor } from "./anchors.js";
 import { parseCSTAll } from "../cst-parser.js";
-import { clearMeta, createState, hasMeta, sameLine } from "./state.js";
+import { checkAnchorOnAlias, getAnchorName, makeAlias, registerAnchor } from "./anchors.js";
+import { hasBlankLineAbove, hasBlankLineBelow, rawCommentText, withCommentFields } from "./comments.js";
+import { clearMeta, commentProps, createState, hasMeta, sameLine } from "./state.js";
 import { parseDirective, validateTagHandlesInDocument } from "./tags.js";
 import { collectMultilinePlainScalar, findNextContentChild, getScalarStyle, hasBlockMapAfterInList, hasValueSepAfter, indexOfChild, makeScalar, resolveScalar } from "./scalars.js";
 import { composeBlockMap, composeBlockSeq, composeFlatBlockMap } from "./block.js";
@@ -131,6 +132,12 @@ function composeDocument(cst, state, hasSubsequentDocuments = false, nextDocCst)
 	const directives = [];
 	let contents = null;
 	let documentComment;
+	let documentCommentAfter;
+	let lastLeadingCommentOffset = -1;
+	let lastAfterMarkerCommentOffset = -1;
+	let sawDocEndMarker = false;
+	let sawDocStartMarker = false;
+	let afterMarkerComment;
 	const hasDocStart = children.some((c) => c.type === "whitespace" && c.source === "---");
 	let i = 0;
 	const meta = {};
@@ -166,6 +173,8 @@ function composeDocument(cst, state, hasSubsequentDocuments = false, nextDocCst)
 		}
 		if (child.type === "newline" && hasMeta(meta)) sawNewlineSinceMeta = true;
 		if (child.type === "whitespace" || child.type === "newline") {
+			if (child.type === "whitespace" && child.source === "...") sawDocEndMarker = true;
+			if (child.type === "whitespace" && child.source === "---") sawDocStartMarker = true;
 			if (child.type === "whitespace" && (child.source === "]" || child.source === "}")) state.errors.push({
 				code: "MalformedFlowCollection",
 				message: `Unexpected flow indicator '${child.source}' at document level`,
@@ -175,8 +184,24 @@ function composeDocument(cst, state, hasSubsequentDocuments = false, nextDocCst)
 			i++;
 			continue;
 		}
-		if (child.type === "comment" && contents === null) {
-			documentComment = child.source.startsWith("#") ? child.source.slice(1).trim() : child.source;
+		if (child.type === "comment" && contents === null && !sawDocEndMarker) {
+			const text = rawCommentText(child.source);
+			if (sawDocStartMarker) {
+				if (afterMarkerComment !== void 0 && hasBlankLineAbove(state.text, child.offset)) afterMarkerComment = `${afterMarkerComment}\n`;
+				afterMarkerComment = afterMarkerComment === void 0 ? text : `${afterMarkerComment}\n${text}`;
+				lastAfterMarkerCommentOffset = child.offset;
+			} else {
+				if (documentComment !== void 0 && hasBlankLineAbove(state.text, child.offset)) documentComment = `${documentComment}\n`;
+				documentComment = documentComment === void 0 ? text : `${documentComment}\n${text}`;
+				lastLeadingCommentOffset = child.offset;
+			}
+			i++;
+			continue;
+		}
+		if (child.type === "comment") {
+			const text = rawCommentText(child.source);
+			if (documentCommentAfter !== void 0 && hasBlankLineAbove(state.text, child.offset)) documentCommentAfter = `${documentCommentAfter}\n`;
+			documentCommentAfter = documentCommentAfter === void 0 ? text : `${documentCommentAfter}\n${text}`;
 			i++;
 			continue;
 		}
@@ -395,15 +420,33 @@ function composeDocument(cst, state, hasSubsequentDocuments = false, nextDocCst)
 			break;
 		}
 	}
+	if (documentComment !== void 0 && contents !== null && hasBlankLineBelow(state.text, lastLeadingCommentOffset)) documentComment = `${documentComment}\n`;
+	if (afterMarkerComment !== void 0 && contents !== null && hasBlankLineBelow(state.text, lastAfterMarkerCommentOffset)) afterMarkerComment = `${afterMarkerComment}\n`;
+	state.escapedComments.length = 0;
+	if (documentCommentAfter === void 0 && contents !== null && contents.comment !== void 0) {
+		if ((contents instanceof YamlMap || contents instanceof YamlSeq) && contents.style !== "flow") {
+			documentCommentAfter = contents.comment;
+			contents = stripOwnComment(contents);
+		}
+	}
+	let headerForDocument;
+	let decorated = contents;
+	if (documentComment !== void 0) {
+		if (hasDocStart || contents === null) headerForDocument = documentComment;
+		else decorated = attachHeaderToFirstEntry(contents, documentComment);
+	}
+	if (afterMarkerComment !== void 0 && decorated !== null) decorated = withCommentFields(decorated, { commentBefore: afterMarkerComment });
+	else if (afterMarkerComment !== void 0) headerForDocument = headerForDocument === void 0 ? afterMarkerComment : `${headerForDocument}\n${afterMarkerComment}`;
 	return {
-		contents,
+		contents: decorated,
 		errors: [...state.errors],
 		warnings: [...state.warnings],
 		directives,
 		hasDocumentStart: hasDocStart,
 		hasDocumentEnd: hasDocEnd,
 		hasDocumentStartTab: hasDocStartTab,
-		...documentComment !== void 0 ? { comment: documentComment } : {}
+		...headerForDocument !== void 0 ? { commentBefore: headerForDocument } : {},
+		...documentCommentAfter !== void 0 ? { comment: documentCommentAfter } : {}
 	};
 }
 /**
@@ -568,8 +611,9 @@ function decorateSourceMultiline(node, text) {
 			style: node.style,
 			...node.tag !== void 0 ? { tag: node.tag } : {},
 			...node.anchor !== void 0 ? { anchor: node.anchor } : {},
-			...node.comment !== void 0 ? { comment: node.comment } : {},
+			...commentProps(node),
 			...node.chomp !== void 0 ? { chomp: node.chomp } : {},
+			...node.blockIndent !== void 0 ? { blockIndent: node.blockIndent } : {},
 			...node.raw !== void 0 ? { raw: node.raw } : {},
 			sourceMultiline: true,
 			offset: node.offset,
@@ -579,8 +623,7 @@ function decorateSourceMultiline(node, text) {
 	if (node instanceof YamlMap) {
 		const newItems = node.items.map((pair) => new YamlPair({
 			key: decorateSourceMultiline(pair.key, text) ?? pair.key,
-			value: pair.value === null ? null : decorateSourceMultiline(pair.value, text),
-			...pair.comment !== void 0 ? { comment: pair.comment } : {}
+			value: pair.value === null ? null : decorateSourceMultiline(pair.value, text)
 		}));
 		const multiline = isSourceMultiline(text, node.offset, node.length);
 		return new YamlMap({
@@ -588,7 +631,7 @@ function decorateSourceMultiline(node, text) {
 			style: node.style,
 			...node.tag !== void 0 ? { tag: node.tag } : {},
 			...node.anchor !== void 0 ? { anchor: node.anchor } : {},
-			...node.comment !== void 0 ? { comment: node.comment } : {},
+			...commentProps(node),
 			...multiline ? { sourceMultiline: true } : {},
 			offset: node.offset,
 			length: node.length
@@ -602,7 +645,7 @@ function decorateSourceMultiline(node, text) {
 			style: node.style,
 			...node.tag !== void 0 ? { tag: node.tag } : {},
 			...node.anchor !== void 0 ? { anchor: node.anchor } : {},
-			...node.comment !== void 0 ? { comment: node.comment } : {},
+			...commentProps(node),
 			...multiline ? { sourceMultiline: true } : {},
 			offset: node.offset,
 			length: node.length
@@ -618,6 +661,7 @@ function decorateDocumentSourceMultiline(doc, text) {
 		errors: doc.errors,
 		warnings: doc.warnings,
 		directives: doc.directives,
+		...doc.commentBefore !== void 0 ? { commentBefore: doc.commentBefore } : {},
 		...doc.comment !== void 0 ? { comment: doc.comment } : {},
 		hasDocumentStart: doc.hasDocumentStart,
 		hasDocumentEnd: doc.hasDocumentEnd,
@@ -641,12 +685,29 @@ const EMPTY_DOCUMENT = {
 * state and therefore appear in the returned document's `errors`.
 */
 function composeFirstDocument(text, options) {
+	return composeFirstDocumentCounted(text, options).document;
+}
+/**
+* {@link composeFirstDocument} plus the CST-level document count of the whole
+* stream, from the single CST parse the compose already performs — no second
+* walk, and correct where a regex on `---` is not (a `---` inside a block
+* scalar or quoted string is content, not a document marker). Callers that
+* must refuse multi-document input (the `YamlFormat` single-document
+* contract) read `documentCount` instead of re-parsing.
+*/
+function composeFirstDocumentCounted(text, options) {
 	const cstNodes = parseCSTAll(text);
 	const state = createState(text, FLOW, options);
 	validateCrossDocumentDirectives(cstNodes, state);
 	const doc = cstNodes[0];
-	if (!doc) return EMPTY_DOCUMENT;
-	return decorateDocumentSourceMultiline(composeDocument(doc, state, cstNodes.length > 1, cstNodes[1]), text);
+	if (!doc) return {
+		document: EMPTY_DOCUMENT,
+		documentCount: 0
+	};
+	return {
+		document: decorateDocumentSourceMultiline(composeDocument(doc, state, cstNodes.length > 1, cstNodes[1]), text),
+		documentCount: cstNodes.length
+	};
 }
 /**
 * Compose every document of `text` with full error recovery — v3
@@ -672,6 +733,72 @@ function composeAllDocuments(text, options) {
 		streamErrors: crossDocState.errors
 	};
 }
+/**
+* Attach a marker-less document header to the FIRST entry of the content — the
+* first pair's key for a mapping, the first item for a sequence, the node
+* itself for a scalar. Without a `---` boundary the header is just the first
+* own-line comment in the document's item stream, so it forward-attributes
+* like any other.
+*/
+function attachHeaderToFirstEntry(contents, header) {
+	if (contents instanceof YamlMap && contents.items.length > 0) {
+		const first = contents.items[0];
+		const items = [...contents.items];
+		items[0] = new YamlPair({
+			key: withCommentFields(first.key, { commentBefore: header }),
+			value: first.value
+		});
+		return new YamlMap({
+			items,
+			style: contents.style,
+			...contents.tag !== void 0 ? { tag: contents.tag } : {},
+			...contents.anchor !== void 0 ? { anchor: contents.anchor } : {},
+			...contents.commentBefore !== void 0 ? { commentBefore: contents.commentBefore } : {},
+			...contents.comment !== void 0 ? { comment: contents.comment } : {},
+			...contents.spaceBefore !== void 0 ? { spaceBefore: contents.spaceBefore } : {},
+			...contents.sourceMultiline !== void 0 ? { sourceMultiline: contents.sourceMultiline } : {},
+			offset: contents.offset,
+			length: contents.length
+		});
+	}
+	if (contents instanceof YamlSeq && contents.items.length > 0) {
+		const items = [...contents.items];
+		items[0] = withCommentFields(items[0], { commentBefore: header });
+		return new YamlSeq({
+			items,
+			style: contents.style,
+			...contents.tag !== void 0 ? { tag: contents.tag } : {},
+			...contents.anchor !== void 0 ? { anchor: contents.anchor } : {},
+			...contents.commentBefore !== void 0 ? { commentBefore: contents.commentBefore } : {},
+			...contents.comment !== void 0 ? { comment: contents.comment } : {},
+			...contents.spaceBefore !== void 0 ? { spaceBefore: contents.spaceBefore } : {},
+			...contents.sourceMultiline !== void 0 ? { sourceMultiline: contents.sourceMultiline } : {},
+			offset: contents.offset,
+			length: contents.length
+		});
+	}
+	return withCommentFields(contents, { commentBefore: header });
+}
+/** Rebuild a collection without its own trailing `comment`. */
+function stripOwnComment(node) {
+	const shared = {
+		style: node.style,
+		...node.tag !== void 0 ? { tag: node.tag } : {},
+		...node.anchor !== void 0 ? { anchor: node.anchor } : {},
+		...node.commentBefore !== void 0 ? { commentBefore: node.commentBefore } : {},
+		...node.spaceBefore !== void 0 ? { spaceBefore: node.spaceBefore } : {},
+		...node.sourceMultiline !== void 0 ? { sourceMultiline: node.sourceMultiline } : {},
+		offset: node.offset,
+		length: node.length
+	};
+	return node instanceof YamlMap ? new YamlMap({
+		items: node.items,
+		...shared
+	}) : new YamlSeq({
+		items: node.items,
+		...shared
+	});
+}
 
 //#endregion
-export { composeAllDocuments, composeDocument, composeFirstDocument, validateCrossDocumentDirectives };
+export { EMPTY_DOCUMENT, composeAllDocuments, composeDocument, composeFirstDocument, composeFirstDocumentCounted, validateCrossDocumentDirectives };

package/internal/composer/flow.js

@@ -1,5 +1,6 @@
 import { YamlMap, YamlScalar, YamlSeq } from "../../YamlNode.js";
 import { checkAnchorOnAlias, getAnchorName, makeAlias, registerAnchor } from "./anchors.js";
+import { blankLineAboveStart, hasBlankLineAbove, isOwnLineAt, joinComments, rawCommentText, withCommentFields } from "./comments.js";
 import { enterNesting, exitNesting, hasMeta } from "./state.js";
 import { collectMultilineKey, collectMultilinePlainScalar, getScalarStyle, hasValueSepThroughPlainScalars, makeScalar, resolveScalar } from "./scalars.js";
 import { buildPairs, checkDuplicateKeys, checkMultilineImplicitKeys } from "./block.js";
@@ -76,7 +77,7 @@ function validateFlowContentIndent(cst, state, parentBlockColumn) {
 				i++;
 				continue;
 			}
-			if (i - lineStart <= parentBlockColumn) {
+			if (i - lineStart <= parentBlockColumn && !isClosersOnly(text, i, end)) {
 				state.errors.push({
 					code: "InvalidIndentation",
 					message: "Flow content continuation line must be indented past the parent block",
@@ -90,6 +91,26 @@ function validateFlowContentIndent(cst, state, parentBlockColumn) {
 		i++;
 	}
 }
+/**
+* True when everything from `start` to the end of that line (bounded by `end`)
+* is flow closing punctuation — `}`, `]`, separating commas and whitespace.
+* Such a line closes the collection rather than carrying content, so the
+* continuation-indent floor does not apply to it.
+*/
+function isClosersOnly(text, start, end) {
+	let sawCloser = false;
+	for (let i = start; i < end && i < text.length; i++) {
+		const ch = text[i];
+		if (ch === "\n") break;
+		if (ch === "}" || ch === "]") {
+			sawCloser = true;
+			continue;
+		}
+		if (ch === "," || ch === " " || ch === "	" || ch === "\r") continue;
+		return false;
+	}
+	return sawCloser;
+}
 function composeFlowMap(cst, state, meta, parentBlockColumn) {
 	if (!enterNesting(state, cst)) return new YamlMap({
 		items: [],
@@ -117,8 +138,9 @@ function composeFlowMapInner(cst, state, meta, parentBlockColumn) {
 	validateFlowContentIndent(cst, state, parentBlockColumn);
 	validateFlowSeparators(children, state, "{", "}");
 	const items = flattenFlowChildren(children.filter((c) => !(c.type === "whitespace" && (c.source === "{" || c.source === "}" || c.source.trim() === ""))), state);
-	buildPairs(items, pairs, state.text);
+	const trailingComment = buildPairs(items, pairs, state.text);
 	if (state.options.uniqueKeys) checkDuplicateKeys(pairs, state);
+	const mapComment = meta?.comment !== void 0 ? trailingComment !== void 0 ? `${meta.comment}\n${trailingComment}` : meta.comment : trailingComment;
 	const map = new YamlMap({
 		items: pairs,
 		style: "flow",
@@ -126,7 +148,7 @@ function composeFlowMapInner(cst, state, meta, parentBlockColumn) {
 		length: cst.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, cst.offset);
 	return map;
@@ -188,7 +210,8 @@ function flattenFlowChildren(children, state) {
 		if (child.type === "comment") {
 			items.push({
 				kind: "comment",
-				comment: child.source.startsWith("#") ? child.source.slice(1).trim() : child.source
+				comment: rawCommentText(child.source),
+				offset: child.offset
 			});
 			continue;
 		}
@@ -370,25 +393,95 @@ function composeFlowSeqInner(cst, state, meta, parentBlockColumn) {
 		current.push(child);
 	}
 	if (current.length > 0) segments.push(current);
+	let seqTrailing;
+	let pending = [];
+	let pendingSpace = false;
+	let lastItemEnd = -1;
+	let pushedIdx = -1;
+	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 blankIsBetweenItems = (anchorOffset) => blankLineAboveStart(state.text, anchorOffset) >= lastItemEnd;
+	const acceptOwnLineComment = (cText, cOff) => {
+		const blankAbove = cOff >= 0 && hasBlankLineAbove(state.text, cOff);
+		if (blankAbove && pending.length === 0 && lastItemEnd >= 0 && blankIsBetweenItems(cOff)) pendingSpace = true;
+		pending.push({
+			text: cText,
+			offset: cOff,
+			blankAbove: blankAbove && pending.length > 0
+		});
+	};
+	/** The pending comment fields for the item being pushed, then reset. */
+	const takePendingFields = (anchorOffset) => {
+		let commentBefore = joinPending(pending);
+		if (anchorOffset >= 0 && hasBlankLineAbove(state.text, anchorOffset)) {
+			if (commentBefore !== void 0) commentBefore = `${commentBefore}\n`;
+			else if (!pendingSpace && lastItemEnd >= 0 && blankIsBetweenItems(anchorOffset)) pendingSpace = true;
+		}
+		const fields = {
+			...commentBefore !== void 0 ? { commentBefore } : {},
+			...pendingSpace ? { spaceBefore: true } : {}
+		};
+		pending = [];
+		pendingSpace = false;
+		return fields;
+	};
+	const hasPendingFields = (fields) => fields.commentBefore !== void 0 || fields.spaceBefore === true;
 	for (const segment of segments) if (segment.some((c) => c.type === "whitespace" && c.source === ":")) {
-		const semItems = flattenFlowChildren(segment.filter((c) => !(c.type === "whitespace" && c.source.trim() === "")), state);
+		const content = segment.filter((c) => !(c.type === "whitespace" && c.source.trim() === ""));
+		const semItems = flattenFlowChildren(content, state);
 		const pairs = [];
-		buildPairs(semItems, pairs, state.text);
+		const segTrailing = buildPairs(semItems, pairs, state.text);
 		if (!segment.some((c) => c.type === "whitespace" && c.source === "?")) checkMultilineImplicitKeys(pairs, state, semItems);
 		const firstPair = pairs[0];
 		if (firstPair) {
+			const segFirst = content[0];
+			const fields = takePendingFields(segFirst !== void 0 ? segFirst.offset : -1);
 			const map = new YamlMap({
 				items: pairs,
 				style: "flow",
 				offset: firstPair.key.offset,
-				length: 0
+				length: 0,
+				...fields,
+				...segTrailing !== void 0 ? { comment: segTrailing } : {}
 			});
 			items.push(map);
-		}
+			pushedIdx = items.length - 1;
+			lastItemEnd = map.offset + map.length;
+		} else if (segTrailing !== void 0) seqTrailing = joinComments(seqTrailing, segTrailing);
 	} else {
 		const semItems = flattenFlowChildren(segment.filter((c) => !(c.type === "whitespace" && c.source.trim() === "")), state);
-		for (const si of semItems) if (si.kind === "node" && si.node) items.push(si.node);
+		for (const si of semItems) {
+			if (si.kind === "comment") {
+				const cText = si.comment ?? "";
+				if (!(si.offset === void 0 ? true : isOwnLineAt(state.text, si.offset)) && pushedIdx >= 0) {
+					const prev = items[pushedIdx];
+					if (prev) items[pushedIdx] = withCommentFields(prev, { comment: cText });
+				} else acceptOwnLineComment(cText, si.offset ?? -1);
+				continue;
+			}
+			if (si.kind === "node" && si.node) {
+				const fields = takePendingFields(si.node.length > 0 ? si.node.offset : -1);
+				const node = hasPendingFields(fields) ? withCommentFields(si.node, fields) : si.node;
+				items.push(node);
+				pushedIdx = items.length - 1;
+				lastItemEnd = si.node.offset + si.node.length;
+			}
+		}
+	}
+	if (pending.length > 0) {
+		const joined = joinPending(pending);
+		const first = pending[0];
+		const withLead = joined !== void 0 && first !== void 0 && lastItemEnd >= 0 && first.offset >= 0 && hasBlankLineAbove(state.text, first.offset) ? `\n${joined}` : joined;
+		if (withLead !== void 0) seqTrailing = joinComments(seqTrailing, withLead);
 	}
+	const seqComment = meta?.comment !== void 0 ? seqTrailing !== void 0 ? `${meta.comment}\n${seqTrailing}` : meta.comment : seqTrailing;
 	const seq = new YamlSeq({
 		items,
 		style: "flow",
@@ -396,7 +489,7 @@ function composeFlowSeqInner(cst, state, meta, parentBlockColumn) {
 		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;