@h3ravel/arquebus 2.0.0 → 3.0.0

package/dist/browser/index.cjs

@@ -33,13 +33,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-let collect_js = require("collect.js");
-collect_js = __toESM(collect_js, 1);
-let radashi = require("radashi");
-let dayjs_plugin_advancedFormat_js = require("dayjs/plugin/advancedFormat.js");
-dayjs_plugin_advancedFormat_js = __toESM(dayjs_plugin_advancedFormat_js, 1);
+let _h3ravel_collect_js = require("@h3ravel/collect.js");
+let _h3ravel_support = require("@h3ravel/support");
 let dayjs = require("dayjs");
 dayjs = __toESM(dayjs, 1);
+let dayjs_plugin_advancedFormat_js = require("dayjs/plugin/advancedFormat.js");
+dayjs_plugin_advancedFormat_js = __toESM(dayjs_plugin_advancedFormat_js, 1);
 let pluralize = require("pluralize");
 pluralize = __toESM(pluralize, 1);
 //#region src/casts/attribute.ts
@@ -162,29 +161,33 @@ function compose$1(Base, ...mixins) {
 	}, Base);
 }
 //#endregion
+//#region src/dayjs.ts
+const dayjs$1 = dayjs.default ?? dayjs;
+const advancedFormat = dayjs_plugin_advancedFormat_js.default ?? dayjs_plugin_advancedFormat_js;
+dayjs$1.extend(advancedFormat);
+//#endregion
 //#region src/utils.ts
