@oscarpalmer/toretto 0.49.0 → 0.49.1

package/dist/aria.d.mts

@@ -72,7 +72,7 @@ declare function setAria(element: Element, attributes: AriaAttributeItem[]): voi
  * @param element Element for _ARIA_ attributes
  * @param attributes _ARIA_ attributes to set
  */
-declare function setAria(element: Element, attributes: { [Key in AnyAriaAttribute]?: Key extends AnyAriaBooleanAttribute ? boolean | string : string; }): void;
+declare function setAria(element: Element, attributes: Record<string, unknown>): void;
 /**
  * Set the role of an element
  *

package/dist/aria.mjs

@@ -47,7 +47,7 @@ function updateAriaAttribute(element, key, value) {
 	const name = getName(key);
 	let actual = value;
 	if (ariaBooleanAttributesSet.has(name) && typeof value === "string" && EXPRESSION_BOOLEAN.test(value)) actual = value.toLowerCase() === "true";
-	updateElementValue(element, name, actual, element.setAttribute, element.removeAttribute, false, false);
+	updateElementValue(element, name, actual, element.setAttribute, element.removeAttribute, false);
 }
 const ATTRIBUTE_ARIA_PREFIX = "aria-";
 const EXPRESSION_ARIA_PREFIX = /^aria-/i;

package/dist/data.mjs

@@ -6,21 +6,21 @@ import { camelCase, kebabCase } from "@oscarpalmer/atoms/string/case";
 function getData(element, keys, parseValues) {
 	if (!(element instanceof Element)) return;
 	const noParse = parseValues === false;
-	if (typeof keys === "string") {
-		const value = element.dataset[camelCase(keys)];
-		if (value === void 0) return;
-		return noParse ? value : parse(value);
-	}
+	if (typeof keys === "string") return getDataValue(element, keys, noParse);
 	const { length } = keys;
 	const data = {};
 	for (let index = 0; index < length; index += 1) {
 		const key = keys[index];
-		const value = element.dataset[camelCase(key)];
-		if (value == null) data[key] = void 0;
-		else data[key] = noParse ? value : parse(value);
+		data[key] = getDataValue(element, key, noParse);
 	}
 	return data;
 }
+function getDataValue(element, key, noParse) {
+	const value = element.dataset[camelCase(key)];
+	if (value == null) return;
+	if (noParse) return value;
+	return parse(value) ?? value;
+}
 function getName(original) {
 	return `${ATTRIBUTE_DATA_PREFIX}${kebabCase(original.replace(EXPRESSION_DATA_PREFIX, ""))}`;
 }
@@ -28,7 +28,7 @@ function setData(element, first, second) {
 	setElementValues(element, first, second, null, updateDataAttribute);
 }
 function updateDataAttribute(element, key, value) {
-	updateElementValue(element, getName(key), value, element.setAttribute, element.removeAttribute, false, true);
+	updateElementValue(element, getName(key), value, element.setAttribute, element.removeAttribute, true);
 }
 const ATTRIBUTE_DATA_PREFIX = "data-";
 //#endregion

package/dist/index.d.mts

@@ -168,7 +168,7 @@ declare function setAria(element: Element, attributes: AriaAttributeItem[]): voi
  * @param element Element for _ARIA_ attributes
  * @param attributes _ARIA_ attributes to set
  */
