@effected/yaml 0.5.1 → 0.6.1

package/README.md

@@ -73,6 +73,17 @@ Effect.runPromise(Yaml.stringify({ port: 3000, hosts: ["a", "b"] })).then(consol
 // - b
 ```
 
+Both directions have a synchronous counterpart that returns a `Result` for callers that cannot await an Effect, a `vitest.config.ts` being the motivating case. `Yaml.parse` is defined in terms of `Yaml.parseResult`, so the two forms cannot disagree about what a document means:
+
+```ts
+import { Yaml } from "@effected/yaml";
+import { Result } from "effect";
+
+const result = Yaml.parseResult("port: 3000 # dev server");
+console.log(Result.isSuccess(result) ? result.success : result.failure);
+// { port: 3000 }
+```
+
 ## Hostile input fails typed
 
 An alias bomb — nested anchors whose expansion multiplies at every level — is bounded by an expansion budget and surfaces as a `YamlParseError`, not as an out-of-memory kill:
@@ -99,6 +110,7 @@ Collection nesting past the depth cap behaves the same way, yielding a `NestingD
 
 - `Yaml.parse` / `Yaml.parseAll` — error-recovery parsing of a single document or a `---`-separated stream into plain values, resolving anchors and aliases and aggregating every diagnostic into one `YamlParseError`.
 - `Yaml.stringify` — serialize a plain value back to YAML, failing typed with `YamlStringifyError` on circular references or on excessively deep nesting.
+- `Yaml.parseResult` / `Yaml.stringifyResult` — the pure synchronous counterparts, returning a `Result` instead of an `Effect` for config-time callers that cannot await; each runs the same engine call as its `Effect` variant, so the two forms cannot diverge, and a fatal diagnostic, a duplicate key, an alias bomb or a circular reference still fails typed rather than throwing.
 - `Yaml.stripComments` — quote-aware comment removal that keeps line numbers stable, or every byte offset stable when given a replacement character.
 - `Yaml.equals` / `Yaml.equalsValue` — semantic equality that ignores comments, whitespace, formatting and mapping key order while keeping sequence order significant.
 - `Yaml.schema` / `Yaml.fromString` / `Yaml.YamlFromString` / `Yaml.allFromString` — string→domain schema factories that decode a single document or a whole stream into a validated Effect `Schema` value.

package/YamlFormat.js

@@ -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

@@ -687,6 +687,35 @@ declare class YamlAlias extends YamlAlias_base {
   /** See `YamlScalar.toValue`. Pure and total. */
   toValue(anchors?: Map<string, YamlNode>): unknown;
 }
+/**
+ * The encoded (plain-object) form of a {@link YamlScalar} — the class fields
+ * without the instance methods. Named so the recursive {@link (YamlNode:variable)}
+ * codec can state its encoded side without a circular type annotation.
+ *
+ * @public
+ */
+interface YamlScalarEncoded extends Schema.Codec.Encoded<typeof YamlScalar> {}
+/**
+ * The encoded (plain-object) form of a {@link YamlMap}. See
+ * {@link YamlScalarEncoded} for why the encoded forms are named interfaces.
+ *
+ * @public
+ */
+interface YamlMapEncoded extends Schema.Codec.Encoded<typeof YamlMap> {}
+/**
+ * The encoded (plain-object) form of a {@link YamlSeq}. See
+ * {@link YamlScalarEncoded} for why the encoded forms are named interfaces.
+ *
+ * @public
+ */
+interface YamlSeqEncoded extends Schema.Codec.Encoded<typeof YamlSeq> {}
+/**
+ * The encoded (plain-object) form of a {@link YamlAlias}. See
+ * {@link YamlScalarEncoded} for why the encoded forms are named interfaces.
+ *
+ * @public
+ */
+interface YamlAliasEncoded extends Schema.Codec.Encoded<typeof YamlAlias> {}
 /**
  * A discriminated-union schema covering all four YAML AST value node types:
  * {@link YamlScalar}, {@link YamlMap}, {@link YamlSeq} and {@link YamlAlias}.
@@ -701,7 +730,7 @@ declare class YamlAlias extends YamlAlias_base {
  *
  * @public
  */
-declare const YamlNode: Schema.Schema<YamlScalar | YamlMap | YamlSeq | YamlAlias>;
+declare const YamlNode: Schema.Codec<YamlScalar | YamlMap | YamlSeq | YamlAlias, YamlScalarEncoded | YamlMapEncoded | YamlSeqEncoded | YamlAliasEncoded>;
 /**
  * The union of all YAML AST value node types.
  *
@@ -709,8 +738,8 @@ declare const YamlNode: Schema.Schema<YamlScalar | YamlMap | YamlSeq | YamlAlias
  */
 type YamlNode = YamlScalar | YamlMap | YamlSeq | YamlAlias;
 declare const YamlPair_base: Schema.Class<YamlPair, Schema.TaggedStruct<"YamlPair", {
-  readonly key: Schema.suspend<Schema.Schema<YamlNode>>;
-  readonly value: Schema.NullOr<Schema.suspend<Schema.Schema<YamlNode>>>;
+  readonly key: Schema.suspend<Schema.Codec<YamlAlias | YamlMap | YamlScalar | YamlSeq, YamlAliasEncoded | YamlMapEncoded | YamlScalarEncoded | YamlSeqEncoded, never, never>>;
+  readonly value: Schema.NullOr<Schema.suspend<Schema.Codec<YamlAlias | YamlMap | YamlScalar | YamlSeq, YamlAliasEncoded | YamlMapEncoded | YamlScalarEncoded | YamlSeqEncoded, never, never>>>;
   readonly comment: Schema.optionalKey<Schema.String>;
 }>, {}>;
 /**
@@ -721,7 +750,7 @@ declare const YamlPair_base: Schema.Class<YamlPair, Schema.TaggedStruct<"YamlPai
  */
 declare class YamlPair extends YamlPair_base {}
 declare const YamlMap_base: Schema.Class<YamlMap, Schema.TaggedStruct<"YamlMap", {
-  readonly items: Schema.$Array<Schema.suspend<Schema.Schema<YamlPair>>>;
+  readonly items: Schema.$Array<Schema.suspend<typeof YamlPair>>;
   readonly tag: Schema.optionalKey<Schema.String>;
   readonly anchor: Schema.optionalKey<Schema.String>;
   readonly style: Schema.Literals<readonly ["block", "flow"]>;
@@ -751,7 +780,7 @@ declare class YamlMap extends YamlMap_base {
   toValue(anchors?: Map<string, YamlNode>): unknown;
 }
 declare const YamlSeq_base: Schema.Class<YamlSeq, Schema.TaggedStruct<"YamlSeq", {
-  readonly items: Schema.$Array<Schema.suspend<Schema.Schema<YamlNode>>>;
+  readonly items: Schema.$Array<Schema.suspend<Schema.Codec<YamlAlias | YamlMap | YamlScalar | YamlSeq, YamlAliasEncoded | YamlMapEncoded | YamlScalarEncoded | YamlSeqEncoded, never, never>>>;
   readonly tag: Schema.optionalKey<Schema.String>;
   readonly anchor: Schema.optionalKey<Schema.String>;
   readonly style: Schema.Literals<readonly ["block", "flow"]>;
@@ -1139,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<{
@@ -1157,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<{
@@ -1172,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;
   }>;
@@ -1228,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";
@@ -1244,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";
@@ -1257,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";
@@ -1302,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;
@@ -1316,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;
@@ -1327,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: {
@@ -1380,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";
@@ -1396,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";
@@ -1409,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";
@@ -1454,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;
@@ -1468,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;
@@ -1479,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<{
@@ -1532,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";
@@ -1548,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";
@@ -1561,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">;
 };
 /**
@@ -1588,5 +1617,5 @@ declare class YamlVisitor {
   static visit(text: string, options?: YamlParseOptions): Stream.Stream<YamlVisitorEvent>;
 }
 //#endregion
-export { CollectionStyle, QuoteStyle, ScalarChomp, ScalarStyle, Yaml, YamlAlias, type YamlBoundCodec, YamlComposerErrorCode, YamlDiagnostic, YamlDirective, YamlDocument, YamlEdit, YamlErrorCode, YamlFormat, YamlFormattingOptions, YamlLexErrorCode, YamlMap, YamlModificationError, YamlModifyErrorCode, YamlNode, YamlPair, YamlParseError, YamlParseErrorCode, YamlParseOptions, type YamlPath, YamlRange, type YamlRangeLike, YamlScalar, type YamlSegment, YamlSeq, YamlStringifyError, YamlStringifyErrorCode, YamlStringifyOptions, YamlVisitor, YamlVisitorEvent };
+export { CollectionStyle, QuoteStyle, ScalarChomp, ScalarStyle, Yaml, YamlAlias, type YamlAliasEncoded, type YamlBoundCodec, YamlComposerErrorCode, YamlDiagnostic, YamlDirective, YamlDocument, YamlEdit, YamlErrorCode, YamlFormat, YamlFormattingOptions, YamlLexErrorCode, YamlMap, type YamlMapEncoded, YamlModificationError, YamlModifyErrorCode, YamlNode, YamlPair, YamlParseError, YamlParseErrorCode, YamlParseOptions, type YamlPath, YamlRange, type YamlRangeLike, YamlScalar, type YamlScalarEncoded, type YamlSegment, YamlSeq, type YamlSeqEncoded, YamlStringifyError, YamlStringifyErrorCode, YamlStringifyOptions, YamlVisitor, YamlVisitorEvent };
 //# sourceMappingURL=index.d.ts.map

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,
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@effected/yaml",
-	"version": "0.5.1",
+	"version": "0.6.1",
 	"private": false,
 	"description": "Zero-dependency YAML parsing, editing and formatting as Effect schemas.",
 	"keywords": [