@h3ravel/arquebus 0.4.0 → 0.5.0

package/dist/index.js

@@ -7,7 +7,7 @@ import Knex$1 from "knex";
 import path from "path";
 import { existsSync } from "fs";
 import pluralize from "pluralize";
-import { Logger } from "@h3ravel/shared";
+import { Logger, TaskManager } from "@h3ravel/shared";
 import fs from "node:fs/promises";
 import { access } from "fs/promises";
 import escalade from "escalade/sync";
@@ -1041,8 +1041,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);
 	}
@@ -1081,7 +1081,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() + ".*"];
@@ -1359,9 +1359,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();
@@ -1383,6 +1380,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 = {}) {
@@ -1471,8 +1469,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",
@@ -1535,7 +1535,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();
 				};
@@ -1592,7 +1592,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) {
@@ -1831,14 +1831,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 = {};
@@ -1848,6 +1849,7 @@ var Model = class Model extends BaseModel {
 	eagerLoad = {};
 	exists = false;
 	with = [];
+	name;
 	trx = null;
 	constructor(attributes = {}) {
 		super();
@@ -2619,8 +2621,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);
 	}
@@ -2796,7 +2798,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",
@@ -2859,7 +2863,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();
 			};
@@ -5008,13 +5012,13 @@ var Migrator = class {
 	async runUp(file, batch, _pretend) {
 		const migration = await this.resolvePath(file);
 		const name = this.getMigrationName(file);
-		await this.taskRunner(name, () => this.runMigration(migration, "up"));
+		await TaskManager.taskRunner(name, () => this.runMigration(migration, "up"));
 		await this.repository.log(name, batch);
 	}
 	async runDown(file, migration, _pretend) {
 		const instance = await this.resolvePath(file);
 		const name = this.getMigrationName(file);
-		await this.taskRunner(name, () => this.runMigration(instance, "down"));
+		await TaskManager.taskRunner(name, () => this.runMigration(instance, "down"));
 		await this.repository.delete(migration);
 	}
 	async rollback(paths = [], options = {}) {
@@ -5065,7 +5069,7 @@ var Migrator = class {
 		const inspector = SchemaInspector.inspect(connection);
 		await connection.raw("SET foreign_key_checks = 0");
 		/** Drop all existing tables */
-		for (const table of await inspector.tables()) this.taskRunner(`Dropping ${Logger.parse([[table, "grey"]], "", false)} table`, () => connection.schema.dropTableIfExists(table));
+		for (const table of await inspector.tables()) await TaskManager.taskRunner(`Dropping ${Logger.parse([[table, "grey"]], "", false)} table`, () => connection.schema.dropTableIfExists(table));
 		await connection.raw("SET foreign_key_checks = 1");
 		/** Create the migration repository */
 		await this.repository.createRepository();
@@ -5146,17 +5150,6 @@ var Migrator = class {
 	write(...args) {
 		if (this.output) console.log(...args);
 	}
-	async taskRunner(description, task) {
-		const startTime = process.hrtime();
-		let result = false;
-		try {
-			result = await Promise.all([(task || (() => true))()].flat());
-		} finally {
-			const endTime = process.hrtime(startTime);
-			const duration = (endTime[0] * 1e9 + endTime[1]) / 1e6;
-			Logger.twoColumnLog(Logger.parse([[description, "green"]], "", false), [Logger.parse([[`${Math.floor(duration)}ms`, "gray"]], "", false), Logger.parse([[result !== false ? "✔" : "✘", result !== false ? "green" : "red"]], "", false)].join(" "));
-		}
-	}
 };
 var migrator_default = Migrator;
 
@@ -5554,7 +5547,7 @@ const make = (model, data, options = {}) => {
 	return model.make(data);
 };
 const makeCollection = (model, data) => new collection_default(data.map((item) => model.make(item)));
-const makePaginator = (model, data) => new paginator_default(data.data.map((item) => model.make(item)), data.total, data.per_page, data.current_page);
+const makePaginator = (model, data, _) => new paginator_default(data.data.map((item) => model.make(item)), data.total, data.per_page, data.current_page);
 
 //#endregion
 export { attribute_default as Attribute, builder_default as Builder, casts_attributes_default as CastsAttributes, collection_default as Collection, has_unique_ids_default as HasUniqueIds, InvalidArgumentError, Migrate, migration_default as Migration, model_default as Model, ModelNotFoundError, paginator_default as Paginator, pivot_default as Pivot, query_builder_default as QueryBuilder, RelationNotFoundError, scope_default as Scope, soft_deletes_default as SoftDeletes, arquebus_default as arquebus, compose, defineConfig, flatten, flattenDeep, getAttrMethod, getAttrName, getGetterMethod, getRelationMethod, getRelationName, getScopeMethod, getScopeName, getSetterMethod, kebabCase, make, makeCollection, makePaginator, now, snakeCase, tap };

package/dist/inspector/index.cjs

@@ -2304,8 +2304,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);
 	}
@@ -2344,7 +2344,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() + ".*"];
@@ -2622,9 +2622,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();
@@ -2646,6 +2643,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 = {}) {
@@ -2734,8 +2732,10 @@ var QueryBuilder = class QueryBuilder extends Inference$1 {
 	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",
@@ -2798,7 +2798,7 @@ var QueryBuilder = class QueryBuilder extends Inference$1 {
 					"clearWhere",
 					"clearHaving",
 					"clearGroup"
-				].includes(prop)) return (...args) => {
+				].includes(prop) && !skipReturning) return (...args) => {
 					target.connector[prop](...args);
 					return target.asProxy();
 				};
