hysteria-orm 10.4.4 → 10.4.6

package/lib/index.d.ts

@@ -2323,11 +2323,12 @@ declare class JoinNode extends QueryNode {
     folder: string;
     file: string;
     type: "inner" | "left" | "right" | "full" | "cross" | "natural";
+    additionalConditions?: (WhereNode | WhereGroupNode | WhereSubqueryNode)[];
     constructor(table: string, left: string, right: string, type: "inner" | "left" | "right" | "full" | "cross" | "natural" | undefined, on: {
         left?: string;
         right?: string;
         operator: string;
-    }, isRawValue?: boolean);
+    }, isRawValue?: boolean, additionalConditions?: (WhereNode | WhereGroupNode | WhereSubqueryNode)[]);
 }
 
 declare class GroupByNode extends QueryNode {
@@ -2651,6 +2652,222 @@ declare abstract class FooterQueryBuilder<T extends Model> {
     offset(offset: number): this;
 }
 
+declare class JoinOnQueryBuilder {
+    protected sqlDataSource: SqlDataSource;
+    protected whereNodes: (WhereNode | WhereGroupNode | WhereSubqueryNode)[];
+    protected isNestedCondition: boolean;
+    constructor(sqlDataSource: SqlDataSource, isNestedCondition?: boolean);
+    /**
+     * @description Get the where conditions for the join
+     */
+    getConditions(): (WhereNode | WhereGroupNode | WhereSubqueryNode)[];
+    /**
+     * @description Adds a WHERE condition to the query.
+     */
+    where(column: SelectableColumn<string>, operator: BinaryOperatorType, value: BaseValues): this;
+    where(cb: (queryBuilder: JoinOnQueryBuilder) => void): this;
+    where(column: SelectableColumn<string>, value: BaseValues): this;
+    /**
+     * @description Adds an AND WHERE condition to the query.
+     */
+    andWhere(column: SelectableColumn<string>, operator: BinaryOperatorType, value: BaseValues): this;
+    andWhere(column: SelectableColumn<string>, value: BaseValues): this;
+    andWhere(cb: (queryBuilder: JoinOnQueryBuilder) => void): this;
+    /**
+     * @description Adds an OR WHERE condition to the query.
+     */
+    orWhere(column: SelectableColumn<string>, operator: BinaryOperatorType, value: BaseValues): this;
+    orWhere(column: SelectableColumn<string>, value: BaseValues): this;
+    orWhere(cb: (queryBuilder: JoinOnQueryBuilder) => void): this;
+    /**
+     * @description Adds a negated WHERE condition to the query.
+     */
+    whereNot(column: SelectableColumn<string>, operator: BinaryOperatorType, value: BaseValues): this;
+    whereNot(column: SelectableColumn<string>, value: BaseValues): this;
+    /**
+     * @description Adds a negated AND WHERE condition to the query.
+     */
+    andWhereNot(column: SelectableColumn<string>, operator: BinaryOperatorType, value: BaseValues): this;
+    andWhereNot(column: SelectableColumn<string>, value: BaseValues): this;
+    /**
+     * @description Adds a negated OR WHERE condition to the query.
+     */
+    orWhereNot(column: SelectableColumn<string>, operator: BinaryOperatorType, value: BaseValues): this;
+    orWhereNot(column: SelectableColumn<string>, value: BaseValues): this;
+    /**
+     * @description Adds a WHERE BETWEEN condition to the query.
+     */
+    whereBetween(column: SelectableColumn<string>, min: BaseValues, max: BaseValues): this;
+    /**
+     * @description Adds an AND WHERE BETWEEN condition to the query.
+     */
+    andWhereBetween(column: SelectableColumn<string>, min: BaseValues, max: BaseValues): this;
+    /**
+     * @description Adds an OR WHERE BETWEEN condition to the query.
+     */
+    orWhereBetween(column: SelectableColumn<string>, min: BaseValues, max: BaseValues): this;
+    /**
+     * @description Adds a WHERE NOT BETWEEN condition to the query.
+     */
+    whereNotBetween(column: SelectableColumn<string>, min: BaseValues, max: BaseValues): this;
+    /**
+     * @description Adds an AND WHERE NOT BETWEEN condition to the query.
+     */
+    andWhereNotBetween(column: SelectableColumn<string>, min: BaseValues, max: BaseValues): this;
+    /**
+     * @description Adds an OR WHERE NOT BETWEEN condition to the query.
+     */
+    orWhereNotBetween(column: SelectableColumn<string>, min: BaseValues, max: BaseValues): this;
+    /**
+     * @description Adds a WHERE LIKE condition to the query.
+     */
+    whereLike(column: SelectableColumn<string>, value: string): this;
+    /**
+     * @description Adds an AND WHERE LIKE condition to the query.
+     */
+    andWhereLike(column: SelectableColumn<string>, value: string): this;
+    /**
+     * @description Adds an OR WHERE LIKE condition to the query.
+     */
+    orWhereLike(column: SelectableColumn<string>, value: string): this;
+    /**
+     * @description Adds a WHERE ILIKE condition to the query.
+     */
+    whereILike(column: SelectableColumn<string>, value: string): this;
+    /**
+     * @description Adds an AND WHERE ILIKE condition to the query.
+     */
+    andWhereILike(column: SelectableColumn<string>, value: string): this;
+    /**
+     * @description Adds an OR WHERE ILIKE condition to the query.
+     */
+    orWhereILike(column: SelectableColumn<string>, value: string): this;
+    /**
+     * @description Adds a WHERE NOT LIKE condition to the query.
+     */
+    whereNotLike(column: SelectableColumn<string>, value: string): this;
+    /**
+     * @description Adds an AND WHERE NOT LIKE condition to the query.
+     */
+    andWhereNotLike(column: SelectableColumn<string>, value: string): this;
+    /**
+     * @description Adds an OR WHERE NOT LIKE condition to the query.
+     */
+    orWhereNotLike(column: SelectableColumn<string>, value: string): this;
+    /**
+     * @description Adds a WHERE NOT ILIKE condition to the query.
+     */
+    whereNotILike(column: SelectableColumn<string>, value: string): this;
+    /**
+     * @description Adds an AND WHERE NOT ILIKE condition to the query.
+     */
+    andWhereNotILike(column: SelectableColumn<string>, value: string): this;
+    /**
+     * @description Adds an OR WHERE NOT ILIKE condition to the query.
+     */
+    orWhereNotILike(column: SelectableColumn<string>, value: string): this;
+    /**
+     * @description Adds a WHERE IN condition to the query.
+     */
+    whereIn(column: SelectableColumn<string>, values: BaseValues[]): this;
+    /**
+     * @description Adds an AND WHERE IN condition to the query.
+     */
+    andWhereIn(column: SelectableColumn<string>, values: BaseValues[]): this;
+    /**
+     * @description Adds an OR WHERE IN condition to the query.
+     */
+    orWhereIn(column: SelectableColumn<string>, values: BaseValues[]): this;
+    /**
+     * @description Adds a WHERE NOT IN condition to the query.
+     */
+    whereNotIn(column: SelectableColumn<string>, values: BaseValues[]): this;
+    /**
+     * @description Adds an AND WHERE NOT IN condition to the query.
+     */
+    andWhereNotIn(column: SelectableColumn<string>, values: BaseValues[]): this;
+    /**
+     * @description Adds an OR WHERE NOT IN condition to the query.
+     */
+    orWhereNotIn(column: SelectableColumn<string>, values: BaseValues[]): this;
+    /**
+     * @description Adds a WHERE NULL condition to the query.
+     */
+    whereNull(column: SelectableColumn<string>): this;
+    /**
+     * @description Adds an AND WHERE NULL condition to the query.
+     */
+    andWhereNull(column: SelectableColumn<string>): this;
+    /**
+     * @description Adds an OR WHERE NULL condition to the query.
+     */
+    orWhereNull(column: SelectableColumn<string>): this;
+    /**
+     * @description Adds a WHERE NOT NULL condition to the query.
+     */
+    whereNotNull(column: SelectableColumn<string>): this;
+    /**
+     * @description Adds an AND WHERE NOT NULL condition to the query.
+     */
+    andWhereNotNull(column: SelectableColumn<string>): this;
+    /**
+     * @description Adds an OR WHERE NOT NULL condition to the query.
+     */
+    orWhereNotNull(column: SelectableColumn<string>): this;
+    /**
+     * @description Adds a WHERE REGEXP condition to the query.
+     */
+    whereRegexp(column: SelectableColumn<string>, regexp: RegExp): this;
+    /**
+     * @description Adds an AND WHERE REGEXP condition to the query.
+     */
+    andWhereRegexp(column: SelectableColumn<string>, regexp: RegExp): this;
+    /**
+     * @description Adds an OR WHERE REGEXP condition to the query.
+     */
+    orWhereRegexp(column: SelectableColumn<string>, regexp: RegExp): this;
+    /**
+     * @description Adds a WHERE NOT REGEXP condition to the query.
+     */
+    whereNotRegexp(column: SelectableColumn<string>, regexp: RegExp): this;
+    /**
+     * @description Adds an AND WHERE NOT REGEXP condition to the query.
+     */
+    andWhereNotRegexp(column: SelectableColumn<string>, regexp: RegExp): this;
+    /**
+     * @description Adds an OR WHERE NOT REGEXP condition to the query.
+     */
+    orWhereNotRegexp(column: SelectableColumn<string>, regexp: RegExp): this;
+    /**
+     * @description Adds a WHERE group condition with AND.
+     */
+    whereGroup(cb: (queryBuilder: JoinOnQueryBuilder) => void): this;
+    /**
+     * @description Adds a WHERE group condition with AND.
+     */
+    andWhereGroup(cb: (queryBuilder: JoinOnQueryBuilder) => void): this;
+    /**
+     * @description Adds a WHERE group condition with OR.
+     */
+    orWhereGroup(cb: (queryBuilder: JoinOnQueryBuilder) => void): this;
+    /**
+     * @description Adds a raw WHERE condition to the query.
+     */
+    whereRaw(sql: string, bindings?: BaseValues[]): this;
+    /**
+     * @description Adds an AND raw WHERE condition to the query.
+     */
+    andWhereRaw(sql: string, bindings?: BaseValues[]): this;
+    /**
+     * @description Adds an OR raw WHERE condition to the query.
+     */
+    orWhereRaw(sql: string, bindings?: BaseValues[]): this;
+}
+
+/**
+ * @description Callback type for join conditions
+ */
+type JoinOnCallback = (query: JoinOnQueryBuilder) => void;
 declare abstract class JoinQueryBuilder<T extends Model> extends FooterQueryBuilder<T> {
     protected joinNodes: JoinNode[];
     protected constructor(model: typeof Model, sqlDataSource: SqlDataSource);
@@ -2693,6 +2910,10 @@ declare abstract class JoinQueryBuilder<T extends Model> extends FooterQueryBuil
     innerJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType): this;
     innerJoin<R extends typeof Model>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator?: BinaryOperatorType): this;
     innerJoin<R extends typeof Model>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn?: ModelKey<T>, operator?: BinaryOperatorType): this;
