@casekit/orm 0.0.1-alpha.1 → 0.0.1-alpha.11

package/lib/test/db/index.d.ts

@@ -70,6 +70,15 @@ export declare const db: import("../..").Orm<{
                     readonly column: "id";
                 };
             };
+            readonly reviewedById: {
+                readonly name: "reviewed_by_id";
+                readonly type: "uuid";
+                readonly nullable: true;
+                readonly references: {
+                    readonly table: "user";
+                    readonly column: "id";
+                };
+            };
             readonly publishedAt: {
                 readonly type: "timestamp";
                 readonly nullable: true;
@@ -106,6 +115,15 @@ export declare const db: import("../..").Orm<{
                 readonly zodSchema: import("zod").ZodString;
                 readonly type: "text";
             };
+            readonly invitedById: {
+                readonly name: "invited_by_id";
+                readonly type: "uuid";
+                readonly nullable: true;
+                readonly references: {
+                    readonly table: "user";
+                    readonly column: "id";
+                };
+            };
             readonly joinedAt: {
                 readonly name: "created_at";
                 readonly zodSchema: import("zod").ZodDate;
@@ -183,6 +201,12 @@ export declare const db: import("../..").Orm<{
             readonly type: "N:1";
             readonly foreignKey: "authorId";
         };
+        readonly reviewedBy: {
+            readonly model: "user";
+            readonly type: "N:1";
+            readonly foreignKey: "reviewedById";
+            readonly optional: true;
+        };
         readonly tenant: {
             readonly model: "tenant";
             readonly type: "N:1";
@@ -195,6 +219,22 @@ export declare const db: import("../..").Orm<{
             readonly model: "post";
             readonly foreignKey: "authorId";
         };
+        readonly reviewedPosts: {
+            readonly type: "1:N";
+            readonly model: "post";
+            readonly foreignKey: "reviewedById";
+        };
+        readonly invitedBy: {
+            readonly type: "N:1";
+            readonly model: "user";
+            readonly foreignKey: "invitedById";
+            readonly optional: true;
+        };
+        readonly invitedUsers: {
+            readonly type: "1:N";
+            readonly model: "user";
+            readonly foreignKey: "invitedById";
+        };
         readonly tenancies: {
             readonly type: "1:N";
             readonly model: "tenantUser";

package/lib/test/db/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/test/db/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAEnD,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOb,CAAC;AAEH,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAAI,cAAc,CAC9D,MAAM,EACN,SAAS,EACT,CAAC,CACJ,CAAC;AAEF,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;AAC7B,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;AAClC,MAAM,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/test/db/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAEnD,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOb,CAAC;AAEH,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAAI,cAAc,CAC9D,MAAM,EACN,SAAS,EACT,CAAC,CACJ,CAAC;AAEF,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;AAC7B,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;AAClC,MAAM,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC"}

package/lib/test/db/models/post.model.d.ts

@@ -2,7 +2,7 @@ export declare const post: {
     readonly columns: {
         readonly id: {
             readonly type: "uuid";
-            readonly default: import("../../../sql").SQLStatement;
+            readonly default: import("../../..").SQLStatement;
             readonly primaryKey: true;
         };
         readonly title: {
@@ -19,6 +19,15 @@ export declare const post: {
                 readonly column: "id";
             };
         };
+        readonly reviewedById: {
+            readonly name: "reviewed_by_id";
+            readonly type: "uuid";
+            readonly nullable: true;
+            readonly references: {
+                readonly table: "user";
+                readonly column: "id";
+            };
+        };
         readonly publishedAt: {
             readonly type: "timestamp";
             readonly nullable: true;

package/lib/test/db/models/post.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"post.model.d.ts","sourceRoot":"","sources":["../../../../src/test/db/models/post.model.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwBmB,CAAC"}
+{"version":3,"file":"post.model.d.ts","sourceRoot":"","sources":["../../../../src/test/db/models/post.model.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BmB,CAAC"}

package/lib/test/db/models/post.model.js

@@ -13,6 +13,12 @@ export const post = {
             type: "uuid",
             references: { table: "user", column: "id" },
         },
+        reviewedById: {
+            name: "reviewed_by_id",
+            type: "uuid",
+            nullable: true,
+            references: { table: "user", column: "id" },
+        },
         publishedAt: { type: "timestamp", nullable: true },
         tags: { type: "text[][][][]", nullable: true },
         tenantId: {

package/lib/test/db/models/post.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"post.model.js","sourceRoot":"","sources":["../../../../src/test/db/models/post.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,MAAM,CAAC,MAAM,IAAI,GAAG;IAChB,OAAO,EAAE;QACL,EAAE,EAAE;YACA,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,GAAG,CAAA,oBAAoB;YAChC,UAAU,EAAE,IAAI;SACnB;QACD,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QACvB,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QACzB,QAAQ,EAAE;YACN,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,MAAM;YACZ,UAAU,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE;SAC9C;QACD,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE;QAClD,IAAI,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC9C,QAAQ,EAAE;YACN,IAAI,EAAE,MAAM;YACZ,UAAU,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE;YAC7C,OAAO,EAAE,sCAAsC;SAClD;QACD,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE;QAChD,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE;KACnD;CAC+B,CAAC"}
+{"version":3,"file":"post.model.js","sourceRoot":"","sources":["../../../../src/test/db/models/post.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,MAAM,CAAC,MAAM,IAAI,GAAG;IAChB,OAAO,EAAE;QACL,EAAE,EAAE;YACA,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,GAAG,CAAA,oBAAoB;YAChC,UAAU,EAAE,IAAI;SACnB;QACD,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QACvB,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QACzB,QAAQ,EAAE;YACN,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,MAAM;YACZ,UAAU,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE;SAC9C;QACD,YAAY,EAAE;YACV,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE;SAC9C;QACD,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE;QAClD,IAAI,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC9C,QAAQ,EAAE;YACN,IAAI,EAAE,MAAM;YACZ,UAAU,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE;YAC7C,OAAO,EAAE,sCAAsC;SAClD;QACD,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE;QAChD,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE;KACnD;CAC+B,CAAC"}

package/lib/test/db/models/post.relations.d.ts

@@ -4,6 +4,12 @@ export declare const post: {
         readonly type: "N:1";
         readonly foreignKey: "authorId";
     };
+    readonly reviewedBy: {
+        readonly model: "user";
+        readonly type: "N:1";
+        readonly foreignKey: "reviewedById";
+        readonly optional: true;
+    };
     readonly tenant: {
         readonly model: "tenant";
         readonly type: "N:1";

package/lib/test/db/models/post.relations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"post.relations.d.ts","sourceRoot":"","sources":["../../../../src/test/db/models/post.relations.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,IAAI;;;;;;;;;;;CAWuC,CAAC"}
+{"version":3,"file":"post.relations.d.ts","sourceRoot":"","sources":["../../../../src/test/db/models/post.relations.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;CAiBuC,CAAC"}

package/lib/test/db/models/post.relations.js

@@ -4,6 +4,12 @@ export const post = {
         type: "N:1",
         foreignKey: "authorId",
     },
+    reviewedBy: {
+        model: "user",
+        type: "N:1",
+        foreignKey: "reviewedById",
+        optional: true,
+    },
     tenant: {
         model: "tenant",
         type: "N:1",

package/lib/test/db/models/post.relations.js.map

@@ -1 +1 @@
-{"version":3,"file":"post.relations.js","sourceRoot":"","sources":["../../../../src/test/db/models/post.relations.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,IAAI,GAAG;IAChB,MAAM,EAAE;QACJ,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,KAAK;QACX,UAAU,EAAE,UAAU;KACzB;IACD,MAAM,EAAE;QACJ,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,KAAK;QACX,UAAU,EAAE,UAAU;KACzB;CACmD,CAAC"}
+{"version":3,"file":"post.relations.js","sourceRoot":"","sources":["../../../../src/test/db/models/post.relations.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,IAAI,GAAG;IAChB,MAAM,EAAE;QACJ,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,KAAK;QACX,UAAU,EAAE,UAAU;KACzB;IACD,UAAU,EAAE;QACR,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,KAAK;QACX,UAAU,EAAE,cAAc;QAC1B,QAAQ,EAAE,IAAI;KACjB;IACD,MAAM,EAAE;QACJ,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,KAAK;QACX,UAAU,EAAE,UAAU;KACzB;CACmD,CAAC"}

package/lib/test/db/models/tenant.model.d.ts

@@ -2,7 +2,7 @@ export declare const tenant: {
     readonly columns: {
         readonly id: {
             readonly type: "uuid";
-            readonly default: import("../../../sql").SQLStatement;
+            readonly default: import("../../..").SQLStatement;
             readonly primaryKey: true;
         };
         readonly name: {
@@ -10,7 +10,7 @@ export declare const tenant: {
         };
         readonly createdAt: {
             readonly type: "timestamp";
-            readonly default: import("../../../sql").SQLStatement;
+            readonly default: import("../../..").SQLStatement;
         };
     };
 };

package/lib/test/db/models/tenantUser.model.d.ts

@@ -3,7 +3,7 @@ export declare const tenantUser: {
     readonly columns: {
         readonly id: {
             readonly type: "uuid";
-            readonly default: import("../../../sql").SQLStatement;
+            readonly default: import("../../..").SQLStatement;
             readonly primaryKey: true;
         };
         readonly tenantId: {
@@ -22,7 +22,7 @@ export declare const tenantUser: {
         };
         readonly createdAt: {
             readonly type: "timestamp with time zone";
-            readonly default: import("../../../sql").SQLStatement;
+            readonly default: import("../../..").SQLStatement;
         };
         readonly deletedAt: {
             readonly type: "timestamp with time zone";

package/lib/test/db/models/user.model.d.ts

@@ -3,12 +3,21 @@ export declare const user: {
     readonly columns: {
         readonly id: {
             readonly type: "uuid";
-            readonly default: import("../../../sql").SQLStatement;
+            readonly default: import("../../..").SQLStatement;
         };
         readonly username: {
             readonly zodSchema: z.ZodString;
             readonly type: "text";
         };
+        readonly invitedById: {
+            readonly name: "invited_by_id";
+            readonly type: "uuid";
+            readonly nullable: true;
+            readonly references: {
+                readonly table: "user";
+                readonly column: "id";
+            };
+        };
         readonly joinedAt: {
             readonly name: "created_at";
             readonly zodSchema: z.ZodDate;
@@ -28,7 +37,7 @@ export declare const user: {
     readonly primaryKey: ["id"];
     readonly uniqueConstraints: [{
         readonly columns: ["username"];
-        readonly where: import("../../../sql").SQLStatement;
+        readonly where: import("../../..").SQLStatement;
     }];
 };
 //# sourceMappingURL=user.model.d.ts.map

package/lib/test/db/models/user.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.model.d.ts","sourceRoot":"","sources":["../../../../src/test/db/models/user.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiBmB,CAAC"}
+{"version":3,"file":"user.model.d.ts","sourceRoot":"","sources":["../../../../src/test/db/models/user.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuBmB,CAAC"}

package/lib/test/db/models/user.model.js

@@ -4,6 +4,12 @@ export const user = {
     columns: {
         id: { type: "uuid", default: sql `uuid_generate_v4()` },
         username: { zodSchema: z.string(), type: "text" },
+        invitedById: {
+            name: "invited_by_id",
+            type: "uuid",
+            nullable: true,
+            references: { table: "user", column: "id" },
+        },
         joinedAt: {
             name: "created_at",
             zodSchema: z.date(),

package/lib/test/db/models/user.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.model.js","sourceRoot":"","sources":["../../../../src/test/db/models/user.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,MAAM,CAAC,MAAM,IAAI,GAAG;IAChB,OAAO,EAAE;QACL,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAA,oBAAoB,EAAE;QACtD,QAAQ,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QACjD,QAAQ,EAAE;YACN,IAAI,EAAE,YAAY;YAClB,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE;YACnB,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,IAAI;SACjB;QACD,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE;QAChD,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE;KACxE;IACD,UAAU,EAAE,CAAC,IAAI,CAAC;IAClB,iBAAiB,EAAE;QACf,EAAE,OAAO,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,GAAG,CAAA,oBAAoB,EAAE;KAC5D;CAC+B,CAAC"}
+{"version":3,"file":"user.model.js","sourceRoot":"","sources":["../../../../src/test/db/models/user.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,MAAM,CAAC,MAAM,IAAI,GAAG;IAChB,OAAO,EAAE;QACL,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAA,oBAAoB,EAAE;QACtD,QAAQ,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QACjD,WAAW,EAAE;YACT,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE;SAC9C;QACD,QAAQ,EAAE;YACN,IAAI,EAAE,YAAY;YAClB,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE;YACnB,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,IAAI;SACjB;QACD,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE;QAChD,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE;KACxE;IACD,UAAU,EAAE,CAAC,IAAI,CAAC;IAClB,iBAAiB,EAAE;QACf,EAAE,OAAO,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,GAAG,CAAA,oBAAoB,EAAE;KAC5D;CAC+B,CAAC"}

package/lib/test/db/models/user.relations.d.ts

@@ -4,6 +4,22 @@ export declare const user: {
         readonly model: "post";
         readonly foreignKey: "authorId";
     };
+    readonly reviewedPosts: {
+        readonly type: "1:N";
+        readonly model: "post";
+        readonly foreignKey: "reviewedById";
+    };
+    readonly invitedBy: {
+        readonly type: "N:1";
+        readonly model: "user";
+        readonly foreignKey: "invitedById";
+        readonly optional: true;
+    };
+    readonly invitedUsers: {
+        readonly type: "1:N";
+        readonly model: "user";
+        readonly foreignKey: "invitedById";
+    };
     readonly tenancies: {
         readonly type: "1:N";
         readonly model: "tenantUser";

package/lib/test/db/models/user.relations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.relations.d.ts","sourceRoot":"","sources":["../../../../src/test/db/models/user.relations.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;CAkBuC,CAAC"}
+{"version":3,"file":"user.relations.d.ts","sourceRoot":"","sources":["../../../../src/test/db/models/user.relations.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkCuC,CAAC"}

package/lib/test/db/models/user.relations.js

@@ -4,6 +4,22 @@ export const user = {
         model: "post",
         foreignKey: "authorId",
     },
+    reviewedPosts: {
+        type: "1:N",
+        model: "post",
+        foreignKey: "reviewedById",
+    },
+    invitedBy: {
+        type: "N:1",
+        model: "user",
+        foreignKey: "invitedById",
+        optional: true,
+    },
+    invitedUsers: {
+        type: "1:N",
+        model: "user",
+        foreignKey: "invitedById",
+    },
     tenancies: {
         type: "1:N",
         model: "tenantUser",

package/lib/test/db/models/user.relations.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.relations.js","sourceRoot":"","sources":["../../../../src/test/db/models/user.relations.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,IAAI,GAAG;IAChB,KAAK,EAAE;QACH,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,UAAU;KACzB;IACD,SAAS,EAAE;QACP,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,YAAY;QACnB,UAAU,EAAE,QAAQ;KACvB;IACD,OAAO,EAAE;QACL,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,QAAQ;QACf,OAAO,EAAE,YAAY;QACrB,UAAU,EAAE,QAAQ;QACpB,QAAQ,EAAE,UAAU;KACvB;CACmD,CAAC"}
+{"version":3,"file":"user.relations.js","sourceRoot":"","sources":["../../../../src/test/db/models/user.relations.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,IAAI,GAAG;IAChB,KAAK,EAAE;QACH,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,UAAU;KACzB;IACD,aAAa,EAAE;QACX,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,cAAc;KAC7B;IACD,SAAS,EAAE;QACP,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,aAAa;QACzB,QAAQ,EAAE,IAAI;KACjB;IACD,YAAY,EAAE;QACV,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,aAAa;KAC5B;IACD,SAAS,EAAE;QACP,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,YAAY;QACnB,UAAU,EAAE,QAAQ;KACvB;IACD,OAAO,EAAE;QACL,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,QAAQ;QACf,OAAO,EAAE,YAAY;QACrB,UAAU,EAAE,QAAQ;QACpB,QAAQ,EAAE,UAAU;KACvB;CACmD,CAAC"}

package/lib/test/db/models.d.ts

@@ -66,6 +66,15 @@ export declare const models: {
                     readonly column: "id";
                 };
             };
+            readonly reviewedById: {
+                readonly name: "reviewed_by_id";
+                readonly type: "uuid";
+                readonly nullable: true;
+                readonly references: {
+                    readonly table: "user";
+                    readonly column: "id";
+                };
+            };
             readonly publishedAt: {
                 readonly type: "timestamp";
                 readonly nullable: true;
@@ -102,6 +111,15 @@ export declare const models: {
                 readonly zodSchema: import("zod").ZodString;
                 readonly type: "text";
             };
+            readonly invitedById: {
+                readonly name: "invited_by_id";
+                readonly type: "uuid";
+                readonly nullable: true;
+                readonly references: {
+                    readonly table: "user";
+                    readonly column: "id";
+                };
+            };
             readonly joinedAt: {
                 readonly name: "created_at";
                 readonly zodSchema: import("zod").ZodDate;

package/lib/test/db/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/test/db/models.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAMlB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/test/db/models.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAMlB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC"}

package/lib/test/db/relations.d.ts

@@ -5,6 +5,12 @@ export declare const relations: {
             readonly type: "N:1";
             readonly foreignKey: "authorId";
         };
+        readonly reviewedBy: {
+            readonly model: "user";
+            readonly type: "N:1";
+            readonly foreignKey: "reviewedById";
+            readonly optional: true;
+        };
         readonly tenant: {
             readonly model: "tenant";
             readonly type: "N:1";
@@ -17,6 +23,22 @@ export declare const relations: {
             readonly model: "post";
             readonly foreignKey: "authorId";
         };
+        readonly reviewedPosts: {
+            readonly type: "1:N";
+            readonly model: "post";
+            readonly foreignKey: "reviewedById";
+        };
+        readonly invitedBy: {
+            readonly type: "N:1";
+            readonly model: "user";
+            readonly foreignKey: "invitedById";
+            readonly optional: true;
+        };
+        readonly invitedUsers: {
+            readonly type: "1:N";
+            readonly model: "user";
+            readonly foreignKey: "invitedById";
+        };
         readonly tenancies: {
             readonly type: "1:N";
             readonly model: "tenantUser";

package/lib/test/db/relations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"relations.d.ts","sourceRoot":"","sources":["../../../src/test/db/relations.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKrB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC"}
+{"version":3,"file":"relations.d.ts","sourceRoot":"","sources":["../../../src/test/db/relations.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKrB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC"}

package/lib/test/gen/column.d.ts

@@ -18,5 +18,6 @@ export declare const column: () => fc.Arbitrary<{
         onUpdate?: import("../..").SQLStatement | undefined;
         onDelete?: import("../..").SQLStatement | undefined;
     } | undefined;
+    provided?: boolean | undefined;
 }>;
 //# sourceMappingURL=column.d.ts.map

package/lib/test/gen/column.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"column.d.ts","sourceRoot":"","sources":["../../../src/test/gen/column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;EA+BlB,CAAC"}
+{"version":3,"file":"column.d.ts","sourceRoot":"","sources":["../../../src/test/gen/column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;EA+BlB,CAAC"}

package/lib/test/seed/index.d.ts

@@ -75,6 +75,15 @@ export declare const seed: (db: import("../..").Orm<{
                     readonly column: "id";
                 };
             };
+            readonly reviewedById: {
+                readonly name: "reviewed_by_id";
+                readonly type: "uuid";
+                readonly nullable: true;
+                readonly references: {
+                    readonly table: "user";
+                    readonly column: "id";
+                };
+            };
             readonly publishedAt: {
                 readonly type: "timestamp";
                 readonly nullable: true;
@@ -111,6 +120,15 @@ export declare const seed: (db: import("../..").Orm<{
                 readonly zodSchema: import("zod").ZodString;
                 readonly type: "text";
             };
+            readonly invitedById: {
+                readonly name: "invited_by_id";
+                readonly type: "uuid";
+                readonly nullable: true;
+                readonly references: {
+                    readonly table: "user";
+                    readonly column: "id";
+                };
+            };
             readonly joinedAt: {
                 readonly name: "created_at";
                 readonly zodSchema: import("zod").ZodDate;
@@ -188,6 +206,12 @@ export declare const seed: (db: import("../..").Orm<{
             readonly type: "N:1";
             readonly foreignKey: "authorId";
         };
+        readonly reviewedBy: {
+            readonly model: "user";
+            readonly type: "N:1";
+            readonly foreignKey: "reviewedById";
+            readonly optional: true;
+        };
         readonly tenant: {
             readonly model: "tenant";
             readonly type: "N:1";
@@ -200,6 +224,22 @@ export declare const seed: (db: import("../..").Orm<{
             readonly model: "post";
             readonly foreignKey: "authorId";
         };
+        readonly reviewedPosts: {
+            readonly type: "1:N";
+            readonly model: "post";
+            readonly foreignKey: "reviewedById";
+        };
+        readonly invitedBy: {
+            readonly type: "N:1";
+            readonly model: "user";
+            readonly foreignKey: "invitedById";
+            readonly optional: true;
+        };
+        readonly invitedUsers: {
+            readonly type: "1:N";
+            readonly model: "user";
+            readonly foreignKey: "invitedById";
+        };
         readonly tenancies: {
             readonly type: "1:N";
             readonly model: "tenantUser";

package/lib/test/seed/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/test/seed/index.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,UAAU,GAAG;IACrB,KAAK,EAAE;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE;YACL,IAAI,EAAE,MAAM,CAAC;YACb,KAAK,EAAE,MAAM,CAAC;SACjB,EAAE,CAAC;KACP,EAAE,CAAC;CACP,CAAC;AAEF,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAEL,UAAU,KACnB,QAAQ;IACP,KAAK,EAAE,OAAO,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACxD,OAAO,EAAE,OAAO,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACtD,WAAW,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACpD,KAAK,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC7E,CAoDA,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/test/seed/index.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,UAAU,GAAG;IACrB,KAAK,EAAE;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE;YACL,IAAI,EAAE,MAAM,CAAC;YACb,KAAK,EAAE,MAAM,CAAC;SACjB,EAAE,CAAC;KACP,EAAE,CAAC;CACP,CAAC;AAEF,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAEL,UAAU,KACnB,QAAQ;IACP,KAAK,EAAE,OAAO,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACxD,OAAO,EAAE,OAAO,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACtD,WAAW,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACpD,KAAK,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC7E,CAoDA,CAAC"}

package/lib/types/ModelType.d.ts

@@ -1,7 +1,14 @@
+import { IsNullable } from "../schema/types/helpers/IsNullable";
 import { LooseModelDefinition } from "../schema/types/loose/LooseModelDefinition";
 import { ColumnName } from "./ColumnName";
 import { ColumnType } from "./ColumnType";
-export type ModelType<Model extends LooseModelDefinition> = {
-    [C in ColumnName<Model>]: ColumnType<Model, C>;
-};
+import { Simplify } from "./util/Simplify";
+export type NullableColumn<Model extends LooseModelDefinition> = {
+    [C in ColumnName<Model>]: IsNullable<Model, C> extends true ? C : never;
+}[ColumnName<Model>];
+export type ModelType<Model extends LooseModelDefinition> = Simplify<{
+    [C in Exclude<ColumnName<Model>, NullableColumn<Model>>]: ColumnType<Model, C>;
+} & {
+    [C in NullableColumn<Model>]?: ColumnType<Model, C>;
+}>;
 //# sourceMappingURL=ModelType.d.ts.map

package/lib/types/ModelType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelType.d.ts","sourceRoot":"","sources":["../../src/types/ModelType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,MAAM,SAAS,CAAC,KAAK,SAAS,oBAAoB,IAAI;KACvD,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;CACjD,CAAC"}
+{"version":3,"file":"ModelType.d.ts","sourceRoot":"","sources":["../../src/types/ModelType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,MAAM,cAAc,CAAC,KAAK,SAAS,oBAAoB,IAAI;KAC5D,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,IAAI,GAAG,CAAC,GAAG,KAAK;CAC1E,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;AAErB,MAAM,MAAM,SAAS,CAAC,KAAK,SAAS,oBAAoB,IAAI,QAAQ,CAChE;KACK,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAChE,KAAK,EACL,CAAC,CACJ;CACJ,GAAG;KACC,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;CACtD,CACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@casekit/orm",
-  "version": "0.0.1-alpha.1",
+  "version": "0.0.1-alpha.11",
   "description": "A simple ORM",
   "type": "module",
   "main": "lib/index.js",
@@ -20,7 +20,7 @@
     "@types/pg-format": "^1.0.5",
     "@types/pluralize": "^0.0.33",
     "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^7.6.0",
+    "@typescript-eslint/eslint-plugin": "^7.7.0",
     "@vitest/coverage-istanbul": "^1.4.0",
     "@vitest/coverage-v8": "^1.4.0",
     "@vitest/ui": "^1.4.0",

package/src/migrate/commands/implode.ts

@@ -33,7 +33,7 @@ export const implode = async (
         }
     }
 
-    if (output) console.log(statement.text);
+    if (output || process.env.ORM_VERBOSE_LOGGING) console.log(statement.text);
 
     if (!dryRun) {
         try {

package/src/migrate/sql/createTableSql.test.ts

@@ -16,6 +16,7 @@ describe("createTableSql", () => {
             CREATE TABLE casekit."user" (
                 id uuid NOT NULL DEFAULT uuid_generate_v4(),
                 username text NOT NULL,
+                invited_by_id uuid,
                 created_at timestamp,
                 updated_at timestamp,
                 deleted_at timestamp,

package/src/orm.ts

@@ -328,8 +328,12 @@ export class Orm<
     public async query<T extends QueryResultRow>(
         fragments: TemplateStringsArray,
         ...variables: readonly unknown[]
-    ) {
+    ): Promise<T[]> {
         const query = sql(fragments, ...variables);
+        if (process.env.ORM_VERBOSE_LOGGING) {
+            console.log(query.text);
+            console.log(query.values);
+        }
         const result = await this.connection.query<T>(query);
         return result.rows;
     }
@@ -337,8 +341,12 @@ export class Orm<
     public async queryOne<T extends QueryResultRow>(
         fragments: TemplateStringsArray,
         ...variables: readonly unknown[]
-    ) {
+    ): Promise<T> {
         const query = sql(fragments, ...variables);
+        if (process.env.ORM_VERBOSE_LOGGING) {
+            console.log(query.text);
+            console.log(query.values);
+        }
         const result = await this.connection.query<T>(query);
         if (result.rowCount === 0 || result.rowCount === null)
             throw new OrmError("No rows returned from query");

package/src/queries/clauses/IncludeClause.ts

@@ -13,11 +13,27 @@ export type IncludeClause<
         model: ModelName<Models>;
     }
         ? Relations[M][R] extends { type: "N:1" }
-            ? FindOneParams<Models, Relations, Relations[M][R]["model"]>
+            ? Omit<
+                  FindOneParams<Models, Relations, Relations[M][R]["model"]>,
+                  // for can only be applied to the top level query
+                  "for"
+              >
             : Relations[M][R] extends { type: "1:N" }
-              ? FindManyParams<Models, Relations, Relations[M][R]["model"]>
+              ? Omit<
+                    FindManyParams<Models, Relations, Relations[M][R]["model"]>,
+                    // for can only be applied to the top level query
+                    "for"
+                >
               : Relations[M][R] extends { type: "N:N" }
-                ? FindManyParams<Models, Relations, Relations[M][R]["model"]>
+                ? Omit<
+                      FindManyParams<
+                          Models,
+                          Relations,
+                          Relations[M][R]["model"]
+                      >,
+                      // for can only be applied to the top level query
+                      "for"
+                  >
                 : never
         : never;
 };

package/src/queries/clauses/ReturningClause.ts

@@ -1,9 +1,7 @@
 import { ColumnName } from "../../schema/types/helpers/ColumnName";
-import { ModelName } from "../../schema/types/helpers/ModelName";
-import { LooseModelDefinitions } from "../../schema/types/loose/LooseModelDefinitions";
+import { LooseModelDefinition } from "../../schema/types/loose/LooseModelDefinition";
 import { NonEmptyArray } from "../../types/util/NonEmptyArray";
 
-export type ReturningClause<
-    Models extends LooseModelDefinitions,
-    M extends ModelName<Models>,
-> = NonEmptyArray<ColumnName<Models, M>>;
+export type ReturningClause<Model extends LooseModelDefinition> = NonEmptyArray<
+    ColumnName<Model>
+>;