@ghom/orm 1.2.5 → 1.2.6

package/dist/cjs/app/orm.js

@@ -1,77 +1,81 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ORM = void 0;
-const fs_1 = __importDefault(require("fs"));
-const url_1 = __importDefault(require("url"));
-const handler_1 = require("@ghom/handler");
-const knex_1 = __importDefault(require("knex"));
-const table_js_1 = require("./table.js");
-const pack = JSON.parse(fs_1.default.readFileSync("./package.json", "utf8"));
-const isCJS = pack.type === "commonjs" || pack.type == void 0;
-class ORM extends handler_1.Handler {
-    /**
-     * @param ormConfig configuration for table handler or just tablePath (path to directory that contains js files of tables)
-     * @param knexConfig configuration for connect to database
-     */
-    constructor(ormConfig, knexConfig = {
-        client: "sqlite3",
-        useNullAsDefault: true,
-        connection: {
-            filename: ":memory:",
-        },
-    }) {
-        super(typeof ormConfig === "string" ? ormConfig : ormConfig.tablePath);
-        this.ormConfig =
-            typeof ormConfig === "string" ? { tablePath: ormConfig } : ormConfig;
-        this.db = (0, knex_1.default)(knexConfig);
-    }
-    async init() {
-        this.once("finish", async (pathList) => {
-            const tables = await Promise.all(pathList.map(async (filepath) => {
-                return Promise.resolve().then(() => __importStar(require(isCJS ? filepath : url_1.default.pathToFileURL(filepath).href))).then((file) => file.default);
-            }));
-            const migration = new table_js_1.Table({
-                name: "migration",
-                priority: Infinity,
-                setup: (table) => {
-                    table.string("table").unique().notNullable();
-                    table.integer("version").notNullable();
-                },
-            });
-            migration.orm = this;
-            await migration.make();
-            for (const table of tables.sort((a, b) => (b.options.priority ?? 0) - (a.options.priority ?? 0))) {
-                table.orm = this;
-                await table.make();
-            }
-        });
-        try {
-            await this.db.raw("PRAGMA foreign_keys = ON;");
-        }
-        catch (error) { }
-        await this.load();
-    }
-}
-exports.ORM = ORM;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ORM = void 0;
+const fs_1 = __importDefault(require("fs"));
+const url_1 = __importDefault(require("url"));
+const handler_1 = require("@ghom/handler");
+const knex_1 = __importDefault(require("knex"));
+const table_js_1 = require("./table.js");
+const pack = JSON.parse(fs_1.default.readFileSync("./package.json", "utf8"));
+const isCJS = pack.type === "commonjs" || pack.type == void 0;
+class ORM extends handler_1.Handler {
+    /**
+     * @param ormConfig configuration for table handler or just tablePath (path to directory that contains js files of tables)
+     * @param knexConfig configuration for connect to database
+     */
+    constructor(ormConfig, knexConfig = {
+        client: "sqlite3",
+        useNullAsDefault: true,
+        connection: {
+            filename: ":memory:",
+        },
+    }) {
+        super(typeof ormConfig === "string" ? ormConfig : ormConfig.tablePath);
+        this.ormConfig =
+            typeof ormConfig === "string" ? { tablePath: ormConfig } : ormConfig;
+        this.db = (0, knex_1.default)(knexConfig);
+    }
+    async init() {
+        this.once("finish", async (pathList) => {
+            const tables = await Promise.all(pathList.map(async (filepath) => {
+                return Promise.resolve(`${isCJS ? filepath : url_1.default.pathToFileURL(filepath).href}`).then(s => __importStar(require(s))).then((file) => file.default);
+            }));
+            const migration = new table_js_1.Table({
+                name: "migration",
+                priority: Infinity,
+                setup: (table) => {
+                    table.string("table").unique().notNullable();
+                    table.integer("version").notNullable();
+                },
+            });
+            migration.orm = this;
+            await migration.make();
+            for (const table of tables.sort((a, b) => (b.options.priority ?? 0) - (a.options.priority ?? 0))) {
+                table.orm = this;
+                await table.make();
+            }
+        });
+        try {
+            await this.db.raw("PRAGMA foreign_keys = ON;");
+        }
+        catch (error) { }
+        await this.load();
+    }
+}
+exports.ORM = ORM;

