hysteria-orm 10.1.5 → 10.1.7

package/lib/index.d.cts

@@ -3891,54 +3891,7 @@ type AnnotatedModel<T extends Model, A extends object = {}, R extends object = {
 type CommonSqlMethodReturnType<T extends SqlMethod> = T extends "count" | "sum" | "avg" | "min" | "max" ? number : T extends "upper" | "lower" | "trim" ? string : T extends "length" ? number : T extends "cast" | "convert" ? any : T extends "abs" | "round" | "floor" | "ceil" ? number : any;
 type RelatedInstance<M extends Model, K extends ModelRelation<M>> = M[K] extends (infer R)[] ? R extends Model ? R : never : M[K] extends Model ? M[K] : never;
 
-declare class BelongsTo extends Relation {
-    type: RelationEnum;
-    foreignKey: string;
-    constructor(relatedModel: typeof Model, columnName: string, foreignKey: string);
-}
-
-declare class HasMany extends Relation {
-    type: RelationEnum;
-    foreignKey: string;
-    constructor(relatedModel: typeof Model, columnName: string, foreignKey: string);
-}
-
-declare class HasOne extends Relation {
-    type: RelationEnum;
-    foreignKey: string;
-    constructor(relatedModel: typeof Model, columnName: string, foreignKey: string);
-}
-
-declare class ManyToMany extends Relation {
-    type: RelationEnum;
-    /**
-     * @description The model that establishes the relation
-     */
-    primaryModel: string;
-    /**
-     * @description The model that is being related to
-     */
-    relatedModel: string;
-    /**
-     * @description The foreign key of the related model in the through table
-     */
-    rightForeignKey: string;
-    /**
-     * @description The table that joins the two models
-     */
-    throughModel: string;
-    /**
-     * @description The foreign key of the primary model in the through table
-     */
-    leftForeignKey: string;
-    constructor(model: typeof Model, columnName: string, data: {
-        primaryModel: string;
-        throughModel: string;
-        leftForeignKey: string;
-        rightForeignKey: string;
-    });
-}
-
+type NullableAndUndefinable<T> = T | (T | null) | (T | undefined) | (T | null | undefined);
 type UpsertOptions<T extends Model> = {
     ignoreHooks?: boolean;
     updateOnConflict?: boolean;
@@ -3949,19 +3902,19 @@ type InsertOptions<T extends Model> = {
     returning?: ModelKey<T>[];
 };
 type ExcludeRelations<T> = {
-    [K in keyof T]: T[K] extends (Model[] | HasMany) | (Model | HasMany) | (Model | BelongsTo) | (Model[] | BelongsTo) | (Model | HasOne) | (Model[] | HasOne) | (Model | ManyToMany) | (Model[] | ManyToMany) | ((...args: any[]) => any) ? never : K;
+    [K in keyof T]: T[K] extends NullableAndUndefinable<Model> | NullableAndUndefinable<Model[]> | ((...args: any[]) => any) ? never : K;
 }[keyof T];
 type OnlyRelations<T> = {
-    [K in keyof T]: T[K] extends Model[] | Model ? K : never;
+    [K in keyof T]: T[K] extends NullableAndUndefinable<Model> | NullableAndUndefinable<Model[]> ? K : never;
 }[keyof T];
 type OnlyM2MRelations<T> = {
-    [K in keyof T]: K extends string ? (T[K] extends Model[] ? K : never) : never;
+    [K in keyof T]: K extends string ? T[K] extends NullableAndUndefinable<Model[]> ? K : never : never;
 }[keyof T];
 type WhereType<T> = {
     [K in keyof T]?: T[K];
 };
 type ModelKey<T extends Model> = {
-    [K in keyof T]: T[K] extends (Model[] | HasMany) | (Model | HasMany) | (Model | BelongsTo) | (Model[] | BelongsTo) | (Model | HasOne) | (Model[] | HasOne) ? never : K extends "*" ? never : T[K] extends (...args: any[]) => any ? never : K;
+    [K in keyof T]: T[K] extends NullableAndUndefinable<Model> | NullableAndUndefinable<Model[]> ? never : K extends "*" ? never : T[K] extends (...args: any[]) => any ? never : K;
 }[keyof T];
 type ModelRelation<T extends Model> = OnlyRelations<T>;
 type OrderByChoices = "asc" | "desc";

package/lib/index.d.ts

@@ -3891,54 +3891,7 @@ type AnnotatedModel<T extends Model, A extends object = {}, R extends object = {
 type CommonSqlMethodReturnType<T extends SqlMethod> = T extends "count" | "sum" | "avg" | "min" | "max" ? number : T extends "upper" | "lower" | "trim" ? string : T extends "length" ? number : T extends "cast" | "convert" ? any : T extends "abs" | "round" | "floor" | "ceil" ? number : any;
 type RelatedInstance<M extends Model, K extends ModelRelation<M>> = M[K] extends (infer R)[] ? R extends Model ? R : never : M[K] extends Model ? M[K] : never;
 
-declare class BelongsTo extends Relation {
-    type: RelationEnum;
-    foreignKey: string;
-    constructor(relatedModel: typeof Model, columnName: string, foreignKey: string);
-}
-
-declare class HasMany extends Relation {
-    type: RelationEnum;
-    foreignKey: string;
-    constructor(relatedModel: typeof Model, columnName: string, foreignKey: string);
-}
-
-declare class HasOne extends Relation {
-    type: RelationEnum;
-    foreignKey: string;
-    constructor(relatedModel: typeof Model, columnName: string, foreignKey: string);
-}
-
-declare class ManyToMany extends Relation {
-    type: RelationEnum;
-    /**
-     * @description The model that establishes the relation
-     */
-    primaryModel: string;
-    /**
-     * @description The model that is being related to
-     */
-    relatedModel: string;
-    /**
-     * @description The foreign key of the related model in the through table
-     */
-    rightForeignKey: string;
-    /**
-     * @description The table that joins the two models
-     */
-    throughModel: string;
-    /**
-     * @description The foreign key of the primary model in the through table
-     */
-    leftForeignKey: string;
-    constructor(model: typeof Model, columnName: string, data: {
-        primaryModel: string;
-        throughModel: string;
-        leftForeignKey: string;
-        rightForeignKey: string;
-    });
-}
-
+type NullableAndUndefinable<T> = T | (T | null) | (T | undefined) | (T | null | undefined);
 type UpsertOptions<T extends Model> = {
     ignoreHooks?: boolean;
     updateOnConflict?: boolean;
@@ -3949,19 +3902,19 @@ type InsertOptions<T extends Model> = {
     returning?: ModelKey<T>[];
 };
 type ExcludeRelations<T> = {
-    [K in keyof T]: T[K] extends (Model[] | HasMany) | (Model | HasMany) | (Model | BelongsTo) | (Model[] | BelongsTo) | (Model | HasOne) | (Model[] | HasOne) | (Model | ManyToMany) | (Model[] | ManyToMany) | ((...args: any[]) => any) ? never : K;
+    [K in keyof T]: T[K] extends NullableAndUndefinable<Model> | NullableAndUndefinable<Model[]> | ((...args: any[]) => any) ? never : K;
 }[keyof T];
 type OnlyRelations<T> = {
-    [K in keyof T]: T[K] extends Model[] | Model ? K : never;
+    [K in keyof T]: T[K] extends NullableAndUndefinable<Model> | NullableAndUndefinable<Model[]> ? K : never;
 }[keyof T];
 type OnlyM2MRelations<T> = {
-    [K in keyof T]: K extends string ? (T[K] extends Model[] ? K : never) : never;
+    [K in keyof T]: K extends string ? T[K] extends NullableAndUndefinable<Model[]> ? K : never : never;
 }[keyof T];
 type WhereType<T> = {
     [K in keyof T]?: T[K];
 };
 type ModelKey<T extends Model> = {
-    [K in keyof T]: T[K] extends (Model[] | HasMany) | (Model | HasMany) | (Model | BelongsTo) | (Model[] | BelongsTo) | (Model | HasOne) | (Model[] | HasOne) ? never : K extends "*" ? never : T[K] extends (...args: any[]) => any ? never : K;
+    [K in keyof T]: T[K] extends NullableAndUndefinable<Model> | NullableAndUndefinable<Model[]> ? never : K extends "*" ? never : T[K] extends (...args: any[]) => any ? never : K;
 }[keyof T];
 type ModelRelation<T extends Model> = OnlyRelations<T>;
 type OrderByChoices = "asc" | "desc";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hysteria-orm",
-  "version": "10.1.5",
+  "version": "10.1.7",
   "license": "MIT",
   "description": "Yet another orm for Javascript and Typescript no one asked for",
   "type": "module",