@esportsplus/template 0.40.3 → 0.41.0

package/build/event/index.d.ts

@@ -1,10 +1,10 @@
-import { Element } from '../types.js';
+import { Attributes, Element } from '../types.js';
 import onconnect from './onconnect.js';
 import onresize from './onresize.js';
 import ontick from './ontick.js';
-declare const delegate: (element: Element, event: string, listener: Function) => void;
-declare const on: (element: Element, event: string, listener: Function) => void;
-declare const ondisconnect: (element: Element, listener: Function) => void;
-declare const onrender: (element: Element, listener: Function) => void;
-declare const runtime: (element: Element, event: `on${string}`, listener: Function) => void;
+declare const delegate: <E extends string>(element: Element, event: E, listener: Attributes[`on${E}`]) => void;
+declare const on: <E extends string>(element: Element, event: E, listener: Attributes[`on${E}`]) => void;
+declare const ondisconnect: (element: Element, listener: NonNullable<Attributes[`ondisconnect`]>) => void;
+declare const onrender: (element: Element, listener: NonNullable<Attributes[`onrender`]>) => void;
+declare const runtime: <E extends `on${string}`>(element: Element, event: E, listener: Attributes[E]) => void;
 export { delegate, on, onconnect, ondisconnect, onrender, onresize, ontick, runtime };

package/build/event/onconnect.d.ts

@@ -1,3 +1,3 @@
-import { Element } from '../types.js';
-declare const _default: (element: Element, listener: Function) => void;
+import { Attributes, Element } from '../types.js';
+declare const _default: (element: Element, listener: NonNullable<Attributes["onconnect"]>) => void;
 export default _default;

package/build/event/onresize.d.ts

@@ -1,3 +1,3 @@
-import { Element } from '../types.js';
-declare const _default: (element: Element, listener: Function) => void;
+import { Attributes, Element } from '../types.js';
+declare const _default: (element: Element, listener: NonNullable<Attributes["onresize"]>) => void;
 export default _default;

package/build/event/ontick.d.ts

@@ -1,6 +1,6 @@
-import { Element } from '../types.js';
+import { Attributes, Element } from '../types.js';
 declare const add: (task: VoidFunction) => void;
 declare const remove: (task: VoidFunction) => void;
-declare const _default: (element: Element, listener: Function) => void;
+declare const _default: (element: Element, listener: NonNullable<Attributes["ontick"]>) => void;
 export default _default;
 export { add, remove };

package/build/index.d.ts

@@ -1,10 +1,11 @@
+export * from '@esportsplus/reactivity';
+export * from './attributes.js';
+export * from './event/index.js';
+export * from './utilities.js';
 export { default as html } from './html.js';
 export { default as render } from './render.js';
 export { default as svg } from './svg.js';
-export * from './attributes.js';
-export * from './event/index.js';
 export { ArraySlot } from './slot/array.js';
 export { EffectSlot } from './slot/effect.js';
 export { default as slot } from './slot/index.js';
 export type { Attributes, Element, Renderable } from './types.js';
-export * from './utilities.js';

package/build/index.js

@@ -3,12 +3,13 @@ if (typeof Node !== 'undefined') {
     Node.prototype[CLEANUP] = null;
     Node.prototype[STORE] = null;
 }
+export * from '@esportsplus/reactivity';
+export * from './attributes.js';
+export * from './event/index.js';
+export * from './utilities.js';
 export { default as html } from './html.js';
 export { default as render } from './render.js';
 export { default as svg } from './svg.js';
-export * from './attributes.js';
-export * from './event/index.js';
 export { ArraySlot } from './slot/array.js';
 export { EffectSlot } from './slot/effect.js';
 export { default as slot } from './slot/index.js';
-export * from './utilities.js';

package/package.json