package/dist/cjs/app/table.js

@@ -1,95 +1,95 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Table = void 0;
-const path_1 = __importDefault(require("path"));
-const chalk_1 = __importDefault(require("chalk"));
-class Table {
-    constructor(options) {
-        this.options = options;
-    }
-    get filepath() {
-        if (!this.orm)
-            throw new Error("missing ORM");
-        return path_1.default.relative(process.cwd(), path_1.default.join(this.orm.ormConfig.tablePath, this.options.name + ".ts"));
-    }
-    get logger() {
-        if (!this.orm)
-            throw new Error("missing ORM");
-        return this.orm.ormConfig.logger;
-    }
-    get db() {
-        if (!this.orm)
-            throw new Error("missing ORM");
-        return this.orm.db;
-    }
-    get query() {
-        return this.db(this.options.name);
-    }
-    async hasColumn(name) {
-        return this.db.schema.hasColumn(this.options.name, name);
-    }
-    async isEmpty() {
-        return this.query
-            .select()
-            .limit(1)
-            .then((rows) => rows.length === 0);
-    }
-    async make() {
-        try {
-            await this.db.schema.createTable(this.options.name, this.options.setup);
-            this.logger?.log(`created table ${chalk_1.default.blueBright(this.options.name)}`);
-        }
-        catch (error) {
-            if (error.toString().includes("syntax error")) {
-                this.logger?.error(`you need to implement the "setup" method in options of your ${chalk_1.default.blueBright(this.options.name)} table!`, this.filepath);
-                throw error;
-            }
-            else {
-                this.logger?.log(`loaded table ${chalk_1.default.blueBright(this.options.name)}`);
-            }
-        }
-        try {
-            const migrated = await this.migrate();
-            if (migrated !== false) {
-                this.logger?.log(`migrated table ${chalk_1.default.blueBright(this.options.name)} to version ${chalk_1.default.magentaBright(migrated)}`);
-            }
-        }
-        catch (error) {
-            this.logger?.error(error, this.filepath);
-        }
-        await this.options.then?.bind(this)(this);
-        return this;
-    }
-    async migrate() {
-        if (!this.options.migrations)
-            return false;
-        const migrations = new Map(Object.entries(this.options.migrations)
-            .sort((a, b) => Number(a[0]) - Number(b[0]))
-            .map((entry) => [Number(entry[0]), entry[1]]));
-        const fromDatabase = await this.db("migration")
-            .where("table", this.options.name)
-            .first();
-        const data = fromDatabase || {
-            table: this.options.name,
-            version: -Infinity,
-        };
-        const baseVersion = data.version;
-        await this.db.schema.alterTable(this.options.name, (builder) => {
-            migrations.forEach((migration, version) => {
-                if (version <= data.version)
-                    return;
-                migration(builder);
-                data.version = version;
-            });
-        });
-        await this.db("migration")
-            .insert(data)
-            .onConflict("table")
-            .merge();
-        return baseVersion === data.version ? false : data.version;
-    }
-}
-exports.Table = Table;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Table = void 0;
+const path_1 = __importDefault(require("path"));
+const chalk_1 = __importDefault(require("chalk"));
+class Table {
+    constructor(options) {
+        this.options = options;
+    }
+    get filepath() {
+        if (!this.orm)
+            throw new Error("missing ORM");
+        return path_1.default.relative(process.cwd(), path_1.default.join(this.orm.ormConfig.tablePath, this.options.name + ".ts"));
+    }
+    get logger() {
+        if (!this.orm)
+            throw new Error("missing ORM");
+        return this.orm.ormConfig.logger;
+    }
+    get db() {
+        if (!this.orm)
+            throw new Error("missing ORM");
+        return this.orm.db;
+    }
+    get query() {
+        return this.db(this.options.name);
+    }
+    async hasColumn(name) {
+        return this.db.schema.hasColumn(this.options.name, name);
+    }
+    async isEmpty() {
+        return this.query
+            .select()
+            .limit(1)
+            .then((rows) => rows.length === 0);
+    }
+    async make() {
+        try {
+            await this.db.schema.createTable(this.options.name, this.options.setup);
+            this.logger?.log(`created table ${chalk_1.default.blueBright(this.options.name)}`);
+        }
+        catch (error) {
+            if (error.toString().includes("syntax error")) {
+                this.logger?.error(`you need to implement the "setup" method in options of your ${chalk_1.default.blueBright(this.options.name)} table!`, this.filepath);
+                throw error;
+            }
+            else {
+                this.logger?.log(`loaded table ${chalk_1.default.blueBright(this.options.name)}`);
+            }
+        }
+        try {
+            const migrated = await this.migrate();
+            if (migrated !== false) {
+                this.logger?.log(`migrated table ${chalk_1.default.blueBright(this.options.name)} to version ${chalk_1.default.magentaBright(migrated)}`);
+            }
+        }
+        catch (error) {
+            this.logger?.error(error, this.filepath);
+        }
+        await this.options.then?.bind(this)(this);
+        return this;
+    }
+    async migrate() {
+        if (!this.options.migrations)
+            return false;
+        const migrations = new Map(Object.entries(this.options.migrations)
+            .sort((a, b) => Number(a[0]) - Number(b[0]))
+            .map((entry) => [Number(entry[0]), entry[1]]));
+        const fromDatabase = await this.db("migration")
+            .where("table", this.options.name)
+            .first();
+        const data = fromDatabase || {
+            table: this.options.name,
+            version: -Infinity,
+        };
+        const baseVersion = data.version;
+        await this.db.schema.alterTable(this.options.name, (builder) => {
+            migrations.forEach((migration, version) => {
+                if (version <= data.version)
+                    return;
+                migration(builder);
+                data.version = version;
+            });
+        });
+        await this.db("migration")
+            .insert(data)
+            .onConflict("table")
+            .merge();
+        return baseVersion === data.version ? false : data.version;
+    }
+}
+exports.Table = Table;

