@h3ravel/arquebus 0.6.6 → 0.6.8

package/dist/index.d.cts

@@ -3,23 +3,23 @@ import Knex$1, { Knex } from "knex";
 import * as dayjs0 from "dayjs";
 
 //#region src/collection.d.ts
-declare class Collection<I extends Model$1 | Model$2> extends Collection$1<I> implements ICollection<I> {
+declare class Collection<I$1 extends Model$1 | Model$2> extends Collection$1<I$1> implements ICollection<I$1> {
   private newConstructor;
-  getConstructor<T extends typeof Collection<I>>(this: InstanceType<T>): T;
-  load(...relations: (string[] | I[] | string | I)[]): Promise<Collection<I>>;
-  loadAggregate<I>(relations: I, column: string, action?: string | null | TFunction): Promise<this>;
-  loadCount(relations: I): Promise<this>;
-  loadMax(relation: I, column: string): Promise<this>;
-  loadMin(relation: I, column: string): Promise<this>;
-  loadSum(relation: I, column: string): Promise<this>;
-  loadAvg(relation: I, column: string): Promise<this>;
+  getConstructor<T$1 extends typeof Collection<I$1>>(this: InstanceType<T$1>): T$1;
+  load(...relations: (string[] | I$1[] | string | I$1)[]): Promise<Collection<I$1>>;
+  loadAggregate<I$1>(relations: I$1, column: string, action?: string | null | TFunction): Promise<this>;
+  loadCount(relations: I$1): Promise<this>;
+  loadMax(relation: I$1, column: string): Promise<this>;
+  loadMin(relation: I$1, column: string): Promise<this>;
+  loadSum(relation: I$1, column: string): Promise<this>;
+  loadAvg(relation: I$1, column: string): Promise<this>;
   mapThen(callback: () => void): Promise<void[]>;
   modelKeys(): any[];
-  contains<K, V>(key: keyof I | K | TFunction, value?: V): boolean;
+  contains<K$1, V>(key: keyof I$1 | K$1 | TFunction, value?: V): boolean;
   diff(items: ICollection<any> | any[]): any;
   except(keys: any[]): any;
-  intersect(items: I[]): any;
-  unique(key?: TFunction | keyof I, _strict?: boolean): any;
+  intersect(items: I$1[]): any;
+  unique(key?: TFunction | keyof I$1, _strict?: boolean): any;
   find(key: any, defaultValue?: null): any;
   fresh(...args: any[]): Promise<any>;
   makeVisible(attributes: any): this;
@@ -28,24 +28,24 @@ declare class Collection<I extends Model$1 | Model$2> extends Collection$1<I> im
   only(keys: any[]): any;
   getDictionary(items?: ICollection<any> | any[]): TGeneric;
   toQuery(): any;
-  toData(): (I | {
+  toData(): (I$1 | {
     [x: string]: any;
     [x: number]: any;
     [x: symbol]: any;
   })[];
-  toJSON(): (I | {
+  toJSON(): (I$1 | {
     [x: string]: any;
     [x: number]: any;
     [x: symbol]: any;
   })[];
   toJson(...args: any[]): string;
-  [Symbol.iterator]: () => Iterator<I>;
+  [Symbol.iterator]: () => Iterator<I$1>;
 }
 //#endregion
 //#region src/paginator.d.ts
-declare class Paginator<T extends Model$1, K extends IPaginatorParams = IPaginatorParams> implements IPaginator<T, K> {
+declare class Paginator<T$1 extends Model$1, K$1 extends IPaginatorParams = IPaginatorParams> implements IPaginator<T$1, K$1> {
   static formatter: (paginator: IPaginator<any>) => any | null;
-  _items: Collection<T>;
+  _items: Collection<T$1>;
   _total: number;
   _perPage: number;
   _lastPage: number;
@@ -53,15 +53,15 @@ declare class Paginator<T extends Model$1, K extends IPaginatorParams = IPaginat
   hasMore: boolean;
   options: TGeneric;
   static setFormatter(formatter?: ((paginator: IPaginator<any> | null) => any) | null): void;
-  constructor(items: T[], total: number, perPage: number, currentPage?: number, options?: TGeneric);
-  setItems(items: T[]): void;
+  constructor(items: T$1[], total: number, perPage: number, currentPage?: number, options?: TGeneric);
+  setItems(items: T$1[]): void;
   firstItem(): number | null;
   lastItem(): number | null;
   hasMorePages(): boolean;
-  get(index: number): T | null;
+  get(index: number): T$1 | null;
   count(): number;
-  items(): Collection<T>;
-  map(callback: (value: T, index: number) => T): Collection<T>;
+  items(): Collection<T$1>;
+  map(callback: (value: T$1, index: number) => T$1): Collection<T$1>;
   currentPage(): number;
   onFirstPage(): boolean;
   perPage(): number;
@@ -80,26 +80,26 @@ declare class Scope<M extends Model$1 = Model$1> implements IScope {
 //#endregion
 //#region src/builder.d.ts
 declare const Inference$2: {
-  new <M extends Model$1 | Model$2 = Model$1, R = IModel | ICollection<M>>(): IBuilder<M, R>;
+  new <M extends Model$1 | Model$2 = Model$1, R$1 = IModel | ICollection<M>>(): IBuilder<M, R$1>;
 };
-declare class Builder<M extends Model$1 = Model$1, R = IModel | ICollection<M>> extends Inference$2 {
-  query: IBuilder<M, R>;
+declare class Builder<M extends Model$1 = Model$1, R$1 = IModel | ICollection<M>> extends Inference$2 {
+  query: IBuilder<M, R$1>;
   connection: any;
   model: M;
   actions: any[];
-  localMacros: TGeneric<(...args: any[]) => any, keyof Omit<IBuilder<M, R>, number>>;
+  localMacros: TGeneric<(...args: any[]) => any, keyof Omit<IBuilder<M, R$1>, number>>;
   eagerLoad: TGeneric<(...args: any[]) => any>;
-  globalScopes: TGeneric<Scope<M> | ((arg: Builder<M, R>) => Builder<M, R>)>;
-  onDeleteCallback?: (builder: Builder<M, R>) => Promise<boolean | number>;
-  constructor(query: IBuilder<M, R>);
-  asProxy(): Builder<M, R>;
+  globalScopes: TGeneric<Scope<M> | ((arg: Builder<M, R$1>) => Builder<M, R$1>)>;
+  onDeleteCallback?: (builder: Builder<M, R$1>) => Promise<boolean | number>;
+  constructor(query: IBuilder<M, R$1>);
+  asProxy(): Builder<M, R$1>;
   orWhere(...args: any[]): this;
   chunk<C extends TFunction>(count: number, callback: C): Promise<boolean>;
   enforceOrderBy(this: any): void;
   clone(this: any): any;
   forPage(this: any, page: number, perPage?: number): any;
   insert(...args: Parameters<typeof this.query.insert>): Promise<any>;
-  update<T extends TGeneric>(values: T): Promise<any>;
+  update<T$1 extends TGeneric>(values: T$1): Promise<any>;
   increment(column: string, amount?: number, extra?: {}): Promise<any>;
   decrement(column: string, amount?: number, extra?: {}): Promise<any>;
   addUpdatedAtColumn(values: TGeneric<string>): TGeneric<string>;
@@ -108,7 +108,7 @@ declare class Builder<M extends Model$1 = Model$1, R = IModel | ICollection<M>>
   forceDelete(): Promise<number | boolean>;
   create(attributes?: {}): Promise<any>;
   newModelInstance(attributes?: {}): any;
-  getQuery(): IBuilder<M, R>;
+  getQuery(): IBuilder<M, R$1>;
   getModel(): M;
   setModel<MO extends Model$1>(model: MO): this;
   qualifyColumn(column: string): string;
@@ -284,11 +284,11 @@ interface IStatement {
   nulls: boolean;
   bool: 'and' | 'or' | 'not';
 }
-interface IQueryBuilder<M extends Model$1 | Model$2 = Model$1, R = M[] | M> {
-  query: IBuilder<M, R>;
+interface IQueryBuilder<M extends Model$1 | Model$2 = Model$1, R$1 = M[] | M> {
+  query: IBuilder<M, R$1>;
   schema: SchemaBuilder;
   _statements: IStatement[];
-  table(name: string): IQueryBuilder<M, R>;
+  table(name: string): IQueryBuilder<M, R$1>;
   select: SelectMethod<this>;
   addSelect: AddSelectMethod<this>;
   columns: SelectMethod<this>;
@@ -297,7 +297,7 @@ interface IQueryBuilder<M extends Model$1 | Model$2 = Model$1, R = M[] | M> {
   returning: ReturningMethod<this>;
   distinctOn: SelectMethod<this>;
   as: AsMethod<this>;
-  asProxy(): IQueryBuilder<M, R>;
+  asProxy(): IQueryBuilder<M, R$1>;
   where: WhereMethod<this>;
   firstOrFail: FirstOrFailMethod<this>;
   forceDelete: ForceDeleteMethod;
@@ -389,7 +389,7 @@ interface IQueryBuilder<M extends Model$1 | Model$2 = Model$1, R = M[] | M> {
   transaction(callback?: TFunction): Promise<Knex.Transaction> | undefined;
   destroy(callback: TFunction): Promise<number>;
   destroy(): Promise<number>;
-  clone(): IQueryBuilder<M, R>;
+  clone(): IQueryBuilder<M, R$1>;
   raw: Knex.RawQueryBuilder<TGeneric, M>;
   get(columns?: string[]): Promise<any>;
   first(columns?: string[]): Promise<M | null | undefined>;
@@ -415,19 +415,19 @@ interface IQueryBuilder<M extends Model$1 | Model$2 = Model$1, R = M[] | M> {
 //#endregion
 //#region src/query-builder.d.ts
 declare const Inference$1: {
-  new <M extends Model$1 = Model$1, R = M[] | M>(): IQueryBuilder<M, R>;
+  new <M extends Model$1 = Model$1, R$1 = M[] | M>(): IQueryBuilder<M, R$1>;
 };
-declare class QueryBuilder<M extends Model$1 = Model$1, R = M[] | M> extends Inference$1<M, R> {
+declare class QueryBuilder<M extends Model$1 = Model$1, R$1 = M[] | M> extends Inference$1<M, R$1> {
   model: M;
   schema: SchemaBuilder;
-  connector: IQueryBuilder<M, R> & Knex.QueryBuilder & {
+  connector: IQueryBuilder<M, R$1> & Knex.QueryBuilder & {
     _statements: any[];
     _single: any;
   } & Knex;
   constructor(config: TConfig | null, connector: TFunction);
   asProxy(): any;
   beginTransaction(): Promise<Knex.Transaction<any, any[]>>;
-  table<X extends M>(table: string): IQueryBuilder<X, R>;
+  table<X extends M>(table: string): IQueryBuilder<X, R$1>;
   transaction(callback?: TFunction): Promise<Knex.Transaction> | undefined;
   find(id: string | number, columns?: string[]): Promise<any>;
   get(_columns?: string[]): Promise<any>;
@@ -443,7 +443,7 @@ declare class QueryBuilder<M extends Model$1 = Model$1, R = M[] | M> extends Inf
   max(column: string): Promise<number>;
   sum(column: string): Promise<number>;
   avg(column: string): Promise<number>;
-  clone(): IQueryBuilder<M, R>;
+  clone(): IQueryBuilder<M, R$1>;
   delete(): Promise<number | boolean>;
   insert(...args: Parameters<typeof this.connector.insert>): Promise<unknown>;
   update(...args: Parameters<typeof this.connector.update>): Promise<number>;
@@ -619,14 +619,14 @@ interface IModel {
   dateFormat: string;
   visible: string[];
   hidden: string[];
-  query<T extends {
+  query<T$1 extends {
     prototype: unknown;
-  }>(this: T, client?: AnyQueryBuilder | null): IBuilder<Model$1>;
-  on<T extends {
+  }>(this: T$1, client?: AnyQueryBuilder | null): IBuilder<Model$1>;
+  on<T$1 extends {
     prototype: unknown;
-  }>(this: T, connection: string | null): IBuilder<Model$1>;
+  }>(this: T$1, connection: string | null): IBuilder<Model$1>;
   boot(): void;
-  make<T extends IModel>(this: new () => T, attributes?: TGeneric): T;
+  make<T$1 extends IModel>(this: new () => T$1, attributes?: TGeneric): T$1;
   addHook(hook: Hook, callback: TFunction): void;
   creating(callback: TFunction): void;
   created(callback: TFunction): void;
@@ -666,8 +666,8 @@ interface IModel {
   fill(attributes: any): this;
   setAppends(appends: string[]): this;
   append(key: string | string[]): this;
-  getRelation<T extends Model$1>(relation: string): T | ICollection<T> | null | undefined;
-  setRelation<T extends Model$1>(relation: string, value: T | ICollection<T> | null): this;
+  getRelation<T$1 extends Model$1>(relation: string): T$1 | ICollection<T$1> | null | undefined;
+  setRelation<T$1 extends Model$1>(relation: string, value: T$1 | ICollection<T$1> | null): this;
   unsetRelation(relation: string): this;
   relationLoaded(relation: string): boolean;
   makeVisible(attributes: string | string[]): this;
@@ -714,45 +714,45 @@ interface IModel {
   push(): Promise<boolean>;
   is(model: this): boolean;
   isNot(model: this): boolean;
-  related<T extends RelationNames<this>>(relation: T): ReturnTypeOfMethod<this, `relation${Capitalize<SnakeToCamelCase<T>>}`>;
-  getRelated<T extends RelationNames<this>>(relation: T): ReturnTypeOfMethod<ReturnTypeOfMethod<this, `relation${Capitalize<SnakeToCamelCase<T>>}`>, any>;
-  hasOne<T extends Model$1>(model: new () => T, foreignKey?: string, localKey?: string): HasOne<T>;
-  hasMany<T extends Model$1>(model: new () => T, foreignKey?: string, localKey?: string): HasMany<T>;
-  belongsTo<T extends Model$1>(model: new () => T, foreignKey?: string, ownerKey?: string, relation?: string): BelongsTo<T>;
-  belongsToMany<T extends Model$1>(model: new () => T, table?: string, foreignPivotKey?: string, relatedPivotKey?: string, parentKey?: string, relatedKey?: string): BelongsToMany<T>;
+  related<T$1 extends RelationNames<this>>(relation: T$1): ReturnTypeOfMethod<this, `relation${Capitalize<SnakeToCamelCase<T$1>>}`>;
+  getRelated<T$1 extends RelationNames<this>>(relation: T$1): ReturnTypeOfMethod<ReturnTypeOfMethod<this, `relation${Capitalize<SnakeToCamelCase<T$1>>}`>, any>;
+  hasOne<T$1 extends Model$1>(model: new () => T$1, foreignKey?: string, localKey?: string): HasOne<T$1>;
+  hasMany<T$1 extends Model$1>(model: new () => T$1, foreignKey?: string, localKey?: string): HasMany<T$1>;
+  belongsTo<T$1 extends Model$1>(model: new () => T$1, foreignKey?: string, ownerKey?: string, relation?: string): BelongsTo<T$1>;
+  belongsToMany<T$1 extends Model$1>(model: new () => T$1, table?: string, foreignPivotKey?: string, relatedPivotKey?: string, parentKey?: string, relatedKey?: string): BelongsToMany<T$1>;
 }
 //#endregion
 //#region types/utils.d.ts
-interface ICollection<T extends Model$1 | Model$2> extends Collection$1<T> {
-  items?: T[];
-  load(...relations: T[]): Promise<ICollection<T>>;
-  loadAggregate(relations: T | T[], column: string, action?: string | null): Promise<this>;
-  loadCount(relation: T, column: string): Promise<this>;
-  loadMax(relation: T, column: string): Promise<this>;
-  loadMin(relation: T, column: string): Promise<this>;
-  loadSum(relation: T, column: string): Promise<this>;
-  loadAvg(relation: T, column: string): Promise<this>;
+interface ICollection<T$1 extends Model$1 | Model$2> extends Collection$1<T$1> {
+  items?: T$1[];
+  load(...relations: T$1[]): Promise<ICollection<T$1>>;
+  loadAggregate(relations: T$1 | T$1[], column: string, action?: string | null): Promise<this>;
+  loadCount(relation: T$1, column: string): Promise<this>;
+  loadMax(relation: T$1, column: string): Promise<this>;
+  loadMin(relation: T$1, column: string): Promise<this>;
+  loadSum(relation: T$1, column: string): Promise<this>;
+  loadAvg(relation: T$1, column: string): Promise<this>;
   mapThen(callback: () => void): Promise<any>;
   modelKeys(): string[] | number[];
   contains(key: IModel | any, operator?: any, value?: any): boolean;
-  diff(items: ICollection<T> | any[]): ICollection<T>;
-  except(keys: any[]): ICollection<T>;
-  intersect(items: T[]): ICollection<T>;
-  unique(key?: any, strict?: boolean): ICollection<T>;
+  diff(items: ICollection<T$1> | any[]): ICollection<T$1>;
+  except(keys: any[]): ICollection<T$1>;
+  intersect(items: T$1[]): ICollection<T$1>;
+  unique(key?: any, strict?: boolean): ICollection<T$1>;
   find(key: any, defaultValue?: any): any;
-  fresh(withs?: any[]): Promise<ICollection<T>>;
+  fresh(withs?: any[]): Promise<ICollection<T$1>>;
   makeVisible(attributes: string | string[]): this;
   makeHidden(attributes: string | string[]): this;
   append(attributes: string[]): this;
   only(keys: null | any[]): this;
   getDictionary(items?: any[]): TGeneric;
-  toQuery(): IBuilder<T, any>;
+  toQuery(): IBuilder<T$1, any>;
   toData(): any;
   toJSON(): any;
   toJson(): string;
   toString(): string;
   [key: string]: any;
-  [Symbol.iterator]: () => Iterator<T>;
+  [Symbol.iterator]: () => Iterator<T$1>;
 }
 interface IPaginatorParams {
   current_page: number;
@@ -763,47 +763,47 @@ interface IPaginatorParams {
   count: number;
   paginated?: boolean;
 }
-interface IPaginator<T extends Model$1 | Model$2, K extends IPaginatorParams = IPaginatorParams> {
+interface IPaginator<T$1 extends Model$1 | Model$2, K$1 extends IPaginatorParams = IPaginatorParams> {
   formatter?(paginator: IPaginator<any>): any | null;
   setFormatter?(formatter: (paginator: IPaginator<any>) => any | null): void;
-  setItems(items: T[] | Collection<T>): void;
+  setItems(items: T$1[] | Collection<T$1>): void;
   hasMorePages(): boolean;
-  get(index: number): T | null;
+  get(index: number): T$1 | null;
   count(): number;
-  items(): Collection<T>;
-  map(callback: (value: T, index: number) => T): Collection<T>;
+  items(): Collection<T$1>;
+  map(callback: (value: T$1, index: number) => T$1): Collection<T$1>;
   currentPage(): number;
   perPage(): number;
   lastPage(): number;
   firstItem(): number | null;
   lastItem(): number | null;
   total(): number;
-  toData<U = K>(): U;
-  toJSON<U = K>(): U;
+  toData<U$1 = K$1>(): U$1;
+  toJSON<U$1 = K$1>(): U$1;
   toJson(): string;
   [Symbol.iterator]?(): {
     next: () => {
-      value: T;
+      value: T$1;
       done: boolean;
     };
   };
 }
 //#endregion
 //#region types/builder.d.ts
-type BaseBuilder<M extends Model$1 | Model$2, R = ICollection<M> | IModel> = Omit<IQueryBuilder<M, R>, 'destroy' | 'clone' | 'get' | 'skip' | 'limit' | 'take' | 'offset' | 'chunk' | 'forPage' | 'orWhere' | 'pluck'>;
+type BaseBuilder<M extends Model$1 | Model$2, R$1 = ICollection<M> | IModel> = Omit<IQueryBuilder<M, R$1>, 'destroy' | 'clone' | 'get' | 'skip' | 'limit' | 'take' | 'offset' | 'chunk' | 'forPage' | 'orWhere' | 'pluck'>;
 interface IScope {
   apply(builder: Builder<any>, model: Model$1): void;
 }
-interface IBuilder<M extends Model$1 | Model$2, R = ICollection<M> | IModel> extends BaseBuilder<M, R> {
-  connector: IQueryBuilder<M, R> & Knex.QueryBuilder & {
+interface IBuilder<M extends Model$1 | Model$2, R$1 = ICollection<M> | IModel> extends BaseBuilder<M, R$1> {
+  connector: IQueryBuilder<M, R$1> & Knex.QueryBuilder & {
     _statements: any[];
     _single: any;
   } & Knex;
-  asProxy(): IQueryBuilder<M, R>;
+  asProxy(): IQueryBuilder<M, R$1>;
   chunk(count: number, callback: (rows: ICollection<M>) => any): Promise<boolean>;
   enforceOrderBy(): void;
   idOf(id: string | number): this;
-  clone(): IBuilder<M, R>;
+  clone(): IBuilder<M, R$1>;
   forPage(page: number, perPage?: number): this;
   insert(...attributes: any[]): Promise<any>;
   update(attributes: any): Promise<any>;
@@ -883,8 +883,8 @@ type FieldExpression = string;
 type TableRef<QB extends AnyQueryBuilder> = ColumnRef | AnyQueryBuilder | CallbackVoid<QB>;
 type Selection<QB extends AnyQueryBuilder> = ColumnRef | AnyQueryBuilder | CallbackVoid<QB>;
 type QBOrCallback<QB extends AnyQueryBuilder> = AnyQueryBuilder | CallbackVoid<QB>;
-interface CallbackVoid<T> {
-  (this: T, arg: T): void;
+interface CallbackVoid<T$1> {
+  (this: T$1, arg: T$1): void;
 }
 type Raw = Knex.Raw;
 type OrderByDirection = 'asc' | 'desc' | 'ASC' | 'DESC';
@@ -892,11 +892,11 @@ interface OrderByDescriptor {
   column: ColumnRef;
   order?: OrderByDirection;
 }
-type AnyQueryBuilder<M extends Model$1 = any, R = any> = IQueryBuilder<M, R> | IBuilder<M, R>;
-type Expression<T> = T | Raw | AnyQueryBuilder;
+type AnyQueryBuilder<M extends Model$1 = any, R$1 = any> = IQueryBuilder<M, R$1> | IBuilder<M, R$1>;
+type Expression<T$1> = T$1 | Raw | AnyQueryBuilder;
 type ColumnRefOrOrderByDescriptor = ColumnRef | OrderByDescriptor;
-interface RawInterface<R> {
-  (sql: string, ...bindings: any[]): R;
+interface RawInterface<R$1> {
+  (sql: string, ...bindings: any[]): R$1;
 }
 interface BaseSetOperations<QB extends AnyQueryBuilder> {
   (callbackOrBuilder: QBOrCallback<QB>, wrap?: boolean): QB;
@@ -910,7 +910,7 @@ interface GroupByMethod<QB extends AnyQueryBuilder> {
   (columns: ColumnRef[]): QB;
 }
 type WithRelationType = {
-  [key: string]: <T extends IBuilder<any>>(builder: T) => T | void;
+  [key: string]: <T$1 extends IBuilder<any>>(builder: T$1) => T$1 | void;
 } | string | string[];
 interface SetOperationsMethod<QB extends AnyQueryBuilder> extends BaseSetOperations<QB> {
   (...callbacksOrBuilders: QBOrCallback<QB>[]): QB;
@@ -1021,7 +1021,7 @@ declare class arquebus<M extends Model$1 = Model$1> {
   connections: Record<string, TConfig>;
   models: Record<string, typeof Model$1>;
   constructor();
-  getConstructor<T extends typeof arquebus>(this: InstanceType<T>): T;
+  getConstructor<T$1 extends typeof arquebus>(this: InstanceType<T$1>): T$1;
   static getInstance(): arquebus<Model$1>;
   /**
    * Initialize a new database connection
@@ -1044,7 +1044,7 @@ declare class arquebus<M extends Model$1 = Model$1> {
   static getConnectorFactory(): typeof Knex$1;
   static addConnection(config: TConfig | TBaseConfig, name?: string): void;
   static beginTransaction(connection?: null): Promise<Knex$1.Knex.Transaction<any, any[]>>;
-  static transaction<A, R>(callback: TFunction<A[], R>, connection?: null): Promise<Knex$1.Knex.Transaction<any, any[]>> | undefined;
+  static transaction<A, R$1>(callback: TFunction<A[], R$1>, connection?: null): Promise<Knex$1.Knex.Transaction<any, any[]>> | undefined;
   static table(name: string, connection?: null): IQueryBuilder<Model$1, Model$1 | Model$1[]>;
   static schema(connection?: null): SchemaBuilder;
   static destroyAll(): Promise<void>;
@@ -1087,14 +1087,14 @@ declare const BaseModel$1: (new (...args: any[]) => any) & {
   dateFormat: string;
   visible: string[] & any[];
   hidden: string[] & any[];
-  query: <T extends {
+  query: <T$1 extends {
     prototype: unknown;
-  }>(this: T, client?: AnyQueryBuilder | null) => IBuilder<Model$1>;
-  on: <T extends {
+  }>(this: T$1, client?: AnyQueryBuilder | null) => IBuilder<Model$1>;
+  on: <T$1 extends {
     prototype: unknown;
-  }>(this: T, connection: string | null) => IBuilder<Model$1>;
+  }>(this: T$1, connection: string | null) => IBuilder<Model$1>;
   boot: () => void;
-  make: <T extends IModel>(this: new () => T, attributes?: TGeneric) => T;
+  make: <T$1 extends IModel>(this: new () => T$1, attributes?: TGeneric) => T$1;
   addHook: (hook: Hook, callback: TFunction) => void;
   creating: (callback: TFunction) => void;
   created: (callback: TFunction) => void;
@@ -1939,8 +1939,8 @@ declare const BaseModel$1: (new (...args: any[]) => any) & {
     uniqueIds(): never[];
     setUniqueIds(): void;
   });
-  getRelation: <T extends Model$1>(relation: string) => T | ICollection<T> | null | undefined;
-  setRelation: <T extends Model$1>(relation: string, value: T | ICollection<T> | null) => (new () => IModel) & IModel & {
+  getRelation: <T$1 extends Model$1>(relation: string) => T$1 | ICollection<T$1> | null | undefined;
+  setRelation: <T$1 extends Model$1>(relation: string, value: T$1 | ICollection<T$1> | null) => (new () => IModel) & IModel & {
     [x: string]: any;
     timestamps: boolean;
     dateFormat: string;
@@ -3830,7 +3830,7 @@ declare const BaseModel$1: (new (...args: any[]) => any) & {
     uniqueIds(): never[];
     setUniqueIds(): void;
   }) => boolean;
-  related: <T extends never>(relation: T) => ReturnTypeOfMethod<(new () => IModel) & IModel & {
+  related: <T$1 extends never>(relation: T$1) => ReturnTypeOfMethod<(new () => IModel) & IModel & {
     [x: string]: any;
     timestamps: boolean;
     dateFormat: string;
@@ -3910,8 +3910,8 @@ declare const BaseModel$1: (new (...args: any[]) => any) & {
     usesUniqueIds(): boolean;
     uniqueIds(): never[];
     setUniqueIds(): void;
-  }, `relation${Capitalize<SnakeToCamelCase<T>>}`>;
-  getRelated: <T extends never>(relation: T) => ReturnTypeOfMethod<ReturnTypeOfMethod<(new () => IModel) & IModel & {
+  }, `relation${Capitalize<SnakeToCamelCase<T$1>>}`>;
+  getRelated: <T$1 extends never>(relation: T$1) => ReturnTypeOfMethod<ReturnTypeOfMethod<(new () => IModel) & IModel & {
     [x: string]: any;
     timestamps: boolean;
     dateFormat: string;
@@ -3991,11 +3991,11 @@ declare const BaseModel$1: (new (...args: any[]) => any) & {
     usesUniqueIds(): boolean;
     uniqueIds(): never[];
     setUniqueIds(): void;
-  }, `relation${Capitalize<SnakeToCamelCase<T>>}`>, any>;
-  hasOne: <T extends Model$1>(model: new () => T, foreignKey?: string, localKey?: string) => HasOne<T>;
-  hasMany: <T extends Model$1>(model: new () => T, foreignKey?: string, localKey?: string) => HasMany<T>;
-  belongsTo: <T extends Model$1>(model: new () => T, foreignKey?: string, ownerKey?: string, relation?: string) => BelongsTo<T>;
-  belongsToMany: <T extends Model$1>(model: new () => T, table?: string, foreignPivotKey?: string, relatedPivotKey?: string, parentKey?: string, relatedKey?: string) => BelongsToMany<T>;
+  }, `relation${Capitalize<SnakeToCamelCase<T$1>>}`>, any>;
+  hasOne: <T$1 extends Model$1>(model: new () => T$1, foreignKey?: string, localKey?: string) => HasOne<T$1>;
+  hasMany: <T$1 extends Model$1>(model: new () => T$1, foreignKey?: string, localKey?: string) => HasMany<T$1>;
+  belongsTo: <T$1 extends Model$1>(model: new () => T$1, foreignKey?: string, ownerKey?: string, relation?: string) => BelongsTo<T$1>;
+  belongsToMany: <T$1 extends Model$1>(model: new () => T$1, table?: string, foreignPivotKey?: string, relatedPivotKey?: string, parentKey?: string, relatedKey?: string) => BelongsToMany<T$1>;
   original: TGeneric;
   casts: TGeneric<typeof CastsAttributes | "int" | "json" | "string" | "date" | "boolean" | "datetime" | "collection">;
   changes: TGeneric;
@@ -4536,7 +4536,7 @@ declare class Model$1 extends BaseModel$1 {
   static init(attributes?: {}): Model$1;
   static extend(plugin: TFunction, options: TGeneric): void;
   static make(attributes?: TGeneric): Model$1;
-  getConstructor<T extends typeof Model$1>(this: InstanceType<T>): T;
+  getConstructor<T$1 extends typeof Model$1>(this: InstanceType<T$1>): T$1;
   bootIfNotBooted(this: any): void;
   static booting(): void;
   static boot(): void;
@@ -4564,12 +4564,12 @@ declare class Model$1 extends BaseModel$1 {
   callNamedScope(scope: string, parameters: any[]): any;
   setTable(table: string): this;
   newCollection(this: any, models?: never[]): Collection<Model$1>;
-  load<R extends WithRelationType>(this: any, ...relations: R[]): Promise<any>;
-  loadAggregate<R extends WithRelationType>(relations: R[], column: string, callback?: TFunction | string | null): Promise<this>;
-  loadCount<R extends WithRelationType>(...relations: R[]): Promise<this>;
-  loadMax<R extends WithRelationType>(relations: R[], column: string): Promise<this>;
-  loadMin<R extends WithRelationType>(relations: R[], column: string): Promise<this>;
-  loadSum<R extends WithRelationType>(relations: R[], column: string): Promise<this>;
+  load<R$1 extends WithRelationType>(this: any, ...relations: R$1[]): Promise<any>;
+  loadAggregate<R$1 extends WithRelationType>(relations: R$1[], column: string, callback?: TFunction | string | null): Promise<this>;
+  loadCount<R$1 extends WithRelationType>(...relations: R$1[]): Promise<this>;
+  loadMax<R$1 extends WithRelationType>(relations: R$1[], column: string): Promise<this>;
+  loadMin<R$1 extends WithRelationType>(relations: R$1[], column: string): Promise<this>;
+  loadSum<R$1 extends WithRelationType>(relations: R$1[], column: string): Promise<this>;
   increment(column: string, amount?: number, extra?: TGeneric, options?: TGeneric): Promise<any>;
   decrement(column: string, amount?: number, extra?: TGeneric, options?: TGeneric): Promise<any>;
   incrementOrDecrement(column: string, amount: number, extra: TGeneric, method: string, options: TGeneric): Promise<any>;
@@ -4618,47 +4618,47 @@ declare class Pivot extends Model$1 {
 }
 //#endregion
 //#region types/generics.d.ts
-type TGeneric<V = any, K extends string = string> = Record<K, V>;
-type XGeneric<V = TGeneric, T = any> = {
-  [key: string]: T;
+type TGeneric<V = any, K$1 extends string = string> = Record<K$1, V>;
+type XGeneric<V = TGeneric, T$1 = any> = {
+  [key: string]: T$1;
 } & V;
 type Hook = 'creating' | 'created' | 'updating' | 'updated' | 'saving' | 'saved' | 'deleting' | 'deleted' | 'restoring' | 'restored' | 'trashed' | 'forceDeleted';
 type TFunction<TArgs extends any[] = any[], TReturn = any> = (...args: TArgs) => TReturn;
 type PrimitiveValue = string | number | boolean | Date | string[] | number[] | boolean[] | Date[] | null | Buffer;
-type ReturnTypeOfMethod<T, K extends keyof T> = T[K] extends ((...args: any[]) => infer R) ? R : never;
+type ReturnTypeOfMethod<T$1, K$1 extends keyof T$1> = T$1[K$1] extends ((...args: any[]) => infer R) ? R : never;
 type SnakeToCamelCase<S extends string> = S extends `${infer T}_${infer U}` ? `${T}${Capitalize<SnakeToCamelCase<U>>}` : S;
 type CamelToSnakeCase<S extends string> = S extends `${infer T}${infer U}` ? U extends Uncapitalize<U> ? `${Uncapitalize<T>}${CamelToSnakeCase<U>}` : `${Uncapitalize<T>}_${CamelToSnakeCase<U>}` : S;
-type FunctionPropertyNames<T> = { [K in keyof T]: T[K] extends ((...args: any[]) => any) ? K : never }[keyof T];
-type RelationNames<T> = FunctionPropertyNames<T> extends infer R ? R extends `relation${infer P}` ? P extends 'sToData' | 'loaded' ? never : CamelToSnakeCase<P> : never : never;
-type MixinConstructor<T = TGeneric> = new (...args: any[]) => T;
+type FunctionPropertyNames<T$1> = { [K in keyof T$1]: T$1[K] extends ((...args: any[]) => any) ? K : never }[keyof T$1];
+type RelationNames<T$1> = FunctionPropertyNames<T$1> extends infer R ? R extends `relation${infer P}` ? P extends 'sToData' | 'loaded' ? never : CamelToSnakeCase<P> : never : never;
+type MixinConstructor<T$1 = TGeneric> = new (...args: any[]) => T$1;
 //#endregion
 //#region src/browser/collection.d.ts
-declare class Collection$2<I extends Model$2> extends Collection$1<I> {
+declare class Collection$2<I$1 extends Model$2> extends Collection$1<I$1> {
   mapThen(callback: TFunction): Promise<any[]>;
   modelKeys(): any[];
-  contains<K, V>(key: keyof I | K | TFunction, value?: V): boolean;
+  contains<K$1, V>(key: keyof I$1 | K$1 | TFunction, value?: V): boolean;
   diff(items: ICollection<any> | any[]): any;
   except(keys: any[]): any;
-  intersect(items: I[]): any;
-  unique(key?: TFunction | keyof I, _strict?: boolean): any;
+  intersect(items: I$1[]): any;
+  unique(key?: TFunction | keyof I$1, _strict?: boolean): any;
   find(key: any, defaultValue?: null): any;
   makeVisible(attributes: any): this;
   makeHidden(attributes: any): this;
   append(attributes: any): this;
   only(keys: any[]): any;
   getDictionary(items?: ICollection<any> | any[]): TGeneric;
-  toData(): (I | {
+  toData(): (I$1 | {
     [x: string]: any;
     [x: number]: any;
     [x: symbol]: any;
   })[];
-  toJSON(): (I | {
+  toJSON(): (I$1 | {
     [x: string]: any;
     [x: number]: any;
     [x: symbol]: any;
   })[];
   toJson(...args: any[]): string;
-  [Symbol.iterator]: () => Iterator<I>;
+  [Symbol.iterator]: () => Iterator<I$1>;
 }
 //#endregion
 //#region src/browser/model.d.ts
@@ -5038,16 +5038,16 @@ declare class InvalidArgumentError extends BaseError {}
 /**
  * Helper type to extract instance type from constructor or mixin function
  */
-type Constructor<T = TGeneric> = MixinConstructor<T>;
+type Constructor<T$1 = TGeneric> = MixinConstructor<T$1>;
 type Mixin<TBase extends Constructor> = (Base: TBase) => Constructor;
 /**
  * Helper type to convert union to intersection
  */
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
+type UnionToIntersection<U$1> = (U$1 extends any ? (k: U$1) => void : never) extends ((k: infer I) => void) ? I : never;
 /**
  * Helper type to get static side of a constructor
  */
-type Static<T> = { [K in keyof T]: T[K] };
+type Static<T$1> = { [K in keyof T$1]: T$1[K] };
 /**
  * Compose function that merges multiple classes and mixins
  *
@@ -5111,7 +5111,7 @@ declare const getAttrName: (attrMethod: string) => string;
  * @param callback
  * @returns
  */
-declare const tap: <I>(instance: I, callback: (ins: I) => Promise<I> | I) => Promise<I> | I;
+declare const tap: <I$1>(instance: I$1, callback: (ins: I$1) => Promise<I$1> | I$1) => Promise<I$1> | I$1;
 declare const compose: typeof compose$1;
 declare const flatten: <A = any>(arr: A[]) => (A extends readonly (infer InnerArr)[] ? InnerArr : A)[];
 declare const flattenDeep: (arr: any) => any;