@hybridly/utils 0.10.0-beta.2 → 0.10.0-beta.21

package/dist/index.d.mts

@@ -1,5 +1,4 @@
-import { debounce, throttle } from "throttle-debounce";
-import clone from "lodash.clonedeep";
+import { Path, PathValue, SearchableObject, getByPath, setByPath } from "@clickbar/dot-diver";
 import makeDebugger from "debug";
 
 //#region src/form-data.d.ts
@@ -40,48 +39,32 @@ declare function showViewComponentErrorModal(response: string): Modal;
 declare function random(length?: number): string;
 /** Simple pattern matching util. */
 declare function match<TValue extends string | number = string, TReturnValue = unknown, TArgs extends readonly unknown[] = []>(value: TValue, lookup: Record<TValue | 'default', TReturnValue | ((...args: TArgs) => TReturnValue | Promise<TReturnValue>)>, ...args: TArgs): TReturnValue | Promise<TReturnValue>;
-declare function value<T>(value: T | (() => T)): T;
-declare function when<T, D>(condition: any, data: T, _default?: D): T | D | undefined;
+declare function wrap<T>(value: undefined | T | T[]): T[];
+/**
+ * Returns the object only if the condition is true. Useful for conditionally merging in an object using the spread operator.
+ */
+declare function mergeObject<T extends object>(condition: any, data: T): T | object;
 interface MergeOptions {
   overwriteArray?: boolean;
   mergePlainObjects?: boolean;
   arrayMerge?: (target: any[], source: any[]) => any[];
 }
 declare function merge<T>(x: Partial<T>, y: Partial<T>, options?: MergeOptions): T;
-declare function removeTrailingSlash(string: string): string;
-/**
- * Sets a value at a path in an object
- *
- * This function will set a value at a path in an object, creating any missing
- * objects along the way. The object is modified in place.
- *
- * @param obj the object to set the value in
- * @param path a dot-separated path to the property to set
- * @param value the value to set
- */
-declare function setValueAtPath(obj: any, path: string, value: any): void;
-/**
- * Unsets a property at a path in an object
- *
- * This function will unset a property at a path in an object, deleting any
- * objects along the way that are empty. The object is modified in place.
- *
- * @param obj the object to unset the property in
- * @param path a dot-separated path to the property to unset
- */
-declare function unsetPropertyAtPath(obj: any, path: string): void;
 //#endregion
 //#region src/debug.d.ts
 declare const debug: {
   router: makeDebugger.Debugger;
+  queue: makeDebugger.Debugger;
   history: makeDebugger.Debugger;
   url: makeDebugger.Debugger;
   context: makeDebugger.Debugger;
   external: makeDebugger.Debugger;
   scroll: makeDebugger.Debugger;
   hook: makeDebugger.Debugger;
+  layout: makeDebugger.Debugger;
+  config: makeDebugger.Debugger;
   plugin: (name: string, ...args: any[]) => void;
   adapter: (name: string, ...args: any[]) => void;
 };
 //#endregion
-export { FormDataConvertible, RequestData, clone, debounce, debug, hasFiles, match, merge, objectToFormData, random, removeTrailingSlash, setValueAtPath, showResponseErrorModal, showViewComponentErrorModal, throttle, unsetPropertyAtPath, value, when };
+export { FormDataConvertible, type Path, type PathValue, RequestData, type SearchableObject, debug, getByPath, hasFiles, match, merge, mergeObject, objectToFormData, random, setByPath, showResponseErrorModal, showViewComponentErrorModal, wrap };

package/dist/index.mjs

@@ -1,16 +1,14 @@
 import baseMerge from "deepmerge";
-import { isPlainObject } from "is-plain-object";
-import { debounce, throttle } from "throttle-debounce";
-import clone from "lodash.clonedeep";
+import { isPlainObject } from "es-toolkit/predicate";
+import { getByPath, setByPath } from "@clickbar/dot-diver";
 import makeDebugger from "debug";
