move token types to tokens.ts

Author: lilnasy

apps/oxlint/src-js/index.ts

@@ -20,7 +20,28 @@ export type {
 } from './plugins/scope.ts';
 export type { Settings } from './plugins/settings.ts';
 export type { SourceCode } from './plugins/source_code.ts';
-export type { CountOptions, FilterFn, RangeOptions, SkipOptions } from './plugins/tokens.ts';
+export type {
+  CountOptions,
+  FilterFn,
+  RangeOptions,
+  SkipOptions,
+  Token,
+  BooleanToken,
+  CommentToken,
+  BlockCommentToken,
+  LineCommentToken,
+  IdentifierToken,
+  JSXIdentifierToken,
+  JSXTextToken,
+  KeywordToken,
+  NullToken,
+  NumericToken,
+  PrivateIdentifierToken,
+  PunctuatorToken,
+  RegularExpressionToken,
+  StringToken,
+  TemplateToken,
+} from './plugins/tokens.ts';
 export type {
   RuleMeta,
   RuleDocs,
@@ -30,16 +51,7 @@ export type {
   RuleReplacedByExternalSpecifier,
 } from './plugins/rule_meta.ts';
 export type { LineColumn, Location, Range, Ranged, Span } from './plugins/location.ts';
-export type {
-  AfterHook,
-  BeforeHook,
-  Comment,
-  Node,
-  NodeOrToken,
-  Token,
-  Visitor,
-  VisitorWithHooks,
-} from './plugins/types.ts';
+export type { AfterHook, BeforeHook, Comment, Node, NodeOrToken, Visitor, VisitorWithHooks } from './plugins/types.ts';
 
 const {
   defineProperty,

apps/oxlint/src-js/plugins/tokens.ts

@@ -4,7 +4,8 @@
 import { parse } from '@typescript-eslint/typescript-estree';
 import { sourceText, initSourceText } from './source_code.js';
 
-import type { Comment, Node, NodeOrToken, Token } from './types.ts';
+import type { Comment, Node, NodeOrToken } from './types.ts';
+import type { Span } from './location.ts';
 
 /**
  * Options for various `SourceCode` methods e.g. `getFirstToken`.
@@ -43,6 +44,89 @@ export interface RangeOptions {
  */
 export type FilterFn = (token: Token) => boolean;
 
+// AST token type.
+export type Token =
+  | BooleanToken
+  | CommentToken
+  | IdentifierToken
+  | JSXIdentifierToken
+  | JSXTextToken
+  | KeywordToken
+  | NullToken
+  | NumericToken
+  | PrivateIdentifierToken
+  | PunctuatorToken
+  | RegularExpressionToken
+  | StringToken
+  | TemplateToken;
+
+interface BaseToken extends Omit<Span, 'start' | 'end'> {
+  type: Token['type'];
+  value: string;
+}
+
+export interface BooleanToken extends BaseToken {
+  type: 'Boolean';
+}
+
+export type CommentToken = BlockCommentToken | LineCommentToken;
+
+export interface BlockCommentToken extends BaseToken {
+  type: 'Block';
+}
+
+export interface LineCommentToken extends BaseToken {
+  type: 'Line';
+}
+
+export interface IdentifierToken extends BaseToken {
+  type: 'Identifier';
+}
+
+export interface JSXIdentifierToken extends BaseToken {
+  type: 'JSXIdentifier';
+}
+
+export interface JSXTextToken extends BaseToken {
+  type: 'JSXText';
+}
+
+export interface KeywordToken extends BaseToken {
+  type: 'Keyword';
+}
+
+export interface NullToken extends BaseToken {
+  type: 'Null';
+}
+
+export interface NumericToken extends BaseToken {
+  type: 'Numeric';
+}
+
+export interface PrivateIdentifierToken extends BaseToken {
+  type: 'PrivateIdentifier';
+}
+
+export interface PunctuatorToken extends BaseToken {
+  type: 'Punctuator';
+}
+
+export interface RegularExpressionToken extends BaseToken {
+  type: 'RegularExpression';
+  regex: {
+    flags: string;
+    pattern: string;
+  };
+}
+
+export interface StringToken extends BaseToken {
+  type: 'String';
+}
+
+export interface TemplateToken extends BaseToken {
+  type: 'Template';
+}
+
 // Tokens for the current file parsed by TS-ESLint.
 // Created lazily only when needed.
 let tokens: Token[] | null = null;

apps/oxlint/src-js/plugins/types.ts

@@ -7,6 +7,7 @@ export interface Visitor {
 */
 
 import type { Span } from './location.ts';
+import type { Token } from './tokens.ts';
 
 import type { VisitorObject as Visitor } from '../generated/visitor.d.ts';
 export type { Visitor };
@@ -30,89 +31,6 @@ export type VisitFn = (node: Node) => void;
 // AST node type.
 export interface Node extends Span {}
 
-// AST token type.
-export type Token =
-  | BooleanToken
-  | CommentToken
-  | IdentifierToken
-  | JSXIdentifierToken
-  | JSXTextToken
-  | KeywordToken
-  | NullToken
-  | NumericToken
-  | PrivateIdentifierToken
-  | PunctuatorToken
-  | RegularExpressionToken
-  | StringToken
-  | TemplateToken;
-
-export interface BaseToken extends Omit<Span, 'start' | 'end'> {
-  type: Token['type'];
-  value: string;
-}
-
-export interface BooleanToken extends BaseToken {
-  type: 'Boolean';
-}
-
-export type CommentToken = BlockCommentToken | LineCommentToken;
-
-export interface BlockCommentToken extends BaseToken {
-  type: 'Block';
-}
-
-export interface LineCommentToken extends BaseToken {
-  type: 'Line';
-}
-
-export interface IdentifierToken extends BaseToken {
-  type: 'Identifier';
-}
-
-export interface JSXIdentifierToken extends BaseToken {
-  type: 'JSXIdentifier';
-}
-
-export interface JSXTextToken extends BaseToken {
-  type: 'JSXText';
-}
-
-export interface KeywordToken extends BaseToken {
-  type: 'Keyword';
-}
-
-export interface NullToken extends BaseToken {
-  type: 'Null';
-}
-
-export interface NumericToken extends BaseToken {
-  type: 'Numeric';
-}
-
-export interface PrivateIdentifierToken extends BaseToken {
-  type: 'PrivateIdentifier';
-}
-
-export interface PunctuatorToken extends BaseToken {
-  type: 'Punctuator';
-}
-
-export interface RegularExpressionToken extends BaseToken {
-  type: 'RegularExpression';
-  regex: {
-    flags: string;
-    pattern: string;
-  };
-}
-
-export interface StringToken extends BaseToken {
-  type: 'String';
-}
-
-export interface TemplateToken extends BaseToken {
-  type: 'Template';
-}
-
 // Currently we only support `Node`s, but will add support for `Token`s later.
 export type NodeOrToken = Node | Token;