@h3ravel/arquebus 2.0.0 → 3.0.0

package/dist/seeders/index.js

@@ -2,6 +2,7 @@ import { access, mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "path";
 import path$1, { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
+import { existsSync } from "node:fs";
 //#region src/seeders/seeder.ts
 var Seeder = class {};
 //#endregion
@@ -29,16 +30,14 @@ var SeederRunner = class {
 		this.resolver = resolver;
 	}
 	path(p) {
-		this.paths = Array.from(new Set([...this.paths, p]));
+		this.paths = Array.from(/* @__PURE__ */ new Set([...this.paths, p]));
 	}
 	getPaths() {
 		return this.paths;
 	}
 	resolveConnection(connection) {
-		var _getInstance, _ref, _instance$connections;
 		const name = connection || this.connection || "default";
-		const instance = ((_getInstance = (_ref = this.resolver).getInstance) === null || _getInstance === void 0 ? void 0 : _getInstance.call(_ref)) ?? null;
-		if (!!!(instance === null || instance === void 0 || (_instance$connections = instance.connections) === null || _instance$connections === void 0 ? void 0 : _instance$connections[name])) this.resolver.autoLoad().catch(() => {
+		if (!!!(this.resolver.getInstance?.() ?? null)?.connections?.[name]) this.resolver.autoLoad().catch(() => {
 			/** noop */
 		});
 		return this.resolver.fire(name);
@@ -76,7 +75,7 @@ var SeederRunner = class {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/tsdown@0.22.2_tsx@4.22.4_typescript@6.0.3/node_modules/tsdown/esm-shims.js
+//#region node_modules/.pnpm/tsdown@0.22.5_tsx@4.23.0_typescript@6.0.3/node_modules/tsdown/esm-shims.js
 const getFilename = () => fileURLToPath(import.meta.url);
 const getDirname = () => path$1.dirname(getFilename());
 const __dirname = /* @__PURE__ */ getDirname();
@@ -98,7 +97,10 @@ var SeederCreator = class {
 	getStubPath(type) {
 		if (this.customStubPath) return path.join(this.customStubPath, `seeder-${type}.stub`);
 		const __dirname = this.getDirname(import.meta);
-		return path.join(__dirname, "stubs", `seeder-${type}.stub`);
+		const name = `seeder-${type}.stub`;
+		const resolved = [path.join(__dirname, "stubs", name), path.join(__dirname, "../stubs", name)].find((candidate) => existsSync(candidate));
+		if (!resolved) throw new Error(`Seeder stub not found: ${name}`);
+		return resolved;
 	}
 	getDirname(meta) {
 		if (typeof __dirname !== "undefined") return __dirname;

package/dist/{migrations/stubs/stubs → stubs}/migration-js.stub

@@ -19,3 +19,4 @@ export default class extends Migration {
     //
   }
 }
+

package/dist/{migrations/stubs/stubs → stubs}/migration-ts.stub

@@ -16,3 +16,4 @@ export default class extends Migration {
     //
   }
 }
+

package/dist/{migrations/stubs/stubs → stubs}/migration.create-js.stub

@@ -22,3 +22,4 @@ export default class extends Migration {
     await schema.dropTableIfExists('{{ table }}')
   }
 }
+

package/dist/{migrations/stubs/stubs → stubs}/migration.create-ts.stub

@@ -19,3 +19,4 @@ export default class extends Migration {
     await schema.dropTableIfExists('{{ table }}')
   }
 }
+

package/dist/{migrations/stubs/stubs → stubs}/migration.update-js.stub

@@ -23,3 +23,4 @@ export default class extends Migration {
     })
   }
 };
+

package/dist/{migrations/stubs/stubs → stubs}/migration.update-ts.stub

@@ -20,3 +20,4 @@ export default class extends Migration {
     })
   }
 }
+

package/dist/stubs/model-ts.stub

