Skip to content

added simple-import-sort #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 8, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -12,10 +12,17 @@
"ecmaVersion": "latest"
},
"plugins": [
"@typescript-eslint"
"@typescript-eslint",
"simple-import-sort",
"import"
],
"rules": {
"@typescript-eslint/no-explicit-any": "off"
"@typescript-eslint/no-explicit-any": "off",
"simple-import-sort/imports": "error",
"simple-import-sort/exports": "error",
"import/first": "error",
"import/newline-after-import": "error",
"import/no-duplicates": "error"
},
"overrides": [
{
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -56,6 +56,8 @@
"@typescript-eslint/eslint-plugin": "5.59.9",
"@typescript-eslint/parser": "5.59.9",
"eslint": "8.42.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-simple-import-sort": "^10.0.0",
"jest": "29.5.0",
"myzod": "1.10.0",
"npm-run-all": "4.1.5",
1 change: 1 addition & 0 deletions src/directive.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ConstArgumentNode, ConstDirectiveNode, ConstValueNode, Kind, valueFromASTUntyped } from 'graphql';

import { DirectiveConfig, DirectiveObjectArguments } from './config';
import { isConvertableRegexp } from './regexp';

16 changes: 8 additions & 8 deletions src/graphql.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { Graph } from 'graphlib';
import {
ASTNode,
DefinitionNode,
DocumentNode,
GraphQLSchema,
ListTypeNode,
NonNullTypeNode,
NamedTypeNode,
TypeNode,
NameNode,
NonNullTypeNode,
ObjectTypeDefinitionNode,
TypeNode,
visit,
DocumentNode,
DefinitionNode,
NameNode,
ASTNode,
GraphQLSchema,
} from 'graphql';
import { Graph } from 'graphlib';

export const isListType = (typ?: TypeNode): typ is ListTypeNode => typ?.kind === 'ListType';
export const isNonNullType = (typ?: TypeNode): typ is NonNullTypeNode => typ?.kind === 'NonNullType';
13 changes: 7 additions & 6 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { ZodSchemaVisitor } from './zod/index';
import { MyZodSchemaVisitor } from './myzod/index';
import { transformSchemaAST } from '@graphql-codegen/schema-ast';
import { YupSchemaVisitor } from './yup/index';
import { ValidationSchemaPluginConfig } from './config';
import { PluginFunction, Types } from '@graphql-codegen/plugin-helpers';
import { transformSchemaAST } from '@graphql-codegen/schema-ast';
import { GraphQLSchema, visit } from 'graphql';
import { SchemaVisitor } from './types';

import { ValidationSchemaPluginConfig } from './config';
import { topologicalSortAST } from './graphql';
import { MyZodSchemaVisitor } from './myzod/index';
import { SchemaVisitor } from './types';
import { YupSchemaVisitor } from './yup/index';
import { ZodSchemaVisitor } from './zod/index';

export const plugin: PluginFunction<ValidationSchemaPluginConfig, Types.ComplexPluginOutput> = (
schema: GraphQLSchema,
3 changes: 2 additions & 1 deletion src/myzod/index.ts
Original file line number Diff line number Diff line change
@@ -10,11 +10,12 @@ import {
TypeNode,
UnionTypeDefinitionNode,
} from 'graphql';

import { ValidationSchemaPluginConfig } from '../config';
import { buildApi, formatDirectiveConfig } from '../directive';
import { SchemaVisitor } from '../types';
import { Visitor } from '../visitor';
import { ObjectTypeDefinitionBuilder, isInput, isListType, isNamedType, isNonNullType } from './../graphql';
import { isInput, isListType, isNamedType, isNonNullType, ObjectTypeDefinitionBuilder } from './../graphql';

const importZod = `import * as myzod from 'myzod'`;
const anySchema = `definedNonNullAnySchema`;
5 changes: 3 additions & 2 deletions src/visitor.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ValidationSchemaPluginConfig } from './config';
import { TsVisitor } from '@graphql-codegen/typescript';
import { NameNode, GraphQLSchema } from 'graphql';
import { GraphQLSchema, NameNode } from 'graphql';

import { ValidationSchemaPluginConfig } from './config';

export class Visitor extends TsVisitor {
constructor(
3 changes: 2 additions & 1 deletion src/yup/index.ts
Original file line number Diff line number Diff line change
@@ -10,11 +10,12 @@ import {
TypeNode,
UnionTypeDefinitionNode,
} from 'graphql';

import { ValidationSchemaPluginConfig } from '../config';
import { buildApi, formatDirectiveConfig } from '../directive';
import { SchemaVisitor } from '../types';
import { Visitor } from '../visitor';
import { ObjectTypeDefinitionBuilder, isInput, isListType, isNamedType, isNonNullType } from './../graphql';
import { isInput, isListType, isNamedType, isNonNullType, ObjectTypeDefinitionBuilder } from './../graphql';

const importYup = `import * as yup from 'yup'`;

3 changes: 2 additions & 1 deletion src/zod/index.ts
Original file line number Diff line number Diff line change
@@ -10,11 +10,12 @@ import {
TypeNode,
UnionTypeDefinitionNode,
} from 'graphql';

import { ValidationSchemaPluginConfig } from '../config';
import { buildApi, formatDirectiveConfig } from '../directive';
import { SchemaVisitor } from '../types';
import { Visitor } from '../visitor';
import { ObjectTypeDefinitionBuilder, isInput, isListType, isNamedType, isNonNullType } from './../graphql';
import { isInput, isListType, isNamedType, isNonNullType, ObjectTypeDefinitionBuilder } from './../graphql';

const importZod = `import { z } from 'zod'`;
const anySchema = `definedNonNullAnySchema`;
11 changes: 6 additions & 5 deletions tests/directive.spec.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { ConstArgumentNode, ConstDirectiveNode, ConstValueNode, Kind, NameNode, parseConstValue } from 'graphql';

import { DirectiveConfig, DirectiveObjectArguments } from '../src/config';
import {
FormattedDirectiveConfig,
FormattedDirectiveObjectArguments,
buildApi,
exportedForTesting,
formatDirectiveConfig,
formatDirectiveObjectArguments,
FormattedDirectiveArguments,
exportedForTesting,
buildApi,
FormattedDirectiveConfig,
FormattedDirectiveObjectArguments,
} from '../src/directive';
import { ConstArgumentNode, ConstDirectiveNode, ConstValueNode, Kind, NameNode, parseConstValue } from 'graphql';

const { applyArgToApiSchemaTemplate, buildApiFromDirectiveObjectArguments, buildApiFromDirectiveArguments } =
exportedForTesting;
5 changes: 3 additions & 2 deletions tests/graphql.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { Kind, ObjectTypeDefinitionNode, buildSchema, parse, print } from 'graphql';
import { ObjectTypeDefinitionBuilder, topsort, topologicalSortAST } from '../src/graphql';
import { Graph } from 'graphlib';
import { buildSchema, Kind, ObjectTypeDefinitionNode, parse, print } from 'graphql';
import dedent from 'ts-dedent';

import { ObjectTypeDefinitionBuilder, topologicalSortAST, topsort } from '../src/graphql';

describe('graphql', () => {
describe('ObjectTypeDefinitionBuilder', () => {
describe('useObjectTypes === true', () => {
1 change: 1 addition & 0 deletions tests/myzod.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { buildSchema } from 'graphql';

import { plugin } from '../src/index';

describe('myzod', () => {
1 change: 1 addition & 0 deletions tests/yup.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { buildSchema } from 'graphql';

import { plugin } from '../src/index';

describe('yup', () => {
1 change: 1 addition & 0 deletions tests/zod.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { buildSchema } from 'graphql';

import { plugin } from '../src/index';

describe('zod', () => {
407 changes: 404 additions & 3 deletions yarn.lock

Large diffs are not rendered by default.