@esportsplus/template 0.22.0 → 0.22.2

package/build/constants.js

@@ -26,7 +26,7 @@ const NODE_WHITELIST = {
     'track': NODE_VOID,
     'wbr': NODE_VOID
 };
-const REGEX_EMPTY_TEXT_NODES = /(>|})\s+(<|{)/g;
+const REGEX_EMPTY_TEXT_NODES = /(>|}|)\s+(<|{|\s)/g;
 const REGEX_EVENTS = /(?:\s*on[\w-:]+\s*=(?:\s*["'][^"']*["'])*)/g;
 const REGEX_SLOT_ATTRIBUTES = /<[\w-]+([^><]*{{\$}}[^><]*)>/g;
 const REGEX_SLOT_NODES = /<([\w-]+|[\/!])(?:([^><]*{{\$}}[^><]*)|(?:[^><]*))?>|{{\$}}/g;

package/build/html/index.js

@@ -4,16 +4,21 @@ import parser from './parser.js';
 const html = (literals, ...values) => {
     let { fragment, slots } = parser.parse(literals), clone = cloneNode.call(fragment, true);
     if (slots !== null) {
-        let node, nodePath;
+        let e, p;
         for (let i = slots.length - 1; i >= 0; i--) {
-            let { fn, path } = slots[i];
-            if (nodePath !== path) {
-                node = clone;
+            let { fn, name, path } = slots[i];
+            if (p !== path) {
+                e = clone;
                 for (let i = 0, n = path.length; i < n; i++) {
-                    node = path[i].call(node);
+                    e = path[i].call(e);
                 }
             }
-            fn(node, values[i]);
+            if (name === null) {
+                fn(e, values[i]);
+            }
+            else {
+                fn(e, name, values[i]);
+            }
         }
     }
     return clone;

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 = Effect<Primitive | Primitive[]> | (<T>(...args: T[]) => void) | Primitive;
+type Attribute = Effect<Primitive | Primitive[]> | ((...args: any[]) => void) | Primitive;
 type Attributes<T extends HTMLElement = Element> = {
     [key: `aria-${string}`]: string | number | boolean | undefined;
     [key: `data-${string}`]: string | undefined;

package/package.json

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

package/src/constants.ts

@@ -40,7 +40,7 @@ const NODE_WHITELIST: Record<string, number> = {
 };
 
 
-const REGEX_EMPTY_TEXT_NODES = /(>|})\s+(<|{)/g;
+const REGEX_EMPTY_TEXT_NODES = /(>|}|)\s+(<|{|\s)/g;
 
 const REGEX_EVENTS = /(?:\s*on[\w-:]+\s*=(?:\s*["'][^"']*["'])*)/g;
 

package/src/html/index.ts

@@ -3,6 +3,8 @@ import { RENDERABLE, RENDERABLE_HTML_REACTIVE_ARRAY } from '~/constants';
 import { Attribute, Attributes, Renderable, RenderableReactive } from '~/types';
 import { cloneNode } from '~/utilities/node';
 import parser from './parser';
+import attributes from '~/attributes';
+import slot from '~/slot';
 
 
 type Values<T> = Attribute | Attributes<any> | Renderable<T>;
@@ -13,21 +15,25 @@ const html = <T>(literals: TemplateStringsArray, ...values: (Values<T> | Values<
         clone = cloneNode.call(fragment, true);
 
     if (slots !== null) {
-        let node, nodePath;
+        let e, p;
 
         for (let i = slots.length - 1; i >= 0; i--) {
-            let { fn, path } = slots[i];
+            let { fn, name, path } = slots[i];
 
-            if (nodePath !== path) {
-                node = clone;
+            if (p !== path) {
+                e = clone;
 
                 for (let i = 0, n = path.length; i < n; i++) {
-                    node = path[i].call(node);
+                    e = path[i].call(e);
                 }
             }
 
-            // @ts-ignore
-            fn(node, values[i]);
+            if (name === null) {
+                (fn as typeof attributes.spread | typeof slot)(e, values[i] as any);
+            }
+            else {
+                (fn as typeof attributes.set)(e, name, values[i]);
+            }
         }
     }
 

package/src/types.ts

@@ -6,7 +6,7 @@ import slot from './slot';
 import html from './html';
 
 
-type Attribute = Effect<Primitive | Primitive[]> | (<T>(...args: T[]) => void) | Primitive;
+type Attribute = Effect<Primitive | Primitive[]> | ((...args: any[]) => void) | Primitive;
 
 type Attributes<T extends HTMLElement = Element> = {
     [key: `aria-${string}`]: string | number | boolean | undefined;