hysteria-orm 10.4.7 → 10.4.9

package/lib/index.d.cts

@@ -4135,17 +4135,14 @@ declare class ModelManager<T extends Model> {
      * @description Finds all records that match the input
      */
     find<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input?: FindType<T, S, R>): Promise<AnnotatedModel<T, {}>[]>;
-    find<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input?: UnrestrictedFindType<T, S, R>): Promise<AnnotatedModel<T, {}>[]>;
     /**
      * @description Finds the first record that matches the input
      */
-    findOne<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: UnrestrictedFindOneType<T, S, R>): Promise<AnnotatedModel<T, {}> | null>;
     findOne<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: FindOneType<T, S, R>): Promise<AnnotatedModel<T, {}> | null>;
     /**
      * @description Finds the first record that matches the input or throws an error
      */
     findOneOrFail<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: FindOneType<T, S, R>): Promise<AnnotatedModel<T, {}>>;
-    findOneOrFail<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: UnrestrictedFindOneType<T, S, R>): Promise<AnnotatedModel<T, {}>>;
     /**
      * @description Finds a record by its primary key
      * @description Ignores all model hooks
@@ -4197,6 +4194,8 @@ declare class ModelManager<T extends Model> {
      * After each insert, it queries the row back using unique columns to get the generated ID.
      */
     private handleOracleIdentityInsert;
