@effected/yaml 0.6.0 → 0.7.0

package/Yaml.js

@@ -4,7 +4,7 @@ import { composeAllDocuments, composeFirstDocument } from "./internal/composer/d
 import { isFatalCode } from "./internal/diagnostics.js";
 import { StringifyDepthExceeded, StringifyFailure, stringifyValue } from "./internal/stringifier.js";
 import { YamlDiagnostic } from "./YamlDiagnostic.js";
-import { Effect, Option, Result, Schema, SchemaIssue, SchemaTransformation } from "effect";
+import { Effect, Result, Schema, SchemaIssue, SchemaTransformation } from "effect";
 
 //#region src/Yaml.ts
 /**
@@ -126,7 +126,7 @@ var YamlStringifyOptions = class extends Schema.Class("YamlStringifyOptions")({
 *
 * @public
 */
-var YamlParseError = class extends Schema.TaggedErrorClass()("YamlParseError", {
+var YamlParseError = class extends Schema.TaggedError()("YamlParseError", {
 	diagnostics: Schema.Array(YamlDiagnostic),
 	input: Schema.String
 }) {
@@ -144,7 +144,7 @@ var YamlParseError = class extends Schema.TaggedErrorClass()("YamlParseError", {
 *
 * @public
 */
-var YamlStringifyError = class extends Schema.TaggedErrorClass()("YamlStringifyError", {
+var YamlStringifyError = class extends Schema.TaggedError()("YamlStringifyError", {
 	diagnostics: Schema.Array(YamlDiagnostic),
 	value: Schema.Unknown
 }) {
@@ -516,8 +516,8 @@ var Yaml = class Yaml {
 	*/
 	static fromString(options) {
 		return Schema.String.pipe(Schema.decodeTo(Schema.Unknown, SchemaTransformation.transformOrFail({
-			decode: (input) => Yaml.parse(input, options).pipe(Effect.mapError((error) => new SchemaIssue.InvalidValue(Option.some(input), { message: error.message }))),
-			encode: (value) => stringifyOrFail(value).pipe(Effect.mapError((error) => new SchemaIssue.InvalidValue(Option.some(value), { message: error.message })))
+			decode: (input) => Yaml.parse(input, options).pipe(Effect.mapError((error) => new SchemaIssue.InvalidValue({ message: error.message }, input))),
+			encode: (value) => stringifyOrFail(value).pipe(Effect.mapError((error) => new SchemaIssue.InvalidValue({ message: error.message }, value)))
 		})));
 	}
 	/**
@@ -536,12 +536,12 @@ var Yaml = class Yaml {
 	*/
 	static allFromString(options) {
 		return Schema.String.pipe(Schema.decodeTo(Schema.Array(Schema.Unknown), SchemaTransformation.transformOrFail({
-			decode: (input) => Yaml.parseAll(input, options).pipe(Effect.mapError((error) => new SchemaIssue.InvalidValue(Option.some(input), { message: error.message }))),
+			decode: (input) => Yaml.parseAll(input, options).pipe(Effect.mapError((error) => new SchemaIssue.InvalidValue({ message: error.message }, input))),
 			encode: (values) => Effect.gen(function* () {
 				if (values.length === 0) return "";
 				const parts = [];
 				for (let index = 0; index < values.length; index++) {
-					const yaml = yield* stringifyOrFail(values[index]).pipe(Effect.mapError((error) => new SchemaIssue.InvalidValue(Option.some(values), { message: error.message })));
+					const yaml = yield* stringifyOrFail(values[index]).pipe(Effect.mapError((error) => new SchemaIssue.InvalidValue({ message: error.message }, values)));
 					parts.push(index > 0 ? `---\n${yaml}` : yaml);
 				}
 				return parts.join("");

package/YamlDocument.js

@@ -4,7 +4,7 @@ import { isFatalCode } from "./internal/diagnostics.js";
 import { StringifyDepthExceeded, StringifyFailure, stringifyDocument } from "./internal/stringifier.js";
 import { YamlDiagnostic } from "./YamlDiagnostic.js";
 import { YamlParseError, YamlStringifyError } from "./Yaml.js";
-import { Effect, Option, Schema, SchemaIssue, SchemaTransformation } from "effect";
+import { Effect, Schema, SchemaIssue, SchemaTransformation } from "effect";
 
 //#region src/YamlDocument.ts
 /**
@@ -80,8 +80,8 @@ var YamlDocument = class YamlDocument extends Schema.Class("YamlDocument")({
 	*/
 	static schema(options) {
 		return Schema.String.pipe(Schema.decodeTo(Schema.instanceOf(YamlDocument), SchemaTransformation.transformOrFail({
-			decode: (input) => YamlDocument.parse(input, options).pipe(Effect.mapError((error) => new SchemaIssue.InvalidValue(Option.some(input), { message: error.message }))),
-			encode: (doc) => doc.stringify().pipe(Effect.mapError((error) => new SchemaIssue.InvalidValue(Option.some(doc), { message: error.message })))
+			decode: (input) => YamlDocument.parse(input, options).pipe(Effect.mapError((error) => new SchemaIssue.InvalidValue({ message: error.message }, input))),
+			encode: (doc) => doc.stringify().pipe(Effect.mapError((error) => new SchemaIssue.InvalidValue({ message: error.message }, doc)))
 		})));
 	}
 	/**

package/YamlFormat.js

@@ -47,7 +47,7 @@ var YamlFormattingOptions = class extends Schema.Class("YamlFormattingOptions")(
 *
 * @public
 */
-var YamlModificationError = class extends Schema.TaggedErrorClass()("YamlModificationError", {
+var YamlModificationError = class extends Schema.TaggedError()("YamlModificationError", {
 	path: Schema.Array(Schema.Union([Schema.String, Schema.Number])),
 	diagnostics: Schema.Array(YamlDiagnostic)
 }) {
@@ -106,7 +106,7 @@ function formatDocument(text, options) {
 	const doc = composeFirstDocument(text, {});
 	if (doc.errors.some((e) => isFatalCode(e.code))) return void 0;
 	const preserveComments = options?.preserveComments ?? true;
-	return stringifyDocument({
+	const outputDoc = {
 		contents: !preserveComments && doc.contents !== null ? stripNodeComments(doc.contents) : doc.contents,
 		errors: doc.errors,
 		warnings: doc.warnings,
@@ -115,7 +115,8 @@ function formatDocument(text, options) {
 		hasDocumentStart: doc.hasDocumentStart,
 		hasDocumentEnd: doc.hasDocumentEnd,
 		hasDocumentStartTab: doc.hasDocumentStartTab
-	}, toStringifyInput(options));
+	};
+	return stringifyDocument(outputDoc, toStringifyInput(options));
 }
 /** Convert a plain JS scalar value into a synthetic `YamlScalar` (offset/length are irrelevant — immediately re-stringified). */
 function jsValueToNode(value) {
@@ -317,10 +318,12 @@ var YamlFormat = class YamlFormat {
 				}, text)]
 			});
 		}
-		return computeEdits(text, stringifyDocument({
+		const outputDoc = {
 			...doc,
 			contents: newContents
-		}, toStringifyInput(options))).map((e) => YamlEdit.make(e));
+		};
+		const formatted = stringifyDocument(outputDoc, toStringifyInput(options));
+		return computeEdits(text, formatted).map((e) => YamlEdit.make(e));
 	});
 	/**
 	* Modify `text` and apply the resulting edits in one step

package/index.d.ts

@@ -1168,8 +1168,8 @@ declare const YamlVisitorEvent: {
     readonly path: YamlPath;
     readonly depth: number;
     readonly style: CollectionStyle;
-    readonly tag?: string | undefined;
-    readonly anchor?: string | undefined;
+    readonly tag?: string;
+    readonly anchor?: string;
   }, {
     readonly _tag: Tag;
   }> | Extract<{
@@ -1186,8 +1186,8 @@ declare const YamlVisitorEvent: {
     readonly depth: number;
     readonly value: unknown;
     readonly style: ScalarStyle;
-    readonly tag?: string | undefined;
-    readonly anchor?: string | undefined;
+    readonly tag?: string;
+    readonly anchor?: string;
   }, {
     readonly _tag: Tag;
   }> | Extract<{
@@ -1201,8 +1201,8 @@ declare const YamlVisitorEvent: {
     readonly path: YamlPath;
     readonly depth: number;
     readonly style: CollectionStyle;
-    readonly tag?: string | undefined;
-    readonly anchor?: string | undefined;
+    readonly tag?: string;
+    readonly anchor?: string;
   }, {
     readonly _tag: Tag;
   }>;
@@ -1257,8 +1257,8 @@ declare const YamlVisitorEvent: {
         readonly path: YamlPath;
         readonly depth: number;
         readonly style: CollectionStyle;
-        readonly tag?: string | undefined;
-        readonly anchor?: string | undefined;
+        readonly tag?: string;
+        readonly anchor?: string;
       }) => any;
       readonly Pair: (args: {
         readonly _tag: "Pair";
@@ -1273,8 +1273,8 @@ declare const YamlVisitorEvent: {
         readonly depth: number;
         readonly value: unknown;
         readonly style: ScalarStyle;
-        readonly tag?: string | undefined;
-        readonly anchor?: string | undefined;
+        readonly tag?: string;
+        readonly anchor?: string;
       }) => any;
       readonly SeqEnd: (args: {
         readonly _tag: "SeqEnd";
@@ -1286,8 +1286,8 @@ declare const YamlVisitorEvent: {
         readonly path: YamlPath;
         readonly depth: number;
         readonly style: CollectionStyle;
-        readonly tag?: string | undefined;
-        readonly anchor?: string | undefined;
+        readonly tag?: string;
+        readonly anchor?: string;
       }) => any;
     }>(cases: Cases): (value: {
       readonly _tag: "Alias";
@@ -1331,8 +1331,8 @@ declare const YamlVisitorEvent: {
       readonly path: YamlPath;
       readonly depth: number;
       readonly style: CollectionStyle;
-      readonly tag?: string | undefined;
-      readonly anchor?: string | undefined;
+      readonly tag?: string;
+      readonly anchor?: string;
     } | {
       readonly _tag: "Pair";
       readonly path: YamlPath;
@@ -1345,8 +1345,8 @@ declare const YamlVisitorEvent: {
       readonly depth: number;
       readonly value: unknown;
       readonly style: ScalarStyle;
-      readonly tag?: string | undefined;
-      readonly anchor?: string | undefined;
+      readonly tag?: string;
+      readonly anchor?: string;
     } | {
       readonly _tag: "SeqEnd";
       readonly path: YamlPath;
@@ -1356,8 +1356,8 @@ declare const YamlVisitorEvent: {
       readonly path: YamlPath;
       readonly depth: number;
       readonly style: CollectionStyle;
-      readonly tag?: string | undefined;
-      readonly anchor?: string | undefined;
+      readonly tag?: string;
+      readonly anchor?: string;
     }) => import("effect/Unify").Unify<ReturnType<Cases["Alias" | "Comment" | "Directive" | "DocumentEnd" | "DocumentStart" | "Error" | "MapEnd" | "MapStart" | "Pair" | "Scalar" | "SeqEnd" | "SeqStart"]>>;
     <Cases extends {
       readonly Alias: (args: {
@@ -1409,8 +1409,8 @@ declare const YamlVisitorEvent: {
         readonly path: YamlPath;
         readonly depth: number;
         readonly style: CollectionStyle;
-        readonly tag?: string | undefined;
-        readonly anchor?: string | undefined;
+        readonly tag?: string;
+        readonly anchor?: string;
       }) => any;
       readonly Pair: (args: {
         readonly _tag: "Pair";
@@ -1425,8 +1425,8 @@ declare const YamlVisitorEvent: {
         readonly depth: number;
         readonly value: unknown;
         readonly style: ScalarStyle;
-        readonly tag?: string | undefined;
-        readonly anchor?: string | undefined;
+        readonly tag?: string;
+        readonly anchor?: string;
       }) => any;
       readonly SeqEnd: (args: {
         readonly _tag: "SeqEnd";
@@ -1438,8 +1438,8 @@ declare const YamlVisitorEvent: {
         readonly path: YamlPath;
         readonly depth: number;
         readonly style: CollectionStyle;
-        readonly tag?: string | undefined;
-        readonly anchor?: string | undefined;
+        readonly tag?: string;
+        readonly anchor?: string;
       }) => any;
     }>(value: {
       readonly _tag: "Alias";
@@ -1483,8 +1483,8 @@ declare const YamlVisitorEvent: {
       readonly path: YamlPath;
       readonly depth: number;
       readonly style: CollectionStyle;
-      readonly tag?: string | undefined;
-      readonly anchor?: string | undefined;
+      readonly tag?: string;
+      readonly anchor?: string;
     } | {
       readonly _tag: "Pair";
       readonly path: YamlPath;
@@ -1497,8 +1497,8 @@ declare const YamlVisitorEvent: {
       readonly depth: number;
       readonly value: unknown;
       readonly style: ScalarStyle;
-      readonly tag?: string | undefined;
-      readonly anchor?: string | undefined;
+      readonly tag?: string;
+      readonly anchor?: string;
     } | {
       readonly _tag: "SeqEnd";
       readonly path: YamlPath;
@@ -1508,8 +1508,8 @@ declare const YamlVisitorEvent: {
       readonly path: YamlPath;
       readonly depth: number;
       readonly style: CollectionStyle;
-      readonly tag?: string | undefined;
-      readonly anchor?: string | undefined;
+      readonly tag?: string;
+      readonly anchor?: string;
     }, cases: Cases): import("effect/Unify").Unify<ReturnType<Cases["Alias" | "Comment" | "Directive" | "DocumentEnd" | "DocumentStart" | "Error" | "MapEnd" | "MapStart" | "Pair" | "Scalar" | "SeqEnd" | "SeqStart"]>>;
   };
   readonly Alias: Data.TaggedEnum.ConstructorFrom<{
@@ -1561,8 +1561,8 @@ declare const YamlVisitorEvent: {
     readonly path: YamlPath;
     readonly depth: number;
     readonly style: CollectionStyle;
-    readonly tag?: string | undefined;
-    readonly anchor?: string | undefined;
+    readonly tag?: string;
+    readonly anchor?: string;
   }, "_tag">;
   readonly Pair: Data.TaggedEnum.ConstructorFrom<{
     readonly _tag: "Pair";
@@ -1577,8 +1577,8 @@ declare const YamlVisitorEvent: {
     readonly depth: number;
     readonly value: unknown;
     readonly style: ScalarStyle;
-    readonly tag?: string | undefined;
-    readonly anchor?: string | undefined;
+    readonly tag?: string;
+    readonly anchor?: string;
   }, "_tag">;
   readonly SeqEnd: Data.TaggedEnum.ConstructorFrom<{
     readonly _tag: "SeqEnd";
@@ -1590,8 +1590,8 @@ declare const YamlVisitorEvent: {
     readonly path: YamlPath;
     readonly depth: number;
     readonly style: CollectionStyle;
-    readonly tag?: string | undefined;
-    readonly anchor?: string | undefined;
+    readonly tag?: string;
+    readonly anchor?: string;
   }, "_tag">;
 };
 /**

package/internal/composer/block.js

@@ -39,11 +39,12 @@ function composeBlockMapInner(blockMapCst, state, externalFirstKey, meta) {
 	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 map = new YamlMap({
 		items: pairs,
 		style: "block",
 		offset,
-		length: blockMapCst.offset + blockMapCst.length - offset,
+		length,
 		...meta?.tag !== void 0 ? { tag: meta.tag } : {},
 		...meta?.anchor !== void 0 ? { anchor: meta.anchor } : {},
 		...meta?.comment !== void 0 ? { comment: meta.comment } : {}
@@ -135,11 +136,12 @@ function flattenBlockMapChildren(children, state, externalKeyColumn, externalKey
 					const firstC = findFirstContent(sliceChildren);
 					const lastC = findLastContent(sliceChildren);
 					const innerOffset = firstC ? firstC.offset : child.offset;
+					const innerEnd = lastC ? lastC.offset + lastC.length : child.offset + child.length;
 					pushNode(new YamlMap({
 						items: innerPairs,
 						style: "block",
 						offset: innerOffset,
-						length: (lastC ? lastC.offset + lastC.length : child.offset + child.length) - innerOffset
+						length: innerEnd - innerOffset
 					}), innerOffset);
 					i = lookahead.endIdx - 1;
 					continue;
@@ -150,8 +152,9 @@ function flattenBlockMapChildren(children, state, externalKeyColumn, externalKey
 				validateNoTabAfterContinuationValueSep(child, children, i, state);
 				const flushMeta = combinedPending();
 				if (hasMeta(flushMeta)) {
+					const value = resolveScalar("", "plain", flushMeta.tag, state);
 					const scalar = new YamlScalar({
-						value: resolveScalar("", "plain", flushMeta.tag, state),
+						value,
 						style: "plain",
 						offset: child.offset,
 						length: 0,
@@ -211,8 +214,9 @@ function flattenBlockMapChildren(children, state, externalKeyColumn, externalKey
 			if (afterValueSep && sepOnSameLine) {
 				const flushMeta = combinedPending();
 				if (hasMeta(flushMeta)) {
+					const value = resolveScalar("", "plain", flushMeta.tag, state);
 					const scalar = new YamlScalar({
-						value: resolveScalar("", "plain", flushMeta.tag, state),
+						value,
 						style: "plain",
 						offset: child.offset,
 						length: 0,
@@ -277,8 +281,9 @@ function flattenBlockMapChildren(children, state, externalKeyColumn, externalKey
 				if (isExplicitKey) {
 					const { value: keyValue, nextIdx: keyNextIdx } = collectMultilineKey(children, i);
 					const keyMeta = combinedPending();
+					const resolved = resolveScalar(keyValue, "plain", keyMeta.tag, state);
 					const scalar = new YamlScalar({
-						value: resolveScalar(keyValue, "plain", keyMeta.tag, state),
+						value: resolved,
 						style: "plain",
 						offset: child.offset,
 						length: child.length,
@@ -386,7 +391,8 @@ function flattenBlockMapChildren(children, state, externalKeyColumn, externalKey
 				i = nextAlias.idx;
 				continue;
 			}
-			checkAnchorOnAlias(combinedPending(), child, state);
+			const aliasMeta = combinedPending();
+			checkAnchorOnAlias(aliasMeta, child, state);
 			const alias = makeAlias(child, state);
 			resetAllMeta();
 			pushNode(alias);
@@ -451,8 +457,9 @@ function flattenBlockMapChildren(children, state, externalKeyColumn, externalKey
 	}
 	const trailingMeta = combinedPending();
 	if (hasMeta(trailingMeta)) {
+		const value = resolveScalar("", "plain", trailingMeta.tag, state);
 		const scalar = new YamlScalar({
-			value: resolveScalar("", "plain", trailingMeta.tag, state),
+			value,
 			style: "plain",
 			offset: 0,
 			length: 0,
@@ -501,7 +508,7 @@ function buildPairs(items, pairs, text) {
 				const nullKey = new YamlScalar({
 					value: null,
 					style: "plain",
-					offset: 0,
+					offset: valueSepOffset,
 					length: 0
 				});
 				pairs.push(new YamlPair({
@@ -513,7 +520,7 @@ function buildPairs(items, pairs, text) {
 				const nullKey = new YamlScalar({
 					value: null,
 					style: "plain",
-					offset: 0,
+					offset: valueSepOffset,
 					length: 0
 				});
 				pairs.push(new YamlPair({
@@ -643,7 +650,8 @@ function keyIdentity(key, text) {
 		case "string": return `s:${v}`;
 		case "bigint": return `i:${v.toString()}`;
 		case "number": {
-			let kind = classifyPlainNumeric(text.slice(key.offset, key.offset + key.length).trim());
+			const raw = text.slice(key.offset, key.offset + key.length).trim();
+			let kind = classifyPlainNumeric(raw);
 			if (key.tag !== void 0) {
 				if (key.tag.includes("float")) kind = "float";
 				else if (key.tag.includes("int")) kind = "int";
@@ -1012,8 +1020,9 @@ function composeBlockSeqInner(cst, state, meta) {
 			if (child.type === "flow-scalar" && getScalarStyle(child) === "plain") {
 				const { value: merged, nextIdx: mergeEnd, partsCount, endOffset } = collectMultilinePlainScalar(children, ci, void 0, state.text);
 				if (partsCount > 1) {
+					const resolved = resolveScalar(merged, "plain", pendingMeta.tag, state);
 					const scalar = new YamlScalar({
-						value: resolveScalar(merged, "plain", pendingMeta.tag, state),
+						value: resolved,
 						style: "plain",
 						offset: child.offset,
 						length: endOffset - child.offset,
@@ -1100,8 +1109,9 @@ function composeBlockSeqInner(cst, state, meta) {
 		length: 0
 	}));
 	if (hasMeta(pendingMeta)) {
+		const value = resolveScalar("", "plain", pendingMeta.tag, state);
 		const scalar = new YamlScalar({
-			value: resolveScalar("", "plain", pendingMeta.tag, state),
+			value,
 			style: "plain",
 			offset: 0,
 			length: 0,
@@ -1138,11 +1148,12 @@ function composeFlatBlockMap(children, startIdx, parentCst, state, externalFirst
 	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 map = new YamlMap({
 		items: pairs,
 		style: "block",
 		offset,
-		length: parentCst.offset + parentCst.length - offset,
+		length: end - offset,
 		...meta?.tag !== void 0 ? { tag: meta.tag } : {},
 		...meta?.anchor !== void 0 ? { anchor: meta.anchor } : {},
 		...meta?.comment !== void 0 ? { comment: meta.comment } : {}

package/internal/composer/flow.js

@@ -116,7 +116,8 @@ function composeFlowMapInner(cst, state, meta, parentBlockColumn) {
 	});
 	validateFlowContentIndent(cst, state, parentBlockColumn);
 	validateFlowSeparators(children, state, "{", "}");
-	buildPairs(flattenFlowChildren(children.filter((c) => !(c.type === "whitespace" && (c.source === "{" || c.source === "}" || c.source.trim() === ""))), state), pairs, state.text);
+	const items = flattenFlowChildren(children.filter((c) => !(c.type === "whitespace" && (c.source === "{" || c.source === "}" || c.source.trim() === ""))), state);
+	buildPairs(items, pairs, state.text);
 	if (state.options.uniqueKeys) checkDuplicateKeys(pairs, state);
 	const map = new YamlMap({
 		items: pairs,
@@ -140,8 +141,9 @@ function flattenFlowChildren(children, state) {
 		if (child.type === "whitespace") {
 			if (child.source === ",") {
 				if (hasMeta(pendingMeta)) {
+					const value = resolveScalar("", "plain", pendingMeta.tag, state);
 					const scalar = new YamlScalar({
-						value: resolveScalar("", "plain", pendingMeta.tag, state),
+						value,
 						style: "plain",
 						offset: child.offset,
 						length: 0,
@@ -159,8 +161,9 @@ function flattenFlowChildren(children, state) {
 			}
 			if (child.source === ":") {
 				if (hasMeta(pendingMeta)) {
+					const value = resolveScalar("", "plain", pendingMeta.tag, state);
 					const scalar = new YamlScalar({
-						value: resolveScalar("", "plain", pendingMeta.tag, state),
+						value,
 						style: "plain",
 						offset: child.offset,
 						length: 0,
@@ -225,8 +228,9 @@ function flattenFlowChildren(children, state) {
 			if (child.type === "flow-scalar" && getScalarStyle(child) === "plain") {
 				if (hasValueSepThroughPlainScalars(children, i + 1)) {
 					const { value, nextIdx } = collectMultilineKey(children, i);
+					const resolved = resolveScalar(value, "plain", pendingMeta.tag, state);
 					const scalar = new YamlScalar({
-						value: resolveScalar(value, "plain", pendingMeta.tag, state),
+						value: resolved,
 						style: "plain",
 						offset: child.offset,
 						length: child.length,
@@ -243,8 +247,9 @@ function flattenFlowChildren(children, state) {
 					continue;
 				}
 				const { value, nextIdx, partsCount, endOffset } = collectMultilinePlainScalar(children, i, void 0, state.text);
+				const resolved = resolveScalar(value, "plain", pendingMeta.tag, state);
 				const scalar = new YamlScalar({
-					value: resolveScalar(value, "plain", pendingMeta.tag, state),
+					value: resolved,
 					style: "plain",
 					offset: child.offset,
 					length: partsCount > 1 ? endOffset - child.offset : child.length,
@@ -297,8 +302,9 @@ function flattenFlowChildren(children, state) {
 		}
 	}
 	if (hasMeta(pendingMeta)) {
+		const value = resolveScalar("", "plain", pendingMeta.tag, state);
 		const scalar = new YamlScalar({
-			value: resolveScalar("", "plain", pendingMeta.tag, state),
+			value,
 			style: "plain",
 			offset: 0,
 			length: 0,

package/internal/composer/scalars.js

@@ -265,10 +265,11 @@ function foldFlowLines(text) {
 		}
 		const isLast = i === lines.length - 1;
 		const trimmed = isLast ? line.trimStart() : line.trim();
-		if (trimmed === "") if (isLast) {
-			if (result.length === 0 || result[result.length - 1] !== "\n") result += " ";
-		} else result += "\n";
-		else {
+		if (trimmed === "") {
+			if (isLast) {
+				if (result.length === 0 || result[result.length - 1] !== "\n") result += " ";
+			} else result += "\n";
+		} else {
 			if (result.length > 0 && result[result.length - 1] !== "\n") result += " ";
 			result += trimmed;
 		}
@@ -681,8 +682,10 @@ function decodeBlockScalar(raw, fullText, nodeOffset) {
 		} else break;
 	}
 	while (i < raw.length && raw[i] !== "\n" && raw[i] !== "\r") i++;
-	if (i < raw.length) if (raw[i] === "\r" && raw[i + 1] === "\n") i += 2;
-	else i++;
+	if (i < raw.length) {
+		if (raw[i] === "\r" && raw[i + 1] === "\n") i += 2;
+		else i++;
+	}
 	let contentIndent = explicitIndent;
 	let foundContent = explicitIndent > 0;
 	if (explicitIndent > 0 && fullText !== void 0 && nodeOffset !== void 0) {
@@ -745,8 +748,10 @@ function decodeBlockScalar(raw, fullText, nodeOffset) {
 				trailingNewlines.length = 0;
 				lines.push(" ".repeat(spaces - contentIndent));
 			} else trailingNewlines.push("");
-			if (i < raw.length) if (raw[i] === "\r" && i + 1 < raw.length && raw[i + 1] === "\n") i += 2;
-			else i++;
+			if (i < raw.length) {
+				if (raw[i] === "\r" && i + 1 < raw.length && raw[i + 1] === "\n") i += 2;
+				else i++;
+			}
 			continue;
 		}
 		if (spaces < contentIndent) break;
@@ -756,8 +761,10 @@ function decodeBlockScalar(raw, fullText, nodeOffset) {
 		const contentStart = i;
 		while (i < raw.length && raw[i] !== "\n" && raw[i] !== "\r") i++;
 		lines.push(extra + raw.slice(contentStart, i));
-		if (i < raw.length) if (raw[i] === "\r" && i + 1 < raw.length && raw[i + 1] === "\n") i += 2;
-		else i++;
+		if (i < raw.length) {
+			if (raw[i] === "\r" && i + 1 < raw.length && raw[i + 1] === "\n") i += 2;
+			else i++;
+		}
 	}
 	let value;
 	if (isFolded) {
@@ -773,9 +780,10 @@ function decodeBlockScalar(raw, fullText, nodeOffset) {
 				prevMoreIndented = isMoreIndented;
 				hadContent = true;
 			} else {
-				if (result[result.length - 1] === "\n") if (isMoreIndented || prevMoreIndented) result += `\n${ln}`;
-				else result += ln;
-				else if (isMoreIndented || prevMoreIndented) result += `\n${ln}`;
+				if (result[result.length - 1] === "\n") {
+					if (isMoreIndented || prevMoreIndented) result += `\n${ln}`;
+					else result += ln;
+				} else if (isMoreIndented || prevMoreIndented) result += `\n${ln}`;
 				else result += ` ${ln}`;
 				prevMoreIndented = isMoreIndented;
 			}
@@ -809,8 +817,10 @@ function validateBlockScalarLeadingEmpties(cst, state) {
 	const raw = cst.source;
 	let i = 0;
 	while (i < raw.length && raw[i] !== "\n" && raw[i] !== "\r") i++;
-	if (i < raw.length) if (raw[i] === "\r" && raw[i + 1] === "\n") i += 2;
-	else i++;
+	if (i < raw.length) {
+		if (raw[i] === "\r" && raw[i + 1] === "\n") i += 2;
+		else i++;
+	}
 	const emptyIndents = [];
 	while (i < raw.length) {
 		const lineStart = i;
@@ -824,8 +834,10 @@ function validateBlockScalarLeadingEmpties(cst, state) {
 				indent: spaces,
 				offsetInRaw: lineStart
 			});
-			if (i < raw.length) if (raw[i] === "\r" && raw[i + 1] === "\n") i += 2;
-			else i++;
+			if (i < raw.length) {
+				if (raw[i] === "\r" && raw[i + 1] === "\n") i += 2;
+				else i++;
+			}
 			continue;
 		}
 		const contentIndent = spaces;

package/internal/cst-parser.js

@@ -286,12 +286,14 @@ function parseBlockMappingInner(state, indent) {
 			continue;
 		}
 		if (token.kind === "block-map-key") {
+			if (token.column < indent && children.length > 0) break;
 			sawExplicitKey = true;
 			const leaf = consumeLeafToken(state);
 			if (leaf) children.push(leaf);
 			continue;
 		}
 		if (token.kind === "block-map-value") {
+			if (token.column < indent && children.length > 0) break;
 			const leaf = consumeLeafToken(state);
 			if (leaf) children.push(leaf);
 			children.push(...parseBlockValue(state, indent, sawExplicitKey));
@@ -357,7 +359,7 @@ function parseBlockMappingInner(state, indent) {
 /**
 * Parse the value part after a ":" in a block mapping.
 */
-function parseBlockValue(state, _parentIndent, explicitKey = false) {
+function parseBlockValue(state, parentIndent, explicitKey = false) {
 	const nodes = [];
 	while (!atEnd(state)) {
 		const token = peek(state);
@@ -385,6 +387,10 @@ function parseBlockValue(state, _parentIndent, explicitKey = false) {
 			nodes.push(parseBlockSequence(state, seqIndent));
 			break;
 		}
+		if (explicitKey && token.kind === "scalar" && !isBlockScalarToken(state) && hasImplicitMapAhead(state, parentIndent)) {
+			nodes.push(parseImplicitBlockMapping(state, parentIndent));
+			break;
+		}
 		if (token.kind === "scalar" || token.kind === "anchor" || token.kind === "alias" || token.kind === "tag") {
 			const leaf = consumeLeafToken(state);
 			if (leaf) nodes.push(leaf);
@@ -540,11 +546,13 @@ function parseImplicitBlockMappingInner(state, seqIndent) {
 		if (!token) break;
 		if (isDocumentBoundary(token)) break;
 		if (token.kind === "block-seq-entry" && token.column <= seqIndent) break;
+		if (token.kind === "block-map-key" && token.column <= seqIndent) break;
 		if (isTrivia(token)) {
 			children.push(...consumeTrivia(state));
 			continue;
 		}
 		if (token.kind === "block-map-value") {
+			if (token.column <= seqIndent && children.length > 0) break;
 			const leaf = consumeLeafToken(state);
 			if (leaf) children.push(leaf);
 			children.push(...parseBlockValue(state, seqIndent));

package/internal/lexer.js

@@ -216,14 +216,15 @@ function createScanner(text) {
 		let value = "";
 		while (pos < text.length) {
 			const ch = peek();
-			if (ch === "'") if (peek(1) === "'") {
-				value += "'";
-				advance(2);
-			} else {
-				advance();
-				return makeToken("scalar", value, start, sLine, sCol, pos - start);
-			}
-			else if (ch === "\n" || ch === "\r" && peek(1) === "\n") {
+			if (ch === "'") {
+				if (peek(1) === "'") {
+					value += "'";
+					advance(2);
+				} else {
+					advance();
+					return makeToken("scalar", value, start, sLine, sCol, pos - start);
+				}
+			} else if (ch === "\n" || ch === "\r" && peek(1) === "\n") {
 				value += " ";
 				if (ch === "\r") advance(2);
 				else advance();
@@ -402,13 +403,17 @@ function createScanner(text) {
 			hadHeaderWhitespace = true;
 			advance();
 		}
-		if (pos < text.length && !isNewline(peek()) && peek() !== "") if (peek() === "#" && hadHeaderWhitespace) while (pos < text.length && !isNewline(peek())) advance();
-		else {
-			while (pos < text.length && !isNewline(peek())) advance();
-			return makeToken("error", text.slice(start, pos), start, sLine, sCol);
+		if (pos < text.length && !isNewline(peek()) && peek() !== "") {
+			if (peek() === "#" && hadHeaderWhitespace) while (pos < text.length && !isNewline(peek())) advance();
+			else {
+				while (pos < text.length && !isNewline(peek())) advance();
+				return makeToken("error", text.slice(start, pos), start, sLine, sCol);
+			}
+		}
+		if (pos < text.length && isNewline(peek())) {
+			if (peek() === "\r" && peek(1) === "\n") advance(2);
+			else advance();
 		}
-		if (pos < text.length && isNewline(peek())) if (peek() === "\r" && peek(1) === "\n") advance(2);
-		else advance();
 		let contentIndent = explicitIndent;
 		let foundContent = explicitIndent > 0;
 		if (explicitIndent > 0) {
@@ -564,9 +569,10 @@ function createScanner(text) {
 					prevMoreIndented = isMoreIndented;
 					hadContent = true;
 				} else {
-					if (result[result.length - 1] === "\n") if (isMoreIndented || prevMoreIndented) result += `\n${ln}`;
-					else result += ln;
-					else if (isMoreIndented || prevMoreIndented) result += `\n${ln}`;
+					if (result[result.length - 1] === "\n") {
+						if (isMoreIndented || prevMoreIndented) result += `\n${ln}`;
+						else result += ln;
+					} else if (isMoreIndented || prevMoreIndented) result += `\n${ln}`;
 					else result += ` ${ln}`;
 					prevMoreIndented = isMoreIndented;
 				}

package/internal/stringifier.js

@@ -98,10 +98,12 @@ function requiresQuoting(s, ignoreType = false) {
 	if (!ignoreType && wouldBeResolved(s)) return true;
 	const first = s[0];
 	if (first === " " || first === "	") return true;
-	if (first !== void 0 && INDICATOR_CHARS.has(first)) if (first === ":" || first === "?" || first === "-") {
-		const second = s[1];
-		if (s.length === 1 || second === " " || second === "	") return true;
-	} else return true;
+	if (first !== void 0 && INDICATOR_CHARS.has(first)) {
+		if (first === ":" || first === "?" || first === "-") {
+			const second = s[1];
+			if (s.length === 1 || second === " " || second === "	") return true;
+		} else return true;
+	}
 	if (s.startsWith("---") || s.startsWith("...")) return true;
 	if (s.includes(": ") || s.includes(":	") || s.endsWith(":")) return true;
 	if (s.includes(" #") || s.includes("	#")) return true;
@@ -132,14 +134,15 @@ function renderDoubleQuoted(s, canonical = false) {
 	let result = "";
 	for (let i = 0; i < escaped.length; i++) {
 		const code = escaped.charCodeAt(i);
-		if (isControlChar(code)) if (code === 0) result += "\\0";
-		else if (code === 7) result += "\\a";
-		else if (code === 8) result += "\\b";
-		else if (code === 11) result += "\\v";
-		else if (code === 12) result += "\\f";
-		else if (code === 27) result += "\\e";
-		else result += `\\x${code.toString(16).padStart(2, "0")}`;
-		else if (canonical && code > 126) {
+		if (isControlChar(code)) {
+			if (code === 0) result += "\\0";
+			else if (code === 7) result += "\\a";
+			else if (code === 8) result += "\\b";
+			else if (code === 11) result += "\\v";
+			else if (code === 12) result += "\\f";
+			else if (code === 27) result += "\\e";
+			else result += `\\x${code.toString(16).padStart(2, "0")}`;
+		} else if (canonical && code > 126) {
 			if (code >= 55296 && code <= 56319 && i + 1 < escaped.length) {
 				const low = escaped.charCodeAt(i + 1);
 				if (low >= 56320 && low <= 57343) {
@@ -534,9 +537,10 @@ function stringifyScalarNodeLines(node, ctx) {
 		return [parts.join(" ")];
 	}
 	let lines;
-	if (val === null || val === void 0) if (isEmpty) lines = [""];
-	else lines = ["null"];
-	else if (typeof val === "boolean") lines = [val ? "true" : "false"];
+	if (val === null || val === void 0) {
+		if (isEmpty) lines = [""];
+		else lines = ["null"];
+	} else if (typeof val === "boolean") lines = [val ? "true" : "false"];
 	else if (typeof val === "number") lines = [node.raw !== void 0 ? node.raw : renderNumber(val)];
 	else if (typeof val === "string") lines = renderString(val, style, " ".repeat(ctx.indent), !!node.tag, ctx.forceDefaultStyles, node.chomp, ctx.parentPosition, ctx.quoteStyle).split("\n");
 	else lines = [renderDoubleQuoted(String(val))];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@effected/yaml",
-	"version": "0.6.0",
+	"version": "0.7.0",
 	"private": false,
 	"description": "Zero-dependency YAML parsing, editing and formatting as Effect schemas.",
 	"keywords": [
@@ -40,7 +40,7 @@
 		"./package.json": "./package.json"
 	},
 	"peerDependencies": {
-		"effect": "4.0.0-beta.101"
+		"effect": "4.0.0-beta.107"
 	},
 	"engines": {
 		"node": ">=24.11.0"