package/dist/cjs/index.js

@@ -1,14 +1,18 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./app/orm.js"), exports);
-__exportStar(require("./app/table.js"), exports);
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./app/orm.js"), exports);
+__exportStar(require("./app/table.js"), exports);

package/dist/esm/app/orm.js

@@ -1,53 +1,53 @@
-import fs from "fs";
-import url from "url";
-import { Handler } from "@ghom/handler";
-import { default as knex } from "knex";
-import { Table } from "./table.js";
-const pack = JSON.parse(fs.readFileSync("./package.json", "utf8"));
-const isCJS = pack.type === "commonjs" || pack.type == void 0;
-export class ORM extends Handler {
-    db;
-    ormConfig;
-    /**
-     * @param ormConfig configuration for table handler or just tablePath (path to directory that contains js files of tables)
-     * @param knexConfig configuration for connect to database
-     */
-    constructor(ormConfig, knexConfig = {
-        client: "sqlite3",
-        useNullAsDefault: true,
-        connection: {
-            filename: ":memory:",
-        },
-    }) {
-        super(typeof ormConfig === "string" ? ormConfig : ormConfig.tablePath);
-        this.ormConfig =
-            typeof ormConfig === "string" ? { tablePath: ormConfig } : ormConfig;
-        this.db = knex(knexConfig);
-    }
-    async init() {
-        this.once("finish", async (pathList) => {
-            const tables = await Promise.all(pathList.map(async (filepath) => {
-                return import(isCJS ? filepath : url.pathToFileURL(filepath).href).then((file) => file.default);
-            }));
-            const migration = new Table({
-                name: "migration",
-                priority: Infinity,
-                setup: (table) => {
-                    table.string("table").unique().notNullable();
-                    table.integer("version").notNullable();
-                },
-            });
-            migration.orm = this;
-            await migration.make();
-            for (const table of tables.sort((a, b) => (b.options.priority ?? 0) - (a.options.priority ?? 0))) {
-                table.orm = this;
-                await table.make();
-            }
-        });
-        try {
-            await this.db.raw("PRAGMA foreign_keys = ON;");
-        }
-        catch (error) { }
-        await this.load();
-    }
-}
+import fs from "fs";
+import url from "url";
+import { Handler } from "@ghom/handler";
+import { default as knex } from "knex";
+import { Table } from "./table.js";
+const pack = JSON.parse(fs.readFileSync("./package.json", "utf8"));
+const isCJS = pack.type === "commonjs" || pack.type == void 0;
+export class ORM extends Handler {
+    db;
+    ormConfig;
+    /**
+     * @param ormConfig configuration for table handler or just tablePath (path to directory that contains js files of tables)
+     * @param knexConfig configuration for connect to database
+     */
+    constructor(ormConfig, knexConfig = {
+        client: "sqlite3",
+        useNullAsDefault: true,
+        connection: {
+            filename: ":memory:",
+        },
+    }) {
+        super(typeof ormConfig === "string" ? ormConfig : ormConfig.tablePath);
+        this.ormConfig =
+            typeof ormConfig === "string" ? { tablePath: ormConfig } : ormConfig;
+        this.db = knex(knexConfig);
+    }
+    async init() {
+        this.once("finish", async (pathList) => {
+            const tables = await Promise.all(pathList.map(async (filepath) => {
+                return import(isCJS ? filepath : url.pathToFileURL(filepath).href).then((file) => file.default);
+            }));
+            const migration = new Table({
+                name: "migration",
+                priority: Infinity,
+                setup: (table) => {
+                    table.string("table").unique().notNullable();
+                    table.integer("version").notNullable();
+                },
+            });
+            migration.orm = this;
+            await migration.make();
+            for (const table of tables.sort((a, b) => (b.options.priority ?? 0) - (a.options.priority ?? 0))) {
+                table.orm = this;
+                await table.make();
+            }
+        });
+        try {
+            await this.db.raw("PRAGMA foreign_keys = ON;");
+        }
+        catch (error) { }
+        await this.load();
+    }
+}

