Fix schema-to-zod unability to infer schema type (#219)

romeerez · Dec 2, 2023 · d398140 · d398140
1 parent 2c48976
commit d398140
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.changeset/short-cooks-help.md b/.changeset/short-cooks-help.md
@@ -0,0 +1,5 @@
+---
+'orchid-orm-schema-to-zod': patch
+---
+
+Fix schema-to-zod unability to infer schema type
diff --git a/packages/schema-to-zod/src/main.test.ts b/packages/schema-to-zod/src/main.test.ts
@@ -69,6 +69,7 @@ describe('zodSchemaProvider', () => {
           columns,
         };
       }
+      columns!: typeof columns;
     }
 
     const schema = Table.schema();

diff --git a/packages/schema-to-zod/src/main.ts b/packages/schema-to-zod/src/main.ts
@@ -220,7 +220,12 @@ type MapJsonTuple<T extends unknown[]> = T extends [infer Head, ...infer Tail]
 
 type Columns = { shape: ColumnsShapeBase };
 type Table = { columns: ColumnsShapeBase };
-type TableClass<T extends Table> = { instance(): T };
+
+type TableClass<T extends Table> = {
+  new (): T;
+  // Cannot set T as the `instance()` return type because it cannot be properly inferred
+  instance(): unknown;
+};
 
 export type InstanceToZod<T extends Columns> = z.ZodObject<{
   [K in keyof T['shape']]: SchemaToZod<T['shape'][K]>;
@@ -244,7 +249,7 @@ export const zodSchemaProvider = function <T extends Table>(
   this: TableClass<T>,
 ): InstanceToZod<{ shape: T['columns'] }> {
   return instanceToZod({
-    shape: this.instance().columns,
+    shape: (this.instance() as T).columns,
   }) as unknown as InstanceToZod<{
     shape: T['columns'];
   }>;