+    innerJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType, callback: JoinOnCallback): this;
+    innerJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, callback: JoinOnCallback): this;
+    innerJoin<R extends typeof Model>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator: BinaryOperatorType, callback: JoinOnCallback): this;
+    innerJoin<R extends typeof Model>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, callback: JoinOnCallback): this;
     /**
      * @description Join a table with the current model
      * @param relationTable - The table to join
@@ -2704,6 +2925,10 @@ declare abstract class JoinQueryBuilder<T extends Model> extends FooterQueryBuil
     join(relationTable: string, referencingColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType): this;
     join<R extends typeof Model>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator?: BinaryOperatorType): this;
     join<R extends typeof Model>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn?: ModelKey<T>, operator?: BinaryOperatorType): this;
+    join(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType, callback: JoinOnCallback): this;
+    join(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, callback: JoinOnCallback): this;
+    join<R extends typeof Model>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator: BinaryOperatorType, callback: JoinOnCallback): this;
+    join<R extends typeof Model>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, callback: JoinOnCallback): this;
     /**
      * @description Join a table with the current model
      * @param relationTable - The table to join
@@ -2715,6 +2940,10 @@ declare abstract class JoinQueryBuilder<T extends Model> extends FooterQueryBuil
     leftJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType): this;
     leftJoin<R extends typeof Model>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator?: BinaryOperatorType): this;
     leftJoin<R extends typeof Model>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn?: ModelKey<T>, operator?: BinaryOperatorType): this;
+    leftJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType, callback: JoinOnCallback): this;
+    leftJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, callback: JoinOnCallback): this;
+    leftJoin<R extends typeof Model>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator: BinaryOperatorType, callback: JoinOnCallback): this;
+    leftJoin<R extends typeof Model>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, callback: JoinOnCallback): this;
     /**
      * @description Join a table with the current model
      * @param relationTable - The table to join
@@ -2724,6 +2953,9 @@ declare abstract class JoinQueryBuilder<T extends Model> extends FooterQueryBuil
      */
     rightJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, operator?: BinaryOperatorType): this;
     rightJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType): this;
