@h3ravel/arquebus 2.0.0 → 3.0.0

package/dist/concerns/index.js

@@ -1,11 +1,11 @@
-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";
-import collect$1, { Collection, collect } from "collect.js";
+import { Arr, Obj, Str, data_get, data_set } from "@h3ravel/support";
+import * as dayjsModule from "dayjs";
+import * as advancedFormatModule from "dayjs/plugin/advancedFormat.js";
+import { Collection, collect } from "@h3ravel/collect.js";
 import Knex$1 from "knex";
 import path from "path";
 import { existsSync } from "fs";
-import { FileSystem } from "@h3ravel/shared";
+import { FileSystem, importFile } from "@h3ravel/shared";
 import pluralize from "pluralize";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -94,25 +94,29 @@ function compose$1(Base, ...mixins) {
 	}, Base);
 }
 //#endregion
-//#region src/utils.ts
+//#region src/dayjs.ts
+const dayjs = dayjsModule.default ?? dayjsModule;
+const advancedFormat = advancedFormatModule.default ?? advancedFormatModule;
 dayjs.extend(advancedFormat);
+//#endregion
+//#region src/utils.ts
 const getRelationName = (relationMethod) => {
-	return snake(relationMethod.substring(8));
+	return Str.snake(relationMethod.substring(8));
 };
 const getRelationMethod = (relation) => {
-	return camel(`relation_${relation}`);
+	return Str.camel(`relation_${relation}`);
 };
 const getScopeMethod = (scope) => {
-	return camel(`scope_${scope}`);
+	return Str.camel(`scope_${scope}`);
 };
 const getAttrMethod = (attr) => {
-	return camel(`attribute_${attr}`);
+	return Str.camel(`attribute_${attr}`);
 };
 const getGetterMethod = (attr) => {
-	return camel(`get_${attr}_attribute`);
+	return Str.camel(`get_${attr}_attribute`);
 };
 const getSetterMethod = (attr) => {
-	return camel(`set_${attr}_attribute`);
+	return Str.camel(`set_${attr}_attribute`);
 };
 /**
 * Tap into a model a collection instance
@@ -126,8 +130,9 @@ const tap = (instance, callback) => {
 	return result instanceof Promise ? result.then(() => instance) : instance;
 };
 const { compose } = mixin_exports;
+const flatten = (arr) => arr.flat();
 const flattenDeep = (arr) => Array.isArray(arr) ? arr.reduce((a, b) => a.concat(flattenDeep(b)), []) : [arr];
-const snakeCase = (str) => trim(snake(str.replace(/[^a-zA-Z0-9_-]/g, "-")), "_-");
+const snakeCase = (str) => Str.trim(Str.snake(str.replace(/[^a-zA-Z0-9_-]/g, "-")), "_-").replace(/_+/g, "_");
 //#endregion
 //#region src/casts-attributes.ts
 var CastsAttributes = class CastsAttributes {
@@ -161,8 +166,7 @@ const HasAttributes$1 = (Model) => {
 			return this;
 		}
 		normalizeCastClassResponse(key, value) {
-			var _value$constructor;
-			return (value === null || value === void 0 || (_value$constructor = value.constructor) === null || _value$constructor === void 0 ? void 0 : _value$constructor.name) === "Object" ? value : { [key]: value };
+			return value?.constructor?.name === "Object" ? value : { [key]: value };
 		}
 		syncOriginal() {
 			this.original = this.getAttributes();
@@ -272,9 +276,9 @@ const HasAttributes$1 = (Model) => {
 					return null;
 				}
 				case "collection": try {
-					return collect$1(JSON.parse(value));
+					return collect(JSON.parse(value));
 				} catch {
-					return collect$1([]);
+					return collect([]);
 				}
 				case "date": return this.asDate(value);
 				case "datetime":
@@ -287,8 +291,8 @@ const HasAttributes$1 = (Model) => {
 		attributesToData() {
 			let attributes = { ...this.attributes };
 			for (const key in attributes) {
-				if (this.hidden.includes(key)) attributes = omit(attributes, [key]);
-				if (this.visible.length > 0 && this.visible.includes(key) === false) attributes = omit(attributes, [key]);
+				if (this.hidden.includes(key)) attributes = Arr.except(attributes, [key]);
+				if (this.visible.length > 0 && this.visible.includes(key) === false) attributes = Arr.except(attributes, [key]);
 			}
 			for (const key of this.getDates()) {
 				if (attributes[key] === void 0) continue;
@@ -343,7 +347,7 @@ const HasAttributes$1 = (Model) => {
 		}
 		hasCast(key, types = []) {
 			if (key in this.casts) {
-				types = flat(types);
+				types = flatten(types);
 				return types.length > 0 ? types.includes(this.getCastType(key)) : true;
 			}
 			return false;
@@ -403,7 +407,7 @@ var ModelNotFoundError = class extends BaseError {
 	}
 	setModel(model, ids = []) {
 		this.model = model;
-		this.ids = isArray(ids) ? ids : [ids];
+		this.ids = Array.isArray(ids) ? ids : [ids];
 		this.message = `No query results for model [${model}]`;
 		if (this.ids.length > 0) this.message += " " + this.ids.join(", ");
 		else this.message += ".";
@@ -435,10 +439,14 @@ const HasGlobalScopes$1 = (Model) => {
 		static globalScopes;
 		static addGlobalScope(scope, implementation = null) {
 			if (typeof scope === "string" && implementation instanceof Scope) {
-				this.globalScopes = set(this.globalScopes ?? {}, this.name + "." + scope, implementation);
+				const scopes = this.globalScopes ?? {};
+				data_set(scopes, this.name + "." + scope, implementation);
+				this.globalScopes = scopes;
 				return implementation;
 			} else if (scope instanceof Scope) {
-				this.globalScopes = set(this.globalScopes ?? {}, this.name + "." + scope.constructor.name, scope);
+				const scopes = this.globalScopes ?? {};
+				data_set(scopes, this.name + "." + scope.constructor.name, scope);
+				this.globalScopes = scopes;
 				return scope;
 			}
 			throw new InvalidArgumentError("Global scope must be an instance of Scope.");
@@ -447,8 +455,8 @@ const HasGlobalScopes$1 = (Model) => {
 			return this.getGlobalScope(scope) !== null;
 		}
 		static getGlobalScope(scope) {
-			if (typeof scope === "string") return get(this.globalScopes, this.name + "." + scope);
-			return get(this.globalScopes, this.name + "." + scope.constructor.name);
+			if (typeof scope === "string") return data_get(this.globalScopes ?? {}, this.name + "." + scope);
+			return data_get(this.globalScopes ?? {}, this.name + "." + scope.constructor.name);
 		}
 		static getAllGlobalScopes() {
 			return this.globalScopes;
@@ -457,7 +465,7 @@ const HasGlobalScopes$1 = (Model) => {
 			this.globalScopes = scopes;
 		}
 		getGlobalScopes() {
-			return get(this.constructor.globalScopes, this.constructor.name, {});
+			return data_get(this.constructor.globalScopes ?? {}, this.constructor.name, {});
 		}
 	};
 };
@@ -541,7 +549,7 @@ const HasHooks$1 = (Model) => {
 };
 //#endregion
 //#region src/collection.ts
-var Collection$1 = class Collection$1 extends Collection {
+var Collection$1 = class extends Collection {
 	newConstructor(...args) {
 		return new (this.getConstructor())(...args);
 	}
@@ -550,17 +558,18 @@ var Collection$1 = class Collection$1 extends Collection {
 	}
 	async load(...relations) {
 		if (this.isNotEmpty()) {
-			const items = await this.first().constructor.query().with(...relations).eagerLoadRelations(this.items);
+			const items = await this.first().constructor.query().with(...relations).eagerLoadRelations(this.all());
 			return this.newConstructor(items);
 		}
 		return this;
 	}
 	async loadAggregate(relations, column, action = null) {
 		if (this.isEmpty()) return this;
-		const models = (await this.first().newModelQuery().whereIn(this.first().getKeyName(), this.modelKeys()).select(this.first().getKeyName()).withAggregate(relations, column, action).get()).keyBy(this.first().getKeyName());
-		const attributes = diff(Object.keys(models.first().getAttributes()), [models.first().getKeyName()]);
+		const first = this.first();
+		const models = (await first.newModelQuery().whereIn(first.getKeyName(), this.modelKeys()).select(first.getKeyName()).withAggregate(relations, column, action).get()).keyBy(first.getKeyName());
+		const attributes = collect(Object.keys(models.first().getAttributes())).diff([models.first().getKeyName()]).all();
 		this.each((model) => {
-			const extraAttributes = pick(models.get(model.getKey()).getAttributes(), attributes);
+			const extraAttributes = Arr.select(models.get(model.getKey()).getAttributes(), attributes);
 			model.fill(extraAttributes).syncOriginalAttributes(...attributes);
 		});
 		return this;
@@ -598,20 +607,21 @@ var Collection$1 = class Collection$1 extends Collection {
 	diff(items) {
 		const diff = new this.constructor();
 		const dictionary = this.getDictionary(items);
-		this.items.map((item) => {
+		this.all().map((item) => {
 			if (dictionary[item.getKey()] === void 0) diff.add(item);
 		});
 		return diff;
 	}
-	except(keys) {
-		const dictionary = omit(this.getDictionary(), keys);
+	except(...keys) {
+		const values = keys.length === 1 && Array.isArray(keys[0]) ? keys[0].map(String) : keys.map(String);
+		const dictionary = Arr.except(this.getDictionary(), values);
 		return new this.constructor(Object.values(dictionary));
 	}
 	intersect(items) {
 		const intersect = new this.constructor();
-		if (isEmpty(items)) return intersect;
+		if (Arr.isEmpty(items)) return intersect;
 		const dictionary = this.getDictionary(items);
-		for (const item of this.items) if (dictionary[item.getKey()] !== void 0) intersect.add(item);
+		for (const item of this.all()) if (dictionary[item.getKey()] !== void 0) intersect.add(item);
 		return intersect;
 	}
 	unique(key, _strict = false) {
@@ -620,20 +630,21 @@ var Collection$1 = class Collection$1 extends Collection {
 	}
 	find(key, defaultValue = null) {
 		if (key instanceof Model) key = key.getKey();
-		if (isArray(key)) {
+		if (Array.isArray(key)) {
 			if (this.isEmpty()) return new this.constructor();
 			return this.whereIn(this.first().getKeyName(), key);
 		}
-		collect(this.items).first((model) => {
+		collect(this.all()).first((model) => {
 			return model.getKey() == key;
 		});
-		return this.items.filter((model) => {
+		return this.all().filter((model) => {
 			return model.getKey() == key;
 		})[0] || defaultValue;
 	}
 	async fresh(...args) {
 		if (this.isEmpty()) return new this.constructor();
 		const model = this.first();
+		if (!model) return new this.constructor();
 		const freshModels = (await model.newQuery().with(...args).whereIn(model.getKeyName(), this.modelKeys()).get()).getDictionary();
 		return this.filter((model) => {
 			return model.exists && freshModels[model.getKey()] !== void 0;
@@ -656,15 +667,15 @@ var Collection$1 = class Collection$1 extends Collection {
 			item.append(attributes);
 		});
 	}
-	only(keys) {
-		if (keys === null) return new Collection$1(this.items);
-		const dictionary = pick(this.getDictionary(), keys);
+	only(...keys) {
+		const values = keys.length === 1 && Array.isArray(keys[0]) ? keys[0].map(String) : keys.map(String);
+		const dictionary = Arr.select(this.getDictionary(), values);
 		return new this.constructor(Object.values(dictionary));
 	}
 	getDictionary(items) {
-		items = !items ? this.items : items;
+		const values = !items ? this.all() : items instanceof Collection ? items.all() : items;
 		const dictionary = {};
-		items.map((value) => {
+		values.map((value) => {
 			dictionary[value.getKey()] = value;
 		});
 		return dictionary;
@@ -688,8 +699,8 @@ var Collection$1 = class Collection$1 extends Collection {
 		return JSON.stringify(this.toData(), ...args);
 	}
 	[Symbol.iterator] = () => {
-		const items = this.items;
-		const length = this.items.length;
+		const items = this.all();
+		const length = items.length;
 		let n = 0;
 		return { next() {
 			return n < length ? {
@@ -736,12 +747,12 @@ const InteractsWithPivotTable = (Relation) => {
 			let records;
 			const results = await this.getCurrentlyAttachedPivots();
 			const current = results.length === 0 ? [] : results.map((result) => result.toData()).pluck(this.relatedPivotKey).all().map((i) => String(i));
-			const detach = diff(current, Object.keys(records = this.formatRecordsList(this.parseIds(ids))));
+			const detach = collect(current).diff(Object.keys(records = this.formatRecordsList(this.parseIds(ids)))).all();
 			if (detaching && detach.length > 0) {
 				await this.detach(detach);
 				changes.detached = this.castKeys(detach);
 			}
-			changes = assign(changes, await this.attachNew(records, current, false));
+			changes = Obj.deepMerge(changes, await this.attachNew(records, current, false));
 			return changes;
 		}
 		syncWithoutDetaching(ids) {
@@ -749,11 +760,11 @@ const InteractsWithPivotTable = (Relation) => {
 		}
 		syncWithPivotValues(ids, values, detaching = true) {
 			return this.sync(collect(this.parseIds(ids)).mapWithKeys((id) => {
-				return [id, values];
+				return [String(id), values];
 			}), detaching);
 		}
 		withPivot(columns) {
-			this.pivotColumns = this.pivotColumns.concat(isArray(columns) ? columns : Array.prototype.slice.call(columns));
+			this.pivotColumns = this.pivotColumns.concat(Array.isArray(columns) ? columns : Array.prototype.slice.call(columns));
 			return this;
 		}
 		async attachNew(records, current, touch = true) {
@@ -790,8 +801,8 @@ const InteractsWithPivotTable = (Relation) => {
 		}
 		formatRecordsList(records) {
 			return collect(records).mapWithKeys((attributes, id) => {
-				if (!isArray(attributes)) [id, attributes] = [attributes, {}];
-				return [id, attributes];
+				if (!Array.isArray(attributes)) [id, attributes] = [attributes, {}];
+				return [String(id), attributes];
 			}).all();
 		}
 		async getCurrentlyAttachedPivots() {
@@ -861,7 +872,7 @@ const InteractsWithPivotTable = (Relation) => {
 		}
 		formatAttachRecord(key, value, attributes, hasTimestamps) {
 			const [id, newAttributes] = this.extractAttachIdAndAttributes(key, value, attributes);
-			return assign(this.baseAttachRecord(id, hasTimestamps), newAttributes);
+			return Obj.deepMerge(this.baseAttachRecord(id, hasTimestamps), newAttributes);
 		}
 		baseAttachRecord(id, timed) {
 			let record = {};
@@ -874,7 +885,7 @@ const InteractsWithPivotTable = (Relation) => {
 			return record;
 		}
 		extractAttachIdAndAttributes(key, value, newAttributes) {
-			return isArray(value) ? [key, {
+			return Array.isArray(value) ? [key, {
 				...value,
 				...newAttributes
 			}] : [value, newAttributes];
@@ -885,7 +896,7 @@ const InteractsWithPivotTable = (Relation) => {
 		parseIds(value) {
 			if (value instanceof Model) return [value[this.relatedKey]];
 			if (value instanceof Collection$1) return value.pluck(this.relatedKey).all();
-			return isArray(value) ? value : [value];
+			return Array.isArray(value) ? value : [value];
 		}
 	};
 };
@@ -975,8 +986,7 @@ var Relation = class {
 		return this.parent.getQualifiedKeyName();
 	}
 	getExistenceCompareKey() {
-		var _this$getQualifiedFor;
-		return (_this$getQualifiedFor = this.getQualifiedForeignKeyName) === null || _this$getQualifiedFor === void 0 ? void 0 : _this$getQualifiedFor.call(this);
+		return this.getQualifiedForeignKeyName?.();
 	}
 };
 //#endregion
@@ -1035,9 +1045,8 @@ var BelongsToMany = class extends compose(Relation, InteractsWithPivotTable) {
 		return this;
 	}
 	async get(columns) {
-		var _builder$query;
 		const builder = this.query.applyScopes();
-		columns = ((_builder$query = builder.query) === null || _builder$query === void 0 || (_builder$query = _builder$query._statements) === null || _builder$query === void 0 ? void 0 : _builder$query.find((item) => item.grouping == "columns")) ? [] : columns;
+		columns = builder.query?._statements?.find((item) => item.grouping == "columns") ? [] : columns;
 		let models = await builder.select(this.shouldSelect(columns)).getModels();
 		this.hydratePivotRelation(models);
 		if (models.length > 0) models = await builder.eagerLoadRelations(models);
@@ -1086,7 +1095,7 @@ var BelongsToMany = class extends compose(Relation, InteractsWithPivotTable) {
 			const value = model.attributes[key];
 			if (key.startsWith("pivot_")) {
 				values[key.substring(6)] = value;
-				model.attributes = omit(model.attributes, [key]);
+				model.attributes = Arr.except(model.attributes, [key]);
 			}
 		}
 		return values;
@@ -1097,7 +1106,7 @@ var BelongsToMany = class extends compose(Relation, InteractsWithPivotTable) {
 		return this.withPivot(this.createdAt(), this.updatedAt());
 	}
 	shouldSelect(columns = ["*"]) {
-		if (isEqual(columns, ["*"])) columns = [this.related.getTable() + ".*"];
+		if (columns.length === 1 && columns[0] === "*") columns = [this.related.getTable() + ".*"];
 		return columns.concat(this.aliasedPivotColumns());
 	}
 	aliasedPivotColumns() {
@@ -1309,9 +1318,8 @@ 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";
+			const skipReturning = !!target.query.connector?.client.config?.client?.includes("mysql") && prop === "returning";
 			if ([
 				"select",
 				"from",
@@ -1405,7 +1413,7 @@ var Builder = class Builder extends Inference$1 {
 					};
 				}
 				if (prop.startsWith("where")) {
-					const column = snake(prop.substring(5));
+					const column = Str.snake(prop.substring(5));
 					return (...args) => {
 						target.query.where(column, ...args);
 						return target.asProxy();
@@ -1480,7 +1488,8 @@ var Builder = class Builder extends Inference$1 {
 	}
 	addUpdatedAtColumn(values) {
 		if (!this.model.usesTimestamps() || this.model.getUpdatedAtColumn() === null) return values;
-		values = assign({ [this.model.getUpdatedAtColumn()]: this.model.freshTimestampString() }, values);
+		const column = this.model.getUpdatedAtColumn();
+		values = Obj.deepMerge({ [column]: this.model.freshTimestampString() }, values);
 		return values;
 	}
 	delete() {
@@ -1508,9 +1517,8 @@ var Builder = class Builder extends Inference$1 {
 		return this.model;
 	}
 	setModel(model) {
-		var _this$query;
 		this.model = model;
-		if (typeof ((_this$query = this.query) === null || _this$query === void 0 || (_this$query = _this$query.client) === null || _this$query === void 0 ? void 0 : _this$query.table) == "function") this.query = this.query.client.table(this.model.getTable());
+		if (typeof this.query?.client?.table == "function") this.query = this.query.client.table(this.model.getTable());
 		else this.query = this.query.table(this.model.getTable());
 		return this;
 	}
@@ -1553,7 +1561,7 @@ var Builder = class Builder extends Inference$1 {
 	}
 	withoutGlobalScope(scope) {
 		if (typeof scope !== "string") scope = scope.constructor.name;
-		this.globalScopes = omit(this.globalScopes, [scope]);
+		this.globalScopes = Arr.except(this.globalScopes, [scope]);
 		return this;
 	}
 	macro(name, callback) {
@@ -1570,7 +1578,7 @@ var Builder = class Builder extends Inference$1 {
 		let eagerLoads = {};
 		if (typeof args[1] === "function") {
 			const eagerLoad = this.parseWithRelations({ [args[0]]: args[1] });
-			this.eagerLoad = assign(this.eagerLoad, eagerLoad);
+			this.eagerLoad = Obj.deepMerge(this.eagerLoad, eagerLoad);
 			return this;
 		}
 		const relations = flattenDeep(args);
@@ -1579,13 +1587,13 @@ var Builder = class Builder extends Inference$1 {
 			let eagerLoad;
 			if (typeof relation === "string") eagerLoad = { [relation]: (q) => q };
 			else if (typeof relation === "object") eagerLoad = relation;
-			eagerLoads = assign(eagerLoads, eagerLoad);
+			eagerLoads = Obj.deepMerge(eagerLoads, eagerLoad);
 		}
-		this.eagerLoad = assign(this.eagerLoad, this.parseWithRelations(eagerLoads));
+		this.eagerLoad = Obj.deepMerge(this.eagerLoad, this.parseWithRelations(eagerLoads));
 		return this;
 	}
 	has(relation, operator = ">=", count = 1, boolean = "and", callback = null) {
-		if (isString(relation)) {
+		if (typeof relation === "string") {
 			if (relation.includes(".")) return this.hasNested(relation, operator, count, boolean, callback);
 			relation = this.getRelationWithoutConstraints(getRelationMethod(relation));
 		}
@@ -1662,7 +1670,7 @@ var Builder = class Builder extends Inference$1 {
 			let eagerLoad;
 			if (typeof relation === "string") eagerLoad = { [relation]: (q) => q };
 			else if (typeof relation === "object") eagerLoad = relation;
-			eagerLoads = assign(eagerLoads, eagerLoad);
+			eagerLoads = Obj.deepMerge(eagerLoads, eagerLoad);
 		}
 		relations = eagerLoads;
 		const db = this.model.getConnection();
@@ -1681,7 +1689,7 @@ var Builder = class Builder extends Inference$1 {
 			} else expression = column;
 			const query = relation.getRelationExistenceQuery(relation.getRelated().newModelQuery(), this, db.raw(expression));
 			constraints(query);
-			alias = alias || snake(`${name} ${action} ${column}`.replace("/[^[:alnum:][:space:]_]/u", ""));
+			alias = alias || Str.snake(`${name} ${action} ${column}`.replace("/[^[:alnum:][:space:]_]/u", ""));
 			if (action === "exists") this.select(db.raw(`exists(${query.toSql().sql}) as ${alias}`));
 			else this.selectSub(action ? query : query.limit(1), alias);
 		}
@@ -1705,7 +1713,7 @@ var Builder = class Builder extends Inference$1 {
 	}
 	parseSub(query) {
 		if (query instanceof Builder || query instanceof Relation) return [query.toSql().sql, query.toSql().bindings];
-		else if (isString(query)) return [query, []];
+		else if (typeof query === "string") return [query, []];
 		else throw new Error("A subquery must be a query builder instance, a Closure, or a string.");
 	}
 	prependDatabaseNameIfCrossDatabaseQuery(query) {
@@ -1762,15 +1770,15 @@ var Builder = class Builder extends Inference$1 {
 		if (prefix !== "") prefix += ".";
 		for (const key in relations) {
 			const value = relations[key];
-			if (isString(value) || Number.isFinite(parseInt(value))) continue;
+			if (typeof value === "string" || Number.isFinite(parseInt(value))) continue;
 			const [attribute, attributeSelectConstraint] = this.parseNameAndAttributeSelectionConstraint(key, value);
 			preparedRelationships = Object.assign({}, preparedRelationships, { [`${prefix}${attribute}`]: attributeSelectConstraint }, this.prepareNestedWithRelationships(value, `${prefix}${attribute}`));
-			relations = omit(relations, [key]);
+			relations = Arr.except(relations, [key]);
 		}
 		for (const key in relations) {
 			const value = relations[key];
 			let attribute = key, attributeSelectConstraint = value;
-			if (isString(value)) [attribute, attributeSelectConstraint] = this.parseNameAndAttributeSelectionConstraint(value);
+			if (typeof value === "string") [attribute, attributeSelectConstraint] = this.parseNameAndAttributeSelectionConstraint(value);
 			preparedRelationships[`${prefix}${attribute}`] = this.combineConstraints([attributeSelectConstraint, preparedRelationships[`${prefix}${attribute}`] || (() => {})]);
 		}
 		return preparedRelationships;
@@ -1818,8 +1826,8 @@ var Builder = class Builder extends Inference$1 {
 	}
 	async findOrFail(...args) {
 		const data = await this.find(...args);
-		if (isArray(args[0])) {
-			if (data.count() !== args[0].length) throw new ModelNotFoundError().setModel(this.model.constructor.name, diff(args[0], data.modelKeys()));
+		if (Array.isArray(args[0])) {
+			if (data.count() !== args[0].length) throw new ModelNotFoundError().setModel(this.model.constructor.name, collect(args[0]).diff(data.modelKeys()).all());
 			return data;
 		}
 		if (data === null) throw new ModelNotFoundError().setModel(this.model.constructor.name, args[0]);
@@ -1833,12 +1841,12 @@ var Builder = class Builder extends Inference$1 {
 	async firstOrNew(attributes = {}, values = {}) {
 		const instance = await this.where(attributes).first();
 		if (instance !== null) return instance;
-		return this.newModelInstance(assign(attributes, values));
+		return this.newModelInstance(Obj.deepMerge(attributes, values));
 	}
 	async firstOrCreate(attributes = {}, values = {}) {
 		const instance = await this.where(attributes).first();
 		if (instance !== null) return instance;
-		return tap(this.newModelInstance(assign(attributes, values)), async (instance) => {
+		return tap(this.newModelInstance(Obj.deepMerge(attributes, values)), async (instance) => {
 			await instance.save({ client: this.query });
 		});
 	}
@@ -1858,14 +1866,13 @@ var Builder = class Builder extends Inference$1 {
 		return this;
 	}
 	async find(id, columns) {
-		if (isArray(id) || id instanceof Collection$1) return await this.findMany(id, columns);
+		if (Array.isArray(id) || id instanceof Collection$1) return await this.findMany(id, columns);
 		return await this.where(this.model.getKeyName(), id).first(columns);
 	}
 	async findMany(ids, columns = ["*"]) {
-		if (ids instanceof Collection$1) ids = ids.modelKeys();
-		ids = isArray(ids) ? ids : [ids];
-		if (ids.length === 0) return new Collection$1([]);
-		return await this.whereIn(this.model.getKeyName(), ids).get(columns);
+		const values = ids instanceof Collection$1 ? ids.modelKeys() : Array.isArray(ids) ? ids : [ids];
+		if (values.length === 0) return new Collection$1([]);
+		return await this.whereIn(this.model.getKeyName(), values).get(columns);
 	}
 	async pluck(column) {
 		return new Collection$1(await this.query.pluck(column));
@@ -1873,7 +1880,7 @@ var Builder = class Builder extends Inference$1 {
 	async destroy(ids) {
 		if (ids instanceof Collection$1) ids = ids.modelKeys();
 		if (ids instanceof Collection) ids = ids.all();
-		ids = isArray(ids) ? ids : Array.prototype.slice.call(ids);
+		ids = Array.isArray(ids) ? ids : Array.prototype.slice.call(ids);
 		if (ids.length === 0) return 0;
 		const key = this.model.newInstance().getKeyName();
 		let count = 0;
@@ -1891,12 +1898,11 @@ var Builder = class Builder extends Inference$1 {
 		return await this.model.newModelQuery().get(columns);
 	}
 	async paginate(page = 1, perPage = 10) {
-		var _this;
 		page = page || 1;
-		perPage = perPage || ((_this = this) === null || _this === void 0 || (_this = _this.model) === null || _this === void 0 ? void 0 : _this.perPage) || 15;
+		perPage = perPage || this?.model?.perPage || 15;
 		this.applyScopes();
 		const total = await this.query.clone().clearOrder().clearSelect().count(this.primaryKey);
-		let results = [];
+		let results;
 		if (total > 0) {
 			const skip = (page - 1) * (perPage ?? 10);
 			this.take(perPage).skip(skip);
@@ -1906,7 +1912,7 @@ var Builder = class Builder extends Inference$1 {
 		return new Paginator(results, parseInt(total), perPage, page);
 	}
 	async getModels(...columns) {
-		columns = flat(columns);
+		columns = flatten(columns);
 		if (columns.length > 0) {
 			if (this.query._statements.filter((item) => item.grouping == "columns").length == 0 && columns[0] !== "*") this.query.select(...columns);
 		}
@@ -1968,7 +1974,7 @@ const HasOneOrMany = (Relation) => {
 		}
 		buildDictionary(results) {
 			const foreign = this.getForeignKeyName();
-			return collect$1(results).mapToDictionary((result) => [result[foreign], result]).all();
+			return collect(results).mapToDictionary((result) => [result[foreign], result]).all();
 		}
 		async save(model) {
 			this.setForeignAttributesForCreate(model);
@@ -2039,9 +2045,7 @@ var HasMany = class extends compose(Relation, HasOneOrMany) {
 		return this.getParentKey() !== null ? await this.query.get() : new Collection$1([]);
 	}
 	getForeignKeyName() {
-		var _this$foreignKey;
-		const segments = (_this$foreignKey = this.foreignKey) === null || _this$foreignKey === void 0 ? void 0 : _this$foreignKey.split(".");
-		return segments === null || segments === void 0 ? void 0 : segments.pop();
+		return (this.foreignKey?.split("."))?.pop();
 	}
 	buildDictionary(results) {
 		const foreign = this.getForeignKeyName();
@@ -2094,9 +2098,7 @@ var HasOne = class extends compose(Relation, HasOneOrMany, SupportsDefaultModels
 		return this.matchOneOrMany(models, results, relation, "one");
 	}
 	getForeignKeyName() {
-		var _this$foreignKey;
-		const segments = (_this$foreignKey = this.foreignKey) === null || _this$foreignKey === void 0 ? void 0 : _this$foreignKey.split(".");
-		return segments === null || segments === void 0 ? void 0 : segments.pop();
+		return (this.foreignKey?.split("."))?.pop();
 	}
 	async getResults() {
 		if (this.getParentKey() === null) return this.getDefaultFor(this.parent);
@@ -2165,7 +2167,7 @@ const HidesAttributes$1 = (Model) => {
 		makeVisible(...keys) {
 			const visible = flattenDeep(keys);
 			if (this.visible.length > 0) this.visible = [...this.visible, ...visible];
-			this.hidden = diff(this.hidden, visible);
+			this.hidden = collect(this.hidden).diff(visible).all();
 			return this;
 		}
 		makeHidden(key, ...keys) {
@@ -2253,10 +2255,9 @@ var QueryBuilder = class QueryBuilder extends Inference {
 	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";
+				const skipReturning = !!target.connector.client.config?.client?.includes("mysql") && prop === "returning";
 				if ([
 					"select",
 					"from",
@@ -2459,6 +2460,9 @@ var arquebus = class arquebus {
 		if (this.instance === null) this.instance = new arquebus();
 		return this.instance;
 	}
+	static withSchema() {
+		return this;
+	}
 	/**
 	* Initialize a new database connection
 	*
@@ -2548,12 +2552,12 @@ var arquebus = class arquebus {
 		const tsPath = path.resolve("arquebus.config.ts");
 		const instance = this.getInstance();
 		if (existsSync(jsPath)) {
-			config = (await import(jsPath)).default;
+			config = (await importFile(jsPath)).default;
 			if (addConnection) instance.addConnection(config, config.client);
 			return config;
 		}
 		if (existsSync(tsPath)) if (process.env.NODE_ENV !== "production") {
-			config = (await import(tsPath)).default;
+			config = (await importFile(tsPath)).default;
 			if (addConnection) instance.addConnection(config, config.client);
 			return config;
 		} else throw new Error("arquebus.config.ts found in production without build step");
@@ -2569,7 +2573,7 @@ var arquebus = class arquebus {
 				"cjs"
 			], dir);
 			if (found) if (!found.endsWith(".ts") || process.env.NODE_ENV !== "production") {
-				config = (await import(found)).default;
+				config = (await importFile(found)).default;
 				if (addConnection) instance.addConnection(config, config.client);
 				return config;
 			} else throw new Error("arquebus.config.ts found in production without build step");
@@ -2590,7 +2594,7 @@ var arquebus = class arquebus {
 	}
 	async destroyAll() {
 		await Promise.all(Object.values(this.manager).map((connection) => {
-			return connection === null || connection === void 0 ? void 0 : connection.destroy();
+			return connection?.destroy();
 		}));
 	}
 	createModel(name, options = {}) {
@@ -2599,29 +2603,25 @@ var arquebus = class arquebus {
 		this.models = {
 			...this.models,
 			[name]: class extends BaseModel {
-				table = (options === null || options === void 0 ? void 0 : options.table) ?? null;
-				connection = (options === null || options === void 0 ? void 0 : options.connection) ?? null;
-				timestamps = (options === null || options === void 0 ? void 0 : options.timestamps) ?? true;
-				primaryKey = (options === null || options === void 0 ? void 0 : options.primaryKey) ?? "id";
-				keyType = (options === null || options === void 0 ? void 0 : options.keyType) ?? "int";
-				incrementing = (options === null || options === void 0 ? void 0 : options.incrementing) ?? true;
-				with = (options === null || options === void 0 ? void 0 : options.with) ?? [];
-				casts = (options === null || options === void 0 ? void 0 : options.casts) ?? {};
-				static CREATED_AT = (options === null || options === void 0 ? void 0 : options.CREATED_AT) ?? "created_at";
-				static UPDATED_AT = (options === null || options === void 0 ? void 0 : options.UPDATED_AT) ?? "updated_at";
-				static DELETED_AT = (options === null || options === void 0 ? void 0 : options.DELETED_AT) ?? "deleted_at";
+				table = options?.table ?? null;
+				connection = options?.connection ?? null;
+				timestamps = options?.timestamps ?? true;
+				primaryKey = options?.primaryKey ?? "id";
+				keyType = options?.keyType ?? "int";
+				incrementing = options?.incrementing ?? true;
+				with = options?.with ?? [];
+				casts = options?.casts ?? {};
+				static CREATED_AT = options?.CREATED_AT ?? "created_at";
+				static UPDATED_AT = options?.UPDATED_AT ?? "updated_at";
+				static DELETED_AT = options?.DELETED_AT ?? "deleted_at";
 			}
 		};
 		if ("attributes" in options) for (const attribute in options.attributes) {
 			if (options.attributes[attribute] instanceof Attribute === false) throw new Error("Attribute must be an instance of \"Attribute\"");
-			this.models[name].prototype[getAttrMethod(attribute)] = () => {
-				var _options$attributes;
-				return (_options$attributes = options.attributes) === null || _options$attributes === void 0 ? void 0 : _options$attributes[attribute];
-			};
+			this.models[name].prototype[getAttrMethod(attribute)] = () => options.attributes?.[attribute];
 		}
 		if ("relations" in options) for (const relation in options.relations) this.models[name].prototype[getRelationMethod(relation)] = function() {
-			var _options$relations;
-			return (_options$relations = options.relations) === null || _options$relations === void 0 ? void 0 : _options$relations[relation](this);
+			return options.relations?.[relation](this);
 		};
 		if ("scopes" in options) for (const scope in options.scopes) this.models[name].prototype[getScopeMethod(scope)] = options.scopes[scope];
 		this.models[name].setConnectionResolver(this);
@@ -2659,6 +2659,9 @@ var Model = class Model extends BaseModel {
 		this.buildRelationships(attributes);
 		return this.asProxy();
 	}
+	static define() {
+		return this;
+	}
 	static query(trx = null) {
 		return new this().newQuery(trx);
 	}
@@ -2842,7 +2845,7 @@ var Model = class Model extends BaseModel {
 		});
 	}
 	toData() {
-		return assign(this.attributesToData(), this.relationsToData());
+		return Obj.deepMerge(this.attributesToData(), this.relationsToData());
 	}
 	toJSON() {
 		return this.toData();
@@ -2853,6 +2856,15 @@ var Model = class Model extends BaseModel {
 	toString() {
 		return this.toJson();
 	}
+	getAttributes() {
+		return super.getAttributes();
+	}
+	getAttribute(key) {
+		return super.getAttribute(key);
+	}
+	setAttribute(key, value) {
+		return super.setAttribute(key, value);
+	}
 	fill(attributes) {
 		for (const key in attributes) this.setAttribute(key, attributes[key]);
 		return this;
@@ -2893,10 +2905,9 @@ var Model = class Model extends BaseModel {
 			if (this.usesTimestamps()) this.updateTimestamps();
 			const attributes = this.getAttributes();
 			if (this.getIncrementing()) {
-				var _data$;
 				const keyName = this.getKeyName();
 				const data = await query.insert([attributes], [keyName]);
-				this.setAttribute(keyName, ((_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$[keyName]) || data[0]);
+				this.setAttribute(keyName, data[0]?.[keyName] || data[0]);
 			} else if (Object.keys(attributes).length > 0) await query.insert(attributes);
 			this.exists = true;
 			await this.execHooks("created", options);
@@ -2938,7 +2949,7 @@ var Model = class Model extends BaseModel {
 		if (!this.exists) return Promise.resolve(void 0);
 		const model = await this.constructor.query().where(this.getKeyName(), this.getKey()).first();
 		this.attributes = { ...model.attributes };
-		await this.load(collect$1(this.relations).reject((relation) => {
+		await this.load(collect(this.relations).reject((relation) => {
 			return relation instanceof Pivot;
 		}).keys().all());
 		this.syncOriginal();
@@ -3180,10 +3191,10 @@ var HasManyThrough = class extends Relation {
 		}
 		const model = await this.first(columns);
 		if (model) return model;
-		return callback === null || callback === void 0 ? void 0 : callback();
+		return callback?.();
 	}
 	async find(id, columns = ["*"]) {
-		if (isArray(id)) return await this.findMany(id, columns);
+		if (Array.isArray(id)) return await this.findMany(id, columns);
 		return await this.where(this.getRelated().getQualifiedKeyName(), "=", id).first(columns);
 	}
 	async findMany(ids, columns = ["*"]) {
@@ -3211,7 +3222,7 @@ var HasManyThrough = class extends Relation {
 		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() + ".*"];
+		if (columns?.at(0) == "*") columns = [this.related.getTable() + ".*"];
 		return [...columns, this.getQualifiedFirstKeyName() + " as laravel_through_key"];
 	}
 	async chunk(count, callback) {
@@ -3305,7 +3316,7 @@ const HasRelations$1 = (Model) => {
 			return this;
 		}
 		unsetRelation(relation) {
-			this.relations = omit(this.relations, [relation]);
+			this.relations = Arr.except(this.relations, [relation]);
 			return this;
 		}
 		relationLoaded(relation) {
@@ -3328,8 +3339,7 @@ const HasRelations$1 = (Model) => {
 			return data;
 		}
 		guessBelongsToRelation() {
-			var _e$stack;
-			const functionName = (((_e$stack = (/* @__PURE__ */ new Error()).stack) === null || _e$stack === void 0 ? void 0 : _e$stack.split("\n")[2]) ?? "").split(" ")[5];
+			const functionName = ((/* @__PURE__ */ new Error()).stack?.split("\n")[2] ?? "").split(" ")[5];
 			return getRelationName(functionName);
 		}
 		joiningTable(related, instance = null) {