f

Author: oskardudycz

src/packages/dumbo/src/core/schema/components/tableSchemaComponent.ts

@@ -1,7 +1,4 @@
-import type {
-  AnyForeignKeyDefinition,
-  ForeignKeyDefinition,
-} from '../foreignKeys/foreignKeyTypes';
+import type { ForeignKeyDefinition } from '../foreignKeys/foreignKeyTypes';
 import {
   mapSchemaComponentsOfType,
   schemaComponent,
@@ -27,17 +24,23 @@ export const TableURN = ({ name }: { name: string }): TableURN =>
 
 export type TableColumns = Record<string, AnyColumnSchemaComponent>;
 export type TableForeignKeys<
-  FKS extends AnyForeignKeyDefinition = AnyForeignKeyDefinition,
-> = Record<
-  string,
+  Columns extends string = string,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  FKS extends ForeignKeyDefinition<Columns, any> = ForeignKeyDefinition<
+    Columns,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    any
+  >,
+> =
   FKS extends ForeignKeyDefinition<infer C, infer R>
-    ? ForeignKeyDefinition<C, R>
-    : never
->;
+    ? readonly ForeignKeyDefinition<C, R>[]
+    : never;
 
 export type TableSchemaComponent<
   Columns extends TableColumns = TableColumns,
-  ForeignKeys extends TableForeignKeys = TableForeignKeys,
+  ForeignKeys extends TableForeignKeys<
+    keyof Columns & string
+  > = TableForeignKeys<keyof Columns & string>,
 > = SchemaComponent<
   TableURN,
   Readonly<{

src/packages/dumbo/src/core/schema/dumboSchema/dumboSchema.ts

@@ -61,7 +61,9 @@ const dumboIndex = (
 
 const dumboTable = <
   Columns extends TableColumns = TableColumns,
-  const ForeignKeys extends TableForeignKeys = TableForeignKeys,
+  const ForeignKeys extends TableForeignKeys<
+    keyof Columns & string
+  > = TableForeignKeys<keyof Columns & string>,
 >(
   name: string,
   definition: {

src/packages/dumbo/src/core/schema/dumboSchema/dumboSchema.unit.spec.ts

@@ -151,14 +151,22 @@ const users = table('users', {
     email: column('email', Varchar('max'), { notNull: true }),
     name: column('name', Varchar('max')),
   },
-  foreignKeys: {
-    fk_profile: foreignKey(['sss'], ['public.profiles.user_id']),
-  },
+  foreignKeys: [foreignKey(['id'], ['public.profiles.user_id'])],
 });
 
-const ttt = users.foreignKeys.fk_profile;
-
-const id = users.columns.email;
+const _users2 = table('users', {
+  columns: {
+    id: column('id', Varchar('max'), { primaryKey: true, notNull: true }),
+    email: column('email', Varchar('max'), { notNull: true }),
+    name: column('name', Varchar('max')),
+  },
+  foreignKeys: [
+    {
+      columns: ['id'],
+      references: ['public.profiles.user_id'],
+    },
+  ],
+});
 
 export const simpleDb = database(
   'myapp',
@@ -187,12 +195,12 @@ const multiSchemaDb = database('myapp', {
         userId: column('user_id', Varchar('max')),
         timestamp: column('timestamp', Varchar('max')),
       },
-      foreignKeys: {
-        userFk: {
+      foreignKeys: [
+        {
           columns: ['userId'],
           references: ['public.users.id'],
         },
-      },
+      ],
     }),
   }),
 });
@@ -229,16 +237,16 @@ void describe('Foreign Key Validation', () => {
             id: column('id', Varchar('max')),
             user_id: column('user_id', Varchar('max')),
           },
-          foreignKeys: {
-            userFk: { columns: ['user_id'], references: ['public.users.id'] },
-          },
+          foreignKeys: [
+            { columns: ['user_id'], references: ['public.users.id'] },
+          ],
         }),
       }),
     });
 
     assert.ok(db.schemas.public.tables.posts.foreignKeys);
     assert.deepStrictEqual(
-      db.schemas.public.tables.posts.foreignKeys.userFk.columns,
+      db.schemas.public.tables.posts.foreignKeys[0].columns,
       ['user_id'],
     );
   });
@@ -258,18 +266,18 @@ void describe('Foreign Key Validation', () => {
             user_id: column('user_id', Varchar('max')),
             tenant_id: column('tenant_id', Varchar('max')),
           },
-          foreignKeys: {
-            compositeKey: {
+          foreignKeys: [
+            {
               columns: ['user_id', 'tenant_id'],
               references: ['public.users.id', 'public.users.tenant_id'],
             },
-          },
+          ],
         }),
       }),
     });
 
     assert.deepStrictEqual(
-      db.schemas.public.tables.posts.foreignKeys.compositeKey.columns,
+      db.schemas.public.tables.posts.foreignKeys[0].columns,
       ['user_id', 'tenant_id'],
     );
   });
@@ -336,15 +344,15 @@ void describe('Foreign Key Validation', () => {
             id: column('id', Varchar('max')),
             user_id: column('user_id', Varchar('max')),
           },
-          foreignKeys: {
-            userFk: { columns: ['user_id'], references: ['public.users.id'] },
-          },
+          foreignKeys: [
+            { columns: ['user_id'], references: ['public.users.id'] },
+          ],
         }),
       }),
     });
 
     assert.deepStrictEqual(
-      db.schemas.analytics.tables.events.foreignKeys.userFk.references,
+      db.schemas.analytics.tables.events.foreignKeys[0].references,
       ['public.users.id'],
     );
   });

src/packages/dumbo/src/core/schema/foreignKeys/foreignKeyTypes.ts

@@ -52,9 +52,6 @@ export type ForeignKeyDefinition<Columns = string, References = string> = {
   readonly references: readonly References[];
 };
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const Tuple = <T extends [any, ...any]>(v: T) => v;
-
 export const foreignKey = <
   const Columns extends readonly string[],
   const References extends readonly string[],