Merge pull request #391 from Code-Hex/fix/386

fix #386

Author: Code-Hex

src/myzod/index.ts

@@ -212,9 +212,8 @@ const generateFieldTypeMyZodSchema = (
     }
     const appliedDirectivesGen = applyDirectives(config, field, gen);
     if (isNonNullType(parentType)) {
-      if (config.notAllowEmptyString === true) {
-        const tsType = visitor.getScalarType(type.name.value);
-        if (tsType === 'string') return `${gen}.min(1)`;
+      if (visitor.shouldEmitAsNotAllowEmptyString(type.name.value)) {
+        return `${gen}.min(1)`;
       }
       return appliedDirectivesGen;
     }

src/visitor.ts

@@ -1,15 +1,19 @@
 import { TsVisitor } from '@graphql-codegen/typescript';
-import { GraphQLSchema, NameNode } from 'graphql';
+import { GraphQLSchema, NameNode, specifiedScalarTypes } from 'graphql';
 
 import { ValidationSchemaPluginConfig } from './config';
 
 export class Visitor extends TsVisitor {
   constructor(
     private scalarDirection: 'input' | 'output' | 'both',
     private schema: GraphQLSchema,
-    config: ValidationSchemaPluginConfig
+    private pluginConfig: ValidationSchemaPluginConfig
   ) {
-    super(schema, config);
+    super(schema, pluginConfig);
+  }
+
+  private isSpecifiedScalarName(scalarName: string) {
+    return specifiedScalarTypes.some(({ name }) => name === scalarName);
   }
 
   public getType(name: string) {
@@ -34,4 +38,16 @@ export class Visitor extends TsVisitor {
     }
     return this.scalars[scalarName][this.scalarDirection];
   }
+
+  public shouldEmitAsNotAllowEmptyString(name: string): boolean {
+    if (this.pluginConfig.notAllowEmptyString !== true) {
+      return false;
+    }
+    const typ = this.getType(name);
+    if (typ?.astNode?.kind !== 'ScalarTypeDefinition' && !this.isSpecifiedScalarName(name)) {
+      return false;
+    }
+    const tsType = this.getScalarType(name);
+    return tsType === 'string';
+  }
 }

src/yup/index.ts

@@ -262,9 +262,8 @@ const generateFieldTypeYupSchema = (
   if (isNamedType(type)) {
     const gen = generateNameNodeYupSchema(config, visitor, type.name);
     if (isNonNullType(parentType)) {
-      if (config.notAllowEmptyString === true) {
-        const tsType = visitor.getScalarType(type.name.value);
-        if (tsType === 'string') return `${gen}.required()`;
+      if (visitor.shouldEmitAsNotAllowEmptyString(type.name.value)) {
+        return `${gen}.required()`;
       }
       return `${gen}.nonNullable()`;
     }

src/zod/index.ts

@@ -222,9 +222,8 @@ const generateFieldTypeZodSchema = (
     }
     const appliedDirectivesGen = applyDirectives(config, field, gen);
     if (isNonNullType(parentType)) {
-      if (config.notAllowEmptyString === true) {
-        const tsType = visitor.getScalarType(type.name.value);
-        if (tsType === 'string') return `${appliedDirectivesGen}.min(1)`;
+      if (visitor.shouldEmitAsNotAllowEmptyString(type.name.value)) {
+        return `${appliedDirectivesGen}.min(1)`;
       }
       return appliedDirectivesGen;
     }

tests/myzod.spec.ts

@@ -1,4 +1,5 @@
 import { buildSchema } from 'graphql';
+import dedent from 'ts-dedent';
 
 import { plugin } from '../src/index';
 
@@ -297,6 +298,37 @@ describe('myzod', () => {
     }
   });
 
+  it('with notAllowEmptyString issue #386', async () => {
+    const schema = buildSchema(/* GraphQL */ `
+      input InputOne {
+        field: InputNested!
+      }
+
+      input InputNested {
+        field: String!
+      }
+    `);
+    const result = await plugin(
+      schema,
+      [],
+      {
+        schema: 'myzod',
+        notAllowEmptyString: true,
+        scalars: {
+          ID: 'string',
+        },
+      },
+      {}
+    );
+    const wantContain = dedent`
+    export function InputNestedSchema(): myzod.Type<InputNested> {
+      return myzod.object({
+        field: myzod.string().min(1)
+      })
+    }`;
+    expect(result.content).toContain(wantContain);
+  });
+
   it('with scalarSchemas', async () => {
     const schema = buildSchema(/* GraphQL */ `
       input ScalarsInput {

tests/yup.spec.ts

@@ -1,4 +1,5 @@
 import { buildSchema } from 'graphql';
+import dedent from 'ts-dedent';
 
 import { plugin } from '../src/index';
 
@@ -294,6 +295,37 @@ describe('yup', () => {
     }
   });
 
+  it('with notAllowEmptyString issue #386', async () => {
+    const schema = buildSchema(/* GraphQL */ `
+      input InputOne {
+        field: InputNested!
+      }
+
+      input InputNested {
+        field: String!
+      }
+    `);
+    const result = await plugin(
+      schema,
+      [],
+      {
+        schema: 'yup',
+        notAllowEmptyString: true,
+        scalars: {
+          ID: 'string',
+        },
+      },
+      {}
+    );
+    const wantContain = dedent`
+    export function InputNestedSchema(): yup.ObjectSchema<InputNested> {
+      return yup.object({
+        field: yup.string().defined().required()
+      })
+    }`;
+    expect(result.content).toContain(wantContain);
+  });
+
   it('with scalarSchemas', async () => {
     const schema = buildSchema(/* GraphQL */ `
       input ScalarsInput {

tests/zod.spec.ts

@@ -1,4 +1,5 @@
 import { buildSchema } from 'graphql';
+import { dedent } from 'ts-dedent';
 
 import { plugin } from '../src/index';
 
@@ -297,6 +298,37 @@ describe('zod', () => {
     }
   });
 
+  it('with notAllowEmptyString issue #386', async () => {
+    const schema = buildSchema(/* GraphQL */ `
+      input InputOne {
+        field: InputNested!
+      }
+
+      input InputNested {
+        field: String!
+      }
+    `);
+    const result = await plugin(
+      schema,
+      [],
+      {
+        schema: 'zod',
+        notAllowEmptyString: true,
+        scalars: {
+          ID: 'string',
+        },
+      },
+      {}
+    );
+    const wantContain = dedent`
+    export function InputNestedSchema(): z.ZodObject<Properties<InputNested>> {
+      return z.object({
+        field: z.string().min(1)
+      })
+    }`;
+    expect(result.content).toContain(wantContain);
+  });
+
   it('with scalarSchemas', async () => {
     const schema = buildSchema(/* GraphQL */ `
       input ScalarsInput {