-declare function setAria(element: Element, attributes: { [Key in AnyAriaAttribute]?: Key extends AnyAriaBooleanAttribute ? boolean | string : string; }): void;
+declare function setAria(element: Element, attributes: Record<string, unknown>): void;
 /**
  * Set the role of an element
  *

package/dist/index.mjs

@@ -528,7 +528,7 @@ function updateAttribute(element, name, value, dispatch) {
 	const isBoolean = booleanAttributesSet.has(lowerCaseName);
 	const next = isBoolean ? value === true || typeof value === "string" && (value === "" || value.toLowerCase() === lowerCaseName) : value == null ? "" : value;
 	if (isBoolean || dispatchedAttributes.has(name)) updateProperty(element, name, next, dispatch);
-	updateElementValue(element, name, isBoolean ? next ? "" : null : value, element.setAttribute, element.removeAttribute, isBoolean, false);
+	updateElementValue(element, name, isBoolean ? next ? "" : null : value, element.setAttribute, element.removeAttribute, false);
 }
 const EXPRESSION_CLOBBERED_NAME = /^(id|name)$/i;
 const EXPRESSION_DATA_OR_SCRIPT = /^(?:data|\w+script):/i;
@@ -577,6 +577,10 @@ const formElement = document.createElement("form");
 let textArea;
 //#endregion
 //#region src/internal/element-value.ts
+function getValueForAttribute(value, json) {
+	if (typeof value === "string") return value;
+	return json ? JSON.stringify(value) : getString(value);
+}
 function ignoreSetAttribute(element, name) {
 	if (element instanceof HTMLTextAreaElement && name === "value") return true;
 	return false;
@@ -608,9 +612,9 @@ function setElementValues(element, first, second, third, callback, style) {
 		if (typeof entry === "object" && typeof entry?.name === "string") callback(element, normalizeKey(entry.name, style), entry.value, dispatch);
 	}
 }
-function updateElementValue(element, key, value, set, remove, isBoolean, json) {
+function updateElementValue(element, key, value, set, remove, json) {
 	if (value == null) remove.call(element, key);
-	else if (!ignoreSetAttribute(element, key)) set.call(element, key, json ? JSON.stringify(value) : getString(value));
+	else if (!ignoreSetAttribute(element, key)) set.call(element, key, getValueForAttribute(value, json));
 }
 const CSS_VARIABLE_PREFIX$1 = "--";
 //#endregion
@@ -662,7 +666,7 @@ function updateAriaAttribute(element, key, value) {
 	const name = getName$1(key);
 	let actual = value;
 	if (ariaBooleanAttributesSet.has(name) && typeof value === "string" && EXPRESSION_BOOLEAN.test(value)) actual = value.toLowerCase() === "true";
-	updateElementValue(element, name, actual, element.setAttribute, element.removeAttribute, false, false);
+	updateElementValue(element, name, actual, element.setAttribute, element.removeAttribute, false);
 }
 const ATTRIBUTE_ARIA_PREFIX = "aria-";
 const EXPRESSION_ARIA_PREFIX = /^aria-/i;
@@ -758,21 +762,21 @@ function isInvalidBooleanAttribute(first, second) {
 function getData(element, keys, parseValues) {
 	if (!(element instanceof Element)) return;
 	const noParse = parseValues === false;
-	if (typeof keys === "string") {
-		const value = element.dataset[camelCase(keys)];
-		if (value === void 0) return;
-		return noParse ? value : parse(value);
-	}
+	if (typeof keys === "string") return getDataValue(element, keys, noParse);
 	const { length } = keys;
 	const data = {};
 	for (let index = 0; index < length; index += 1) {
 		const key = keys[index];
-		const value = element.dataset[camelCase(key)];
-		if (value == null) data[key] = void 0;
-		else data[key] = noParse ? value : parse(value);
+		data[key] = getDataValue(element, key, noParse);
 	}
 	return data;
 }
+function getDataValue(element, key, noParse) {
+	const value = element.dataset[camelCase(key)];
+	if (value == null) return;
+	if (noParse) return value;
+	return parse(value) ?? value;
+}
 function getName(original) {
 	return `${ATTRIBUTE_DATA_PREFIX}${kebabCase(original.replace(EXPRESSION_DATA_PREFIX, ""))}`;
 }
@@ -780,7 +784,7 @@ function setData(element, first, second) {
 	setElementValues(element, first, second, null, updateDataAttribute);
 }
 function updateDataAttribute(element, key, value) {
-	updateElementValue(element, getName(key), value, element.setAttribute, element.removeAttribute, false, true);
+	updateElementValue(element, getName(key), value, element.setAttribute, element.removeAttribute, true);
 }
 const ATTRIBUTE_DATA_PREFIX = "data-";
 //#endregion
@@ -942,7 +946,7 @@ function updateStyleProperty(element, key, value) {
 		if (name.startsWith(VARIABLE_PREFIX)) this.style.removeProperty(name);
 		else this.style[name] = "";
 		if (this.getAttribute(ATTRIBUTE_STYLE) === "") this.removeAttribute(ATTRIBUTE_STYLE);
-	}, false, false);
+	}, false);
 }
 const ATTRIBUTE_STYLE = "style";
 const DIRECTION_LTR = "ltr";

package/dist/internal/attribute.mjs

@@ -56,7 +56,7 @@ function updateAttribute(element, name, value, dispatch) {
 	const isBoolean = booleanAttributesSet.has(lowerCaseName);
 	const next = isBoolean ? value === true || typeof value === "string" && (value === "" || value.toLowerCase() === lowerCaseName) : value == null ? "" : value;
 	if (isBoolean || dispatchedAttributes.has(name)) updateProperty(element, name, next, dispatch);
-	updateElementValue(element, name, isBoolean ? next ? "" : null : value, element.setAttribute, element.removeAttribute, isBoolean, false);
+	updateElementValue(element, name, isBoolean ? next ? "" : null : value, element.setAttribute, element.removeAttribute, false);
 }
 const EXPRESSION_CLOBBERED_NAME = /^(id|name)$/i;
 const EXPRESSION_DATA_OR_SCRIPT = /^(?:data|\w+script):/i;

package/dist/internal/element-value.d.mts

@@ -1,6 +1,6 @@
 //#region src/internal/element-value.d.ts
 declare function setElementValue(element: Element, first: unknown, second: unknown, third: unknown, callback: (element: Element, key: string, value: unknown, dispatch: boolean) => void, style?: boolean): void;
 declare function setElementValues(element: Element, first: unknown, second: unknown, third: unknown, callback: (element: Element, key: string, value: unknown, dispatch: boolean) => void, style?: boolean): void;
-declare function updateElementValue(element: Element, key: string, value: unknown, set: (key: string, value: string) => void, remove: (key: string) => void, isBoolean: boolean, json: boolean): void;
+declare function updateElementValue(element: Element, key: string, value: unknown, set: (key: string, value: string) => void, remove: (key: string) => void, json: boolean): void;
 //#endregion
 export { setElementValue, setElementValues, updateElementValue };

package/dist/internal/element-value.mjs

@@ -2,6 +2,10 @@ import { isAttribute } from "./attribute.mjs";
 import { getString } from "@oscarpalmer/atoms/string";
 import { kebabCase } from "@oscarpalmer/atoms/string/case";
 //#region src/internal/element-value.ts
+function getValueForAttribute(value, json) {
+	if (typeof value === "string") return value;
+	return json ? JSON.stringify(value) : getString(value);
+}
 function ignoreSetAttribute(element, name) {
 	if (element instanceof HTMLTextAreaElement && name === "value") return true;
 	return false;
@@ -33,9 +37,9 @@ function setElementValues(element, first, second, third, callback, style) {
 		if (typeof entry === "object" && typeof entry?.name === "string") callback(element, normalizeKey(entry.name, style), entry.value, dispatch);
 	}
 }
-function updateElementValue(element, key, value, set, remove, isBoolean, json) {
+function updateElementValue(element, key, value, set, remove, json) {
 	if (value == null) remove.call(element, key);
-	else if (!ignoreSetAttribute(element, key)) set.call(element, key, json ? JSON.stringify(value) : getString(value));
+	else if (!ignoreSetAttribute(element, key)) set.call(element, key, getValueForAttribute(value, json));
 }
 const CSS_VARIABLE_PREFIX = "--";
 //#endregion

package/dist/style.mjs

@@ -100,7 +100,7 @@ function updateStyleProperty(element, key, value) {
 		if (name.startsWith(VARIABLE_PREFIX)) this.style.removeProperty(name);
 		else this.style[name] = "";
 		if (this.getAttribute(ATTRIBUTE_STYLE) === "") this.removeAttribute(ATTRIBUTE_STYLE);
-	}, false, false);
+	}, false);
 }
 const ATTRIBUTE_STYLE = "style";
 const DIRECTION_LTR = "ltr";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oscarpalmer/toretto",
-	"version": "0.49.0",
+	"version": "0.49.1",
 	"description": "A collection of badass DOM utilities.",
 	"keywords": [
 		"dom",

package/src/aria.ts

@@ -149,12 +149,7 @@ export function setAria(element: Element, attributes: AriaAttributeItem[]): void
  * @param element Element for _ARIA_ attributes
  * @param attributes _ARIA_ attributes to set
  */
