solid-js 1.4.0-beta.1 → 1.4.0-beta.4

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) {
@@ -1228,17 +1228,16 @@ function enableHydration() {
   hydrationEnabled = true;
 }
 function createComponent(Comp, props) {
-  if (props == null || typeof props !== "object") props = {};
   if (hydrationEnabled) {
     if (sharedConfig.context) {
       const c = sharedConfig.context;
       setHydrateContext(nextHydrateContext());
-      const r = devComponent(Comp, props) ;
+      const r = devComponent(Comp, props || {}) ;
       setHydrateContext(c);
       return r;
     }
   }
-  return devComponent(Comp, props);
+  return devComponent(Comp, props || {});
 }
 function trueFn() {
   return true;
@@ -1269,7 +1268,7 @@ const propTraps = {
   }
 };
 function resolveSource(s) {
-  return (s = typeof s === "function" ? s() : s) == null || typeof s !== "object" ? {} : s;
+  return (s = typeof s === "function" ? s() : s) == null ? {} : s;
 }
 function mergeProps(...sources) {
   return new Proxy({

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) {
@@ -1224,17 +1224,16 @@ function enableHydration() {
   hydrationEnabled = true;
 }
 function createComponent(Comp, props) {
-  if (props == null || typeof props !== "object") props = {};
   if (hydrationEnabled) {
     if (sharedConfig.context) {
       const c = sharedConfig.context;
       setHydrateContext(nextHydrateContext());
-      const r = devComponent(Comp, props) ;
+      const r = devComponent(Comp, props || {}) ;
       setHydrateContext(c);
       return r;
     }
   }
-  return devComponent(Comp, props);
+  return devComponent(Comp, props || {});
 }
 function trueFn() {
   return true;
@@ -1265,7 +1264,7 @@ const propTraps = {
   }
 };
 function resolveSource(s) {
-  return (s = typeof s === "function" ? s() : s) == null || typeof s !== "object" ? {} : s;
+  return (s = typeof s === "function" ? s() : s) == null ? {} : s;
 }
 function mergeProps(...sources) {
   return new Proxy({

package/dist/server.cjs

@@ -246,15 +246,14 @@ function createUniqueId() {
   return `${ctx.id}${ctx.count++}`;
 }
 function createComponent(Comp, props) {
-  if (props == null || typeof props !== "object") props = {};
   if (sharedConfig.context && !sharedConfig.context.noHydrate) {
     const c = sharedConfig.context;
     setHydrateContext(nextHydrateContext());
-    const r = Comp(props);
+    const r = Comp(props || {});
     setHydrateContext(c);
     return r;
   }
-  return Comp(props);
+  return Comp(props || {});
 }
 function mergeProps(...sources) {
   const target = {};
@@ -401,7 +400,7 @@ function createResource(source, fetcher, options = {}) {
     }
     if (p && "then" in p) {
       read.loading = true;
-      if (ctx.writeResource) ctx.writeResource(id, p);
+      if (ctx.writeResource) ctx.writeResource(id, p, undefined, options.deferStream);
       return p.then(res => {
         read.loading = false;
         ctx.resources[id].data = res;

package/dist/server.js

@@ -242,15 +242,14 @@ function createUniqueId() {
   return `${ctx.id}${ctx.count++}`;
 }
 function createComponent(Comp, props) {
-  if (props == null || typeof props !== "object") props = {};
   if (sharedConfig.context && !sharedConfig.context.noHydrate) {
     const c = sharedConfig.context;
     setHydrateContext(nextHydrateContext());
-    const r = Comp(props);
+    const r = Comp(props || {});
     setHydrateContext(c);
     return r;
   }
-  return Comp(props);
+  return Comp(props || {});
 }
 function mergeProps(...sources) {
   const target = {};
@@ -397,7 +396,7 @@ function createResource(source, fetcher, options = {}) {
     }
     if (p && "then" in p) {
       read.loading = true;
-      if (ctx.writeResource) ctx.writeResource(id, p);
+      if (ctx.writeResource) ctx.writeResource(id, p, undefined, options.deferStream);
       return p.then(res => {
         read.loading = false;
         ctx.resources[id].data = res;

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) {
@@ -1147,17 +1147,16 @@ function enableHydration() {
   hydrationEnabled = true;
 }
 function createComponent(Comp, props) {
-  if (props == null || typeof props !== "object") props = {};
   if (hydrationEnabled) {
     if (sharedConfig.context) {
       const c = sharedConfig.context;
       setHydrateContext(nextHydrateContext());
-      const r = untrack(() => Comp(props));
+      const r = untrack(() => Comp(props || {}));
       setHydrateContext(c);
       return r;
     }
   }
-  return untrack(() => Comp(props));
+  return untrack(() => Comp(props || {}));
 }
 function trueFn() {
   return true;
@@ -1188,7 +1187,7 @@ const propTraps = {
   }
 };
 function resolveSource(s) {
-  return (s = typeof s === "function" ? s() : s) == null || typeof s !== "object" ? {} : s;
+  return (s = typeof s === "function" ? s() : s) == null ? {} : s;
 }
 function mergeProps(...sources) {
   return new Proxy({

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) {
@@ -1143,17 +1143,16 @@ function enableHydration() {
   hydrationEnabled = true;
 }
 function createComponent(Comp, props) {
-  if (props == null || typeof props !== "object") props = {};
   if (hydrationEnabled) {
     if (sharedConfig.context) {
       const c = sharedConfig.context;
       setHydrateContext(nextHydrateContext());
-      const r = untrack(() => Comp(props));
+      const r = untrack(() => Comp(props || {}));
       setHydrateContext(c);
       return r;
     }
   }
-  return untrack(() => Comp(props));
+  return untrack(() => Comp(props || {}));
 }
 function trueFn() {
   return true;
@@ -1184,7 +1183,7 @@ const propTraps = {
   }
 };
 function resolveSource(s) {
-  return (s = typeof s === "function" ? s() : s) == null || typeof s !== "object" ? {} : s;
+  return (s = typeof s === "function" ? s() : s) == null ? {} : s;
 }
 function mergeProps(...sources) {
   return new Proxy({

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) {
@@ -42,12 +50,12 @@ function createHyperScript(r) {
           }
           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) {
@@ -40,12 +48,12 @@ function createHyperScript(r) {
           }
           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 };