@h3ravel/arquebus 0.4.1 → 0.6.0

package/dist/migrations/index.js

@@ -1,5 +1,5 @@
 import { __export } from "./chunk-PECeCxCb.js";
-import { Logger, TaskManager } from "@h3ravel/shared";
+import { FileSystem, Logger, TaskManager } from "@h3ravel/shared";
 import { assign, camel, diff, flat, get, isArray, isEmpty, isEqual, isString, omit, pick, set, snake, trim } from "radashi";
 import advancedFormat from "dayjs/plugin/advancedFormat.js";
 import dayjs from "dayjs";
@@ -7,13 +7,12 @@ import collect, { Collection, collect as collect$1 } from "collect.js";
 import Knex$1 from "knex";
 import path from "path";
 import { existsSync } from "fs";
-import pluralize from "pluralize";
-import fs from "node:fs/promises";
 import { access } from "fs/promises";
 import escalade from "escalade/sync";
 import resolveFrom from "resolve-from";
-import { existsSync as existsSync$1, readFileSync } from "node:fs";
-import { dirname } from "node:path";
+import pluralize from "pluralize";
+import fs, { copyFile, mkdir, readFile, readdir, writeFile } from "node:fs/promises";
+import path$1, { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 
 //#region src/migrations/migration-repository.ts
@@ -1405,7 +1404,7 @@ var InvalidArgumentError = class extends BaseError {};
 var mixin_exports = /* @__PURE__ */ __export({ compose: () => compose$1 });
 /**
 * Compose function that merges multiple classes and mixins
-* 
+*
 * @example
 * const SomePlugin = <TBase extends new (...args: any[]) => TGeneric> (Base: TBase) => {
 *     return class extends Base {
@@ -1442,10 +1441,10 @@ var mixin_exports = /* @__PURE__ */ __export({ compose: () => compose$1 });
 * console.log(user.pluginMethod('w')) // "plugin"
 * console.log(user.pluginMethod()) // "plugin"
 * console.log(user.relationPosts()) // "hasMany Posts"
-* 
-* @param Base 
-* @param mixins 
-* @returns 
+*
+* @param Base
+* @param mixins
+* @returns
 */
 function compose$1(Base, ...mixins) {
 	/**
@@ -1499,10 +1498,10 @@ const getSetterMethod = (attr) => {
 };
 /**
 * Tap into a model a collection instance
-* 
-* @param instance 
-* @param callback 
-* @returns 
+*
+* @param instance
+* @param callback
+* @returns
 */
 const tap = (instance, callback) => {
 	const result = callback(instance);
@@ -2338,8 +2337,8 @@ var HasManyThrough = class extends relation_default {
 		const results = await this.take(1).get(columns);
 		return results.count() > 0 ? results.first() : null;
 	}
-	async firstOrFail(columns = ["*"]) {
-		const model = await this.first(columns);
+	async firstOrFail(...columns) {
+		const model = await this.first(...columns);
 		if (model) return model;
 		throw new ModelNotFoundError().setModel(this.related.constructor);
 	}
@@ -2378,7 +2377,7 @@ var HasManyThrough = class extends relation_default {
 	}
 	async paginate(perPage = null, columns = ["*"], pageName = "page", page = null) {
 		this.query.addSelect(this.shouldSelect(columns));
-		return await this.query.paginate(perPage, columns, pageName, page);
+		return await this.query.paginate(perPage ?? 15, columns, pageName, page);
 	}
 	shouldSelect(columns = ["*"]) {
 		if ((columns === null || columns === void 0 ? void 0 : columns.at(0)) == "*") columns = [this.related.getTable() + ".*"];
@@ -2656,9 +2655,6 @@ const UniqueIds = (Model$1) => {
 		uniqueIds() {
 			return [];
 		}
-		newUniqueId() {
-			return null;
-		}
 		setUniqueIds() {
 			const uniqueIds = this.uniqueIds();
 			for (const column of uniqueIds) if (this[column] === null || this[column] === void 0) this[column] = this.newUniqueId();
@@ -2680,6 +2676,7 @@ var Paginator = class {
 	options = {};
 	static setFormatter(formatter) {
 		if (typeof formatter !== "function" && formatter !== null && formatter !== void 0) throw new Error("Paginator formatter must be a function or null");
+		if (!formatter) return;
 		this.formatter = formatter;
 	}
 	constructor(items, total, perPage, currentPage = 1, options = {}) {
@@ -2768,8 +2765,10 @@ var QueryBuilder = class QueryBuilder extends Inference$2 {
 	asProxy() {
 		return new Proxy(this, {
 			get: function(target, prop) {
+				var _target$connector$cli;
 				if (typeof target[prop] !== "undefined") return target[prop];
 				if (["destroy", "schema"].includes(prop)) return target.connector.schema;
+				const skipReturning = !!((_target$connector$cli = target.connector.client.config) === null || _target$connector$cli === void 0 || (_target$connector$cli = _target$connector$cli.client) === null || _target$connector$cli === void 0 ? void 0 : _target$connector$cli.includes("mysql")) && prop === "returning";
 				if ([
 					"select",
 					"from",
@@ -2832,7 +2831,7 @@ var QueryBuilder = class QueryBuilder extends Inference$2 {
 					"clearWhere",
 					"clearHaving",
 					"clearGroup"
-				].includes(prop)) return (...args) => {
+				].includes(prop) && !skipReturning) return (...args) => {
 					target.connector[prop](...args);
 					return target.asProxy();
 				};
@@ -2889,7 +2888,7 @@ var QueryBuilder = class QueryBuilder extends Inference$2 {
 		} while (countResults === count);
 		return true;
 	}
-	async paginate(page = 1, perPage = 15) {
+	async paginate(page = 1, perPage = 15, _pageName, _page) {
 		const total = await this.clone().clearOrder().count("*");
 		let results;
 		if (total > 0) {
@@ -2953,6 +2952,59 @@ var QueryBuilder = class QueryBuilder extends Inference$2 {
 };
 var query_builder_default = QueryBuilder;
 
+//#endregion
+//#region src/cli/utils.ts
+const join = path.join;
+var Utils = class {
+	/**
+	* Wraps text with chalk
+	*
+	* @param txt
+	* @param color
+	* @returns
+	*/
+	static textFormat(txt, color) {
+		return String(txt).split(":").map((e, i, a) => i == 0 && a.length > 1 ? color(" " + e + ": ") : e).join("");
+	}
+	static findModulePkg(moduleId, cwd) {
+		const parts = moduleId.replace(/\\/g, "/").split("/");
+		let packageName = "";
+		if (parts.length > 0 && parts[0][0] === "@") packageName += parts.shift() + "/";
+		packageName += parts.shift();
+		const packageJson = path.join(packageName, "package.json");
+		const resolved = resolveFrom.silent(cwd ?? process.cwd(), packageJson);
+		if (!resolved) return;
+		return path.join(path.dirname(resolved), parts.join("/"));
+	}
+	static async getMigrationPaths(cwd, migrator, defaultPath, path$2) {
+		if (path$2) return [join(cwd, path$2)];
+		return [...migrator.getPaths(), join(cwd, defaultPath)];
+	}
+	/**
+	* Check if file exists
+	*
+	* @param path
+	* @returns
+	*/
+	static async fileExists(path$2) {
+		try {
+			await access(path$2);
+			return true;
+		} catch {
+			return false;
+		}
+	}
+	static findUpConfig(cwd, name, extensions) {
+		return escalade(cwd, (_dir, names) => {
+			for (const ext of extensions) {
+				const filename = `${name}.${ext}`;
+				if (names.includes(filename)) return filename;
+			}
+			return false;
+		});
+	}
+};
+
 //#endregion
 //#region src/arquebus.ts
 var arquebus = class arquebus {
@@ -2974,22 +3026,22 @@ var arquebus = class arquebus {
 		return this.instance;
 	}
 	/**
-	* Initialize a new database connection 
-	* 
-	* @returns 
+	* Initialize a new database connection
+	*
+	* @returns
 	*/
 	static fire(connection = null) {
 		return this.getInstance().getConnection(connection);
 	}
 	/**
-	* Initialize a new database connection 
-	* 
+	* Initialize a new database connection
+	*
 	* This is an alias of `arquebus.fire()` and will be removed in the future
-	* 
+	*
 	* @deprecated since version 0.3.0
 	* @alias fire
-	* 
-	* @returns 
+	*
+	* @returns
 	*/
 	static connection(connection = null) {
 		return this.fire(connection);
@@ -3026,11 +3078,12 @@ var arquebus = class arquebus {
 	}
 	getConnection(name = null) {
 		name = name || "default";
-		if (this.manager[name] === void 0) {
-			const queryBuilder = new query_builder_default(this.connections[name], arquebus.getConnectorFactory());
-			this.manager[name] = queryBuilder;
+		const resolvedName = this.connections[name] ? name : "default";
+		if (this.manager[resolvedName] === void 0) {
+			const queryBuilder = new query_builder_default(this.connections[resolvedName], arquebus.getConnectorFactory());
+			this.manager[resolvedName] = queryBuilder;
 		}
-		return this.manager[name];
+		return this.manager[resolvedName];
 	}
 	addConnection(config, name = "default") {
 		this.connections[name] = {
@@ -3047,13 +3100,13 @@ var arquebus = class arquebus {
 	}
 	/**
 	* Autoload the config file
-	* 
-	* @param addConnection 
+	*
+	* @param addConnection
 	* @default true
-	* If set to `false` we will no attempt add the connection, we 
+	* If set to `false` we will no attempt add the connection, we
 	* will just go ahead and return the config
-	* 
-	* @returns 
+	*
+	* @returns
 	*/
 	static async autoLoad(addConnection = true) {
 		let config;
@@ -3070,6 +3123,23 @@ var arquebus = class arquebus {
 			if (addConnection) instance.addConnection(config, config.client);
 			return config;
 		} else throw new Error("arquebus.config.ts found in production without build step");
+		const candidateDirs = [
+			process.cwd(),
+			path.join(process.cwd(), "test", "cli"),
+			path.join(process.cwd(), "test")
+		];
+		for (const dir of candidateDirs) {
+			const found = Utils.findUpConfig(dir, "arquebus.config", [
+				"js",
+				"ts",
+				"cjs"
+			]);
+			if (found) if (!found.endsWith(".ts") || process.env.NODE_ENV !== "production") {
+				config = (await import(found)).default;
+				if (addConnection) instance.addConnection(config, config.client);
+				return config;
+			} else throw new Error("arquebus.config.ts found in production without build step");
+		}
 		return {};
 	}
 	beginTransaction(connection = null) {
@@ -3128,14 +3198,15 @@ var arquebus_default = arquebus;
 
 //#endregion
 //#region src/model.ts
-const BaseModel = compose(class {}, has_attributes_default, hides_attributes_default, has_relations_default, has_timestamps_default, has_hooks_default, has_global_scopes_default, unique_ids_default);
+const ModelClass = class {};
+const BaseModel = compose(ModelClass, has_attributes_default, hides_attributes_default, has_relations_default, has_timestamps_default, has_hooks_default, has_global_scopes_default, unique_ids_default);
 var Model = class Model extends BaseModel {
-	primaryKey = "id";
 	builder = null;
 	table = null;
 	keyType = "int";
 	incrementing = true;
 	withCount = [];
+	primaryKey = "id";
 	perPage = 15;
 	static globalScopes = {};
 	static pluginInitializers = {};
@@ -3145,6 +3216,7 @@ var Model = class Model extends BaseModel {
 	eagerLoad = {};
 	exists = false;
 	with = [];
+	name;
 	trx = null;
 	constructor(attributes = {}) {
 		super();
@@ -3916,8 +3988,8 @@ var BelongsToMany = class extends compose(relation_default, interacts_with_pivot
 		const results = await this.take(1).get(columns);
 		return results.count() > 0 ? results.first() : null;
 	}
-	async firstOrFail(columns = ["*"]) {
-		const model = await this.first(columns);
+	async firstOrFail(...columns) {
+		const model = await this.first(...columns);
 		if (model !== null) return model;
 		throw new ModelNotFoundError().setModel(this.related.constructor);
 	}
@@ -4093,7 +4165,9 @@ var Builder = class Builder extends Inference$1 {
 	}
 	asProxy() {
 		return new Proxy(this, { get(target, prop) {
+			var _target$query$connect;
 			if (typeof target[prop] !== "undefined") return target[prop];
+			const skipReturning = !!((_target$query$connect = target.query.connector) === null || _target$query$connect === void 0 || (_target$query$connect = _target$query$connect.client.config) === null || _target$query$connect === void 0 || (_target$query$connect = _target$query$connect.client) === null || _target$query$connect === void 0 ? void 0 : _target$query$connect.includes("mysql")) && prop === "returning";
 			if ([
 				"select",
 				"from",
@@ -4156,7 +4230,7 @@ var Builder = class Builder extends Inference$1 {
 				"clearWhere",
 				"clearHaving",
 				"clearGroup"
-			].includes(prop)) return (...args) => {
+			].includes(prop) && !skipReturning) return (...args) => {
 				target.query[prop](...args);
 				return target.asProxy();
 			};
@@ -4758,6 +4832,12 @@ var Migration = class extends Inference {
 };
 var migration_default = Migration;
 
+//#endregion
+//#region node_modules/.pnpm/tsdown@0.15.6_typescript@5.9.3/node_modules/tsdown/esm-shims.js
+const getFilename = () => fileURLToPath(import.meta.url);
+const getDirname = () => path$1.dirname(getFilename());
+const __dirname = /* @__PURE__ */ getDirname();
+
 //#endregion
 //#region src/inspector/dialects/sqlite.ts
 function parseDefaultValue(value) {
@@ -5035,9 +5115,9 @@ var Migrator = class {
 	}
 	/**
 	* Drop all tables and re-run all migrations
-	* 
-	* @param paths 
-	* @param options 
+	*
+	* @param paths
+	* @param options
 	*/
 	async fresh(paths, options) {
 		/** Initialise connections */
@@ -5129,59 +5209,6 @@ var Migrator = class {
 };
 var migrator_default = Migrator;
 
-//#endregion
-//#region src/cli/utils.ts
-const join = path.join;
-var Utils = class {
-	/**
-	* Wraps text with chalk
-	* 
-	* @param txt 
-	* @param color 
-	* @returns 
-	*/
-	static textFormat(txt, color) {
-		return String(txt).split(":").map((e, i, a) => i == 0 && a.length > 1 ? color(" " + e + ": ") : e).join("");
-	}
-	static findModulePkg(moduleId, cwd) {
-		const parts = moduleId.replace(/\\/g, "/").split("/");
-		let packageName = "";
-		if (parts.length > 0 && parts[0][0] === "@") packageName += parts.shift() + "/";
-		packageName += parts.shift();
-		const packageJson = path.join(packageName, "package.json");
-		const resolved = resolveFrom.silent(cwd ?? process.cwd(), packageJson);
-		if (!resolved) return;
-		return path.join(path.dirname(resolved), parts.join("/"));
-	}
-	static async getMigrationPaths(cwd, migrator, defaultPath, path$1) {
-		if (path$1) return [join(cwd, path$1)];
-		return [...migrator.getPaths(), join(cwd, defaultPath)];
-	}
-	/**
-	* Check if file exists
-	* 
-	* @param path 
-	* @returns 
-	*/
-	static async fileExists(path$1) {
-		try {
-			await access(path$1);
-			return true;
-		} catch {
-			return false;
-		}
-	}
-	static findUpConfig(cwd, name, extensions) {
-		return escalade(cwd, (_dir, names) => {
-			for (const ext of extensions) {
-				const filename = `${name}.${ext}`;
-				if (names.includes(filename)) return filename;
-			}
-			return false;
-		});
-	}
-};
-
 //#endregion
 //#region src/migrate.ts
 var Migrate = class {
@@ -5193,10 +5220,10 @@ var Migrate = class {
 	}
 	/**
 	* Runs all pending migrations
-	* 
-	* @param config 
-	* @param options 
-	* @param destroyAll 
+	*
+	* @param config
+	* @param options
+	* @param destroyAll
 	*/
 	async run(config, options = {}, destroyAll = false) {
 		const { arquebus: arquebus$1, migrator } = await this.setupConnection(config);
@@ -5210,10 +5237,10 @@ var Migrate = class {
 	}
 	/**
 	* Rollback the last migration
-	* 
-	* @param config 
-	* @param options 
-	* @param destroyAll 
+	*
+	* @param config
+	* @param options
+	* @param destroyAll
 	*/
 	async rollback(config, options = {}, destroyAll = false) {
 		const { arquebus: arquebus$1, migrator } = await this.setupConnection(config);
@@ -5227,10 +5254,10 @@ var Migrate = class {
 	}
 	/**
 	* Rollback all database migrations
-	* 
-	* @param config 
-	* @param options 
-	* @param destroyAll 
+	*
+	* @param config
+	* @param options
+	* @param destroyAll
 	*/
 	async reset(config, options = {}, destroyAll = false) {
 		const { arquebus: arquebus$1, migrator } = await this.setupConnection(config);
@@ -5245,10 +5272,10 @@ var Migrate = class {
 	}
 	/**
 	* Reset and re-run all migrations
-	* 
-	* @param config 
-	* @param options 
-	* @param destroyAll 
+	*
+	* @param config
+	* @param options
+	* @param destroyAll
 	*/
 	async refresh(config, options = {}, destroyAll = false) {
 		await this.reset(config, Object.assign({}, options, { quiet: true }), false);
@@ -5257,10 +5284,10 @@ var Migrate = class {
 	}
 	/**
 	* Drop all tables and re-run all migrations
-	* 
-	* @param config 
-	* @param options 
-	* @param destroyAll 
+	*
+	* @param config
+	* @param options
+	* @param destroyAll
 	*/
 	async fresh(config, options = {}, destroyAll = false) {
 		const { arquebus: arquebus$1, migrator } = await this.setupConnection(config);
@@ -5270,8 +5297,8 @@ var Migrate = class {
 	}
 	/**
 	* Prepares the database for migration
-	* 
-	* @param migrator 
+	*
+	* @param migrator
 	*/
 	async prepareDatabase(migrator) {
 		if (!await migrator.repositoryExists()) {
@@ -5283,11 +5310,11 @@ var Migrate = class {
 	}
 	/**
 	* Check the status of available migrations
-	* 
-	* @param config 
-	* @param options 
-	* @param destroyAll 
-	* @returns 
+	*
+	* @param config
+	* @param options
+	* @param destroyAll
+	* @returns
 	*/
 	async status(config, options = {}, destroyAll = false) {
 		const { arquebus: arquebus$1, migrator } = await this.setupConnection(config);
@@ -5314,9 +5341,9 @@ var Migrate = class {
 	}
 	/**
 	* Setup the database connection
-	* 
-	* @param config 
-	* @returns 
+	*
+	* @param config
+	* @returns
 	*/
 	async setupConnection(config) {
 		var _config$migrations;
@@ -5346,54 +5373,54 @@ var MigrationCreator = class {
 	}
 	/**
 	* Create a new migration file
-	* 
-	* @param name 
-	* @param dir 
-	* @param table 
-	* @param create 
-	* @returns 
+	*
+	* @param name
+	* @param dir
+	* @param table
+	* @param create
+	* @returns
 	*/
 	async create(name, dir, table, create = false) {
-		const stub = this.getStub(table, create);
+		const stub = await this.getStub(table, create);
 		const filePath = this.getPath(name, dir);
 		await this.ensureDirectoryExists(path.dirname(filePath));
-		await fs.writeFile(filePath, this.populateStub(stub, table));
+		await writeFile(filePath, this.populateStub(stub, table));
 		await this.firePostCreateHooks(table, filePath);
 		return filePath;
 	}
 	/**
 	* Publish migrations from third party vendors
-	* 
-	* @param dir 
-	* @param callback 
+	*
+	* @param dir
+	* @param callback
 	*/
 	async publish(dir, callback) {
-		const migrationFiles = await fs.readdir(this.customStubPath ?? "");
+		const migrationFiles = await readdir(this.customStubPath ?? "");
 		await this.ensureDirectoryExists(dir);
 		for (const migrationFile of migrationFiles) {
 			const sourceFilePath = path.join(this.customStubPath ?? "", migrationFile);
 			const destinationFilePath = path.join(dir, migrationFile);
-			await fs.copyFile(sourceFilePath, destinationFilePath);
+			await copyFile(sourceFilePath, destinationFilePath);
 			if (callback) callback(migrationFile, sourceFilePath, destinationFilePath);
 		}
 	}
-	getStub(table, create = false) {
+	async getStub(table, create = false) {
 		let stub;
 		if (!table) {
 			const customPath = path.join(this.customStubPath ?? "", `migration-${this.type}.stub`);
 			console.log("\n", customPath, "---");
-			stub = existsSync$1(customPath) ? customPath : this.stubPath(`/migration-${this.type}.stub`);
+			stub = await FileSystem.fileExists(customPath) ? customPath : this.stubPath(`/migration-${this.type}.stub`);
 		} else if (create) {
 			const customPath = path.join(this.customStubPath ?? "", `migration.create-${this.type}.stub`);
-			stub = existsSync$1(customPath) ? customPath : this.stubPath(`/migration.create-${this.type}.stub`);
+			stub = await FileSystem.fileExists(customPath) ? customPath : this.stubPath(`/migration.create-${this.type}.stub`);
 		} else {
 			const customPath = path.join(this.customStubPath ?? "", `migration.update-${this.type}.stub`);
-			stub = existsSync$1(customPath) ? customPath : this.stubPath(`/migration.update-${this.type}.stub`);
+			stub = await FileSystem.fileExists(customPath) ? customPath : this.stubPath(`/migration.update-${this.type}.stub`);
 		}
-		return readFileSync(stub, "utf-8");
+		return await readFile(stub, "utf-8");
 	}
 	populateStub(stub, table) {
-		if (table !== null) stub = stub.replace(/DummyTable|{{\s*table\s*}}/g, table);
+		if (table) stub = stub.replace(/DummyTable|{{\s*table\s*}}/g, table);
 		return stub;
 	}
 	getClassName(name) {
@@ -5410,7 +5437,7 @@ var MigrationCreator = class {
 		this.postCreate.push(callback);
 	}
 	async ensureDirectoryExists(dir) {
-		await fs.mkdir(dir, { recursive: true });
+		await mkdir(dir, { recursive: true });
 	}
 	stubPath(stub = "") {
 		const __dirname$1 = this.getDirname(import.meta);

package/dist/migrations/stubs/migration-js.stub

@@ -18,4 +18,4 @@ export default class extends Migration {
   async down(schema) {
     //
   }
-};
+}

package/dist/migrations/stubs/migration-ts.stub

@@ -15,4 +15,4 @@ export default class extends Migration {
   async down (schema: SchemaBuilder) {
     //
   }
-};
+}

package/dist/migrations/stubs/migration.create-js.stub

@@ -8,9 +8,9 @@ export default class extends Migration {
     */
   async up(schema) {
     await schema.createTable('{{ table }}', (table) => {
-      table.increments('id');
-      table.timestamps();
-    });
+      table.increments('id')
+      table.timestamps()
+    })
   }
 
   /**
@@ -19,6 +19,6 @@ export default class extends Migration {
     * @param {(import('@h3ravel/arquebus/types/query-builder').SchemaBuilder)} schema 
     */
   async down(schema) {
-    await schema.dropTableIfExists('{{ table }}');
+    await schema.dropTableIfExists('{{ table }}')
   }
-};
+}

package/dist/migrations/stubs/migration.create-ts.stub

@@ -7,15 +7,15 @@ export default class extends Migration {
     */
   async up(schema: SchemaBuilder) {
     await schema.createTable('{{ table }}', (table) => {
-      table.increments('id');
-      table.timestamps();
-    });
+      table.increments('id')
+      table.timestamps()
+    })
   }
 
   /**
     * Reverse the migrations.
     */
   async down(schema: SchemaBuilder) {
-    await schema.dropTableIfExists('{{ table }}');
+    await schema.dropTableIfExists('{{ table }}')
   }
-};
+}

package/dist/migrations/stubs/migration.update-js.stub

@@ -9,7 +9,7 @@ export default class extends Migration {
   async up(schema) {
     await schema.table('{{ table }}', (table) => {
       // 
-    });
+    })
   }
 
   /**
@@ -20,6 +20,6 @@ export default class extends Migration {
   async down(schema) {
     await schema.table('{{ table }}', (table) => {
       // 
-    });
+    })
   }
 };