use defined instead of required

Author: Code-Hex

src/yup/index.ts

@@ -150,7 +150,7 @@ const generateInputObjectFieldTypeYupSchema = (
       type.type,
       type,
     );
-    return maybeLazy(type.type, `${gen}.required()`);
+    return maybeLazy(type.type, `${gen}.defined()`);
   }
   if (isNamedType(type)) {
     return generateNameNodeYupSchema(tsVisitor, schema, type.name);

tests/yup.spec.ts

@@ -6,7 +6,7 @@ import { plugin } from "../src/index";
 describe("yup", () => {
   test.each([
     [
-      "required",
+      "defined",
       /* GraphQL */ `
         input PrimitiveInput {
           a: ID!
@@ -18,11 +18,11 @@ describe("yup", () => {
       `,
       [
         "export function PrimitiveInputSchema(): yup.SchemaOf<PrimitiveInput>",
-        "a: yup.string().required()",
-        "b: yup.string().required()",
-        "c: yup.boolean().required()",
-        "d: yup.number().required()",
-        "e: yup.number().required()",
+        "a: yup.string().defined()",
+        "b: yup.string().defined()",
+        "c: yup.boolean().defined()",
+        "d: yup.number().defined()",
+        "e: yup.number().defined()",
       ],
     ],
     [
@@ -34,7 +34,7 @@ describe("yup", () => {
           c: Boolean
           d: Int
           e: Float
-          z: String! # no required check
+          z: String! # no defined check
         }
       `,
       [
@@ -62,11 +62,11 @@ describe("yup", () => {
       [
         "export function ArrayInputSchema(): yup.SchemaOf<ArrayInput>",
         "a: yup.array().of(yup.string()).optional(),",
-        "b: yup.array().of(yup.string().required()).optional(),",
-        "c: yup.array().of(yup.string().required()).required(),",
+        "b: yup.array().of(yup.string().defined()).optional(),",
+        "c: yup.array().of(yup.string().defined()).defined(),",
         "d: yup.array().of(yup.array().of(yup.string()).optional()).optional(),",
-        "e: yup.array().of(yup.array().of(yup.string()).required()).optional(),",
-        "f: yup.array().of(yup.array().of(yup.string()).required()).required()",
+        "e: yup.array().of(yup.array().of(yup.string()).defined()).optional(),",
+        "f: yup.array().of(yup.array().of(yup.string()).defined()).defined()",
       ],
     ],
     [
@@ -84,11 +84,11 @@ describe("yup", () => {
       `,
       [
         "export function AInputSchema(): yup.SchemaOf<AInput>",
-        "b: yup.lazy(() => BInputSchema().required()) as never",
+        "b: yup.lazy(() => BInputSchema().defined()) as never",
         "export function BInputSchema(): yup.SchemaOf<BInput>",
-        "c: yup.lazy(() => CInputSchema().required()) as never",
+        "c: yup.lazy(() => CInputSchema().defined()) as never",
         "export function CInputSchema(): yup.SchemaOf<CInput>",
-        "a: yup.lazy(() => AInputSchema().required()) as never",
+        "a: yup.lazy(() => AInputSchema().defined()) as never",
       ],
     ],
     [
@@ -119,7 +119,7 @@ describe("yup", () => {
       [
         "export const PageTypeSchema = yup.mixed().oneOf([PageType.Public, PageType.BasicAuth])",
         "export function PageInputSchema(): yup.SchemaOf<PageInput>",
-        "pageType: PageTypeSchema.required()",
+        "pageType: PageTypeSchema.defined()",
       ],
     ],
     [
@@ -141,7 +141,7 @@ describe("yup", () => {
         "export function HttpInputSchema(): yup.SchemaOf<HttpInput>",
         "export const HttpMethodSchema = yup.mixed().oneOf([HttpMethod.Get, HttpMethod.Post])",
         "method: HttpMethodSchema",
-        "url: yup.mixed().required()",
+        "url: yup.mixed().defined()",
       ],
     ],
   ])("%s", async (_, textSchema, wantContains) => {
@@ -175,8 +175,8 @@ describe("yup", () => {
       },
       {}
     );
-    expect(result.content).toContain("phrase: yup.string().required()");
-    expect(result.content).toContain("times: yup.number().required()");
+    expect(result.content).toContain("phrase: yup.string().defined()");
+    expect(result.content).toContain("times: yup.number().defined()");
   });
 
   it("with importFrom", async () => {
@@ -194,7 +194,7 @@ describe("yup", () => {
       {}
     );
     expect(result.prepend).toContain("import { Say } from './types'");
-    expect(result.content).toContain("phrase: yup.string().required()");
+    expect(result.content).toContain("phrase: yup.string().defined()");
   });
 
   it("with enumsAsTypes", async () => {