solid-js 1.3.0-beta.4 → 1.3.0-beta.8

package/dist/dev.cjs

@@ -251,6 +251,8 @@ function createResource(source, fetcher, options) {
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
+    ({ ...sharedConfig.context
+    });
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
@@ -1281,7 +1283,7 @@ function lazy(fn) {
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
         set(() => mod.default);
-        setHydrateContext(undefined);
+        setHydrateContext();
       });
       comp = s;
     } else if (!comp) {
@@ -1479,7 +1481,7 @@ function Suspense(props) {
         waitingHydration = true;
         setHydrateContext(ctx);
         set();
-        setHydrateContext(undefined);
+        setHydrateContext();
         waitingHydration = false;
       });
     }
@@ -1512,7 +1514,10 @@ function Suspense(props) {
           if (!visibleFallback) return;
           return createRoot(disposer => {
             dispose = disposer;
-            if (sharedConfig.context) sharedConfig.context.count = 0;
+            if (sharedConfig.context) setHydrateContext({
+              id: sharedConfig.context.id + "f",
+              count: 0
+            });
             return props.fallback;
           }, owner);
         });

package/dist/dev.js

@@ -247,6 +247,8 @@ function createResource(source, fetcher, options) {
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
+    ({ ...sharedConfig.context
+    });
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
@@ -1277,7 +1279,7 @@ function lazy(fn) {
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
         set(() => mod.default);
-        setHydrateContext(undefined);
+        setHydrateContext();
       });
       comp = s;
     } else if (!comp) {
@@ -1475,7 +1477,7 @@ function Suspense(props) {
         waitingHydration = true;
         setHydrateContext(ctx);
         set();
-        setHydrateContext(undefined);
+        setHydrateContext();
         waitingHydration = false;
       });
     }
@@ -1508,7 +1510,10 @@ function Suspense(props) {
           if (!visibleFallback) return;
           return createRoot(disposer => {
             dispose = disposer;
-            if (sharedConfig.context) sharedConfig.context.count = 0;
+            if (sharedConfig.context) setHydrateContext({
+              id: sharedConfig.context.id + "f",
+              count: 0
+            });
             return props.fallback;
           }, owner);
         });

package/dist/server.cjs

@@ -351,7 +351,7 @@ function createResource(fn, fetcher, options = {}) {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
     const resolved = sharedConfig.context.async && sharedConfig.context.resources[id].data;
-    if (!resolved) {
+    if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
         ctx.resources.set(id, read);
@@ -363,7 +363,7 @@ function createResource(fn, fetcher, options = {}) {
   read.loading = false;
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = true;
+    if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
     if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
       value = ctx.resources[id].data;
       return;
@@ -502,9 +502,10 @@ function Suspense(props) {
     };
   }
   setHydrateContext({ ...ctx,
-    count: 0
+    count: 0,
+    id: ctx.id + "0.f"
   });
-  return createComponent(() => props.fallback, {});
+  return props.fallback;
 }
 
 exports.$PROXY = $PROXY;

package/dist/server.js

@@ -347,7 +347,7 @@ function createResource(fn, fetcher, options = {}) {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
     const resolved = sharedConfig.context.async && sharedConfig.context.resources[id].data;
-    if (!resolved) {
+    if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
         ctx.resources.set(id, read);
@@ -359,7 +359,7 @@ function createResource(fn, fetcher, options = {}) {
   read.loading = false;
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = true;
+    if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
     if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
       value = ctx.resources[id].data;
       return;
@@ -498,9 +498,10 @@ function Suspense(props) {
     };
   }
   setHydrateContext({ ...ctx,
-    count: 0
+    count: 0,
+    id: ctx.id + "0.f"
   });
-  return createComponent(() => props.fallback, {});
+  return props.fallback;
 }
 
 export { $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/solid.cjs

@@ -248,6 +248,8 @@ function createResource(source, fetcher, options) {
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
+    ({ ...sharedConfig.context
+    });
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
@@ -1205,7 +1207,7 @@ function lazy(fn) {
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
         set(() => mod.default);
-        setHydrateContext(undefined);
+        setHydrateContext();
       });
       comp = s;
     } else if (!comp) {
@@ -1403,7 +1405,7 @@ function Suspense(props) {
         waitingHydration = true;
         setHydrateContext(ctx);
         set();
-        setHydrateContext(undefined);
+        setHydrateContext();
         waitingHydration = false;
       });
     }
@@ -1436,7 +1438,10 @@ function Suspense(props) {
           if (!visibleFallback) return;
           return createRoot(disposer => {
             dispose = disposer;
-            if (sharedConfig.context) sharedConfig.context.count = 0;
+            if (sharedConfig.context) setHydrateContext({
+              id: sharedConfig.context.id + "f",
+              count: 0
+            });
             return props.fallback;
           }, owner);
         });

