@veap/database 0.1.0 → 0.1.1

package/README.md

@@ -1,5 +1,6 @@
-[![CI](https://github.com/veapjs/veap-database/actions/workflows/ci.yml/badge.svg)](https://github.com/veapjs/veap-database/actions/workflows/ci.yml)
-[![Release](https://github.com/veapjs/veap-database/actions/workflows/release.yml/badge.svg)](https://github.com/veapjs/veap-database/actions/workflows/release.yml)
+[![CI](https://github.com/veapjs/veap-database/actions/workflows/CI.yml/badge.svg)](https://github.com/veapjs/veap-database/actions/workflows/CI.yml)
+[![Release](https://github.com/veapjs/veap-database/actions/workflows/RELEASE.yml/badge.svg)](https://github.com/veapjs/veap-database/actions/workflows/RELEASE.yml)
+[![Version](https://img.shields.io/npm/v/@veap/database?style=flat&colorA=000000&colorB=000000)](https://www.npmjs.com/package/@veap/database)
 
 # @veap/database
 

package/dist/casts.js

@@ -57,7 +57,7 @@ export function serializeForStorage(value, type, clientType) {
     }
     switch (type) {
         case "json":
-            return JSON.stringify(value);
+            return typeof value === "string" ? value : JSON.stringify(value);
         case "boolean":
             if (clientType?.includes("sqlite")) {
                 return value ? 1 : 0;

package/dist/composition.d.ts

@@ -0,0 +1,15 @@
+import { ServiceProvider } from "@veap/kernel";
+declare module "@veap/kernel" {
+    interface ApplicationBuilder {
+        /**
+         * Registers host application migrations with IoC and configures MigrationServiceProvider.
+         */
+        withMigrations(migrations: any[]): this;
+    }
+}
+declare class MigrationsConfigProvider extends ServiceProvider {
+    private migrations;
+    constructor(container: any, migrations?: any[]);
+    register(): void;
+}
+export { MigrationsConfigProvider };

package/dist/composition.js

@@ -0,0 +1,26 @@
+import { ApplicationBuilder, ServiceProvider } from "@veap/kernel";
+import { MigrationServiceProvider } from "./migration-provider.js";
+import { APP_MIGRATIONS } from "./tokens.js";
+class MigrationsConfigProvider extends ServiceProvider {
+    migrations;
+    constructor(container, migrations = []) {
+        super(container);
+        this.migrations = migrations;
+    }
+    register() {
+        this.container.register({
+            token: APP_MIGRATIONS,
+            useValue: this.migrations,
+        });
+        this.container.register({
+            token: "AppMigrations",
+            useValue: this.migrations,
+        });
+    }
+}
+if (!ApplicationBuilder.prototype.withMigrations) {
+    ApplicationBuilder.prototype.withMigrations = function (migrations) {
+        return this.use((c) => new MigrationsConfigProvider(c, migrations)).use(MigrationServiceProvider);
+    };
+}
+export { MigrationsConfigProvider };

package/dist/connection.d.ts

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 import { type Knex } from "knex";
-import type { DatabaseConfig, PostgresSslConfig, PostgresSslOptions, TransactionOptions } from "./types";
+import type { DatabaseConfig, PostgresSslConfig, PostgresSslOptions, TransactionOptions } from "./types.js";
 /**
  * AsyncLocalStorage holding the currently active Knex transaction for the asynchronous execution context.
  */

package/dist/connection.js

@@ -2,8 +2,8 @@ import { AsyncLocalStorage } from "node:async_hooks";
 import fs from "node:fs";
 import path from "node:path";
 import knex from "knex";
-import { DatabaseError } from "./errors";
-import { debug, warn } from "./logger";
+import { DatabaseError } from "./errors.js";
+import { debug, warn } from "./logger.js";
 const globalForDb = globalThis;
 /**
  * AsyncLocalStorage holding the currently active Knex transaction for the asynchronous execution context.
@@ -90,9 +90,13 @@ export function resolveSqliteFilename(filename) {
     }
     if (!clean.startsWith(":memory:")) {
         try {
-            fs.mkdirSync(path.dirname(path.resolve(clean)), {
-                recursive: true,
-            });
+            if (typeof process !== "undefined" && process.versions?.node) {
+                /* turbopackIgnore: true */
+                const resolvedPath = path.resolve(clean);
+                fs.mkdirSync(path.dirname(resolvedPath), {
+                    recursive: true,
+                });
+            }
         }
         catch {
             // Read-only filesystem etc. Let the driver surface its own error.

package/dist/factory.d.ts

@@ -1,4 +1,4 @@
-import type { Model } from "./model";
+import type { Model } from "./model.js";
 export declare abstract class Factory<M extends Model = any> {
     private static get registry();
     /**

package/dist/factory.js

@@ -1,4 +1,4 @@
-import { DatabaseError } from "./errors";
+import { DatabaseError } from "./errors.js";
 export class Factory {
     static get registry() {
         const g = globalThis;

package/dist/index.d.ts

@@ -1,17 +1,19 @@
 export { default as knex, type Knex } from "knex";
-export * from "./casts";
-export * from "./connection";
-export * from "./errors";
-export * from "./events";
-export * from "./factory";
-export * from "./logger";
-export * from "./migration-provider";
-export * from "./migrations/index";
-export * from "./model";
-export * from "./provider";
-export * from "./query-builder";
-export * from "./relations/index";
-export * from "./scopes";
-export * from "./seeder";
-export * from "./types";
-export * from "./utils";
+export * from "./casts.js";
+export * from "./composition.js";
+export * from "./connection.js";
+export * from "./errors.js";
+export * from "./events.js";
+export * from "./factory.js";
+export * from "./logger.js";
+export * from "./migration-provider.js";
+export * from "./migrations/index.js";
+export * from "./model.js";
+export * from "./provider.js";
+export * from "./query-builder.js";
+export * from "./relations/index.js";
+export * from "./scopes.js";
+export * from "./seeder.js";
+export * from "./tokens.js";
+export * from "./types.js";
+export * from "./utils.js";

package/dist/index.js

@@ -1,17 +1,19 @@
 export { default as knex } from "knex";
-export * from "./casts";
-export * from "./connection";
-export * from "./errors";
-export * from "./events";
-export * from "./factory";
-export * from "./logger";
-export * from "./migration-provider";
-export * from "./migrations/index";
-export * from "./model";
-export * from "./provider";
-export * from "./query-builder";
-export * from "./relations/index";
-export * from "./scopes";
-export * from "./seeder";
-export * from "./types";
-export * from "./utils";
+export * from "./casts.js";
+export * from "./composition.js";
+export * from "./connection.js";
+export * from "./errors.js";
+export * from "./events.js";
+export * from "./factory.js";
+export * from "./logger.js";
+export * from "./migration-provider.js";
+export * from "./migrations/index.js";
+export * from "./model.js";
+export * from "./provider.js";
+export * from "./query-builder.js";
+export * from "./relations/index.js";
+export * from "./scopes.js";
+export * from "./seeder.js";
+export * from "./tokens.js";
+export * from "./types.js";
+export * from "./utils.js";

package/dist/migration-provider.d.ts

@@ -1,5 +1,7 @@
 import { ServiceProvider } from "@veap/kernel";
 export declare class MigrationServiceProvider extends ServiceProvider {
+    private migrations?;
+    constructor(container: any, migrations?: any[]);
     register(): void;
     boot(): Promise<void>;
 }

package/dist/migration-provider.js

@@ -1,15 +1,36 @@
 import { ServiceProvider } from "@veap/kernel";
-import { runMigrations } from "./migrations/runner";
+import { runMigrations } from "./migrations/runner.js";
+import { APP_MIGRATIONS } from "./tokens.js";
 export class MigrationServiceProvider extends ServiceProvider {
+    migrations;
+    constructor(container, migrations) {
+        super(container);
+        this.migrations = migrations;
+    }
     register() {
-        // No bindings needed
+        if (this.migrations?.length) {
+            this.container.register({
+                token: APP_MIGRATIONS,
+                useValue: this.migrations,
+            });
+            this.container.register({
+                token: "AppMigrations",
+                useValue: this.migrations,
+            });
+        }
     }
     async boot() {
-        if (this.container.has("AppMigrations")) {
-            const appMigrations = await this.container.resolve("AppMigrations");
-            if (appMigrations?.length) {
-                await runMigrations("app", appMigrations);
+        let appMigrations = this.migrations;
+        if (!appMigrations?.length) {
+            if (this.container.has(APP_MIGRATIONS)) {
+                appMigrations = await this.container.resolve(APP_MIGRATIONS);
             }
+            else if (this.container.has("AppMigrations")) {
+                appMigrations = await this.container.resolve("AppMigrations");
+            }
+        }
+        if (appMigrations?.length) {
+            await runMigrations("app", appMigrations);
         }
     }
 }

package/dist/migrations/index.d.ts

@@ -1,3 +1,3 @@
-export * from "./generator";
-export * from "./runner";
-export * from "./schema-builder";
+export * from "./generator.js";
+export * from "./runner.js";
+export * from "./schema-builder.js";

package/dist/migrations/index.js

@@ -1,3 +1,3 @@
-export * from "./generator";
-export * from "./runner";
-export * from "./schema-builder";
+export * from "./generator.js";
+export * from "./runner.js";
+export * from "./schema-builder.js";

package/dist/migrations/runner.d.ts

@@ -1,4 +1,4 @@
-import { Schema } from "./schema-builder";
+import { Schema } from "./schema-builder.js";
 export interface Migration {
     name: string;
     up: (db: any, schema: Schema) => Promise<void>;

package/dist/migrations/runner.js

@@ -1,7 +1,7 @@
 import crypto from "node:crypto";
-import { getKnex } from "../connection";
-import { debug, warn } from "../logger";
-import { Schema } from "./schema-builder";
+import { getKnex } from "../connection.js";
+import { debug, warn } from "../logger.js";
+import { Schema } from "./schema-builder.js";
 async function ensureMigrationsTable(knex = getKnex()) {
     try {
         const hasTable = await knex.schema.hasTable("migrations");
@@ -27,6 +27,19 @@ async function ensureMigrationsTable(knex = getKnex()) {
         warn("veap:migration", "Failed to ensure migrations table:", error);
     }
 }
+async function acquireAdvisoryLockIfPostgres(tx, knex) {
+    const clientName = knex?.client?.config?.client || "";
+    if (typeof clientName === "string" &&
+        (clientName.includes("pg") || clientName.includes("postgres"))) {
+        const lockId = 123456;
+        try {
+            await tx.raw("SELECT pg_advisory_xact_lock(?)", [lockId]);
+        }
+        catch (_e) {
+            debug("veap:migration", "Could not acquire advisory lock, continuing...");
+        }
+    }
+}
 /**
  * Creates a compatibility DB adapter for migrations that provides `.execute(query)`
  * wrapping `trx.raw(query)`, while also being directly callable as a Knex query builder
@@ -67,14 +80,8 @@ export async function runMigrations(scope, migrations) {
         return;
     await ensureMigrationsTable(knex);
     await knex.transaction(async (tx) => {
-        // Acquire advisory lock (unique ID for migrations in Postgres)
-        const lockId = 123456;
-        try {
-            await tx.raw("SELECT pg_advisory_xact_lock(?)", [lockId]);
-        }
-        catch (_e) {
-            debug("veap:migration", "Could not acquire advisory lock, continuing...");
-        }
+        // Acquire advisory lock only if running on PostgreSQL
+        await acquireAdvisoryLockIfPostgres(tx, knex);
         debug("veap:migration", `Running migrations for scope: ${scope}`);
         // 1. Get executed migrations for this scope
         const executed = await tx("migrations")
@@ -131,14 +138,8 @@ export async function rollbackMigrations(scope, migrations) {
         return;
     await ensureMigrationsTable(knex);
     await knex.transaction(async (tx) => {
-        // Acquire advisory lock
-        const lockId = 123456;
-        try {
-            await tx.raw("SELECT pg_advisory_xact_lock(?)", [lockId]);
-        }
-        catch (_e) {
-            debug("veap:migration", "Could not acquire advisory lock, continuing...");
-        }
+        // Acquire advisory lock only if running on PostgreSQL
+        await acquireAdvisoryLockIfPostgres(tx, knex);
         // 1. Get executed migrations for this scope ordered by batch desc
         const executed = await tx("migrations")
             .select("name", "batch")

package/dist/migrations/schema-builder.js

@@ -1,4 +1,4 @@
-import { getKnex } from "../connection";
+import { getKnex } from "../connection.js";
 /**
  * Lightweight SQL helper for migrations, compatible with sql`...` template strings.
  */

package/dist/model.d.ts

@@ -1,7 +1,7 @@
-import { type CastType } from "./casts";
-import { ModelQueryBuilder } from "./query-builder";
-import { BelongsTo, BelongsToMany, HasMany, HasOne, MorphedByMany, MorphMany, MorphOne, MorphTo, MorphToMany } from "./relations";
-import type { GlobalScope } from "./scopes";
+import { type CastType } from "./casts.js";
+import { ModelQueryBuilder } from "./query-builder.js";
+import { BelongsTo, BelongsToMany, HasMany, HasOne, MorphedByMany, MorphMany, MorphOne, MorphTo, MorphToMany } from "./relations/index.js";
+import type { GlobalScope } from "./scopes.js";
 export declare abstract class Model<Attributes extends Record<string, any> = Record<string, any>> {
     [key: string]: any;
     /**

package/dist/model.js

@@ -1,13 +1,13 @@
 /** biome-ignore-all lint/correctness/noConstructorReturn: <ignore> */
 import crypto from "node:crypto";
-import { castAttribute, serializeForStorage } from "./casts";
-import { getKnex } from "./connection";
-import { DatabaseError } from "./errors";
-import { getDatabaseEventDispatcher } from "./events";
-import { Factory } from "./factory";
-import { ModelQueryBuilder } from "./query-builder";
-import { BelongsTo, BelongsToMany, HasMany, HasOne, MorphedByMany, MorphMany, MorphMap, MorphOne, MorphTo, MorphToMany, } from "./relations";
-import { toCamelCase, toSnakeCase } from "./utils";
+import { castAttribute, serializeForStorage } from "./casts.js";
+import { getKnex } from "./connection.js";
+import { DatabaseError } from "./errors.js";
+import { getDatabaseEventDispatcher } from "./events.js";
+import { Factory } from "./factory.js";
+import { ModelQueryBuilder } from "./query-builder.js";
+import { BelongsTo, BelongsToMany, HasMany, HasOne, MorphedByMany, MorphMany, MorphMap, MorphOne, MorphTo, MorphToMany, } from "./relations/index.js";
+import { toCamelCase, toSnakeCase } from "./utils.js";
 export class Model {
     /**
      * Database table name.
@@ -285,7 +285,7 @@ export class Model {
      * Executes a database transaction.
      */
     static async transaction(callback) {
-        const { transaction: runTrx } = await import("./connection");
+        const { transaction: runTrx } = await import("./connection.js");
         return await runTrx(callback);
     }
     /**
@@ -336,12 +336,15 @@ export class Model {
      */
     static async destroy(id) {
         const knex = getKnex();
+        const clientType = knex.client?.config?.client;
         if (this.softDeletes) {
             const col = toSnakeCase(this.deletedAtColumn || "deleted_at");
             const count = await knex(this.table)
                 .where(this.primaryKey, id)
                 .whereNull(col)
-                .update({ [col]: new Date() });
+                .update({
+                [col]: serializeForStorage(new Date(), "datetime", clientType),
+            });
             return count > 0;
         }
         const count = await knex(this.table).where(this.primaryKey, id).delete();
@@ -607,7 +610,18 @@ export class Model {
                 }
                 insertData[col] = serializeForStorage(v, castType, clientType);
             }
-            await knex(modelClass.table).insert(insertData);
+            const insertResult = await knex(modelClass.table)
+                .insert(insertData)
+                .returning(pk);
+            if (!this.getAttribute(pk)) {
+                if (Array.isArray(insertResult) && insertResult.length > 0) {
+                    const first = insertResult[0];
+                    const returnedId = typeof first === "object" && first !== null ? first[pk] : first;
+                    if (returnedId !== undefined && returnedId !== null) {
+                        this.setAttribute(pk, returnedId);
+                    }
+                }
+            }
             this.isNew = false;
             this._original = { ...this._attributes };
             await this.fireModelEvent("created");

package/dist/provider.d.ts

@@ -1,5 +1,5 @@
 import { ServiceProvider } from "@veap/kernel";
-import type { DatabaseConfig } from "./types";
+import type { DatabaseConfig } from "./types.js";
 export interface DatabaseProviderConfig {
     databaseUrl?: string;
     config?: DatabaseConfig;
@@ -9,4 +9,5 @@ export declare class DatabaseServiceProvider extends ServiceProvider {
     constructor(container: any, config?: DatabaseProviderConfig);
     register(): void;
     boot(): Promise<void>;
+    shutdown(): Promise<void>;
 }

package/dist/provider.js

@@ -1,7 +1,9 @@
-import { ConfigService, DATABASE, ServiceProvider } from "@veap/kernel";
+import { ConfigService, ServiceProvider } from "@veap/kernel";
 import knex from "knex";
-import { initDatabase, isSqliteDatabase, resolvePostgresSslConfig, resolveSqliteFilename, setKnex, } from "./connection";
-import { debug } from "./logger";
+import { getKnex, initDatabase, isSqliteDatabase, resolvePostgresSslConfig, resolveSqliteFilename, setKnex, } from "./connection.js";
+import { setDatabaseEventDispatcher } from "./events.js";
+import { debug, setDatabaseLogger } from "./logger.js";
+import { DATABASE } from "./tokens.js";
 export class DatabaseServiceProvider extends ServiceProvider {
     config;
     constructor(container, config) {
@@ -12,13 +14,54 @@ export class DatabaseServiceProvider extends ServiceProvider {
         // Port token registration
     }
     async boot() {
-        const configService = await this.container.resolve(ConfigService);
+        let configService = null;
+        if (this.container.has(ConfigService)) {
+            configService = await this.container.resolve(ConfigService);
+        }
+        else if (this.container.has("ConfigService")) {
+            configService = await this.container.resolve("ConfigService");
+        }
         const databaseUrl = this.config?.databaseUrl ||
-            configService.get("DATABASE_URL") ||
+            configService?.get?.("DATABASE_URL") ||
             process.env.DATABASE_URL ||
             process.env.DATABASE_FILE;
-        const isProd = configService.get("NODE_ENV") === "production" ||
+        const isProd = configService?.get?.("NODE_ENV") === "production" ||
             process.env.NODE_ENV === "production";
+        // Auto-wire EventDispatcher if bound to container
+        if (this.container.has("EventDispatcher")) {
+            try {
+                const dispatcher = (await this.container.resolve("EventDispatcher"));
+                if (dispatcher && typeof dispatcher.publish === "function") {
+                    setDatabaseEventDispatcher(dispatcher);
+                }
+            }
+            catch {
+                // Continue without event dispatcher
+            }
+        }
+        // Auto-wire Logger if bound to container
+        if (this.container.has("LOGGER")) {
+            try {
+                const logger = (await this.container.resolve("LOGGER"));
+                if (logger && typeof logger.info === "function") {
+                    setDatabaseLogger({
+                        debug: (ch, msg, ...args) => logger.debug
+                            ? logger.debug(`[${ch}] ${msg}`, ...args)
+                            : undefined,
+                        info: (ch, msg, ...args) => logger.info(`[${ch}] ${msg}`, ...args),
+                        warn: (ch, msg, ...args) => logger.warn
+                            ? logger.warn(`[${ch}] ${msg}`, ...args)
+                            : console.warn(`[${ch}] ${msg}`, ...args),
+                        error: (ch, msg, ...args) => logger.error
+                            ? logger.error(`[${ch}] ${msg}`, ...args)
+                            : console.error(`[${ch}] ${msg}`, ...args),
+                    });
+                }
+            }
+            catch {
+                // Continue with default logger
+            }
+        }
         if (this.config?.config) {
             const instance = initDatabase(this.config.config);
             this.container.register({ token: DATABASE, useValue: instance });
@@ -32,8 +75,8 @@ export class DatabaseServiceProvider extends ServiceProvider {
         const ssl = resolvePostgresSslConfig({
             databaseUrl: resolvedUrl,
             isProd,
-            rejectUnauthorizedEnv: configService.get("DATABASE_SSL_REJECT_UNAUTHORIZED"),
-            caCert: configService.get("DATABASE_SSL_CA"),
+            rejectUnauthorizedEnv: configService?.get?.("DATABASE_SSL_REJECT_UNAUTHORIZED"),
+            caCert: configService?.get?.("DATABASE_SSL_CA"),
         });
         const instance = knex({
             client,
@@ -55,4 +98,15 @@ export class DatabaseServiceProvider extends ServiceProvider {
             useValue: instance,
         });
     }
+    async shutdown() {
+        try {
+            const k = getKnex();
+            if (k && typeof k.destroy === "function") {
+                await k.destroy();
+            }
+        }
+        catch {
+            // Ignore if not initialized
+        }
+    }
 }

package/dist/query-builder.d.ts

@@ -1,5 +1,6 @@
 import type { Knex } from "knex";
-import type { Model } from "./model";
+import type { Model } from "./model.js";
+import type { PaginationResult } from "./types.js";
 export declare class ModelQueryBuilder<M extends Model = any> {
     modelClass: any;
     [key: string]: any;
@@ -65,6 +66,9 @@ export declare class ModelQueryBuilder<M extends Model = any> {
     take(count: number): this;
     offset(count: number): this;
     skip(count: number): this;
+    groupBy(...columns: any[]): this;
+    having(column: any, operatorOrValue?: any, value?: any): this;
+    distinct(...columns: any[]): this;
     join(table: string, first: string, operatorOrSecond: string, second?: string): this;
     leftJoin(table: string, first: string, operatorOrSecond: string, second?: string): this;
     /**
@@ -162,12 +166,8 @@ export declare class ModelQueryBuilder<M extends Model = any> {
     /**
      * Paginates results.
      */
-    paginate(page?: number, perPage?: number): Promise<{
-        data: M[];
-        total: number;
+    paginate(page?: number, perPage?: number): Promise<PaginationResult<M> & {
         page: number;
-        perPage: number;
-        lastPage: number;
     }>;
     /**
      * Bulk updates matching records.

package/dist/query-builder.js

@@ -1,9 +1,9 @@
-import { serializeForStorage } from "./casts";
-import { getKnex } from "./connection";
-import { DatabaseError } from "./errors";
-import { BelongsTo, BelongsToMany, MorphedByMany, MorphMany, MorphOne, MorphToMany, } from "./relations";
-import { eagerLoadRelations } from "./relations/eager-loader";
-import { toCamelCase, toSnakeCase } from "./utils";
+import { serializeForStorage } from "./casts.js";
+import { getKnex } from "./connection.js";
+import { DatabaseError } from "./errors.js";
+import { eagerLoadRelations } from "./relations/eager-loader.js";
+import { BelongsTo, BelongsToMany, MorphedByMany, MorphMany, MorphOne, MorphToMany, } from "./relations/index.js";
+import { toCamelCase, toSnakeCase } from "./utils.js";
 export class ModelQueryBuilder {
     modelClass;
     knexBuilder;
@@ -47,6 +47,14 @@ export class ModelQueryBuilder {
                                 : result;
                         };
                     }
+                    // 3. Delegate to Knex query builder if method exists (e.g. groupBy, having, distinct, joinRaw)
+                    if (target.knexBuilder &&
+                        typeof target.knexBuilder[prop] === "function") {
+                        return (...args) => {
+                            const result = target.knexBuilder[prop](...args);
+                            return result === target.knexBuilder ? receiver : result;
+                        };
+                    }
                 }
                 return Reflect.get(target, prop, receiver);
             },
@@ -270,6 +278,30 @@ export class ModelQueryBuilder {
     skip(count) {
         return this.offset(count);
     }
+    groupBy(...columns) {
+        const converted = columns.map((col) => typeof col === "string" ? toSnakeCase(col) : col);
+        this.knexBuilder.groupBy(...converted);
+        return this;
+    }
+    having(column, operatorOrValue, value) {
+        if (value === undefined) {
+            if (operatorOrValue === undefined) {
+                this.knexBuilder.having(column);
+            }
+            else {
+                this.knexBuilder.having(column, "=", operatorOrValue);
+            }
+        }
+        else {
+            this.knexBuilder.having(column, operatorOrValue, value);
+        }
+        return this;
+    }
+    distinct(...columns) {
+        const converted = columns.map((col) => typeof col === "string" ? toSnakeCase(col) : col);
+        this.knexBuilder.distinct(...converted);
+        return this;
+    }
     join(table, first, operatorOrSecond, second) {
         if (second === undefined) {
             this.knexBuilder.join(table, first, operatorOrSecond);
@@ -646,6 +678,7 @@ export class ModelQueryBuilder {
             data,
             total,
             page,
+            currentPage: page,
             perPage,
             lastPage,
         };
@@ -654,6 +687,7 @@ export class ModelQueryBuilder {
      * Bulk updates matching records.
      */
     async update(attributes) {
+        this.applyGlobalScopes();
         const converted = {};
         const casts = this.modelClass?.casts || {};
         const knex = getKnex();

package/dist/relations/belongs-to-many.d.ts

@@ -1,6 +1,6 @@
-import type { Model } from "../model";
-import type { ModelQueryBuilder } from "../query-builder";
-import { Relation } from "./relation";
+import type { Model } from "../model.js";
+import type { ModelQueryBuilder } from "../query-builder.js";
+import { Relation } from "./relation.js";
 export declare class BelongsToMany<Parent extends Model = any, Related extends Model = any> extends Relation<Parent, Related> {
     pivotTable: string;
     foreignPivotKey: string;

package/dist/relations/belongs-to-many.js

@@ -1,5 +1,5 @@
-import { getKnex } from "../connection";
-import { Relation } from "./relation";
+import { getKnex } from "../connection.js";
+import { Relation } from "./relation.js";
 export class BelongsToMany extends Relation {
     pivotTable;
     foreignPivotKey;

package/dist/relations/belongs-to.d.ts

@@ -1,6 +1,6 @@
-import type { Model } from "../model";
-import type { ModelQueryBuilder } from "../query-builder";
-import { Relation } from "./relation";
+import type { Model } from "../model.js";
+import type { ModelQueryBuilder } from "../query-builder.js";
+import { Relation } from "./relation.js";
 export declare class BelongsTo<Parent extends Model = any, Related extends Model = any> extends Relation<Parent, Related> {
     query(): ModelQueryBuilder<Related>;
     get(): Promise<Related | null>;

package/dist/relations/belongs-to.js

@@ -1,4 +1,4 @@
-import { Relation } from "./relation";
+import { Relation } from "./relation.js";
 export class BelongsTo extends Relation {
     query() {
         const foreignKeyValue = this.parent.getAttribute(this.foreignKey);

package/dist/relations/eager-loader.d.ts

@@ -1,4 +1,4 @@
-import type { Model } from "../model";
+import type { Model } from "../model.js";
 /**
  * Loads relations onto an array of model instances in bulk queries, avoiding N+1.
  */

package/dist/relations/eager-loader.js

@@ -1,4 +1,4 @@
-import { DatabaseError } from "../errors";
+import { DatabaseError } from "../errors.js";
 /**
  * Loads relations onto an array of model instances in bulk queries, avoiding N+1.
  */
@@ -11,6 +11,8 @@ export async function eagerLoadRelations(models, relations) {
     for (const rel of relations) {
         const parts = rel.split(".");
         const head = parts[0];
+        if (!head)
+            continue;
         const tail = parts.slice(1).join(".");
         if (!tree[head]) {
             tree[head] = [];

package/dist/relations/has-many.d.ts

@@ -1,6 +1,6 @@
-import type { Model } from "../model";
-import type { ModelQueryBuilder } from "../query-builder";
-import { Relation } from "./relation";
+import type { Model } from "../model.js";
+import type { ModelQueryBuilder } from "../query-builder.js";
+import { Relation } from "./relation.js";
 export declare class HasMany<Parent extends Model = any, Related extends Model = any> extends Relation<Parent, Related> {
     query(): ModelQueryBuilder<Related>;
     get(): Promise<Related[]>;

package/dist/relations/has-many.js

@@ -1,4 +1,4 @@
-import { Relation } from "./relation";
+import { Relation } from "./relation.js";
 export class HasMany extends Relation {
     query() {
         const localKeyValue = this.parent.getAttribute(this.localKey);

package/dist/relations/has-one.d.ts

@@ -1,6 +1,6 @@
-import type { Model } from "../model";
-import type { ModelQueryBuilder } from "../query-builder";
-import { Relation } from "./relation";
+import type { Model } from "../model.js";
+import type { ModelQueryBuilder } from "../query-builder.js";
+import { Relation } from "./relation.js";
 export declare class HasOne<Parent extends Model = any, Related extends Model = any> extends Relation<Parent, Related> {
     query(): ModelQueryBuilder<Related>;
     get(): Promise<Related | null>;

package/dist/relations/has-one.js

@@ -1,4 +1,4 @@
-import { Relation } from "./relation";
+import { Relation } from "./relation.js";
 export class HasOne extends Relation {
     query() {
         const localKeyValue = this.parent.getAttribute(this.localKey);

package/dist/relations/index.d.ts

@@ -1,11 +1,11 @@
-export * from "./belongs-to";
-export * from "./belongs-to-many";
-export * from "./eager-loader";
-export * from "./has-many";
-export * from "./has-one";
-export * from "./morph-many";
-export * from "./morph-map";
-export * from "./morph-one";
-export * from "./morph-to";
-export * from "./morph-to-many";
-export * from "./relation";
+export * from "./belongs-to.js";
+export * from "./belongs-to-many.js";
+export * from "./eager-loader.js";
+export * from "./has-many.js";
+export * from "./has-one.js";
+export * from "./morph-many.js";
+export * from "./morph-map.js";
+export * from "./morph-one.js";
+export * from "./morph-to.js";
+export * from "./morph-to-many.js";
+export * from "./relation.js";

package/dist/relations/index.js

@@ -1,11 +1,11 @@
-export * from "./belongs-to";
-export * from "./belongs-to-many";
-export * from "./eager-loader";
-export * from "./has-many";
-export * from "./has-one";
-export * from "./morph-many";
-export * from "./morph-map";
-export * from "./morph-one";
-export * from "./morph-to";
-export * from "./morph-to-many";
-export * from "./relation";
+export * from "./belongs-to.js";
+export * from "./belongs-to-many.js";
+export * from "./eager-loader.js";
+export * from "./has-many.js";
+export * from "./has-one.js";
+export * from "./morph-many.js";
+export * from "./morph-map.js";
+export * from "./morph-one.js";
+export * from "./morph-to.js";
+export * from "./morph-to-many.js";
+export * from "./relation.js";

package/dist/relations/morph-many.d.ts

@@ -1,6 +1,6 @@
-import type { Model } from "../model";
-import type { ModelQueryBuilder } from "../query-builder";
-import { Relation } from "./relation";
+import type { Model } from "../model.js";
+import type { ModelQueryBuilder } from "../query-builder.js";
+import { Relation } from "./relation.js";
 export declare class MorphMany<Parent extends Model = any, Related extends Model = any> extends Relation<Parent, Related> {
     morphName: string;
     typeColumn: string;

package/dist/relations/morph-many.js

@@ -1,5 +1,5 @@
-import { MorphMap } from "./morph-map";
-import { Relation } from "./relation";
+import { MorphMap } from "./morph-map.js";
+import { Relation } from "./relation.js";
 export class MorphMany extends Relation {
     morphName;
     typeColumn;

package/dist/relations/morph-one.d.ts

@@ -1,6 +1,6 @@
-import type { Model } from "../model";
-import type { ModelQueryBuilder } from "../query-builder";
-import { Relation } from "./relation";
+import type { Model } from "../model.js";
+import type { ModelQueryBuilder } from "../query-builder.js";
+import { Relation } from "./relation.js";
 export declare class MorphOne<Parent extends Model = any, Related extends Model = any> extends Relation<Parent, Related> {
     morphName: string;
     typeColumn: string;

package/dist/relations/morph-one.js

@@ -1,5 +1,5 @@
-import { MorphMap } from "./morph-map";
-import { Relation } from "./relation";
+import { MorphMap } from "./morph-map.js";
+import { Relation } from "./relation.js";
 export class MorphOne extends Relation {
     morphName;
     typeColumn;

package/dist/relations/morph-to-many.d.ts

@@ -1,6 +1,6 @@
-import type { Model } from "../model";
-import type { ModelQueryBuilder } from "../query-builder";
-import { Relation } from "./relation";
+import type { Model } from "../model.js";
+import type { ModelQueryBuilder } from "../query-builder.js";
+import { Relation } from "./relation.js";
 /**
  * MorphToMany represents a many-to-many polymorphic relation where the parent
  * owns the polymorphic side of the pivot table (e.g. BlogPost -> tags via taggables).

package/dist/relations/morph-to-many.js

@@ -1,6 +1,6 @@
-import { getKnex } from "../connection";
-import { MorphMap } from "./morph-map";
-import { Relation } from "./relation";
+import { getKnex } from "../connection.js";
+import { MorphMap } from "./morph-map.js";
+import { Relation } from "./relation.js";
 /**
  * MorphToMany represents a many-to-many polymorphic relation where the parent
  * owns the polymorphic side of the pivot table (e.g. BlogPost -> tags via taggables).

package/dist/relations/morph-to.d.ts

@@ -1,6 +1,6 @@
-import type { Model } from "../model";
-import type { ModelQueryBuilder } from "../query-builder";
-import { Relation } from "./relation";
+import type { Model } from "../model.js";
+import type { ModelQueryBuilder } from "../query-builder.js";
+import { Relation } from "./relation.js";
 export declare class MorphTo<Child extends Model = any, Parent extends Model = any> extends Relation<Child, Parent> {
     morphName: string;
     typeColumn: string;

package/dist/relations/morph-to.js

@@ -1,6 +1,6 @@
-import { DatabaseError } from "../errors";
-import { MorphMap } from "./morph-map";
-import { Relation } from "./relation";
+import { DatabaseError } from "../errors.js";
+import { MorphMap } from "./morph-map.js";
+import { Relation } from "./relation.js";
 export class MorphTo extends Relation {
     morphName;
     typeColumn;

package/dist/relations/relation.d.ts

@@ -1,5 +1,5 @@
-import type { Model } from "../model";
-import type { ModelQueryBuilder } from "../query-builder";
+import type { Model } from "../model.js";
+import type { ModelQueryBuilder } from "../query-builder.js";
 export declare abstract class Relation<Parent extends Model = any, Related extends Model = any> {
     parent: Parent;
     related: any;

package/dist/scopes.d.ts

@@ -1,5 +1,5 @@
-import type { Model } from "./model";
-import type { ModelQueryBuilder } from "./query-builder";
+import type { Model } from "./model.js";
+import type { ModelQueryBuilder } from "./query-builder.js";
 /**
  * Callback function for applying a global scope.
  */

package/dist/seeder.js

@@ -1,5 +1,5 @@
-import { transaction } from "./connection";
-import { debug, info, warn } from "./logger";
+import { transaction } from "./connection.js";
+import { debug, info, warn } from "./logger.js";
 /**
  * Base Database Seeder class.
  */

package/dist/tokens.d.ts

@@ -0,0 +1,10 @@
+import type { Token } from "@veap/kernel";
+import type { Knex } from "knex";
+/**
+ * IoC Token for primary Knex database connection instance.
+ */
+export declare const DATABASE: Token<Knex>;
+/**
+ * IoC Token for application database migrations array.
+ */
+export declare const APP_MIGRATIONS: Token<any[]>;

package/dist/tokens.js

@@ -0,0 +1,8 @@
+/**
+ * IoC Token for primary Knex database connection instance.
+ */
+export const DATABASE = Symbol.for("veap:kernel:database");
+/**
+ * IoC Token for application database migrations array.
+ */
+export const APP_MIGRATIONS = Symbol.for("veap:kernel:app-migrations");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veap/database",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Eloquent-like Active Record ORM powered by Knex with AsyncLocalStorage transactions",
   "bugs": "https://github.com/veapjs/veap-database/issues",
   "repository": {
@@ -16,6 +16,14 @@
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
+    "./migrations": {
+      "types": "./dist/migrations/index.d.ts",
+      "default": "./dist/migrations/index.js"
+    },
+    "./relations": {
+      "types": "./dist/relations/index.d.ts",
+      "default": "./dist/relations/index.js"
+    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -28,7 +36,7 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@veap/kernel": "^0.1.0",
+    "@veap/kernel": "^0.1.1",
     "better-sqlite3": "^13.0.3",
     "knex": "^3.3.0"
   },