hyper-dom-expressions 0.40.2 → 0.41.0-next.0

package/dist/hyper-dom-expressions.js

@@ -1,15 +1,3 @@
-const $ELEMENT = Symbol("hyper-element");
-
-
-
-
-
-
-
-
-
-
-
 // Inspired by https://github.com/hyperhype/hyperscript
 function createHyperScript(r) {
   function h() {
@@ -18,17 +6,6 @@ function createHyperScript(r) {
       classes = [],
       multiExpression = false;
 
-    while (Array.isArray(args[0])) args = args[0];
-    if (args[0][$ELEMENT]) args.unshift(h.Fragment);
-    typeof args[0] === "string" && detectMultiExpression(args);
-    const ret = () => {
-      while (args.length) item(args.shift());
-      if (e instanceof Element && classes.length) e.classList.add(...classes);
-      return e;
-    };
-    ret[$ELEMENT] = true;
-    return ret;
-
     function item(l) {
       const type = typeof l;
       if (l == null) ;else
@@ -53,10 +30,10 @@ function createHyperScript(r) {
         const d = Object.getOwnPropertyDescriptors(l);
         for (const k in d) {
           if (k === "class" && classes.length !== 0) {
-            const fixedClasses = classes.join(" "),
-              value = typeof d["class"].value === "function" ?
-              () => fixedClasses + " " + d["class"].value() :
-              fixedClasses + " " + l["class"];
+            const value =
+            typeof d["class"].value === "function" ?
+            () => [...classes, d["class"].value()] :
+            [...classes, l["class"]];
             Object.defineProperty(l, "class", { ...d[k], value });
             classes = [];
           }
@@ -83,26 +60,22 @@ function createHyperScript(r) {
           }
           const d = Object.getOwnPropertyDescriptors(props);
           for (const k in d) {
-            if (Array.isArray(d[k].value)) {
-              const list = d[k].value;
-              props[k] = () => {
-                for (let i = 0; i < list.length; i++) {
-                  while (list[i][$ELEMENT]) list[i] = list[i]();
-                }
-                return list;
-              };
-              r.dynamicProperty(props, k);
-            } else if (typeof d[k].value === "function" && !d[k].value.length)
-            r.dynamicProperty(props, k);
+            if (typeof d[k].value === "function" && !d[k].value.length) r.dynamicProperty(props, k);
           }
           e = r.createComponent(l, props);
           args = [];
         } else {
-          while (l[$ELEMENT]) l = l();
           r.insert(e, l, multiExpression ? null : undefined);
         }
       }
     }
+
+    if (args.length === 1 && Array.isArray(args[0])) return args[0];
+    typeof args[0] === "string" && detectMultiExpression(args);
+    while (args.length) item(args.shift());
+    if (e instanceof Element && classes.length) e.classList.add(...classes);
+    return e;
+
     function parseClass(string) {
       // Our minimal parser doesn’t understand escaping CSS special
       // characters like `#`. Don’t use them. More reading:

package/lib/hyper-dom-expressions.js

@@ -1,17 +1,5 @@
 'use strict';
 
-const $ELEMENT = Symbol("hyper-element");
-
-
-
-
-
-
-
-
-
-
-
 // Inspired by https://github.com/hyperhype/hyperscript
 function createHyperScript(r) {
   function h() {
@@ -20,17 +8,6 @@ function createHyperScript(r) {
       classes = [],
       multiExpression = false;
 
-    while (Array.isArray(args[0])) args = args[0];
-    if (args[0][$ELEMENT]) args.unshift(h.Fragment);
-    typeof args[0] === "string" && detectMultiExpression(args);
-    const ret = () => {
-      while (args.length) item(args.shift());
-      if (e instanceof Element && classes.length) e.classList.add(...classes);
-      return e;
-    };
-    ret[$ELEMENT] = true;
-    return ret;
-
     function item(l) {
       const type = typeof l;
       if (l == null) ;else
@@ -55,10 +32,10 @@ function createHyperScript(r) {
         const d = Object.getOwnPropertyDescriptors(l);
         for (const k in d) {
           if (k === "class" && classes.length !== 0) {
-            const fixedClasses = classes.join(" "),
-              value = typeof d["class"].value === "function" ?
-              () => fixedClasses + " " + d["class"].value() :
-              fixedClasses + " " + l["class"];
+            const value =
+            typeof d["class"].value === "function" ?
+            () => [...classes, d["class"].value()] :
+            [...classes, l["class"]];
             Object.defineProperty(l, "class", { ...d[k], value });
             classes = [];
           }
@@ -85,26 +62,22 @@ function createHyperScript(r) {
           }
           const d = Object.getOwnPropertyDescriptors(props);
           for (const k in d) {
-            if (Array.isArray(d[k].value)) {
-              const list = d[k].value;
-              props[k] = () => {
-                for (let i = 0; i < list.length; i++) {
-                  while (list[i][$ELEMENT]) list[i] = list[i]();
-                }
-                return list;
-              };
-              r.dynamicProperty(props, k);
-            } else if (typeof d[k].value === "function" && !d[k].value.length)
-            r.dynamicProperty(props, k);
+            if (typeof d[k].value === "function" && !d[k].value.length) r.dynamicProperty(props, k);
           }
           e = r.createComponent(l, props);
           args = [];
         } else {
-          while (l[$ELEMENT]) l = l();
           r.insert(e, l, multiExpression ? null : undefined);
         }
       }
     }
+
+    if (args.length === 1 && Array.isArray(args[0])) return args[0];
+    typeof args[0] === "string" && detectMultiExpression(args);
+    while (args.length) item(args.shift());
+    if (e instanceof Element && classes.length) e.classList.add(...classes);
+    return e;
+
     function parseClass(string) {
       // Our minimal parser doesn’t understand escaping CSS special
       // characters like `#`. Don’t use them. More reading:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hyper-dom-expressions",
   "description": "A Fine-Grained Rendering Runtime API using HyperScript",
-  "version": "0.40.2",
+  "version": "0.41.0-next.0",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -19,7 +19,7 @@
     "prepare": "pnpm run build"
   },
   "devDependencies": {
-    "dom-expressions": "^0.40.2"
+    "dom-expressions": "^0.41.0-next.0"
   },
-  "gitHead": "2c44b1854b7b2863a506ee32517e6f962804609e"
+  "gitHead": "59823cd3108ee6d17058b90d1ef92b9d9ad103d7"
 }

package/types/index.d.ts

@@ -11,10 +11,10 @@ type ExpandableNode = Node & {
     [key: string]: any;
 };
 export type HyperScript = {
-    (...args: any[]): () => ExpandableNode | ExpandableNode[];
+    (...args: any[]): ExpandableNode | ExpandableNode[];
     Fragment: (props: {
-        children: (() => ExpandableNode) | (() => ExpandableNode)[];
-    }) => ExpandableNode[];
+        children: ExpandableNode | ExpandableNode[];
+    }) => ExpandableNode | ExpandableNode[];
 };
 export declare function createHyperScript(r: Runtime): HyperScript;
 export {};

package/rollup.config-1704312703383.cjs

@@ -1,38 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var babel = require('@rollup/plugin-babel');
-var nodeResolve = require('@rollup/plugin-node-resolve');
-
-const plugins = [
-  nodeResolve({
-    extensions: [".js", ".ts"]
-  }),
-  babel({
-    extensions: [".js", ".ts"],
-    babelHelpers: "bundled",
-    presets: ["@babel/preset-typescript"],
-    exclude: "node_modules/**",
-    babelrc: false,
-    configFile: false,
-    retainLines: true
-  })
-];
-
-var rollup_config = {
-  input: "src/index.ts",
-  output: [
-    {
-      file: "lib/hyper-dom-expressions.js",
-      format: "cjs"
-    },
-    {
-      file: "dist/hyper-dom-expressions.js",
-      format: "es"
-    }
-  ],
-  plugins
-};
-
-exports.default = rollup_config;