fix: consistent-type-imports

vega · Dec 31, 2024 · 415a123 · 415a123
1 parent add3814
commit 415a123
Show file tree

Hide file tree

Showing 112 changed files with 341 additions and 320 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -30,6 +30,7 @@ export default tseslint.config(
         rules: {
             "@typescript-eslint/explicit-function-return-type": "off",
             "@typescript-eslint/no-explicit-any": "off",
+            "@typescript-eslint/consistent-type-imports": "error",
             "@typescript-eslint/prefer-for-of": "error",
             "@typescript-eslint/no-require-imports": "error",
             "@typescript-eslint/no-parameter-properties": "off",

diff --git a/factory/formatter.ts b/factory/formatter.ts
@@ -1,8 +1,8 @@
 import { ChainTypeFormatter } from "../src/ChainTypeFormatter.js";
 import { CircularReferenceTypeFormatter } from "../src/CircularReferenceTypeFormatter.js";
-import { CompletedConfig } from "../src/Config.js";
-import { MutableTypeFormatter } from "../src/MutableTypeFormatter.js";
-import { TypeFormatter } from "../src/TypeFormatter.js";
+import type { CompletedConfig } from "../src/Config.js";
+import type { MutableTypeFormatter } from "../src/MutableTypeFormatter.js";
+import type { TypeFormatter } from "../src/TypeFormatter.js";
 import { AliasTypeFormatter } from "../src/TypeFormatter/AliasTypeFormatter.js";
 import { AnnotatedTypeFormatter } from "../src/TypeFormatter/AnnotatedTypeFormatter.js";
 import { AnyTypeFormatter } from "../src/TypeFormatter/AnyTypeFormatter.js";

diff --git a/factory/generator.ts b/factory/generator.ts
@@ -1,4 +1,5 @@
-import { Config, DEFAULT_CONFIG } from "../src/Config.js";
+import type { Config } from "../src/Config.js";
+import { DEFAULT_CONFIG } from "../src/Config.js";
 import { SchemaGenerator } from "../src/SchemaGenerator.js";
 import { createFormatter } from "./formatter.js";
 import { createParser } from "./parser.js";

diff --git a/src/AnnotationsReader.ts b/src/AnnotationsReader.ts
@@ -1,5 +1,5 @@
-import ts from "typescript";
-import { Annotations } from "./Type/AnnotatedType.js";
+import type ts from "typescript";
+import type { Annotations } from "./Type/AnnotatedType.js";
 
 export interface AnnotationsReader {
     getAnnotations(node: ts.Node): Annotations | undefined;

diff --git a/src/AnnotationsReader/BasicAnnotationsReader.ts b/src/AnnotationsReader/BasicAnnotationsReader.ts
@@ -1,7 +1,7 @@
 import json5 from "json5";
-import ts from "typescript";
-import { AnnotationsReader } from "../AnnotationsReader.js";
-import { Annotations } from "../Type/AnnotatedType.js";
+import type ts from "typescript";
+import type { AnnotationsReader } from "../AnnotationsReader.js";
+import type { Annotations } from "../Type/AnnotatedType.js";
 import { symbolAtNode } from "../Utils/symbolAtNode.js";
 
 export class BasicAnnotationsReader implements AnnotationsReader {

diff --git a/src/AnnotationsReader/ExtendedAnnotationsReader.ts b/src/AnnotationsReader/ExtendedAnnotationsReader.ts
@@ -1,6 +1,6 @@
 import json5 from "json5";
-import ts from "typescript";
-import { Annotations } from "../Type/AnnotatedType.js";
+import type ts from "typescript";
+import type { Annotations } from "../Type/AnnotatedType.js";
 import { symbolAtNode } from "../Utils/symbolAtNode.js";
 import { BasicAnnotationsReader } from "./BasicAnnotationsReader.js";
 

diff --git a/src/CircularReferenceNodeParser.ts b/src/CircularReferenceNodeParser.ts
@@ -1,7 +1,7 @@
-import ts from "typescript";
-import { Context } from "./NodeParser.js";
-import { SubNodeParser } from "./SubNodeParser.js";
-import { BaseType } from "./Type/BaseType.js";
+import type ts from "typescript";
+import type { Context } from "./NodeParser.js";
+import type { SubNodeParser } from "./SubNodeParser.js";
+import type { BaseType } from "./Type/BaseType.js";
 import { ReferenceType } from "./Type/ReferenceType.js";
 import { getKey } from "./Utils/nodeKey.js";
 

diff --git a/src/CircularReferenceTypeFormatter.ts b/src/CircularReferenceTypeFormatter.ts
@@ -1,6 +1,6 @@
-import { Definition } from "./Schema/Definition.js";
-import { SubTypeFormatter } from "./SubTypeFormatter.js";
-import { BaseType } from "./Type/BaseType.js";
+import type { Definition } from "./Schema/Definition.js";
+import type { SubTypeFormatter } from "./SubTypeFormatter.js";
+import type { BaseType } from "./Type/BaseType.js";
 import { uniqueArray } from "./Utils/uniqueArray.js";
 
 export class CircularReferenceTypeFormatter implements SubTypeFormatter {

diff --git a/src/ExposeNodeParser.ts b/src/ExposeNodeParser.ts
@@ -1,9 +1,9 @@
 import ts from "typescript";
-import { Context } from "./NodeParser.js";
-import { SubNodeParser } from "./SubNodeParser.js";
-import { BaseType } from "./Type/BaseType.js";
+import type { Context } from "./NodeParser.js";
+import type { SubNodeParser } from "./SubNodeParser.js";
+import type { BaseType } from "./Type/BaseType.js";
 import { DefinitionType } from "./Type/DefinitionType.js";
-import { ReferenceType } from "./Type/ReferenceType.js";
+import type { ReferenceType } from "./Type/ReferenceType.js";
 import { hasJsDocTag } from "./Utils/hasJsDocTag.js";
 import { symbolAtNode } from "./Utils/symbolAtNode.js";
 

diff --git a/src/Interfaces/AnnotationsReader.ts b/src/Interfaces/AnnotationsReader.ts
@@ -1,5 +1,5 @@
-import ts from "typescript";
-import { Annotations } from "../Type/AnnotatedType.js";
+import type ts from "typescript";
+import type { Annotations } from "../Type/AnnotatedType.js";
 
 export interface AnnotationsReader {
     getAnnotations(node: ts.Node): Annotations | undefined;

diff --git a/src/Interfaces/MutableParser.ts b/src/Interfaces/MutableParser.ts
@@ -1,4 +1,4 @@
-import { SubNodeParser } from "./SubNodeParser.js";
+import type { SubNodeParser } from "./SubNodeParser.js";
 
 export interface MutableParser {
     addNodeParser(parser: SubNodeParser): MutableParser;

diff --git a/src/Interfaces/MutableTypeFormatter.ts b/src/Interfaces/MutableTypeFormatter.ts
@@ -1,4 +1,4 @@
-import { SubTypeFormatter } from "./SubTypeFormatter.js";
+import type { SubTypeFormatter } from "./SubTypeFormatter.js";
 
 export interface MutableTypeFormatter {
     addTypeFormatter(formatter: SubTypeFormatter): MutableTypeFormatter;

diff --git a/src/Interfaces/SubNodeParser.ts b/src/Interfaces/SubNodeParser.ts
@@ -1,5 +1,5 @@
-import ts from "typescript";
-import { NodeParser } from "../NodeParser.js";
+import type ts from "typescript";
+import type { NodeParser } from "../NodeParser.js";
 
 export interface SubNodeParser extends NodeParser {
     supportsNode(node: ts.Node): boolean;

diff --git a/src/Interfaces/SubTypeFormatter.ts b/src/Interfaces/SubTypeFormatter.ts
@@ -1,5 +1,5 @@
-import { BaseType } from "../Type/BaseType.js";
-import { TypeFormatter } from "./TypeFormatter.js";
+import type { BaseType } from "../Type/BaseType.js";
+import type { TypeFormatter } from "./TypeFormatter.js";
 
 export interface SubTypeFormatter extends TypeFormatter {
     supportsType(type: BaseType): boolean;

diff --git a/src/Interfaces/TypeFormatter.ts b/src/Interfaces/TypeFormatter.ts
@@ -1,5 +1,5 @@
-import { Definition } from "../Schema/Definition.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { Definition } from "../Schema/Definition.js";
+import type { BaseType } from "../Type/BaseType.js";
 
 export interface TypeFormatter {
     getDefinition(type: BaseType): Definition;

diff --git a/src/MutableParser.ts b/src/MutableParser.ts
@@ -1,4 +1,4 @@
-import { SubNodeParser } from "./SubNodeParser.js";
+import type { SubNodeParser } from "./SubNodeParser.js";
 
 export interface MutableParser {
     addNodeParser(parser: SubNodeParser): MutableParser;

diff --git a/src/MutableTypeFormatter.ts b/src/MutableTypeFormatter.ts
@@ -1,4 +1,4 @@
-import { SubTypeFormatter } from "./SubTypeFormatter.js";
+import type { SubTypeFormatter } from "./SubTypeFormatter.js";
 
 export interface MutableTypeFormatter {
     addTypeFormatter(formatter: SubTypeFormatter): MutableTypeFormatter;

diff --git a/src/NodeParser.ts b/src/NodeParser.ts
@@ -1,7 +1,7 @@
 import stringify from "safe-stable-stringify";
-import ts from "typescript";
-import { BaseType } from "./Type/BaseType.js";
-import { ReferenceType } from "./Type/ReferenceType.js";
+import type ts from "typescript";
+import type { BaseType } from "./Type/BaseType.js";
+import type { ReferenceType } from "./Type/ReferenceType.js";
 import { getKey } from "./Utils/nodeKey.js";
 
 export class Context {

diff --git a/src/NodeParser/AnnotatedNodeParser.ts b/src/NodeParser/AnnotatedNodeParser.ts
@@ -1,11 +1,11 @@
 import ts from "typescript";
-import { AnnotationsReader } from "../AnnotationsReader.js";
+import type { AnnotationsReader } from "../AnnotationsReader.js";
 import { ExtendedAnnotationsReader } from "../AnnotationsReader/ExtendedAnnotationsReader.js";
-import { Context } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
+import type { Context } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
 import { AnnotatedType } from "../Type/AnnotatedType.js";
-import { BaseType } from "../Type/BaseType.js";
-import { ReferenceType } from "../Type/ReferenceType.js";
+import type { BaseType } from "../Type/BaseType.js";
+import type { ReferenceType } from "../Type/ReferenceType.js";
 import { removeUndefined } from "../Utils/removeUndefined.js";
 import { DefinitionType } from "../Type/DefinitionType.js";
 import { UnionType } from "../Type/UnionType.js";

diff --git a/src/NodeParser/AnyTypeNodeParser.ts b/src/NodeParser/AnyTypeNodeParser.ts
@@ -1,8 +1,8 @@
 import ts from "typescript";
-import { Context } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
+import type { Context } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
 import { AnyType } from "../Type/AnyType.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { BaseType } from "../Type/BaseType.js";
 
 export class AnyTypeNodeParser implements SubNodeParser {
     public supportsNode(node: ts.KeywordTypeNode): boolean {

diff --git a/src/NodeParser/ArrayLiteralExpressionNodeParser.ts b/src/NodeParser/ArrayLiteralExpressionNodeParser.ts
@@ -1,7 +1,7 @@
 import ts from "typescript";
-import { Context, NodeParser } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { Context, NodeParser } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
+import type { BaseType } from "../Type/BaseType.js";
 import { TupleType } from "../Type/TupleType.js";
 
 export class ArrayLiteralExpressionNodeParser implements SubNodeParser {

diff --git a/src/NodeParser/AsExpressionNodeParser.ts b/src/NodeParser/AsExpressionNodeParser.ts
@@ -1,8 +1,8 @@
-import { NodeParser } from "../NodeParser.js";
+import type { NodeParser } from "../NodeParser.js";
 import ts from "typescript";
-import { Context } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { Context } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
+import type { BaseType } from "../Type/BaseType.js";
 
 export class AsExpressionNodeParser implements SubNodeParser {
     public constructor(protected childNodeParser: NodeParser) {}

diff --git a/src/NodeParser/BooleanLiteralNodeParser.ts b/src/NodeParser/BooleanLiteralNodeParser.ts
@@ -1,7 +1,7 @@
 import ts from "typescript";
-import { Context } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { Context } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
+import type { BaseType } from "../Type/BaseType.js";
 import { LiteralType } from "../Type/LiteralType.js";
 
 export class BooleanLiteralNodeParser implements SubNodeParser {

diff --git a/src/NodeParser/BooleanTypeNodeParser.ts b/src/NodeParser/BooleanTypeNodeParser.ts
@@ -1,7 +1,7 @@
 import ts from "typescript";
-import { Context } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { Context } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
+import type { BaseType } from "../Type/BaseType.js";
 import { BooleanType } from "../Type/BooleanType.js";
 
 export class BooleanTypeNodeParser implements SubNodeParser {

diff --git a/src/NodeParser/CallExpressionParser.ts b/src/NodeParser/CallExpressionParser.ts
@@ -1,8 +1,9 @@
 import { TupleType } from "../Type/TupleType.js";
 import ts from "typescript";
-import { Context, NodeParser } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { NodeParser } from "../NodeParser.js";
+import { Context } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
+import type { BaseType } from "../Type/BaseType.js";
 import { UnionType } from "../Type/UnionType.js";
 import { LiteralType } from "../Type/LiteralType.js";
 import { SymbolType } from "../Type/SymbolType.js";

diff --git a/src/NodeParser/ConditionalTypeNodeParser.ts b/src/NodeParser/ConditionalTypeNodeParser.ts
@@ -1,7 +1,8 @@
 import ts from "typescript";
-import { Context, NodeParser } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { NodeParser } from "../NodeParser.js";
+import { Context } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
+import type { BaseType } from "../Type/BaseType.js";
 import { isAssignableTo } from "../Utils/isAssignableTo.js";
 import { narrowType } from "../Utils/narrowType.js";
 import { UnionType } from "../Type/UnionType.js";

diff --git a/src/NodeParser/ConstructorNodeParser.ts b/src/NodeParser/ConstructorNodeParser.ts
@@ -1,10 +1,10 @@
 import ts from "typescript";
-import { SubNodeParser } from "../SubNodeParser.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
+import type { BaseType } from "../Type/BaseType.js";
 import { ConstructorType } from "../Type/ConstructorType.js";
-import { FunctionOptions } from "../Config.js";
+import type { FunctionOptions } from "../Config.js";
 import { NeverType } from "../Type/NeverType.js";
-import { Context, NodeParser } from "../NodeParser.js";
+import type { Context, NodeParser } from "../NodeParser.js";
 import { DefinitionType } from "../Type/DefinitionType.js";
 import { getNamedArguments, getTypeName } from "./FunctionNodeParser.js";
 

diff --git a/src/NodeParser/EnumNodeParser.ts b/src/NodeParser/EnumNodeParser.ts
@@ -1,8 +1,9 @@
 import ts from "typescript";
-import { Context } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
-import { BaseType } from "../Type/BaseType.js";
-import { EnumType, EnumValue } from "../Type/EnumType.js";
+import type { Context } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
+import type { BaseType } from "../Type/BaseType.js";
+import type { EnumValue } from "../Type/EnumType.js";
+import { EnumType } from "../Type/EnumType.js";
 import { isNodeHidden } from "../Utils/isHidden.js";
 import { getKey } from "../Utils/nodeKey.js";
 

diff --git a/src/NodeParser/ExpressionWithTypeArgumentsNodeParser.ts b/src/NodeParser/ExpressionWithTypeArgumentsNodeParser.ts
@@ -1,7 +1,8 @@
 import ts from "typescript";
-import { Context, NodeParser } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { NodeParser } from "../NodeParser.js";
+import { Context } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
+import type { BaseType } from "../Type/BaseType.js";
 
 export class ExpressionWithTypeArgumentsNodeParser implements SubNodeParser {
     public constructor(

diff --git a/src/NodeParser/HiddenTypeNodeParser.ts b/src/NodeParser/HiddenTypeNodeParser.ts
@@ -1,7 +1,7 @@
-import ts from "typescript";
-import { Context } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
-import { BaseType } from "../Type/BaseType.js";
+import type ts from "typescript";
+import type { Context } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
+import type { BaseType } from "../Type/BaseType.js";
 import { HiddenType } from "../Type/HiddenType.js";
 import { isNodeHidden } from "../Utils/isHidden.js";
 

diff --git a/src/NodeParser/InferTypeNodeParser.ts b/src/NodeParser/InferTypeNodeParser.ts
@@ -1,7 +1,7 @@
 import ts from "typescript";
-import { Context, NodeParser } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { Context, NodeParser } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
+import type { BaseType } from "../Type/BaseType.js";
 import { InferType } from "../Type/InferType.js";
 
 export class InferTypeNodeParser implements SubNodeParser {

diff --git a/src/NodeParser/InterfaceAndClassNodeParser.ts b/src/NodeParser/InterfaceAndClassNodeParser.ts
@@ -1,11 +1,12 @@
-import ts, { PropertyName } from "typescript";
-import { Context, NodeParser } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
+import type { PropertyName } from "typescript";
+import ts from "typescript";
+import type { Context, NodeParser } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
 import { ArrayType } from "../Type/ArrayType.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { BaseType } from "../Type/BaseType.js";
 import { NeverType } from "../Type/NeverType.js";
 import { ObjectProperty, ObjectType } from "../Type/ObjectType.js";
-import { ReferenceType } from "../Type/ReferenceType.js";
+import type { ReferenceType } from "../Type/ReferenceType.js";
 import { isNodeHidden } from "../Utils/isHidden.js";
 import { isPublic, isStatic } from "../Utils/modifiers.js";
 import { getKey } from "../Utils/nodeKey.js";

diff --git a/src/NodeParser/LiteralNodeParser.ts b/src/NodeParser/LiteralNodeParser.ts
@@ -1,7 +1,7 @@
 import ts from "typescript";
-import { Context, NodeParser } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { Context, NodeParser } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
+import type { BaseType } from "../Type/BaseType.js";
 
 export class LiteralNodeParser implements SubNodeParser {
     public constructor(protected childNodeParser: NodeParser) {}

diff --git a/src/NodeParser/MappedTypeNodeParser.ts b/src/NodeParser/MappedTypeNodeParser.ts
@@ -1,12 +1,14 @@
 import ts from "typescript";
 import { ExpectationFailedError } from "../Error/Errors.js";
-import { Context, NodeParser } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
+import type { NodeParser } from "../NodeParser.js";
+import { Context } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
 import { AnnotatedType } from "../Type/AnnotatedType.js";
 import { ArrayType } from "../Type/ArrayType.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { BaseType } from "../Type/BaseType.js";
 import { DefinitionType } from "../Type/DefinitionType.js";
-import { EnumType, EnumValue } from "../Type/EnumType.js";
+import type { EnumValue } from "../Type/EnumType.js";
+import { EnumType } from "../Type/EnumType.js";
 import { LiteralType } from "../Type/LiteralType.js";
 import { NeverType } from "../Type/NeverType.js";
 import { NumberType } from "../Type/NumberType.js";

diff --git a/src/NodeParser/NamedTupleMemberNodeParser.ts b/src/NodeParser/NamedTupleMemberNodeParser.ts
@@ -1,10 +1,10 @@
 import ts from "typescript";
-import { Context, NodeParser } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
+import type { Context, NodeParser } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
 import { AnnotatedType } from "../Type/AnnotatedType.js";
 import { ArrayType } from "../Type/ArrayType.js";
-import { BaseType } from "../Type/BaseType.js";
-import { ReferenceType } from "../Type/ReferenceType.js";
+import type { BaseType } from "../Type/BaseType.js";
+import type { ReferenceType } from "../Type/ReferenceType.js";
 import { RestType } from "../Type/RestType.js";
 
 export class NamedTupleMemberNodeParser implements SubNodeParser {

diff --git a/src/NodeParser/NeverTypeNodeParser.ts b/src/NodeParser/NeverTypeNodeParser.ts
@@ -1,7 +1,7 @@
 import ts from "typescript";
-import { Context } from "../NodeParser.js";
-import { SubNodeParser } from "../SubNodeParser.js";
-import { BaseType } from "../Type/BaseType.js";
+import type { Context } from "../NodeParser.js";
+import type { SubNodeParser } from "../SubNodeParser.js";
+import type { BaseType } from "../Type/BaseType.js";
 import { NeverType } from "../Type/NeverType.js";
 
 export class NeverTypeNodeParser implements SubNodeParser {