-
 //#region src/form-data.ts
 /**
 * Checks if the given object has a file.
 */
 function hasFiles(data) {
 	if (!data) return false;
-	return data instanceof File || data instanceof Blob || data instanceof FileList && data.length > 0 || data instanceof FormData && Array.from(data.values()).some((value$1) => hasFiles(value$1)) || typeof data === "object" && data !== null && Object.values(data).some((value$1) => hasFiles(value$1));
+	return data instanceof File || data instanceof Blob || data instanceof FileList && data.length > 0 || data instanceof FormData && Array.from(data.values()).some((value) => hasFiles(value)) || typeof data === "object" && data !== null && Object.values(data).some((value) => hasFiles(value));
 }
 /**
 * Converts an object literal to a `FormData` object.
@@ -25,34 +23,28 @@ function objectToFormData(source, form, parentKey) {
 function composeKey(key, parentKey) {
 	return parentKey ? `${parentKey}[${key}]` : key;
 }
-function append(form, key, value$1) {
-	if (Array.isArray(value$1) || value$1 instanceof Set) {
-		const valueAsArray = value$1 instanceof Set ? [...value$1] : value$1;
+function append(form, key, value) {
+	if (Array.isArray(value) || value instanceof Set) {
+		const valueAsArray = value instanceof Set ? [...value] : value;
 		if (!valueAsArray.length) return form.append(key, "");
 		return Array.from(valueAsArray.keys()).forEach((index) => append(form, composeKey(index.toString(), key), valueAsArray[index]));
-	} else if (value$1 instanceof Date) return form.append(key, value$1.toISOString());
-	else if (value$1 instanceof File) return form.append(key, value$1, value$1.name);
-	else if (value$1 instanceof Blob) return form.append(key, value$1);
-	else if (typeof value$1 === "boolean") return form.append(key, value$1 ? "1" : "0");
-	else if (typeof value$1 === "string") return form.append(key, value$1);
-	else if (typeof value$1 === "number") return form.append(key, `${value$1}`);
-	else if (value$1 === null || value$1 === void 0) return form.append(key, "");
-	objectToFormData(value$1, form, key);
+	} else if (value instanceof Date) return form.append(key, value.toISOString());
+	else if (value instanceof File) return form.append(key, value, value.name);
+	else if (value instanceof Blob) return form.append(key, value);
+	else if (typeof value === "boolean") return form.append(key, value ? "1" : "0");
+	else if (typeof value === "string") return form.append(key, value);
+	else if (typeof value === "number") return form.append(key, `${value}`);
+	else if (value === null || value === void 0) return form.append(key, "");
+	objectToFormData(value, form, key);
 }
-
 //#endregion
 //#region src/error-modal.ts
 const stack = [];
 var Modal = class Modal {
-	main;
-	overlay;
-	iframe;
-	style;
-	hideOnEscape;
-	animationDurationInMs = 200;
 	constructor(html, id) {
 		this.html = html;
 		this.id = id;
+		this.animationDurationInMs = 200;
 		if (stack.includes(id)) return;
 		if (this.initializeDOM() === false) return;
 		this.show();
@@ -105,8 +97,8 @@ var Modal = class Modal {
 		iframe.style.height = "100%";
 		iframe.style.borderRadius = "10px";
 		overlay.appendChild(iframe);
-		const style$1 = document.createElement("style");
-		style$1.innerHTML = `
+		const style = document.createElement("style");
+		style.innerHTML = `
 			[data-hybridly] {
 				opacity: 0;
 				overflow: hidden;
@@ -133,7 +125,7 @@ var Modal = class Modal {
 		this.main = main;
 		this.overlay = overlay;
 		this.iframe = iframe;
-		this.style = style$1;
+		this.style = style;
 	}
 	show() {
 		stack.push(this.id);
@@ -255,7 +247,6 @@ function style() {
 		}
 	`;
 }
-
 //#endregion
 //#region src/utils.ts
 function random(length = 10) {
@@ -265,20 +256,23 @@ function random(length = 10) {
 	return str;
 }
 /** Simple pattern matching util. */
