@oscarpalmer/toretto 0.26.1 → 0.28.0

package/src/attribute/set.ts

@@ -1,43 +1,27 @@
+import {updateValue, updateValues} from '../internal/attribute';
 import type {Attribute, HTMLOrSVGElement, Property} from '../models';
-import {
-	updateAttribute,
-	updateProperty,
-	updateValue,
-	updateValues,
-} from './update';
 
 /**
  * Set an attribute on an element
  *
  * _(Or remove it, if value is `null` or `undefined`)_
  * @param element Element for attribute
- * @param attribute Attribute to set
+ * @param name Attribute name
+ * @param value Attribute value
  */
-export function setAttribute(
-	element: HTMLOrSVGElement,
-	attribute: Attr | Attribute,
-): void;
+export function setAttribute(element: HTMLOrSVGElement, name: string, value?: unknown): void;
 
 /**
  * Set an attribute on an element
  *
  * _(Or remove it, if value is `null` or `undefined`)_
  * @param element Element for attribute
- * @param name Attribute name
- * @param value Attribute value
+ * @param attribute Attribute to set
  */
-export function setAttribute(
-	element: HTMLOrSVGElement,
-	name: string,
-	value?: unknown,
-): void;
+export function setAttribute(element: HTMLOrSVGElement, attribute: Attr | Attribute): void;
 
