@h3ravel/arquebus 2.0.0 → 3.0.0

package/dist/browser/index.js

@@ -1,7 +1,7 @@
-import collect$1, { Collection as Collection$1, collect } from "collect.js";
-import { assign, camel, dash, diff, flat, isArray, isEmpty, omit, pick, snake, trim } from "radashi";
-import advancedFormat from "dayjs/plugin/advancedFormat.js";
-import dayjs from "dayjs";
+import { Collection as Collection$1, collect } from "@h3ravel/collect.js";
+import { Arr, Obj, Str } from "@h3ravel/support";
+import * as dayjsModule from "dayjs";
+import * as advancedFormatModule from "dayjs/plugin/advancedFormat.js";
 import pluralize from "pluralize";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -135,29 +135,33 @@ 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 now = (format = "YYYY-MM-DD HH:mm:ss") => dayjs().format(format);
 const getRelationName = (relationMethod) => {
-	return snake(relationMethod.substring(8));
+	return Str.snake(relationMethod.substring(8));
 };
 const getScopeName = (scopeMethod) => {
-	return snake(scopeMethod.substring(5));
+	return Str.snake(scopeMethod.substring(5));
 };
 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`);
 };
 const getAttrName = (attrMethod) => {
 	return attrMethod.substring(3, attrMethod.length - 9).toLowerCase();
@@ -176,8 +180,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) => trim(dash(str.replace(/[^a-zA-Z0-9_-]/g, "-")), "_-");
-const snakeCase = (str) => trim(snake(str.replace(/[^a-zA-Z0-9_-]/g, "-")), "_-");
+const kebabCase = (str) => Str.trim(Str.kebab(str.replace(/[^a-zA-Z0-9_-]/g, "-")), "_-").replace(/-+/g, "-");
+const snakeCase = (str) => Str.trim(Str.snake(str.replace(/[^a-zA-Z0-9_-]/g, "-")), "_-").replace(/_+/g, "_");
 const defineConfig = (config) => {
 	return config;
 };
@@ -265,8 +269,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();
@@ -376,9 +379,9 @@ const HasAttributes = (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":
@@ -391,8 +394,8 @@ const HasAttributes = (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;
@@ -447,7 +450,7 @@ const HasAttributes = (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;
@@ -554,7 +557,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 += ".";
@@ -582,7 +585,7 @@ const HasRelations = (Instance) => {
 			return this;
 		}
 		unsetRelation(relation) {
-			this.relations = omit(this.relations, [relation]);
+			this.relations = Arr.except(this.relations, [relation]);
 			return this;
 		}
 		relationLoaded(relation) {
@@ -615,9 +618,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) {
@@ -724,7 +727,7 @@ const HidesAttributes = (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) {
@@ -880,7 +883,7 @@ var Model = class Model extends BaseModel {
 		return this;
 	}
 	toData() {
-		return assign(this.attributesToData(), this.relationsToData());
+		return Obj.deepMerge(this.attributesToData(), this.relationsToData());
 	}
 	toJSON() {
 		return this.toData();
@@ -951,7 +954,7 @@ var Pivot = class extends Model {
 };
 //#endregion
 //#region src/browser/collection.ts
-var Collection = class Collection extends Collection$1 {
+var Collection = class extends Collection$1 {
 	mapThen(callback) {
 		return Promise.all(this.map(callback));
 	}
@@ -970,20 +973,21 @@ var Collection = class Collection extends Collection$1 {
 	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 = 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()] != null) intersect.add(item);
+		for (const item of this.all()) if (dictionary[item.getKey()] != null) intersect.add(item);
 		return intersect;
 	}
 	unique(key, _strict = false) {
@@ -992,14 +996,14 @@ var Collection = class Collection extends Collection$1 {
 	}
 	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;
 	}
@@ -1018,15 +1022,15 @@ var Collection = class Collection extends Collection$1 {
 			item.append(attributes);
 		});
 	}
-	only(keys) {
-		if (keys === null) return new Collection(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$1 ? items.all() : items;
 		const dictionary = {};
-		items.map((value) => {
+		values.map((value) => {
 			dictionary[value.getKey()] = value;
 		});
 		return dictionary;
@@ -1041,8 +1045,8 @@ var Collection = class Collection extends Collection$1 {
 		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 ? {
@@ -1165,7 +1169,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 (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)));