@esportsplus/template 0.19.2 → 0.19.4

package/build/html/index.d.ts

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

package/build/slot/reactive.d.ts

@@ -1,3 +1,3 @@
 import { RenderableReactive } from '../types.js';
-declare const _default: (anchor: Element, renderable: RenderableReactive) => Node;
+declare const _default: <T>(anchor: Element, renderable: RenderableReactive<T>) => Node;
 export default _default;

package/build/types.d.ts

@@ -18,13 +18,13 @@ type Attributes = {
     onrender?: (element: Element) => void;
 } & Record<PropertyKey, unknown>;
 type Effect<T> = () => T extends [] ? Renderable[] : Renderable;
-type Element = HTMLElement & Attributes & Record<PropertyKey, unknown>;
+type Element = HTMLElement & Attributes;
 type Primitive = bigint | boolean | null | number | string | undefined;
-type Renderable<T = unknown> = DocumentFragment | Effect<T> | Node | NodeList | Primitive | RenderableReactive | Renderable[];
-type RenderableReactive = Readonly<{
+type Renderable<T = unknown> = DocumentFragment | Effect<T> | Node | NodeList | Primitive | RenderableReactive<T> | Renderable[];
+type RenderableReactive<T> = Readonly<{
     [RENDERABLE]: typeof RENDERABLE_HTML_REACTIVE_ARRAY;
-    array: ReactiveArray<unknown[]>;
-    template: (this: ReactiveArray<unknown[]>, ...args: Parameters<Parameters<ReactiveArray<unknown[]>['map']>[0]>) => ReturnType<typeof html>;
+    array: ReactiveArray<T>;
+    template: (this: ReactiveArray<T>, value: T, i: number) => ReturnType<typeof html>;
 }>;
 type SlotGroup = {
     head: Element;

package/package.json

@@ -2,7 +2,7 @@
   "author": "ICJR",
   "dependencies": {
     "@esportsplus/queue": "^0.1.0",
-    "@esportsplus/reactivity": "^0.16.1",
+    "@esportsplus/reactivity": "^0.16.7",
     "@esportsplus/tasks": "^0.2.1",
     "@esportsplus/utilities": "^0.22.1"
   },
@@ -14,7 +14,7 @@
   "private": false,
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.19.2",
+  "version": "0.19.4",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/html/index.ts

@@ -65,7 +65,7 @@ const html = (literals: TemplateStringsArray, ...values: (Values | Values[])[])
     return clone;
 };
 
-html.reactive = <T>(array: ReactiveArray<T[]>, template: RenderableReactive['template']): RenderableReactive => {
+html.reactive = <T>(array: ReactiveArray<T>, template: RenderableReactive<T>['template']): RenderableReactive<T> => {
     return {
         [RENDERABLE]: RENDERABLE_HTML_REACTIVE_ARRAY,
         array,

package/src/slot/reactive.ts

@@ -7,17 +7,17 @@ import { ondisconnect, remove } from './cleanup';
 
 
 class ReactiveArraySlot<T> {
-    array: ReactiveArray<T[]>;
+    array: ReactiveArray<T>;
     fragment: Node;
     marker: Element;
     nodes: SlotGroup[] = [];
     template: (
-        this: ReactiveArray<T[]>,
-        ...args: Parameters< Parameters<ReactiveArray<T[]>['map']>[0] >
+        this: ReactiveArray<T>,
+        ...args: Parameters< Parameters<ReactiveArray<T>['map']>[0] >
     ) => SlotGroup;
 
 
-    constructor(anchor: Element, array: ReactiveArray<T[]>, template: RenderableReactive['template']) {
+    constructor(anchor: Element, array: ReactiveArray<T>, template: RenderableReactive<T>['template']) {
         let fragment = this.fragment = cloneNode.call(EMPTY_FRAGMENT);
 
         this.array = array;
@@ -163,7 +163,7 @@ class ReactiveArraySlot<T> {
 }
 
 
-export default (anchor: Element, renderable: RenderableReactive) => {
+export default <T>(anchor: Element, renderable: RenderableReactive<T>) => {
     let { array, template } = renderable,
         slot = new ReactiveArraySlot(anchor, array, template);
 

package/src/slot/render.ts

@@ -21,7 +21,7 @@ export default function render(anchor: Element, input: unknown): Node {
     }
 
     if (RENDERABLE in input) {
-        return reactive(anchor, input as RenderableReactive);
+        return reactive(anchor, input as RenderableReactive<unknown>);
     }
 
     if (isArray(input)) {

package/src/types.ts

@@ -23,20 +23,21 @@ type Attributes = {
 
 type Effect<T> = () => T extends [] ? Renderable[] : Renderable;
 
-type Element = HTMLElement & Attributes & Record<PropertyKey, unknown>;
+type Element = HTMLElement & Attributes;
 
 // Copied from '@esportsplus/utilities'
 // - Importing from ^ causes 'cannot be named without a reference to...' error
 type Primitive = bigint | boolean | null | number | string | undefined;
 
-type Renderable<T = unknown> = DocumentFragment | Effect<T> | Node | NodeList | Primitive | RenderableReactive | Renderable[];
+type Renderable<T = unknown> = DocumentFragment | Effect<T> | Node | NodeList | Primitive | RenderableReactive<T> | Renderable[];
 
-type RenderableReactive = Readonly<{
+type RenderableReactive<T> = Readonly<{
     [RENDERABLE]: typeof RENDERABLE_HTML_REACTIVE_ARRAY;
-    array: ReactiveArray<unknown[]>;
+    array: ReactiveArray<T>;
     template: (
-        this: ReactiveArray<unknown[]>,
-        ...args: Parameters< Parameters<ReactiveArray<unknown[]>['map']>[0] >
+        this: ReactiveArray<T>,
+        value: T,
+        i: number
     ) => ReturnType<typeof html>;
 }>;