-export function setAttribute(
-	element: HTMLOrSVGElement,
-	first: unknown,
-	second?: unknown,
-): void {
-	updateValue(element, first, second, updateAttribute);
+export function setAttribute(element: HTMLOrSVGElement, first: unknown, second?: unknown): void {
+	updateValue(element, first, second);
 }
 
 /**
@@ -47,10 +31,7 @@ export function setAttribute(
  * @param element Element for attributes
  * @param attributes Attributes to set
  */
-export function setAttributes(
-	element: HTMLOrSVGElement,
-	attributes: Array<Attr | Attribute>,
-): void;
+export function setAttributes(element: HTMLOrSVGElement, attributes: Array<Attr | Attribute>): void;
 
 /**
  * Set one or more attributes on an element
@@ -59,10 +40,7 @@ export function setAttributes(
  * @param element Element for attributes
  * @param attributes Attributes to set
  */
-export function setAttributes(
-	element: HTMLOrSVGElement,
-	attributes: Record<string, unknown>,
-): void;
+export function setAttributes(element: HTMLOrSVGElement, attributes: Record<string, unknown>): void;
 
 export function setAttributes(
 	element: HTMLOrSVGElement,
@@ -76,33 +54,22 @@ export function setAttributes(
  *
  * _(Or remove it, if value is not an empty string or does not match the name)_
  * @param element Element for property
- * @param property Property to set
+ * @param name Property name
+ * @param value Property value
  */
-export function setProperty(
-	element: HTMLOrSVGElement,
-	property: Property,
-): void;
+export function setProperty(element: HTMLOrSVGElement, name: string, value: boolean | string): void;
 
 /**
  * Set a property on an element
  *
  * _(Or remove it, if value is not an empty string or does not match the name)_
  * @param element Element for property
- * @param name Property name
- * @param value Property value
+ * @param property Property to set
  */
-export function setProperty(
-	element: HTMLOrSVGElement,
-	name: string,
-	value: boolean | string,
-): void;
+export function setProperty(element: HTMLOrSVGElement, property: Property): void;
 
-export function setProperty(
-	element: HTMLOrSVGElement,
-	first: unknown,
-	second?: unknown,
-): void {
-	updateValue(element, first, second, updateProperty);
+export function setProperty(element: HTMLOrSVGElement, first: unknown, second?: unknown): void {
+	updateValue(element, first, second);
 }
 
 /**
@@ -112,10 +79,7 @@ export function setProperty(
  * @param element Element for properties
  * @param properties Properties to set
  */
-export function setProperties(
-	element: HTMLOrSVGElement,
-	properties: Property[],
-): void;
+export function setProperties(element: HTMLOrSVGElement, properties: Property[]): void;
 
 /**
  * Set one or more properties on an element
@@ -124,14 +88,11 @@ export function setProperties(
  * @param element Element for properties
  * @param properties Properties to set
  */
-export function setProperties(
-	element: HTMLOrSVGElement,
-	properties: Record<string, unknown>,
-): void;
+export function setProperties(element: HTMLOrSVGElement, properties: Record<string, unknown>): void;
 
 export function setProperties(
 	element: HTMLOrSVGElement,
 	properties: Property[] | Record<string, unknown>,
 ): void {
-	updateValues(element, properties, updateProperty);
+	updateValues(element, properties);
 }

package/src/data.ts

@@ -12,11 +12,7 @@ import type {HTMLOrSVGElement} from './models';
  * @param parse Parse values? _(defaults to `true`)_
  * @returns Data value
  */
-export function getData(
-	element: HTMLOrSVGElement,
-	key: string,
-	parse?: boolean,
-): unknown;
+export function getData(element: HTMLOrSVGElement, key: string, parse?: boolean): unknown;
 
 /**
  * Get keyed data values from an element
@@ -87,11 +83,7 @@ export function setData(element: HTMLOrSVGElement, data: PlainObject): void;
  * @param key Data key
  * @param value Data value
  */
-export function setData(
-	element: HTMLOrSVGElement,
-	key: string,
-	value: unknown,
-): void;
+export function setData(element: HTMLOrSVGElement, key: string, value: unknown): void;
 
 export function setData(
 	element: HTMLOrSVGElement,
@@ -101,11 +93,7 @@ export function setData(
 	setElementValues(element, first, second, updateDataAttribute);
 }
 
-function updateDataAttribute(
-	element: HTMLOrSVGElement,
-	key: string,
-	value: unknown,
-): void {
+function updateDataAttribute(element: HTMLOrSVGElement, key: string, value: unknown): void {
 	updateElementValue(
 		element,
 		getName(key),

package/src/event/delegation.ts

@@ -3,7 +3,7 @@ import type {CustomEventListener, RemovableEventListener} from '../models';
 
 //
 
-type DocumentWithListeners = Document &
+type DocumentWithListenerCounts = Document &
 	Partial<{
 		[key: string]: number;
 	}>;
@@ -14,20 +14,20 @@ export type EventTargetWithListeners = EventTarget &
 	}>;
 
 function addDelegatedHandler(
-	document: DocumentWithListeners,
+	document: DocumentWithListenerCounts,
 	type: string,
 	name: string,
 	passive: boolean,
 ): void {
-	const listeners = `${name}${LISTENERS_SUFFIX}`;
+	const count = `${name}${COUNT_SUFFIX}`;
 
-	if (document[listeners] != null) {
-		(document[listeners] as number) += 1;
+	if (document[count] != null) {
+		(document[count] as number) += 1;
 
 		return;
 	}
 
-	document[listeners] = 1;
+	document[count] = 1;
 
 	document.addEventListener(type, passive ? HANDLER_PASSIVE : HANDLER_ACTIVE, {
 		passive,
@@ -45,7 +45,7 @@ export function addDelegatedListener(
 
 	target[name]?.add(listener);
 
-	addDelegatedHandler(document as DocumentWithListeners, type, name, passive);
+	addDelegatedHandler(document as DocumentWithListenerCounts, type, name, passive);
 
 	return () => {
 		removeDelegatedListener(target, type, name, listener, passive);
@@ -67,18 +67,20 @@ function delegatedEventHandler(this: boolean, event: Event): void {
 		const item = items[index] as EventTargetWithListeners;
 		const listeners = item[key];
 
-		if (!(item as unknown as HTMLButtonElement).disabled && listeners != null) {
-			Object.defineProperty(event, 'currentTarget', {
-				configurable: true,
-				value: item,
-			});
+		if ((item as unknown as HTMLButtonElement).disabled || listeners == null) {
+			continue;
+		}
+
+		Object.defineProperty(event, 'currentTarget', {
+			configurable: true,
+			value: item,
+		});
 
-			for (const listener of listeners) {
-				(listener as EventListener).call(item, event);
+		for (const listener of listeners) {
+			(listener as EventListener).call(item, event);
 
-				if (event.cancelBubble) {
-					return;
-				}
+			if (event.cancelBubble) {
+				return;
 			}
 		}
 	}
@@ -101,22 +103,19 @@ export function getDelegatedName(
 }
 
 function removeDelegatedHandler(
-	document: DocumentWithListeners,
+	document: DocumentWithListenerCounts,
 	type: string,
 	name: string,
 	passive: boolean,
 ): void {
-	const listeners = `${name}${LISTENERS_SUFFIX}`;
+	const count = `${name}${COUNT_SUFFIX}`;
 
-	(document[listeners] as number) -= 1;
+	(document[count] as number) -= 1;
 
-	if ((document[listeners] as number) < 1) {
-		document[listeners] = undefined;
+	if ((document[count] as number) < 1) {
+		document[count] = undefined;
 
-		document.removeEventListener(
-			type,
-			passive ? HANDLER_PASSIVE : HANDLER_ACTIVE,
-		);
+		document.removeEventListener(type, passive ? HANDLER_PASSIVE : HANDLER_ACTIVE);
 	}
 }
 
@@ -135,22 +134,19 @@ export function removeDelegatedListener(
 
 	handlers.delete(listener);
 
-	if (handlers?.size === 0) {
+	if (handlers.size === 0) {
 		target[name] = undefined;
 	}
 
-	removeDelegatedHandler(
-		document as DocumentWithListeners,
-		type,
-		name,
-		passive,
-	);
+	removeDelegatedHandler(document as DocumentWithListenerCounts, type, name, passive);
 
 	return true;
 }
 
 //
 
+const COUNT_SUFFIX = '.count';
+
 const EVENT_PREFIX = '@';
 
 const EVENT_SUFFIX_ACTIVE = ':active';
@@ -185,5 +181,3 @@ const EVENT_TYPES: Set<string> = new Set([
 const HANDLER_ACTIVE: EventListener = delegatedEventHandler.bind(false);
 
 const HANDLER_PASSIVE: EventListener = delegatedEventHandler.bind(true);
-
-const LISTENERS_SUFFIX = ':listeners';

package/src/event/index.ts

@@ -2,11 +2,7 @@ import {noop} from '@oscarpalmer/atoms/function';
 import {isPlainObject} from '@oscarpalmer/atoms/is';
 import {getBoolean} from '../internal/get-value';
 import {isEventTarget} from '../internal/is';
-import type {
-	CustomEventListener,
-	EventPosition,
-	RemovableEventListener,
-} from '../models';
+import type {CustomEventListener, EventPosition, RemovableEventListener} from '../models';
 import {
 	addDelegatedListener,
 	type EventTargetWithListeners,
@@ -73,11 +69,7 @@ export function dispatch<Type extends keyof HTMLElementEventMap>(
  * @param type Type of event
  * @param options Options for event _(bubbles and is cancelable by default)_
  */
-export function dispatch(
-	target: EventTarget,
-	type: string,
-	options?: CustomEventInit,
-): void;
+export function dispatch(target: EventTarget, type: string, options?: CustomEventInit): void;
 
 export function dispatch<Type extends keyof HTMLElementEventMap>(
 	target: EventTarget,
@@ -94,9 +86,7 @@ export function dispatch<Type extends keyof HTMLElementEventMap>(
  * @param event Pointer event
  * @returns X- and Y-coordinates
  */
-export function getPosition(
-	event: MouseEvent | TouchEvent,
-): EventPosition | undefined {
+export function getPosition(event: MouseEvent | TouchEvent): EventPosition | undefined {
 	let x: number | undefined;
 	let y: number | undefined;
 
@@ -111,6 +101,34 @@ export function getPosition(
 	return typeof x === 'number' && typeof y === 'number' ? {x, y} : undefined;
 }
 
+/**
+ * Remove an event listener
+ * @param target Event target
+ * @param type Type of event
+ * @param listener Event listener
+ * @param options Options for event
+ */
+export function off(
+	target: EventTarget,
+	type: keyof HTMLElementEventMap,
+	listener: EventListener | CustomEventListener,
+	options?: EventListenerOptions,
+): void;
+
+/**
+ * Remove an event listener
+ * @param target Event target
+ * @param type Type of event
+ * @param listener Event listener
+ * @param options Options for event
+ */
+export function off(
+	target: EventTarget,
+	type: string,
+	listener: EventListener | CustomEventListener,
+	options?: EventListenerOptions,
+): void;
+
 /**
  * Remove an event listener
  * @param target Event target
@@ -124,11 +142,7 @@ export function off(
 	listener: EventListener | CustomEventListener,
 	options?: EventListenerOptions,
 ): void {
-	if (
-		!isEventTarget(target) ||
-		typeof type !== 'string' ||
-		typeof listener !== 'function'
-	) {
+	if (!isEventTarget(target) || typeof type !== 'string' || typeof listener !== 'function') {
 		return;
 	}
 
@@ -183,11 +197,7 @@ export function on(
 	listener: EventListener | CustomEventListener,
 	options?: AddEventListenerOptions,
 ): RemovableEventListener {
-	if (
-		!isEventTarget(target) ||
-		typeof type !== 'string' ||
-		typeof listener !== 'function'
-	) {
+	if (!isEventTarget(target) || typeof type !== 'string' || typeof listener !== 'function') {
 		return noop;
 	}
 

package/src/find/index.ts

@@ -7,10 +7,7 @@ import type {Selector} from '../models';
  * @param context Context to search within _(defaults to `document`)_
  * @returns Found element or `null`
  */
-export function findElement(
-	selector: string,
-	context?: Selector | null,
-): Element | null {
+export function findElement(selector: string, context?: Selector | null): Element | null {
 	return findElementOrElements(selector, context, true) as never;
 }
 
@@ -24,17 +21,10 @@ function findElementOrElements(
 	const contexts =
 		context == null
 			? [document]
-			: (findElementOrElements(context, undefined, false) as Element[]).filter(
-					isContext,
-				);
+			: (findElementOrElements(context, undefined, false) as Element[]).filter(isContext);
 
 	if (typeof selector === 'string') {
-		return findElementOrElementsForSelector(
-			selector,
-			contexts,
-			callback,
-			single,
-		);
+		return findElementOrElementsForSelector(selector, contexts, callback, single);
 	}
 
 	let array: unknown[];
@@ -59,9 +49,10 @@ function findElementOrElementsForSelector(
 	const result: Element[] = [];
 
 	for (let index = 0; index < length; index += 1) {
-		const value = (
-			contexts[index][callback] as (selector: string) => Node | null
-		)(selector) as Element | Element[] | null;
+		const value = (contexts[index][callback] as (selector: string) => Node | null)(selector) as
+			| Element
+			| Element[]
+			| null;
 
 		if (single) {
 			if (value == null) {
@@ -74,9 +65,7 @@ function findElementOrElementsForSelector(
 		result.push(...Array.from(value as Element[]));
 	}
 
-	return single
-		? null
-		: result.filter((value, index, array) => array.indexOf(value) === index);
+	return single ? null : result.filter((value, index, array) => array.indexOf(value) === index);
 }
 
 function findElementOrElementsFromNodes(
@@ -104,9 +93,7 @@ function findElementOrElementsFromNodes(
 			element != null &&
 			(context == null ||
 				contexts.length === 0 ||
-				contexts.some(
-					context => context === element || context.contains(element),
-				)) &&
+				contexts.some(context => context === element || context.contains(element))) &&
 			!result.includes(element)
 		) {
 			result.push(element);
@@ -122,10 +109,7 @@ function findElementOrElementsFromNodes(
  * @param context Context to search within _(defaults to `document`)_
  * @returns Found elements
  */
-export function findElements(
-	selector: Selector,
-	context?: Selector | null,
-): Element[] {
+export function findElements(selector: Selector, context?: Selector | null): Element[] {
 	return findElementOrElements(selector, context, false) as never;
 }
 

package/src/find/relative.ts

@@ -2,10 +2,7 @@
  * - Get the distance between two elements _(i.e., the amount of nodes of between them)_
  * - If the distance cannot be calculated, `-1` is returned
  */
-function getDistanceBetweenElements(
-	origin: Element,
-	target: Element,
-): number | undefined {
+function getDistanceBetweenElements(origin: Element, target: Element): number | undefined {
 	if (origin === target || origin.parentElement === target) {
 		return 0;
 	}
@@ -20,12 +17,7 @@ function getDistanceBetweenElements(
 	const beforeOrInside = !!(comparison & 2 || comparison & 8);
 
 	if (beforeOrInside || !!(comparison & 4 || comparison & 16)) {
-		return (
-			traverse(
-				beforeOrInside ? origin : target,
-				beforeOrInside ? target : origin,
-			) ?? -1
-		);
+		return traverse(beforeOrInside ? origin : target, beforeOrInside ? target : origin) ?? -1;
 	}
 }
 
@@ -137,9 +129,7 @@ export function findRelatives(
 
 	return minimum == null
 		? []
-		: distances
-				.filter(found => found.distance === minimum)
-				.map(found => found.element);
+		: distances.filter(found => found.distance === minimum).map(found => found.element);
 }
 
 function traverse(from: Element, to: Element): number | undefined {
@@ -161,9 +151,7 @@ function traverse(from: Element, to: Element): number | undefined {
 		const children = [...(parent.children ?? [])];
 
 		if (children.includes(to)) {
-			return (
-				distance + Math.abs(children.indexOf(current) - children.indexOf(to))
-			);
+			return distance + Math.abs(children.indexOf(current) - children.indexOf(to));
 		}
 
 		index = children.findIndex(child => child.contains(to));

package/src/focusable.ts

@@ -41,8 +41,7 @@ function getTabIndex(element: Element): number {
 
 	if (
 		tabIndex < TABINDEX_BASE &&
-		(EXPRESSION_SPECIAL_TABINDEX.test(element.tagName) ||
-			isEditable(element)) &&
+		(EXPRESSION_SPECIAL_TABINDEX.test(element.tagName) || isEditable(element)) &&
 		!hasTabIndex(element)
 	) {
 		return TABINDEX_BASE;
@@ -51,11 +50,7 @@ function getTabIndex(element: Element): number {
 	return tabIndex;
 }
 
-function getValidElements(
-	parent: Element,
-	filters: Filter[],
-	tabbable: boolean,
-): Element[] {
+function getValidElements(parent: Element, filters: Filter[], tabbable: boolean): Element[] {
 	if (!(parent instanceof Element)) {
 		return [];
 	}
@@ -88,10 +83,7 @@ function getValidElements(
 		if (item.tabIndex === TABINDEX_BASE) {
 			zeroed.push(item.element);
 		} else {
-			indiced[item.tabIndex] = [
-				...(indiced[item.tabIndex] ?? []),
-				item.element,
-			];
+			indiced[item.tabIndex] = [...(indiced[item.tabIndex] ?? []), item.element];
 		}
 	}
 
@@ -99,16 +91,11 @@ function getValidElements(
 }
 
 function hasTabIndex(element: Element): boolean {
-	return !Number.isNaN(
-		Number.parseInt(element.getAttribute(ATTRIBUTE_TABINDEX) as string, 10),
-	);
+	return !Number.isNaN(Number.parseInt(element.getAttribute(ATTRIBUTE_TABINDEX) as string, 10));
 }
 
 function isDisabled(item: ElementWithTabIndex): boolean {
-	if (
-		EXPRESSION_DISABLEABLE.test(item.element.tagName) &&
-		isDisabledFromFieldset(item.element)
-	) {
+	if (EXPRESSION_DISABLEABLE.test(item.element.tagName) && isDisabledFromFieldset(item.element)) {
 		return true;
 	}
 
@@ -127,10 +114,7 @@ function isDisabledFromFieldset(element: Element): boolean {
 				const child = children[index];
 
 				if (child instanceof HTMLLegendElement) {
-					return (
-						parent.matches(SELECTOR_FIELDSET_DISABLED) ||
-						!child.contains(element)
-					);
+					return parent.matches(SELECTOR_FIELDSET_DISABLED) || !child.contains(element);
 				}
 			}
 
@@ -144,9 +128,7 @@ function isDisabledFromFieldset(element: Element): boolean {
 }
 
 function isEditable(element: Element): boolean {
-	return EXPRESSION_TRUEISH.test(
-		element.getAttribute(ATTRIBUTE_CONTENTEDITABLE) as string,
-	);
+	return EXPRESSION_TRUEISH.test(element.getAttribute(ATTRIBUTE_CONTENTEDITABLE) as string);
 }
 
 /**
@@ -155,25 +137,20 @@ function isEditable(element: Element): boolean {
  * @returns `true` if focusable, otherwise `false`
  */
 export function isFocusable(element: Element): boolean {
-	return element instanceof Element
-		? isValidElement(element, FILTERS_FOCUSABLE, false)
-		: false;
+	return element instanceof Element ? isValidElement(element, FILTERS_FOCUSABLE, false) : false;
 }
 
 function isHidden(item: ElementWithTabIndex): boolean {
 	if (
 		((item.element as HTMLElement).hidden ?? false) ||
-		(item.element instanceof HTMLInputElement &&
-			item.element.type === STYLE_HIDDEN)
+		(item.element instanceof HTMLInputElement && item.element.type === STYLE_HIDDEN)
 	) {
 		return true;
 	}
 
 	const isDirectSummary = item.element.matches(SELECTOR_SUMMARY_FIRST);
 
-	const nodeUnderDetails = isDirectSummary
-		? item.element.parentElement
-		: item.element;
+	const nodeUnderDetails = isDirectSummary ? item.element.parentElement : item.element;
 
 	if (nodeUnderDetails?.matches(SELECTOR_DETAILS_CLOSED_CHILDREN) ?? false) {
 		return true;
@@ -193,9 +170,7 @@ function isHidden(item: ElementWithTabIndex): boolean {
 function isInert(item: ElementWithTabIndex): boolean {
 	return (
 		((item.element as InertElement).inert ?? false) ||
-		EXPRESSION_TRUEISH.test(
-			item.element.getAttribute(ATTRIBUTE_INERT) as string,
-		) ||
+		EXPRESSION_TRUEISH.test(item.element.getAttribute(ATTRIBUTE_INERT) as string) ||
 		(item.element.parentElement != null &&
 			isInert({
 				element: item.element.parentElement,
@@ -218,10 +193,7 @@ function isNotTabbableRadio(item: ElementWithTabIndex): boolean {
 		return false;
 	}
 
-	const parent =
-		item.element.form ??
-		item.element.getRootNode?.() ??
-		item.element.ownerDocument;
+	const parent = item.element.form ?? item.element.getRootNode?.() ?? item.element.ownerDocument;
 
 	const realName = CSS?.escape?.(item.element.name) ?? item.element.name;
 
@@ -239,9 +211,7 @@ function isNotTabbableRadio(item: ElementWithTabIndex): boolean {
 function isSummarised(item: ElementWithTabIndex): boolean {
 	return (
 		item.element instanceof HTMLDetailsElement &&
-		[...item.element.children].some(child =>
-			EXPRESSION_SUMMARY.test(child.tagName),
-		)
+		[...item.element.children].some(child => EXPRESSION_SUMMARY.test(child.tagName))
 	);
 }
 
@@ -251,16 +221,10 @@ function isSummarised(item: ElementWithTabIndex): boolean {
  * @returns `true` if tabbable, otherwise `false`
  */
 export function isTabbable(element: Element): boolean {
-	return element instanceof Element
-		? isValidElement(element, FILTERS_TABBABLE, true)
-		: false;
+	return element instanceof Element ? isValidElement(element, FILTERS_TABBABLE, true) : false;
 }
 
-function isValidElement(
-	element: Element,
-	filters: Filter[],
-	tabbable: boolean,
-): boolean {
+function isValidElement(element: Element, filters: Filter[], tabbable: boolean): boolean {
 	const item = getItem(element, tabbable);
 
 	return !filters.some(filter => filter(item));