package/dist/esm/app/table.js

@@ -1,90 +1,90 @@
-import path from "path";
-import chalk from "chalk";
-export class Table {
-    options;
-    orm;
-    constructor(options) {
-        this.options = options;
-    }
-    get filepath() {
-        if (!this.orm)
-            throw new Error("missing ORM");
-        return path.relative(process.cwd(), path.join(this.orm.ormConfig.tablePath, this.options.name + ".ts"));
-    }
-    get logger() {
-        if (!this.orm)
-            throw new Error("missing ORM");
-        return this.orm.ormConfig.logger;
-    }
-    get db() {
-        if (!this.orm)
-            throw new Error("missing ORM");
-        return this.orm.db;
-    }
-    get query() {
-        return this.db(this.options.name);
-    }
-    async hasColumn(name) {
-        return this.db.schema.hasColumn(this.options.name, name);
-    }
-    async isEmpty() {
-        return this.query
-            .select()
-            .limit(1)
-            .then((rows) => rows.length === 0);
-    }
-    async make() {
-        try {
-            await this.db.schema.createTable(this.options.name, this.options.setup);
-            this.logger?.log(`created table ${chalk.blueBright(this.options.name)}`);
-        }
-        catch (error) {
-            if (error.toString().includes("syntax error")) {
-                this.logger?.error(`you need to implement the "setup" method in options of your ${chalk.blueBright(this.options.name)} table!`, this.filepath);
-                throw error;
-            }
-            else {
-                this.logger?.log(`loaded table ${chalk.blueBright(this.options.name)}`);
-            }
-        }
-        try {
-            const migrated = await this.migrate();
-            if (migrated !== false) {
-                this.logger?.log(`migrated table ${chalk.blueBright(this.options.name)} to version ${chalk.magentaBright(migrated)}`);
-            }
-        }
-        catch (error) {
-            this.logger?.error(error, this.filepath);
-        }
-        await this.options.then?.bind(this)(this);
-        return this;
-    }
-    async migrate() {
-        if (!this.options.migrations)
-            return false;
-        const migrations = new Map(Object.entries(this.options.migrations)
-            .sort((a, b) => Number(a[0]) - Number(b[0]))
-            .map((entry) => [Number(entry[0]), entry[1]]));
-        const fromDatabase = await this.db("migration")
-            .where("table", this.options.name)
-            .first();
-        const data = fromDatabase || {
-            table: this.options.name,
-            version: -Infinity,
-        };
-        const baseVersion = data.version;
-        await this.db.schema.alterTable(this.options.name, (builder) => {
-            migrations.forEach((migration, version) => {
-                if (version <= data.version)
-                    return;
-                migration(builder);
-                data.version = version;
-            });
-        });
-        await this.db("migration")
-            .insert(data)
-            .onConflict("table")
-            .merge();
-        return baseVersion === data.version ? false : data.version;
-    }
-}
+import path from "path";
+import chalk from "chalk";
+export class Table {
+    options;
+    orm;
+    constructor(options) {
+        this.options = options;
+    }
+    get filepath() {
+        if (!this.orm)
+            throw new Error("missing ORM");
+        return path.relative(process.cwd(), path.join(this.orm.ormConfig.tablePath, this.options.name + ".ts"));
+    }
+    get logger() {
+        if (!this.orm)
+            throw new Error("missing ORM");
+        return this.orm.ormConfig.logger;
+    }
+    get db() {
+        if (!this.orm)
+            throw new Error("missing ORM");
+        return this.orm.db;
+    }
+    get query() {
+        return this.db(this.options.name);
+    }
+    async hasColumn(name) {
+        return this.db.schema.hasColumn(this.options.name, name);
+    }
+    async isEmpty() {
+        return this.query
+            .select()
+            .limit(1)
+            .then((rows) => rows.length === 0);
+    }
+    async make() {
+        try {
+            await this.db.schema.createTable(this.options.name, this.options.setup);
+            this.logger?.log(`created table ${chalk.blueBright(this.options.name)}`);
+        }
+        catch (error) {
+            if (error.toString().includes("syntax error")) {
+                this.logger?.error(`you need to implement the "setup" method in options of your ${chalk.blueBright(this.options.name)} table!`, this.filepath);
+                throw error;
+            }
+            else {
+                this.logger?.log(`loaded table ${chalk.blueBright(this.options.name)}`);
+            }
+        }
+        try {
+            const migrated = await this.migrate();
+            if (migrated !== false) {
+                this.logger?.log(`migrated table ${chalk.blueBright(this.options.name)} to version ${chalk.magentaBright(migrated)}`);
+            }
+        }
+        catch (error) {
+            this.logger?.error(error, this.filepath);
+        }
+        await this.options.then?.bind(this)(this);
+        return this;
+    }
+    async migrate() {
+        if (!this.options.migrations)
+            return false;
+        const migrations = new Map(Object.entries(this.options.migrations)
+            .sort((a, b) => Number(a[0]) - Number(b[0]))
+            .map((entry) => [Number(entry[0]), entry[1]]));
+        const fromDatabase = await this.db("migration")
+            .where("table", this.options.name)
+            .first();
+        const data = fromDatabase || {
+            table: this.options.name,
+            version: -Infinity,
+        };
+        const baseVersion = data.version;
+        await this.db.schema.alterTable(this.options.name, (builder) => {
+            migrations.forEach((migration, version) => {
+                if (version <= data.version)
+                    return;
+                migration(builder);
+                data.version = version;
+            });
+        });
+        await this.db("migration")
+            .insert(data)
+            .onConflict("table")
+            .merge();
+        return baseVersion === data.version ? false : data.version;
+    }
+}