@@ -2855,7 +2855,7 @@ var QueryBuilder = class QueryBuilder extends Inference$1 {
 		} 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) {
@@ -3094,14 +3094,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 = {};
@@ -3111,6 +3112,7 @@ var Model = class Model extends BaseModel {
 	eagerLoad = {};
 	exists = false;
 	with = [];
+	name;
 	trx = null;
 	constructor(attributes = {}) {
 		super();
@@ -3882,8 +3884,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);
 	}
@@ -4059,7 +4061,9 @@ var Builder = class Builder extends Inference {
 	}
 	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",
@@ -4122,7 +4126,7 @@ var Builder = class Builder extends Inference {
 				"clearWhere",
 				"clearHaving",
 				"clearGroup"
-			].includes(prop)) return (...args) => {
+			].includes(prop) && !skipReturning) return (...args) => {
 				target.query[prop](...args);
 				return target.asProxy();
 			};

package/dist/inspector/index.js

@@ -2278,8 +2278,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);
 	}
@@ -2318,7 +2318,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() + ".*"];
@@ -2596,9 +2596,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();
@@ -2620,6 +2617,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 = {}) {
@@ -2708,8 +2706,10 @@ var QueryBuilder = class QueryBuilder extends Inference$1 {
 	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",
@@ -2772,7 +2772,7 @@ var QueryBuilder = class QueryBuilder extends Inference$1 {
 					"clearWhere",
 					"clearHaving",
 					"clearGroup"
-				].includes(prop)) return (...args) => {
+				].includes(prop) && !skipReturning) return (...args) => {
 					target.connector[prop](...args);
 					return target.asProxy();
 				};
@@ -2829,7 +2829,7 @@ var QueryBuilder = class QueryBuilder extends Inference$1 {
 		} 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) {
@@ -3068,14 +3068,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 = {};
@@ -3085,6 +3086,7 @@ var Model = class Model extends BaseModel {
 	eagerLoad = {};
 	exists = false;
 	with = [];
+	name;
 	trx = null;
 	constructor(attributes = {}) {
 		super();
@@ -3856,8 +3858,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);
 	}
@@ -4033,7 +4035,9 @@ var Builder = class Builder extends Inference {
 	}
 	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",
@@ -4096,7 +4100,7 @@ var Builder = class Builder extends Inference {
 				"clearWhere",
 				"clearHaving",
 				"clearGroup"
-			].includes(prop)) return (...args) => {
+			].includes(prop) && !skipReturning) return (...args) => {
 				target.query[prop](...args);
 				return target.asProxy();
 			};

package/dist/migrations/index.cjs

@@ -55,8 +55,6 @@ let escalade_sync = require("escalade/sync");
 escalade_sync = __toESM(escalade_sync);
 let resolve_from = require("resolve-from");
 resolve_from = __toESM(resolve_from);
-let node_fs = require("node:fs");
-node_fs = __toESM(node_fs);
 let node_path = require("node:path");
 node_path = __toESM(node_path);
 let node_url = require("node:url");
@@ -2384,8 +2382,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);
 	}
@@ -2424,7 +2422,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() + ".*"];
@@ -2702,9 +2700,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();
@@ -2726,6 +2721,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 = {}) {
@@ -2814,8 +2810,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",
@@ -2878,7 +2876,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();
 				};
@@ -2935,7 +2933,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) {
@@ -3174,14 +3172,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 = {};
@@ -3191,6 +3190,7 @@ var Model = class Model extends BaseModel {
 	eagerLoad = {};
 	exists = false;
 	with = [];
+	name;
 	trx = null;
 	constructor(attributes = {}) {
 		super();
@@ -3962,8 +3962,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);
 	}
@@ -4139,7 +4139,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",
@@ -4202,7 +4204,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();
 			};
