eslint-plugin-yml 3.5.0 → 3.6.1

package/lib/index.mjs

@@ -4426,7 +4426,10 @@ var sort_keys_default = createRule("sort-keys", {
 				yield fixer.removeRange(removeRange);
 				yield fixer.insertTextAfterRange(moveTargetRange, `${isAtFileStart ? "\n" : ""}${insertCode}`);
 			} else {
-				const nextToken = sourceCode.getTokenAfter(data.node, { includeComments: true });
+				const nextToken = sourceCode.getTokenAfter(data.node, {
+					includeComments: true,
+					filter: (t) => !isCommentToken(t) || data.node.loc.end.line < t.loc.start.line
+				});
 				const removeRange = [data.node.range[0], nextToken.range[0]];
 				yield fixer.removeRange(removeRange);
 				const insertCode = `\n${sourceCode.text.slice(sourceCode.getIndexFromLoc({
@@ -4495,7 +4498,10 @@ var sort_keys_default = createRule("sort-keys", {
 			};
 			const beforeToken = sourceCode.getTokenBefore(node);
 			if (beforeToken) {
-				const next = sourceCode.getTokenAfter(beforeToken, { includeComments: true });
+				const next = sourceCode.getTokenAfter(beforeToken, {
+					includeComments: true,
+					filter: (t) => !isCommentToken(t) || beforeToken.loc.end.line < t.loc.start.line
+				});
 				if (beforeToken.loc.end.line < next.loc.start.line || beforeToken.loc.end.line < node.loc.start.line) {
 					const start = {
 						line: beforeToken.loc.end.line < next.loc.start.line ? next.loc.start.line : node.loc.start.line,
@@ -4599,6 +4605,10 @@ var YAMLEntryData = class {
 	get value() {
 		return (this.cached ?? (this.cached = { value: this.node == null ? null : getStaticYAMLValue(this.node) })).value;
 	}
+	getValueForKey(key) {
+		const val = this.value;
+		if (val !== null && typeof val === "object" && !Array.isArray(val)) return val[key];
+	}
 };
 var YAMLSequenceData = class {
 	node;
@@ -4617,7 +4627,7 @@ var YAMLSequenceData = class {
 /**
 * Build function which check that the given 2 names are in specific order.
 */
-function buildValidatorFromType(order, insensitive, natural) {
+function buildValidatorFromType(order, insensitive, natural, key) {
 	let compareValue = ([a, b]) => a <= b;
 	let compareText = compareValue;
 	if (natural) compareText = ([a, b]) => naturalCompare(a, b) <= 0;
@@ -4631,11 +4641,23 @@ function buildValidatorFromType(order, insensitive, natural) {
 		const baseCompareValue = compareValue;
 		compareValue = (args) => baseCompareValue(args.reverse());
 	}
-	return (a, b) => {
-		if (typeof a.value === "string" && typeof b.value === "string") return compareText([a.value, b.value]);
-		const type = getYAMLPrimitiveType(a.value);
-		if (type && type === getYAMLPrimitiveType(b.value)) return compareValue([a.value, b.value]);
+	/**
+	* Compare resolved sequence entry values.
+	*/
+	function compare(aVal, bVal) {
+		if (typeof aVal === "string" && typeof bVal === "string") return compareText([aVal, bVal]);
+		const type = getYAMLPrimitiveType(aVal);
+		if (type && type === getYAMLPrimitiveType(bVal)) return compareValue([aVal, bVal]);
 		return true;
+	}
+	return (a, b) => {
+		if (key) {
+			const aVal = a.getValueForKey(key);
+			const bVal = b.getValueForKey(key);
+			if (aVal === void 0 || bVal === void 0) return true;
+			return compare(aVal, bVal);
+		}
+		return compare(a.value, b.value);
 	};
 }
 /**
@@ -4650,14 +4672,16 @@ function parseOptions(options, sourceCode) {
 			const type = order.type ?? "asc";
 			const insensitive = order.caseSensitive === false;
 			const natural = Boolean(order.natural);
+			const key = order.key;
 			return {
 				isTargetArray,
-				ignore: () => false,
-				isValidOrder: buildValidatorFromType(type, insensitive, natural),
+				ignore: key ? (v) => v.getValueForKey(key) === void 0 : () => false,
+				isValidOrder: buildValidatorFromType(type, insensitive, natural, key),
 				orderText(data) {
-					if (typeof data.value === "string") return `${natural ? "natural " : ""}${insensitive ? "insensitive " : ""}${type}ending`;
-					return `${type}ending`;
-				}
+					const base = typeof data.value === "string" || key ? `${natural ? "natural " : ""}${insensitive ? "insensitive " : ""}${type}ending` : `${type}ending`;
+					return key ? `${base} by '${key}'` : base;
+				},
+				key
 			};
 		}
 		const parsedOrder = [];
@@ -4671,9 +4695,16 @@ function parseOptions(options, sourceCode) {
 			const type = nestOrder.type ?? "asc";
 			const insensitive = nestOrder.caseSensitive === false;
 			const natural = Boolean(nestOrder.natural);
+			const itemKey = nestOrder.key;
 			parsedOrder.push({
-				test: (v) => valuePattern ? Boolean(getYAMLPrimitiveType(v.value)) && valuePattern.test(String(v.value)) : true,
-				isValidNestOrder: buildValidatorFromType(type, insensitive, natural)
+				test: (v) => {
+					if (itemKey) {
+						const keyVal = v.getValueForKey(itemKey);
+						return valuePattern ? keyVal !== void 0 && valuePattern.test(String(keyVal)) : keyVal !== void 0;
+					}
+					return valuePattern ? Boolean(getYAMLPrimitiveType(v.value)) && valuePattern.test(String(v.value)) : true;
+				},
+				isValidNestOrder: buildValidatorFromType(type, insensitive, natural, itemKey)
 			});
 		}
 		return {
@@ -4743,7 +4774,8 @@ const ORDER_OBJECT_SCHEMA = {
 	properties: {
 		type: { enum: ["asc", "desc"] },
 		caseSensitive: { type: "boolean" },
-		natural: { type: "boolean" }
+		natural: { type: "boolean" },
+		key: { type: "string" }
 	},
 	additionalProperties: false
 };
@@ -4838,8 +4870,8 @@ var sort_sequence_values_default = createRule("sort-sequence-values", {
 						loc: edit.a.reportLoc,
 						messageId: "shouldBeAfter",
 						data: {
-							thisValue: toText(edit.a),
-							targetValue: toText(target),
+							thisValue: toText(edit.a, option.key),
+							targetValue: toText(target, option.key),
 							orderText: option.orderText(edit.a)
 						},
 						*fix(fixer) {
@@ -4854,8 +4886,8 @@ var sort_sequence_values_default = createRule("sort-sequence-values", {
 						loc: edit.a.reportLoc,
 						messageId: "shouldBeBefore",
 						data: {
-							thisValue: toText(edit.a),
-							targetValue: toText(target),
+							thisValue: toText(edit.a, option.key),
+							targetValue: toText(target, option.key),
 							orderText: option.orderText(edit.a)
 						},
 						*fix(fixer) {
@@ -4927,7 +4959,11 @@ var sort_sequence_values_default = createRule("sort-sequence-values", {
 		/**
 		* Convert to display text.
 		*/
-		function toText(data) {
+		function toText(data, key) {
+			if (key) {
+				const keyVal = data.getValueForKey(key);
+				if (keyVal !== void 0) return String(keyVal);
+			}
 			if (getYAMLPrimitiveType(data.value)) return String(data.value);
 			return sourceCode.getText(data.node);
 		}
@@ -5390,7 +5426,7 @@ var prettier_default = [...base_default, { rules: {
 //#endregion
 //#region package.json
 var name$1 = "eslint-plugin-yml";
-var version$1 = "3.5.0";
+var version$1 = "3.6.1";
 //#endregion
 //#region src/meta.ts
 var meta_exports = /* @__PURE__ */ __exportAll({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-yml",
-  "version": "3.5.0",
+  "version": "3.6.1",
   "description": "This ESLint plugin provides linting rules for YAML.",
   "type": "module",
   "main": "lib/index.mjs",
@@ -89,8 +89,8 @@
     "@types/natural-compare": "^1.4.0",
     "@types/node": "^24.0.0",
     "@types/semver": "^7.3.1",
-    "@typescript-eslint/eslint-plugin": "~8.62.0",
-    "@typescript-eslint/parser": "~8.62.0",
+    "@typescript-eslint/eslint-plugin": "~8.65.0",
+    "@typescript-eslint/parser": "~8.65.0",
     "cross-env": "^10.0.0",
     "env-cmd": "^11.0.0",
     "eslint": "^10.0.0",
@@ -109,9 +109,9 @@
     "eslint-plugin-yml": "^3.0.0",
     "events": "^3.3.0",
     "mocha": "^11.0.0",
-    "monaco-editor": "^0.55.0",
+    "monaco-editor": "^0.56.0",
     "nyc": "^18.0.0",
-    "pako": "^2.1.0",
+    "pako": "^3.0.0",
     "prettier": "^3.0.3",
     "semver": "^7.3.2",
     "stylelint": "^17.0.0",