package/dist/esm/index.js

@@ -1,2 +1,2 @@
-export * from "./app/orm.js";
-export * from "./app/table.js";
+export * from "./app/orm.js";
+export * from "./app/table.js";

package/dist/typings/app/orm.d.ts

@@ -1,24 +1,24 @@
-import { Handler } from "@ghom/handler";
-import { Knex } from "knex";
-export interface ORMLogger {
-    log: (message: string, section?: string) => void;
-    error: (text: string | Error, _path: string, full?: boolean) => void;
-}
-/**
- * @property tablePath - path to directory that contains js files of tables
- * @property verbose - show console logs or not
- */
-export interface ORMConfig {
-    logger?: ORMLogger;
-    tablePath: string;
-}
-export declare class ORM extends Handler {
-    db: Knex;
-    ormConfig: ORMConfig;
-    /**
-     * @param ormConfig configuration for table handler or just tablePath (path to directory that contains js files of tables)
-     * @param knexConfig configuration for connect to database
-     */
-    constructor(ormConfig: ORMConfig | string, knexConfig?: Knex.Config);
-    init(): Promise<void>;
-}
+import { Handler } from "@ghom/handler";
+import { Knex } from "knex";
+export interface ORMLogger {
+    log: (message: string, section?: string) => void;
+    error: (text: string | Error, _path: string, full?: boolean) => void;
+}
+/**
+ * @property tablePath - path to directory that contains js files of tables
+ * @property verbose - show console logs or not
+ */
+export interface ORMConfig {
+    logger?: ORMLogger;
+    tablePath: string;
+}
+export declare class ORM extends Handler {
+    db: Knex;
+    ormConfig: ORMConfig;
+    /**
+     * @param ormConfig configuration for table handler or just tablePath (path to directory that contains js files of tables)
+     * @param knexConfig configuration for connect to database
+     */
+    constructor(ormConfig: ORMConfig | string, knexConfig?: Knex.Config);
+    init(): Promise<void>;
+}

