Skip to content

Commit 08dbfa0

Browse files
Code-HexCode-Hex
committed
lint-fix
1 parent d7751ef commit 08dbfa0

File tree

10 files changed

+75
-86
lines changed

10 files changed

+75
-86
lines changed

‎src/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ export interface ValidationSchemaPluginConfig extends TypeScriptPluginConfig {
211211
* withInterfaceType: true
212212
* ```
213213
*/
214-
withInterfaceType?: boolean;
214+
withInterfaceType?: boolean
215215
/**
216216
* @description Specify validation schema export type.
217217
* @default function

‎src/graphql.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,15 @@ export function ObjectTypeDefinitionBuilder(useObjectTypes: boolean | undefined,
3737
};
3838
}
3939

40-
export const InterfaceTypeDefinitionBuilder = (
41-
useInterfaceTypes: boolean | undefined,
42-
callback: InterfaceTypeDefinitionFn
43-
): InterfaceTypeDefinitionFn | undefined => {
44-
if (!useInterfaceTypes) return undefined;
45-
return node => {
40+
export function InterfaceTypeDefinitionBuilder(useInterfaceTypes: boolean | undefined, callback: InterfaceTypeDefinitionFn): InterfaceTypeDefinitionFn | undefined {
41+
if (!useInterfaceTypes)
42+
return undefined;
43+
return (node) => {
4644
return callback(node);
4745
};
48-
};
46+
}
4947

50-
export const topologicalSortAST = (schema: GraphQLSchema, ast: DocumentNode): DocumentNode => {
48+
export function topologicalSortAST(schema: GraphQLSchema, ast: DocumentNode): DocumentNode {
5149
const dependencyGraph = new Graph();
5250
const targetKinds = [
5351
'ObjectTypeDefinition',

‎src/myzod/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ import {
1818
import type { ValidationSchemaPluginConfig } from '../config';
1919
import { buildApi, formatDirectiveConfig } from '../directive';
2020
import { BaseSchemaVisitor } from '../schema_visitor';
21-
import { Visitor } from '../visitor';
21+
import type { Visitor } from '../visitor';
2222
import {
2323
InterfaceTypeDefinitionBuilder,
24+
ObjectTypeDefinitionBuilder,
2425
isInput,
2526
isListType,
2627
isNamedType,
2728
isNonNullType,
28-
ObjectTypeDefinitionBuilder,
2929
} from './../graphql';
3030

3131
const anySchema = `definedNonNullAnySchema`;
@@ -70,7 +70,7 @@ export class MyZodSchemaVisitor extends BaseSchemaVisitor {
7070

7171
// Building schema for field arguments.
7272
const argumentBlocks = this.buildTypeDefinitionArguments(node, visitor);
73-
const appendArguments = argumentBlocks ? '\n' + argumentBlocks : '';
73+
const appendArguments = argumentBlocks ? `\n${argumentBlocks}` : '';
7474

7575
// Building schema for fields.
7676
const shape = node.fields?.map(field => generateFieldMyZodSchema(this.config, visitor, field, 2)).join(',\n');
@@ -108,7 +108,7 @@ export class MyZodSchemaVisitor extends BaseSchemaVisitor {
108108

109109
// Building schema for field arguments.
110110
const argumentBlocks = this.buildTypeDefinitionArguments(node, visitor);
111-
const appendArguments = argumentBlocks ? '\n' + argumentBlocks : '';
111+
const appendArguments = argumentBlocks ? `\n${argumentBlocks}` : '';
112112

113113
// Building schema for fields.
114114
const shape = node.fields?.map(field => generateFieldMyZodSchema(this.config, visitor, field, 2)).join(',\n');
@@ -329,9 +329,9 @@ function generateNameNodeMyZodSchema(config: ValidationSchemaPluginConfig, visit
329329
case 'ScalarTypeDefinition':
330330
return myzod4Scalar(config, visitor, node.value);
331331
default:
332-
if (converter?.targetKind) {
332+
if (converter?.targetKind)
333333
console.warn('Unknown target kind', converter.targetKind);
334-
}
334+
335335
return myzod4Scalar(config, visitor, node.value);
336336
}
337337
}

‎src/schema_visitor.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {
1+
import type {
22
FieldDefinitionNode,
33
GraphQLSchema,
44
InputValueDefinitionNode,
@@ -47,7 +47,7 @@ export abstract class BaseSchemaVisitor implements SchemaVisitor {
4747

4848
protected buildTypeDefinitionArguments(
4949
node: ObjectTypeDefinitionNode | InterfaceTypeDefinitionNode,
50-
visitor: Visitor
50+
visitor: Visitor,
5151
) {
5252
return visitor.buildArgumentsSchemaBlock(node, (typeName, field) => {
5353
this.importTypes.push(typeName);

‎src/visitor.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import { TsVisitor } from '@graphql-codegen/typescript';
2-
import {
2+
import type {
33
FieldDefinitionNode,
44
GraphQLSchema,
55
InterfaceTypeDefinitionNode,
66
NameNode,
77
ObjectTypeDefinitionNode,
8+
} from 'graphql';
9+
import {
810
specifiedScalarTypes,
911
} from 'graphql';
1012

@@ -40,13 +42,13 @@ export class Visitor extends TsVisitor {
4042
}
4143

4244
public getScalarType(scalarName: string): string | null {
43-
if (this.scalarDirection === 'both') {
45+
if (this.scalarDirection === 'both')
4446
return null;
45-
}
47+
4648
const scalar = this.scalars[scalarName];
47-
if (!scalar) {
49+
if (!scalar)
4850
throw new Error(`Unknown scalar ${scalarName}`);
49-
}
51+
5052
return scalar[this.scalarDirection];
5153
}
5254

@@ -64,7 +66,7 @@ export class Visitor extends TsVisitor {
6466

6567
public buildArgumentsSchemaBlock(
6668
node: ObjectTypeDefinitionNode | InterfaceTypeDefinitionNode,
67-
callback: (typeName: string, field: FieldDefinitionNode) => string
69+
callback: (typeName: string, field: FieldDefinitionNode) => string,
6870
) {
6971
const fieldsWithArguments = node.fields?.filter(field => field.arguments && field.arguments.length > 0) ?? [];
7072
if (fieldsWithArguments.length === 0)

‎src/yup/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ import {
1818
import type { ValidationSchemaPluginConfig } from '../config';
1919
import { buildApi, formatDirectiveConfig } from '../directive';
2020
import { BaseSchemaVisitor } from '../schema_visitor';
21-
import { Visitor } from '../visitor';
21+
import type { Visitor } from '../visitor';
2222
import {
2323
InterfaceTypeDefinitionBuilder,
24+
ObjectTypeDefinitionBuilder,
2425
isInput,
2526
isListType,
2627
isNamedType,
2728
isNonNullType,
28-
ObjectTypeDefinitionBuilder,
2929
} from './../graphql';
3030

3131
export class YupSchemaVisitor extends BaseSchemaVisitor {
@@ -77,11 +77,11 @@ export class YupSchemaVisitor extends BaseSchemaVisitor {
7777

7878
// Building schema for field arguments.
7979
const argumentBlocks = this.buildTypeDefinitionArguments(node, visitor);
80-
const appendArguments = argumentBlocks ? '\n' + argumentBlocks : '';
80+
const appendArguments = argumentBlocks ? `\n${argumentBlocks}` : '';
8181

8282
// Building schema for fields.
8383
const shape = node.fields
84-
?.map(field => {
84+
?.map((field) => {
8585
const fieldSchema = generateFieldYupSchema(this.config, visitor, field, 2);
8686
return isNonNullType(field.type) ? fieldSchema : `${fieldSchema}.optional()`;
8787
})
@@ -120,7 +120,7 @@ export class YupSchemaVisitor extends BaseSchemaVisitor {
120120

121121
// Building schema for field arguments.
122122
const argumentBlocks = this.buildTypeDefinitionArguments(node, visitor);
123-
const appendArguments = argumentBlocks ? '\n' + argumentBlocks : '';
123+
const appendArguments = argumentBlocks ? `\n${argumentBlocks}` : '';
124124

125125
// Building schema for fields.
126126
const shape = shapeFields(node.fields, this.config, visitor);

‎src/zod/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ import {
1818
import type { ValidationSchemaPluginConfig } from '../config';
1919
import { buildApi, formatDirectiveConfig } from '../directive';
2020
import { BaseSchemaVisitor } from '../schema_visitor';
21-
import { Visitor } from '../visitor';
21+
import type { Visitor } from '../visitor';
2222
import {
2323
InterfaceTypeDefinitionBuilder,
24+
ObjectTypeDefinitionBuilder,
2425
isInput,
2526
isListType,
2627
isNamedType,
2728
isNonNullType,
28-
ObjectTypeDefinitionBuilder,
2929
} from './../graphql';
3030

3131
const anySchema = `definedNonNullAnySchema`;
@@ -86,7 +86,7 @@ export class ZodSchemaVisitor extends BaseSchemaVisitor {
8686

8787
// Building schema for field arguments.
8888
const argumentBlocks = this.buildTypeDefinitionArguments(node, visitor);
89-
const appendArguments = argumentBlocks ? '\n' + argumentBlocks : '';
89+
const appendArguments = argumentBlocks ? `\n${argumentBlocks}` : '';
9090

9191
// Building schema for fields.
9292
const shape = node.fields?.map(field => generateFieldZodSchema(this.config, visitor, field, 2)).join(',\n');
@@ -124,7 +124,7 @@ export class ZodSchemaVisitor extends BaseSchemaVisitor {
124124

125125
// Building schema for field arguments.
126126
const argumentBlocks = this.buildTypeDefinitionArguments(node, visitor);
127-
const appendArguments = argumentBlocks ? '\n' + argumentBlocks : '';
127+
const appendArguments = argumentBlocks ? `\n${argumentBlocks}` : '';
128128

129129
// Building schema for fields.
130130
const shape = node.fields?.map(field => generateFieldZodSchema(this.config, visitor, field, 2)).join(',\n');
@@ -342,9 +342,9 @@ function generateNameNodeZodSchema(config: ValidationSchemaPluginConfig, visitor
342342
case 'ScalarTypeDefinition':
343343
return zod4Scalar(config, visitor, node.value);
344344
default:
345-
if (converter?.targetKind) {
345+
if (converter?.targetKind)
346346
console.warn('Unknown targetKind', converter?.targetKind);
347-
}
347+
348348
return zod4Scalar(config, visitor, node.value);
349349
}
350350
}

‎tests/myzod.spec.ts

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ describe('myzod', () => {
500500
{
501501
schema: 'myzod',
502502
},
503-
{}
503+
{},
504504
);
505505
expect(result.content).not.toContain('export function UserSchema(): myzod.Type<User> {');
506506
});
@@ -518,19 +518,18 @@ describe('myzod', () => {
518518
schema: 'myzod',
519519
withInterfaceType: true,
520520
},
521-
{}
521+
{},
522522
);
523523
const wantContains = [
524524
'export function BookSchema(): myzod.Type<Book> {',
525525
'title: myzod.string().optional().nullable()',
526526
];
527-
const wantNotContains = ["__typename: myzod.literal('Book')"];
528-
for (const wantContain of wantContains) {
527+
const wantNotContains = ['__typename: myzod.literal(\'Book\')'];
528+
for (const wantContain of wantContains)
529529
expect(result.content).toContain(wantContain);
530-
}
531-
for (const wantNotContain of wantNotContains) {
530+
531+
for (const wantNotContain of wantNotContains)
532532
expect(result.content).not.toContain(wantNotContain);
533-
}
534533
});
535534

536535
it('generate interface type contains interface type', async () => {
@@ -552,7 +551,7 @@ describe('myzod', () => {
552551
schema: 'myzod',
553552
withInterfaceType: true,
554553
},
555-
{}
554+
{},
556555
);
557556
const wantContains = [
558557
'export function AuthorSchema(): myzod.Type<Author> {',
@@ -563,9 +562,8 @@ describe('myzod', () => {
563562
'author: AuthorSchema().optional().nullable(),',
564563
'title: myzod.string().optional().nullable()',
565564
];
566-
for (const wantContain of wantContains) {
565+
for (const wantContain of wantContains)
567566
expect(result.content).toContain(wantContain);
568-
}
569567
});
570568
it('generate object type contains interface type', async () => {
571569
const schema = buildSchema(/* GraphQL */ `
@@ -599,7 +597,7 @@ describe('myzod', () => {
599597
withInterfaceType: true,
600598
withObjectType: true,
601599
},
602-
{}
600+
{},
603601
);
604602
const wantContains = [
605603
[
@@ -614,7 +612,7 @@ describe('myzod', () => {
614612
[
615613
'export function TextbookSchema(): myzod.Type<Textbook> {',
616614
'return myzod.object({',
617-
"__typename: myzod.literal('Textbook').optional(),",
615+
'__typename: myzod.literal(\'Textbook\').optional(),',
618616
'title: myzod.string(),',
619617
'author: AuthorSchema(),',
620618
'courses: myzod.array(myzod.string())',
@@ -625,7 +623,7 @@ describe('myzod', () => {
625623
[
626624
'export function ColoringBookSchema(): myzod.Type<ColoringBook> {',
627625
'return myzod.object({',
628-
"__typename: myzod.literal('ColoringBook').optional(),",
626+
'__typename: myzod.literal(\'ColoringBook\').optional(),',
629627
'title: myzod.string(),',
630628
'author: AuthorSchema(),',
631629
'colors: myzod.array(myzod.string())',
@@ -636,17 +634,16 @@ describe('myzod', () => {
636634
[
637635
'export function AuthorSchema(): myzod.Type<Author> {',
638636
'return myzod.object({',
639-
"__typename: myzod.literal('Author').optional()",
637+
'__typename: myzod.literal(\'Author\').optional()',
640638
'books: myzod.array(BookSchema()).optional().nullable()',
641639
'name: myzod.string().optional().nullable()',
642640
'})',
643641
'}',
644642
],
645643
];
646644
for (const wantContain of wantContains) {
647-
for (const wantContainLine of wantContain) {
645+
for (const wantContainLine of wantContain)
648646
expect(result.content).toContain(wantContainLine);
649-
}
650647
}
651648
});
652649
});

0 commit comments

Comments
 (0)