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

package/lib/schema/types/relations/OneToManyRelation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OneToManyRelation.d.ts","sourceRoot":"","sources":["../../../../src/schema/types/relations/OneToManyRelation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,MAAM,MAAM,iBAAiB,CAAC,MAAM,SAAS,qBAAqB,IAAI;KACjE,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC,GAAG;QACvB,KAAK,EAAE,EAAE,CAAC;QACV,IAAI,EAAE,KAAK,CAAC;QACZ,UAAU,EAAE,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QAC9D,QAAQ,CAAC,EAAE,OAAO,CAAC;KACtB;CACJ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC"}
+{"version":3,"file":"OneToManyRelation.d.ts","sourceRoot":"","sources":["../../../../src/schema/types/relations/OneToManyRelation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,MAAM,MAAM,iBAAiB,CAAC,MAAM,SAAS,qBAAqB,IAAI;KACjE,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC,GAAG;QACvB,KAAK,EAAE,EAAE,CAAC;QACV,IAAI,EAAE,KAAK,CAAC;QACZ,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAC9D,QAAQ,CAAC,EAAE,OAAO,CAAC;KACtB;CACJ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,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.8",
+  "version": "0.0.1-alpha.9",
   "description": "A simple ORM",
   "type": "module",
   "main": "lib/index.js",

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>
+>;

package/src/queries/clauses/SelectClause.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 SelectClause<
-    Models extends LooseModelDefinitions,
-    M extends ModelName<Models>,
-> = NonEmptyArray<ColumnName<Models, M>>;
+export type SelectClause<Model extends LooseModelDefinition> = NonEmptyArray<
+    ColumnName<Model>
+>;

package/src/queries/clauses/WhereClause.ts

@@ -8,7 +8,7 @@ export type WhereClause<
     Models extends LooseModelDefinitions,
     M extends ModelName<Models>,
 > = {
-    [C in ColumnName<Models, M>]?: WhereClauseValue<Models, M, C>;
+    [C in ColumnName<Models[M]>]?: WhereClauseValue<Models, M, C>;
 } & {
     [$and]?: WhereClause<Models, M>[];
     [$or]?: WhereClause<Models, M>[];

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

@@ -3,20 +3,16 @@ import { HasDefault } from "../../../schema/types/helpers/HasDefault";
 import { IsNullable } from "../../../schema/types/helpers/IsNullable";
 import { IsProvided } from "../../../schema/types/helpers/IsProvided";
 import { IsSerial } from "../../../schema/types/helpers/IsSerial";
-import { ModelName } from "../../../schema/types/helpers/ModelName";
-import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
+import { LooseModelDefinition } from "../../../schema/types/loose/LooseModelDefinition";
 
-export type OptionalColumn<
-    Models extends LooseModelDefinitions,
-    M extends ModelName<Models>,
-> = {
-    [C in ColumnName<Models, M>]: IsNullable<Models, M, C> extends true
+export type OptionalColumn<Model extends LooseModelDefinition> = {
+    [C in ColumnName<Model>]: IsNullable<Model, C> extends true
         ? C
-        : IsSerial<Models, M, C> extends true
+        : IsSerial<Model, C> extends true
           ? C
-          : HasDefault<Models, M, C> extends true
+          : HasDefault<Model, C> extends true
             ? C
-            : IsProvided<Models, M, C> extends true
+            : IsProvided<Model, C> extends true
               ? C
               : never;
-}[ColumnName<Models, M>];
+}[ColumnName<Model>];

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

@@ -7,8 +7,8 @@ export type OptionalParams<
     Models extends LooseModelDefinitions,
     M extends ModelName<Models>,
 > =
-    OptionalColumn<Models, M> extends never
+    OptionalColumn<Models[M]> extends never
         ? unknown
         : {
-              [C in OptionalColumn<Models, M>]?: ColumnType<Models, M, C>;
+              [C in OptionalColumn<Models[M]>]?: ColumnType<Models, M, C>;
           };

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

@@ -1,9 +1,8 @@
 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 { OptionalColumn } from "./OptionalColumn";
 
-export type RequiredColumn<
-    Models extends LooseModelDefinitions,
-    M extends ModelName<Models>,
-> = Exclude<ColumnName<Models, M>, OptionalColumn<Models, M>>;
+export type RequiredColumn<Model extends LooseModelDefinition> = Exclude<
+    ColumnName<Model>,
+    OptionalColumn<Model>
+>;

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

@@ -7,8 +7,8 @@ export type RequiredParams<
     Models extends LooseModelDefinitions,
     M extends ModelName<Models>,
 > =
-    RequiredColumn<Models, M> extends never
+    RequiredColumn<Models[M]> extends never
         ? unknown
         : {
-              [C in RequiredColumn<Models, M>]: ColumnType<Models, M, C>;
+              [C in RequiredColumn<Models[M]>]: ColumnType<Models, M, C>;
           };

package/src/queries/clauses/where/types/WhereClauseValue.ts

@@ -19,7 +19,7 @@ import {
 export type WhereClauseValue<
     Models extends LooseModelDefinitions,
     M extends ModelName<Models>,
-    C extends ColumnName<Models, M>,
+    C extends ColumnName<Models[M]>,
     T = ColumnType<Models, M, C>,
 > =
     | ColumnType<Models, M, C>

package/src/queries/create/types/CreateManyParams.ts

@@ -8,7 +8,7 @@ export type CreateManyParams<
     M extends ModelName<Models>,
 > = {
     values: CreateValues<Models, M>[];
-    returning?: ReturningClause<Models, M>;
+    returning?: ReturningClause<Models[M]>;
     onConflict?: {
         do: "nothing";
     };

package/src/queries/create/types/CreateManyResult.ts

@@ -10,7 +10,7 @@ export type CreateManyResult<
     M extends ModelName<Models>,
     P extends CreateOneParams<Models, M> | CreateManyParams<Models, M>,
 > =
-    P["returning"] extends ReturningClause<Models, M>
+    P["returning"] extends ReturningClause<Models[M]>
         ? Readonly<{
               [C in P["returning"][number]]: ColumnType<Models, M, C>;
           }>[]

package/src/queries/create/types/CreateOneParams.ts

@@ -15,7 +15,7 @@ export type CreateOneParams<
     M extends ModelName<Models>,
 > = {
     values: CreateValues<Models, M>;
-    returning?: ReturningClause<Models, M>;
+    returning?: ReturningClause<Models[M]>;
     onConflict?: {
         do: "nothing";
     };

package/src/queries/create/types/CreateOneResult.ts

@@ -10,7 +10,7 @@ export type CreateOneResult<
     M extends ModelName<Models>,
     P extends CreateOneParams<Models, M> | CreateManyParams<Models, M>,
 > =
-    P["returning"] extends SelectClause<Models, M>
+    P["returning"] extends SelectClause<Models[M]>
         ? Readonly<{
               [C in P["returning"][number]]: ColumnType<Models, M, C>;
           }>

package/src/queries/delete/types/DeleteManyResult.ts

@@ -9,7 +9,7 @@ export type DeleteManyResult<
     M extends ModelName<Models>,
     P extends DeleteParams<Models, M>,
 > =
-    P["returning"] extends ReturningClause<Models, M>
+    P["returning"] extends ReturningClause<Models[M]>
         ? Readonly<{
               [C in P["returning"][number]]: ColumnType<Models, M, C>;
           }>[]

package/src/queries/delete/types/DeleteOneResult.ts

@@ -9,7 +9,7 @@ export type DeleteOneResult<
     M extends ModelName<Models>,
     P extends DeleteParams<Models, M>,
 > =
-    P["returning"] extends ReturningClause<Models, M>
+    P["returning"] extends ReturningClause<Models[M]>
         ? Readonly<{
               [C in P["returning"][number]]: ColumnType<Models, M, C>;
           }>

package/src/queries/delete/types/DeleteParams.ts

@@ -8,5 +8,5 @@ export type DeleteParams<
     M extends ModelName<Models>,
 > = {
     where: WhereClause<Models, M>;
-    returning?: ReturningClause<Models, M>;
+    returning?: ReturningClause<Models[M]>;
 };

package/src/queries/find/types/FindManyParams.ts

@@ -12,12 +12,12 @@ export type FindManyParams<
     Relations extends LooseRelationsDefinitions<Models>,
     M extends ModelName<Models>,
 > = {
-    select: SelectClause<Models, M>;
+    select: SelectClause<Models[M]>;
     include?: IncludeClause<Models, Relations, M>;
     where?: WhereClause<Models, M>;
     limit?: number;
     offset?: number;
     orderBy?: NonEmptyArray<
-        ColumnName<Models, M> | [ColumnName<Models, M>, "asc" | "desc"]
+        ColumnName<Models[M]> | [ColumnName<Models[M]>, "asc" | "desc"]
     >;
 };

package/src/queries/find/types/FindOneParams.ts

@@ -10,7 +10,7 @@ export type FindOneParams<
     Relations extends LooseRelationsDefinitions<Models>,
     M extends ModelName<Models>,
 > = {
-    select: SelectClause<Models, M>;
+    select: SelectClause<Models[M]>;
     where?: WhereClause<Models, M>;
     include?: IncludeClause<Models, Relations, M>;
 };

package/src/queries/update/types/UpdateManyResult.ts

@@ -9,7 +9,7 @@ export type UpdateManyResult<
     M extends ModelName<Models>,
     P extends UpdateParams<Models, M>,
 > =
-    P["returning"] extends ReturningClause<Models, M>
+    P["returning"] extends ReturningClause<Models[M]>
         ? Readonly<{
               [C in P["returning"][number]]: ColumnType<Models, M, C>;
           }>[]

package/src/queries/update/types/UpdateOneResult.ts

@@ -9,7 +9,7 @@ export type UpdateOneResult<
     M extends ModelName<Models>,
     P extends UpdateParams<Models, M>,
 > =
-    P["returning"] extends ReturningClause<Models, M>
+    P["returning"] extends ReturningClause<Models[M]>
         ? Readonly<{
               [C in P["returning"][number]]: ColumnType<Models, M, C>;
           }>

package/src/queries/update/types/UpdateParams.ts

@@ -10,5 +10,5 @@ export type UpdateParams<
 > = {
     values: UpdateValues<Models, M>;
     where: WhereClause<Models, M>;
-    returning?: ReturningClause<Models, M>;
+    returning?: ReturningClause<Models[M]>;
 };

package/src/queries/update/types/UpdateValues.ts

@@ -8,5 +8,5 @@ export type UpdateValues<
     Models extends LooseModelDefinitions,
     M extends ModelName<Models>,
 > = Simplify<{
-    [C in ColumnName<Models, M>]?: ColumnType<Models, M, C>;
+    [C in ColumnName<Models[M]>]?: ColumnType<Models, M, C>;
 }>;

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

@@ -1,7 +1,6 @@
-import { LooseModelDefinitions } from "../loose/LooseModelDefinitions";
-import { ModelName } from "./ModelName";
+import { LooseModelDefinition } from "../loose/LooseModelDefinition";
 
-export type ColumnName<
-    Models extends LooseModelDefinitions,
-    M extends ModelName<Models>,
-> = Extract<keyof Models[M]["columns"], string>;
+export type ColumnName<Model extends LooseModelDefinition> = Extract<
+    keyof Model["columns"],
+    string
+>;

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

@@ -8,7 +8,7 @@ import { ModelName } from "./ModelName";
 type NonNullableColumnType<
     Models extends LooseModelDefinitions,
     M extends ModelName<Models>,
-    C extends ColumnName<Models, M>,
+    C extends ColumnName<Models[M]>,
 > =
     Models[M]["columns"][C]["zodSchema"] extends z.ZodType<unknown>
         ? z.infer<Models[M]["columns"][C]["zodSchema"]>
@@ -17,7 +17,7 @@ type NonNullableColumnType<
 export type ColumnType<
     Models extends LooseModelDefinitions,
     M extends ModelName<Models>,
-    C extends ColumnName<Models, M>,
+    C extends ColumnName<Models[M]>,
 > = Models[M]["columns"][C]["nullable"] extends true
     ? NonNullableColumnType<Models, M, C> | null
     : NonNullableColumnType<Models, M, C>;

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

@@ -1,7 +1,3 @@
-import { LooseModelDefinitions } from "../loose/LooseModelDefinitions";
-import { ModelName } from "./ModelName";
+import { LooseModelDefinition } from "../loose/LooseModelDefinition";
 
-export type Columns<
-    Models extends LooseModelDefinitions,
-    M extends ModelName<Models>,
-> = Models[M]["columns"];
+export type Columns<Model extends LooseModelDefinition> = Model["columns"];

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

@@ -1,13 +1,11 @@
-import { LooseModelDefinitions } from "../loose/LooseModelDefinitions";
+import { LooseModelDefinition } from "../loose/LooseModelDefinition";
 import { Columns } from "./Columns";
-import { ModelName } from "./ModelName";
 
 export type HasDefault<
-    Models extends LooseModelDefinitions,
-    M extends ModelName<Models>,
-    C extends keyof Columns<Models, M>,
-> = null extends Columns<Models, M>[C]["default"]
+    Model extends LooseModelDefinition,
+    C extends keyof Columns<Model>,
+> = null extends Columns<Model>[C]["default"]
     ? false
-    : undefined extends Columns<Models, M>[C]["default"]
+    : undefined extends Columns<Model>[C]["default"]
       ? false
       : true;

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/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,7 +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/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> };