fix: Fix nullable (#92)

* Fix array or null Closed #86 * Fix other nullable cases
fabien0102 · Aug 26, 2022 · f2321a3 · f2321a3
1 parent c5abe8c
commit f2321a3
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 0 deletions.
diff --git a/src/core/generateZodSchema.test.ts b/src/core/generateZodSchema.test.ts
@@ -831,6 +831,56 @@ describe("generateZodSchema", () => {
     `);
   });
 
+  it("should deal with array of null or null", () => {
+    const source = `export type Example = {
+        field?: Array<string | null> | null
+    }`;
+
+    expect(generate(source)).toMatchInlineSnapshot(`
+      "export const exampleSchema = z.object({
+          field: z.array(z.string().nullable()).optional().nullable()
+      });"
+    `);
+  });
+
+  it("should deal with partial or null", () => {
+    const source = `export type Example = {
+        field: Partial<{foo: string}> | null
+    }`;
+
+    expect(generate(source)).toMatchInlineSnapshot(`
+      "export const exampleSchema = z.object({
+          field: z.object({
+              foo: z.string()
+          }).nullable().partial()
+      });"
+    `);
+  });
+
+  it("should deal with ReadonlyArray or null", () => {
+    const source = `export type Example = {
+        field: ReadonlyArray<"foo" | "bar"> | null
+    }`;
+
+    expect(generate(source)).toMatchInlineSnapshot(`
+      "export const exampleSchema = z.object({
+          field: z.array(z.union([z.literal(\\"foo\\"), z.literal(\\"bar\\")])).nullable()
+      });"
+    `);
+  });
+
+  it("should deal with Record or null", () => {
+    const source = `export type Example = {
+        field: Record<string, string> | null
+    }`;
+
+    expect(generate(source)).toMatchInlineSnapshot(`
+      "export const exampleSchema = z.object({
+          field: z.record(z.string()).nullable()
+      });"
+    `);
+  });
+
   it("should allow nullable on union properties", () => {
     const source = `export interface A {
       a: number | string | null;

diff --git a/src/core/generateZodSchema.ts b/src/core/generateZodSchema.ts
@@ -256,6 +256,7 @@ function buildZodPrimitive({
         z,
         typeNode: f.createArrayTypeNode(typeNode.typeArguments[0]),
         isOptional,
+        isNullable,
         jsDocTags: {},
         sourceFile,
         dependencies,
@@ -270,6 +271,7 @@ function buildZodPrimitive({
         z,
         typeNode: typeNode.typeArguments[0],
         isOptional,
+        isNullable,
         jsDocTags,
         sourceFile,
         isPartial: true,
@@ -285,6 +287,7 @@ function buildZodPrimitive({
         z,
         typeNode: typeNode.typeArguments[0],
         isOptional,
+        isNullable,
         jsDocTags,
         sourceFile,
         isRequired: true,
@@ -300,6 +303,7 @@ function buildZodPrimitive({
         z,
         typeNode: typeNode.typeArguments[0],
         isOptional,
+        isNullable,
         jsDocTags,
         sourceFile,
         dependencies,