@bunnykit/orm 0.1.10 → 0.1.12

package/README.md

@@ -394,6 +394,25 @@ await Schema.create("posts", (table) => {
 });
 ```
 
+The foreign key call adds the constraint only. Define the local column first, and make its type match the referenced column:
+
+```ts
+await Schema.create("users", (table) => {
+  table.uuid("id").primary();
+  table.string("email").unique();
+  table.timestamps();
+});
+
+await Schema.create("posts", (table) => {
+  table.increments("id");
+  table.uuid("user_id");
+  table.foreign("user_id").references("id").on("users").onDelete("cascade");
+  table.string("title");
+  table.text("content");
+  table.timestamps();
+});
+```
+
 ---
 
 ## Query Builder
@@ -1243,7 +1262,16 @@ export class User extends Model {
 }
 ```
 
-Editors that include the generated `.d.ts` files in `tsconfig.json` will understand `user.name`, `user.email`, etc. The generated files can be safely **gitignored** and regenerated whenever your schema changes.
+Editors that include the generated `.d.ts` files in `tsconfig.json` will understand `user.name`, `user.email`, etc. The same generated attributes are also used for column-name autocomplete in model and builder APIs:
+
+```ts
+await User.where("email", "alice@example.com").first();
+await User.where({ email: "alice@example.com" }).first();
+await User.orderBy("created_at").get();
+await User.create({ id: 1, name: "Alice", email: "alice@example.com" });
+```
+
+Column arguments still accept raw strings for joins, aliases, expressions, and advanced SQL, so autocomplete is helpful without blocking escape hatches. The generated files can be safely **gitignored** and regenerated whenever your schema changes.
 
 If you still want generated base classes, use the programmatic generator with `{ stubs: true }`.
 

package/dist/src/index.d.ts

@@ -14,7 +14,7 @@ export { MySqlGrammar } from "./schema/grammars/MySqlGrammar.js";
 export { PostgresGrammar } from "./schema/grammars/PostgresGrammar.js";
 export { Builder } from "./query/Builder.js";
 export { Model, HasMany, BelongsTo, HasOne, HasManyThrough, HasOneThrough } from "./model/Model.js";
-export type { ModelConstructor, GlobalScope, CastDefinition, CastsAttributes } from "./model/Model.js";
+export type { ModelAttributeInput, ModelAttributes, ModelColumn, ModelColumnValue, ModelConstructor, GlobalScope, CastDefinition, CastsAttributes, } from "./model/Model.js";
 export { ModelNotFoundError } from "./model/ModelNotFoundError.js";
 export { ObserverRegistry, type ObserverContract } from "./model/Observer.js";
 export { MorphMap } from "./model/MorphMap.js";

package/dist/src/model/Model.d.ts

@@ -4,6 +4,15 @@ import { MorphTo, MorphOne, MorphMany, MorphToMany } from "./MorphRelations.js";
 import { BelongsToMany } from "./BelongsToMany.js";
 export type ModelConstructor<T extends Model = Model> = (new (...args: any[]) => T) & Omit<typeof Model, "prototype">;
 export type GlobalScope = (builder: Builder<any>, model: ModelConstructor) => void;