-dayjs.default.extend(dayjs_plugin_advancedFormat_js.default);
-const now = (format = "YYYY-MM-DD HH:mm:ss") => (0, dayjs.default)().format(format);
+const now = (format = "YYYY-MM-DD HH:mm:ss") => dayjs$1().format(format);
 const getRelationName = (relationMethod) => {
-	return (0, radashi.snake)(relationMethod.substring(8));
+	return _h3ravel_support.Str.snake(relationMethod.substring(8));
 };
 const getScopeName = (scopeMethod) => {
-	return (0, radashi.snake)(scopeMethod.substring(5));
+	return _h3ravel_support.Str.snake(scopeMethod.substring(5));
 };
 const getRelationMethod = (relation) => {
-	return (0, radashi.camel)(`relation_${relation}`);
+	return _h3ravel_support.Str.camel(`relation_${relation}`);
 };
 const getScopeMethod = (scope) => {
-	return (0, radashi.camel)(`scope_${scope}`);
+	return _h3ravel_support.Str.camel(`scope_${scope}`);
 };
 const getAttrMethod = (attr) => {
-	return (0, radashi.camel)(`attribute_${attr}`);
+	return _h3ravel_support.Str.camel(`attribute_${attr}`);
 };
 const getGetterMethod = (attr) => {
-	return (0, radashi.camel)(`get_${attr}_attribute`);
+	return _h3ravel_support.Str.camel(`get_${attr}_attribute`);
 };
 const getSetterMethod = (attr) => {
-	return (0, radashi.camel)(`set_${attr}_attribute`);
+	return _h3ravel_support.Str.camel(`set_${attr}_attribute`);
 };
 const getAttrName = (attrMethod) => {
 	return attrMethod.substring(3, attrMethod.length - 9).toLowerCase();
@@ -203,8 +206,8 @@ const tap = (instance, callback) => {
 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 kebabCase = (str) => (0, radashi.trim)((0, radashi.dash)(str.replace(/[^a-zA-Z0-9_-]/g, "-")), "_-");
-const snakeCase = (str) => (0, radashi.trim)((0, radashi.snake)(str.replace(/[^a-zA-Z0-9_-]/g, "-")), "_-");
+const kebabCase = (str) => _h3ravel_support.Str.trim(_h3ravel_support.Str.kebab(str.replace(/[^a-zA-Z0-9_-]/g, "-")), "_-").replace(/-+/g, "-");
+const snakeCase = (str) => _h3ravel_support.Str.trim(_h3ravel_support.Str.snake(str.replace(/[^a-zA-Z0-9_-]/g, "-")), "_-").replace(/_+/g, "_");
 const defineConfig = (config) => {
 	return config;
 };
@@ -292,8 +295,7 @@ const HasAttributes = (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();
@@ -403,9 +405,9 @@ const HasAttributes = (Model) => {
 					return null;
 				}
 				case "collection": try {
-					return (0, collect_js.default)(JSON.parse(value));
+					return (0, _h3ravel_collect_js.collect)(JSON.parse(value));
 				} catch {
-					return (0, collect_js.default)([]);
+					return (0, _h3ravel_collect_js.collect)([]);
 				}
 				case "date": return this.asDate(value);
 				case "datetime":
@@ -418,8 +420,8 @@ const HasAttributes = (Model) => {
 		attributesToData() {
 			let attributes = { ...this.attributes };
 			for (const key in attributes) {
-				if (this.hidden.includes(key)) attributes = (0, radashi.omit)(attributes, [key]);
-				if (this.visible.length > 0 && this.visible.includes(key) === false) attributes = (0, radashi.omit)(attributes, [key]);
+				if (this.hidden.includes(key)) attributes = _h3ravel_support.Arr.except(attributes, [key]);
+				if (this.visible.length > 0 && this.visible.includes(key) === false) attributes = _h3ravel_support.Arr.except(attributes, [key]);
 			}
 			for (const key of this.getDates()) {
 				if (attributes[key] === void 0) continue;
@@ -431,7 +433,7 @@ const HasAttributes = (Model) => {
 				if (key in attributes === false) continue;
 				attributes[key] = this.castAttribute(key, attributes[key]);
 				if (key in attributes && ["date", "datetime"].includes(String(value))) attributes[key] = this.serializeDate(attributes[key]);
-				if (key in attributes && this.isCustomDateTimeCast(value)) attributes[key] = (0, dayjs.default)(attributes[key]).format(String(value).split(":")[1]);
+				if (key in attributes && this.isCustomDateTimeCast(value)) attributes[key] = dayjs$1(attributes[key]).format(String(value).split(":")[1]);
 			}
 			for (const key of this.appends) attributes[key] = this.mutateAttribute(key, null);
 			return attributes;
@@ -447,7 +449,7 @@ const HasAttributes = (Model) => {
 			return this.getDates().includes(key) || this.isDateCastable(key);
 		}
 		serializeDate(date) {
-			return date ? (0, dayjs.default)(date).toISOString() : null;
+			return date ? dayjs$1(date).toISOString() : null;
 		}
 		getDates() {
 			return this.usesTimestamps() ? [this.getCreatedAtColumn(), this.getUpdatedAtColumn()] : [];
@@ -474,13 +476,13 @@ const HasAttributes = (Model) => {
 		}
 		hasCast(key, types = []) {
 			if (key in this.casts) {
-				types = (0, radashi.flat)(types);
+				types = flatten(types);
 				return types.length > 0 ? types.includes(this.getCastType(key)) : true;
 			}
 			return false;
 		}
 		withDayjs(date) {
-			return (0, dayjs.default)(date);
+			return dayjs$1(date);
 		}
 		isCustomCast(cast) {
 			return typeof cast === "function" && new cast() instanceof CastsAttributes;
@@ -497,7 +499,7 @@ const HasAttributes = (Model) => {
 			return this.hasCast(key, ["date", "datetime"]);
 		}
 		fromDateTime(value) {
-			return (0, dayjs.default)(this.asDateTime(value)).format(this.getDateFormat());
+			return dayjs$1(this.asDateTime(value)).format(this.getDateFormat());
 		}
 		getDateFormat() {
 			return this.dateFormat || "YYYY-MM-DD HH:mm:ss";
@@ -512,7 +514,7 @@ const HasAttributes = (Model) => {
 			return new Date(value);
 		}
 		asDate(value) {
-			return (0, dayjs.default)(this.asDateTime(value)).startOf("day").toDate();
+			return dayjs$1(this.asDateTime(value)).startOf("day").toDate();
 		}
 	};
 };
@@ -581,7 +583,7 @@ var ModelNotFoundError = class extends BaseError {
 	}
 	setModel(model, ids = []) {
 		this.model = model;
-		this.ids = (0, radashi.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 += ".";
@@ -609,7 +611,7 @@ const HasRelations = (Instance) => {
 			return this;
 		}
 		unsetRelation(relation) {
-			this.relations = (0, radashi.omit)(this.relations, [relation]);
+			this.relations = _h3ravel_support.Arr.except(this.relations, [relation]);
 			return this;
 		}
 		relationLoaded(relation) {
@@ -642,9 +644,9 @@ const HasRelations = (Instance) => {
 			else if (frame.includes("at ")) {
 				const match = frame.match(/at\s+([^(]+)\s*\(/);
 				functionName = match ? match[1].trim() : "anonymous";
-				if (functionName === null || functionName === void 0 ? void 0 : functionName.includes(".")) functionName = functionName.split(".").pop();
+				if (functionName?.includes(".")) functionName = functionName.split(".").pop();
 			}
-			functionName = functionName === null || functionName === void 0 ? void 0 : functionName.replace(/^</, "").replace(/>$/, "").trim();
+			functionName = functionName?.replace(/^</, "").replace(/>$/, "").trim();
 			return getRelationName(functionName || "anonymous");
 		}
 		joiningTable(related, instance = null) {
@@ -751,7 +753,7 @@ const HidesAttributes = (Model) => {
 		makeVisible(...keys) {
 			const visible = flattenDeep(keys);
 			if (this.visible.length > 0) this.visible = [...this.visible, ...visible];
-			this.hidden = (0, radashi.diff)(this.hidden, visible);
+			this.hidden = (0, _h3ravel_collect_js.collect)(this.hidden).diff(visible).all();
 			return this;
 		}
 		makeHidden(key, ...keys) {
@@ -907,7 +909,7 @@ var Model = class Model extends BaseModel {
 		return this;
 	}
 	toData() {
-		return (0, radashi.assign)(this.attributesToData(), this.relationsToData());
+		return _h3ravel_support.Obj.deepMerge(this.attributesToData(), this.relationsToData());
 	}
 	toJSON() {
 		return this.toData();
@@ -978,7 +980,7 @@ var Pivot = class extends Model {
 };
 //#endregion
 //#region src/browser/collection.ts
-var Collection = class Collection extends collect_js.Collection {
+var Collection = class extends _h3ravel_collect_js.Collection {
 	mapThen(callback) {
 		return Promise.all(this.map(callback));
 	}
@@ -997,20 +999,21 @@ var Collection = class Collection extends collect_js.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()] == null) diff.add(item);
 		});
 		return diff;
 	}
-	except(keys) {
-		const dictionary = (0, radashi.omit)(this.getDictionary(), keys);
+	except(...keys) {
+		const values = keys.length === 1 && Array.isArray(keys[0]) ? keys[0].map(String) : keys.map(String);
+		const dictionary = _h3ravel_support.Arr.except(this.getDictionary(), values);
 		return new this.constructor(Object.values(dictionary));
 	}
 	intersect(items) {
 		const intersect = new this.constructor();
-		if ((0, radashi.isEmpty)(items)) return intersect;
+		if (_h3ravel_support.Arr.isEmpty(items)) return intersect;
 		const dictionary = this.getDictionary(items);
-		for (const item of this.items) if (dictionary[item.getKey()] != null) intersect.add(item);
+		for (const item of this.all()) if (dictionary[item.getKey()] != null) intersect.add(item);
 		return intersect;
 	}
 	unique(key, _strict = false) {
@@ -1019,14 +1022,14 @@ var Collection = class Collection extends collect_js.Collection {
 	}
 	find(key, defaultValue = null) {
 		if (key instanceof Model) key = key.getKey();
-		if ((0, radashi.isArray)(key)) {
+		if (Array.isArray(key)) {
 			if (this.isEmpty()) return new this.constructor();
 			return this.whereIn(this.first().getKeyName(), key);
 		}
-		(0, collect_js.collect)(this.items).first((model) => {
+		(0, _h3ravel_collect_js.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;
 	}
@@ -1045,15 +1048,15 @@ var Collection = class Collection extends collect_js.Collection {
 			item.append(attributes);
 		});
 	}
-	only(keys) {
-		if (keys === null) return new Collection(this.items);
-		const dictionary = (0, radashi.pick)(this.getDictionary(), keys);
+	only(...keys) {
+		const values = keys.length === 1 && Array.isArray(keys[0]) ? keys[0].map(String) : keys.map(String);
+		const dictionary = _h3ravel_support.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 _h3ravel_collect_js.Collection ? items.all() : items;
 		const dictionary = {};
-		items.map((value) => {
+		values.map((value) => {
 			dictionary[value.getKey()] = value;
 		});
 		return dictionary;
@@ -1068,8 +1071,8 @@ var Collection = class Collection extends collect_js.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 ? {
@@ -1192,7 +1195,7 @@ var pivot_default = Pivot;
 const make = (model, data, options = {}) => {
 	const { paginated } = options;
 	if (paginated) return new Paginator(data.data.map((item) => model.make(item)), data.total, data.per_page, data.current_page);
-	if ((0, radashi.isArray)(data)) return new Collection(data.map((item) => model.make(item)));
+	if (Array.isArray(data)) return new Collection(data.map((item) => model.make(item)));
 	return model.make(data);
 };
 const makeCollection = (model, data) => new Collection(data.map((item) => model.make(item)));