package/dist/typings/app/table.d.ts

@@ -1,36 +1,36 @@
-import { Knex } from "knex";
-import { ORM } from "./orm.js";
-export interface MigrationData {
-    table: string;
-    version: number;
-}
-export interface TableOptions<Type> {
-    name: string;
-    priority?: number;
-    migrations?: {
-        [version: number]: (table: Knex.CreateTableBuilder) => void;
-    };
-    then?: (this: Table<Type>, table: Table<Type>) => unknown;
-    setup: (table: Knex.CreateTableBuilder) => void;
-}
-export declare class Table<Type> {
-    readonly options: TableOptions<Type>;
-    orm?: ORM;
-    constructor(options: TableOptions<Type>);
-    private get filepath();
-    private get logger();
-    get db(): Knex<any, Record<string, any>[]>;
-    get query(): Knex.QueryBuilder<Type, {
-        _base: Type;
-        _hasSelection: false;
-        _keys: never;
-        _aliases: {};
-        _single: false;
-        _intersectProps: {};
-        _unionProps: never;
-    }[]>;
-    hasColumn(name: keyof Type): Promise<boolean>;
-    isEmpty(): Promise<boolean>;
-    make(): Promise<this>;
-    private migrate;
-}
+import { Knex } from "knex";
+import { ORM } from "./orm.js";
+export interface MigrationData {
+    table: string;
+    version: number;
+}
+export interface TableOptions<Type extends {}> {
+    name: string;
+    priority?: number;
+    migrations?: {
+        [version: number]: (table: Knex.CreateTableBuilder) => void;
+    };
+    then?: (this: Table<Type>, table: Table<Type>) => unknown;
+    setup: (table: Knex.CreateTableBuilder) => void;
+}
+export declare class Table<Type extends {}> {
+    readonly options: TableOptions<Type>;
+    orm?: ORM;
+    constructor(options: TableOptions<Type>);
+    private get filepath();
+    private get logger();
+    get db(): Knex<any, any[]>;
+    get query(): Knex.QueryBuilder<Type, {
+        _base: Type;
+        _hasSelection: false;
+        _keys: never;
+        _aliases: {};
+        _single: false;
+        _intersectProps: {};
+        _unionProps: never;
+    }[]>;
+    hasColumn(name: keyof Type): Promise<boolean>;
+    isEmpty(): Promise<boolean>;
+    make(): Promise<this>;
+    private migrate;
+}

package/dist/typings/index.d.ts

@@ -1,2 +1,2 @@
-export * from "./app/orm.js";
-export * from "./app/table.js";
+export * from "./app/orm.js";
+export * from "./app/table.js";

package/fixup.sh