+    rightJoin<R extends typeof Model>(relationTable: string | R, referencingColumnOrPrimaryColumn: ModelKey<InstanceType<R>> | JoinableColumn | ModelKey<T>, primaryColumn?: JoinableColumn | ModelKey<T>, operator?: BinaryOperatorType): this;
+    rightJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType, callback: JoinOnCallback): this;
+    rightJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, callback: JoinOnCallback): this;
     /**
      * @description Perform a FULL OUTER JOIN with another table
      * @param relationTable - The table to join
@@ -2733,6 +2965,9 @@ declare abstract class JoinQueryBuilder<T extends Model> extends FooterQueryBuil
      */
     fullJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, operator?: BinaryOperatorType): this;
     fullJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType): this;
+    fullJoin<R extends typeof Model>(relationTable: string | R, referencingColumnOrPrimaryColumn: ModelKey<InstanceType<R>> | JoinableColumn | ModelKey<T>, primaryColumn?: JoinableColumn | ModelKey<T>, operator?: BinaryOperatorType): this;
+    fullJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType, callback: JoinOnCallback): this;
+    fullJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, callback: JoinOnCallback): this;
 }
 
 declare class SelectQueryBuilder<T extends Model> extends JoinQueryBuilder<T> {
@@ -3418,6 +3653,16 @@ type UpdateOptions = {
  */
 type RelationQueryBuilderType<T extends Model, A extends Record<string, any> = {}, R extends Record<string, any> = {}> = Omit<ModelQueryBuilder<T, A, R>, "increment" | "decrement" | "first" | "firstOrFail" | "paginate" | "pluck" | "truncate" | "many" | "one" | "oneOrFail" | "insert" | "insertMany" | "update" | "delete" | "softDelete" | "getSum" | "getAvg" | "getMin" | "getMax" | "getCount" | "getMin" | "getMax" | "getCount">;
 
+/**
+ * Helper type to determine if annotation overrides model field or goes to $annotations
+ * If K is a key of the model T, it overrides that field in the model.
+ * Otherwise, it goes into the annotations object A.
+ */
+type AnnotationResult<T extends Model, A extends Record<string, any>, R extends Record<string, any>, K extends string, V> = K extends keyof T ? ModelQueryBuilder<T & {
+    [P in K]: V;
+}, A, R> : ModelQueryBuilder<T, A & {
+    [P in K]: V;
+}, R>;
 declare class ModelQueryBuilder<T extends Model, A extends Record<string, any> = {}, R extends Record<string, any> = {}> extends QueryBuilder<T> {
     relation: Relation;
     protected sqlModelManagerUtils: SqlModelManagerUtils<T>;
@@ -3512,11 +3757,11 @@ declare class ModelQueryBuilder<T extends Model, A extends Record<string, any> =
     /**
      * @description Inserts a new record into the database, it is not advised to use this method directly from the query builder if using a ModelQueryBuilder (`Model.query()`), use the `Model.insert` method instead.
      */
-    insert(...args: Parameters<typeof this$1.model.insert>): ReturnType<typeof this$1.model.insert>;
+    insert(...args: Parameters<typeof this$1.model.insert<T>>): ReturnType<typeof this$1.model.insert>;
     /**
      * @description Inserts multiple records into the database, it is not advised to use this method directly from the query builder if using a ModelQueryBuilder (`Model.query()`), use the `Model.insertMany` method instead.
      */
-    insertMany(...args: Parameters<typeof this$1.model.insertMany>): ReturnType<typeof this$1.model.insertMany>;
+    insertMany(...args: Parameters<typeof this$1.model.insertMany<T>>): ReturnType<typeof this$1.model.insertMany>;
     update(data: Partial<ModelWithoutRelations<T>>, options?: UpdateOptions): Promise<number>;
     softDelete(options?: SoftDeleteOptions<T>): Promise<number>;
     delete(options?: DeleteOptions): Promise<number>;
@@ -3542,32 +3787,26 @@ declare class ModelQueryBuilder<T extends Model, A extends Record<string, any> =
     select(...columns: (ModelKey<T> | "*")[]): this;
     /**
      * @description Annotates a column with a SQL method or a simple alias
-     * @description If using a model, the result will be available in the $annotations property of the model, else it will be available in the result of the query
+     * @description If the alias matches a model field name, it overrides that field. Otherwise, it's available in $annotations
      * @example
      * ```ts
      * const user = await User.query().annotate("max", "id", "maxId").first(); // max(id) as maxId
      * const user = await User.query().annotate("id", "superId").first(); // id as superId
+     * // If alias matches model field, it overrides it:
+     * const user = await User.query().annotate("COUNT(*)", "email").first(); // user.email is now a number
      * ```
      */
-    annotate<K extends string, V = any>(column: string, alias: K): ModelQueryBuilder<T, A & {
-        [P in K]: V;
-    }, R>;
-    annotate<K extends string, S extends SqlMethod, V = CommonSqlMethodReturnType<S>>(sqlMethod: string, column: string, alias: K): ModelQueryBuilder<T, A & {
-        [P in K]: V;
-    }, R>;
-    annotate<K extends string, S extends SqlMethod, V = CommonSqlMethodReturnType<S>>(sqlMethod: S, column: string, alias: K): ModelQueryBuilder<T, A & {
-        [P in K]: V;
-    }, R>;
-    annotate<K extends string, S extends SqlMethod, V = CommonSqlMethodReturnType<S>>(sqlMethod: S, column: string, alias: K): ModelQueryBuilder<T, A & {
-        [P in K]: V;
-    }, R>;
+    annotate<K extends string, V = any>(column: string, alias: K): AnnotationResult<T, A, R, K, V>;
+    annotate<K extends string, S extends SqlMethod, V = CommonSqlMethodReturnType<S>>(sqlMethod: string, column: string, alias: K): AnnotationResult<T, A, R, K, V>;
+    annotate<K extends string, S extends SqlMethod, V = CommonSqlMethodReturnType<S>>(sqlMethod: S, column: string, alias: K): AnnotationResult<T, A, R, K, V>;
+    annotate<K extends string, S extends SqlMethod, V = CommonSqlMethodReturnType<S>>(sqlMethod: S, column: string, alias: K): AnnotationResult<T, A, R, K, V>;
     /**
      * @description Selects a JSON value at the specified path and returns it as JSON
      * @param column The column containing JSON data
      * @param path The JSON path to extract (standardized format: "$.user.name", "user.name", or ["user", "name"])
      * @param alias The alias for the selected value
      * @description Path format is standardized across all databases - ORM converts to DB-specific syntax
-     * @description Result will be available in model.$annotations[alias]
+     * @description If alias matches a model field, it overrides that field. Otherwise, it's in $annotations
      * @example
      * ```ts
      * // All these path formats are supported:
@@ -3590,24 +3829,24 @@ declare class ModelQueryBuilder<T extends Model, A extends Record<string, any> =
      * // 6. Root object
      * await User.query().selectJson("data", "$", "allData").first();
      *
-     * // Access the result
+     * // Access the result - in $annotations if not a model field
      * const user = await User.query().selectJson("data", "user.name", "userName").first();
      * console.log(user?.$annotations?.userName); // Typed as any
+     *
+     * // If alias matches model field, it overrides it
+     * const user2 = await User.query().selectJson("data", "$.name", "email").first();
+     * console.log(user2?.email); // Overrides model's email field
      * ```
      */
-    selectJson<K extends string>(column: ModelKey<T>, path: JsonPathInput, alias: K): ModelQueryBuilder<T, A & {
-        [P in K]: any;
-    }, R>;
-    selectJson<K extends string>(column: string, path: JsonPathInput, alias: K): ModelQueryBuilder<T, A & {
-        [P in K]: any;
-    }, R>;
+    selectJson<K extends string>(column: ModelKey<T>, path: JsonPathInput, alias: K): AnnotationResult<T, A, R, K, any>;
+    selectJson<K extends string>(column: string, path: JsonPathInput, alias: K): AnnotationResult<T, A, R, K, any>;
     /**
      * @description Selects a JSON value at the specified path and returns it as text
      * @param column The column containing JSON data
      * @param path The JSON path to extract (standardized format)
      * @param alias The alias for the selected value
      * @description Path format is standardized across all databases - ORM converts to DB-specific syntax
-     * @description Result will be available in model.$annotations[alias]
+     * @description If alias matches a model field, it overrides that field. Otherwise, it's in $annotations
      * @example
      * ```ts
      * // All these path formats are supported:
@@ -3628,24 +3867,20 @@ declare class ModelQueryBuilder<T extends Model, A extends Record<string, any> =
      * // 5. Deep nesting
      * await User.query().selectJsonText("data", "user.profile.bio", "biography").first();
      *
-     * // Access the result
-     * const user = await User.query().selectJsonText("data", "user.email", "email").first();
-     * console.log(user?.$annotations?.email); // Typed as string
+     * // Access the result - in $annotations if not a model field
+     * const user = await User.query().selectJsonText("data", "user.email", "userEmail").first();
+     * console.log(user?.$annotations?.userEmail); // Typed as string
      * ```
      */
-    selectJsonText<K extends string>(column: ModelKey<T>, path: any, alias: K): ModelQueryBuilder<T, A & {
-        [P in K]: string;
-    }, R>;
-    selectJsonText<K extends string>(column: string, path: any, alias: K): ModelQueryBuilder<T, A & {
-        [P in K]: string;
-    }, R>;
+    selectJsonText<K extends string>(column: ModelKey<T>, path: JsonPathInput, alias: K): AnnotationResult<T, A, R, K, string>;
+    selectJsonText<K extends string>(column: string, path: JsonPathInput, alias: K): AnnotationResult<T, A, R, K, string>;
     /**
      * @description Selects the length of a JSON array
      * @param column The column containing JSON array data
      * @param path The JSON path to the array (standardized format, use "$" or "" for root)
      * @param alias The alias for the length value
      * @description Path format is standardized across all databases - ORM converts to DB-specific syntax
-     * @description Result will be available in model.$annotations[alias]
+     * @description If alias matches a model field, it overrides that field. Otherwise, it's in $annotations
      * @warning Not supported in SQLite
      * @example
      * ```ts
@@ -3671,24 +3906,20 @@ declare class ModelQueryBuilder<T extends Model, A extends Record<string, any> =
      * // 6. Deeply nested arrays
      * await User.query().selectJsonArrayLength("data", "level1.level2.items", "deepCount").first();
      *
-     * // Access the result
+     * // Access the result - in $annotations if not a model field
      * const user = await User.query().selectJsonArrayLength("data", "items", "count").first();
      * console.log(user?.$annotations?.count); // Typed as number
      * ```
      */
-    selectJsonArrayLength<K extends string>(column: ModelKey<T>, path: JsonPathInput, alias: K): ModelQueryBuilder<T, A & {
-        [P in K]: number;
-    }, R>;
-    selectJsonArrayLength<K extends string>(column: string, path: JsonPathInput, alias: K): ModelQueryBuilder<T, A & {
-        [P in K]: number;
-    }, R>;
+    selectJsonArrayLength<K extends string>(column: ModelKey<T>, path: JsonPathInput, alias: K): AnnotationResult<T, A, R, K, number>;
+    selectJsonArrayLength<K extends string>(column: string, path: JsonPathInput, alias: K): AnnotationResult<T, A, R, K, number>;
     /**
      * @description Selects the keys of a JSON object
      * @param column The column containing JSON object data
      * @param path The JSON path to the object (standardized format, use "$" or "" for root)
      * @param alias The alias for the keys
      * @description Path format is standardized across all databases - ORM converts to DB-specific syntax
-     * @description Result will be available in model.$annotations[alias]
+     * @description If alias matches a model field, it overrides that field. Otherwise, it's in $annotations
      * @warning Not supported in SQLite or MSSQL
      * @postgresql Returns a native array of keys
      * @mysql Returns a JSON array of keys
@@ -3716,22 +3947,18 @@ declare class ModelQueryBuilder<T extends Model, A extends Record<string, any> =
      * // 6. Deeply nested objects
      * await User.query().selectJsonKeys("data", "settings.display.theme", "themeKeys").first();
      *
-     * // Access the result
+     * // Access the result - in $annotations if not a model field
      * const user = await User.query().selectJsonKeys("data", "settings", "keys").first();
      * console.log(user?.$annotations?.keys); // Typed as any[] - ["theme", "fontSize", "autoSave"]
      * ```
      */
-    selectJsonKeys<K extends string>(column: ModelKey<T>, path: JsonPathInput, alias: K): ModelQueryBuilder<T, A & {
-        [P in K]: any[];
-    }, R>;
-    selectJsonKeys<K extends string>(column: string, path: JsonPathInput, alias: K): ModelQueryBuilder<T, A & {
-        [P in K]: any[];
-    }, R>;
+    selectJsonKeys<K extends string>(column: ModelKey<T>, path: JsonPathInput, alias: K): AnnotationResult<T, A, R, K, any[]>;
+    selectJsonKeys<K extends string>(column: string, path: JsonPathInput, alias: K): AnnotationResult<T, A, R, K, any[]>;
     /**
      * @description Adds a raw JSON select expression for database-specific operations
      * @param raw The raw SQL expression (database-specific syntax)
      * @param alias The alias for the selected value
-     * @description Result will be available in model.$annotations[alias]
+     * @description If alias matches a model field, it overrides that field. Otherwise, it's in $annotations
      * @description Use this for advanced JSON operations not covered by other selectJson* methods
      * @warning This bypasses path standardization - you must write database-specific SQL
      * @example
@@ -3757,14 +3984,12 @@ declare class ModelQueryBuilder<T extends Model, A extends Record<string, any> =
      * // SQLite - Extract value with json_extract
      * await User.query().selectJsonRaw("json_extract(data, '$.email')", "userEmail").first();
      *
-     * // Access the result
-     * const user = await User.query().selectJsonRaw("data->>'email'", "email").first();
-     * console.log(user?.$annotations?.email); // Typed as any
+     * // Access the result - in $annotations if not a model field
+     * const user = await User.query().selectJsonRaw("data->>'email'", "userEmail").first();
+     * console.log(user?.$annotations?.userEmail); // Typed as any
      * ```
      */
-    selectJsonRaw<K extends string>(raw: string, alias: K): ModelQueryBuilder<T, A & {
-        [P in K]: any;
-    }, R>;
+    selectJsonRaw<K extends string>(raw: string, alias: K): AnnotationResult<T, A, R, K, any>;
     /**
      * @description Removes annotations from the serialized model, by default, annotations are maintained in the serialized model if `annotate` is used
      */
@@ -4529,7 +4754,7 @@ declare class SqlDataSource<D extends SqlDataSourceType = SqlDataSourceType, T e
     private connectWithoutSettingPrimary;
 }
 
-type ModelWithoutRelations<T extends Model> = Pick<T, ExcludeRelations<Omit<T, "*">>>;
+type ModelWithoutRelations<T extends Model> = Pick<Omit<T, "*">, ExcludeRelations<Omit<T, "*">>> & Pick<Model, keyof Model>;
 type NumberModelKey<T extends Model> = {
     [K in keyof T]: T[K] extends number | bigint ? K : never;
 }[keyof T];
@@ -5376,6 +5601,12 @@ declare abstract class Model extends Entity {
      * @throws {HysteriaError} If the model has no primary key valorized in the instance
      */
     refresh<T extends Model = this>(options?: Omit<BaseModelMethodOptions, "ignoreHooks">): Promise<T>;
+    /**
+     * @description Converts the model to a JSON object
+     * @description Flattens all `$annotations` into the JSON object at first level including the relations
+     * @warning Use with caution, this method flattens the `$annotations` into the JSON object at first level including the relations, so if you have conflicting column names between model columns and annotations, the annotation could override the model column value
+     */
+    toJSON(): Record<string, any>;
 }
 
 type BaseModelRelationType = {