@@ -0,0 +1,9 @@
+import { Model } from '@h3ravel/arquebus'
+
+export interface {{ name }}Attributes {
+  id: number
+}
+
+export default class {{ name }} extends Model.define<{{ name }}Attributes>() {
+  //
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h3ravel/arquebus",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Arquebus ORM is a Beautiful, expressive ORM inspired by Laravel's Eloquent, designed for TypeScript applications and for the H3ravel Framework.",
   "homepage": "https://h3ravel.toneflix.net/arquebus",
   "bin": {
@@ -139,8 +139,8 @@
     "url": "https://github.com/h3ravel/arquebus.git"
   },
   "engines": {
-    "node": ">=14",
-    "pnpm": ">=4"
+    "node": "^20.19.0 || >=22.12.0",
+    "pnpm": ">=10"
   },
   "husky": {
     "hooks": {
@@ -154,46 +154,45 @@
     ]
   },
   "dependencies": {
-    "@h3ravel/shared": "^2.0.0",
-    "@h3ravel/support": "^2.0.0",
-    "barrelize": "^1.6.4",
+    "@h3ravel/collect.js": "^5.4.0",
+    "@h3ravel/musket": "^2.2.7",
+    "@h3ravel/shared": "^2.2.5",
+    "@h3ravel/support": "^2.2.5",
+    "barrelize": "^1.8.2",
     "chalk": "^5.6.2",
-    "chokidar": "^4.0.1",
-    "collect.js": "^4.36.1",
-    "commander": "^14.0.1",
-    "cross-env": "^10.0.0",
-    "dayjs": "^1.11.18",
-    "dotenv": "^17.2.2",
+    "chokidar": "^5.0.0",
+    "cross-env": "^10.1.0",
+    "dayjs": "^1.11.21",
+    "dotenv": "^17.4.2",
     "escalade": "^3.2.0",
     "husky": "^9.1.7",
-    "knex": "^3.1.0",
-    "lint-staged": "^16.2.0",
-    "mysql2": "^3.15.0",
-    "pg": "^8.16.3",
+    "knex": "^3.3.0",
+    "lint-staged": "^17.0.8",
+    "mysql2": "^3.22.6",
+    "pg": "^8.22.0",
     "pluralize": "^8.0.0",
-    "radashi": "^12.6.2",
     "resolve-from": "^5.0.0",
-    "tedious": "^19.0.0"
+    "tedious": "^20.0.0"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@types/node": "^25.9.3",
+    "@types/node": "^26.1.1",
     "@types/pluralize": "^0.0.33",
-    "@typescript-eslint/eslint-plugin": "^8.61.0",
-    "@typescript-eslint/parser": "^8.61.0",
-    "@vitest/coverage-v8": "^4.1.8",
-    "eslint": "^10.4.1",
-    "jsdom": "^26.1.0",
-    "prettier": "^3.8.4",
+    "@typescript-eslint/eslint-plugin": "^8.63.0",
+    "@typescript-eslint/parser": "^8.63.0",
+    "@vitest/coverage-v8": "^4.1.10",
+    "eslint": "^10.7.0",
+    "jsdom": "^29.1.1",
+    "prettier": "^3.9.5",
     "sqlite3": "^6.0.1",
-    "terser": "^5.48.0",
+    "terser": "^5.49.0",
     "ts-node": "^10.9.2",
-    "tsdown": "^0.22.2",
-    "tsx": "^4.22.4",
+    "tsdown": "^0.22.5",
+    "tsx": "^4.23.0",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.61.0",
-    "vite": "^8.0.16",
-    "vitest": "^4.1.8"
+    "typescript-eslint": "^8.63.0",
+    "vite": "^8.1.4",
+    "vitest": "^4.1.10"
   },
   "keywords": [
     "arquebus",
@@ -211,6 +210,7 @@
   "license": "MIT",
   "scripts": {
     "build": "tsdown",
+    "typecheck": "tsc --noEmit",
     "lint": "eslint . --ext .ts",
     "barrel": "barrelize >/dev/null",
     "postinstall": "pnpm barrel",

package/types/builder.ts

@@ -33,7 +33,7 @@ export interface IBuilder<M extends Model | BModel, R = ICollection<M> | IModel>
   extends BaseBuilder<M, R> {
   connector: IQueryBuilder<M, R> &
     Knex.QueryBuilder & { _statements: any[]; _single: any } & Knex
-  asProxy(): IQueryBuilder<M, R>
+  asProxy(): IBuilder<M, R>
   chunk(
     count: number,
     callback: (rows: ICollection<M>) => any,

package/types/database.ts

@@ -0,0 +1,69 @@
+import type { Collection as ValueCollection } from '@h3ravel/collect.js'
+import type { Knex } from 'knex'
+
+export type DatabaseSchema = object
+export type TableName<Database extends DatabaseSchema> = Extract<keyof Database, string>
+export type TableRow<
+  Database extends DatabaseSchema,
+  Table extends TableName<Database>,
+> = Database[Table]
+export type TableColumn<
+  Database extends DatabaseSchema,
+  Table extends TableName<Database>,
+> = Extract<keyof TableRow<Database, Table>, string>
+
+export interface TableBuilder<
+  Database extends DatabaseSchema,
+  Table extends TableName<Database>,
+> {
+  where<Column extends TableColumn<Database, Table>>(
+    column: Column,
+    value: TableRow<Database, Table>[Column] | Knex.Raw,
+  ): this
+  where<Column extends TableColumn<Database, Table>>(
+    column: Column,
+    operator: string,
+    value: TableRow<Database, Table>[Column] | Knex.Raw,
+  ): this
+  where(attributes: Partial<TableRow<Database, Table>>): this
+  orWhere<Column extends TableColumn<Database, Table>>(
+    column: Column,
+    value: TableRow<Database, Table>[Column] | Knex.Raw,
+  ): this
+  whereIn<Column extends TableColumn<Database, Table>>(
+    column: Column,
+    values: TableRow<Database, Table>[Column][],
+  ): this
+  whereNull(column: TableColumn<Database, Table>): this
+  whereNotNull(column: TableColumn<Database, Table>): this
+  select(...columns: (TableColumn<Database, Table> | '*')[]): this
+  orderBy(
+    column: TableColumn<Database, Table>,
+    direction?: 'asc' | 'desc' | 'ASC' | 'DESC',
+  ): this
+  limit(count: number): this
+  offset(count: number): this
+  first(columns?: TableColumn<Database, Table>[]): Promise<TableRow<Database, Table> | undefined>
+  get(columns?: TableColumn<Database, Table>[]): Promise<TableRow<Database, Table>[]>
+  insert(
+    rows: Partial<TableRow<Database, Table>> | Partial<TableRow<Database, Table>>[],
+  ): Promise<unknown>
+  update(values: Partial<TableRow<Database, Table>>): Promise<number>
+  delete(): Promise<number>
+  count(column?: TableColumn<Database, Table> | '*'): Promise<number>
+  min(column: TableColumn<Database, Table>): Promise<number>
+  max(column: TableColumn<Database, Table>): Promise<number>
+  sum(column: TableColumn<Database, Table>): Promise<number>
+  avg(column: TableColumn<Database, Table>): Promise<number>
+  pluck<Column extends TableColumn<Database, Table>>(
+    column: Column,
+  ): Promise<ValueCollection<TableRow<Database, Table>[Column]>>
+  clone(): TableBuilder<Database, Table>
+}
+
+export interface TypedArquebus<Database extends DatabaseSchema> {
+  table<Table extends TableName<Database>>(
+    name: Table,
+    connection?: string | null,
+  ): TableBuilder<Database, Table>
+}

package/types/index.ts

@@ -1,7 +1,10 @@
 export * from './builder'
 export * from './container'
+export * from './database'
 export * from './generics'
+export * from './model-builder'
 export * from './modeling'
 export * from './query-builder'
 export * from './query-methods'
+export * from './schema'
 export * from './utils'

package/types/model-builder.ts

@@ -0,0 +1,132 @@
+import type { Collection as ValueCollection } from '@h3ravel/collect.js'
+import type { Knex } from 'knex'
+import type Collection from 'src/collection'
+import type Paginator from 'src/paginator'
+import type Model from 'src/model'
+import type { IBuilder } from './builder'
+import type {
+  ModelColumn,
+  ModelColumnValue,
+  ModelInput,
+  ModelKey,
+  ModelRelationPath,
+  QualifiedModelColumn,
+} from './schema'
+
+export type QueryOperator =
+  | '='
+  | '!='
+  | '<>'
+  | '<'
+  | '<='
+  | '>'
+  | '>='
+  | 'like'
+  | 'ilike'
+  | 'in'
+  | 'not in'
+  | (string & {})
+
+export type QueryValue<Value> = Value | Knex.Raw | ModelBuilder<any>
+
+export interface ModelBuilder<M extends Model = Model> {
+  query: IBuilder<M>
+  [method: string]: any
+  where<Column extends ModelColumn<M>>(
+    column: Column,
+    value: QueryValue<ModelColumnValue<M, Column>>,
+  ): this
+  where<Column extends ModelColumn<M>>(
+    column: Column,
+    operator: QueryOperator,
+    value: QueryValue<ModelColumnValue<M, Column>>,
+  ): this
+  where(attributes: ModelInput<M>): this
+  where(callback: (query: ModelBuilder<M>) => unknown): this
+  orWhere<Column extends ModelColumn<M>>(
+    column: Column,
+    value: QueryValue<ModelColumnValue<M, Column>>,
+  ): this
+  orWhere<Column extends ModelColumn<M>>(
+    column: Column,
+    operator: QueryOperator,
+    value: QueryValue<ModelColumnValue<M, Column>>,
+  ): this
+  orWhere(callback: (query: ModelBuilder<M>) => unknown): this
+  whereIn<Column extends ModelColumn<M>>(
+    column: Column,
+    values: ModelColumnValue<M, Column>[],
+  ): this
+  whereNotIn<Column extends ModelColumn<M>>(
+    column: Column,
+    values: ModelColumnValue<M, Column>[],
+  ): this
+  whereNull(column: ModelColumn<M>): this
+  whereNotNull(column: ModelColumn<M>): this
+  whereBetween<Column extends ModelColumn<M>>(
+    column: Column,
+    values: [ModelColumnValue<M, Column>, ModelColumnValue<M, Column>],
+  ): this
+  whereColumn(
+    first: QualifiedModelColumn<M>,
+    operator: QueryOperator,
+    second: QualifiedModelColumn<M>,
+  ): this
+  select(
+    ...columns: (
+      | ModelColumn<M>
+      | '*'
+      | readonly (ModelColumn<M> | '*')[]
+    )[]
+  ): this
+  orderBy(column: ModelColumn<M>, direction?: 'asc' | 'desc' | 'ASC' | 'DESC'): this
+  latest(column?: ModelColumn<M>): this
+  oldest(column?: ModelColumn<M>): this
+  limit(count: number): this
+  take(count: number): this
+  offset(count: number): this
+  skip(count: number): this
+  with(
+    ...relations: (
+      | ModelRelationPath<M>
+      | readonly ModelRelationPath<M>[]
+      | Partial<
+          Record<
+            ModelRelationPath<M>,
+            (query: ModelBuilder<any>) => unknown
+          >
+        >
+    )[]
+  ): this
+  withCount(
+    ...relations: (ModelRelationPath<M> | readonly ModelRelationPath<M>[])[]
+  ): this
+  first(columns?: ModelColumn<M>[]): Promise<M | null>
+  firstOrFail(columns?: ModelColumn<M>[]): Promise<M>
+  find(key: ModelKey<M>, columns?: ModelColumn<M>[]): Promise<M | null>
+  findOrFail(key: ModelKey<M>, columns?: ModelColumn<M>[]): Promise<M>
+  findMany(keys: ModelKey<M>[], columns?: ModelColumn<M>[]): Promise<Collection<M>>
+  get(columns?: ModelColumn<M>[]): Promise<Collection<M>>
+  all(columns?: ModelColumn<M>[]): Promise<Collection<M>>
+  create(attributes?: ModelInput<M>): Promise<M>
+  firstOrNew(attributes?: ModelInput<M>, values?: ModelInput<M>): Promise<M>
+  firstOrCreate(attributes?: ModelInput<M>, values?: ModelInput<M>): Promise<M>
+  updateOrCreate(attributes: ModelInput<M>, values?: ModelInput<M>): Promise<M>
+  update(attributes: ModelInput<M>): Promise<number>
+  increment(column: ModelColumn<M>, amount?: number, extra?: ModelInput<M>): Promise<number>
+  decrement(column: ModelColumn<M>, amount?: number, extra?: ModelInput<M>): Promise<number>
+  delete(): Promise<boolean | number>
+  forceDelete(): Promise<boolean | number>
+  count(column?: ModelColumn<M> | '*'): Promise<number>
+  min(column: ModelColumn<M>): Promise<number>
+  max(column: ModelColumn<M>): Promise<number>
+  sum(column: ModelColumn<M>): Promise<number>
+  avg(column: ModelColumn<M>): Promise<number>
+  pluck<Column extends ModelColumn<M>>(
+    column: Column,
+  ): Promise<ValueCollection<ModelColumnValue<M, Column>>>
+  paginate(page?: number, perPage?: number): Promise<Paginator<M>>
+  clone(): ModelBuilder<M>
+  getModel(): M
+  toSql(): object
+}

package/types/query-builder.ts

@@ -72,7 +72,6 @@ export interface SchemaBuilder extends Knex.SchemaBuilder {
    */
   foreignKeys (): Promise<ForeignKey>
 }
-
 interface AsMethod<QB extends AnyQueryBuilder> {
   (alias: string): QB
 }

package/types/query-methods.ts

@@ -24,7 +24,6 @@ type QBOrCallback<QB extends AnyQueryBuilder> =
 interface CallbackVoid<T> {
   (this: T, arg: T): void
 }
-
 export type Raw = Knex.Raw
 
 export type OrderByDirection = 'asc' | 'desc' | 'ASC' | 'DESC'

package/types/schema.ts

@@ -0,0 +1,92 @@
+import type { Collection as BaseCollection } from '@h3ravel/collect.js'
+import type Collection from 'src/collection'
+import type { ModelBuilder } from './model-builder'
+import type Model from 'src/model'
+
+export type ModelRecord = object
+export type RelationRecord = object
+
+export type ModelAttributesOf<M> = M extends { readonly $attributes: infer Attributes }
+  ? Attributes
+  : never
+
+export type ModelRelationsOf<M> = M extends { readonly $relations: infer Relations }
+  ? Relations
+  : never
+
+export type ModelTableOf<M> = M extends { readonly $table: infer Table extends string }
+  ? Table
+  : string
+
+export type ModelColumn<M> = [keyof ModelAttributesOf<M>] extends [never]
+  ? string
+  : Extract<keyof ModelAttributesOf<M>, string>
+export type QualifiedModelColumn<M> =
+  | ModelColumn<M>
+  | `${ModelTableOf<M>}.${ModelColumn<M>}`
+
+export type ModelColumnValue<
+  M,
+  Column extends string,
+> = Column extends `${string}.${infer Name}`
+  ? Name extends keyof ModelAttributesOf<M>
+    ? ModelAttributesOf<M>[Name]
+    : never
+  : Column extends keyof ModelAttributesOf<M>
+    ? ModelAttributesOf<M>[Column]
+    : never
+
+export type ModelInput<M> = Partial<ModelAttributesOf<M>>
+export type ModelData<M> = ModelAttributesOf<M> & Partial<ModelRelationsOf<M>>
+export type ModelRelation<M> = Extract<keyof ModelRelationsOf<M>, string>
+export type ModelRelationPath<M> = [ModelRelation<M>] extends [never]
+  ? string
+  : ModelRelation<M> | `${ModelRelation<M>}.${string}`
+type DeclaredModelKey<M> = 'id' extends keyof ModelAttributesOf<M>
+  ? Extract<ModelAttributesOf<M>['id'], string | number>
+  : never
+export type ModelKey<M> = [DeclaredModelKey<M>] extends [never]
+  ? string | number
+  : DeclaredModelKey<M>
+
+export type HydratedModel<
+  Attributes extends ModelRecord,
+  Relations extends RelationRecord = {},
+  Table extends string = string,
+> = Model<Attributes, Relations, Table> & Attributes & Partial<Relations>
+
+export type DefinedModel<
+  Attributes extends ModelRecord,
+  Relations extends RelationRecord = {},
+  Table extends string = string,
+> = {
+  new (attributes?: Partial<Attributes>): HydratedModel<Attributes, Relations, Table>
+  query<M extends Model<any, any, any>>(this: ModelConstructor<M>): ModelBuilder<M>
+  on<M extends Model<any, any, any>>(
+    this: ModelConstructor<M>,
+    connection?: string | null,
+  ): ModelBuilder<M>
+  init<M extends Model<any, any, any>>(
+    this: ModelConstructor<M>,
+    attributes?: ModelInput<M>,
+  ): M
+  make<M extends Model<any, any, any>>(
+    this: ModelConstructor<M>,
+    attributes?: ModelInput<M>,
+  ): M
+  booting(): void
+  boot(): void
+  booted(): void
+  setConnectionResolver(resolver: unknown): void
+  extend(plugin: (...args: any[]) => any, options: object): void
+}
+
+export type ModelConstructor<M extends Model<any, any, any> = Model> = {
+  new (attributes?: ModelInput<M>): M
+}
+
+export type CollectionItem<C> = C extends Collection<infer Item>
+  ? Item
+  : C extends BaseCollection<infer Item>
+    ? Item
+    : never

package/types/utils.ts

@@ -1,47 +1,8 @@
 import type BModel from 'src/browser/model'
-import type { Collection as BaseCollection } from 'collect.js'
 import type Collection from 'src/collection'
-import type { IBuilder } from './builder'
-import type { IModel } from './modeling'
 import type Model from 'src/model'
-import type { TGeneric } from './generics'
 
-export interface ICollection<T extends Model | BModel>
-  extends BaseCollection<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>
-  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>
-  find (key: any, defaultValue?: any): any
-  fresh (withs?: any[]): Promise<ICollection<T>>
-  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>
-  toData (): any
-  toJSON (): any
-  toJson (): string
-  toString (): string
-  [key: string]: any
-  [Symbol.iterator]: () => Iterator<T>
-}
+export type ICollection<T extends Model | BModel> = Collection<T>
 
 export interface IPaginatorParams {
   current_page?: number

package/dist/stubs/stubs/model-ts.stub

@@ -1,5 +0,0 @@
-import { Model } from '@h3ravel/arquebus'
-
-export default class {{ name }} extends Model {
-  //
-}