@@ -1,11 +1,11 @@
-cat >dist/cjs/package.json <<!EOF
-{
-    "type": "commonjs"
-}
-!EOF
-
-cat >dist/esm/package.json <<!EOF
-{
-    "type": "module"
-}
-!EOF
+cat >dist/cjs/package.json <<!EOF
+{
+    "type": "commonjs"
+}
+!EOF
+
+cat >dist/esm/package.json <<!EOF
+{
+    "type": "module"
+}
+!EOF

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghom/orm",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "license": "MIT",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -20,16 +20,20 @@
     "prepublishOnly": "npm run format && npm test"
   },
   "devDependencies": {
-    "@vscode/sqlite3": "^5.0.7",
-    "better-sqlite3": "^7.5.0",
-    "dotenv": "^16.0.0",
-    "jest": "^27.5.1",
-    "prettier": "^2.5.1",
-    "typescript": "^4.5.5"
+    "@types/jest": "^29.5.0",
+    "@types/node": "^18.15.11",
+    "dotenv": "^16.0.3",
+    "jest": "^29.5.0",
+    "prettier": "^2.8.7",
+    "typescript": "^5.0.4"
+  },
+  "optionalDependencies": {
+    "mysql2": "^3.2.1",
+    "pg": "^8.10.0",
+    "sqlite3": "^5.1.6"
   },
   "dependencies": {
     "@ghom/handler": "^1.1.0",
-    "chalk": "^4.1.2",
-    "knex": "^1.0.3"
+    "knex": "^2.4.2"
   }
 }

package/src/app/table.ts

@@ -8,7 +8,7 @@ export interface MigrationData {
   version: number
 }
 