-export function setAria(
-	element: Element,
-	attributes: {
-		[Key in AnyAriaAttribute]?: Key extends AnyAriaBooleanAttribute ? boolean | string : string;
-	},
-): void;
+export function setAria(element: Element, attributes: Record<string, unknown>): void;
 
 export function setAria(element: Element, first: unknown, second?: unknown): void {
 	setElementValues(element, first, second, null, updateAriaAttribute);
@@ -202,7 +197,6 @@ function updateAriaAttribute(element: Element, key: string, value: unknown): voi
 		// oxlint-disable-next-line typescript/unbound-method
 		element.removeAttribute,
 		false,
-		false,
 	);
 }
 

package/src/data.ts

@@ -56,13 +56,7 @@ export function getData(element: Element, keys: string | string[], parseValues?:
 	const noParse = parseValues === false;
 
 	if (typeof keys === 'string') {
-		const value = (element as HTMLElement).dataset[camelCase(keys)];
-
-		if (value === undefined) {
-			return;
-		}
-
-		return noParse ? value : parse(value);
+		return getDataValue(element, keys, noParse);
 	}
 
 	const {length} = keys;
@@ -71,18 +65,27 @@ export function getData(element: Element, keys: string | string[], parseValues?:
 
 	for (let index = 0; index < length; index += 1) {
 		const key = keys[index];
-		const value = (element as HTMLElement).dataset[camelCase(key)];
 
-		if (value == null) {
-			data[key] = undefined;
-		} else {
-			data[key] = noParse ? value : parse(value);
-		}
+		data[key] = getDataValue(element, key, noParse);
 	}
 
 	return data;
 }
 
+function getDataValue(element: Element, key: string, noParse: boolean): unknown {
+	const value = (element as HTMLElement).dataset[camelCase(key)];
+
+	if (value == null) {
+		return;
+	}
+
+	if (noParse) {
+		return value;
+	}
+
+	return parse(value) ?? value;
+}
+
 function getName(original: string): string {
 	return `${ATTRIBUTE_DATA_PREFIX}${kebabCase(original.replace(EXPRESSION_DATA_PREFIX, ''))}`;
 }
@@ -119,7 +122,6 @@ function updateDataAttribute(element: Element, key: string, value: unknown): voi
 		// Using `.call` in `updateElementValue`
 		// oxlint-disable-next-line typescript/unbound-method
 		element.removeAttribute,
-		false,
 		true,
 	);
 }