@@ -5034,13 +5036,13 @@ var Migrator = class {
 	async runUp(file, batch, _pretend) {
 		const migration = await this.resolvePath(file);
 		const name = this.getMigrationName(file);
-		await this.taskRunner(name, () => this.runMigration(migration, "up"));
+		await __h3ravel_shared.TaskManager.taskRunner(name, () => this.runMigration(migration, "up"));
 		await this.repository.log(name, batch);
 	}
 	async runDown(file, migration, _pretend) {
 		const instance = await this.resolvePath(file);
 		const name = this.getMigrationName(file);
-		await this.taskRunner(name, () => this.runMigration(instance, "down"));
+		await __h3ravel_shared.TaskManager.taskRunner(name, () => this.runMigration(instance, "down"));
 		await this.repository.delete(migration);
 	}
 	async rollback(paths = [], options = {}) {
@@ -5091,7 +5093,7 @@ var Migrator = class {
 		const inspector = SchemaInspector.inspect(connection);
 		await connection.raw("SET foreign_key_checks = 0");
 		/** Drop all existing tables */
-		for (const table of await inspector.tables()) this.taskRunner(`Dropping ${__h3ravel_shared.Logger.parse([[table, "grey"]], "", false)} table`, () => connection.schema.dropTableIfExists(table));
+		for (const table of await inspector.tables()) await __h3ravel_shared.TaskManager.taskRunner(`Dropping ${__h3ravel_shared.Logger.parse([[table, "grey"]], "", false)} table`, () => connection.schema.dropTableIfExists(table));
 		await connection.raw("SET foreign_key_checks = 1");
 		/** Create the migration repository */
 		await this.repository.createRepository();
@@ -5172,17 +5174,6 @@ var Migrator = class {
 	write(...args) {
 		if (this.output) console.log(...args);
 	}
-	async taskRunner(description, task) {
-		const startTime = process.hrtime();
-		let result = false;
-		try {
-			result = await Promise.all([(task || (() => true))()].flat());
-		} finally {
-			const endTime = process.hrtime(startTime);
-			const duration = (endTime[0] * 1e9 + endTime[1]) / 1e6;
-			__h3ravel_shared.Logger.twoColumnLog(__h3ravel_shared.Logger.parse([[description, "green"]], "", false), [__h3ravel_shared.Logger.parse([[`${Math.floor(duration)}ms`, "gray"]], "", false), __h3ravel_shared.Logger.parse([[result !== false ? "✔" : "✘", result !== false ? "green" : "red"]], "", false)].join(" "));
-		}
-	}
 };
 var migrator_default = Migrator;
 
@@ -5411,10 +5402,10 @@ var MigrationCreator = class {
 	* @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.default.dirname(filePath));
-		await node_fs_promises.default.writeFile(filePath, this.populateStub(stub, table));
+		await (0, node_fs_promises.writeFile)(filePath, this.populateStub(stub, table));
 		await this.firePostCreateHooks(table, filePath);
 		return filePath;
 	}
@@ -5425,29 +5416,29 @@ var MigrationCreator = class {
 	* @param callback 
 	*/
 	async publish(dir, callback) {
-		const migrationFiles = await node_fs_promises.default.readdir(this.customStubPath ?? "");
+		const migrationFiles = await (0, node_fs_promises.readdir)(this.customStubPath ?? "");
 		await this.ensureDirectoryExists(dir);
 		for (const migrationFile of migrationFiles) {
 			const sourceFilePath = path.default.join(this.customStubPath ?? "", migrationFile);
 			const destinationFilePath = path.default.join(dir, migrationFile);
-			await node_fs_promises.default.copyFile(sourceFilePath, destinationFilePath);
+			await (0, node_fs_promises.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.default.join(this.customStubPath ?? "", `migration-${this.type}.stub`);
 			console.log("\n", customPath, "---");
-			stub = (0, node_fs.existsSync)(customPath) ? customPath : this.stubPath(`/migration-${this.type}.stub`);
+			stub = await __h3ravel_shared.FileSystem.fileExists(customPath) ? customPath : this.stubPath(`/migration-${this.type}.stub`);
 		} else if (create) {
 			const customPath = path.default.join(this.customStubPath ?? "", `migration.create-${this.type}.stub`);
-			stub = (0, node_fs.existsSync)(customPath) ? customPath : this.stubPath(`/migration.create-${this.type}.stub`);
+			stub = await __h3ravel_shared.FileSystem.fileExists(customPath) ? customPath : this.stubPath(`/migration.create-${this.type}.stub`);
 		} else {
 			const customPath = path.default.join(this.customStubPath ?? "", `migration.update-${this.type}.stub`);
-			stub = (0, node_fs.existsSync)(customPath) ? customPath : this.stubPath(`/migration.update-${this.type}.stub`);
+			stub = await __h3ravel_shared.FileSystem.fileExists(customPath) ? customPath : this.stubPath(`/migration.update-${this.type}.stub`);
 		}
-		return (0, node_fs.readFileSync)(stub, "utf-8");
+		return await (0, node_fs_promises.readFile)(stub, "utf-8");
 	}
 	populateStub(stub, table) {
 		if (table !== null) stub = stub.replace(/DummyTable|{{\s*table\s*}}/g, table);
@@ -5467,7 +5458,7 @@ var MigrationCreator = class {
 		this.postCreate.push(callback);
 	}
 	async ensureDirectoryExists(dir) {
-		await node_fs_promises.default.mkdir(dir, { recursive: true });
+		await (0, node_fs_promises.mkdir)(dir, { recursive: true });
 	}
 	stubPath(stub = "") {
 		const __dirname$1 = this.getDirname({});