@arkstack/database 0.16.5 → 0.16.6

package/dist/commands/DbCommand.js

@@ -0,0 +1,15 @@
+import { t as bootArkorm } from "./chunks/arkorm-DbtS6UA3.js";
+import { CliApp, DbCommand as DbCommand$1 } from "arkormx";
+//#region src/commands/DbCommand.ts
+var DbCommand = class extends DbCommand$1 {
+	async handle() {
+		try {
+			bootArkorm();
+		} catch {}
+		this.app.command = this;
+		this.app = new CliApp();
+		return super.handle();
+	}
+};
+//#endregion
+export { DbCommand };

package/dist/commands/MakeFactoryCommand.js

@@ -1,4 +1,4 @@
-import { t as Rebuilder } from "./chunks/Rebuilder-BeqOrRy3.js";
+import { t as Rebuilder } from "./chunks/Rebuilder-CL-V8vgc.js";
 import { CliApp, MakeFactoryCommand as MakeFactoryCommand$1 } from "arkormx";
 //#region src/commands/MakeFactoryCommand.ts
 var MakeFactoryCommand = class extends MakeFactoryCommand$1 {

package/dist/commands/MakeMigrationCommand.js

@@ -1,4 +1,4 @@
-import { t as Rebuilder } from "./chunks/Rebuilder-BeqOrRy3.js";
+import { t as Rebuilder } from "./chunks/Rebuilder-CL-V8vgc.js";
 import { CliApp, MakeMigrationCommand as MakeMigrationCommand$1 } from "arkormx";
 //#region src/commands/MakeMigrationCommand.ts
 var MakeMigrationCommand = class extends MakeMigrationCommand$1 {

package/dist/commands/MakeModelCommand.js

@@ -1,4 +1,4 @@
-import { t as Rebuilder } from "./chunks/Rebuilder-BeqOrRy3.js";
+import { t as Rebuilder } from "./chunks/Rebuilder-CL-V8vgc.js";
 import { CliApp, MakeModelCommand as MakeModelCommand$1 } from "arkormx";
 //#region src/commands/MakeModelCommand.ts
 var MakeModelCommand = class extends MakeModelCommand$1 {

package/dist/commands/MakeSeederCommand.js

@@ -1,4 +1,4 @@
-import { t as Rebuilder } from "./chunks/Rebuilder-BeqOrRy3.js";
+import { t as Rebuilder } from "./chunks/Rebuilder-CL-V8vgc.js";
 import { CliApp, MakeSeederCommand as MakeSeederCommand$1 } from "arkormx";
 //#region src/commands/MakeSeederCommand.ts
 var MakeSeederCommand = class extends MakeSeederCommand$1 {

package/dist/commands/MigrateCommand.js

@@ -1,7 +1,11 @@
+import { t as bootArkorm } from "./chunks/arkorm-DbtS6UA3.js";
 import { CliApp, MigrateCommand as MigrateCommand$1 } from "arkormx";
 //#region src/commands/MigrateCommand.ts
 var MigrateCommand = class extends MigrateCommand$1 {
 	async handle() {
+		try {
+			bootArkorm();
+		} catch {}
 		this.app.command = this;
 		this.app = new CliApp();
 		return super.handle();

package/dist/commands/MigrateFreshCommand.js

@@ -1,7 +1,11 @@
+import { t as bootArkorm } from "./chunks/arkorm-DbtS6UA3.js";
 import { CliApp, MigrateFreshCommand as MigrateFreshCommand$1 } from "arkormx";
 //#region src/commands/MigrateFreshCommand.ts
 var MigrateFreshCommand = class extends MigrateFreshCommand$1 {
 	async handle() {
+		try {
+			bootArkorm();
+		} catch {}
 		this.app.command = this;
 		this.app = new CliApp();
 		return super.handle();

package/dist/commands/MigrateRollbackCommand.js

@@ -1,7 +1,11 @@
+import { t as bootArkorm } from "./chunks/arkorm-DbtS6UA3.js";
 import { CliApp, MigrateRollbackCommand as MigrateRollbackCommand$1 } from "arkormx";
 //#region src/commands/MigrateRollbackCommand.ts
 var MigrateRollbackCommand = class extends MigrateRollbackCommand$1 {
 	async handle() {
+		try {
+			bootArkorm();
+		} catch {}
 		this.app.command = this;
 		this.app = new CliApp();
 		return super.handle();

package/dist/commands/MigrationHistoryCommand.js

@@ -1,7 +1,11 @@
+import { t as bootArkorm } from "./chunks/arkorm-DbtS6UA3.js";
 import { CliApp, MigrationHistoryCommand as MigrationHistoryCommand$1 } from "arkormx";
 //#region src/commands/MigrationHistoryCommand.ts
 var MigrationHistoryCommand = class extends MigrationHistoryCommand$1 {
 	async handle() {
+		try {
+			bootArkorm();
+		} catch {}
 		this.app.command = this;
 		this.app = new CliApp();
 		return super.handle();

package/dist/commands/SeedCommand.js

@@ -1,7 +1,11 @@
+import { t as bootArkorm } from "./chunks/arkorm-DbtS6UA3.js";
 import { CliApp, SeedCommand as SeedCommand$1 } from "arkormx";
 //#region src/commands/SeedCommand.ts
 var SeedCommand = class extends SeedCommand$1 {
 	async handle() {
+		try {
+			bootArkorm();
+		} catch {}
 		this.app.command = this;
 		this.app = new CliApp();
 		return super.handle();

package/dist/commands/chunks/arkorm-DbtS6UA3.js

@@ -0,0 +1,137 @@
+import { Arkorm, DB, Model, createKyselyAdapter } from "arkormx";
+import { Arkstack } from "@arkstack/contract";
+import { Pool } from "pg";
+import { Kysely, PostgresDialect } from "kysely";
+import { createArkormCurrentPageResolver } from "resora";
+import { existsSync } from "node:fs";
+import { config, outputDir } from "@arkstack/common";
+import path from "node:path";
+//#region src/kysely.ts
+/**
+* Build a pg {@link Pool} from a {@link ConnectionConfig}. A `url` (or
+* `DATABASE_URL`) wins over the discrete `host`/`port`/`user`/... fields.
+* 
+* @param connection 
+* @returns 
+*/
+const createPool = (connection) => {
+	const poolConfig = connection.url ? { connectionString: connection.url } : {
+		host: connection.host,
+		port: connection.port,
+		user: connection.user,
+		database: connection.database,
+		password: connection.password
+	};
+	if (connection.ssl !== void 0) poolConfig.ssl = connection.ssl;
+	if (connection.pool?.max !== void 0) poolConfig.max = connection.pool.max;
+	if (connection.pool?.idleTimeoutMillis !== void 0) poolConfig.idleTimeoutMillis = connection.pool.idleTimeoutMillis;
+	if (connection.pool?.connectionTimeoutMillis !== void 0) poolConfig.connectionTimeoutMillis = connection.pool.connectionTimeoutMillis;
+	return new Pool(poolConfig);
+};
+/**
+* Build a Kysely instance for the given connection using the Postgres dialect.
+* 
+* @param connection 
+* @returns 
+*/
+const createKysely = (connection) => {
+	return new Kysely({ dialect: new PostgresDialect({ pool: createPool(connection) }) });
+};
+/**
+* Build an ArkORM Kysely adapter for the given connection. This is what binds
+* models to the database.
+* 
+* @param connection 
+* @returns 
+*/
+const createAdapter = (connection) => {
+	return createKyselyAdapter(createKysely(connection));
+};
+//#endregion
+//#region src/config.ts
+/**
+* Read a value from the `database` configuration namespace with a fallback.
+*
+* Never throws when the config file is missing; returns the default instead.
+*
+* @param key           Dot path within the database config.
+* @param defaultValue  Value returned when the key is not set.
+*/
+const configure = (key, defaultValue) => {
+	try {
+		return config(`database.${key}`, defaultValue);
+	} catch {
+		return defaultValue;
+	}
+};
+/**
+* Resolve a configured {@link ConnectionConfig} by name, or the default
+* connection when none is given.
+*
+* @param name  The connection name. Defaults to `database.default`.
+* @throws when the named connection is not configured.
+*/
+const resolveConnection = (name) => {
+	const connection = name ?? configure("default", "pgsql");
+	const resolved = configure("connections", {})[connection];
+	if (!resolved) throw new Error(`Database connection "${connection}" is not configured.`);
+	return resolved;
+};
+//#endregion
+//#region src/arkorm.ts
+/**
+* Default ArkORM paths matching the scaffolded application structure. Apps with
+* a different layout can override them by adding an `arkormx.config.ts`.
+*/
+const defaultPaths = () => {
+	return {
+		models: "./src/app/models",
+		factories: "./src/database/factories",
+		seeders: "./src/database/seeders",
+		migrations: "./src/database/migrations",
+		buildOutput: path.relative(Arkstack.rootDir(), outputDir())
+	};
+};
+/**
+* Whether the application provides its own `arkormx.config.{ts,js}`. When it
+* does, ArkORM loads it and it takes precedence over the framework defaults.
+*/
+const hasUserArkormConfig = () => {
+	const root = Arkstack.rootDir();
+	return existsSync(path.join(root, "arkormx.config.ts")) || existsSync(path.join(root, "arkormx.config.js"));
+};
+/**
+* Configure ArkORM natively from `src/config/database.ts`, so applications work
+* without an `arkormx.config.ts`.
+*
+* Builds the adapter from the default (or named) connection, registers the
+* conventional paths and the resora pagination resolver, and binds models. A
+* user-provided `arkormx.config.{ts,js}` always wins — in that case this is a
+* no-op and ArkORM loads the file instead.
+*
+* @param options  Optional overrides merged over the derived config.
+* @returns        Whether the framework applied its configuration.
+*/
+const bootArkorm = (options = {}) => {
+	if (hasUserArkormConfig()) return false;
+	const { connection, adapter, paths, pagination, ...rest } = options;
+	const resolvedAdapter = adapter ?? createAdapter(resolveConnection(connection));
+	Arkorm.configure({
+		adapter: resolvedAdapter,
+		paths: {
+			...defaultPaths(),
+			...paths ?? {}
+		},
+		pagination: {
+			resolveCurrentPage: createArkormCurrentPageResolver(),
+			...pagination ?? {}
+		},
+		outputExt: "ts",
+		...rest
+	});
+	Model.setAdapter(resolvedAdapter);
+	DB.setAdapter(resolvedAdapter);
+	return true;
+};
+//#endregion
+export { bootArkorm as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/database",
-  "version": "0.16.5",
+  "version": "0.16.6",
   "type": "module",
   "description": "Database module for Arkstack, providing core database integration and data layer features.",
   "homepage": "https://arkstack.toneflix.net",
@@ -31,6 +31,7 @@
   },
   "exports": {
     ".": "./dist/index.js",
+    "./DbCommand": "./dist/commands/DbCommand.js",
     "./MakeFactoryCommand": "./dist/commands/MakeFactoryCommand.js",
     "./MakeMigrationCommand": "./dist/commands/MakeMigrationCommand.js",
     "./MakeModelCommand": "./dist/commands/MakeModelCommand.js",
@@ -51,12 +52,12 @@
   "dependencies": {
     "@arkormx/plugin-clear-router": "^0.1.49",
     "dotenv": "^17.4.2",
-    "arkormx": "^2.10.1",
+    "arkormx": "^2.11.2",
     "kysely": "^0.29.2",
     "pg": "^8.22.0",
     "resora": "^1.3.27",
-    "@arkstack/common": "^0.16.5",
-    "@arkstack/contract": "^0.16.5"
+    "@arkstack/common": "^0.16.6",
+    "@arkstack/contract": "^0.16.6"
   },
   "devDependencies": {
     "@types/pg": "^8.16.0"

package/dist/commands/chunks/{Rebuilder-BeqOrRy3.js → Rebuilder-CL-V8vgc.js}

@@ -1,9 +1,9 @@
 import { createRequire } from "node:module";
-import { readFile, writeFile } from "node:fs/promises";
 import { Arkstack } from "@arkstack/contract";
-import { Logger } from "@arkstack/common";
 import { globSync } from "node:fs";
+import { Logger } from "@arkstack/common";
 import { join } from "node:path";
+import { readFile, writeFile } from "node:fs/promises";
 //#region src/extensions/Rebuilder.ts
 var Rebuilder = class Rebuilder {
 	app;