+export type LiteralUnion<T extends string> = T | (string & {});
+type BaseModelInstanceKey = "$attributes" | "$original" | "$exists" | "$relations" | "$casts" | "$connection" | "fill" | "setConnection" | "getConnection" | "isFillable" | "getAttribute" | "setAttribute" | "castAttribute" | "serializeCastAttribute" | "mergeCasts" | "getDirty" | "isDirty" | "save" | "updateTimestamps" | "touch" | "increment" | "decrement" | "load" | "delete" | "restore" | "forceDelete" | "refresh" | "toJSON" | "toString" | "freshTimestamp" | "setRelation" | "getRelation" | "hasMany" | "belongsTo" | "hasOne" | "hasManyThrough" | "hasOneThrough" | "belongsToMany" | "morphTo" | "morphOne" | "morphMany" | "morphToMany" | "morphedByMany";
+export type ModelInstanceAttributeKeys<T> = Extract<Exclude<keyof T, BaseModelInstanceKey>, string>;
+export type ModelAttributes<T> = T extends {
+    $attributes: Record<string, any>;
+} ? string extends keyof T["$attributes"] ? Pick<T, ModelInstanceAttributeKeys<T>> : T["$attributes"] : T;
+export type ModelColumn<T> = LiteralUnion<Extract<keyof ModelAttributes<T>, string>>;
+export type ModelColumnValue<T, K> = K extends keyof ModelAttributes<T> ? ModelAttributes<T>[K] : any;
+export type ModelAttributeInput<T> = Partial<ModelAttributes<T>> & Record<string, any>;
 export type CastDefinition = string | CastsAttributes | (new (...args: any[]) => CastsAttributes);
 export interface CastsAttributes {
     get(model: Model, key: string, value: any, attributes: Record<string, any>): any;
@@ -110,33 +119,37 @@ export declare class Model<T extends Record<string, any> = Record<string, any>>
     static applyGlobalScopes(builder: Builder<any>): void;
     static getQualifiedDeletedAtColumn(): string;
     static shouldAutoGeneratePrimaryKey(): Promise<boolean>;
-    static create<M extends ModelConstructor>(this: M, attributes: Partial<InstanceType<M> extends Model<infer U> ? U : Record<string, any>>): Promise<InstanceType<M>>;
+    static create<M extends ModelConstructor>(this: M, attributes: ModelAttributeInput<InstanceType<M>>): Promise<InstanceType<M>>;
     static find<M extends ModelConstructor>(this: M, id: any): Promise<InstanceType<M> | null>;
     static findOrFail<M extends ModelConstructor>(this: M, id: any): Promise<InstanceType<M>>;
     static first<M extends ModelConstructor>(this: M): Promise<InstanceType<M> | null>;
     static firstOrFail<M extends ModelConstructor>(this: M): Promise<InstanceType<M>>;
-    static firstOrCreate<M extends ModelConstructor>(this: M, attributes?: Record<string, any>, values?: Record<string, any>): Promise<InstanceType<M>>;
-    static updateOrCreate<M extends ModelConstructor>(this: M, attributes: Record<string, any>, values?: Record<string, any>): Promise<InstanceType<M>>;
-    static where<M extends ModelConstructor>(this: M, column: string | Record<string, any>, operator?: string | any, value?: any): Builder<InstanceType<M>>;
-    static orderBy<M extends ModelConstructor>(this: M, column: string, direction?: "asc" | "desc"): Builder<InstanceType<M>>;
-    static whereIn<M extends ModelConstructor>(this: M, column: string, values: any[]): Builder<InstanceType<M>>;
-    static whereNull<M extends ModelConstructor>(this: M, column: string): Builder<InstanceType<M>>;
-    static whereNotNull<M extends ModelConstructor>(this: M, column: string): Builder<InstanceType<M>>;
-    static orWhere<M extends ModelConstructor>(this: M, column: string | Record<string, any>, operator?: string | any, value?: any): Builder<InstanceType<M>>;
-    static whereNot<M extends ModelConstructor>(this: M, column: string | Record<string, any>, value?: any): Builder<InstanceType<M>>;
-    static orWhereNot<M extends ModelConstructor>(this: M, column: string | Record<string, any>, value?: any): Builder<InstanceType<M>>;
-    static whereDate<M extends ModelConstructor>(this: M, column: string, operator?: string | any, value?: any): Builder<InstanceType<M>>;
-    static orWhereDate<M extends ModelConstructor>(this: M, column: string, operator?: string | any, value?: any): Builder<InstanceType<M>>;
-    static whereDay<M extends ModelConstructor>(this: M, column: string, operator?: string | any, value?: any): Builder<InstanceType<M>>;
-    static orWhereDay<M extends ModelConstructor>(this: M, column: string, operator?: string | any, value?: any): Builder<InstanceType<M>>;
-    static whereMonth<M extends ModelConstructor>(this: M, column: string, operator?: string | any, value?: any): Builder<InstanceType<M>>;
-    static orWhereMonth<M extends ModelConstructor>(this: M, column: string, operator?: string | any, value?: any): Builder<InstanceType<M>>;
-    static whereYear<M extends ModelConstructor>(this: M, column: string, operator?: string | any, value?: any): Builder<InstanceType<M>>;
-    static orWhereYear<M extends ModelConstructor>(this: M, column: string, operator?: string | any, value?: any): Builder<InstanceType<M>>;
-    static whereTime<M extends ModelConstructor>(this: M, column: string, operator?: string | any, value?: any): Builder<InstanceType<M>>;
-    static orWhereTime<M extends ModelConstructor>(this: M, column: string, operator?: string | any, value?: any): Builder<InstanceType<M>>;
-    static latest<M extends ModelConstructor>(this: M, column?: string): Builder<InstanceType<M>>;
-    static oldest<M extends ModelConstructor>(this: M, column?: string): Builder<InstanceType<M>>;
+    static firstOrCreate<M extends ModelConstructor>(this: M, attributes?: ModelAttributeInput<InstanceType<M>>, values?: ModelAttributeInput<InstanceType<M>>): Promise<InstanceType<M>>;
+    static updateOrCreate<M extends ModelConstructor>(this: M, attributes: ModelAttributeInput<InstanceType<M>>, values?: ModelAttributeInput<InstanceType<M>>): Promise<InstanceType<M>>;
+    static where<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, value: any): Builder<InstanceType<M>>;
+    static where<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, operator: string, value: any): Builder<InstanceType<M>>;
+    static where<M extends ModelConstructor>(this: M, column: ModelAttributeInput<InstanceType<M>>, operator?: string | any, value?: any): Builder<InstanceType<M>>;
+    static orderBy<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, direction?: "asc" | "desc"): Builder<InstanceType<M>>;
+    static whereIn<M extends ModelConstructor, K extends ModelColumn<InstanceType<M>>>(this: M, column: K, values: ModelColumnValue<InstanceType<M>, K>[]): Builder<InstanceType<M>>;
+    static whereNull<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>): Builder<InstanceType<M>>;
+    static whereNotNull<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>): Builder<InstanceType<M>>;
+    static orWhere<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, value: any): Builder<InstanceType<M>>;
+    static orWhere<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, operator: string, value: any): Builder<InstanceType<M>>;
+    static orWhere<M extends ModelConstructor>(this: M, column: ModelAttributeInput<InstanceType<M>>, operator?: string | any, value?: any): Builder<InstanceType<M>>;
+    static whereNot<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>> | ModelAttributeInput<InstanceType<M>>, value?: any): Builder<InstanceType<M>>;
+    static orWhereNot<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>> | ModelAttributeInput<InstanceType<M>>, value?: any): Builder<InstanceType<M>>;
+    static whereDate<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, operator?: string | any, value?: any): Builder<InstanceType<M>>;
+    static orWhereDate<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, operator?: string | any, value?: any): Builder<InstanceType<M>>;
+    static whereDay<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, operator?: string | any, value?: any): Builder<InstanceType<M>>;
+    static orWhereDay<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, operator?: string | any, value?: any): Builder<InstanceType<M>>;
+    static whereMonth<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, operator?: string | any, value?: any): Builder<InstanceType<M>>;
+    static orWhereMonth<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, operator?: string | any, value?: any): Builder<InstanceType<M>>;
+    static whereYear<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, operator?: string | any, value?: any): Builder<InstanceType<M>>;
+    static orWhereYear<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, operator?: string | any, value?: any): Builder<InstanceType<M>>;
+    static whereTime<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, operator?: string | any, value?: any): Builder<InstanceType<M>>;
+    static orWhereTime<M extends ModelConstructor>(this: M, column: ModelColumn<InstanceType<M>>, operator?: string | any, value?: any): Builder<InstanceType<M>>;
+    static latest<M extends ModelConstructor>(this: M, column?: ModelColumn<InstanceType<M>>): Builder<InstanceType<M>>;
+    static oldest<M extends ModelConstructor>(this: M, column?: ModelColumn<InstanceType<M>>): Builder<InstanceType<M>>;
     static when<M extends ModelConstructor>(this: M, condition: any, callback: (query: Builder<any>) => void | Builder<any>, defaultCallback?: (query: Builder<any>) => void | Builder<any>): Builder<InstanceType<M>>;
     static unless<M extends ModelConstructor>(this: M, condition: any, callback: (query: Builder<any>) => void | Builder<any>, defaultCallback?: (query: Builder<any>) => void | Builder<any>): Builder<InstanceType<M>>;
     static tap<M extends ModelConstructor>(this: M, callback: (query: Builder<any>) => void | Builder<any>): Builder<InstanceType<M>>;
