solid-js 1.4.0-beta.2 → 1.4.0-beta.5

package/dist/dev.cjs

@@ -273,9 +273,9 @@ function createResource(source, fetcher, options) {
     if (pr === p) {
       pr = null;
       resolved = true;
-      if (initP && p === initP && options.onHydrated) options.onHydrated(key, {
+      if (initP && (p === initP || v === initP) && options.onHydrated) queueMicrotask(() => options.onHydrated(key, {
         value: v
-      });
+      }));
       initP = null;
       setError(err = e);
       if (Transition && p && loadedUnderTransition) {
@@ -516,6 +516,7 @@ function startTransition(fn) {
       t.running = true;
     }
     batch(fn);
+    Listener = Owner = null;
     return t ? t.done : undefined;
   });
 }

package/dist/dev.js

@@ -269,9 +269,9 @@ function createResource(source, fetcher, options) {
     if (pr === p) {
       pr = null;
       resolved = true;
-      if (initP && p === initP && options.onHydrated) options.onHydrated(key, {
+      if (initP && (p === initP || v === initP) && options.onHydrated) queueMicrotask(() => options.onHydrated(key, {
         value: v
-      });
+      }));
       initP = null;
       setError(err = e);
       if (Transition && p && loadedUnderTransition) {
@@ -512,6 +512,7 @@ function startTransition(fn) {
       t.running = true;
     }
     batch(fn);
+    Listener = Owner = null;
     return t ? t.done : undefined;
   });
 }

package/dist/solid.cjs

@@ -270,9 +270,9 @@ function createResource(source, fetcher, options) {
     if (pr === p) {
       pr = null;
       resolved = true;
-      if (initP && p === initP && options.onHydrated) options.onHydrated(key, {
+      if (initP && (p === initP || v === initP) && options.onHydrated) queueMicrotask(() => options.onHydrated(key, {
         value: v
-      });
+      }));
       initP = null;
       setError(err = e);
       if (Transition && p && loadedUnderTransition) {
@@ -513,6 +513,7 @@ function startTransition(fn) {
       t.running = true;
     }
     batch(fn);
+    Listener = Owner = null;
     return t ? t.done : undefined;
   });
 }

package/dist/solid.js

@@ -266,9 +266,9 @@ function createResource(source, fetcher, options) {
     if (pr === p) {
       pr = null;
       resolved = true;
-      if (initP && p === initP && options.onHydrated) options.onHydrated(key, {
+      if (initP && (p === initP || v === initP) && options.onHydrated) queueMicrotask(() => options.onHydrated(key, {
         value: v
-      });
+      }));
       initP = null;
       setError(err = e);
       if (Transition && p && loadedUnderTransition) {
@@ -509,6 +509,7 @@ function startTransition(fn) {
       t.running = true;
     }
     batch(fn);
+    Listener = Owner = null;
     return t ? t.done : undefined;
   });
 }

package/h/dist/h.cjs

@@ -2,11 +2,19 @@
 
 var web = require('solid-js/web');
 
+const $ELEMENT = Symbol("hyper-element");
 function createHyperScript(r) {
   function h() {
     let args = [].slice.call(arguments),
         e,
         multiExpression = false;
+    typeof args[0] === "string" && detectMultiExpression(args);
+    const ret = () => {
+      while (args.length) item(args.shift());
+      return e;
+    };
+    ret[$ELEMENT] = true;
+    return ret;
     function item(l) {
       const type = typeof l;
       if (l == null) ;else if ("string" === type) {
@@ -38,16 +46,25 @@ function createHyperScript(r) {
           }
           const d = Object.getOwnPropertyDescriptors(props);
           for (const k in d) {
-            if (typeof d[k].value === "function" && !d[k].value.length) r.dynamicProperty(props, k);
+            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);
           }
           e = r.createComponent(l, props);
           args = [];
-        } else r.insert(e, l, multiExpression ? null : undefined);
+        } else {
+          while (l[$ELEMENT]) l = l();
+          r.insert(e, l, multiExpression ? null : undefined);
+        }
       }
     }
-    typeof args[0] === "string" && detectMultiExpression(args);
-    while (args.length) item(args.shift());
-    return e;
     function parseClass(string) {
       const m = string.split(/([\.#]?[^\s#.]+)/);
       if (/^\.|#/.test(m[1])) e = document.createElement("div");

package/h/dist/h.js

@@ -1,10 +1,18 @@
 import { spread, assign, insert, createComponent, dynamicProperty, SVGElements } from 'solid-js/web';
 
+const $ELEMENT = Symbol("hyper-element");
 function createHyperScript(r) {
   function h() {
     let args = [].slice.call(arguments),
         e,
         multiExpression = false;
+    typeof args[0] === "string" && detectMultiExpression(args);
+    const ret = () => {
+      while (args.length) item(args.shift());
+      return e;
+    };
+    ret[$ELEMENT] = true;
+    return ret;
     function item(l) {
       const type = typeof l;
       if (l == null) ;else if ("string" === type) {
@@ -36,16 +44,25 @@ function createHyperScript(r) {
           }
           const d = Object.getOwnPropertyDescriptors(props);
           for (const k in d) {
-            if (typeof d[k].value === "function" && !d[k].value.length) r.dynamicProperty(props, k);
+            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);
           }
           e = r.createComponent(l, props);
           args = [];
-        } else r.insert(e, l, multiExpression ? null : undefined);
+        } else {
+          while (l[$ELEMENT]) l = l();
+          r.insert(e, l, multiExpression ? null : undefined);
+        }
       }
     }
-    typeof args[0] === "string" && detectMultiExpression(args);
-    while (args.length) item(args.shift());
-    return e;
     function parseClass(string) {
       const m = string.split(/([\.#]?[^\s#.]+)/);
       if (/^\.|#/.test(m[1])) e = document.createElement("div");

package/h/jsx-runtime/dist/jsx.cjs

@@ -0,0 +1,27 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var h = require('solid-js/h');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var h__default = /*#__PURE__*/_interopDefaultLegacy(h);
+
+function Fragment(props) {
+  return props.children;
+}
+
+Object.defineProperty(exports, 'jsx', {
+  enumerable: true,
+  get: function () { return h__default["default"]; }
+});
+Object.defineProperty(exports, 'jsxDEV', {
+  enumerable: true,
+  get: function () { return h__default["default"]; }
+});
+Object.defineProperty(exports, 'jsxs', {
+  enumerable: true,
+  get: function () { return h__default["default"]; }
+});
+exports.Fragment = Fragment;

package/h/jsx-runtime/dist/jsx.js

@@ -0,0 +1,7 @@
+export { default as jsx, default as jsxDEV, default as jsxs } from 'solid-js/h';
+
+function Fragment(props) {
+  return props.children;
+}
+
+export { Fragment };

package/h/jsx-runtime/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "solid-js/h/jsx-runtime",
+  "main": "./dist/jsx.cjs",
+  "module": "./dist/jsx.js",
+  "types": "./types/index.d.ts",
+  "type": "module",
+  "sideEffects": false
+}

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

@@ -0,0 +1,7 @@
+import h from "solid-js/h";
+export type { JSX } from "./jsx";
+import type { JSX } from "./jsx";
+declare function Fragment(props: {
+    children: JSX.Element;
+}): JSX.Element;
+export { h as jsx, h as jsxs, h as jsxDEV, Fragment };