@oscarpalmer/toretto 0.48.0 → 0.49.1

package/dist/aria.d.mts

@@ -1,18 +1,25 @@
-import { AriaAttribute, AriaAttributeUnprefixed, AriaRole } from "./models.mjs";
+import { AnyAriaAttribute, AnyAriaBooleanAttribute, AriaRole } from "./models.mjs";
 //#region src/aria.d.ts
-type AnyAriaAttribute = AriaAttribute | AriaAttributeUnprefixed;
-type AriaAttributeItem = {
-  name: AnyAriaAttribute;
-  value?: string;
+type AriaAttributeItem<Name extends AnyAriaAttribute = AnyAriaAttribute> = {
+  name: Name;
+  value?: Name extends AnyAriaBooleanAttribute ? boolean | string : string;
 };
 /**
  * Get the value of a specific _ARIA_ attribute from an element
  *
  * @param element Element to get _ARIA_ attribute from
- * @param name _ARIA_ name
+ * @param name _ARIA_ attribute name
  * @returns _ARIA_ value _(or `undefined`)_
  */
-declare function getAria(element: Element, attribute: AnyAriaAttribute): string | undefined;
+declare function getAria(element: Element, name: AnyAriaBooleanAttribute): boolean | string | undefined;
+/**
+ * Get the value of a specific _ARIA_ attribute from an element
+ *
+ * @param element Element to get _ARIA_ attribute from
+ * @param name _ARIA_ attribute name
+ * @returns _ARIA_ value _(or `undefined`)_
+ */
+declare function getAria(element: Element, name: AnyAriaAttribute): string | undefined;
 /**
  * Get specific _ARIA_ attributes from an element
  *
@@ -20,7 +27,7 @@ declare function getAria(element: Element, attribute: AnyAriaAttribute): string
  * @param names _ARIA_ attribute names
  * @returns Object of named _ARIA_ attributes
  */
-declare function getAria<Attribute extends AnyAriaAttribute>(element: Element, attributes: Attribute[]): Record<Attribute, string | undefined>;
+declare function getAria<Attribute extends AnyAriaAttribute>(element: Element, names: Attribute[]): { [Key in Attribute as Key extends `aria-${infer Name}` ? Name : Key]: Key extends AnyAriaBooleanAttribute ? boolean | string | undefined : string | undefined; };
 /**
  * Get the role of an element
  *
@@ -37,7 +44,17 @@ declare function getRole(element: Element): string | undefined;
  * @param attribute _ARIA_ attribute to set
  * @param value _ARIA_ attribute value
  */
-declare function setAria(element: Element, attribute: AnyAriaAttribute, value?: unknown): void;
+declare function setAria(element: Element, attribute: AnyAriaBooleanAttribute, value?: boolean | string): void;
+/**
+ * Set an _ARIA_ attribute on an element
+ *
+ * _(Or remove it, if value is `null` or `undefined`)_
+ *
+ * @param element Element for _ARIA_ attribute
+ * @param attribute _ARIA_ attribute to set
+ * @param value _ARIA_ attribute value
+ */
+declare function setAria(element: Element, attribute: AnyAriaAttribute, value?: string): void;
 /**
  * Set one or more _ARIA_ attributes on an element
  *
@@ -55,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: Partial<Record<AnyAriaAttribute, unknown>>): void;
+declare function setAria(element: Element, attributes: Record<string, unknown>): void;
 /**
  * Set the role of an element
  *
@@ -63,5 +80,13 @@ declare function setAria(element: Element, attributes: Partial<Record<AnyAriaAtt
  * @param role Role to set _(or `undefined` to remove it)_
  */
 declare function setRole(element: Element, role?: AriaRole): void;
+/**
+ * List of _ARIA_ attributes that can be treated as boolean values
+ */
+declare const ariaBooleanAttributes: readonly AnyAriaBooleanAttribute[];
+/**
+ * Set of _ARIA_ attributes that can be treated as boolean values
+ */
+declare const ariaBooleanAttributesSet: Set<AnyAriaBooleanAttribute>;
 //#endregion
-export { getAria, getRole, setAria, setRole };
+export { ariaBooleanAttributes, ariaBooleanAttributesSet, getAria, getRole, setAria, setRole };

package/dist/aria.mjs

@@ -12,7 +12,10 @@ function getAria(element, value) {
 	return arias;
 }
 function getAriaValue(element, attribute) {
-	return element.getAttribute(getName(attribute)) ?? void 0;
+	const name = getName(attribute);
+	const value = element.getAttribute(name) ?? void 0;
+	if (ariaBooleanAttributesSet.has(name) && typeof value === "string" && EXPRESSION_BOOLEAN.test(value)) return value.toLowerCase() === "true";
+	return value;
 }
 function getName(value) {
 	return EXPRESSION_ARIA_PREFIX.test(value) ? value : `${ATTRIBUTE_ARIA_PREFIX}${value}`;
@@ -41,9 +44,38 @@ function setRole(element, role) {
 	else element.removeAttribute("role");
 }
 function updateAriaAttribute(element, key, value) {
-	updateElementValue(element, getName(key), value, element.setAttribute, element.removeAttribute, false, false);
+	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);
 }
 const ATTRIBUTE_ARIA_PREFIX = "aria-";
 const EXPRESSION_ARIA_PREFIX = /^aria-/i;
+const EXPRESSION_BOOLEAN = /^(true|false)$/i;
+/**
+* List of _ARIA_ attributes that can be treated as boolean values
+*/
+const ariaBooleanAttributes = Object.freeze([
+	"aria-atomic",
+	"aria-busy",
+	"aria-checked",
+	"aria-current",
+	"aria-disabled",
+	"aria-expanded",
+	"aria-haspopup",
+	"aria-hidden",
+	"aria-invalid",
+	"aria-modal",
+	"aria-multiline",
+	"aria-multiselectable",
+	"aria-pressed",
+	"aria-readonly",
+	"aria-required",
+	"aria-selected"
+]);
+/**
+* Set of _ARIA_ attributes that can be treated as boolean values
+*/
+const ariaBooleanAttributesSet = new Set(ariaBooleanAttributes);
 //#endregion
-export { getAria, getRole, setAria, setRole };
+export { ariaBooleanAttributes, ariaBooleanAttributesSet, getAria, getRole, setAria, setRole };

package/dist/create.d.mts

@@ -1,26 +1,30 @@
+import { AnyAriaAttribute, AnyAriaBooleanAttribute, CSSValues } from "./models.mjs";
 import { Primitive } from "@oscarpalmer/atoms/models";
 //#region src/create.d.ts
-type Properties<Target extends Element> = { [Property in keyof Target]?: Target[Property] extends Primitive ? Target[Property] : never; };
-type Styles = Partial<Record<keyof CSSStyleDeclaration, unknown>>;
+type CreateElementValues<Target extends Element> = {
+  aria?: CreateElementValuesAria;
+  attribute?: Record<string, unknown>;
+  data?: Record<string, unknown>;
+  property?: CreateElementValuesProperties<Target>;
+  style?: Partial<CSSValues>;
+};
+type CreateElementValuesAria = { [Key in AnyAriaAttribute]?: Key extends AnyAriaBooleanAttribute ? boolean | string : string; };
+type CreateElementValuesProperties<Target extends Element> = { [Property in keyof Target]?: Target[Property] extends Primitive ? Target[Property] : never; };
 /**
  * Creates an _HTML_ element with the specified tag name together with optional properties, attributes, and styles
  *
  * @param tag Tag name
- * @param properties Element properties
- * @param attributes Element attributes
- * @param styles Element styles
+ * @param values Element values
  * @returns Created element
  */
-declare function createElement<TagName extends keyof HTMLElementTagNameMap>(tag: TagName, properties?: Properties<HTMLElementTagNameMap[TagName]>, attributes?: Record<string, unknown>, styles?: Styles): HTMLElementTagNameMap[TagName];
+declare function createElement<TagName extends keyof HTMLElementTagNameMap>(tag: TagName, values?: CreateElementValues<HTMLElementTagNameMap[TagName]>): HTMLElementTagNameMap[TagName];
 /**
  * Creates an _HTML_ element with the specified tag name together with optional properties, attributes, and styles
  *
  * @param tag Tag name
- * @param properties Element properties
- * @param attributes Element attributes
- * @param styles Element styles
+ * @param values Element values
  * @returns Created element
  */
-declare function createElement(tag: string, properties?: Properties<HTMLElement>, attributes?: Record<string, unknown>, styles?: Styles): HTMLUnknownElement;
+declare function createElement(tag: string, values?: CreateElementValues<HTMLElement>): HTMLUnknownElement;
 //#endregion
 export { createElement };

package/dist/create.mjs

@@ -1,17 +1,33 @@
+import { setAria } from "./aria.mjs";
 import { setAttributes } from "./attribute/set.attribute.mjs";
 import "./attribute/index.mjs";
+import { setData } from "./data.mjs";
 import { setProperties } from "./property/set.property.mjs";
 import "./property/index.mjs";
 import { setStyles } from "./style.mjs";
+import { isPlainObject } from "@oscarpalmer/atoms/is";
 //#region src/create.ts
-function createElement(tag, properties, attributes, styles) {
+function createElement(tag, values) {
 	if (typeof tag !== "string") throw new TypeError(MESSAGE);
 	const element = document.createElement(tag);
-	if (properties != null) setProperties(element, properties);
-	if (attributes != null) setAttributes(element, attributes);
-	if (styles != null) setStyles(element, styles);
+	const { aria, attribute, data, property, style } = getElementValues(values);
+	setAria(element, aria ?? {});
+	setAttributes(element, attribute ?? {});
+	setData(element, data ?? {});
+	setProperties(element, property ?? {});
+	setStyles(element, style ?? {});
 	return element;
 }
+function getElementValues(input) {
+	if (!isPlainObject(input)) return {};
+	return {
+		aria: isPlainObject(input.aria) ? input.aria : void 0,
+		attribute: isPlainObject(input.attribute) ? input.attribute : void 0,
+		data: isPlainObject(input.data) ? input.data : void 0,
+		property: isPlainObject(input.property) ? input.property : void 0,
+		style: isPlainObject(input.style) ? input.style : void 0
+	};
+}
 const MESSAGE = "Tag name must be a string";
 //#endregion
 export { createElement };

package/dist/data.d.mts

@@ -1,23 +1,39 @@
 import { PlainObject } from "@oscarpalmer/atoms/models";
 //#region src/data.d.ts
 /**
- * Get a keyed data value from an element
+ * Get a keyed data value from an element, without parsing the value
  *
  * @param element Element to get data from
  * @param key Data key
- * @param parse Parse values? _(defaults to `true`)_
+ * @param parse Parse the value?
  * @returns Data value
  */
-declare function getData(element: Element, key: string, parse?: boolean): unknown;
+declare function getData(element: Element, key: string, parse: false): string | undefined;
 /**
- * Get keyed data values from an element
+ * Get a keyed data value from an element and parse the value
+ *
+ * @param element Element to get data from
+ * @param key Data key
+ * @returns Data value
+ */
+declare function getData(element: Element, key: string): unknown;
+/**
+ * Get keyed data values from an element, without parsing the values
+ *
+ * @param element Element to get data from
+ * @param keys Keys of the data values to get
+ * @param parse Parse the values?
+ * @returns Keyed data values
+ */
+declare function getData<Key extends string>(element: Element, keys: Key[], parse: false): Record<Key, string | undefined>;
+/**
+ * Get keyed data values from an element and parse the values
  *
  * @param element Element to get data from
  * @param keys Keys of the data values to get
- * @param parse Parse values? _(defaults to `true`)_
  * @returns Keyed data values
  */
-declare function getData<Key extends string>(element: Element, keys: Key[], parse?: boolean): Record<Key, unknown>;
+declare function getData<Key extends string>(element: Element, keys: Key[]): Record<Key, unknown>;
 /**
  * Set data values on an element
  *

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

@@ -23,6 +23,14 @@ type SupporsTouch = {
 declare const supportsTouch: SupporsTouch;
 //#endregion
 //#region src/models.d.ts
+/**
+ * Any _ARIA_ attribute for an element _(both prefixed and unprefixed)_
+ */
+type AnyAriaAttribute = AriaAttribute | AriaAttributeUnprefixed;
+/**
+ * Any _ARIA_ attribute for an element that can be set to a boolean value _(both prefixed and unprefixed)_
+ */
+type AnyAriaBooleanAttribute = AriaBooleanAttribute | AriaBooleanAttributeUnprefixed;
 /**
  * _ARIA_ attribute for an element
  *
@@ -34,8 +42,16 @@ type AriaAttribute = keyof AriaAttributes;
  *
  * _(https://www.w3.org/TR/wai-aria-1.3/#aria-attributes)_
  */
-type AriaAttributeUnprefixed = keyof { [Key in AriaAttribute as Key extends `aria-${infer Name}` ? Name : never]: string | null; };
-type AriaAttributes = { [Key in keyof ARIAMixin as NormalizedName<Key>]: string | null; };
+type AriaAttributeUnprefixed = keyof { [Key in AriaAttribute as Key extends `aria-${infer Name}` ? Name : never]: unknown; };
+type AriaAttributes = { [Key in keyof ARIAMixin as NormalizedName<Key>]: unknown; };
+/**
+ * _ARIA_ attribute for an element that can be set to a boolean value
+ */
+type AriaBooleanAttribute = 'aria-atomic' | 'aria-busy' | 'aria-checked' | 'aria-current' | 'aria-disabled' | 'aria-expanded' | 'aria-haspopup' | 'aria-hidden' | 'aria-invalid' | 'aria-modal' | 'aria-multiline' | 'aria-multiselectable' | 'aria-pressed' | 'aria-readonly' | 'aria-required' | 'aria-selected';
+/**
+ * _ARIA_ attribute for an element that can be set to a boolean value, without the `aria-` prefix
+ */
+type AriaBooleanAttributeUnprefixed = keyof { [Key in AriaBooleanAttribute as Key extends `aria-${infer Name}` ? Name : never]: string | null; };
 type NormalizedName<Key extends string> = Key extends `aria${infer Name}` ? Name extends `${infer Part}Element` ? `aria-${Lowercase<Part>}` : Name extends `${infer Part}Elements` ? `aria-${Lowercase<Part>}` : `aria-${Lowercase<Name>}` : never;
 /**
  * _ARIA_ role for an element
@@ -50,6 +66,18 @@ type Attribute = {
   name: string;
   value: unknown;
 };
+/**
+ * CSS styles for an element
+ */
+type CSSStyles = Record<keyof CSSStyleDeclaration, unknown>;
+/**
+ * CSSS values for an element _(both styles and variables)_
+ */
+type CSSValues = CSSVariables & CSSStyles;
+/**
+ * CSS variables for an element
+ */
+type CSSVariables<Value extends Record<string, unknown> = Record<string, unknown>> = { [Property in keyof Value as `--${string & Property}`]?: unknown; };
 /**
  * Event listener for custom events
  */
@@ -68,19 +96,26 @@ type Selector = string | Node | Node[] | NodeList;
 type TextDirection = 'ltr' | 'rtl';
 //#endregion
 //#region src/aria.d.ts
-type AnyAriaAttribute = AriaAttribute | AriaAttributeUnprefixed;
-type AriaAttributeItem = {
-  name: AnyAriaAttribute;
-  value?: string;
+type AriaAttributeItem<Name extends AnyAriaAttribute = AnyAriaAttribute> = {
+  name: Name;
+  value?: Name extends AnyAriaBooleanAttribute ? boolean | string : string;
 };
 /**
  * Get the value of a specific _ARIA_ attribute from an element
  *
  * @param element Element to get _ARIA_ attribute from
- * @param name _ARIA_ name
+ * @param name _ARIA_ attribute name
+ * @returns _ARIA_ value _(or `undefined`)_
+ */
+declare function getAria(element: Element, name: AnyAriaBooleanAttribute): boolean | string | undefined;
+/**
+ * Get the value of a specific _ARIA_ attribute from an element
+ *
+ * @param element Element to get _ARIA_ attribute from
+ * @param name _ARIA_ attribute name
  * @returns _ARIA_ value _(or `undefined`)_
  */
-declare function getAria(element: Element, attribute: AnyAriaAttribute): string | undefined;
+declare function getAria(element: Element, name: AnyAriaAttribute): string | undefined;
 /**
  * Get specific _ARIA_ attributes from an element
  *
@@ -88,7 +123,7 @@ declare function getAria(element: Element, attribute: AnyAriaAttribute): string
  * @param names _ARIA_ attribute names
  * @returns Object of named _ARIA_ attributes
  */
-declare function getAria<Attribute extends AnyAriaAttribute>(element: Element, attributes: Attribute[]): Record<Attribute, string | undefined>;
+declare function getAria<Attribute extends AnyAriaAttribute>(element: Element, names: Attribute[]): { [Key in Attribute as Key extends `aria-${infer Name}` ? Name : Key]: Key extends AnyAriaBooleanAttribute ? boolean | string | undefined : string | undefined; };
 /**
  * Get the role of an element
  *
@@ -105,7 +140,17 @@ declare function getRole(element: Element): string | undefined;
  * @param attribute _ARIA_ attribute to set
  * @param value _ARIA_ attribute value
  */
-declare function setAria(element: Element, attribute: AnyAriaAttribute, value?: unknown): void;
+declare function setAria(element: Element, attribute: AnyAriaBooleanAttribute, value?: boolean | string): void;
+/**
+ * Set an _ARIA_ attribute on an element
+ *
+ * _(Or remove it, if value is `null` or `undefined`)_
+ *
+ * @param element Element for _ARIA_ attribute
+ * @param attribute _ARIA_ attribute to set
+ * @param value _ARIA_ attribute value
+ */
+declare function setAria(element: Element, attribute: AnyAriaAttribute, value?: string): void;
 /**
  * Set one or more _ARIA_ attributes on an element
  *
@@ -123,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: Partial<Record<AnyAriaAttribute, unknown>>): void;
+declare function setAria(element: Element, attributes: Record<string, unknown>): void;
 /**
  * Set the role of an element
  *
@@ -131,6 +176,14 @@ declare function setAria(element: Element, attributes: Partial<Record<AnyAriaAtt
  * @param role Role to set _(or `undefined` to remove it)_
  */
 declare function setRole(element: Element, role?: AriaRole): void;
+/**
+ * List of _ARIA_ attributes that can be treated as boolean values
+ */
+declare const ariaBooleanAttributes: readonly AnyAriaBooleanAttribute[];
+/**
+ * Set of _ARIA_ attributes that can be treated as boolean values
+ */
+declare const ariaBooleanAttributesSet: Set<AnyAriaBooleanAttribute>;
 //#endregion
 //#region src/internal/attribute.d.ts
 /**
@@ -290,48 +343,67 @@ type PlainObject = Record<PropertyKey, unknown>;
 type Primitive = null | undefined | string | number | boolean | symbol | bigint;
 //#endregion
 //#region src/create.d.ts
-type Properties<Target extends Element> = { [Property in keyof Target]?: Target[Property] extends Primitive ? Target[Property] : never; };
-type Styles$1 = Partial<Record<keyof CSSStyleDeclaration, unknown>>;
+type CreateElementValues<Target extends Element> = {
+  aria?: CreateElementValuesAria;
+  attribute?: Record<string, unknown>;
+  data?: Record<string, unknown>;
+  property?: CreateElementValuesProperties<Target>;
+  style?: Partial<CSSValues>;
+};
+type CreateElementValuesAria = { [Key in AnyAriaAttribute]?: Key extends AnyAriaBooleanAttribute ? boolean | string : string; };
+type CreateElementValuesProperties<Target extends Element> = { [Property in keyof Target]?: Target[Property] extends Primitive ? Target[Property] : never; };
 /**
  * Creates an _HTML_ element with the specified tag name together with optional properties, attributes, and styles
  *
  * @param tag Tag name
- * @param properties Element properties
- * @param attributes Element attributes
- * @param styles Element styles
+ * @param values Element values
  * @returns Created element
  */
-declare function createElement<TagName extends keyof HTMLElementTagNameMap>(tag: TagName, properties?: Properties<HTMLElementTagNameMap[TagName]>, attributes?: Record<string, unknown>, styles?: Styles$1): HTMLElementTagNameMap[TagName];
+declare function createElement<TagName extends keyof HTMLElementTagNameMap>(tag: TagName, values?: CreateElementValues<HTMLElementTagNameMap[TagName]>): HTMLElementTagNameMap[TagName];
 /**
  * Creates an _HTML_ element with the specified tag name together with optional properties, attributes, and styles
  *
  * @param tag Tag name
- * @param properties Element properties
- * @param attributes Element attributes
- * @param styles Element styles
+ * @param values Element values
  * @returns Created element
  */
-declare function createElement(tag: string, properties?: Properties<HTMLElement>, attributes?: Record<string, unknown>, styles?: Styles$1): HTMLUnknownElement;
+declare function createElement(tag: string, values?: CreateElementValues<HTMLElement>): HTMLUnknownElement;
 //#endregion
 //#region src/data.d.ts
 /**
- * Get a keyed data value from an element
+ * Get a keyed data value from an element, without parsing the value
  *
  * @param element Element to get data from
  * @param key Data key
- * @param parse Parse values? _(defaults to `true`)_
+ * @param parse Parse the value?
  * @returns Data value
  */
-declare function getData(element: Element, key: string, parse?: boolean): unknown;
+declare function getData(element: Element, key: string, parse: false): string | undefined;
+/**
+ * Get a keyed data value from an element and parse the value
+ *
+ * @param element Element to get data from
+ * @param key Data key
+ * @returns Data value
+ */
+declare function getData(element: Element, key: string): unknown;
+/**
+ * Get keyed data values from an element, without parsing the values
+ *
+ * @param element Element to get data from
+ * @param keys Keys of the data values to get
+ * @param parse Parse the values?
+ * @returns Keyed data values
+ */
+declare function getData<Key extends string>(element: Element, keys: Key[], parse: false): Record<Key, string | undefined>;
 /**
- * Get keyed data values from an element
+ * Get keyed data values from an element and parse the values
  *
  * @param element Element to get data from
  * @param keys Keys of the data values to get
- * @param parse Parse values? _(defaults to `true`)_
  * @returns Keyed data values
  */
-declare function getData<Key extends string>(element: Element, keys: Key[], parse?: boolean): Record<Key, unknown>;
+declare function getData<Key extends string>(element: Element, keys: Key[]): Record<Key, unknown>;
 /**
  * Set data values on an element
  *
@@ -695,7 +767,6 @@ declare function setProperty<Target extends Element, Property extends Dispatched
 declare function setProperty<Target extends Element, Property extends keyof SetProperties<Target>>(target: Target, property: Property, value: SetProperties<Target>[Property]): void;
 //#endregion
 //#region src/style.d.ts
-type CSSStyleValues = Variables & CSSStyleDeclaration;
 type StyleToggler = {
   /**
    * Set the provided styles on the element
@@ -706,26 +777,24 @@ type StyleToggler = {
    */
   remove(): void;
 };
-type Styles = Partial<Record<keyof CSSStyleValues, unknown>>;
-type Variables<Value extends Record<string, string | undefined> = Record<string, string | undefined>> = { [property in keyof Value as `--${string & property}`]?: string | undefined; };
 /**
  * Get a style from an element
  *
  * @param element Element to get the style from
- * @param property Style name
+ * @param name Style name
  * @param computed Get the computed style? _(defaults to `false`)_
  * @returns Style value
  */
-declare function getStyle(element: Element, property: keyof CSSStyleValues, computed?: boolean): string | undefined;
+declare function getStyle(element: Element, name: keyof CSSValues, computed?: boolean): string | undefined;
 /**
  * Get styles from an element
  *
  * @param element Element to get the styles from
- * @param properties Styles to get
+ * @param names Styles to get
  * @param computed Get the computed styles? _(defaults to `false`)_
  * @returns Style values
  */
-declare function getStyles<Property extends keyof CSSStyleValues>(element: Element, properties: Property[], computed?: boolean): Record<Property, string | undefined>;
+declare function getStyles<Name extends keyof CSSValues>(element: Element, names: Name[], computed?: boolean): Record<Name, string | undefined>;
 /**
  * Get the text direction of a node or element _(or document, if element is invalid)_
  *
@@ -743,17 +812,17 @@ declare function getTextDirection(): TextDirection;
  * Set a style on an element
  *
  * @param element Element to set the style on
- * @param property Style name
+ * @param name Style name
  * @param value Style value
  */
-declare function setStyle(element: Element, property: keyof CSSStyleValues, value?: unknown): void;
+declare function setStyle(element: Element, name: keyof CSSValues, value?: unknown): void;
 /**
  * Set styles on an element
  *
  * @param element Element to set the styles on
  * @param styles Styles to set
  */
-declare function setStyles(element: Element, styles: Styles): void;
+declare function setStyles(element: Element, styles: Partial<CSSValues>): void;
 /**
  * Toggle styles for an element
  *
@@ -761,6 +830,6 @@ declare function setStyles(element: Element, styles: Styles): void;
  * @param styles Styles to be set or removed
  * @returns Style toggler
  */
-declare function toggleStyles(element: Element, styles: Styles): StyleToggler;
+declare function toggleStyles(element: Element, styles: Partial<CSSValues>): StyleToggler;
 //#endregion
-export { findElement as $, findElement, findElements as $$, findElements, AriaAttribute, AriaAttributeUnprefixed, AriaRole, Attribute, CustomEventListener, HtmlOptions, RemovableEventListener, Selector, StyleToggler, TextDirection, booleanAttributes, createElement, dispatch, findAncestor, findRelatives, getAria, getAttribute, getAttributes, getData, getDistance, getElementFromPosition, getElementUnderPointer, getFocusable, getPosition, getProperties, getProperty, getRole, getStyle, getStyles, getTabbable, getTextDirection, html, isBadAttribute, isBooleanAttribute, isChildNode, isEventPosition, isEventTarget, isFocusable, isHTMLOrSVGElement, isInDocument, isInputElement, isInvalidBooleanAttribute, isTabbable, off, on, sanitize, setAria, setAttribute, setAttributes, setData, setProperties, setProperty, setRole, setStyle, setStyles, supportsTouch, toggleStyles };
+export { findElement as $, findElement, findElements as $$, findElements, AnyAriaAttribute, AnyAriaBooleanAttribute, AriaAttribute, AriaAttributeUnprefixed, AriaBooleanAttribute, AriaBooleanAttributeUnprefixed, AriaRole, Attribute, CSSStyles, CSSValues, CSSVariables, CustomEventListener, HtmlOptions, RemovableEventListener, Selector, StyleToggler, TextDirection, ariaBooleanAttributes, ariaBooleanAttributesSet, booleanAttributes, createElement, dispatch, findAncestor, findRelatives, getAria, getAttribute, getAttributes, getData, getDistance, getElementFromPosition, getElementUnderPointer, getFocusable, getPosition, getProperties, getProperty, getRole, getStyle, getStyles, getTabbable, getTextDirection, html, isBadAttribute, isBooleanAttribute, isChildNode, isEventPosition, isEventTarget, isFocusable, isHTMLOrSVGElement, isInDocument, isInputElement, isInvalidBooleanAttribute, isTabbable, off, on, sanitize, setAria, setAttribute, setAttributes, setData, setProperties, setProperty, setRole, setStyle, setStyles, supportsTouch, toggleStyles };