@esportsplus/template 0.20.1 → 0.20.3

package/build/html/index.d.ts

@@ -1,6 +1,6 @@
 import { ReactiveArray } from '@esportsplus/reactivity';
 import { Attributes, Renderable, RenderableReactive } from '../types.js';
-type Values<T> = Attributes | Attributes[] | Readonly<Attributes> | Readonly<Attributes[]> | Renderable<T>;
+type Values<T> = Attributes<any> | Renderable<T>;
 declare const html: {
     <T>(literals: TemplateStringsArray, ...values: (Values<T> | Values<T>[])[]): Node;
     reactive<T>(array: ReactiveArray<T>, template: RenderableReactive<T>["template"]): RenderableReactive<T>;

package/build/types.d.ts

@@ -5,21 +5,20 @@ import attributes from './attributes.js';
 import slot from './slot/index.js';
 import html from './html/index.js';
 type Attribute = Effect<Primitive | Primitive[]> | Primitive;
-type Attributes = {
+type Attributes<T extends HTMLElement = Element> = {
+    [key: `aria-${string}`]: string | number | boolean | undefined;
+    [key: `data-${string}`]: string | undefined;
     class?: Attribute | Attribute[];
+    onconnect?: (element: T) => void;
+    ondisconnect?: (element: T) => void;
+    onrender?: (element: T) => void;
+    ontick?: (element: T) => void;
     style?: Attribute | Attribute[];
 } & {
-    [K in keyof GlobalEventHandlersEventMap as `on${string & K}`]?: (this: Element, event: GlobalEventHandlersEventMap[K]) => void;
-} & {
-    [key: `aria-${string}`]: string | number | boolean | undefined;
-    [key: `data-${string}`]: string | undefined;
-    onconnect?: <T = Element>(element: T) => void;
-    ondisconnect?: <T = Element>(element: T) => void;
-    onrender?: <T = Element>(element: T) => void;
-    ontick?: <T = Element>(element: T) => void;
+    [K in keyof GlobalEventHandlersEventMap as `on${string & K}`]?: (this: HTMLElement, event: GlobalEventHandlersEventMap[K]) => void;
 } & Record<PropertyKey, unknown>;
 type Effect<T> = () => T extends [] ? Renderable<T>[] : Renderable<T>;
-type Element = HTMLElement & Attributes;
+type Element = HTMLElement & Attributes<any>;
 type Primitive = bigint | boolean | null | number | string | undefined;
 type Renderable<T> = DocumentFragment | Effect<T> | Node | NodeList | Primitive | RenderableReactive<T> | Renderable<T>[];
 type RenderableReactive<T> = Readonly<{

package/package.json

@@ -14,7 +14,7 @@
   "private": false,
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.20.1",
+  "version": "0.20.3",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/html/index.ts

@@ -5,7 +5,7 @@ import { cloneNode } from '~/utilities/node';
 import parser from './parser';
 
 
-type Values<T> = Attributes | Attributes[] | Readonly<Attributes> | Readonly<Attributes[]> | Renderable<T>;
+type Values<T> = Attributes<any> | Renderable<T>;
 
 
 const html = <T>(literals: TemplateStringsArray, ...values: (Values<T> | Values<T>[])[]) => {

package/src/types.ts

@@ -8,23 +8,22 @@ import html from './html';
 
 type Attribute = Effect<Primitive | Primitive[]> | Primitive;
 
-type Attributes = {
+type Attributes<T extends HTMLElement = Element> = {
+    [key: `aria-${string}`]: string | number | boolean | undefined;
+    [key: `data-${string}`]: string | undefined;
     class?: Attribute | Attribute[];
+    onconnect?: (element: T) => void;
+    ondisconnect?: (element: T) => void;
+    onrender?: (element: T) => void;
+    ontick?: (element: T) => void;
     style?: Attribute | Attribute[];
 } & {
-    [K in keyof GlobalEventHandlersEventMap as `on${string & K}`]?: (this: Element, event: GlobalEventHandlersEventMap[K]) => void;
-} & {
-    [key: `aria-${string}`]: string | number | boolean | undefined;
-    [key: `data-${string}`]: string | undefined;
-    onconnect?: <T = Element>(element: T) => void;
-    ondisconnect?: <T = Element>(element: T) => void;
-    onrender?: <T = Element>(element: T) => void;
-    ontick?: <T = Element>(element: T) => void;
+    [K in keyof GlobalEventHandlersEventMap as `on${string & K}`]?: (this: HTMLElement, event: GlobalEventHandlersEventMap[K]) => void;
 } & Record<PropertyKey, unknown>;
 
 type Effect<T> = () => T extends [] ? Renderable<T>[] : Renderable<T>;
 
-type Element = HTMLElement & Attributes;
+type Element = HTMLElement & Attributes<any>;
 
 // Copied from '@esportsplus/utilities'
 // - Importing from ^ causes 'cannot be named without a reference to...' error