package/src/internal/attribute.ts

@@ -148,7 +148,6 @@ export function updateAttribute(
 		// Using `.call` in `updateElementValue`
 		// oxlint-disable-next-line typescript/unbound-method
 		element.removeAttribute,
-		isBoolean,
 		false,
 	);
 }

package/src/internal/element-value.ts

@@ -4,6 +4,14 @@ import {isAttribute} from './attribute';
 
 // #region Functions
 
+function getValueForAttribute(value: unknown, json: boolean): string | undefined {
+	if (typeof value === 'string') {
+		return value;
+	}
+
+	return json ? JSON.stringify(value) : getString(value);
+}
+
 function ignoreSetAttribute(element: Element, name: string): boolean {
 	if (element instanceof HTMLTextAreaElement && name === 'value') {
 		return true;
@@ -79,13 +87,12 @@ export function updateElementValue(
 	value: unknown,
 	set: (key: string, value: string) => void,
 	remove: (key: string) => void,
-	isBoolean: boolean,
 	json: boolean,
 ): void {
 	if (value == null) {
 		remove.call(element, key);
 	} else if (!ignoreSetAttribute(element, key)) {
-		set.call(element, key, json ? JSON.stringify(value) : getString(value));
+		set.call(element, key, getValueForAttribute(value, json) as string);
 	}
 }
 

package/src/style.ts

@@ -201,7 +201,6 @@ function updateStyleProperty(element: Element, key: string, value: unknown): voi
 			}
 		},
 		false,
-		false,
 	);
 }