fix optional types

src/relations.ts

@@ -183,7 +183,7 @@ const createZeroSchema = <
 
         if (!sourceFieldNames.length || !destFieldNames.length) {
           throw new Error(
-            `No source or dest field names found for: ${relation.fieldName}`,
+            `No relationship found for: ${relation.fieldName} (${relation instanceof One ? "One" : "Many"} from ${tableName} to ${relation.referencedTableName}). Did you forget to define foreign keys?`,
           );
         }
 

src/types.ts

@@ -88,14 +88,16 @@ type ZeroMappedCustomType<
     ? ColumnDefinition<T, K>["_"]["$type"]
     : ZeroTypeToTypescriptType[ZeroMappedColumnType<T, K>];
 
-type ZeroColumnDefinition<T extends Table, K extends ColumnNames<T>> = Readonly<
+type ZeroColumnDefinition<
+  T extends Table,
+  K extends ColumnNames<T>,
+  CD extends ColumnDefinition<T, K>["_"] = ColumnDefinition<T, K>["_"],
+> = Readonly<
   {
-    readonly optional: ColumnDefinition<T, K>["_"]["notNull"] extends true
-      ? boolean // false
-      : boolean; // true;
+    readonly optional: CD extends { notNull: true } ? false : true;
     readonly type: ZeroMappedColumnType<T, K>;
     readonly customType: ZeroMappedCustomType<T, K>;
-  } & (ColumnDefinition<T, K>["_"] extends { columnType: "PgEnumColumn" }
+  } & (CD extends { columnType: "PgEnumColumn" }
     ? { readonly kind: "enum" }
     : {})
 >;

tests/compile.test.ts

@@ -2,7 +2,7 @@ import { execSync } from "child_process";
 import * as fs from "fs";
 import * as os from "os";
 import * as path from "path";
-import { expect, test } from "vitest";
+import { expect, test, describe } from "vitest";
 
 const runZeroBuildSchema = async (testName: string) => {
   const schemaPath = path.join(
@@ -36,37 +36,39 @@ const runZeroBuildSchema = async (testName: string) => {
   }
 };
 
-test("compile - one-to-one", async () => {
-  const result = await runZeroBuildSchema("one-to-one");
-  expect(result.schema.tables.user).toBeTruthy();
-});
+describe.concurrent("compile", () => {
+  test("compile - one-to-one", async () => {
+    const result = await runZeroBuildSchema("one-to-one");
+    expect(result.schema.tables.user).toBeTruthy();
+  });
 
-test("compile - one-to-one-2", async () => {
-  const result = await runZeroBuildSchema("one-to-one-2");
-  expect(result.schema.tables.user).toBeTruthy();
-});
+  test("compile - one-to-one-2", async () => {
+    const result = await runZeroBuildSchema("one-to-one-2");
+    expect(result.schema.tables.user).toBeTruthy();
+  });
 
-test("compile - one-to-one-foreign-key", async () => {
-  const result = await runZeroBuildSchema("one-to-one-foreign-key");
-  expect(result.schema.tables.users).toBeTruthy();
-});
+  test("compile - one-to-one-foreign-key", async () => {
+    const result = await runZeroBuildSchema("one-to-one-foreign-key");
+    expect(result.schema.tables.users).toBeTruthy();
+  });
 
-test("compile - one-to-one-self", async () => {
-  const result = await runZeroBuildSchema("one-to-one-self");
-  expect(result.schema.tables.user).toBeTruthy();
-});
+  test("compile - one-to-one-self", async () => {
+    const result = await runZeroBuildSchema("one-to-one-self");
+    expect(result.schema.tables.user).toBeTruthy();
+  });
 
-test("compile - one-to-many", async () => {
-  const result = await runZeroBuildSchema("one-to-many");
-  expect(result.schema.tables.user).toBeTruthy();
-});
+  test("compile - one-to-many", async () => {
+    const result = await runZeroBuildSchema("one-to-many");
+    expect(result.schema.tables.user).toBeTruthy();
+  });
 
-test("compile - one-to-many-named", async () => {
-  const result = await runZeroBuildSchema("one-to-many-named");
-  expect(result.schema.tables.users).toBeTruthy();
-});
+  test("compile - one-to-many-named", async () => {
+    const result = await runZeroBuildSchema("one-to-many-named");
+    expect(result.schema.tables.users).toBeTruthy();
+  });
 
-test("compile - many-to-many", async () => {
-  const result = await runZeroBuildSchema("many-to-many");
-  expect(result.schema.tables.user).toBeTruthy();
+  test("compile - many-to-many", async () => {
+    const result = await runZeroBuildSchema("many-to-many");
+    expect(result.schema.tables.user).toBeTruthy();
+  });
 });