Skip to content

Commit

Permalink
style: format
Browse files Browse the repository at this point in the history
  • Loading branch information
domoritz committed Aug 1, 2023
1 parent 1ac3e38 commit c4805fc
Show file tree
Hide file tree
Showing 27 changed files with 124 additions and 38 deletions.
5 changes: 4 additions & 1 deletion src/AnnotationsReader/ExtendedAnnotationsReader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import { symbolAtNode } from "../Utils/symbolAtNode";
import { BasicAnnotationsReader } from "./BasicAnnotationsReader";

export class ExtendedAnnotationsReader extends BasicAnnotationsReader {
public constructor(private typeChecker: ts.TypeChecker, extraTags?: Set<string>) {
public constructor(
private typeChecker: ts.TypeChecker,
extraTags?: Set<string>
) {
super(extraTags);
}

Expand Down
5 changes: 4 additions & 1 deletion src/ChainNodeParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ import { ReferenceType } from "./Type/ReferenceType";
export class ChainNodeParser implements SubNodeParser, MutableParser {
protected readonly typeCaches = new WeakMap<ts.Node, Map<string, BaseType>>();

public constructor(protected typeChecker: ts.TypeChecker, protected nodeParsers: SubNodeParser[]) {}
public constructor(
protected typeChecker: ts.TypeChecker,
protected nodeParsers: SubNodeParser[]
) {}

public addNodeParser(nodeParser: SubNodeParser): this {
this.nodeParsers.push(nodeParser);
Expand Down
5 changes: 4 additions & 1 deletion src/Error/UnknownNodeError.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import ts from "typescript";
import { BaseError } from "./BaseError";

export class UnknownNodeError extends BaseError {
public constructor(private node: ts.Node, private reference?: ts.Node) {
public constructor(
private node: ts.Node,
private reference?: ts.Node
) {
super(
`Unknown node "${node.getSourceFile() ? node.getFullText() : "<unknown>"}" of kind "${
ts.SyntaxKind[node.kind]
Expand Down
5 changes: 4 additions & 1 deletion src/NodeParser/AnnotatedNodeParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ import { UnionType } from "../Type/UnionType";
import { AnyType } from "../Type/AnyType";

export class AnnotatedNodeParser implements SubNodeParser {
public constructor(protected childNodeParser: SubNodeParser, protected annotationsReader: AnnotationsReader) {}
public constructor(
protected childNodeParser: SubNodeParser,
protected annotationsReader: AnnotationsReader
) {}

public supportsNode(node: ts.Node): boolean {
return this.childNodeParser.supportsNode(node);
Expand Down
5 changes: 4 additions & 1 deletion src/NodeParser/CallExpressionParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import { LiteralType } from "../Type/LiteralType";
import { SymbolType } from "../Type/SymbolType";

export class CallExpressionParser implements SubNodeParser {
public constructor(protected typeChecker: ts.TypeChecker, protected childNodeParser: NodeParser) {}
public constructor(
protected typeChecker: ts.TypeChecker,
protected childNodeParser: NodeParser
) {}

public supportsNode(node: ts.CallExpression): boolean {
return node.kind === ts.SyntaxKind.CallExpression;
Expand Down
10 changes: 8 additions & 2 deletions src/NodeParser/ConditionalTypeNodeParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,17 @@ import { UnionType } from "../Type/UnionType";
import { NeverType } from "../Type/NeverType";

class CheckType {
constructor(public parameterName: string, public type: BaseType) {}
constructor(
public parameterName: string,
public type: BaseType
) {}
}

export class ConditionalTypeNodeParser implements SubNodeParser {
public constructor(protected typeChecker: ts.TypeChecker, protected childNodeParser: NodeParser) {}
public constructor(
protected typeChecker: ts.TypeChecker,
protected childNodeParser: NodeParser
) {}

public supportsNode(node: ts.ConditionalTypeNode): boolean {
return node.kind === ts.SyntaxKind.ConditionalType;
Expand Down
5 changes: 4 additions & 1 deletion src/NodeParser/ExpressionWithTypeArgumentsNodeParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ import { SubNodeParser } from "../SubNodeParser";
import { BaseType } from "../Type/BaseType";

export class ExpressionWithTypeArgumentsNodeParser implements SubNodeParser {
public constructor(protected typeChecker: ts.TypeChecker, protected childNodeParser: NodeParser) {}
public constructor(
protected typeChecker: ts.TypeChecker,
protected childNodeParser: NodeParser
) {}

public supportsNode(node: ts.ExpressionWithTypeArguments): boolean {
return node.kind === ts.SyntaxKind.ExpressionWithTypeArguments;
Expand Down
5 changes: 4 additions & 1 deletion src/NodeParser/IndexedAccessTypeNodeParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ import { derefType } from "../Utils/derefType";
import { getTypeByKey } from "../Utils/typeKeys";

export class IndexedAccessTypeNodeParser implements SubNodeParser {
public constructor(protected typeChecker: ts.TypeChecker, protected childNodeParser: NodeParser) {}
public constructor(
protected typeChecker: ts.TypeChecker,
protected childNodeParser: NodeParser
) {}

public supportsNode(node: ts.TypeNode): boolean {
return node.kind === ts.SyntaxKind.IndexedAccessType;
Expand Down
5 changes: 4 additions & 1 deletion src/NodeParser/InferTypeNodeParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import { BaseType } from "../Type/BaseType";
import { InferType } from "../Type/InferType";

export class InferTypeNodeParser implements SubNodeParser {
public constructor(protected typeChecker: ts.TypeChecker, protected childNodeParser: NodeParser) {}
public constructor(
protected typeChecker: ts.TypeChecker,
protected childNodeParser: NodeParser
) {}

public supportsNode(node: ts.InferTypeNode): boolean {
return node.kind === ts.SyntaxKind.InferType;
Expand Down
25 changes: 14 additions & 11 deletions src/NodeParser/InterfaceAndClassNodeParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,20 @@ export class InterfaceAndClassNodeParser implements SubNodeParser {
let hasRequiredNever = false;

const properties = (node.members as ts.NodeArray<ts.TypeElement | ts.ClassElement>)
.reduce((members, member) => {
if (ts.isConstructorDeclaration(member)) {
const params = member.parameters.filter((param) =>
ts.isParameterPropertyDeclaration(param, param.parent)
) as ts.ParameterPropertyDeclaration[];
members.push(...params);
} else if (ts.isPropertySignature(member) || ts.isPropertyDeclaration(member)) {
members.push(member);
}
return members;
}, [] as (ts.PropertyDeclaration | ts.PropertySignature | ts.ParameterPropertyDeclaration)[])
.reduce(
(members, member) => {
if (ts.isConstructorDeclaration(member)) {
const params = member.parameters.filter((param) =>
ts.isParameterPropertyDeclaration(param, param.parent)
) as ts.ParameterPropertyDeclaration[];
members.push(...params);
} else if (ts.isPropertySignature(member) || ts.isPropertyDeclaration(member)) {
members.push(member);
}
return members;
},
[] as (ts.PropertyDeclaration | ts.PropertySignature | ts.ParameterPropertyDeclaration)[]
)
.filter((member) => isPublic(member) && !isStatic(member) && !isNodeHidden(member))
.reduce((entries, member) => {
let memberType: ts.Node | undefined = member.type;
Expand Down
5 changes: 4 additions & 1 deletion src/NodeParser/IntersectionNodeParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ import { UndefinedType } from "../Type/UndefinedType";
import { NeverType } from "../Type/NeverType";

export class IntersectionNodeParser implements SubNodeParser {
public constructor(protected typeChecker: ts.TypeChecker, protected childNodeParser: NodeParser) {}
public constructor(
protected typeChecker: ts.TypeChecker,
protected childNodeParser: NodeParser
) {}

public supportsNode(node: ts.IntersectionTypeNode): boolean {
return node.kind === ts.SyntaxKind.IntersectionType;
Expand Down
5 changes: 4 additions & 1 deletion src/NodeParser/MappedTypeNodeParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ import { preserveAnnotation } from "../Utils/preserveAnnotation";
import { removeUndefined } from "../Utils/removeUndefined";

export class MappedTypeNodeParser implements SubNodeParser {
public constructor(protected childNodeParser: NodeParser, protected readonly additionalProperties: boolean) {}
public constructor(
protected childNodeParser: NodeParser,
protected readonly additionalProperties: boolean
) {}

public supportsNode(node: ts.MappedTypeNode): boolean {
return node.kind === ts.SyntaxKind.MappedType;
Expand Down
5 changes: 4 additions & 1 deletion src/NodeParser/PropertyAccessExpressionParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ import { SubNodeParser } from "../SubNodeParser";
import { BaseType } from "../Type/BaseType";

export class PropertyAccessExpressionParser implements SubNodeParser {
public constructor(protected typeChecker: ts.TypeChecker, protected childNodeParser: NodeParser) {}
public constructor(
protected typeChecker: ts.TypeChecker,
protected childNodeParser: NodeParser
) {}

public supportsNode(node: ts.PropertyAccessExpression): boolean {
return node.kind === ts.SyntaxKind.PropertyAccessExpression;
Expand Down
5 changes: 4 additions & 1 deletion src/NodeParser/TupleNodeParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import { BaseType } from "../Type/BaseType";
import { TupleType } from "../Type/TupleType";

export class TupleNodeParser implements SubNodeParser {
public constructor(protected typeChecker: ts.TypeChecker, protected childNodeParser: NodeParser) {}
public constructor(
protected typeChecker: ts.TypeChecker,
protected childNodeParser: NodeParser
) {}

public supportsNode(node: ts.TupleTypeNode): boolean {
return node.kind === ts.SyntaxKind.TupleType;
Expand Down
5 changes: 4 additions & 1 deletion src/NodeParser/TypeAliasNodeParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import { ReferenceType } from "../Type/ReferenceType";
import { getKey } from "../Utils/nodeKey";

export class TypeAliasNodeParser implements SubNodeParser {
public constructor(protected typeChecker: ts.TypeChecker, protected childNodeParser: NodeParser) {}
public constructor(
protected typeChecker: ts.TypeChecker,
protected childNodeParser: NodeParser
) {}

public supportsNode(node: ts.TypeAliasDeclaration): boolean {
return node.kind === ts.SyntaxKind.TypeAliasDeclaration;
Expand Down
5 changes: 4 additions & 1 deletion src/NodeParser/TypeReferenceNodeParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ const invalidTypes: Record<number, boolean> = {
};

export class TypeReferenceNodeParser implements SubNodeParser {
public constructor(protected typeChecker: ts.TypeChecker, protected childNodeParser: NodeParser) {}
public constructor(
protected typeChecker: ts.TypeChecker,
protected childNodeParser: NodeParser
) {}

public supportsNode(node: ts.TypeReferenceNode): boolean {
return node.kind === ts.SyntaxKind.TypeReference;
Expand Down
5 changes: 4 additions & 1 deletion src/NodeParser/TypeofNodeParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ import { LiteralType } from "../Type/LiteralType";
import { UnknownType } from "../Type/UnknownType";

export class TypeofNodeParser implements SubNodeParser {
public constructor(protected typeChecker: ts.TypeChecker, protected childNodeParser: NodeParser) {}
public constructor(
protected typeChecker: ts.TypeChecker,
protected childNodeParser: NodeParser
) {}

public supportsNode(node: ts.TypeQueryNode): boolean {
return node.kind === ts.SyntaxKind.TypeQuery;
Expand Down
5 changes: 4 additions & 1 deletion src/NodeParser/UnionNodeParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ import { notNever } from "../Utils/notNever";
import { NeverType } from "../Type/NeverType";

export class UnionNodeParser implements SubNodeParser {
public constructor(protected typeChecker: ts.TypeChecker, protected childNodeParser: NodeParser) {}
public constructor(
protected typeChecker: ts.TypeChecker,
protected childNodeParser: NodeParser
) {}

public supportsNode(node: ts.UnionTypeNode): boolean {
return node.kind === ts.SyntaxKind.UnionType;
Expand Down
5 changes: 4 additions & 1 deletion src/Type/AliasType.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { BaseType } from "./BaseType";

export class AliasType extends BaseType {
public constructor(private id: string, private type: BaseType) {
public constructor(
private id: string,
private type: BaseType
) {
super();
}

Expand Down
6 changes: 5 additions & 1 deletion src/Type/AnnotatedType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ export interface Annotations {
}

export class AnnotatedType extends BaseType {
public constructor(private type: BaseType, private annotations: Annotations, private nullable: boolean) {
public constructor(
private type: BaseType,
private annotations: Annotations,
private nullable: boolean
) {
super();
}

Expand Down
5 changes: 4 additions & 1 deletion src/Type/DefinitionType.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { BaseType } from "./BaseType";

export class DefinitionType extends BaseType {
public constructor(private name: string | undefined, private type: BaseType) {
public constructor(
private name: string | undefined,
private type: BaseType
) {
super();
}

Expand Down
5 changes: 4 additions & 1 deletion src/Type/EnumType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ export type EnumValue = string | boolean | number | null;
export class EnumType extends BaseType {
private types: BaseType[];

public constructor(private id: string, private values: readonly EnumValue[]) {
public constructor(
private id: string,
private values: readonly EnumValue[]
) {
super();
this.types = values.map((value) => (value == null ? new NullType() : new LiteralType(value)));
}
Expand Down
6 changes: 5 additions & 1 deletion src/Type/ObjectType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ import { BaseType } from "./BaseType";
import { strip } from "../Utils/String";

export class ObjectProperty {
public constructor(private name: string, private type: BaseType, private required: boolean) {}
public constructor(
private name: string,
private type: BaseType,
private required: boolean
) {}

public getName(): string {
return strip(this.name);
Expand Down
5 changes: 4 additions & 1 deletion src/Type/RestType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ import { InferType } from "./InferType";
import { TupleType } from "./TupleType";

export class RestType extends BaseType {
public constructor(private item: ArrayType | InferType | TupleType, private title: string | null = null) {
public constructor(
private item: ArrayType | InferType | TupleType,
private title: string | null = null
) {
super();
}

Expand Down
5 changes: 4 additions & 1 deletion src/TypeFormatter/DefinitionTypeFormatter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import { TypeFormatter } from "../TypeFormatter";
import { uniqueArray } from "../Utils/uniqueArray";

export class DefinitionTypeFormatter implements SubTypeFormatter {
public constructor(protected childTypeFormatter: TypeFormatter, protected encodeRefs: boolean) {}
public constructor(
protected childTypeFormatter: TypeFormatter,
protected encodeRefs: boolean
) {}

public supportsType(type: DefinitionType): boolean {
return type instanceof DefinitionType;
Expand Down
5 changes: 4 additions & 1 deletion src/TypeFormatter/ReferenceTypeFormatter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import { ReferenceType } from "../Type/ReferenceType";
import { TypeFormatter } from "../TypeFormatter";

export class ReferenceTypeFormatter implements SubTypeFormatter {
public constructor(protected childTypeFormatter: TypeFormatter, protected encodeRefs: boolean) {}
public constructor(
protected childTypeFormatter: TypeFormatter,
protected encodeRefs: boolean
) {}

public supportsType(type: ReferenceType): boolean {
return type instanceof ReferenceType;
Expand Down
5 changes: 4 additions & 1 deletion src/TypeFormatter/UnionTypeFormatter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ import { uniqueArray } from "../Utils/uniqueArray";
type DiscriminatorType = "json-schema" | "open-api";

export class UnionTypeFormatter implements SubTypeFormatter {
public constructor(protected childTypeFormatter: TypeFormatter, private discriminatorType?: DiscriminatorType) {}
public constructor(
protected childTypeFormatter: TypeFormatter,
private discriminatorType?: DiscriminatorType
) {}

public supportsType(type: UnionType): boolean {
return type instanceof UnionType;
Expand Down

0 comments on commit c4805fc

Please sign in to comment.