@@ -39,7 +39,7 @@
   },
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.40.3",
+  "version": "0.41.0",
   "scripts": {
     "build": "tsc",
     "build:test": "vite build --config test/vite.config.ts",

package/src/event/index.ts

@@ -1,6 +1,6 @@
 import { root } from '@esportsplus/reactivity';
 import { defineProperty } from '@esportsplus/utilities';
-import { Element } from '~/types';
+import { Attributes, Element } from '~/types';
 import { ondisconnect as disconnect } from '~/slot/cleanup';
 import onconnect from './onconnect';
 import onresize from './onresize';
@@ -88,13 +88,13 @@ function register(element: Element, event: string) {
 }
 
 
-const delegate = (element: Element, event: string, listener: Function): void => {
+const delegate = <E extends string>(element: Element, event: E, listener: Attributes[`on${E}`]): void => {
     element[ keys[event] || register(element, event) ] = listener;
 };
 
 // DIRECT_ATTACH_EVENTS in ./constants.ts tells compiler to use this function
-const on = (element: Element, event: string, listener: Function): void => {
-    let handler = (e: Event) => listener.call(element, e);
+const on = <E extends string>(element: Element, event: E, listener: Attributes[`on${E}`]): void => {
+    let handler = (e: Event) => (listener as Function).call(element, e);
 
     element.addEventListener(event, handler, {
         passive: passive.has(event)
@@ -105,31 +105,31 @@ const on = (element: Element, event: string, listener: Function): void => {
     });
 };
 
-const ondisconnect = (element: Element, listener: Function) => {
+const ondisconnect = (element: Element, listener: NonNullable<Attributes[`ondisconnect`]>) => {
     disconnect(element, () => listener(element));
 };
 
-const onrender = (element: Element, listener: Function) => {
+const onrender = (element: Element, listener: NonNullable<Attributes[`onrender`]>) => {
     root(() => listener(element));
 };
 
 const lifecycle = { onconnect, ondisconnect, onrender, onresize, ontick };
 
-const runtime = (element: Element, event: `on${string}`, listener: Function): void => {
+const runtime = <E extends `on${string}`>(element: Element, event: E, listener: Attributes[E]): void => {
     let key = event.toLowerCase();
 
     if (LIFECYCLE_EVENTS.has(key)) {
-        lifecycle[key as keyof typeof lifecycle](element, listener);
+        lifecycle[key as keyof typeof lifecycle](element, listener as any);
         return;
     }
 
     let e = event.slice(2).toLowerCase();
 
     if (DIRECT_ATTACH_EVENTS.has(key)) {
-        on(element, e, listener);
+        on(element, e, listener as Attributes[`on${typeof e}`]);
     }
     else {
-        delegate(element, e, listener);
+        delegate(element, e, listener as Attributes[`on${typeof e}`]);
     }
 };
 

package/src/event/onconnect.ts

@@ -1,9 +1,9 @@
 import { root } from '@esportsplus/reactivity';
 import { add, remove } from './ontick';
-import { Element } from '~/types';
+import { Attributes, Element } from '~/types';
 
 
-export default (element: Element, listener: Function) => {
+export default (element: Element, listener: NonNullable<Attributes['onconnect']>) => {
     let fn = () => {
             retry--;
 

package/src/event/onresize.ts

@@ -1,5 +1,5 @@
 import { onCleanup } from '@esportsplus/reactivity';
-import { Element } from '~/types';
+import { Attributes, Element } from '~/types';
 
 
 let listeners = new Map<Element, Function>(),
@@ -23,7 +23,7 @@ function onresize() {
 }
 
 
-export default (element: Element, listener: Function) => {
+export default (element: Element, listener: NonNullable<Attributes['onresize']>) => {
     listeners.set(element, listener);
 
     onCleanup(() => {

package/src/event/ontick.ts

@@ -1,4 +1,4 @@
-import { Element } from '~/types';
+import { Attributes, Element } from '~/types';
 import { raf } from '~/utilities';
 
 
@@ -33,7 +33,7 @@ const remove = (task: VoidFunction) => {
 };
 
 
-export default (element: Element, listener: Function) => {
+export default (element: Element, listener: NonNullable<Attributes['ontick']>) => {
     let connected = false,
         fn = () => {
             if (connected === false) {

package/src/index.ts

@@ -8,13 +8,16 @@ if (typeof Node !== 'undefined') {
 }
 
 
+export * from '@esportsplus/reactivity';
+
+export * from './attributes';
+export * from './event';
+export * from './utilities';
+
 export { default as html } from './html';
 export { default as render } from './render';
 export { default as svg } from './svg';
-export * from './attributes';
-export * from './event';
 export { ArraySlot } from './slot/array';
 export { EffectSlot } from './slot/effect';
 export { default as slot } from './slot';
-export type { Attributes, Element, Renderable } from './types';
-export * from './utilities';
+export type { Attributes, Element, Renderable } from './types';