fix: Fix optional function parameter (#48)

Closed #47
fabien0102 · Oct 7, 2021 · bf0d527 · bf0d527
1 parent 1e13bbb
commit bf0d527
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/example/heros.ts b/example/heros.ts
@@ -84,3 +84,8 @@ export interface Exported {
   a: NonExported;
   b: string;
 }
+
+export type GetSupermanSkill = (
+  skillName: string,
+  withKryptonite?: boolean
+) => string;
diff --git a/example/heros.zod.ts b/example/heros.zod.ts
@@ -64,3 +64,8 @@ export const exportedSchema = z.object({
   a: nonExportedSchema,
   b: z.string(),
 });
+
+export const getSupermanSkillSchema = z
+  .function()
+  .args(z.string(), z.boolean().optional())
+  .returns(z.string());
diff --git a/src/core/generateZodSchema.test.ts b/src/core/generateZodSchema.test.ts
@@ -221,6 +221,17 @@ describe("generateZodSchema", () => {
     );
   });
 
+  it("should generate a function with optional parameter", () => {
+    const source = `export type GetSupermanSkill = (
+      key: string,
+      params?: Record<string, string | number>
+    ) => string`;
+
+    expect(generate(source)).toMatchInlineSnapshot(
+      `"export const getSupermanSkillSchema = z.function().args(z.string(), z.record(z.union([z.string(), z.number()])).optional()).returns(z.string());"`
+    );
+  });
+
   it("should generate a function schema (with `any` fallback on param)", () => {
     const source = `export type KillSuperman = (withKryptonite: boolean, method) => Promise<boolean>;`;
     expect(generate(source)).toMatchInlineSnapshot(

diff --git a/src/core/generateZodSchema.ts b/src/core/generateZodSchema.ts
@@ -287,7 +287,7 @@ function buildZodPrimitive({
           buildZodPrimitive({
             z,
             typeNode: typeNode.typeArguments[1],
-            isOptional,
+            isOptional: false,
             jsDocTags,
             sourceFile,
             isPartial: false,
@@ -572,7 +572,7 @@ function buildZodPrimitive({
               sourceFile,
               dependencies,
               getDependencyName,
-              isOptional: false,
+              isOptional: Boolean(p.questionToken),
             })
           ),
         },