@oscarpalmer/toretto 0.34.0 → 0.36.0

package/dist/find/relative.js

@@ -1,12 +1,13 @@
 function findAncestor(origin, selector) {
-	if (!(origin instanceof Element) || selector == null) return null;
+	const element = getElement(origin);
+	if (element == null || selector == null) return null;
 	if (typeof selector === "string") {
-		if (origin.matches?.(selector)) return origin;
-		return origin.closest(selector);
+		if (element.matches?.(selector)) return element;
+		return element.closest(selector);
 	}
 	if (typeof selector !== "function") return null;
-	if (selector(origin)) return origin;
-	let parent = origin.parentElement;
+	if (selector(element)) return element;
+	let parent = element.parentElement;
 	while (parent != null && !selector(parent)) {
 		if (parent === document.body) return null;
 		parent = parent.parentElement;
@@ -45,6 +46,10 @@ function getDistance(origin, target) {
 	const preceding = comparison & Node.DOCUMENT_POSITION_PRECEDING;
 	return traverse(preceding ? origin : target, preceding ? target : origin) ?? -1;
 }
+function getElement(origin) {
+	if (origin instanceof Element) return origin;
+	return origin instanceof Event && origin.target instanceof Element ? origin.target : void 0;
+}
 function traverse(from, to) {
 	let current = from;
 	let distance = 0;

package/dist/toretto.full.js

@@ -53,12 +53,16 @@ function getString(value) {
 	const asString = String(value.valueOf?.() ?? value);
 	return asString.startsWith("[object ") ? JSON.stringify(value) : asString;
 }
+function ignoreKey(key) {
+	return EXPRESSION_IGNORED.test(key);
+}
 function join(value, delimiter) {
 	return compact(value).map(getString).join(typeof delimiter === "string" ? delimiter : "");
 }
 function words(value) {
 	return typeof value === "string" ? value.match(EXPRESSION_WORDS) ?? [] : [];
 }
+var EXPRESSION_IGNORED = /(^|\.)(__proto__|constructor|prototype)(\.|$)/i;
 var EXPRESSION_WORDS = /[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;
 function isNullableOrWhitespace(value) {
 	return value == null || EXPRESSION_WHITESPACE$1.test(getString(value));
@@ -237,7 +241,7 @@ function calculate() {
 var TOTAL = 10;
 var TRIM_PART = 2;
 var TRIM_TOTAL = 4;
-await calculate();
+calculate().then((value) => {});
 function clamp(value, minimum, maximum, loop) {
 	if (![
 		value,
@@ -364,7 +368,7 @@ function toCaseCallback(value) {
 	const { capitalizeAny, capitalizeFirst, type } = this;
 	const parts = words(value);
 	const partsLength = parts.length;
-	const result = [];
+	const cased = [];
 	for (let partIndex = 0; partIndex < partsLength; partIndex += 1) {
 		const items = parts[partIndex].replace(EXPRESSION_ACRONYM, (full, one, two, three) => three === "s" ? full : `${one}-${two}${three}`).replace(EXPRESSION_CAMEL_CASE, REPLACEMENT_CAMEL_CASE).split("-");
 		const itemsLength = items.length;
@@ -377,9 +381,9 @@ function toCaseCallback(value) {
 			else partResult.push(capitalize(item));
 			itemCount += 1;
 		}
-		result.push(join(partResult, delimiters[type]));
+		cased.push(join(partResult, delimiters[type]));
 	}
-	return join(result, delimiters[type]);
+	return join(cased, delimiters[type]);
 }
 var EXPRESSION_CAMEL_CASE = /(\p{Ll})(\p{Lu})/gu;
 var EXPRESSION_ACRONYM = /(\p{Lu}*)(\p{Lu})(\p{Ll}+)/gu;
@@ -399,6 +403,67 @@ function parse(value, reviver) {
 		return;
 	}
 }
+function findKey(needle, haystack) {
+	const keys = Object.keys(haystack);
+	const index = keys.map((key) => key.toLowerCase()).indexOf(needle.toLowerCase());
+	return index > -1 ? keys[index] : needle;
+}
+function getPaths(path, lowercase) {
+	const normalized = lowercase ? path.toLowerCase() : path;
+	if (!EXPRESSION_NESTED.test(normalized)) return normalized;
+	return normalized.replace(EXPRESSION_BRACKET, ".$1").replace(EXPRESSION_DOTS, "").split(".");
+}
+function handleValue(data, path, value, get, ignoreCase) {
+	if (typeof data === "object" && data !== null && !ignoreKey(path)) {
+		const key = ignoreCase ? findKey(path, data) : path;
+		if (get) return data[key];
+		data[key] = typeof value === "function" ? value(data[key]) : value;
+	}
+}
+var EXPRESSION_BRACKET = /\[(\w+)\]/g;
+var EXPRESSION_DOTS = /^\.|\.$/g;
+var EXPRESSION_NESTED = /\.|\[\w+\]/;
+function getValue(data, path, ignoreCase) {
+	if (typeof data !== "object" || data === null || typeof path !== "string" || path.trim().length === 0) return;
+	const shouldIgnoreCase = ignoreCase === true;
+	const paths = getPaths(path, shouldIgnoreCase);
+	if (typeof paths === "string") return handleValue(data, paths, null, true, shouldIgnoreCase);
+	const { length } = paths;
+	let index = 0;
+	let value = data;
+	while (index < length && value != null) value = handleValue(value, paths[index++], null, true, shouldIgnoreCase);
+	return value;
+}
+function getTemplateOptions(input) {
+	const options = isPlainObject(input) ? input : {};
+	return {
+		ignoreCase: options.ignoreCase === true,
+		pattern: options.pattern instanceof RegExp ? options.pattern : EXPRESSION_VARIABLE
+	};
+}
+function handleTemplate(value, pattern, ignoreCase, variables) {
+	if (typeof value !== "string") return "";
+	if (typeof variables !== "object" || variables === null) return value;
+	const values = {};
+	return value.replace(pattern, (_, key) => {
+		if (values[key] == null) {
+			const templateValue = getValue(variables, key, ignoreCase);
+			values[key] = templateValue == null ? "" : getString(templateValue);
+		}
+		return values[key];
+	});
+}
+function template(value, variables, options) {
+	const { ignoreCase, pattern } = getTemplateOptions(options);
+	return handleTemplate(value, pattern, ignoreCase, variables);
+}
+template.initialize = function(options) {
+	const { ignoreCase, pattern } = getTemplateOptions(options);
+	return (value, variables) => {
+		return handleTemplate(value, pattern, ignoreCase, variables);
+	};
+};
+var EXPRESSION_VARIABLE = /{{([\s\S]+?)}}/g;
 function getBoolean(value, defaultValue) {
 	return typeof value === "boolean" ? value : defaultValue ?? false;
 }
@@ -591,14 +656,15 @@ function on(target, type, listener, options) {
 }
 const PROPERTY_DETAIL = "detail";
 function findAncestor(origin, selector) {
-	if (!(origin instanceof Element) || selector == null) return null;
+	const element = getElement(origin);
+	if (element == null || selector == null) return null;
 	if (typeof selector === "string") {
-		if (origin.matches?.(selector)) return origin;
-		return origin.closest(selector);
+		if (element.matches?.(selector)) return element;
+		return element.closest(selector);
 	}
 	if (typeof selector !== "function") return null;
-	if (selector(origin)) return origin;
-	let parent = origin.parentElement;
+	if (selector(element)) return element;
+	let parent = element.parentElement;
 	while (parent != null && !selector(parent)) {
 		if (parent === document.body) return null;
 		parent = parent.parentElement;
@@ -637,6 +703,10 @@ function getDistance(origin, target) {
 	const preceding = comparison & Node.DOCUMENT_POSITION_PRECEDING;
 	return traverse(preceding ? origin : target, preceding ? target : origin) ?? -1;
 }
+function getElement(origin) {
+	if (origin instanceof Element) return origin;
+	return origin instanceof Event && origin.target instanceof Element ? origin.target : void 0;
+}
 function traverse(from, to) {
 	let current = from;
 	let distance = 0;
@@ -917,18 +987,18 @@ function createHtml(value) {
 	return parsed.body.innerHTML;
 }
 function createTemplate(value, options) {
-	const template = document.createElement(TEMPLATE_TAG);
-	template.innerHTML = createHtml(value);
-	if (typeof value === "string" && options.cache) templates[value] = template;
-	return template;
+	const template$1 = document.createElement(TEMPLATE_TAG);
+	template$1.innerHTML = createHtml(value);
+	if (typeof value === "string" && options.cache) templates[value] = template$1;
+	return template$1;
 }
 function getHtml(value) {
 	return `${TEMPORARY_ELEMENT}${typeof value === "string" ? value : value.innerHTML}${TEMPORARY_ELEMENT}`;
 }
 function getNodes(value, options) {
 	if (typeof value !== "string" && !(value instanceof HTMLTemplateElement)) return [];
-	const template = getTemplate(value, options);
-	return template == null ? [] : [...template.content.cloneNode(true).childNodes];
+	const template$1 = getTemplate(value, options);
+	return template$1 == null ? [] : [...template$1.content.cloneNode(true).childNodes];
 }
 function getOptions(input) {
 	const options = isPlainObject(input) ? input : {};
@@ -942,8 +1012,8 @@ function getParser() {
 function getTemplate(value, options) {
 	if (value instanceof HTMLTemplateElement) return createTemplate(value, options);
 	if (value.trim().length === 0) return;
-	let template = templates[value];
-	if (template != null) return template;
+	let template$1 = templates[value];
+	if (template$1 != null) return template$1;
 	const element = EXPRESSION_ID.test(value) ? document.querySelector(`#${value}`) : null;
 	return createTemplate(element instanceof HTMLTemplateElement ? element : value, options);
 }
@@ -953,14 +1023,14 @@ const html = ((value, options) => {
 html.clear = () => {
 	templates = {};
 };
-html.remove = (template) => {
-	if (typeof template !== "string" || templates[template] == null) return;
+html.remove = (template$1) => {
+	if (typeof template$1 !== "string" || templates[template$1] == null) return;
 	const keys = Object.keys(templates);
 	const { length } = keys;
 	const updated = {};
 	for (let index = 0; index < length; index += 1) {
 		const key = keys[index];
-		if (key !== template) updated[key] = templates[key];
+		if (key !== template$1) updated[key] = templates[key];
 	}
 	templates = updated;
 };

package/package.json

@@ -4,16 +4,16 @@
 		"url": "https://oscarpalmer.se"
 	},
 	"dependencies": {
-		"@oscarpalmer/atoms": "^0.124"
+		"@oscarpalmer/atoms": "^0.128.1"
 	},
 	"description": "A collection of badass DOM utilities.",
 	"devDependencies": {
 		"@types/node": "^25",
 		"@vitest/coverage-istanbul": "^4",
 		"jsdom": "^27.4",
-		"oxfmt": "^0.21",
-		"oxlint": "^1.36",
-		"rolldown": "1.0.0-beta.57",
+		"oxfmt": "^0.24",
+		"oxlint": "^1.39",
+		"rolldown": "1.0.0-beta.60",
 		"tslib": "^2.8",
 		"typescript": "^5.9",
 		"vite": "8.0.0-beta.5",
@@ -93,5 +93,5 @@
 	},
 	"type": "module",
 	"types": "types/index.d.ts",
-	"version": "0.34.0"
+	"version": "0.36.0"
 }

package/src/find/relative.ts

@@ -3,35 +3,37 @@
  *
  * - If no match is found, `null` is returned
  * - _(If you want to search upwards, downwards, and sideways, use {@link findRelatives})_
- * @param origin Element to start from
+ * @param origin Origin to start from
  * @param selector Selector to match
  * @returns Found ancestor or `null`
  */
 export function findAncestor(
-	origin: Element,
+	origin: Element | Event | EventTarget,
 	selector: string | ((element: Element) => boolean),
 ): Element | null {
-	if (!(origin instanceof Element) || selector == null) {
+	const element = getElement(origin);
+
+	if (element == null || selector == null) {
 		return null;
 	}
 
 	if (typeof selector === 'string') {
-		if (origin.matches?.(selector)) {
-			return origin;
+		if (element.matches?.(selector)) {
+			return element;
 		}
 
-		return origin.closest(selector);
+		return element.closest(selector);
 	}
 
 	if (typeof selector !== 'function') {
 		return null;
 	}
 
-	if (selector(origin)) {
-		return origin;
+	if (selector(element)) {
+		return element;
 	}
 
-	let parent: Element | null = origin.parentElement;
+	let parent: Element | null = element.parentElement;
 
 	while (parent != null && !selector(parent)) {
 		if (parent === document.body) {
@@ -95,9 +97,7 @@ export function findRelatives(
 		}
 	}
 
-	return distances
-		.filter(found => found.distance === minimum)
-		.map(found => found.element);
+	return distances.filter(found => found.distance === minimum).map(found => found.element);
 }
 
 /**
@@ -132,6 +132,14 @@ export function getDistance(origin: Element, target: Element): number {
 	return traverse(preceding ? origin : target, preceding ? target : origin) ?? -1;
 }
 
+function getElement(origin: unknown): Element | undefined {
+	if (origin instanceof Element) {
+		return origin;
+	}
+
+	return origin instanceof Event && origin.target instanceof Element ? origin.target : undefined;
+}
+
 function traverse(from: Element, to: Element): number | undefined {
 	let current = from;
 	let distance = 0;

package/types/find/relative.d.ts

@@ -3,11 +3,11 @@
  *
  * - If no match is found, `null` is returned
  * - _(If you want to search upwards, downwards, and sideways, use {@link findRelatives})_
- * @param origin Element to start from
+ * @param origin Origin to start from
  * @param selector Selector to match
  * @returns Found ancestor or `null`
  */
-export declare function findAncestor(origin: Element, selector: string | ((element: Element) => boolean)): Element | null;
+export declare function findAncestor(origin: Element | Event | EventTarget, selector: string | ((element: Element) => boolean)): Element | null;
 /**
  * Finds the closest elements to the origin element that matches the selector
  *