eslint-plugin-toml 1.0.0 → 1.0.2

package/lib/index.mjs

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./chunk-15K8U1wQ.mjs";
 import * as tomlESLintParser from "toml-eslint-parser";
-import { VisitorKeys, getStaticTOMLValue, parseForESLint, traverseNodes } from "toml-eslint-parser";
+import { VisitorKeys, getStaticTOMLValue, parseTOML, traverseNodes } from "toml-eslint-parser";
 import path from "path";
 import { CallMethodStep, ConfigCommentParser, Directive, TextSourceCodeBase, VisitNodeStep } from "@eslint/plugin-kit";
 
@@ -178,7 +178,7 @@ var array_bracket_newline_default = createRule("array-bracket-newline", {
 		* @param options An option value to parse.
 		* @returns Normalized option object.
 		*/
-		function normalizeOptions$1(options) {
+		function normalizeOptions(options) {
 			return { TOMLArray: normalizeOptionValue(options) };
 		}
 		/**
@@ -251,7 +251,7 @@ var array_bracket_newline_default = createRule("array-bracket-newline", {
 		*/
 		function check(node) {
 			const elements = node.elements;
-			const options = normalizeOptions$1(context.options[0])[node.type];
+			const options = normalizeOptions(context.options[0])[node.type];
 			const openBracket = sourceCode.getFirstToken(node);
 			const closeBracket = sourceCode.getLastToken(node);
 			const firstIncComment = sourceCode.getTokenAfter(openBracket, { includeComments: true });
@@ -531,7 +531,7 @@ var array_element_newline_default = createRule("array-element-newline", {
 		* @param options An option value to parse.
 		* @returns Normalized option object.
 		*/
-		function normalizeOptions$1(options) {
+		function normalizeOptions(options) {
 			if (options && (options.ArrayExpression || options.TOMLArray)) {
 				let expressionOptions;
 				if (options.ArrayExpression) expressionOptions = normalizeOptionValue(options.ArrayExpression);
@@ -598,7 +598,7 @@ var array_element_newline_default = createRule("array-element-newline", {
 		*/
 		function check(node) {
 			const elements = node.elements;
-			const options = normalizeOptions$1(context.options[0])[node.type];
+			const options = normalizeOptions(context.options[0])[node.type];
 			if (!options) return;
 			let elementBreak = false;
 			/**
@@ -3070,7 +3070,7 @@ var standard_default = [...base_default, { rules: {
 //#endregion
 //#region package.json
 var name$1 = "eslint-plugin-toml";
-var version$1 = "1.0.0";
+var version$1 = "1.0.2";
 
 //#endregion
 //#region src/meta.ts
@@ -3117,20 +3117,29 @@ function getLastIndex(tokens, indexMap, endLoc) {
 /**
 * Normalizes the options for cursor methods.
 */
-function normalizeOptions(options) {
+function normalizeSkipOptions(options) {
 	if (typeof options === "number") return {
-		includeComments: false,
-		filter: null,
+		filter: isNotComment,
 		skip: options
 	};
 	if (typeof options === "function") return {
-		includeComments: false,
-		filter: options,
+		filter: (n) => {
+			if (isComment(n)) return false;
+			return options(n);
+		},
 		skip: 0
 	};
+	let filter;
+	if (options?.includeComments) filter = options?.filter ?? (() => true);
+	else if (options?.filter) {
+		const baseFilter = options?.filter;
+		filter = (token) => {
+			if (isComment(token)) return false;
+			return baseFilter(token);
+		};
+	} else filter = isNotComment;
 	return {
-		includeComments: options?.includeComments ?? false,
-		filter: options?.filter ?? null,
+		filter,
 		skip: options?.skip ?? 0
 	};
 }
@@ -3161,16 +3170,17 @@ function normalizeCountOptions(options) {
 		},
 		count: 0
 	};
-	let filter = options?.filter;
-	if (!options?.includeComments) if (filter) {
-		const baseFilter = filter;
+	let filter;
+	if (options?.includeComments) filter = options?.filter ?? (() => true);
+	else if (options?.filter) {
+		const baseFilter = options?.filter;
 		filter = (token) => {
 			if (isComment(token)) return false;
 			return baseFilter(token);
 		};
 	} else filter = isNotComment;
 	return {
-		filter: filter ?? null,
+		filter,
 		count: options?.count ?? 0
 	};
 }
@@ -3186,7 +3196,7 @@ var TokenStore = class {
 	* Gets the first token of the given node.
 	*/
 	getFirstToken(node, options) {
-		const { filter, skip } = normalizeOptions(options);
+		const { filter, skip } = normalizeSkipOptions(options);
 		const startIndex = getFirstIndex(this.allTokens, this.tokenStartToIndex, node.range[0]);
 		const endIndex = getLastIndex(this.allTokens, this.tokenStartToIndex, node.range[1]);
 		let skipped = 0;
@@ -3205,7 +3215,7 @@ var TokenStore = class {
 	* Gets the last token of the given node.
 	*/
 	getLastToken(node, options) {
-		const { filter, skip } = normalizeOptions(options);
+		const { filter, skip } = normalizeSkipOptions(options);
 		const startIndex = getFirstIndex(this.allTokens, this.tokenStartToIndex, node.range[0]);
 		const endIndex = getLastIndex(this.allTokens, this.tokenStartToIndex, node.range[1]);
 		let skipped = 0;
@@ -3224,7 +3234,7 @@ var TokenStore = class {
 	* Gets the first token between two non-overlapping nodes.
 	*/
 	getFirstTokenBetween(left, right, options) {
-		const { filter, skip } = normalizeOptions(options);
+		const { filter, skip } = normalizeSkipOptions(options);
 		const startIndex = getFirstIndex(this.allTokens, this.tokenStartToIndex, left.range[1]);
 		const endIndex = getLastIndex(this.allTokens, this.tokenStartToIndex, right.range[0]);
 		let skipped = 0;
@@ -3243,7 +3253,7 @@ var TokenStore = class {
 	* Gets the token that precedes a given node or token.
 	*/
 	getTokenBefore(node, options) {
-		const { filter, skip } = normalizeOptions(options);
+		const { filter, skip } = normalizeSkipOptions(options);
 		const endIndex = getLastIndex(this.allTokens, this.tokenStartToIndex, node.range[0]);
 		let skipped = 0;
 		for (let i = endIndex; i >= 0; i--) {
@@ -3261,7 +3271,7 @@ var TokenStore = class {
 	* Gets the token that follows a given node or token.
 	*/
 	getTokenAfter(node, options) {
-		const { filter, skip } = normalizeOptions(options);
+		const { filter, skip } = normalizeSkipOptions(options);
 		const startIndex = getFirstIndex(this.allTokens, this.tokenStartToIndex, node.range[1]);
 		let skipped = 0;
 		for (let i = startIndex; i < this.allTokens.length; i++) {
@@ -3649,10 +3659,10 @@ var TOMLLanguage = class {
 		const text = file.body;
 		return {
 			ok: true,
-			ast: parseForESLint(text, {
+			ast: parseTOML(text, {
 				filePath: file.path,
 				tomlVersion: context.languageOptions?.parserOptions?.tomlVersion
-			}).ast
+			})
 		};
 	}
 	/**

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "eslint-plugin-toml",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "This ESLint plugin provides linting rules for TOML.",
   "type": "module",
   "exports": {
     ".": {
+      "types": "./lib/index.d.mts",
       "import": "./lib/index.mjs",
-      "types": "./lib/index.d.mts"
+      "default": "./lib/index.mjs"
     },
     "./package.json": "./package.json"
   },
@@ -99,18 +100,18 @@
     "eslint-plugin-node-dependencies": "^1.0.0",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-regexp": "^2.6.0",
-    "eslint-plugin-toml": "^0.13.0",
-    "eslint-plugin-vue": "^9.26.0",
-    "eslint-plugin-yml": "^1.14.0",
+    "eslint-plugin-toml": "^1.0.0",
+    "eslint-plugin-vue": "^10.0.0",
+    "eslint-plugin-yml": "^2.0.0",
     "events": "^3.3.0",
     "mocha": "^11.0.0",
     "nyc": "^17.0.0",
     "pako": "^2.1.0",
     "prettier": "^3.3.2",
     "semver": "^7.6.2",
-    "stylelint": "^16.6.1",
+    "stylelint": "^17.0.0",
     "stylelint-config-recommended-vue": "^1.5.0",
-    "stylelint-config-standard": "^39.0.0",
+    "stylelint-config-standard": "^40.0.0",
     "stylelint-config-standard-vue": "^1.0.0",
     "stylelint-stylus": "^1.0.0",
     "tsdown": "^0.19.0",