@@ -155,10 +168,10 @@ export declare class Model<T extends Record<string, any> = Record<string, any>>
     static whereHas<M extends ModelConstructor>(this: M, relationName: string, callback?: (query: Builder<any>) => void | Builder<any>, operator?: string, count?: number): Builder<InstanceType<M>>;
     static doesntHave<M extends ModelConstructor>(this: M, relationName: string): Builder<InstanceType<M>>;
     static withCount<M extends ModelConstructor>(this: M, relationName: string, alias?: string): Builder<InstanceType<M>>;
-    static withSum<M extends ModelConstructor>(this: M, relationName: string, column: string, alias?: string): Builder<InstanceType<M>>;
-    static withAvg<M extends ModelConstructor>(this: M, relationName: string, column: string, alias?: string): Builder<InstanceType<M>>;
-    static withMin<M extends ModelConstructor>(this: M, relationName: string, column: string, alias?: string): Builder<InstanceType<M>>;
-    static withMax<M extends ModelConstructor>(this: M, relationName: string, column: string, alias?: string): Builder<InstanceType<M>>;
+    static withSum<M extends ModelConstructor>(this: M, relationName: string, column: ModelColumn<InstanceType<M>>, alias?: string): Builder<InstanceType<M>>;
+    static withAvg<M extends ModelConstructor>(this: M, relationName: string, column: ModelColumn<InstanceType<M>>, alias?: string): Builder<InstanceType<M>>;
+    static withMin<M extends ModelConstructor>(this: M, relationName: string, column: ModelColumn<InstanceType<M>>, alias?: string): Builder<InstanceType<M>>;
+    static withMax<M extends ModelConstructor>(this: M, relationName: string, column: ModelColumn<InstanceType<M>>, alias?: string): Builder<InstanceType<M>>;
     static all<M extends ModelConstructor>(this: M): Promise<InstanceType<M>[]>;
     static paginate<M extends ModelConstructor>(this: M, perPage?: number, page?: number): Promise<import("../query/Builder.js").Paginator<InstanceType<M>>>;
     static chunk<M extends ModelConstructor>(this: M, count: number, callback: (items: InstanceType<M>[]) => void | Promise<void>): Promise<void>;
