@utoo/lint 0.4.9 → 0.4.11

package/index.cjs

@@ -16,6 +16,7 @@ const {
 const configModule = require("./lib/config-module.cjs");
 const estreeParser = require("./lib/estree-parser.cjs");
 const pluginRunner = require("./lib/plugin-runner.cjs");
+const { tokenWindow, selectTokenItems } = require("./lib/source-code-tokens.cjs");
 
 const version = JSON.parse(readFileSync(join(__dirname, "package.json"), "utf8")).version;
 
@@ -1438,6 +1439,11 @@ function appendPluginRuleDiagnostics(report, options, { perFileConfig = true } =
 }
 
 function nativeFlatConfigOptions(options) {
+  // lintText stores source in a temporary file. Resolve its configuration
+  // against the logical filename before passing the materialized config to native.
+  if (options.pluginTextFilePath !== undefined) {
+    return undefined;
+  }
   if (defersLegacyIgnores(options)) {
     // A legacy config may cascade from a nested directory even with baseConfig.
     return undefined;
@@ -1605,7 +1611,7 @@ function nativeConfigRunsForFiles(paths, options) {
   let hasConfigSource = Boolean(options.baseConfig || options.overrideConfig);
   for (const filePath of paths) {
     const matchPath = paths.length === 1
-      ? options.filePath ?? options.filename ?? filePath
+      ? options.filePath ?? options.filename ?? options.pluginTextFilePath ?? filePath
       : filePath;
     const fileConfigPath = options.noConfig ? undefined : configPathForFile(options, matchPath);
     const configured = Boolean(options.baseConfig || options.overrideConfig || fileConfigPath || legacyConfigForFile(options, matchPath));
@@ -3519,8 +3525,14 @@ class SourceCode {
   getLocFromIndex(index) {
     const clamped = Math.max(0, Math.min(index, this.text.length));
     let line = 0;
-    while (line + 1 < this.lineStartIndices.length && this.lineStartIndices[line + 1] <= clamped) {
-      line += 1;
+    let end = this.lineStartIndices.length - 1;
+    while (line < end) {
+      const middle = line + Math.ceil((end - line) / 2);
+      if (this.lineStartIndices[middle] <= clamped) {
+        line = middle;
+      } else {
+        end = middle - 1;
+      }
     }
     return {
       line: line + 1,
@@ -3564,64 +3576,64 @@ class SourceCode {
   }
 
   getFirstToken(node, skipOrOptions = 0) {
-    return sourceForwardToken(this.getTokens(node, sourceTokenOptions(skipOrOptions, "skip")), skipOrOptions);
+    return sourceNodeTokenWindow(this, node, sourceTokenOptions(skipOrOptions, "skip"), false, true);
   }
 
   getFirstTokens(node, countOrOptions = 1) {
-    return sourceForwardTokens(this.getTokens(node, sourceTokenOptions(countOrOptions, "count")), countOrOptions);
+    return sourceNodeTokenWindow(this, node, sourceTokenOptions(countOrOptions, "count"), false, false);
   }
 
   getLastToken(node, skipOrOptions = 0) {
-    return sourceBackwardToken(this.getTokens(node, sourceTokenOptions(skipOrOptions, "skip")), skipOrOptions);
+    return sourceNodeTokenWindow(this, node, sourceTokenOptions(skipOrOptions, "skip"), true, true);
   }
 
   getLastTokens(node, countOrOptions = 1) {
-    return sourceBackwardTokens(this.getTokens(node, sourceTokenOptions(countOrOptions, "count")), countOrOptions);
+    return sourceNodeTokenWindow(this, node, sourceTokenOptions(countOrOptions, "count"), true, false);
   }
 
   getTokenBefore(nodeOrToken, skipOrOptions = 0) {
     const options = sourceTokenOptions(skipOrOptions, "skip");
-    return sourceBackwardToken(sourceApplyTokenFilter(sourceItemsBefore(sourceTokenItems(this, options), this.getRange(nodeOrToken)[0]), options), options);
+    return tokenWindow(this, options, null, this.getRange(nodeOrToken)[0], true, true);
   }
 
   getTokensBefore(nodeOrToken, countOrOptions = 1) {
-    const options = sourceTokenOptions(countOrOptions, "count");
-    return sourceBackwardTokens(sourceApplyTokenFilter(sourceItemsBefore(sourceTokenItems(this, options), this.getRange(nodeOrToken)[0]), options), options);
+    const options = sourceCountedTokenOptions(countOrOptions);
+    return tokenWindow(this, options, null, this.getRange(nodeOrToken)[0], true, false);
   }
 
   getTokenAfter(nodeOrToken, skipOrOptions = 0) {
     const options = sourceTokenOptions(skipOrOptions, "skip");
-    return sourceForwardToken(sourceApplyTokenFilter(sourceItemsAfter(sourceTokenItems(this, options), this.getRange(nodeOrToken)[1]), options), options);
+    return tokenWindow(this, options, this.getRange(nodeOrToken)[1], null, false, true);
   }
 
   getTokensAfter(nodeOrToken, countOrOptions = 1) {
-    const options = sourceTokenOptions(countOrOptions, "count");
-    return sourceForwardTokens(sourceApplyTokenFilter(sourceItemsAfter(sourceTokenItems(this, options), this.getRange(nodeOrToken)[1]), options), options);
+    const options = sourceCountedTokenOptions(countOrOptions);
+    return tokenWindow(this, options, this.getRange(nodeOrToken)[1], null, false, false);
   }
 
   getTokensBetween(left, right, optionsOrCount) {
-    const options = sourceTokenOptions(optionsOrCount, "count");
-    return sourceForwardTokens(sourceTokensBetween(this, left, right, options), options);
+    const options = sourceCountedTokenOptions(optionsOrCount);
+    return tokenWindow(this, options, this.getRange(left)[1], this.getRange(right)[0], false, false);
   }
 
   getFirstTokenBetween(left, right, skipOrOptions = 0) {
     const options = sourceTokenOptions(skipOrOptions, "skip");
-    return sourceForwardToken(sourceTokensBetween(this, left, right, options), options);
+    return tokenWindow(this, options, this.getRange(left)[1], this.getRange(right)[0], false, true);
   }
 
   getFirstTokensBetween(left, right, countOrOptions = 1) {
-    const options = sourceTokenOptions(countOrOptions, "count");
-    return sourceForwardTokens(sourceTokensBetween(this, left, right, options), options);
+    const options = sourceCountedTokenOptions(countOrOptions);
+    return tokenWindow(this, options, this.getRange(left)[1], this.getRange(right)[0], false, false);
   }
 
   getLastTokenBetween(left, right, skipOrOptions = 0) {
     const options = sourceTokenOptions(skipOrOptions, "skip");
-    return sourceBackwardToken(sourceTokensBetween(this, left, right, options), options);
+    return tokenWindow(this, options, this.getRange(left)[1], this.getRange(right)[0], true, true);
   }
 
   getLastTokensBetween(left, right, countOrOptions = 1) {
-    const options = sourceTokenOptions(countOrOptions, "count");
-    return sourceBackwardTokens(sourceTokensBetween(this, left, right, options), options);
+    const options = sourceCountedTokenOptions(countOrOptions);
+    return tokenWindow(this, options, this.getRange(left)[1], this.getRange(right)[0], true, false);
   }
 
   getTokenByRangeStart(index, options = {}) {
@@ -3629,11 +3641,11 @@ class SourceCode {
   }
 
   getTokenOrCommentBefore(nodeOrToken) {
-    return sourceItemsBefore(sourceTokensAndComments(this), this.getRange(nodeOrToken)[0]).at(-1) ?? null;
+    return this.getTokenBefore(nodeOrToken, { includeComments: true });
   }
 
   getTokenOrCommentAfter(nodeOrToken) {
-    return sourceItemsAfter(sourceTokensAndComments(this), this.getRange(nodeOrToken)[1])[0] ?? null;
+    return this.getTokenAfter(nodeOrToken, { includeComments: true });
   }
 
   getCommentsBefore(nodeOrToken) {
@@ -3806,11 +3818,12 @@ function sourceTokensAndComments(sourceCode) {
   return [...sourceCode.tokens, ...sourceCode.comments].sort((left, right) => (left.range?.[0] ?? 0) - (right.range?.[0] ?? 0));
 }
 
-function sourceTokensBetween(sourceCode, left, right, options) {
-  return sourceApplyTokenFilter(
-    sourceItemsBetween(sourceTokenItems(sourceCode, options), sourceCode.getRange(left)[1], sourceCode.getRange(right)[0]),
-    options
-  );
+function sourceNodeTokenWindow(sourceCode, node, options, backwards, single) {
+  if (!node) {
+    return selectTokenItems(sourceTokenItems(sourceCode, options), options, backwards, single);
+  }
+  const range = expandSourceRange(sourceCode.getRange(node), options.beforeCount, options.afterCount, sourceCode.text.length);
+  return tokenWindow(sourceCode, options, range[0], range[1], backwards, single);
 }
 
 function sourceTokenItems(sourceCode, options) {
@@ -3843,6 +3856,14 @@ function sourceTokenOptions(optionsOrNumber, numericKey) {
   };
 }
 
+// Adjacent/between token APIs default an omitted count to one, including
+// options objects; getFirstTokens/getLastTokens keep their unbounded form.
+function sourceCountedTokenOptions(value) {
+  const options = sourceTokenOptions(value, "count");
+  options.count ??= 1;
+  return options;
+}
+
 function sourceTokenCount(value, defaultValue) {
   return Number.isFinite(value) ? Math.max(0, Math.trunc(value)) : defaultValue;
 }
@@ -3851,33 +3872,6 @@ function sourceApplyTokenFilter(items, options) {
   return options.filter ? items.filter((item) => options.filter(item)) : items;
 }
 
-function sourceForwardToken(items, optionsOrNumber) {
-  const options = sourceTokenOptions(optionsOrNumber, "skip");
-  return items[options.skip] ?? null;
-}
-
-function sourceForwardTokens(items, optionsOrNumber) {
-  const options = sourceTokenOptions(optionsOrNumber, "count");
-  const start = options.skip;
-  const end = options.count === null ? undefined : start + options.count;
-  return items.slice(start, end);
-}
-
-function sourceBackwardToken(items, optionsOrNumber) {
-  const options = sourceTokenOptions(optionsOrNumber, "skip");
-  return items.at(-(options.skip + 1)) ?? null;
-}
-
-function sourceBackwardTokens(items, optionsOrNumber) {
-  const options = sourceTokenOptions(optionsOrNumber, "count");
-  if (options.count === 0) {
-    return [];
-  }
-  const end = options.skip === 0 ? undefined : -options.skip;
-  const available = end === undefined ? items : items.slice(0, end);
-  return options.count === null ? available : available.slice(-options.count);
-}
-
 function sourceNodeByRangeIndex(node, index, seen = new Set()) {
   if (!node || typeof node !== "object" || seen.has(node)) {
     return null;

package/index.js

@@ -17,6 +17,7 @@ import {
 import configModule from "./lib/config-module.cjs";
 import estreeParser from "./lib/estree-parser.cjs";
 import pluginRunner from "./lib/plugin-runner.cjs";
+import { tokenWindow, selectTokenItems } from "./lib/source-code-tokens.cjs";
 
 export { platformPackageName, resolveBinary } from "./lib/binary.js";
 
@@ -1703,8 +1704,14 @@ export class SourceCode {
   getLocFromIndex(index) {
     const clamped = Math.max(0, Math.min(index, this.text.length));
     let line = 0;
-    while (line + 1 < this.lineStartIndices.length && this.lineStartIndices[line + 1] <= clamped) {
-      line += 1;
+    let end = this.lineStartIndices.length - 1;
+    while (line < end) {
+      const middle = line + Math.ceil((end - line) / 2);
+      if (this.lineStartIndices[middle] <= clamped) {
+        line = middle;
+      } else {
+        end = middle - 1;
+      }
     }
     return {
       line: line + 1,
@@ -1748,64 +1755,64 @@ export class SourceCode {
   }
 
   getFirstToken(node, skipOrOptions = 0) {
-    return sourceForwardToken(this.getTokens(node, sourceTokenOptions(skipOrOptions, "skip")), skipOrOptions);
+    return sourceNodeTokenWindow(this, node, sourceTokenOptions(skipOrOptions, "skip"), false, true);
   }
 
   getFirstTokens(node, countOrOptions = 1) {
-    return sourceForwardTokens(this.getTokens(node, sourceTokenOptions(countOrOptions, "count")), countOrOptions);
+    return sourceNodeTokenWindow(this, node, sourceTokenOptions(countOrOptions, "count"), false, false);
   }
 
   getLastToken(node, skipOrOptions = 0) {
-    return sourceBackwardToken(this.getTokens(node, sourceTokenOptions(skipOrOptions, "skip")), skipOrOptions);
+    return sourceNodeTokenWindow(this, node, sourceTokenOptions(skipOrOptions, "skip"), true, true);
   }
 
   getLastTokens(node, countOrOptions = 1) {
-    return sourceBackwardTokens(this.getTokens(node, sourceTokenOptions(countOrOptions, "count")), countOrOptions);
+    return sourceNodeTokenWindow(this, node, sourceTokenOptions(countOrOptions, "count"), true, false);
   }
 
   getTokenBefore(nodeOrToken, skipOrOptions = 0) {
     const options = sourceTokenOptions(skipOrOptions, "skip");
-    return sourceBackwardToken(sourceApplyTokenFilter(sourceItemsBefore(sourceTokenItems(this, options), this.getRange(nodeOrToken)[0]), options), options);
+    return tokenWindow(this, options, null, this.getRange(nodeOrToken)[0], true, true);
   }
 
   getTokensBefore(nodeOrToken, countOrOptions = 1) {
-    const options = sourceTokenOptions(countOrOptions, "count");
-    return sourceBackwardTokens(sourceApplyTokenFilter(sourceItemsBefore(sourceTokenItems(this, options), this.getRange(nodeOrToken)[0]), options), options);
+    const options = sourceCountedTokenOptions(countOrOptions);
+    return tokenWindow(this, options, null, this.getRange(nodeOrToken)[0], true, false);
   }
 
   getTokenAfter(nodeOrToken, skipOrOptions = 0) {
     const options = sourceTokenOptions(skipOrOptions, "skip");
-    return sourceForwardToken(sourceApplyTokenFilter(sourceItemsAfter(sourceTokenItems(this, options), this.getRange(nodeOrToken)[1]), options), options);
+    return tokenWindow(this, options, this.getRange(nodeOrToken)[1], null, false, true);
   }
 
   getTokensAfter(nodeOrToken, countOrOptions = 1) {
-    const options = sourceTokenOptions(countOrOptions, "count");
-    return sourceForwardTokens(sourceApplyTokenFilter(sourceItemsAfter(sourceTokenItems(this, options), this.getRange(nodeOrToken)[1]), options), options);
+    const options = sourceCountedTokenOptions(countOrOptions);
+    return tokenWindow(this, options, this.getRange(nodeOrToken)[1], null, false, false);
   }
 
   getTokensBetween(left, right, optionsOrCount) {
-    const options = sourceTokenOptions(optionsOrCount, "count");
-    return sourceForwardTokens(sourceTokensBetween(this, left, right, options), options);
+    const options = sourceCountedTokenOptions(optionsOrCount);
+    return tokenWindow(this, options, this.getRange(left)[1], this.getRange(right)[0], false, false);
   }
 
   getFirstTokenBetween(left, right, skipOrOptions = 0) {
     const options = sourceTokenOptions(skipOrOptions, "skip");
-    return sourceForwardToken(sourceTokensBetween(this, left, right, options), options);
+    return tokenWindow(this, options, this.getRange(left)[1], this.getRange(right)[0], false, true);
   }
 
   getFirstTokensBetween(left, right, countOrOptions = 1) {
-    const options = sourceTokenOptions(countOrOptions, "count");
-    return sourceForwardTokens(sourceTokensBetween(this, left, right, options), options);
+    const options = sourceCountedTokenOptions(countOrOptions);
+    return tokenWindow(this, options, this.getRange(left)[1], this.getRange(right)[0], false, false);
   }
 
   getLastTokenBetween(left, right, skipOrOptions = 0) {
     const options = sourceTokenOptions(skipOrOptions, "skip");
-    return sourceBackwardToken(sourceTokensBetween(this, left, right, options), options);
+    return tokenWindow(this, options, this.getRange(left)[1], this.getRange(right)[0], true, true);
   }
 
   getLastTokensBetween(left, right, countOrOptions = 1) {
-    const options = sourceTokenOptions(countOrOptions, "count");
-    return sourceBackwardTokens(sourceTokensBetween(this, left, right, options), options);
+    const options = sourceCountedTokenOptions(countOrOptions);
+    return tokenWindow(this, options, this.getRange(left)[1], this.getRange(right)[0], true, false);
   }
 
   getTokenByRangeStart(index, options = {}) {
@@ -1813,11 +1820,11 @@ export class SourceCode {
   }
 
   getTokenOrCommentBefore(nodeOrToken) {
-    return sourceItemsBefore(sourceTokensAndComments(this), this.getRange(nodeOrToken)[0]).at(-1) ?? null;
+    return this.getTokenBefore(nodeOrToken, { includeComments: true });
   }
 
   getTokenOrCommentAfter(nodeOrToken) {
-    return sourceItemsAfter(sourceTokensAndComments(this), this.getRange(nodeOrToken)[1])[0] ?? null;
+    return this.getTokenAfter(nodeOrToken, { includeComments: true });
   }
 
   getCommentsBefore(nodeOrToken) {
@@ -1990,11 +1997,12 @@ function sourceTokensAndComments(sourceCode) {
   return [...sourceCode.tokens, ...sourceCode.comments].sort((left, right) => (left.range?.[0] ?? 0) - (right.range?.[0] ?? 0));
 }
 
-function sourceTokensBetween(sourceCode, left, right, options) {
-  return sourceApplyTokenFilter(
-    sourceItemsBetween(sourceTokenItems(sourceCode, options), sourceCode.getRange(left)[1], sourceCode.getRange(right)[0]),
-    options
-  );
+function sourceNodeTokenWindow(sourceCode, node, options, backwards, single) {
+  if (!node) {
+    return selectTokenItems(sourceTokenItems(sourceCode, options), options, backwards, single);
+  }
+  const range = expandSourceRange(sourceCode.getRange(node), options.beforeCount, options.afterCount, sourceCode.text.length);
+  return tokenWindow(sourceCode, options, range[0], range[1], backwards, single);
 }
 
 function sourceTokenItems(sourceCode, options) {
@@ -2027,6 +2035,14 @@ function sourceTokenOptions(optionsOrNumber, numericKey) {
   };
 }
 
+// Adjacent/between token APIs default an omitted count to one, including
+// options objects; getFirstTokens/getLastTokens keep their unbounded form.
+function sourceCountedTokenOptions(value) {
+  const options = sourceTokenOptions(value, "count");
+  options.count ??= 1;
+  return options;
+}
+
 function sourceTokenCount(value, defaultValue) {
   return Number.isFinite(value) ? Math.max(0, Math.trunc(value)) : defaultValue;
 }
@@ -2035,33 +2051,6 @@ function sourceApplyTokenFilter(items, options) {
   return options.filter ? items.filter((item) => options.filter(item)) : items;
 }
 
-function sourceForwardToken(items, optionsOrNumber) {
-  const options = sourceTokenOptions(optionsOrNumber, "skip");
-  return items[options.skip] ?? null;
-}
-
-function sourceForwardTokens(items, optionsOrNumber) {
-  const options = sourceTokenOptions(optionsOrNumber, "count");
-  const start = options.skip;
-  const end = options.count === null ? undefined : start + options.count;
-  return items.slice(start, end);
-}
-
-function sourceBackwardToken(items, optionsOrNumber) {
-  const options = sourceTokenOptions(optionsOrNumber, "skip");
-  return items.at(-(options.skip + 1)) ?? null;
-}
-
-function sourceBackwardTokens(items, optionsOrNumber) {
-  const options = sourceTokenOptions(optionsOrNumber, "count");
-  if (options.count === 0) {
-    return [];
-  }
-  const end = options.skip === 0 ? undefined : -options.skip;
-  const available = end === undefined ? items : items.slice(0, end);
-  return options.count === null ? available : available.slice(-options.count);
-}
-
 function sourceNodeByRangeIndex(node, index, seen = new Set()) {
   if (!node || typeof node !== "object" || seen.has(node)) {
     return null;
@@ -3486,6 +3475,11 @@ function appendPluginRuleDiagnostics(report, options, { perFileConfig = true } =
 }
 
 function nativeFlatConfigOptions(options) {
+  // lintText stores source in a temporary file. Resolve its configuration
+  // against the logical filename before passing the materialized config to native.
+  if (options.pluginTextFilePath !== undefined) {
+    return undefined;
+  }
   if (defersLegacyIgnores(options)) {
     // A legacy config may cascade from a nested directory even with baseConfig.
     return undefined;
@@ -3653,7 +3647,7 @@ function nativeConfigRunsForFiles(paths, options) {
   let hasConfigSource = Boolean(options.baseConfig || options.overrideConfig);
   for (const filePath of paths) {
     const matchPath = paths.length === 1
-      ? options.filePath ?? options.filename ?? filePath
+      ? options.filePath ?? options.filename ?? options.pluginTextFilePath ?? filePath
       : filePath;
     const fileConfigPath = options.noConfig ? undefined : configPathForFile(options, matchPath);
     const configured = Boolean(options.baseConfig || options.overrideConfig || fileConfigPath || legacyConfigForFile(options, matchPath));

package/lib/estree-parser.cjs

@@ -4,7 +4,7 @@
 //
 // The native lint engine keeps its own AST in Zig. Plugin rules are JavaScript
 // and expect the ESTree shape that ESLint hands to `create(context)`, so this
-// module parses the file a second time with yuku-parser (the same parser the
+// module parses the file a second time with yuku (the same parser the
 // engine is built on), then decorates the tree with `range`, `loc`, `parent`,
 // a token stream, comments, and a lazily computed scope manager.
 //
@@ -70,12 +70,12 @@ function loadYuku() {
     throw yukuLoadError;
   }
   try {
-    // yuku-parser is an ES module. Loading it synchronously from CommonJS
+    // yuku is an ES module. Loading it synchronously from CommonJS
     // relies on require(esm), which Node.js 20.19+ and 22.12+ support.
-    yukuModule = require("yuku-parser");
+    yukuModule = require("yuku");
   } catch (error) {
     yukuLoadError = new Error(
-      "utoo-lint: unable to load yuku-parser, which is required to run ESLint plugin rules. " +
+      "utoo-lint: unable to load yuku, which is required to run ESLint plugin rules. " +
         "Plugin rules need Node.js 20.19 or newer (or 22.12 or newer). " +
         `Underlying error: ${error?.message ?? error}`
     );
@@ -192,13 +192,14 @@ function decorateNode(node, locate) {
   node.loc = { start: locate(node.start), end: locate(node.end) };
 }
 
-function normalizeTree(program, text, locate) {
+function normalizeTree(program, text, locate, lang) {
   const stack = [[program, null]];
   while (stack.length > 0) {
     const [node, parent] = stack.pop();
-    if (node.type === "TemplateElement") {
+    if (node.type === "TemplateElement" && !isTypeScriptLanguage(lang)) {
       // ESLint's parsers include the surrounding backticks and `${`/`}`
-      // delimiters in a template element's range.
+      // delimiters in a template element's range. Yuku already includes those
+      // delimiters in TypeScript trees.
       node.start -= 1;
       node.end += node.tail ? 1 : 2;
     }
@@ -607,12 +608,14 @@ function parseForESLint(text, options = {}) {
   const ecmaFeatures = options.ecmaFeatures ?? {};
   const lang = languageForFile(filePath, ecmaFeatures);
   const sourceType = sourceTypeForFile(filePath, options.sourceType);
-  const result = parse(text, { lang, sourceType, preserveParens: false });
-  const program = result.program;
+  const file = parse(text, { lang, sourceType, preserveParens: false });
+  const program = file.program;
   const locate = createLocator(text);
 
-  normalizeTree(program, text, locate);
-  program.comments = normalizeComments(program, result.comments ?? [], text, locate);
+  normalizeTree(program, text, locate, lang);
+  program.comments = normalizeComments(program, file.comments, text, locate);
+  // SourceFile.tokens requires tokens: true and uses Yuku's TokenList API.
+  // Build the ESLint token array from the normalized tree instead.
   program.tokens = buildTokens(program, text, locate, lang);
 
   return {
@@ -620,7 +623,7 @@ function parseForESLint(text, options = {}) {
     scopeManager: createScopeManagerFactory(program, { ...options, lang, sourceType, ecmaFeatures }),
     visitorKeys: VISITOR_KEYS,
     services: {},
-    diagnostics: result.diagnostics ?? []
+    diagnostics: file.diagnostics
   };
 }
 

package/lib/source-code-tokens.cjs

@@ -0,0 +1,97 @@
+"use strict";
+
+function inRange(item, start, end) {
+  return item.range && (start === null || item.range[0] >= start) && (end === null || item.range[1] <= end);
+}
+
+function select(items, options, backwards, single) {
+  const filtered = options.filter ? items.filter((item) => options.filter(item)) : items;
+  if (single) {
+    return backwards ? filtered.at(-(options.skip + 1)) ?? null : filtered[options.skip] ?? null;
+  }
+  if (!backwards) {
+    return filtered.slice(options.skip, options.count === null ? undefined : options.skip + options.count);
+  }
+  if (options.count === 0) {
+    return [];
+  }
+  if (options.count === null && options.skip === 0) {
+    return filtered;
+  }
+  const end = Math.max(0, filtered.length - options.skip);
+  const start = options.count === null ? 0 : Math.max(0, end - options.count);
+  return filtered.slice(start, end);
+}
+
+function collect(sourceCode, options, start, end) {
+  if (!options.includeComments) {
+    return sourceCode.tokens.filter((item) => inRange(item, start, end));
+  }
+  // Sort the live arrays for each query: callers can replace, reorder, or edit
+  // tokens and comments in place. Equal starts keep tokens before comments.
+  const items = [...sourceCode.tokens, ...sourceCode.comments];
+  items.sort((left, right) => (left.range?.[0] ?? 0) - (right.range?.[0] ?? 0));
+  return items.filter((item) => inRange(item, start, end));
+}
+
+/** Select a token window without assuming the public arrays remain sorted. */
+function tokenWindow(sourceCode, options, start, end, backwards, single) {
+  // A predicate must see every candidate in the same order, even when only
+  // one token is requested or count is zero.
+  if (options.filter) {
+    return select(collect(sourceCode, options, start, end), options, backwards, single);
+  }
+
+  if (options.includeComments) {
+    if (!single || options.skip !== 0) {
+      return select(collect(sourceCode, options, start, end), options, backwards, single);
+    }
+    // The nearest item in the sorted combined stream can be selected without
+    // allocating or sorting it. Scan both arrays to also handle unsorted input.
+    let found = null;
+    let foundStart = backwards ? -Infinity : Infinity;
+    for (const items of [sourceCode.tokens, sourceCode.comments]) {
+      for (const item of items) {
+        const itemStart = item.range?.[0] ?? 0;
+        if (typeof itemStart !== "number" || !Number.isFinite(itemStart)) {
+          return select(collect(sourceCode, options, start, end), options, backwards, single);
+        }
+        if (!inRange(item, start, end)) {
+          continue;
+        }
+        if (backwards ? itemStart >= foundStart : itemStart < foundStart) {
+          found = item;
+          foundStart = itemStart;
+        }
+      }
+    }
+    return found;
+  }
+
+  const items = sourceCode.tokens;
+  const result = [];
+  const count = single ? 1 : options.count;
+  if (count === 0) {
+    return result;
+  }
+  let skip = options.skip;
+  for (let index = backwards ? items.length - 1 : 0; backwards ? index >= 0 : index < items.length; index += backwards ? -1 : 1) {
+    if (!(index in items) || !inRange(items[index], start, end)) {
+      continue;
+    }
+    if (skip > 0) {
+      skip -= 1;
+      continue;
+    }
+    if (single) {
+      return items[index];
+    }
+    result.push(items[index]);
+    if (count !== null && result.length === count) {
+      break;
+    }
+  }
+  return single ? null : backwards ? result.reverse() : result;
+}
+
+module.exports = { tokenWindow, selectTokenItems: select };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/lint",
-  "version": "0.4.9",
+  "version": "0.4.11",
   "description": "High-performance JavaScript and TypeScript linter powered by Yuku",
   "license": "MIT",
   "repository": {
@@ -74,11 +74,11 @@
     "use-at-your-own-risk.js"
   ],
   "optionalDependencies": {
-    "@utoo/lint-darwin-arm64": "0.4.9",
-    "@utoo/lint-darwin-x64": "0.4.9",
-    "@utoo/lint-linux-arm64": "0.4.9",
-    "@utoo/lint-linux-x64": "0.4.9",
-    "@utoo/lint-win32-x64": "0.4.9"
+    "@utoo/lint-darwin-arm64": "0.4.11",
+    "@utoo/lint-darwin-x64": "0.4.11",
+    "@utoo/lint-linux-arm64": "0.4.11",
+    "@utoo/lint-linux-x64": "0.4.11",
+    "@utoo/lint-win32-x64": "0.4.11"
   },
   "dependencies": {
     "@eslint/eslintrc": "2.1.4",
@@ -88,7 +88,7 @@
     "eslint-scope": "9.1.2",
     "esquery": "1.7.0",
     "jiti": "2.7.0",
-    "yuku-parser": "0.18.0"
+    "yuku": "0.22.1"
   },
   "publishConfig": {
     "access": "public",