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

package/dist/dev.cjs

@@ -247,13 +247,12 @@ function createResource(source, fetcher, options) {
       pr = null,
       initP = null,
       id = null,
-      ctx,
       loadedUnderTransition = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
-    ctx = { ...sharedConfig.context
-    };
+    ({ ...sharedConfig.context
+    });
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
@@ -271,14 +270,7 @@ function createResource(source, fetcher, options) {
           }
           completeLoad(v);
         }, false);
-      } else {
-        if (p === initP) setHydrateContext(ctx);
-        completeLoad(v);
-        if (p === initP) {
-          initP = null;
-          setHydrateContext();
-        }
-      }
+      } else completeLoad(v);
     }
     return v;
   }
@@ -316,7 +308,8 @@ function createResource(source, fetcher, options) {
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
-    const p = sharedConfig.context && initP || untrack(() => fetcher(lookup, s));
+    const p = initP || untrack(() => fetcher(lookup, s));
+    initP = null;
     if (typeof p !== "object" || !("then" in p)) {
       loadEnd(pr, p);
       return;
@@ -1488,7 +1481,7 @@ function Suspense(props) {
         waitingHydration = true;
         setHydrateContext(ctx);
         set();
-        setHydrateContext(undefined);
+        setHydrateContext();
         waitingHydration = false;
       });
     }

package/dist/dev.js

@@ -243,13 +243,12 @@ function createResource(source, fetcher, options) {
       pr = null,
       initP = null,
       id = null,
-      ctx,
       loadedUnderTransition = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
-    ctx = { ...sharedConfig.context
-    };
+    ({ ...sharedConfig.context
+    });
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
@@ -267,14 +266,7 @@ function createResource(source, fetcher, options) {
           }
           completeLoad(v);
         }, false);
-      } else {
-        if (p === initP) setHydrateContext(ctx);
-        completeLoad(v);
-        if (p === initP) {
-          initP = null;
-          setHydrateContext();
-        }
-      }
+      } else completeLoad(v);
     }
     return v;
   }
@@ -312,7 +304,8 @@ function createResource(source, fetcher, options) {
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
-    const p = sharedConfig.context && initP || untrack(() => fetcher(lookup, s));
+    const p = initP || untrack(() => fetcher(lookup, s));
+    initP = null;
     if (typeof p !== "object" || !("then" in p)) {
       loadEnd(pr, p);
       return;
@@ -1484,7 +1477,7 @@ function Suspense(props) {
         waitingHydration = true;
         setHydrateContext(ctx);
         set();
-        setHydrateContext(undefined);
+        setHydrateContext();
         waitingHydration = false;
       });
     }

package/dist/solid.cjs

@@ -244,13 +244,12 @@ function createResource(source, fetcher, options) {
       pr = null,
       initP = null,
       id = null,
-      ctx,
       loadedUnderTransition = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
-    ctx = { ...sharedConfig.context
-    };
+    ({ ...sharedConfig.context
+    });
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
@@ -268,14 +267,7 @@ function createResource(source, fetcher, options) {
           }
           completeLoad(v);
         }, false);
-      } else {
-        if (p === initP) setHydrateContext(ctx);
-        completeLoad(v);
-        if (p === initP) {
-          initP = null;
-          setHydrateContext();
-        }
-      }
+      } else completeLoad(v);
     }
     return v;
   }
@@ -313,7 +305,8 @@ function createResource(source, fetcher, options) {
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
-    const p = sharedConfig.context && initP || untrack(() => fetcher(lookup, s));
+    const p = initP || untrack(() => fetcher(lookup, s));
+    initP = null;
     if (typeof p !== "object" || !("then" in p)) {
       loadEnd(pr, p);
       return;
@@ -1412,7 +1405,7 @@ function Suspense(props) {
         waitingHydration = true;
         setHydrateContext(ctx);
         set();
-        setHydrateContext(undefined);
+        setHydrateContext();
         waitingHydration = false;
       });
     }

package/dist/solid.js

@@ -240,13 +240,12 @@ function createResource(source, fetcher, options) {
       pr = null,
       initP = null,
       id = null,
-      ctx,
       loadedUnderTransition = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
-    ctx = { ...sharedConfig.context
-    };
+    ({ ...sharedConfig.context
+    });
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
@@ -264,14 +263,7 @@ function createResource(source, fetcher, options) {
           }
           completeLoad(v);
         }, false);
-      } else {
-        if (p === initP) setHydrateContext(ctx);
-        completeLoad(v);
-        if (p === initP) {
-          initP = null;
-          setHydrateContext();
-        }
-      }
+      } else completeLoad(v);
     }
     return v;
   }
@@ -309,7 +301,8 @@ function createResource(source, fetcher, options) {
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
-    const p = sharedConfig.context && initP || untrack(() => fetcher(lookup, s));
+    const p = initP || untrack(() => fetcher(lookup, s));
+    initP = null;
     if (typeof p !== "object" || !("then" in p)) {
       loadEnd(pr, p);
       return;
@@ -1408,7 +1401,7 @@ function Suspense(props) {
         waitingHydration = true;
         setHydrateContext(ctx);
         set();
-        setHydrateContext(undefined);
+        setHydrateContext();
         waitingHydration = false;
       });
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.3.0-beta.7",
+  "version": "1.3.0-beta.8",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "de3e45c226d44d9e1a67813be07e87459e41852c"
+  "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/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++) {