@@ -167,7 +180,7 @@ export declare class Model<T extends Record<string, any> = Record<string, any>>
     static lazy<M extends ModelConstructor>(this: M, count?: number): AsyncGenerator<InstanceType<M>>;
     static eagerLoadRelations(models: Model[], relations: string[]): Promise<void>;
     static eagerLoadRelation(models: Model[], relationName: string): Promise<void>;
-    fill(attributes: Partial<T>): this;
+    fill(attributes: Partial<T> | ModelAttributeInput<this>): this;
     setConnection(connection: Connection): this;
     getConnection(): Connection;
     isFillable(key: string): boolean;
@@ -185,8 +198,8 @@ export declare class Model<T extends Record<string, any> = Record<string, any>>
     save(): Promise<this>;
     updateTimestamps(): void;
     touch(): Promise<boolean>;
-    increment(column: string, amount?: number, extra?: Record<string, any>): Promise<this>;
-    decrement(column: string, amount?: number, extra?: Record<string, any>): Promise<this>;
+    increment<K extends ModelColumn<this>>(column: K, amount?: number, extra?: ModelAttributeInput<this>): Promise<this>;
+    decrement<K extends ModelColumn<this>>(column: K, amount?: number, extra?: ModelAttributeInput<this>): Promise<this>;
     load(...relations: string[]): Promise<this>;
     delete(): Promise<boolean>;
     restore(): Promise<boolean>;
