@effected/yaml 0.6.0 → 0.6.1

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

@@ -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,
@@ -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.6.0",
+	"version": "0.6.1",
 	"private": false,
 	"description": "Zero-dependency YAML parsing, editing and formatting as Effect schemas.",
 	"keywords": [