@esportsplus/template 0.19.3 → 0.19.5

package/build/html/index.d.ts

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

package/build/types.d.ts

@@ -4,7 +4,7 @@ import { firstChild } from './utilities/node.js';
 import attributes from './attributes.js';
 import slot from './slot/index.js';
 import html from './html/index.js';
-type Attribute = Primitive | Effect<Primitive | Primitive[]>;
+type Attribute = Effect<Primitive | Primitive[]> | Primitive;
 type Attributes = {
     class?: Attribute | Attribute[];
     style?: Attribute | Attribute[];
@@ -17,14 +17,14 @@ type Attributes = {
     ondisconnect?: (element: Element) => void;
     onrender?: (element: Element) => void;
 } & Record<PropertyKey, unknown>;
-type Effect<T> = () => T extends [] ? Renderable[] : Renderable;
-type Element = HTMLElement & Attributes & Record<PropertyKey, unknown>;
+type Effect<T> = () => T extends [] ? Renderable<T>[] : Renderable<T>;
+type Element = HTMLElement & Attributes;
 type Primitive = bigint | boolean | null | number | string | undefined;
-type Renderable<T = unknown> = DocumentFragment | Effect<T> | Node | NodeList | Primitive | RenderableReactive<T> | Renderable[];
+type Renderable<T> = DocumentFragment | Effect<T> | Node | NodeList | Primitive | RenderableReactive<T> | Renderable<T>[];
 type RenderableReactive<T> = Readonly<{
     [RENDERABLE]: typeof RENDERABLE_HTML_REACTIVE_ARRAY;
     array: ReactiveArray<T>;
-    template: (this: ReactiveArray<T>, ...args: Parameters<Parameters<ReactiveArray<T>['map']>[0]>) => ReturnType<typeof html>;
+    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.6",
+    "@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.3",
+  "version": "0.19.5",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/html/index.ts

@@ -5,10 +5,10 @@ import { cloneNode } from '~/utilities/node';
 import parser from './parser';
 
 
-type Values<T = unknown> = Attributes | Attributes[] | Readonly<Attributes> | Readonly<Attributes[]> | Renderable<T>;
+type Values<T> = Attributes | Attributes[] | Readonly<Attributes> | Readonly<Attributes[]> | Renderable<T>;
 
 
-const html = (literals: TemplateStringsArray, ...values: (Values | Values[])[]) => {
+const html = <T>(literals: TemplateStringsArray, ...values: (Values<T> | Values<T>[])[]) => {
     let { fragment, slots } = parser.parse(literals),
         clone = cloneNode.call(fragment, true);
 

package/src/types.ts

@@ -6,7 +6,7 @@ import slot from './slot';
 import html from './html';
 
 
-type Attribute = Primitive | Effect<Primitive | Primitive[]>;
+type Attribute = Effect<Primitive | Primitive[]> | Primitive;
 
 type Attributes = {
     class?: Attribute | Attribute[];
@@ -21,22 +21,23 @@ type Attributes = {
     onrender?: (element: Element) => void;
 } & Record<PropertyKey, unknown>;
 
-type Effect<T> = () => T extends [] ? Renderable[] : Renderable;
+type Effect<T> = () => T extends [] ? Renderable<T>[] : Renderable<T>;
 
-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<T> | Renderable[];
+type Renderable<T> = DocumentFragment | Effect<T> | Node | NodeList | Primitive | RenderableReactive<T> | Renderable<T>[];
 
 type RenderableReactive<T> = Readonly<{
     [RENDERABLE]: typeof RENDERABLE_HTML_REACTIVE_ARRAY;
     array: ReactiveArray<T>;
     template: (
         this: ReactiveArray<T>,
-        ...args: Parameters< Parameters<ReactiveArray<T>['map']>[0] >
+        value: T,
+        i: number
     ) => ReturnType<typeof html>;
 }>;