@oscarpalmer/toretto 0.31.0 → 0.33.0

package/src/internal/element-value.ts

@@ -1,28 +1,57 @@
-import type {PlainObject} from '@oscarpalmer/atoms';
-import {isNullableOrWhitespace, isPlainObject} from '@oscarpalmer/atoms/is';
+import {isNullableOrWhitespace} from '@oscarpalmer/atoms/is';
 import {isHTMLOrSVGElement} from '../is';
+import {isAttribute} from './attribute';
 
-export function setElementValues(
+export function setElementValue(
 	element: Element,
-	first: PlainObject | string,
+	first: unknown,
 	second: unknown,
+	third: unknown,
 	callback: (element: Element, key: string, value: unknown) => void,
 ): void {
 	if (!isHTMLOrSVGElement(element)) {
 		return;
 	}
 
-	if (isPlainObject(first)) {
-		const entries = Object.entries(first);
-		const {length} = entries;
+	if (typeof first === 'string') {
+		setElementValues(element, first, second, third, callback);
+	} else if (isAttribute(first)) {
+		setElementValues(element, first.name, first.value, third, callback);
+	}
+}
+
+export function setElementValues(
+	element: Element,
+	first: unknown,
+	second: unknown,
+	third: unknown,
+	callback: (element: Element, key: string, value: unknown, dispatch?: unknown) => void,
+): void {
+	if (!isHTMLOrSVGElement(element)) {
+		return;
+	}
+
+	if (typeof first === 'string') {
+		callback(element, first, second, third);
+
+		return;
+	}
+
+	const isArray = Array.isArray(first);
+
+	if (!isArray && !(typeof first === 'object' && first !== null)) {
+		return;
+	}
+
+	const entries = isArray ? first : Object.entries(first).map(([name, value]) => ({name, value}));
+	const {length} = entries;
 
-		for (let index = 0; index < length; index += 1) {
-			const [key, value] = entries[index];
+	for (let index = 0; index < length; index += 1) {
+		const entry = entries[index];
 
-			callback(element, key, value);
+		if (typeof entry === 'object' && typeof entry?.name === 'string') {
+			callback(element, entry.name, entry.value, third);
 		}
-	} else if (typeof first === 'string') {
-		callback(element, first, second);
 	}
 }
 
@@ -32,9 +61,10 @@ export function updateElementValue(
 	value: unknown,
 	set: (key: string, value: string) => void,
 	remove: (key: string) => void,
+	isBoolean: boolean,
 	json: boolean,
 ): void {
-	if (isNullableOrWhitespace(value)) {
+	if (isBoolean ? value == null : isNullableOrWhitespace(value)) {
 		remove.call(element, key);
 	} else {
 		set.call(element, key, json ? JSON.stringify(value) : String(value));

package/src/models.ts

@@ -1,9 +1,9 @@
 /**
  * Attribute for an element
  */
-export type Attribute<Value = unknown> = {
+export type Attribute = {
 	name: string;
-	value: Value;
+	value: unknown;
 };
 
 /**
@@ -19,11 +19,6 @@ export type EventPosition = {
 	y: number;
 };
 
-/**
- * Property for an element
- */
-export type Property = Attribute<unknown>;
-
 /**
  * Event listener that can be removed
  */

package/src/style.ts

@@ -97,7 +97,7 @@ export function setStyle(
 	property: keyof CSSStyleDeclaration,
 	value?: string,
 ): void {
-	setElementValues(element, property as string, value, updateStyleProperty);
+	setElementValues(element, property as string, value, null, updateStyleProperty);
 }
 
 /**
@@ -106,7 +106,7 @@ export function setStyle(
  * @param styles Styles to set
  */
 export function setStyles(element: Element, styles: Partial<CSSStyleDeclaration>): void {
-	setElementValues(element, styles as never, null, updateStyleProperty);
+	setElementValues(element, styles as never, null, null, updateStyleProperty);
 }
 
 /**
@@ -169,6 +169,7 @@ function updateStyleProperty(element: Element, key: string, value: unknown): voi
 			(this as HTMLElement).style[property as never] = '';
 		},
 		false,
+		false,
 	);
 }
 

package/types/attribute/set.d.ts

@@ -1,4 +1,15 @@
-import type { Attribute, Property } from '../models';
+import type { Attribute } from '../models';
+type DispatchedAttribute = 'checked' | 'open' | 'value';
+/**
+ * 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 dispatch Dispatch event for attribute? _(defaults to `true`)_
+ */
+export declare function setAttribute<Name extends DispatchedAttribute>(element: Element, name: Name, value?: unknown, dispatch?: boolean): void;
 /**
  * Set an attribute on an element
  *
@@ -14,54 +25,25 @@ export declare function setAttribute(element: Element, name: string, value?: unk
  * _(Or remove it, if value is `null` or `undefined`)_
  * @param element Element for attribute
  * @param attribute Attribute to set
+ * @param dispatch Dispatch event for attribute? _(defaults to `true`)_
  */
-export declare function setAttribute(element: Element, attribute: Attr | Attribute): void;
+export declare function setAttribute(element: Element, attribute: Attr | Attribute, dispatch?: boolean): void;
 /**
  * Set one or more attributes on an element
  *
  * _(Or remove them, if their value is `null` or `undefined`)_
  * @param element Element for attributes
  * @param attributes Attributes to set
+ * @param dispatch Dispatch events for relevant attributes? _(defaults to `true`)_
  */
-export declare function setAttributes(element: Element, attributes: Array<Attr | Attribute>): void;
+export declare function setAttributes(element: Element, attributes: Array<Attr | Attribute>, dispatch?: boolean): void;
 /**
  * Set one or more attributes on an element
  *
  * _(Or remove them, if their value is `null` or `undefined`)_
  * @param element Element for attributes
  * @param attributes Attributes to set
+ * @param dispatch Dispatch events for relevant attributes? _(defaults to `true`)_
  */
-export declare function setAttributes(element: Element, attributes: Record<string, unknown>): 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
- */
-export declare function setProperty(element: Element, 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 property Property to set
- */
-export declare function setProperty(element: Element, property: Property): void;
-/**
- * Set one or more properties on an element
- *
- * _(Or remove them, if their value is not an empty string or does not match the name)_
- * @param element Element for properties
- * @param properties Properties to set
- */
-export declare function setProperties(element: Element, properties: Property[]): void;
-/**
- * Set one or more properties on an element
- *
- * _(Or remove them, if their value is not an empty string or does not match the name)_
- * @param element Element for properties
- * @param properties Properties to set
- */
-export declare function setProperties(element: Element, properties: Record<string, unknown>): void;
+export declare function setAttributes(element: Element, attributes: Record<string, unknown>, dispatch?: boolean): void;
+export {};

package/types/event/delegation.d.ts

@@ -4,4 +4,4 @@ export type EventTargetWithListeners = EventTarget & Partial<{
 }>;
 export declare function addDelegatedListener(target: EventTargetWithListeners, type: string, name: string, listener: EventListener | CustomEventListener, passive: boolean): RemovableEventListener;
 export declare function getDelegatedName(target: EventTarget, type: string, options: AddEventListenerOptions): string | undefined;
-export declare function removeDelegatedListener(target: EventTargetWithListeners, type: string, name: string, listener: EventListener | CustomEventListener, passive: boolean): boolean;
+export declare function removeDelegatedListener(target: EventTargetWithListeners, name: string, listener: EventListener | CustomEventListener): boolean;

package/types/find/index.d.ts

@@ -23,4 +23,4 @@ export declare function findElements(selector: Selector, context?: Selector | nu
  */
 export declare function getElementUnderPointer(skipIgnore?: boolean): Element | null;
 export { findElement as $, findElements as $$ };
-export { findAncestor, findRelatives } from './relative';
+export { findAncestor, findRelatives, getDistance } from './relative';

package/types/find/relative.d.ts

@@ -11,11 +11,17 @@ export declare function findAncestor(origin: Element, selector: string | ((eleme
 /**
  * Finds the closest elements to the origin element that matches the selector
  *
- * - Traverses up, down, and sideways in the _DOM_-tree
- * - _(If you only want to traverse up, use {@link findAncestor})_
+ * Traverses up, down, and sideways in the _DOM_-tree. _(If you only want to traverse up, use {@link findAncestor})_
  * @param origin Element to start from
  * @param selector Selector to match
  * @param context Context to search within
  * @returns Found elements
  */
 export declare function findRelatives(origin: Element, selector: string, context?: Document | Element): Element[];
+/**
+ * Get the distance between two elements _(i.e., the amount of nodes of between them)_
+ * @param origin Origin element
+ * @param target Target element
+ * @returns Distance between elements, or `-1` if distance cannot be calculated
+ */
+export declare function getDistance(origin: Element, target: Element): number;

package/types/index.d.ts

@@ -1,5 +1,5 @@
 import supportsTouch from './touch';
-export { isBadAttribute, isBooleanAttribute, isEmptyNonBooleanAttribute, isInvalidBooleanAttribute, } from './attribute';
+export { isBadAttribute, isBooleanAttribute, isEmptyNonBooleanAttribute, isInvalidBooleanAttribute, } from './attribute/index';
 export * from './data';
 export * from './event/index';
 export * from './find/index';

package/types/internal/attribute.d.ts

@@ -1,11 +1,10 @@
-import type { Attribute, Property } from '../models';
+import type { Attribute } from '../models';
+export declare function isAttribute(value: unknown): value is Attr | Attribute;
 export declare function _isBadAttribute(first: unknown, second: unknown, decode: boolean): boolean;
 export declare function _isBooleanAttribute(first: unknown, decode: boolean): boolean;
 export declare function _isEmptyNonBooleanAttribute(first: unknown, second: unknown, decode: boolean): boolean;
 export declare function _isInvalidBooleanAttribute(first: unknown, second: unknown, decode: boolean): boolean;
-export declare function isProperty(value: unknown): value is Property;
-export declare function updateValue(element: Element, first: unknown, second: unknown): void;
-export declare function updateValues(element: Element, values: Attribute<unknown>[] | Record<string, unknown>): void;
+export declare function updateAttribute(element: Element, name: string, value: unknown, dispatch?: unknown): void;
 /**
  * List of boolean attributes
  */

package/types/internal/element-value.d.ts

@@ -1,3 +1,3 @@
-import type { PlainObject } from '@oscarpalmer/atoms';
-export declare function setElementValues(element: Element, first: PlainObject | string, second: unknown, callback: (element: Element, key: string, value: unknown) => void): void;
-export declare function updateElementValue(element: Element, key: string, value: unknown, set: (key: string, value: string) => void, remove: (key: string) => void, json: boolean): void;
+export declare function setElementValue(element: Element, first: unknown, second: unknown, third: unknown, callback: (element: Element, key: string, value: unknown) => void): void;
+export declare function setElementValues(element: Element, first: unknown, second: unknown, third: unknown, callback: (element: Element, key: string, value: unknown, dispatch?: unknown) => void): void;
+export declare function updateElementValue(element: Element, key: string, value: unknown, set: (key: string, value: string) => void, remove: (key: string) => void, isBoolean: boolean, json: boolean): void;

package/types/models.d.ts

@@ -1,9 +1,9 @@
 /**
  * Attribute for an element
  */
-export type Attribute<Value = unknown> = {
+export type Attribute = {
     name: string;
-    value: Value;
+    value: unknown;
 };
 /**
  * Event listener for custom events
@@ -16,10 +16,6 @@ export type EventPosition = {
     x: number;
     y: number;
 };
-/**
- * Property for an element
- */
-export type Property = Attribute<unknown>;
 /**
  * Event listener that can be removed
  */