-function match(value$1, lookup, ...args) {
-	if (value$1 in lookup || "default" in lookup) {
-		const returnValue = value$1 in lookup ? lookup[value$1] : lookup.default;
+function match(value, lookup, ...args) {
+	if (value in lookup || "default" in lookup) {
+		const returnValue = value in lookup ? lookup[value] : lookup.default;
 		return typeof returnValue === "function" ? returnValue(...args) : returnValue;
 	}
 	const handlers = Object.keys(lookup).map((key) => `"${key}"`).join(", ");
-	throw new Error(`Tried to handle "${value$1}" but there is no handler defined. Only defined handlers are: ${handlers}.`);
+	throw new Error(`Tried to handle "${value}" but there is no handler defined. Only defined handlers are: ${handlers}.`);
 }
-function value(value$1) {
-	if (typeof value$1 === "function") return value$1?.();
-	return value$1;
+function wrap(value) {
+	if (value === void 0) return [];
+	return Array.isArray(value) ? value : [value];
 }
-function when(condition, data, _default) {
-	if (!condition) return _default;
+/**
+* Returns the object only if the condition is true. Useful for conditionally merging in an object using the spread operator.
+*/
+function mergeObject(condition, data) {
+	if (!condition) return {};
 	return data;
 }
 function merge(x, y, options = {}) {
@@ -287,69 +281,21 @@ function merge(x, y, options = {}) {
 		isMergeableObject: options?.mergePlainObjects ? isPlainObject : void 0
 	});
 }
-function removeTrailingSlash(string) {
-	return string.replace(/\/+$/, "");
-}
-/**
-* Sets a value at a path in an object
-*
-* This function will set a value at a path in an object, creating any missing
-* objects along the way. The object is modified in place.
-*
-* @param obj the object to set the value in
-* @param path a dot-separated path to the property to set
-* @param value the value to set
-*/
-function setValueAtPath(obj, path, value$1) {
-	if (!path.includes(".")) {
-		obj[path] = value$1;
-		return;
-	}
-	const segments = path.split(".");
-	let nestedObject = obj;
-	for (let i = 0; i < segments.length - 1; i++) {
-		const key = segments[i];
-		nestedObject = nestedObject[key] = nestedObject[key] || {};
-	}
-	nestedObject[segments[segments.length - 1]] = value$1;
-}
-/**
-* Unsets a property at a path in an object
-*
-* This function will unset a property at a path in an object, deleting any
-* objects along the way that are empty. The object is modified in place.
-*
-* @param obj the object to unset the property in
-* @param path a dot-separated path to the property to unset
-*/
-function unsetPropertyAtPath(obj, path) {
-	if (!path.includes(".")) {
-		delete obj[path];
-		return;
-	}
-	const segments = path.split(".");
-	let nestedObject = obj;
-	for (let i = 0; i < segments.length - 1; i++) {
-		const key = segments[i];
-		nestedObject = nestedObject[key] = nestedObject[key] || {};
-	}
-	delete nestedObject[segments[segments.length - 1]];
-	if (Object.keys(nestedObject).length === 0) unsetPropertyAtPath(obj, segments.slice(0, -1).join("."));
-}
-
 //#endregion
 //#region src/debug.ts
 const debug = {
 	router: makeDebugger("hybridly:core:router"),
+	queue: makeDebugger("hybridly:core:router:queue"),
 	history: makeDebugger("hybridly:core:history"),
 	url: makeDebugger("hybridly:core:url"),
 	context: makeDebugger("hybridly:core:context"),
 	external: makeDebugger("hybridly:core:external"),
 	scroll: makeDebugger("hybridly:core:scroll"),
 	hook: makeDebugger("hybridly:core:hook"),
+	layout: makeDebugger("hybridly:plugin:layout"),
+	config: makeDebugger("hybridly:vite:config"),
 	plugin: (name, ...args) => makeDebugger("hybridly:plugin").extend(name.replace("hybridly:", ""))(args.shift(), ...args),
 	adapter: (name, ...args) => makeDebugger("hybridly:adapter").extend(name)(args.shift(), ...args)
 };
-
 //#endregion
-export { clone, debounce, debug, hasFiles, match, merge, objectToFormData, random, removeTrailingSlash, setValueAtPath, showResponseErrorModal, showViewComponentErrorModal, throttle, unsetPropertyAtPath, value, when };
+export { debug, getByPath, hasFiles, match, merge, mergeObject, objectToFormData, random, setByPath, showResponseErrorModal, showViewComponentErrorModal, wrap };

package/package.json

@@ -1,52 +1,48 @@
 {
-  "name": "@hybridly/utils",
-  "type": "module",
-  "version": "0.10.0-beta.2",
-  "description": "Utils used in Hybridly packages",
-  "author": "Enzo Innocenzi <enzo@innocenzi.dev>",
-  "license": "MIT",
-  "funding": "https://github.com/sponsors/innocenzi",
-  "homepage": "https://github.com/hybridly/hybridly/tree/main/packages/config#readme",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/hybridly/hybridly.git",
-    "directory": "packages/utils"
-  },
-  "bugs": {
-    "url": "https://github.com/hybridly/hybridly/issues"
-  },
-  "keywords": [
-    "hybridly"
-  ],
-  "publishConfig": {
-    "provenance": true,
-    "access": "public"
-  },
-  "sideEffects": false,
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.mts",
-      "import": "./dist/index.mjs"
-    }
-  },
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.mts",
-  "files": [
-    "*.d.ts",
-    "dist"
-  ],
-  "scripts": {
-    "build": "obuild",
-    "build:stub": "obuild --stub"
-  },
-  "dependencies": {
-    "debug": "^4.4.1",
-    "deepmerge": "^4.3.1",
-    "is-plain-object": "^5.0.0",
-    "lodash.clonedeep": "^4.5.0",
-    "throttle-debounce": "^5.0.2"
-  },
-  "devDependencies": {
-    "@types/lodash.clonedeep": "^4.5.9"
-  }
+	"name": "@hybridly/utils",
+	"type": "module",
+	"version": "0.10.0-beta.21",
+	"description": "Utils used in Hybridly packages",
+	"author": "Enzo Innocenzi <enzo@innocenzi.dev>",
+	"license": "MIT",
+	"funding": "https://github.com/sponsors/innocenzi",
+	"homepage": "https://github.com/hybridly/hybridly/tree/main/packages/config#readme",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/hybridly/hybridly.git",
+		"directory": "packages/utils"
+	},
+	"bugs": {
+		"url": "https://github.com/hybridly/hybridly/issues"
+	},
+	"keywords": [
+		"hybridly"
+	],
+	"publishConfig": {
+		"provenance": true,
+		"access": "public"
+	},
+	"sideEffects": false,
+	"exports": {
+		".": {
+			"types": "./dist/index.d.mts",
+			"import": "./dist/index.mjs"
+		}
+	},
+	"module": "dist/index.mjs",
+	"types": "dist/index.d.mts",
+	"files": [
+		"*.d.ts",
+		"dist"
+	],
+	"scripts": {
+		"build": "obuild",
+		"build:stub": "obuild --stub"
+	},
+	"dependencies": {
+		"@clickbar/dot-diver": "^1.0.7",
+		"debug": "^4.4.1",
+		"deepmerge": "^4.3.1",
+		"es-toolkit": "^1.45.1"
+	}
 }