@solidjs/h 2.0.0-experimental.0 → 2.0.0-experimental.10

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2023 Ryan Carniato
+Copyright (c) 2016-2025 Ryan Carniato
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/h.cjs

@@ -2,23 +2,12 @@
 
 var web = require('@solidjs/web');
 
-const $ELEMENT = Symbol("hyper-element");
 function createHyperScript(r) {
   function h() {
     let args = [].slice.call(arguments),
       e,
       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 if ("string" === type) {
@@ -34,8 +23,7 @@ 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
@@ -59,25 +47,20 @@ 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) {
       const m = string.split(/([\.#]?[^\s#.]+)/);
       if (/^\.|#/.test(m[1])) e = document.createElement("div");

package/dist/h.js

@@ -1,43 +1,16 @@
-import {
-  spread,
-  assign,
-  insert,
-  createComponent,
-  dynamicProperty,
-  SVGElements
-} from "@solidjs/web";
+import { spread, assign, insert, createComponent, dynamicProperty, SVGElements } from '@solidjs/web';
 
-const $ELEMENT = Symbol("hyper-element");
 function createHyperScript(r) {
   function h() {
     let args = [].slice.call(arguments),
       e,
       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 if ("string" === type) {
-        if (!e) parseClass(l);
-        else e.appendChild(document.createTextNode(l));
-      } else if (
-        "number" === type ||
-        "boolean" === type ||
-        "bigint" === type ||
-        "symbol" === type ||
-        l instanceof Date ||
-        l instanceof RegExp
-      ) {
+      if (l == null) ;else if ("string" === type) {
+        if (!e) parseClass(l);else e.appendChild(document.createTextNode(l));
+      } else if ("number" === type || "boolean" === type || "bigint" === type || "symbol" === type || l instanceof Date || l instanceof RegExp) {
         e.appendChild(document.createTextNode(l.toString()));
       } else if (Array.isArray(l)) {
         for (let i = 0; i < l.length; i++) item(l[i]);
@@ -48,11 +21,7 @@ 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
@@ -64,44 +33,32 @@ function createHyperScript(r) {
             dynamic = true;
           } else if (d[k].get) dynamic = true;
         }
-        dynamic
-          ? r.spread(e, l, e instanceof SVGElement, !!args.length)
-          : r.assign(e, l, e instanceof SVGElement, !!args.length);
+        dynamic ? r.spread(e, l, e instanceof SVGElement, !!args.length) : r.assign(e, l, e instanceof SVGElement, !!args.length);
       } else if ("function" === type) {
         if (!e) {
           let props,
             next = args[0];
-          if (
-            next == null ||
-            (typeof next === "object" && !Array.isArray(next) && !(next instanceof Element))
-          )
-            props = args.shift();
+          if (next == null || typeof next === "object" && !Array.isArray(next) && !(next instanceof Element)) props = args.shift();
           props || (props = {});
           if (args.length) {
             props.children = args.length > 1 ? args : args[0];
           }
           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) {
       const m = string.split(/([\.#]?[^\s#.]+)/);
       if (/^\.|#/.test(m[1])) e = document.createElement("div");
@@ -109,12 +66,7 @@ function createHyperScript(r) {
         const v = m[i],
           s = v.substring(1, v.length);
         if (!v) continue;
-        if (!e)
-          e = r.SVGElements.has(v)
-            ? document.createElementNS("http://www.w3.org/2000/svg", v)
-            : document.createElement(v);
-        else if (v[0] === ".") classes.push(s);
-        else if (v[0] === "#") e.setAttribute("id", s);
+        if (!e) e = r.SVGElements.has(v) ? document.createElementNS("http://www.w3.org/2000/svg", v) : document.createElement(v);else if (v[0] === ".") classes.push(s);else if (v[0] === "#") e.setAttribute("id", s);
       }
     }
     function detectMultiExpression(list) {

package/jsx-runtime/dist/jsx.js

@@ -1,4 +1,4 @@
-import h from "@solidjs/h";
+import h from '@solidjs/h';
 
 function Fragment(props) {
   return props.children;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@solidjs/h",
   "description": "A standard (less-optimal) JSX factory for Solid",
-  "version": "2.0.0-experimental.0",
+  "version": "2.0.0-experimental.10",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -46,11 +46,10 @@
     "./types/*": "./types/*"
   },
   "peerDependencies": {
-    "solid-js": "^2.0.0-experimental.0",
-    "@solidjs/web": "^2.0.0-experimental.0"
+    "@solidjs/web": "^2.0.0-experimental.10"
   },
   "devDependencies": {
-    "@solidjs/web": "2.0.0-experimental.0"
+    "@solidjs/web": "2.0.0-experimental.10"
   },
   "scripts": {
     "build": "npm-run-all -nl build:*",

package/jsx-runtime/types/index.d.ts

@@ -1,14 +0,0 @@
-export type { JSX } from "./jsx.d.ts";
-import type { JSX } from "./jsx.d.ts";
-declare function Fragment(props: { children: JSX.Element }): JSX.Element;
-declare function jsx(
-  type: any,
-  props: any
-): () =>
-  | (Node & {
-      [key: string]: any;
-    })
-  | (Node & {
-      [key: string]: any;
-    })[];
-export { jsx, jsx as jsxs, jsx as jsxDEV, Fragment };