lint-fix

Author: Code-Hex

.github/renovate.json

@@ -9,4 +9,4 @@
   "dependencyDashboard": false,
   "onboarding": false,
   "prConcurrentLimit": 5
-}
+}

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: current
-          cache: 'pnpm'
+          cache: pnpm
       - run: pnpm install --frozen-lockfile
       - run: pnpm test
         env:
@@ -32,7 +32,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: current
-          cache: 'pnpm'
+          cache: pnpm
       - run: pnpm install --frozen-lockfile
       - run: pnpm lint-fix
       - name: Auto commit fixed code

.github/workflows/issues.yml

@@ -1,4 +1,4 @@
-name: 'good first issue'
+name: good first issue
 on: [issues]
 
 jobs:

README.md

@@ -239,7 +239,7 @@ generates:
         constraint:
           minLength: min
           # Replace $1 with specified `startsWith` argument value of the constraint directive
-          startsWith: ["matches", "/^$1/"]
+          startsWith: [matches, /^$1/]
           format:
             email: email
 ```
@@ -249,7 +249,7 @@ Then generates yup validation schema like below.
 ```ts
 export function ExampleInputSchema(): yup.SchemaOf<ExampleInput> {
   return yup.object({
-    email: yup.string().defined().required("Hello, World!").min(50).email(),
+    email: yup.string().defined().required('Hello, World!').min(50).email(),
     message: yup.string().defined().matches(/^Hello/)
   })
 }
@@ -277,7 +277,7 @@ generates:
         constraint:
           minLength: min
           # Replace $1 with specified `startsWith` argument value of the constraint directive
-          startsWith: ["regex", "/^$1/", "message"]
+          startsWith: [regex, /^$1/, message]
           format:
             email: email
 ```
@@ -288,7 +288,7 @@ Then generates zod validation schema like below.
 export function ExampleInputSchema(): z.ZodSchema<ExampleInput> {
   return z.object({
     email: z.string().min(50).email(),
-    message: z.string().regex(/^Hello/, "message")
+    message: z.string().regex(/^Hello/, 'message')
   })
 }
 ```
@@ -310,4 +310,4 @@ generates:
     preset: 'client',
       plugins:
       ...
-```
+```

codegen.yml

@@ -1,5 +1,5 @@
 overwrite: true
-schema: './example/test.graphql'
+schema: ./example/test.graphql
 generates:
   example/types.ts:
     plugins:
@@ -21,11 +21,11 @@ generates:
             constraint:
               minLength: min # same as ['min', '$1']
               maxLength: max
-              startsWith: ['matches', '/^$1/']
-              endsWith: ['matches', '/$1$/']
-              contains: ['matches', '/$1/']
-              notContains: ['matches', '/^((?!$1).)*$/']
-              pattern: ['matches', '/$1/']
+              startsWith: [matches, /^$1/]
+              endsWith: [matches, /$1$/]
+              contains: [matches, /$1/]
+              notContains: [matches, '/^((?!$1).)*$/']
+              pattern: [matches, /$1/]
               format:
                 # For example, `@constraint(format: "uri")`. this case $1 will be "uri".
                 # Therefore the generator generates yup schema `.url()` followed by `uri: 'url'`
@@ -37,8 +37,8 @@ generates:
                 # you need to add the logic using `yup.addMethod`.
                 # see: https://github.com/jquense/yup#addmethodschematype-schema-name-string-method--schema-void
                 ipv4: ipv4
-              min: ['min', '$1 - 1']
-              max: ['max', '$1 + 1']
+              min: [min, $1 - 1]
+              max: [max, '$1 + 1']
               exclusiveMin: min
               exclusiveMax: max
           scalars:
@@ -61,7 +61,7 @@ generates:
             constraint:
               minLength: min
               # Replace $1 with specified `startsWith` argument value of the constraint directive
-              startsWith: ['regex', '/^$1/', 'message']
+              startsWith: [regex, /^$1/, message]
               format:
                 email: email
           scalars:
@@ -76,7 +76,7 @@ generates:
             constraint:
               minLength: min
               # Replace $1 with specified `startsWith` argument value of the constraint directive