package/dist/solid.js

@@ -244,6 +244,8 @@ function createResource(source, fetcher, options) {
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
+    ({ ...sharedConfig.context
+    });
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
@@ -1201,7 +1203,7 @@ function lazy(fn) {
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
         set(() => mod.default);
-        setHydrateContext(undefined);
+        setHydrateContext();
       });
       comp = s;
     } else if (!comp) {
@@ -1399,7 +1401,7 @@ function Suspense(props) {
         waitingHydration = true;
         setHydrateContext(ctx);
         set();
-        setHydrateContext(undefined);
+        setHydrateContext();
         waitingHydration = false;
       });
     }
@@ -1432,7 +1434,10 @@ function Suspense(props) {
           if (!visibleFallback) return;
           return createRoot(disposer => {
             dispose = disposer;
-            if (sharedConfig.context) sharedConfig.context.count = 0;
+            if (sharedConfig.context) setHydrateContext({
+              id: sharedConfig.context.id + "f",
+              count: 0
+            });
             return props.fallback;
           }, owner);
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.3.0-beta.4",
+  "version": "1.3.0-beta.8",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -37,6 +37,10 @@
   "exports": {
     ".": {
       "browser": {
+        "development": {
+          "import": "./dist/dev.js",
+          "require": "./dist/dev.cjs"
+        },
         "import": "./dist/solid.js",
         "require": "./dist/solid.cjs"
       },
@@ -54,6 +58,10 @@
     "./dist/*": "./dist/*",
     "./store": {
       "browser": {
+        "development": {
+          "import": "./store/dist/dev.js",
+          "require": "./store/dist/dev.cjs"
+        },
         "import": "./store/dist/store.js",
         "require": "./store/dist/store.cjs"
       },
@@ -71,6 +79,10 @@
     "./store/dist/*": "./store/dist/*",
     "./web": {
       "browser": {
+        "development": {
+          "import": "./web/dist/dev.js",
+          "require": "./web/dist/dev.cjs"
+        },
         "import": "./web/dist/web.js",
         "require": "./web/dist/web.cjs"
       },
@@ -132,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "c9307f020f33ff584f2d896c219e530d8ee97a9c"
+  "gitHead": "d63c43c95c224cb4c4dc4f5c8681b9be3c62f1c9"
 }

package/types/reactive/signal.d.ts

@@ -200,7 +200,7 @@ export declare type ResourceOptions<T> = T extends undefined ? {
 /**
  * Creates a resource that wraps a repeated promise in a reactive pattern:
  * ```typescript
- * const [resource, { mutate, refetch }] = crateResource(source, fetcher, options);
+ * const [resource, { mutate, refetch }] = createResource(source, fetcher, options);
  * ```
  * @param source - reactive data function to toggle the request, optional
  * @param fetcher - function that receives the source (or true) and an accessor for the last or initial value and returns a value or a Promise with the value:

package/web/dist/dev.cjs

@@ -403,6 +403,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
+    if (solidJs.sharedConfig.context) return current = value.parentNode ? value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);

package/web/dist/dev.js

@@ -400,6 +400,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
+    if (sharedConfig.context) return current = value.parentNode ? value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);

package/web/dist/server.cjs

@@ -358,8 +358,8 @@ function renderToStream(code, options = {}) {
       tasks.push(`_$HY.init("${id}")`);
       p.then(d => {
         !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", ${devalue(d)})</script>`);
-      }).catch(() => {
-        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", null)</script>`);
+      }).catch(err => {
+        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", null, ${serializeError(err)})</script>`);
       });
     },
     registerFragment(key) {
@@ -404,6 +404,7 @@ function renderToStream(code, options = {}) {
       const writer = w.getWriter();
       writable = {
         end() {
+          writer.releaseLock();
           w.close();
         }
       };
@@ -573,7 +574,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 }) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>((e,t,o={})=>{t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let n=o.composedPath&&o.composedPath()[0]||o.target,s=t(n);s&&!e.completed.has(s)&&e.events.push([s,o])})))),e.init=(e,t)=>{o[e]=[new Promise((e=>t=e)),t]},e.set=(e,t,n)=>{if(!(n=o[e]))return o[e]=[t];n[1](t)},e.unset=(e)=>{delete o[e]},e.load=(e,t)=>{if(t=o[e])return t[0]}})(window._$HY||(_$HY={events:[],completed:new WeakSet}))</script><!xs>`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>((e,t,o={})=>{t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,n=t(s);n&&!e.completed.has(n)&&e.events.push([n,o])})))),e.init=(e,t,s)=>{o[e]=[new Promise(((e,o)=>(t=e,s=o))),t,s]},e.set=(e,t,s,n)=>{(n=o[e])&&(s?n[2](s):n[1](t)),o[e]=[t]},e.unset=e=>{delete o[e]},e.load=(e,t)=>{if(t=o[e])return t[0]}})(window._$HY||(_$HY={events:[],completed:new WeakSet}))</script><!xs>`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {

package/web/dist/server.js

@@ -355,8 +355,8 @@ function renderToStream(code, options = {}) {
       tasks.push(`_$HY.init("${id}")`);
       p.then(d => {
         !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", ${devalue(d)})</script>`);
-      }).catch(() => {
-        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", null)</script>`);
+      }).catch(err => {
+        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", null, ${serializeError(err)})</script>`);
       });
     },
     registerFragment(key) {
@@ -401,6 +401,7 @@ function renderToStream(code, options = {}) {
       const writer = w.getWriter();
       writable = {
         end() {
+          writer.releaseLock();
           w.close();
         }
       };
@@ -570,7 +571,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 }) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>((e,t,o={})=>{t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let n=o.composedPath&&o.composedPath()[0]||o.target,s=t(n);s&&!e.completed.has(s)&&e.events.push([s,o])})))),e.init=(e,t)=>{o[e]=[new Promise((e=>t=e)),t]},e.set=(e,t,n)=>{if(!(n=o[e]))return o[e]=[t];n[1](t)},e.unset=(e)=>{delete o[e]},e.load=(e,t)=>{if(t=o[e])return t[0]}})(window._$HY||(_$HY={events:[],completed:new WeakSet}))</script><!xs>`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>((e,t,o={})=>{t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,n=t(s);n&&!e.completed.has(n)&&e.events.push([n,o])})))),e.init=(e,t,s)=>{o[e]=[new Promise(((e,o)=>(t=e,s=o))),t,s]},e.set=(e,t,s,n)=>{(n=o[e])&&(s?n[2](s):n[1](t)),o[e]=[t]},e.unset=e=>{delete o[e]},e.load=(e,t)=>{if(t=o[e])return t[0]}})(window._$HY||(_$HY={events:[],completed:new WeakSet}))</script><!xs>`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {

package/web/dist/web.cjs

@@ -402,6 +402,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
+    if (solidJs.sharedConfig.context) return current = value.parentNode ? value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);

package/web/dist/web.js

@@ -399,6 +399,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
+    if (sharedConfig.context) return current = value.parentNode ? value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);