@casekit/orm 0.0.1-alpha.7 → 0.0.1-alpha.9

package/src/schema/types/helpers/IsNullable.ts

@@ -1,9 +1,7 @@
-import { LooseModelDefinitions } from "../loose/LooseModelDefinitions";
+import { LooseModelDefinition } from "../loose/LooseModelDefinition";
 import { Columns } from "./Columns";
-import { ModelName } from "./ModelName";
 
 export type IsNullable<
-    Models extends LooseModelDefinitions,
-    M extends ModelName<Models>,
-    C extends keyof Columns<Models, M>,
-> = Columns<Models, M>[C]["nullable"] extends true ? true : false;
+    Model extends LooseModelDefinition,
+    C extends keyof Columns<Model>,
+> = Columns<Model>[C]["nullable"] extends true ? true : false;

package/src/schema/types/helpers/IsProvided.ts

@@ -1,10 +1,8 @@
-import { LooseModelDefinitions } from "../loose/LooseModelDefinitions";
+import { LooseModelDefinition } from "../loose/LooseModelDefinition";
 import { ColumnName } from "./ColumnName";
 import { Columns } from "./Columns";
-import { ModelName } from "./ModelName";
 
 export type IsProvided<
-    Models extends LooseModelDefinitions,
-    M extends ModelName<Models>,
-    C extends ColumnName<Models, M>,
-> = Columns<Models, M>[C]["provided"];
+    Model extends LooseModelDefinition,
+    C extends ColumnName<Model>,
+> = Columns<Model>[C]["provided"];

package/src/schema/types/helpers/IsSerial.ts

@@ -1,12 +1,10 @@
-import { LooseModelDefinitions } from "../loose/LooseModelDefinitions";
+import { LooseModelDefinition } from "../loose/LooseModelDefinition";
 import { ColumnName } from "./ColumnName";
 import { Columns } from "./Columns";
-import { ModelName } from "./ModelName";
 
 export type IsSerial<
-    Models extends LooseModelDefinitions,
-    M extends ModelName<Models>,
-    C extends ColumnName<Models, M>,
-> = Columns<Models, M>[C]["type"] extends "serial" | "bigserial" | "smallserial"
+    Model extends LooseModelDefinition,
+    C extends ColumnName<Model>,
+> = Columns<Model>[C]["type"] extends "serial" | "bigserial" | "smallserial"
     ? true
     : false;

package/src/schema/types/loose/LooseRelationDefinition.ts

@@ -1,6 +1,6 @@
 export type LooseRelationDefinition =
     | { model: string; type: "1:N"; foreignKey: string }
-    | { model: string; type: "N:1"; foreignKey: string }
+    | { model: string; type: "N:1"; foreignKey: string; optional?: true }
     | {
           model: string;
           type: "N:N";

package/src/schema/types/relations/ManyToManyRelation.ts

@@ -8,8 +8,8 @@ export type ManyToManyRelation<Models extends LooseModelDefinitions> = {
             model: M2;
             through: J;
             type: "N:N";
-            foreignKey: ColumnName<Models, J> | ColumnName<Models, J>[];
-            otherKey: ColumnName<Models, J> | ColumnName<Models, J>[];
+            foreignKey: ColumnName<Models[J]> | ColumnName<Models[J]>[];
+            otherKey: ColumnName<Models[J]> | ColumnName<Models[J]>[];
         };
     };
 }[ModelName<Models>][ModelName<Models>];

package/src/schema/types/relations/ManyToOneRelation.ts

@@ -9,6 +9,6 @@ export type ManyToOneRelation<
     [M2 in ModelName<Models>]: {
         model: M2;
         type: "N:1";
-        foreignKey: ColumnName<Models, M> | ColumnName<Models, M>[];
+        foreignKey: ColumnName<Models[M]> | ColumnName<Models[M]>[];
     };
 }[ModelName<Models>];

package/src/schema/types/relations/OneToManyRelation.ts

@@ -6,6 +6,7 @@ export type OneToManyRelation<Models extends LooseModelDefinitions> = {
     [M2 in ModelName<Models>]: {
         model: M2;
         type: "1:N";
-        foreignKey: ColumnName<Models, M2> | ColumnName<Models, M2>[];
+        foreignKey: ColumnName<Models[M2]> | ColumnName<Models[M2]>[];
+        optional?: boolean;
     };
 }[ModelName<Models>];

package/src/test/db/models/post.model.ts

@@ -15,6 +15,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/src/test/db/models/post.relations.ts

@@ -7,6 +7,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/src/test/db/models/user.model.ts

@@ -7,6 +7,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/src/test/db/models/user.relations.ts

@@ -7,6 +7,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/src/types/ModelType.ts

@@ -1,7 +1,20 @@
+import { IsNullable } from "../schema/types/helpers/IsNullable";
 import { LooseModelDefinition } from "../schema/types/loose/LooseModelDefinition";
 import { ColumnName } from "./ColumnName";
 import { ColumnType } from "./ColumnType";
+import { Simplify } from "./util/Simplify";
 
-export type ModelType<Model extends LooseModelDefinition> = {
-    [C in ColumnName<Model>]: ColumnType<Model, C>;
-};
+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>;
+    }
+>;

package/lib/queries/clauses/helpers/ModelValues.d.ts

@@ -1,8 +0,0 @@
-import { ColumnName } from "../../../schema/types/helpers/ColumnName";
-import { ColumnType } from "../../../schema/types/helpers/ColumnType";
-import { ModelName } from "../../../schema/types/helpers/ModelName";
-import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
-export type ModelValues<Models extends LooseModelDefinitions, M extends ModelName<Models>> = {
-    [C in ColumnName<Models, M>]: ColumnType<Models, M, C>;
-};
-//# sourceMappingURL=ModelValues.d.ts.map

package/lib/queries/clauses/helpers/ModelValues.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ModelValues.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/helpers/ModelValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAE1F,MAAM,MAAM,WAAW,CACnB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;KAAG,CAAC,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAAE,CAAC"}

package/lib/queries/clauses/helpers/ModelValues.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=ModelValues.js.map

package/lib/queries/clauses/helpers/ModelValues.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ModelValues.js","sourceRoot":"","sources":["../../../../src/queries/clauses/helpers/ModelValues.ts"],"names":[],"mappings":""}

package/src/queries/clauses/helpers/ModelValues.ts

@@ -1,9 +0,0 @@
-import { ColumnName } from "../../../schema/types/helpers/ColumnName";
-import { ColumnType } from "../../../schema/types/helpers/ColumnType";
-import { ModelName } from "../../../schema/types/helpers/ModelName";
-import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
-
-export type ModelValues<
-    Models extends LooseModelDefinitions,
-    M extends ModelName<Models>,
-> = { [C in ColumnName<Models, M>]: ColumnType<Models, M, C> };