-              startsWith: ['pattern', '/^$1/']
+              startsWith: [pattern, /^$1/]
               format:
                 email: email
           scalars:

eslint.config.mjs

@@ -9,5 +9,8 @@ export default antfu({
     'example/**',
     'vitest.config.ts',
     'tsconfig.json',
+    'README.md',
   ],
+}, {
+  rules: { 'style/semi': 'off' },
 })

package.json

@@ -6,21 +6,40 @@
     "type": "git",
     "url": "https://github.com/Code-Hex/graphql-codegen-typescript-validation-schema.git"
   },
-  "main": "dist/main/index.js",
-  "typings": "dist/types/index.d.ts",
-  "module": "dist/module/index.js",
+  "author": "codehex",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/Code-Hex/graphql-codegen-typescript-validation-schema/issues"
+  },
+  "keywords": [
+    "gql",
+    "generator",
+    "yup",
+    "zod",
+    "code",
+    "types",
+    "graphql",
+    "codegen",
+    "apollo",
+    "node",
+    "types",
+    "typings"
+  ],
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
       "import": "./dist/module/index.js",
       "require": "./dist/main/index.js"
     }
   },
+  "main": "dist/main/index.js",
+  "typings": "dist/types/index.d.ts",
+  "module": "dist/module/index.js",
   "files": [
-    "dist/**/*.{js,ts}",
     "!**/*.tsbuildinfo",
     "LICENSE",
-    "README.md"
+    "README.md",
+    "dist/**/*.{js,ts}"
   ],
   "scripts": {
     "type-check": "tsc --noEmit",
@@ -32,27 +51,22 @@
     "build:main": "tsc -p tsconfig.main.json",
     "build:module": "tsc -p tsconfig.module.json",
     "build:types": "tsc -p tsconfig.types.json",
-    "lint": "eslint --ext .ts .",
-    "lint-fix": "eslint --fix --ext .ts .",
+    "lint": "eslint .",
+    "lint-fix": "eslint . --fix",
     "generate": "run-p build:* && graphql-codegen",
     "prepublish": "run-p build:*"
   },
-  "keywords": [
-    "gql",
-    "generator",
-    "yup",
-    "zod",
-    "code",
-    "types",
-    "graphql",
-    "codegen",
-    "apollo",
-    "node",
-    "types",
-    "typings"
-  ],
-  "author": "codehex",
-  "license": "MIT",
+  "peerDependencies": {
+    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
+  },
+  "dependencies": {
+    "@graphql-codegen/plugin-helpers": "^5.0.0",
+    "@graphql-codegen/schema-ast": "4.0.2",
+    "@graphql-codegen/visitor-plugin-common": "^5.0.0",
+    "@graphql-tools/utils": "^10.0.0",
+    "graphlib": "^2.1.8",
+    "graphql": "^16.6.0"
+  },
   "devDependencies": {
     "@antfu/eslint-config": "^2.12.2",
     "@graphql-codegen/cli": "5.0.2",
@@ -70,19 +84,5 @@
     "vitest": "^1.0.0",
     "yup": "1.4.0",
     "zod": "3.22.4"
-  },
-  "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^5.0.0",
-    "@graphql-codegen/schema-ast": "4.0.2",
-    "@graphql-codegen/visitor-plugin-common": "^5.0.0",
-    "@graphql-tools/utils": "^10.0.0",
-    "graphlib": "^2.1.8",
-    "graphql": "^16.6.0"
-  },
-  "peerDependencies": {
-    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
-  },
-  "bugs": {
-    "url": "https://github.com/Code-Hex/graphql-codegen-typescript-validation-schema/issues"
   }
 }

src/config.ts

