eslint-plugin-yml 3.1.2 → 3.2.0

package/lib/index.d.mts

@@ -1,5 +1,6 @@
 import { AST } from "yaml-eslint-parser";
 import { IDirective, TextSourceCodeBase, TraversalStep } from "@eslint/plugin-kit";
+import { CursorWithCountOptionsWithComment, CursorWithCountOptionsWithFilter, CursorWithCountOptionsWithoutFilter, CursorWithSkipOptionsWithComment, CursorWithSkipOptionsWithFilter, CursorWithSkipOptionsWithoutFilter } from "@ota-meshi/ast-token-store";
 import * as _eslint_core0 from "@eslint/core";
 import { File, FileProblem, Language, OkParseResult, RuleDefinition, RulesConfig } from "@eslint/core";
 import { Linter, Scope } from "eslint";
@@ -11,19 +12,6 @@ declare namespace meta_d_exports {
 declare const name: string;
 declare const version: string;
 //#endregion
-//#region src/language/token-store.d.ts
-type FilterPredicate = (tokenOrComment: YAMLToken) => boolean;
-type CursorWithSkipOptions = number | FilterPredicate | {
-  includeComments?: boolean;
-  filter?: FilterPredicate;
-  skip?: number;
-};
-type CursorWithCountOptions = number | FilterPredicate | {
-  includeComments?: boolean;
-  filter?: FilterPredicate;
-  count?: number;
-};
-//#endregion
 //#region src/language/yaml-source-code.d.ts
 /**
  * YAML-specific syntax element type
@@ -95,21 +83,186 @@ declare class YAMLSourceCode extends TextSourceCodeBase<{
     problems: FileProblem[];
   };
   getNodeByRangeIndex(index: number): AST.YAMLNode | null;
+  /**
+   * Gets the first token of the given node.
+   */
   getFirstToken(node: YAMLSyntaxElement): AST.Token;
-  getFirstToken(node: YAMLSyntaxElement, options?: CursorWithSkipOptions): YAMLToken | null;
+  /**
+   * Gets the first token of the given node with options.
+   */
+  getFirstToken(node: YAMLSyntaxElement, options: CursorWithSkipOptionsWithoutFilter): AST.Token | null;
+  /**
+   * Gets the first token of the given node with filter options.
+   */
+  getFirstToken<R extends AST.Token>(node: YAMLSyntaxElement, options: CursorWithSkipOptionsWithFilter<AST.Token, R>): R | null;
+  /**
+   * Gets the first token of the given node with comment options.
+   */
+  getFirstToken<R extends AST.Token | AST.Comment>(node: YAMLSyntaxElement, options: CursorWithSkipOptionsWithComment<AST.Token, AST.Comment, R>): R | null;
+  /**
+   * Gets the first tokens of the given node.
+   */
+  getFirstTokens(node: YAMLSyntaxElement, options?: CursorWithCountOptionsWithoutFilter): AST.Token[];
+  /**
+   * Gets the first tokens of the given node with filter options.
+   */
+  getFirstTokens<R extends AST.Token>(node: YAMLSyntaxElement, options: CursorWithCountOptionsWithFilter<AST.Token, R>): R[];
+  /**
+   * Gets the first tokens of the given node with comment options.
+   */
+  getFirstTokens<R extends AST.Token | AST.Comment>(node: YAMLSyntaxElement, options: CursorWithCountOptionsWithComment<AST.Token, AST.Comment, R>): R[];
+  /**
+   * Gets the last token of the given node.
+   */
   getLastToken(node: YAMLSyntaxElement): AST.Token;
-  getLastToken(node: YAMLSyntaxElement, options?: CursorWithSkipOptions): YAMLToken | null;
-  getTokenBefore(node: YAMLSyntaxElement): AST.Token | null;
-  getTokenBefore(node: YAMLSyntaxElement, options?: CursorWithSkipOptions): YAMLToken | null;
-  getTokensBefore(node: YAMLSyntaxElement, options?: CursorWithCountOptions): YAMLToken[];
-  getTokenAfter(node: YAMLSyntaxElement): AST.Token | null;
-  getTokenAfter(node: YAMLSyntaxElement, options?: CursorWithSkipOptions): YAMLToken | null;
-  getFirstTokenBetween(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options?: CursorWithSkipOptions): YAMLToken | null;
-  getTokensBetween(left: YAMLSyntaxElement, right: YAMLSyntaxElement, paddingOrOptions?: number | FilterPredicate | CursorWithCountOptions): YAMLToken[];
-  getTokens(node: AST.YAMLNode, options?: FilterPredicate | CursorWithCountOptions): YAMLToken[];
+  /**
+   * Gets the last token of the given node with options.
+   */
+  getLastToken(node: YAMLSyntaxElement, options: CursorWithSkipOptionsWithoutFilter): AST.Token | null;
+  /**
+   * Gets the last token of the given node with filter options.
+   */
+  getLastToken<R extends AST.Token>(node: YAMLSyntaxElement, options: CursorWithSkipOptionsWithFilter<AST.Token, R>): R | null;
+  /**
+   * Gets the last token of the given node with comment options.
+   */
+  getLastToken<R extends AST.Token | AST.Comment>(node: YAMLSyntaxElement, options: CursorWithSkipOptionsWithComment<AST.Token, AST.Comment, R>): R | null;
+  /**
+   * Get the last tokens of the given node.
+   */
+  getLastTokens(node: YAMLSyntaxElement, options?: CursorWithCountOptionsWithoutFilter): AST.Token[];
+  /**
+   * Get the last tokens of the given node with filter options.
+   */
+  getLastTokens<R extends AST.Token>(node: YAMLSyntaxElement, options: CursorWithCountOptionsWithFilter<AST.Token, R>): R[];
+  /**
+   * Get the last tokens of the given node with comment options.
+   */
+  getLastTokens<R extends AST.Token | AST.Comment>(node: YAMLSyntaxElement, options: CursorWithCountOptionsWithComment<AST.Token, AST.Comment, R>): R[];
+  /**
+   * Gets the token that precedes a given node or token.
+   */
+  getTokenBefore(node: YAMLSyntaxElement, options?: CursorWithSkipOptionsWithoutFilter): AST.Token | null;
+  /**
+   * Gets the token that precedes a given node or token with filter options.
+   */
+  getTokenBefore<R extends AST.Token>(node: YAMLSyntaxElement, options: CursorWithSkipOptionsWithFilter<AST.Token, R>): R | null;
+  /**
+   * Gets the token that precedes a given node or token with comment options.
+   */
+  getTokenBefore<R extends AST.Token | AST.Comment>(node: YAMLSyntaxElement, options: CursorWithSkipOptionsWithComment<AST.Token, AST.Comment, R>): R | null;
+  /**
+   * Gets the `count` tokens that precedes a given node or token.
+   */
+  getTokensBefore(node: YAMLSyntaxElement, options?: CursorWithCountOptionsWithoutFilter): AST.Token[];
+  /**
+   * Gets the `count` tokens that precedes a given node or token with filter options.
+   */
+  getTokensBefore<R extends AST.Token>(node: YAMLSyntaxElement, options: CursorWithCountOptionsWithFilter<AST.Token, R>): R[];
+  /**
+   * Gets the `count` tokens that precedes a given node or token with comment options.
+   */
+  getTokensBefore<R extends AST.Token | AST.Comment>(node: YAMLSyntaxElement, options: CursorWithCountOptionsWithComment<AST.Token, AST.Comment, R>): R[];
+  /**
+   * Gets the token that follows a given node or token.
+   */
+  getTokenAfter(node: YAMLSyntaxElement, options?: CursorWithSkipOptionsWithoutFilter): AST.Token | null;
+  /**
+   * Gets the token that follows a given node or token with filter options.
+   */
+  getTokenAfter<R extends AST.Token>(node: YAMLSyntaxElement, options: CursorWithSkipOptionsWithFilter<AST.Token, R>): R | null;
+  /**
+   * Gets the token that follows a given node or token with comment options.
+   */
+  getTokenAfter<R extends AST.Token | AST.Comment>(node: YAMLSyntaxElement, options: CursorWithSkipOptionsWithComment<AST.Token, AST.Comment, R>): R | null;
+  /**
+   * Gets the `count` tokens that follows a given node or token.
+   */
+  getTokensAfter(node: YAMLSyntaxElement, options?: CursorWithCountOptionsWithoutFilter): AST.Token[];
+  /**
+   * Gets the `count` tokens that follows a given node or token with filter options.
+   */
+  getTokensAfter<R extends AST.Token>(node: YAMLSyntaxElement, options: CursorWithCountOptionsWithFilter<AST.Token, R>): R[];
+  /**
+   * Gets the `count` tokens that follows a given node or token with comment options.
+   */
+  getTokensAfter<R extends AST.Token | AST.Comment>(node: YAMLSyntaxElement, options: CursorWithCountOptionsWithComment<AST.Token, AST.Comment, R>): R[];
+  /**
+   * Gets the first token between two non-overlapping nodes.
+   */
+  getFirstTokenBetween(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options?: CursorWithSkipOptionsWithoutFilter): AST.Token | null;
+  /**
+   * Gets the first token between two non-overlapping nodes with filter options.
+   */
+  getFirstTokenBetween<R extends AST.Token>(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options: CursorWithSkipOptionsWithFilter<AST.Token, R>): R | null;
+  /**
+   * Gets the first token between two non-overlapping nodes with comment options.
+   */
+  getFirstTokenBetween<R extends AST.Token | AST.Comment>(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options: CursorWithSkipOptionsWithComment<AST.Token, AST.Comment, R>): R | null;
+  /**
+   * Gets the first tokens between two non-overlapping nodes.
+   */
+  getFirstTokensBetween(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options?: CursorWithCountOptionsWithoutFilter): AST.Token[];
+  /**
+   * Gets the first tokens between two non-overlapping nodes with filter options.
+   */
+  getFirstTokensBetween<R extends AST.Token>(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options: CursorWithCountOptionsWithFilter<AST.Token, R>): R[];
+  /**
+   * Gets the first tokens between two non-overlapping nodes with comment options.
+   */
+  getFirstTokensBetween<R extends AST.Token | AST.Comment>(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options: CursorWithCountOptionsWithComment<AST.Token, AST.Comment, R>): R[];
+  /**
+   * Gets the last token between two non-overlapping nodes.
+   */
+  getLastTokenBetween(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options?: CursorWithSkipOptionsWithoutFilter): AST.Token | null;
+  /**
+   * Gets the last token between two non-overlapping nodes with filter options.
+   */
+  getLastTokenBetween<R extends AST.Token>(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options: CursorWithSkipOptionsWithFilter<AST.Token, R>): R | null;
+  /**
+   * Gets the last token between two non-overlapping nodes with comment options.
+   */
+  getLastTokenBetween<R extends AST.Token | AST.Comment>(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options: CursorWithSkipOptionsWithComment<AST.Token, AST.Comment, R>): R | null;
+  /**
+   * Gets the last tokens between two non-overlapping nodes.
+   */
+  getLastTokensBetween(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options?: CursorWithCountOptionsWithoutFilter): AST.Token[];
+  /**
+   * Gets the last tokens between two non-overlapping nodes with filter options.
+   */
+  getLastTokensBetween<R extends AST.Token>(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options: CursorWithCountOptionsWithFilter<AST.Token, R>): R[];
+  /**
+   * Gets the last tokens between two non-overlapping nodes with comment options.
+   */
+  getLastTokensBetween<R extends AST.Token | AST.Comment>(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options: CursorWithCountOptionsWithComment<AST.Token, AST.Comment, R>): R[];
+  /**
+   * Gets all tokens that are related to the given node.
+   */
+  getTokens(node: YAMLSyntaxElement, options?: CursorWithCountOptionsWithoutFilter): AST.Token[];
+  /**
+   * Gets all tokens that are related to the given node with filter options.
+   */
+  getTokens<R extends AST.Token>(node: YAMLSyntaxElement, options: CursorWithCountOptionsWithFilter<AST.Token, R>): R[];
+  /**
+   * Gets all tokens that are related to the given node with comment options.
+   */
+  getTokens<R extends AST.Token | AST.Comment>(node: YAMLSyntaxElement, options: CursorWithCountOptionsWithComment<AST.Token, AST.Comment, R>): R[];
+  /**
+   * Gets all of the tokens between two non-overlapping nodes.
+   */
+  getTokensBetween(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options?: CursorWithCountOptionsWithoutFilter): AST.Token[];
+  /**
+   * Gets all of the tokens between two non-overlapping nodes with filter options.
+   */
+  getTokensBetween<R extends AST.Token>(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options: CursorWithCountOptionsWithFilter<AST.Token, R>): R[];
+  /**
+   * Gets all of the tokens between two non-overlapping nodes with comment options.
+   */
+  getTokensBetween<R extends AST.Token | AST.Comment>(left: YAMLSyntaxElement, right: YAMLSyntaxElement, options: CursorWithCountOptionsWithComment<AST.Token, AST.Comment, R>): R[];
+  getCommentsInside(nodeOrToken: YAMLSyntaxElement): AST.Comment[];
   getCommentsBefore(nodeOrToken: YAMLSyntaxElement): AST.Comment[];
   getCommentsAfter(nodeOrToken: YAMLSyntaxElement): AST.Comment[];
-  isSpaceBetween(first: YAMLToken, second: YAMLToken): boolean;
+  isSpaceBetween(first: AST.Token | AST.Comment, second: AST.Token | AST.Comment): boolean;
   /**
    * Compatibility for ESLint's SourceCode API
    * @deprecated YAML does not have scopes

package/lib/index.mjs

@@ -6,6 +6,7 @@ import naturalCompare from "natural-compare";
 import diffModule from "diff-sequences";
 import escapeStringRegexp from "escape-string-regexp";
 import { CallMethodStep, ConfigCommentParser, Directive, TextSourceCodeBase, VisitNodeStep } from "@eslint/plugin-kit";
+import { TokenStore } from "@ota-meshi/ast-token-store";
 
 //#region src/utils/index.ts
 /**
@@ -5254,7 +5255,7 @@ var prettier_default = [...base_default, { rules: {
 //#endregion
 //#region package.json
 var name$1 = "eslint-plugin-yml";
-var version$1 = "3.1.2";
+var version$1 = "3.2.0";
 
 //#endregion
 //#region src/meta.ts
@@ -5265,293 +5266,6 @@ var meta_exports = /* @__PURE__ */ __exportAll({
 const name = name$1;
 const version = version$1;
 
-//#endregion
-//#region src/language/token-store.ts
-/**
-* Binary search for the index of the first token that is after the given location.
-*/
-function search(tokens, location) {
-	let minIndex = 0;
-	let maxIndex = tokens.length - 1;
-	while (minIndex <= maxIndex) {
-		const index = Math.floor((minIndex + maxIndex) / 2);
-		const tokenStartLocation = tokens[index].range[0];
-		if (tokenStartLocation < location) minIndex = index + 1;
-		else if (tokenStartLocation > location) maxIndex = index - 1;
-		else return index;
-	}
-	return minIndex;
-}
-/**
-* Get the index of the first token that is after the given location.
-*/
-function getFirstIndex(tokens, indexMap, startLoc) {
-	const index = indexMap.get(startLoc);
-	if (index != null) return index;
-	return search(tokens, startLoc);
-}
-/**
-* Get the index of the last token that is before the given location.
-*/
-function getLastIndex(tokens, indexMap, endLoc) {
-	const index = indexMap.get(endLoc);
-	if (index != null) return index - 1;
-	return search(tokens, endLoc) - 1;
-}
-/**
-* Normalizes the options for cursor methods.
-*/
-function normalizeSkipOptions(options) {
-	if (typeof options === "number") return {
-		filter: isNotComment,
-		skip: options
-	};
-	if (typeof options === "function") return {
-		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 {
-		filter,
-		skip: options?.skip ?? 0
-	};
-}
-/**
-* Checks if a token is a comment.
-*/
-function isComment(token) {
-	return token.type === "Block";
-}
-/**
-* Checks if a token is a not comment.
-*/
-function isNotComment(token) {
-	return !isComment(token);
-}
-/**
-* Normalizes the options for cursor methods with count.
-*/
-function normalizeCountOptions(options) {
-	if (typeof options === "number") return {
-		filter: isNotComment,
-		count: options
-	};
-	if (typeof options === "function") return {
-		filter: (n) => {
-			if (isComment(n)) return false;
-			return options(n);
-		},
-		count: 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 {
-		filter,
-		count: options?.count ?? 0
-	};
-}
-var TokenStore = class {
-	/**
-	* Combined and sorted list of tokens and comments
-	*/
-	allTokens;
-	/**
-	* Map from token start location to index in allTokens
-	*/
-	tokenStartToIndex;
-	constructor(params) {
-		const tokens = params.ast.tokens || [];
-		const comments = params.ast.comments || [];
-		this.allTokens = [...tokens, ...comments].sort((a, b) => a.range[0] - b.range[0]);
-		this.tokenStartToIndex = /* @__PURE__ */ new Map();
-		for (let i = 0; i < this.allTokens.length; i++) this.tokenStartToIndex.set(this.allTokens[i].range[0], i);
-	}
-	/**
-	* Gets the first token of the given node.
-	*/
-	getFirstToken(node, 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;
-		for (let i = startIndex; i <= endIndex && i < this.allTokens.length; i++) {
-			const token = this.allTokens[i];
-			if (filter && !filter(token)) continue;
-			if (skipped < skip) {
-				skipped++;
-				continue;
-			}
-			return token;
-		}
-		return null;
-	}
-	/**
-	* Gets the last token of the given node.
-	*/
-	getLastToken(node, 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;
-		for (let i = endIndex; i >= startIndex && i >= 0; i--) {
-			const token = this.allTokens[i];
-			if (filter && !filter(token)) continue;
-			if (skipped < skip) {
-				skipped++;
-				continue;
-			}
-			return token;
-		}
-		return null;
-	}
-	/**
-	* Gets the first token between two non-overlapping nodes.
-	*/
-	getFirstTokenBetween(left, right, 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;
-		for (let i = startIndex; i <= endIndex && i < this.allTokens.length; i++) {
-			const token = this.allTokens[i];
-			if (filter && !filter(token)) continue;
-			if (skipped < skip) {
-				skipped++;
-				continue;
-			}
-			return token;
-		}
-		return null;
-	}
-	/**
-	* Gets the token that precedes a given node or token.
-	*/
-	getTokenBefore(node, 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--) {
-			const token = this.allTokens[i];
-			if (filter && !filter(token)) continue;
-			if (skipped < skip) {
-				skipped++;
-				continue;
-			}
-			return token;
-		}
-		return null;
-	}
-	/**
-	* Gets the token that follows a given node or token.
-	*/
-	getTokenAfter(node, 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++) {
-			const token = this.allTokens[i];
-			if (filter && !filter(token)) continue;
-			if (skipped < skip) {
-				skipped++;
-				continue;
-			}
-			return token;
-		}
-		return null;
-	}
-	/**
-	* Gets the `count` tokens that precedes a given node or token.
-	*/
-	getTokensBefore(node, options) {
-		const { filter, count } = normalizeCountOptions(options);
-		const endIndex = getLastIndex(this.allTokens, this.tokenStartToIndex, node.range[0]);
-		const result = [];
-		for (let i = endIndex; i >= 0; i--) {
-			const token = this.allTokens[i];
-			if (filter && !filter(token)) continue;
-			result.unshift(token);
-			if (count > 0 && result.length >= count) break;
-		}
-		return result;
-	}
-	/**
-	* Gets all tokens that are related to the given node.
-	*/
-	getTokens(node, options) {
-		const { filter, count } = normalizeCountOptions(options);
-		const startIndex = getFirstIndex(this.allTokens, this.tokenStartToIndex, node.range[0]);
-		const endIndex = getLastIndex(this.allTokens, this.tokenStartToIndex, node.range[1]);
-		const result = [];
-		for (let i = startIndex; i <= endIndex && i < this.allTokens.length; i++) {
-			const token = this.allTokens[i];
-			if (filter && !filter(token)) continue;
-			result.push(token);
-			if (count > 0 && result.length >= count) break;
-		}
-		return result;
-	}
-	/**
-	* Gets all of the tokens between two non-overlapping nodes.
-	*/
-	getTokensBetween(left, right, paddingOrOptions) {
-		const { filter, count } = normalizeCountOptions(paddingOrOptions);
-		const startIndex = getFirstIndex(this.allTokens, this.tokenStartToIndex, left.range[1]);
-		const endIndex = getLastIndex(this.allTokens, this.tokenStartToIndex, right.range[0]);
-		const result = [];
-		for (let i = startIndex; i <= endIndex && i < this.allTokens.length; i++) {
-			const token = this.allTokens[i];
-			if (filter && !filter(token)) continue;
-			result.push(token);
-			if (count > 0 && result.length >= count) break;
-		}
-		return result;
-	}
-	/**
-	* Gets all comment tokens directly before the given node or token.
-	*/
-	getCommentsBefore(nodeOrToken) {
-		const endIndex = getLastIndex(this.allTokens, this.tokenStartToIndex, nodeOrToken.range[0]);
-		const result = [];
-		for (let i = endIndex; i >= 0; i--) {
-			const token = this.allTokens[i];
-			if (isComment(token)) result.unshift(token);
-			else break;
-		}
-		return result;
-	}
-	/**
-	* Gets all comment tokens directly after the given node or token.
-	*/
-	getCommentsAfter(nodeOrToken) {
-		const startIndex = getFirstIndex(this.allTokens, this.tokenStartToIndex, nodeOrToken.range[1]);
-		const result = [];
-		for (let i = startIndex; i < this.allTokens.length; i++) {
-			const token = this.allTokens[i];
-			if (isComment(token)) result.push(token);
-			else break;
-		}
-		return result;
-	}
-};
-
 //#endregion
 //#region src/language/yaml-source-code.ts
 /**
@@ -5585,7 +5299,10 @@ var YAMLSourceCode = class extends TextSourceCodeBase {
 		this.hasBOM = Boolean(config.hasBOM);
 		this.parserServices = config.parserServices;
 		this.visitorKeys = config.visitorKeys || {};
-		this.tokenStore = new TokenStore({ ast: this.ast });
+		this.tokenStore = new TokenStore({
+			tokens: [...config.ast.tokens, ...config.ast.comments],
+			isComment: (token) => token.type === "Block"
+		});
 	}
 	traverse() {
 		if (this.#steps != null) return this.#steps;
@@ -5628,7 +5345,7 @@ var YAMLSourceCode = class extends TextSourceCodeBase {
 		return this.lines;
 	}
 	getAllComments() {
-		return this.ast.comments;
+		return this.tokenStore.getAllComments();
 	}
 	/**
 	* Returns an array of all inline configuration nodes found in the source code.
@@ -5728,9 +5445,15 @@ var YAMLSourceCode = class extends TextSourceCodeBase {
 	getFirstToken(node, options) {
 		return this.tokenStore.getFirstToken(node, options);
 	}
+	getFirstTokens(node, options) {
+		return this.tokenStore.getFirstTokens(node, options);
+	}
 	getLastToken(node, options) {
 		return this.tokenStore.getLastToken(node, options);
 	}
+	getLastTokens(node, options) {
+		return this.tokenStore.getLastTokens(node, options);
+	}
 	getTokenBefore(node, options) {
 		return this.tokenStore.getTokenBefore(node, options);
 	}
@@ -5740,15 +5463,30 @@ var YAMLSourceCode = class extends TextSourceCodeBase {
 	getTokenAfter(node, options) {
 		return this.tokenStore.getTokenAfter(node, options);
 	}
+	getTokensAfter(node, options) {
+		return this.tokenStore.getTokensAfter(node, options);
+	}
 	getFirstTokenBetween(left, right, options) {
 		return this.tokenStore.getFirstTokenBetween(left, right, options);
 	}
-	getTokensBetween(left, right, paddingOrOptions) {
-		return this.tokenStore.getTokensBetween(left, right, paddingOrOptions);
+	getFirstTokensBetween(left, right, options) {
+		return this.tokenStore.getFirstTokensBetween(left, right, options);
+	}
+	getLastTokenBetween(left, right, options) {
+		return this.tokenStore.getLastTokenBetween(left, right, options);
+	}
+	getLastTokensBetween(left, right, options) {
+		return this.tokenStore.getLastTokensBetween(left, right, options);
 	}
 	getTokens(node, options) {
 		return this.tokenStore.getTokens(node, options);
 	}
+	getTokensBetween(left, right, options) {
+		return this.tokenStore.getTokensBetween(left, right, options);
+	}
+	getCommentsInside(nodeOrToken) {
+		return this.tokenStore.getCommentsInside(nodeOrToken);
+	}
 	getCommentsBefore(nodeOrToken) {
 		return this.tokenStore.getCommentsBefore(nodeOrToken);
 	}
@@ -5756,17 +5494,8 @@ var YAMLSourceCode = class extends TextSourceCodeBase {
 		return this.tokenStore.getCommentsAfter(nodeOrToken);
 	}
 	isSpaceBetween(first, second) {
-		if (nodesOrTokensOverlap(first, second)) return false;
-		const [startingNodeOrToken, endingNodeOrToken] = first.range[1] <= second.range[0] ? [first, second] : [second, first];
-		const firstToken = this.getLastToken(startingNodeOrToken) || startingNodeOrToken;
-		const finalToken = this.getFirstToken(endingNodeOrToken) || endingNodeOrToken;
-		let currentToken = firstToken;
-		while (currentToken !== finalToken) {
-			const nextToken = this.getTokenAfter(currentToken, { includeComments: true });
-			if (currentToken.range[1] !== nextToken.range[0]) return true;
-			currentToken = nextToken;
-		}
-		return false;
+		const [left, right] = first.range[1] <= second.range[0] ? [first, second] : [second, first];
+		return this.tokenStore.isSpaceBetween(left, right);
 	}
 	/**
 	* Compatibility for ESLint's SourceCode API
@@ -5818,12 +5547,6 @@ function isNode(value) {
 	return typeof value === "object" && value !== null && typeof value.type === "string" && Array.isArray(value.range) && Boolean(value.loc) && typeof value.loc === "object";
 }
 /**
-* Determines whether two nodes or tokens overlap.
-*/
-function nodesOrTokensOverlap(first, second) {
-	return first.range[0] < second.range[1] && second.range[0] < first.range[1];
-}
-/**
 * Creates a fake global scope for YAML files.
 * @deprecated YAML does not have scopes
 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-yml",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "description": "This ESLint plugin provides linting rules for YAML.",
   "type": "module",
   "main": "lib/index.mjs",
@@ -66,6 +66,7 @@
   "dependencies": {
     "@eslint/core": "^1.0.1",
     "@eslint/plugin-kit": "^0.6.0",
+    "@ota-meshi/ast-token-store": "^0.2.0",
     "debug": "^4.3.2",
     "diff-sequences": "^29.0.0",
     "escape-string-regexp": "5.0.0",
@@ -90,8 +91,8 @@
     "@types/natural-compare": "^1.4.0",
     "@types/node": "^24.0.0",
     "@types/semver": "^7.3.1",
-    "@typescript-eslint/eslint-plugin": "~8.54.0",
-    "@typescript-eslint/parser": "~8.54.0",
+    "@typescript-eslint/eslint-plugin": "~8.56.0",
+    "@typescript-eslint/parser": "~8.56.0",
     "cross-env": "^10.0.0",
     "env-cmd": "^11.0.0",
     "eslint": "^10.0.0",