@@ -209,3 +222,4 @@ export declare class Model<T extends Record<string, any> = Record<string, any>>
     morphToMany<R extends Model>(related: ModelConstructor<R>, name: string, table?: string, foreignPivotKey?: string, relatedPivotKey?: string, parentKey?: string, relatedKey?: string): MorphToMany<R>;
     morphedByMany<R extends Model>(related: ModelConstructor<R>, name: string, table?: string, foreignPivotKey?: string, relatedPivotKey?: string, parentKey?: string, relatedKey?: string): MorphToMany<R>;
 }
+export {};

package/dist/src/model/Observer.d.ts

@@ -1,5 +1,5 @@
 import type { Model } from "./Model.js";
-export interface ObserverContract<T extends Model = Model> {
+export interface ObserverContract<T extends Model<any> = Model<any>> {
     creating?(model: T): Promise<void> | void;
     created?(model: T): Promise<void> | void;
     updating?(model: T): Promise<void> | void;
@@ -15,5 +15,5 @@ export declare class ObserverRegistry {
     private static observers;
     static register(modelClass: typeof Model, observer: ObserverContract): void;
     static get(modelClass: typeof Model): ObserverContract[];
-    static dispatch<T extends Model>(event: keyof ObserverContract, model: T): Promise<void>;
+    static dispatch<T extends Model<any>>(event: keyof ObserverContract, model: T): Promise<void>;
 }

package/dist/src/query/Builder.d.ts

@@ -1,6 +1,6 @@
 import { Connection } from "../connection/Connection.js";
 import type { WhereClause, OrderClause, HavingClause, UnionClause } from "../types/index.js";
-import type { ModelConstructor } from "../model/Model.js";
+import type { ModelAttributeInput, ModelColumn, ModelColumnValue, ModelConstructor } from "../model/Model.js";
 type RelationConstraint = (query: Builder<any>) => void | Builder<any>;
 export interface Paginator<T> {
     data: T[];
@@ -34,59 +34,63 @@ export declare class Builder<T = Record<string, any>> {
     private get grammar();
     setModel(model: ModelConstructor): this;
     table(table: string): this;
-    select(...columns: string[]): this;
+    select(...columns: ModelColumn<T>[]): this;
     distinct(): this;
-    where(column: string | Record<string, any> | ((query: Builder<T>) => void), operator?: string | any, value?: any, boolean?: "and" | "or", scope?: string): this;
+    where(column: ModelColumn<T>, value: any): this;
+    where(column: ModelColumn<T>, operator: string, value: any, boolean?: "and" | "or", scope?: string): this;
+    where(column: ModelAttributeInput<T> | ((query: Builder<T>) => void), operator?: string | any, value?: any, boolean?: "and" | "or", scope?: string): this;
     private whereNested;
-    orWhere(column: string | Record<string, any> | ((query: Builder<T>) => void), operator?: string | any, value?: any): this;
-    whereNot(column: string | Record<string, any>, value?: any, boolean?: "and" | "or"): this;
-    orWhereNot(column: string | Record<string, any>, value?: any): this;
-    whereIn(column: string, values: any[], boolean?: "and" | "or", scope?: string): this;
-    whereNotIn(column: string, values: any[], boolean?: "and" | "or", scope?: string): this;
-    whereNull(column: string, boolean?: "and" | "or", scope?: string): this;
-    whereNotNull(column: string, boolean?: "and" | "or", scope?: string): this;
-    whereBetween(column: string, values: [any, any], boolean?: "and" | "or", scope?: string): this;
-    whereNotBetween(column: string, values: [any, any], boolean?: "and" | "or", scope?: string): this;
-    whereDate(column: string, operator?: string | any, value?: any, boolean?: "and" | "or"): this;
-    orWhereDate(column: string, operator?: string | any, value?: any): this;
-    whereDay(column: string, operator?: string | any, value?: any, boolean?: "and" | "or"): this;
-    orWhereDay(column: string, operator?: string | any, value?: any): this;
-    whereMonth(column: string, operator?: string | any, value?: any, boolean?: "and" | "or"): this;
-    orWhereMonth(column: string, operator?: string | any, value?: any): this;
-    whereYear(column: string, operator?: string | any, value?: any, boolean?: "and" | "or"): this;
-    orWhereYear(column: string, operator?: string | any, value?: any): this;
-    whereTime(column: string, operator?: string | any, value?: any, boolean?: "and" | "or"): this;
-    orWhereTime(column: string, operator?: string | any, value?: any): this;
+    orWhere(column: ModelColumn<T>, value: any): this;
+    orWhere(column: ModelColumn<T>, operator: string, value: any): this;
+    orWhere(column: ModelAttributeInput<T> | ((query: Builder<T>) => void), operator?: string | any, value?: any): this;
+    whereNot(column: ModelColumn<T> | ModelAttributeInput<T>, value?: any, boolean?: "and" | "or"): this;
+    orWhereNot(column: ModelColumn<T> | ModelAttributeInput<T>, value?: any): this;
+    whereIn<K extends ModelColumn<T>>(column: K, values: ModelColumnValue<T, K>[], boolean?: "and" | "or", scope?: string): this;
+    whereNotIn<K extends ModelColumn<T>>(column: K, values: ModelColumnValue<T, K>[], boolean?: "and" | "or", scope?: string): this;
+    whereNull(column: ModelColumn<T>, boolean?: "and" | "or", scope?: string): this;
+    whereNotNull(column: ModelColumn<T>, boolean?: "and" | "or", scope?: string): this;
+    whereBetween<K extends ModelColumn<T>>(column: K, values: [ModelColumnValue<T, K>, ModelColumnValue<T, K>], boolean?: "and" | "or", scope?: string): this;
+    whereNotBetween<K extends ModelColumn<T>>(column: K, values: [ModelColumnValue<T, K>, ModelColumnValue<T, K>], boolean?: "and" | "or", scope?: string): this;
+    whereDate(column: ModelColumn<T>, operator?: string | any, value?: any, boolean?: "and" | "or"): this;
+    orWhereDate(column: ModelColumn<T>, operator?: string | any, value?: any): this;
+    whereDay(column: ModelColumn<T>, operator?: string | any, value?: any, boolean?: "and" | "or"): this;
+    orWhereDay(column: ModelColumn<T>, operator?: string | any, value?: any): this;
+    whereMonth(column: ModelColumn<T>, operator?: string | any, value?: any, boolean?: "and" | "or"): this;
+    orWhereMonth(column: ModelColumn<T>, operator?: string | any, value?: any): this;
+    whereYear(column: ModelColumn<T>, operator?: string | any, value?: any, boolean?: "and" | "or"): this;
+    orWhereYear(column: ModelColumn<T>, operator?: string | any, value?: any): this;
+    whereTime(column: ModelColumn<T>, operator?: string | any, value?: any, boolean?: "and" | "or"): this;
+    orWhereTime(column: ModelColumn<T>, operator?: string | any, value?: any): this;
     whereRaw(sql: string, boolean?: "and" | "or", scope?: string): this;
     whereColumn(first: string, operator: string, second: string, boolean?: "and" | "or"): this;
     whereExists(sql: string, boolean?: "and" | "or", not?: boolean): this;
-    orWhereNull(column: string, scope?: string): this;
-    orWhereNotNull(column: string, scope?: string): this;
-    orWhereBetween(column: string, values: [any, any], scope?: string): this;
-    orWhereNotBetween(column: string, values: [any, any], scope?: string): this;
-    orWhereIn(column: string, values: any[], scope?: string): this;
-    orWhereNotIn(column: string, values: any[], scope?: string): this;
+    orWhereNull(column: ModelColumn<T>, scope?: string): this;
+    orWhereNotNull(column: ModelColumn<T>, scope?: string): this;
+    orWhereBetween<K extends ModelColumn<T>>(column: K, values: [ModelColumnValue<T, K>, ModelColumnValue<T, K>], scope?: string): this;
+    orWhereNotBetween<K extends ModelColumn<T>>(column: K, values: [ModelColumnValue<T, K>, ModelColumnValue<T, K>], scope?: string): this;
+    orWhereIn<K extends ModelColumn<T>>(column: K, values: ModelColumnValue<T, K>[], scope?: string): this;
+    orWhereNotIn<K extends ModelColumn<T>>(column: K, values: ModelColumnValue<T, K>[], scope?: string): this;
     orWhereExists(sql: string): this;
     orWhereNotExists(sql: string): this;
     orWhereColumn(first: string, operator: string, second: string): this;
     orWhereRaw(sql: string, scope?: string): this;
-    whereJsonContains(column: string, value: any, boolean?: "and" | "or", not?: boolean): this;
-    whereJsonLength(column: string, operator?: string | number, value?: number, boolean?: "and" | "or", not?: boolean): this;
-    whereLike(column: string, value: string, boolean?: "and" | "or", not?: boolean): this;
-    whereNotLike(column: string, value: string): this;
-    whereRegexp(column: string, value: string, boolean?: "and" | "or", not?: boolean): this;
-    whereFullText(columns: string | string[], value: string, boolean?: "and" | "or", not?: boolean): this;
-    whereAll(columns: string[], operator: string, value: any, boolean?: "and" | "or"): this;
-    whereAny(columns: string[], operator: string, value: any, boolean?: "and" | "or"): this;
-    orderBy(column: string, direction?: "asc" | "desc"): this;
-    latest(column?: string): this;
-    oldest(column?: string): this;
+    whereJsonContains(column: ModelColumn<T>, value: any, boolean?: "and" | "or", not?: boolean): this;
+    whereJsonLength(column: ModelColumn<T>, operator?: string | number, value?: number, boolean?: "and" | "or", not?: boolean): this;
+    whereLike(column: ModelColumn<T>, value: string, boolean?: "and" | "or", not?: boolean): this;
+    whereNotLike(column: ModelColumn<T>, value: string): this;
+    whereRegexp(column: ModelColumn<T>, value: string, boolean?: "and" | "or", not?: boolean): this;
+    whereFullText(columns: ModelColumn<T> | ModelColumn<T>[], value: string, boolean?: "and" | "or", not?: boolean): this;
+    whereAll(columns: ModelColumn<T>[], operator: string, value: any, boolean?: "and" | "or"): this;
+    whereAny(columns: ModelColumn<T>[], operator: string, value: any, boolean?: "and" | "or"): this;
+    orderBy(column: ModelColumn<T>, direction?: "asc" | "desc"): this;
+    latest(column?: ModelColumn<T>): this;
+    oldest(column?: ModelColumn<T>): this;
     inRandomOrder(): this;
-    orderByDesc(column: string): this;
-    reorder(column?: string, direction?: "asc" | "desc"): this;
-    groupBy(...columns: string[]): this;
-    having(column: string, operator: string, value: any): this;
-    orHaving(column: string, operator: string, value: any): this;
+    orderByDesc(column: ModelColumn<T>): this;
+    reorder(column?: ModelColumn<T>, direction?: "asc" | "desc"): this;
+    groupBy(...columns: ModelColumn<T>[]): this;
+    having(column: ModelColumn<T>, operator: string, value: any): this;
+    orHaving(column: ModelColumn<T>, operator: string, value: any): this;
     havingRaw(sql: string, boolean?: "and" | "or"): this;
     orHavingRaw(sql: string): this;
     limit(count: number): this;
@@ -114,11 +118,11 @@ export declare class Builder<T = Record<string, any>> {
     doesntHave(relationName: string, callback?: RelationConstraint): this;
     whereDoesntHave(relationName: string, callback?: RelationConstraint): this;
     withCount(relationName: string, alias?: string): this;
-    withSum(relationName: string, column: string, alias?: string): this;
-    withAvg(relationName: string, column: string, alias?: string): this;
-    withMin(relationName: string, column: string, alias?: string): this;
-    withMax(relationName: string, column: string, alias?: string): this;
-    addSelect(...columns: string[]): this;
+    withSum(relationName: string, column: ModelColumn<T>, alias?: string): this;
+    withAvg(relationName: string, column: ModelColumn<T>, alias?: string): this;
+    withMin(relationName: string, column: ModelColumn<T>, alias?: string): this;
+    withMax(relationName: string, column: ModelColumn<T>, alias?: string): this;
+    addSelect(...columns: ModelColumn<T>[]): this;
     selectRaw(sql: string): this;
     fromSub(query: Builder<any> | string, as: string): this;
     updateFrom(table: string, first: string, operator: string, second: string): this;
@@ -138,36 +142,36 @@ export declare class Builder<T = Record<string, any>> {
     toSql(): string;
     get(): Promise<T[]>;
     first(): Promise<T | null>;
-    find(id: any, column?: string): Promise<T | null>;
-    findOrFail(id: any, column?: string): Promise<T>;
+    find(id: any, column?: ModelColumn<T>): Promise<T | null>;
+    findOrFail(id: any, column?: ModelColumn<T>): Promise<T>;
     firstOrFail(): Promise<T>;
-    firstOrCreate(attributes?: Partial<T>, values?: Partial<T>): Promise<T>;
-    updateOrCreate(attributes: Partial<T>, values?: Partial<T>): Promise<T>;
-    pluck(column: string): Promise<any[]>;
+    firstOrCreate(attributes?: ModelAttributeInput<T>, values?: ModelAttributeInput<T>): Promise<T>;
+    updateOrCreate(attributes: ModelAttributeInput<T>, values?: ModelAttributeInput<T>): Promise<T>;
+    pluck<K extends ModelColumn<T>>(column: K): Promise<ModelColumnValue<T, K>[]>;
     private aggregate;
-    count(column?: string): Promise<number>;
-    sum(column: string): Promise<number>;
-    avg(column: string): Promise<number>;
-    min(column: string): Promise<any>;
-    max(column: string): Promise<any>;
+    count(column?: ModelColumn<T> | "*"): Promise<number>;
+    sum(column: ModelColumn<T>): Promise<number>;
+    avg(column: ModelColumn<T>): Promise<number>;
+    min<K extends ModelColumn<T>>(column: K): Promise<ModelColumnValue<T, K> | null>;
+    max<K extends ModelColumn<T>>(column: K): Promise<ModelColumnValue<T, K> | null>;
     paginate(perPage?: number, page?: number): Promise<Paginator<T>>;
     chunk(count: number, callback: (items: T[]) => void | Promise<void>): Promise<void>;
     each(count: number, callback: (item: T) => void | Promise<void>): Promise<void>;
     cursor(): AsyncGenerator<T>;
     lazy(count?: number): AsyncGenerator<T>;
-    insert(data: Partial<T> | Partial<T>[]): Promise<any>;
-    insertGetId(data: Partial<T>, idColumn?: string): Promise<any>;
-    insertOrIgnore(data: Partial<T> | Partial<T>[]): Promise<any>;
-    upsert(data: Partial<T> | Partial<T>[], uniqueBy: string | string[], updateColumns?: string[]): Promise<any>;
-    update(data: Partial<T>): Promise<any>;
+    insert(data: ModelAttributeInput<T> | ModelAttributeInput<T>[]): Promise<any>;
+    insertGetId(data: ModelAttributeInput<T>, idColumn?: ModelColumn<T>): Promise<any>;
+    insertOrIgnore(data: ModelAttributeInput<T> | ModelAttributeInput<T>[]): Promise<any>;
+    upsert(data: ModelAttributeInput<T> | ModelAttributeInput<T>[], uniqueBy: ModelColumn<T> | ModelColumn<T>[], updateColumns?: ModelColumn<T>[]): Promise<any>;
+    update(data: ModelAttributeInput<T>): Promise<any>;
     delete(): Promise<any>;
-    increment(column: string, amount?: number, extra?: Record<string, any>): Promise<any>;
-    decrement(column: string, amount?: number, extra?: Record<string, any>): Promise<any>;
+    increment(column: ModelColumn<T>, amount?: number, extra?: ModelAttributeInput<T>): Promise<any>;
+    decrement(column: ModelColumn<T>, amount?: number, extra?: ModelAttributeInput<T>): Promise<any>;
     restore(): Promise<any>;
     exists(): Promise<boolean>;
     doesntExist(): Promise<boolean>;
     sole(): Promise<T>;
-    value(column: string): Promise<any>;
+    value<K extends ModelColumn<T>>(column: K): Promise<ModelColumnValue<T, K> | null>;
     dump(): this;
     dd(): never;
     explain(): Promise<any[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunnykit/orm",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "An Eloquent-inspired ORM for Bun's native SQL client supporting SQLite, MySQL, and PostgreSQL.",
   "license": "MIT",
   "packageManager": "bun@1.3.12",