@@ -1,20 +1,20 @@
-import { TypeScriptPluginConfig } from '@graphql-codegen/typescript';
+import type { TypeScriptPluginConfig } from '@graphql-codegen/typescript';
 
 export type ValidationSchema = 'yup' | 'zod' | 'myzod';
 export type ValidationSchemaExportType = 'function' | 'const';
 
 export interface DirectiveConfig {
   [directive: string]: {
-    [argument: string]: string | string[] | DirectiveObjectArguments;
-  };
+    [argument: string]: string | string[] | DirectiveObjectArguments
+  }
 }
 
 export interface DirectiveObjectArguments {
-  [matched: string]: string | string[];
+  [matched: string]: string | string[]
 }
 
 interface ScalarSchemas {
-  [name: string]: string;
+  [name: string]: string
 }
 
 export interface ValidationSchemaPluginConfig extends TypeScriptPluginConfig {
@@ -33,7 +33,7 @@ export interface ValidationSchemaPluginConfig extends TypeScriptPluginConfig {
    *       schema: yup
    * ```
    */
-  schema?: ValidationSchema;
+  schema?: ValidationSchema
   /**
    * @description import types from generated typescript type path
    * if not given, omit import statement.
@@ -52,7 +52,7 @@ export interface ValidationSchemaPluginConfig extends TypeScriptPluginConfig {
    *       importFrom: ./path/to/types
    * ```
    */
-  importFrom?: string;
+  importFrom?: string
   /**
    * @description Will use `import type {}` rather than `import {}` when importing generated typescript types.
    * This gives compatibility with TypeScript's "importsNotUsedAsValues": "error" option
@@ -74,7 +74,7 @@ export interface ValidationSchemaPluginConfig extends TypeScriptPluginConfig {
    *       useTypeImports: true
    * ```
    */
-  useTypeImports?: boolean;
+  useTypeImports?: boolean
   /**
    * @description Prefixes all import types from generated typescript type.
    * @default ""
@@ -93,7 +93,7 @@ export interface ValidationSchemaPluginConfig extends TypeScriptPluginConfig {
    *       importFrom: ./path/to/types
    * ```
    */
-  typesPrefix?: string;
+  typesPrefix?: string
   /**
    * @description Suffixes all import types from generated typescript type.
    * @default ""
@@ -112,7 +112,7 @@ export interface ValidationSchemaPluginConfig extends TypeScriptPluginConfig {
    *       importFrom: ./path/to/types
    * ```
    */
-  typesSuffix?: string;
+  typesSuffix?: string
   /**
    * @description Generates validation schema for enum as TypeScript `type`
    * @default false
@@ -137,7 +137,7 @@ export interface ValidationSchemaPluginConfig extends TypeScriptPluginConfig {
    *       enumsAsTypes: true
    * ```
    */
-  enumsAsTypes?: boolean;
+  enumsAsTypes?: boolean
   /**
    * @description Generates validation string schema as do not allow empty characters by default.
    * @default false
@@ -152,7 +152,7 @@ export interface ValidationSchemaPluginConfig extends TypeScriptPluginConfig {
    *       notAllowEmptyString: true
    * ```
    */
-  notAllowEmptyString?: boolean;
+  notAllowEmptyString?: boolean
   /**
    * @description Extends or overrides validation schema for the built-in scalars and custom GraphQL scalars.
    *
@@ -174,7 +174,7 @@ export interface ValidationSchemaPluginConfig extends TypeScriptPluginConfig {
    *     Email: z.string().email()
    * ```
    */
-  scalarSchemas?: ScalarSchemas;
+  scalarSchemas?: ScalarSchemas
   /**
    * @description Generates validation schema with GraphQL type objects.
    * but excludes "Query", "Mutation", "Subscription" objects.
@@ -193,7 +193,7 @@ export interface ValidationSchemaPluginConfig extends TypeScriptPluginConfig {
    *       withObjectType: true
    * ```
    */
-  withObjectType?: boolean;
+  withObjectType?: boolean
   /**
    * @description Specify validation schema export type.
    * @default function
@@ -209,7 +209,7 @@ export interface ValidationSchemaPluginConfig extends TypeScriptPluginConfig {
    *       validationSchemaExportType: const
    * ```
    */
-  validationSchemaExportType?: ValidationSchemaExportType;
+  validationSchemaExportType?: ValidationSchemaExportType
   /**
    * @description Generates validation schema with more API based on directive schema.
    * @exampleMarkdown
@@ -250,5 +250,5 @@ export interface ValidationSchemaPluginConfig extends TypeScriptPluginConfig {
    *           exclusiveMax: max
    * ```
    */
-  directives?: DirectiveConfig;
+  directives?: DirectiveConfig
 }