Merge branch 'Code-Hex:main' into main

Author: elijaholmos

package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-codegen-typescript-validation-schema",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "GraphQL Code Generator plugin to generate form validation schema from your GraphQL schema",
   "respository": {
     "type": "git",
@@ -47,18 +47,18 @@
     "@graphql-codegen/cli": "2.12.0",
     "@graphql-codegen/typescript": "2.7.3",
     "@tsconfig/recommended": "1.0.1",
-    "@types/jest": "28.1.8",
-    "@typescript-eslint/eslint-plugin": "5.35.1",
-    "@typescript-eslint/parser": "5.35.1",
-    "eslint": "8.23.0",
-    "jest": "29.0.1",
+    "@types/jest": "29.0.3",
+    "@typescript-eslint/eslint-plugin": "5.37.0",
+    "@typescript-eslint/parser": "5.37.0",
+    "eslint": "8.23.1",
+    "jest": "29.0.3",
     "myzod": "1.8.8",
     "npm-run-all": "4.1.5",
     "prettier": "2.7.1",
-    "ts-jest": "28.0.8",
-    "typescript": "4.7.4",
+    "ts-jest": "29.0.1",
+    "typescript": "4.8.3",
     "yup": "0.32.11",
-    "zod": "3.18.0"
+    "zod": "3.19.1"
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.3.2",

src/directive.ts

@@ -162,7 +162,7 @@ const applyArgToApiSchemaTemplate = (template: string, apiArgs: any[]): string =
     const placeholder = match[0]; // `$1`
     const idx = parseInt(match[1], 10) - 1; // start with `1 - 1`
     const apiArg = apiArgs[idx];
-    if (!apiArg) {
+    if (apiArg === undefined) {
       template = template.replace(placeholder, '');
       continue;
     }

src/graphql.ts

@@ -14,7 +14,7 @@ export const ObjectTypeDefinitionBuilder = (
 ): ObjectTypeDefinitionFn | undefined => {
   if (!useObjectTypes) return undefined;
   return node => {
-    if (/^Query|Mutation|Subscription$/.test(node.name.value)) {
+    if (/^(Query|Mutation|Subscription)$/.test(node.name.value)) {
       return;
     }
     return callback(node);

tests/graphql.spec.ts

@@ -0,0 +1,46 @@
+import { Kind, ObjectTypeDefinitionNode } from 'graphql';
+import { ObjectTypeDefinitionBuilder } from '../src/graphql';
+
+describe('graphql', () => {
+  describe('ObjectTypeDefinitionBuilder', () => {
+    describe('useObjectTypes === true', () => {
+      test.each([
+        ['Query', false],
+        ['Mutation', false],
+        ['Subscription', false],
+        ['QueryFoo', true],
+        ['MutationFoo', true],
+        ['SubscriptionFoo', true],
+        ['FooQuery', true],
+        ['FooMutation', true],
+        ['FooSubscription', true],
+        ['Foo', true],
+      ])(`A node with a name of "%s" should be matched? %s`, (nodeName, nodeIsMatched) => {
+        const node: ObjectTypeDefinitionNode = {
+          name: {
+            kind: Kind.NAME,
+            value: nodeName,
+          },
+          kind: Kind.OBJECT_TYPE_DEFINITION,
+        };
+
+        const objectTypeDefFn = ObjectTypeDefinitionBuilder(true, (n: ObjectTypeDefinitionNode) => n);
+
+        expect(objectTypeDefFn).toBeDefined();
+
+        if (nodeIsMatched) {
+          expect(objectTypeDefFn?.(node)).toBe(node);
+        } else {
+          expect(objectTypeDefFn?.(node)).toBeUndefined();
+        }
+      });
+    });
+
+    describe('useObjectTypes === false', () => {
+      test('should not return an ObjectTypeDefinitionFn', () => {
+        const objectTypeDefFn = ObjectTypeDefinitionBuilder(false, (n: ObjectTypeDefinitionNode) => n);
+        expect(objectTypeDefFn).toBeUndefined();
+      });
+    });
+  });
+});

tests/myzod.spec.ts

@@ -626,4 +626,38 @@ describe('myzod', () => {
       }
     });
   });
+
+  it('properly generates custom directive values', async () => {
+    const schema = buildSchema(/* GraphQL */ `
+      input UserCreateInput {
+        name: String! @constraint(startsWith: "Sir")
+        age: Int! @constraint(min: 0, max: 100)
+      }
+      directive @constraint(startsWith: String, min: Int, max: Int) on INPUT_FIELD_DEFINITION
+    `);
+    const result = await plugin(
+      schema,
+      [],
+      {
+        schema: 'myzod',
+        directives: {
+          constraint: {
+            min: 'min',
+            max: 'max',
+            startsWith: ['pattern', '/^$1/'],
+          },
+        },
+      },
+      {}
+    );
+    const wantContains = [
+      // User Create Input
+      'export function UserCreateInputSchema(): myzod.Type<UserCreateInput> {',
+      'name: myzod.string().pattern(/^Sir/),',
+      'age: myzod.number().min(0).max(100)',
+    ];
+    for (const wantContain of wantContains) {
+      expect(result.content).toContain(wantContain);
+    }
+  });
 });

tests/yup.spec.ts

@@ -539,4 +539,38 @@ describe('yup', () => {
       }
     });
   });
+
+  it('properly generates custom directive values', async () => {
+    const schema = buildSchema(/* GraphQL */ `
+      input UserCreateInput {
+        name: String! @constraint(startsWith: "Sir")
+        age: Int! @constraint(min: 0, max: 100)
+      }
+      directive @constraint(startsWith: String, min: Int, max: Int) on INPUT_FIELD_DEFINITION
+    `);
+    const result = await plugin(
+      schema,
+      [],
+      {
+        schema: 'yup',
+        directives: {
+          constraint: {
+            min: 'min',
+            max: 'max',
+            startsWith: ['matches', '/^$1/'],
+          },
+        },
+      },
+      {}
+    );
+    const wantContains = [
+      // User Create Input
+      'export function UserCreateInputSchema(): yup.SchemaOf<UserCreateInput> {',
+      'name: yup.string().defined().matches(/^Sir/),',
+      'age: yup.number().defined().min(0).max(100)',
+    ];
+    for (const wantContain of wantContains) {
+      expect(result.content).toContain(wantContain);
+    }
+  });
 });

tests/zod.spec.ts

@@ -724,4 +724,38 @@ describe('zod', () => {
       }
     });
   });
+
+  it('properly generates custom directive values', async () => {
+    const schema = buildSchema(/* GraphQL */ `
+      input UserCreateInput {
+        name: String! @constraint(startsWith: "Sir")
+        age: Int! @constraint(min: 0, max: 100)
+      }
+      directive @constraint(startsWith: String, min: Int, max: Int) on INPUT_FIELD_DEFINITION
+    `);
+    const result = await plugin(
+      schema,
+      [],
+      {
+        schema: 'zod',
+        directives: {
+          constraint: {
+            min: 'min',
+            max: 'max',
+            startsWith: ['regex', '/^$1/'],
+          },
+        },
+      },
+      {}
+    );
+    const wantContains = [
+      // User Create Input
+      'export function UserCreateInputSchema(): z.ZodObject<Properties<UserCreateInput>> {',
+      'name: z.string().regex(/^Sir/),',
+      'age: z.number().min(0).max(100)',
+    ];
+    for (const wantContain of wantContains) {
+      expect(result.content).toContain(wantContain);
+    }
+  });
 });