+    private handleWhereCondition;
+    private applyFieldCondition;
 }
 
 type TableColumnInfo = {
@@ -5219,8 +5218,50 @@ type OnlyRelations<T> = {
 type OnlyM2MRelations<T> = {
     [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 FindComparisonOperator = "$eq" | "$ne" | "$gt" | "$gte" | "$lt" | "$lte";
+type BaseWhereType<T> = {
+    [K in keyof T as T[K] extends Function ? never : K]?: T[K] | {
+        op: "$between";
+        value: [T[K], T[K]];
+    } | {
+        op: "$not between";
+        value: [T[K], T[K]];
+    } | {
+        op: "$regexp";
+        value: RegExp;
+    } | {
+        op: "$not regexp";
+        value: RegExp;
+    } | {
+        op: "$is null";
+    } | {
+        op: "$is not null";
+    } | {
+        op: "$like";
+        value: string;
+    } | {
+        op: "$not like";
+        value: string;
+    } | {
+        op: "$ilike";
+        value: string;
+    } | {
+        op: "$not ilike";
+        value: string;
+    } | {
+        op: "$in";
+        value: T[K][];
+    } | {
+        op: "$nin";
+        value: T[K][];
+    } | {
+        op: FindComparisonOperator;
+        value: T[K] | T[K][] | null;
+    };
+};
+type WhereType<T> = BaseWhereType<T> & {
+    $and?: WhereType<T>[];
+    $or?: WhereType<T>[];
 };
 type ModelKey<T extends Model> = {
     [K in keyof T]: T[K] extends NullableAndUndefinable<Model> | NullableAndUndefinable<Model[]> ? never : K extends "*" ? never : T[K] extends (...args: any[]) => any ? never : K;
@@ -5232,18 +5273,6 @@ type OrderByType<T extends Model> = {
 } & {
     [K in string]?: OrderByChoices;
 };
-type UnrestrictedFindOneType<T extends Model, S extends ModelKey<T>[] = any[], R extends ModelRelation<T>[] = never[]> = {
-    select?: S;
-    relations?: R;
-    ignoreHooks?: FetchHooks;
-    where?: Record<string, any>;
-    orderBy?: OrderByType<T>;
-    groupBy?: string[];
-    offset?: number;
-};
-type UnrestrictedFindType<T extends Model, S extends ModelKey<T>[] = any[], R extends ModelRelation<T>[] = never[]> = Omit<UnrestrictedFindOneType<T, S, R>, "throwErrorOnNull"> & {
-    limit?: number;
-};
 type FindOneType<T extends Model, S extends ModelKey<T>[] = any[], R extends ModelRelation<T>[] = never[]> = {
     select?: S;
     offset?: number;
@@ -5318,17 +5347,17 @@ declare abstract class Model extends Entity {
     /**
      * @description Finds records for the given model
      */
-    static find<T extends Model, S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(this: new () => T | typeof Model, findOptions?: FindType<T, S, R> | UnrestrictedFindType<T, S, R>, options?: Omit<BaseModelMethodOptions, "ignoreHooks">): Promise<FindReturnType<T, S, R>[]>;
+    static find<T extends Model, S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(this: new () => T | typeof Model, findOptions?: FindType<T, S, R>, options?: Omit<BaseModelMethodOptions, "ignoreHooks">): Promise<FindReturnType<T, S, R>[]>;
     /**
      * @description Finds a record for the given model or throws an error if it doesn't exist
      */
-    static findOneOrFail<T extends Model, S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(this: new () => T | typeof Model, findOneOptions: (FindOneType<T, S, R> | UnrestrictedFindOneType<T, S, R>) & {
+    static findOneOrFail<T extends Model, S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(this: new () => T | typeof Model, findOneOptions: FindOneType<T, S, R> & {
         customError?: Error;
     }, options?: Omit<BaseModelMethodOptions, "ignoreHooks">): Promise<FindReturnType<T, S, R>>;
     /**
      * @description Finds a record for the given model
      */
-    static findOne<T extends Model, S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(this: new () => T | typeof Model, findOneOptions: (FindOneType<T, S, R> | UnrestrictedFindOneType<T, S, R>) & BaseModelMethodOptions, options?: Omit<BaseModelMethodOptions, "ignoreHooks">): Promise<FindReturnType<T, S, R> | null>;
+    static findOne<T extends Model, S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(this: new () => T | typeof Model, findOneOptions: FindOneType<T, S, R> & BaseModelMethodOptions, options?: Omit<BaseModelMethodOptions, "ignoreHooks">): Promise<FindReturnType<T, S, R> | null>;
     /**
      * @description Finds records for the given column and value
      */

package/lib/index.d.ts

@@ -4135,17 +4135,14 @@ declare class ModelManager<T extends Model> {
      * @description Finds all records that match the input
      */
     find<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input?: FindType<T, S, R>): Promise<AnnotatedModel<T, {}>[]>;
-    find<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input?: UnrestrictedFindType<T, S, R>): Promise<AnnotatedModel<T, {}>[]>;
     /**
      * @description Finds the first record that matches the input
      */
-    findOne<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: UnrestrictedFindOneType<T, S, R>): Promise<AnnotatedModel<T, {}> | null>;
     findOne<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: FindOneType<T, S, R>): Promise<AnnotatedModel<T, {}> | null>;
     /**
      * @description Finds the first record that matches the input or throws an error
      */
     findOneOrFail<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: FindOneType<T, S, R>): Promise<AnnotatedModel<T, {}>>;
-    findOneOrFail<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: UnrestrictedFindOneType<T, S, R>): Promise<AnnotatedModel<T, {}>>;
     /**
      * @description Finds a record by its primary key
      * @description Ignores all model hooks
@@ -4197,6 +4194,8 @@ declare class ModelManager<T extends Model> {
      * After each insert, it queries the row back using unique columns to get the generated ID.
      */
     private handleOracleIdentityInsert;
+    private handleWhereCondition;
+    private applyFieldCondition;
 }
 
 type TableColumnInfo = {
@@ -5219,8 +5218,50 @@ type OnlyRelations<T> = {
 type OnlyM2MRelations<T> = {
     [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 FindComparisonOperator = "$eq" | "$ne" | "$gt" | "$gte" | "$lt" | "$lte";
+type BaseWhereType<T> = {
+    [K in keyof T as T[K] extends Function ? never : K]?: T[K] | {
+        op: "$between";
+        value: [T[K], T[K]];
+    } | {
+        op: "$not between";
+        value: [T[K], T[K]];
+    } | {
+        op: "$regexp";
+        value: RegExp;
+    } | {
+        op: "$not regexp";
+        value: RegExp;
+    } | {
+        op: "$is null";
+    } | {
+        op: "$is not null";
+    } | {
+        op: "$like";
+        value: string;
+    } | {
+        op: "$not like";
+        value: string;
+    } | {
+        op: "$ilike";
+        value: string;
+    } | {
+        op: "$not ilike";
+        value: string;
+    } | {
+        op: "$in";
+        value: T[K][];
+    } | {
+        op: "$nin";
+        value: T[K][];
+    } | {
+        op: FindComparisonOperator;
+        value: T[K] | T[K][] | null;
+    };
+};
+type WhereType<T> = BaseWhereType<T> & {
+    $and?: WhereType<T>[];
+    $or?: WhereType<T>[];
 };
 type ModelKey<T extends Model> = {
     [K in keyof T]: T[K] extends NullableAndUndefinable<Model> | NullableAndUndefinable<Model[]> ? never : K extends "*" ? never : T[K] extends (...args: any[]) => any ? never : K;
@@ -5232,18 +5273,6 @@ type OrderByType<T extends Model> = {
 } & {
     [K in string]?: OrderByChoices;
 };
-type UnrestrictedFindOneType<T extends Model, S extends ModelKey<T>[] = any[], R extends ModelRelation<T>[] = never[]> = {
-    select?: S;
-    relations?: R;
-    ignoreHooks?: FetchHooks;
-    where?: Record<string, any>;
-    orderBy?: OrderByType<T>;
-    groupBy?: string[];
-    offset?: number;
-};
-type UnrestrictedFindType<T extends Model, S extends ModelKey<T>[] = any[], R extends ModelRelation<T>[] = never[]> = Omit<UnrestrictedFindOneType<T, S, R>, "throwErrorOnNull"> & {
-    limit?: number;
-};
 type FindOneType<T extends Model, S extends ModelKey<T>[] = any[], R extends ModelRelation<T>[] = never[]> = {
     select?: S;
     offset?: number;
@@ -5318,17 +5347,17 @@ declare abstract class Model extends Entity {
     /**
      * @description Finds records for the given model
      */
-    static find<T extends Model, S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(this: new () => T | typeof Model, findOptions?: FindType<T, S, R> | UnrestrictedFindType<T, S, R>, options?: Omit<BaseModelMethodOptions, "ignoreHooks">): Promise<FindReturnType<T, S, R>[]>;
+    static find<T extends Model, S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(this: new () => T | typeof Model, findOptions?: FindType<T, S, R>, options?: Omit<BaseModelMethodOptions, "ignoreHooks">): Promise<FindReturnType<T, S, R>[]>;
     /**
      * @description Finds a record for the given model or throws an error if it doesn't exist
      */
-    static findOneOrFail<T extends Model, S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(this: new () => T | typeof Model, findOneOptions: (FindOneType<T, S, R> | UnrestrictedFindOneType<T, S, R>) & {
+    static findOneOrFail<T extends Model, S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(this: new () => T | typeof Model, findOneOptions: FindOneType<T, S, R> & {
         customError?: Error;
     }, options?: Omit<BaseModelMethodOptions, "ignoreHooks">): Promise<FindReturnType<T, S, R>>;
     /**
      * @description Finds a record for the given model
      */
-    static findOne<T extends Model, S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(this: new () => T | typeof Model, findOneOptions: (FindOneType<T, S, R> | UnrestrictedFindOneType<T, S, R>) & BaseModelMethodOptions, options?: Omit<BaseModelMethodOptions, "ignoreHooks">): Promise<FindReturnType<T, S, R> | null>;
+    static findOne<T extends Model, S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(this: new () => T | typeof Model, findOneOptions: FindOneType<T, S, R> & BaseModelMethodOptions, options?: Omit<BaseModelMethodOptions, "ignoreHooks">): Promise<FindReturnType<T, S, R> | null>;
     /**
      * @description Finds records for the given column and value
      */