-export interface TableOptions<Type> {
+export interface TableOptions<Type extends {}> {
   name: string
   priority?: number
   migrations?: { [version: number]: (table: Knex.CreateTableBuilder) => void }
@@ -16,7 +16,7 @@ export interface TableOptions<Type> {
   setup: (table: Knex.CreateTableBuilder) => void
 }
 
-export class Table<Type> {
+export class Table<Type extends {}> {
   orm?: ORM
 
   constructor(public readonly options: TableOptions<Type>) {}

package/tests/tables/a.js

@@ -1,21 +1,21 @@
-const { Table } = require("../..")
-
-module.exports = new Table({
-  name: "a",
-  priority: 0,
-  setup(table) {
-    table.increments("id").primary().notNullable()
-    table
-      .integer("b_id")
-      .references("id")
-      .inTable("b")
-      .onDelete("cascade")
-      .notNullable()
-  },
-  async then({ query }) {
-    await query.insert({
-      id: 0,
-      b_id: 0,
-    })
-  },
-})
+const { Table } = require("../..")
+
+module.exports = new Table({
+  name: "a",
+  priority: 0,
+  setup(table) {
+    table.increments("id").primary().notNullable()
+    table
+      .integer("b_id")
+      .references("id")
+      .inTable("b")
+      .onDelete("cascade")
+      .notNullable()
+  },
+  async then({ query }) {
+    await query.insert({
+      id: 0,
+      b_id: 0,
+    })
+  },
+})

package/tests/tables/b.js

@@ -1,24 +1,24 @@
-const { Table } = require("../..")
-
-module.exports = new Table({
-  name: "b",
-  migrations: {
-    0: (table) =>
-      table
-        .integer("c_id")
-        .references("id")
-        .inTable("c")
-        .onDelete("cascade")
-        .notNullable(),
-  },
-  priority: 1,
-  setup(table) {
-    table.increments("id").primary().notNullable()
-  },
-  async then({ query }) {
-    await query.insert({
-      id: 0,
-      c_id: 0,
-    })
-  },
-})
+const { Table } = require("../..")
+
+module.exports = new Table({
+  name: "b",
+  migrations: {
+    0: (table) =>
+      table
+        .integer("c_id")
+        .references("id")
+        .inTable("c")
+        .onDelete("cascade")
+        .notNullable(),
+  },
+  priority: 1,
+  setup(table) {
+    table.increments("id").primary().notNullable()
+  },
+  async then({ query }) {
+    await query.insert({
+      id: 0,
+      c_id: 0,
+    })
+  },
+})

package/tests/tables/c.js

@@ -1,12 +1,12 @@
-const { Table } = require("../..")
-
-module.exports = new Table({
-  name: "c",
-  priority: 2,
-  setup(table) {
-    table.increments("id").primary().notNullable()
-  },
-  async then({ query }) {
-    await query.insert({ id: 0 })
-  },
-})
+const { Table } = require("../..")
+
+module.exports = new Table({
+  name: "c",
+  priority: 2,
+  setup(table) {
+    table.increments("id").primary().notNullable()
+  },
+  async then({ query }) {
+    await query.insert({ id: 0 })
+  },
+})

package/tests/test.js

@@ -1,40 +1,40 @@
-require("dotenv").config({ path: "./.env" })
-const path = require("path")
-const { ORM } = require("..")
-const a = require("./tables/a")
-const b = require("./tables/b")
-const c = require("./tables/c")
-
-const orm = new ORM({
-  tablePath: path.join(__dirname, "tables"),
-  logger: console,
-})
-
-beforeAll(async () => {
-  await orm.init()
-})
-
-test("tables created", async () => {
-  expect(await orm.db.schema.hasTable("migration")).toBeTruthy()
-  expect(await orm.db.schema.hasTable("a")).toBeTruthy()
-  expect(await orm.db.schema.hasTable("b")).toBeTruthy()
-  expect(await orm.db.schema.hasTable("c")).toBeTruthy()
-})
-
-test("migrations ran", async () => {
-  expect(await orm.db.schema.hasColumn("b", "c_id")).toBeTruthy()
-})
-
-test("then ran", async () => {
-  const rows = await orm.db("a").select()
-  expect(rows.length).toBe(1)
-})
-
-test("cascade delete", async () => {
-  await c.query.del()
-  expect(await a.isEmpty()).toBeTruthy()
-})
-
-afterAll(async () => {
-  await orm.db.destroy()
-})
+require("dotenv").config({ path: "./.env" })
+const path = require("path")
+const { ORM } = require("..")
+const a = require("./tables/a")
+const b = require("./tables/b")
+const c = require("./tables/c")
+
+const orm = new ORM({
+  tablePath: path.join(__dirname, "tables"),
+  logger: console,
+})
+
+beforeAll(async () => {
+  await orm.init()
+})
+
+test("tables created", async () => {
+  expect(await orm.db.schema.hasTable("migration")).toBeTruthy()
+  expect(await orm.db.schema.hasTable("a")).toBeTruthy()
+  expect(await orm.db.schema.hasTable("b")).toBeTruthy()
+  expect(await orm.db.schema.hasTable("c")).toBeTruthy()
+})
+
+test("migrations ran", async () => {
+  expect(await orm.db.schema.hasColumn("b", "c_id")).toBeTruthy()
+})
+
+test("then ran", async () => {
+  const rows = await orm.db("a").select()
+  expect(rows.length).toBe(1)
+})
+
+test("cascade delete", async () => {
+  await c.query.del()
+  expect(await a.isEmpty()).toBeTruthy()
+})
+
+afterAll(async () => {
+  await orm.db.destroy()
+})

package/tsconfig-cjs.json

@@ -1,10 +1,10 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "dist/cjs",
-    "module": "CommonJS",
-    "target": "es2020",
-    "declaration": true,
-    "declarationDir": "dist/typings"
-  }
-}
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist/cjs",
+    "module": "CommonJS",
+    "target": "es2020",
+    "declaration": true,
+    "declarationDir": "dist/typings"
+  }
+}

package/tsconfig-esm.json

@@ -1,8 +1,8 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "dist/esm",
-    "module": "esnext",
-    "target": "esnext",
-  }
-}
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist/esm",
+    "module": "esnext",
+    "target": "esnext",
+  }
+}

package/dist/cjs/package.json

@@ -1,3 +0,0 @@
-{
-    "type": "commonjs"
-}

package/dist/esm/package.json

@@ -1,3 +0,0 @@
-{
-    "type": "module"
-}