@solidjs/web 2.0.0-beta.15 → 2.0.0-beta.16

package/dist/server.cjs

@@ -60,9 +60,9 @@ const syncOptions = {
   sync: true
 };
 const effect = (fn, effectFn, options) => solidJs.createRenderEffect(fn, effectFn, options ? {
-  transparent: true,
   sync: true,
-  ...options
+  ...options,
+  transparent: !options.scope
 } : transparentOptions);
 const memo = fn => solidJs.createMemo(() => fn(), syncOptions);
 
@@ -94,9 +94,15 @@ function getLocalHeaderScript(id) {
   return seroval.getCrossReferenceHeader(id) + ";";
 }
 
+function joinAssetPath(base, file) {
+  if (/^(?:[a-z][a-z0-9+.-]*:)?\/\//i.test(file)) return file;
+  if (typeof base !== "string" || !base) base = "/";
+  if (base[base.length - 1] !== "/") base += "/";
+  return base + (file[0] === "/" ? file.slice(1) : file);
+}
 function resolveAssets(moduleUrl, manifest) {
   if (!manifest) return null;
-  const base = manifest._base || "/";
+  const base = manifest._base;
   const entry = manifest[moduleUrl];
   if (!entry) return null;
   const css = [];
@@ -107,8 +113,8 @@ function resolveAssets(moduleUrl, manifest) {
     visited.add(key);
     const e = manifest[key];
     if (!e) return;
-    js.push(base + e.file);
-    if (e.css) for (let i = 0; i < e.css.length; i++) css.push(base + e.css[i]);
+    js.push(joinAssetPath(base, e.file));
+    if (e.css) for (let i = 0; i < e.css.length; i++) css.push(joinAssetPath(base, e.css[i]));
     if (e.imports) for (let i = 0; i < e.imports.length; i++) walk(e.imports[i]);
   };
   walk(moduleUrl);
@@ -497,38 +503,41 @@ function renderToStream(code, options = {}) {
   }, {
     id: renderId
   });
-  function doShell() {
-    if (shellCompleted) return;
-    if (rootHoles) {
-      const pending = [];
-      for (const {
-        id,
-        fn
-      } of rootHoles) {
-        const marker = `<!--rh${id}-->`;
-        const res = resolveSSRNode(fn);
-        if (!res.h.length) {
-          html = html.replace(marker, res.t[0]);
-        } else {
-          let out = res.t[0];
-          for (let j = 0; j < res.h.length; j++) {
-            const newId = nextHoleId++;
-            pending.push({
-              id: newId,
-              fn: res.h[j]
-            });
-            out += `<!--rh${newId}-->` + res.t[j + 1];
-          }
-          html = html.replace(marker, out);
-          for (const p of res.p) blockingPromises.add(p);
+  function resolveRootHoles() {
+    if (!rootHoles) return true;
+    const pending = [];
+    for (const {
+      id,
+      fn
+    } of rootHoles) {
+      const marker = `<!--rh${id}-->`;
+      const res = resolveSSRNode(fn);
+      if (!res.h.length) {
+        html = html.replace(marker, res.t[0]);
+      } else {
+        let out = res.t[0];
+        for (let j = 0; j < res.h.length; j++) {
+          const newId = nextHoleId++;
+          pending.push({
+            id: newId,
+            fn: res.h[j]
+          });
+          out += `<!--rh${newId}-->` + res.t[j + 1];
         }
+        html = html.replace(marker, out);
+        for (const p of res.p) blockingPromises.add(p);
       }
-      if (pending.length) {
-        rootHoles = pending;
-        return;
-      }
-      rootHoles = null;
     }
+    if (pending.length) {
+      rootHoles = pending;
+      return false;
+    }
+    rootHoles = null;
+    return true;
+  }
+  function doShell() {
+    if (shellCompleted) return;
+    if (!resolveRootHoles()) return;
     solidJs.sharedConfig.context = context;
     html = injectAssets(context.assets, html);
     headStyles = new Set();
@@ -560,7 +569,15 @@ function renderToStream(code, options = {}) {
           complete();
         };
       } else onCompleteAll = complete;
-      queue(flushEnd);
+      function flush() {
+        allSettled(blockingPromises).then(() => {
+          setTimeout(() => {
+            if (!resolveRootHoles()) return flush();
+            queue(flushEnd);
+          });
+        });
+      }
+      flush();
     },
     pipe(w) {
       function flush() {
@@ -941,29 +958,6 @@ function tryJoinPlainSSRArray(nodes) {
   }
   return out;
 }
-function mergeProps(...sources) {
-  const target = {};
-  for (let i = 0; i < sources.length; i++) {
-    let source = sources[i];
-    if (typeof source === "function") source = source();
-    if (source) {
-      const descriptors = Object.getOwnPropertyDescriptors(source);
-      for (const key in descriptors) {
-        if (key in target) continue;
-        Object.defineProperty(target, key, {
-          enumerable: true,
-          get() {
-            for (let i = sources.length - 1; i >= 0; i--) {
-              const v = (sources[i] || {})[key];
-              if (v !== undefined) return v;
-            }
-          }
-        });
-      }
-    }
-  }
-  return target;
-}
 function getHydrationKey() {
   const hydrate = solidJs.sharedConfig.context;
   return hydrate && solidJs.sharedConfig.getNextContextId();
@@ -1112,6 +1106,10 @@ function tryResolveString(node) {
     if (node.h && node.h.length > 0) return {
       merge: node
     };
+    if (node.t === undefined) {
+      console.warn(`Unrecognized value. Skipped inserting`, node);
+      return "";
+    }
     return Array.isArray(node.t) ? node.t[0] : node.t;
   }
   if (t === "function") {
@@ -1150,7 +1148,9 @@ function resolveSSRNode(node, result = {
         result.h.push(...node.h);
         result.p.push(...node.p);
       }
-    } else result.t[result.t.length - 1] += node.t;
+    } else if (node.t !== undefined) {
+      result.t[result.t.length - 1] += node.t;
+    } else console.warn(`Unrecognized value. Skipped inserting`, node);
   } else if (t === "function") {
     try {
       resolveSSRNode(node(), result);
@@ -1187,15 +1187,38 @@ function dynamic(source) {
   const o = solidJs.getOwner();
   if (o?.id != null) solidJs.getNextChildId(o);
   return props => {
-    const memoOwner = solidJs.createOwner();
-    return solidJs.runWithOwner(memoOwner, () => {
-      const comp = source(),
-        t = typeof comp;
-      if (comp) {
-        if (t === "function") return comp(props);else if (t === "string") {
-          return ssrElement(comp, props, undefined, true);
+    const comp = source();
+    let p;
+    let settled = false;
+    let value;
+    let error;
+    if (comp && typeof comp.then === "function") {
+      p = comp;
+      p.then(v => {
+        value = v;
+        settled = true;
+      }, err => {
+        error = err;
+        settled = true;
+      });
+      const ctx = solidJs.sharedConfig.context;
+      if (ctx?.async) ctx.block(p.then(() => {}, () => {}));
+    }
+    return solidJs.createMemo(() => {
+      let c = comp;
+      if (p) {
+        if (!settled) throw new solidJs.NotReadyError(p);
+        if (error) throw error;
+        c = value;
+      }
+      if (c) {
+        if (typeof c === "function") return c(props);
+        if (typeof c === "string") {
+          return ssrElement(c, props, undefined, true);
         }
       }
+    }, {
+      sync: true
     });
   };
 }
@@ -1255,6 +1278,14 @@ Object.defineProperty(exports, "getOwner", {
   enumerable: true,
   get: function () { return solidJs.getOwner; }
 });
+Object.defineProperty(exports, "mergeProps", {
+  enumerable: true,
+  get: function () { return solidJs.merge; }
+});
+Object.defineProperty(exports, "scope", {
+  enumerable: true,
+  get: function () { return solidJs.ssrScope; }
+});
 Object.defineProperty(exports, "untrack", {
   enumerable: true,
   get: function () { return solidJs.untrack; }
@@ -1295,7 +1326,6 @@ exports.insert = notSup;
 exports.isDev = isDev;
 exports.isServer = isServer;
 exports.memo = memo;
-exports.mergeProps = mergeProps;
 exports.ref = notSup;
 exports.registerDelegatedContainer = notSup;
 exports.registerDelegatedRoot = notSup;

package/dist/server.js

@@ -1,5 +1,5 @@
-import { createRenderEffect, createMemo, sharedConfig, createRoot, ssrHandleError, getOwner, runWithOwner, createComponent, omit, getNextChildId, createOwner } from 'solid-js';
-export { Errored, For, Hydration, Loading, Match, NoHydration, Repeat, Reveal, Show, Switch, createComponent, getOwner, untrack } from 'solid-js';
+import { createRenderEffect, createMemo, sharedConfig, createRoot, ssrHandleError, getOwner, runWithOwner, createComponent, omit, getNextChildId, NotReadyError } from 'solid-js';
+export { Errored, For, Hydration, Loading, Match, NoHydration, Repeat, Reveal, Show, Switch, createComponent, getOwner, merge as mergeProps, ssrScope as scope, untrack } from 'solid-js';
 import { Serializer, Feature, getCrossReferenceHeader } from 'seroval';
 import { AbortSignalPlugin, CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
 
@@ -59,9 +59,9 @@ const syncOptions = {
   sync: true
 };
 const effect = (fn, effectFn, options) => createRenderEffect(fn, effectFn, options ? {
-  transparent: true,
   sync: true,
-  ...options
+  ...options,
+  transparent: !options.scope
 } : transparentOptions);
 const memo = fn => createMemo(() => fn(), syncOptions);
 
@@ -93,9 +93,15 @@ function getLocalHeaderScript(id) {
   return getCrossReferenceHeader(id) + ";";
 }
 
+function joinAssetPath(base, file) {
+  if (/^(?:[a-z][a-z0-9+.-]*:)?\/\//i.test(file)) return file;
+  if (typeof base !== "string" || !base) base = "/";
+  if (base[base.length - 1] !== "/") base += "/";
+  return base + (file[0] === "/" ? file.slice(1) : file);
+}
 function resolveAssets(moduleUrl, manifest) {
   if (!manifest) return null;
-  const base = manifest._base || "/";
+  const base = manifest._base;
   const entry = manifest[moduleUrl];
   if (!entry) return null;
   const css = [];
@@ -106,8 +112,8 @@ function resolveAssets(moduleUrl, manifest) {
     visited.add(key);
     const e = manifest[key];
     if (!e) return;
-    js.push(base + e.file);
-    if (e.css) for (let i = 0; i < e.css.length; i++) css.push(base + e.css[i]);
+    js.push(joinAssetPath(base, e.file));
+    if (e.css) for (let i = 0; i < e.css.length; i++) css.push(joinAssetPath(base, e.css[i]));
     if (e.imports) for (let i = 0; i < e.imports.length; i++) walk(e.imports[i]);
   };
   walk(moduleUrl);
@@ -496,38 +502,41 @@ function renderToStream(code, options = {}) {
   }, {
     id: renderId
   });
-  function doShell() {
-    if (shellCompleted) return;
-    if (rootHoles) {
-      const pending = [];
-      for (const {
-        id,
-        fn
-      } of rootHoles) {
-        const marker = `<!--rh${id}-->`;
-        const res = resolveSSRNode(fn);
-        if (!res.h.length) {
-          html = html.replace(marker, res.t[0]);
-        } else {
-          let out = res.t[0];
-          for (let j = 0; j < res.h.length; j++) {
-            const newId = nextHoleId++;
-            pending.push({
-              id: newId,
-              fn: res.h[j]
-            });
-            out += `<!--rh${newId}-->` + res.t[j + 1];
-          }
-          html = html.replace(marker, out);
-          for (const p of res.p) blockingPromises.add(p);
+  function resolveRootHoles() {
+    if (!rootHoles) return true;
+    const pending = [];
+    for (const {
+      id,
+      fn
+    } of rootHoles) {
+      const marker = `<!--rh${id}-->`;
+      const res = resolveSSRNode(fn);
+      if (!res.h.length) {
+        html = html.replace(marker, res.t[0]);
+      } else {
+        let out = res.t[0];
+        for (let j = 0; j < res.h.length; j++) {
+          const newId = nextHoleId++;
+          pending.push({
+            id: newId,
+            fn: res.h[j]
+          });
+          out += `<!--rh${newId}-->` + res.t[j + 1];
         }
+        html = html.replace(marker, out);
+        for (const p of res.p) blockingPromises.add(p);
       }
-      if (pending.length) {
-        rootHoles = pending;
-        return;
-      }
-      rootHoles = null;
     }
+    if (pending.length) {
+      rootHoles = pending;
+      return false;
+    }
+    rootHoles = null;
+    return true;
+  }
+  function doShell() {
+    if (shellCompleted) return;
+    if (!resolveRootHoles()) return;
     sharedConfig.context = context;
     html = injectAssets(context.assets, html);
     headStyles = new Set();
@@ -559,7 +568,15 @@ function renderToStream(code, options = {}) {
           complete();
         };
       } else onCompleteAll = complete;
-      queue(flushEnd);
+      function flush() {
+        allSettled(blockingPromises).then(() => {
+          setTimeout(() => {
+            if (!resolveRootHoles()) return flush();
+            queue(flushEnd);
+          });
+        });
+      }
+      flush();
     },
     pipe(w) {
       function flush() {
@@ -940,29 +957,6 @@ function tryJoinPlainSSRArray(nodes) {
   }
   return out;
 }
-function mergeProps(...sources) {
-  const target = {};
-  for (let i = 0; i < sources.length; i++) {
-    let source = sources[i];
-    if (typeof source === "function") source = source();
-    if (source) {
-      const descriptors = Object.getOwnPropertyDescriptors(source);
-      for (const key in descriptors) {
-        if (key in target) continue;
-        Object.defineProperty(target, key, {
-          enumerable: true,
-          get() {
-            for (let i = sources.length - 1; i >= 0; i--) {
-              const v = (sources[i] || {})[key];
-              if (v !== undefined) return v;
-            }
-          }
-        });
-      }
-    }
-  }
-  return target;
-}
 function getHydrationKey() {
   const hydrate = sharedConfig.context;
   return hydrate && sharedConfig.getNextContextId();
@@ -1111,6 +1105,10 @@ function tryResolveString(node) {
     if (node.h && node.h.length > 0) return {
       merge: node
     };
+    if (node.t === undefined) {
+      console.warn(`Unrecognized value. Skipped inserting`, node);
+      return "";
+    }
     return Array.isArray(node.t) ? node.t[0] : node.t;
   }
   if (t === "function") {
@@ -1149,7 +1147,9 @@ function resolveSSRNode(node, result = {
         result.h.push(...node.h);
         result.p.push(...node.p);
       }
-    } else result.t[result.t.length - 1] += node.t;
+    } else if (node.t !== undefined) {
+      result.t[result.t.length - 1] += node.t;
+    } else console.warn(`Unrecognized value. Skipped inserting`, node);
   } else if (t === "function") {
     try {
       resolveSSRNode(node(), result);
@@ -1186,15 +1186,38 @@ function dynamic(source) {
   const o = getOwner();
   if (o?.id != null) getNextChildId(o);
   return props => {
-    const memoOwner = createOwner();
-    return runWithOwner(memoOwner, () => {
-      const comp = source(),
-        t = typeof comp;
-      if (comp) {
-        if (t === "function") return comp(props);else if (t === "string") {
-          return ssrElement(comp, props, undefined, true);
+    const comp = source();
+    let p;
+    let settled = false;
+    let value;
+    let error;
+    if (comp && typeof comp.then === "function") {
+      p = comp;
+      p.then(v => {
+        value = v;
+        settled = true;
+      }, err => {
+        error = err;
+        settled = true;
+      });
+      const ctx = sharedConfig.context;
+      if (ctx?.async) ctx.block(p.then(() => {}, () => {}));
+    }
+    return createMemo(() => {
+      let c = comp;
+      if (p) {
+        if (!settled) throw new NotReadyError(p);
+        if (error) throw error;
+        c = value;
+      }
+      if (c) {
+        if (typeof c === "function") return c(props);
+        if (typeof c === "string") {
+          return ssrElement(c, props, undefined, true);
         }
       }
+    }, {
+      sync: true
     });
   };
 }
@@ -1206,4 +1229,4 @@ function Portal(props) {
   throw new Error("Portal is not supported on the server");
 }
 
-export { Assets, ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, HydrationScript, MathMLElements, Namespaces, Portal, RawTextElements, RequestContext, SVGElements, VoidElements, notSup as addEvent, applyRef, notSup as assign, notSup as className, notSup as delegateEvents, dynamic, notSup as dynamicProperty, effect, escape, generateHydrationScript, getAssets, notSup as getDelegatedRoot, getHydrationKey, notSup as getNextElement, notSup as getNextMarker, notSup as getNextMatch, getRequestEvent, notSup as hydrate, notSup as insert, isDev, isServer, memo, mergeProps, notSup as ref, notSup as registerDelegatedContainer, notSup as registerDelegatedRoot, notSup as render, renderToStream, renderToString, renderToStringAsync, notSup as runHydrationEvents, notSup as setAttribute, notSup as setAttributeNS, notSup as setProperty, notSup as setStyleProperty, notSup as spread, ssr, ssrAttribute, ssrClassName, ssrElement, ssrGroup, ssrHydrationKey, ssrStyle, ssrStyleProperty, notSup as style, notSup as template, notSup as unregisterDelegatedContainer, notSup as unregisterDelegatedRoot, useAssets };
+export { Assets, ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, HydrationScript, MathMLElements, Namespaces, Portal, RawTextElements, RequestContext, SVGElements, VoidElements, notSup as addEvent, applyRef, notSup as assign, notSup as className, notSup as delegateEvents, dynamic, notSup as dynamicProperty, effect, escape, generateHydrationScript, getAssets, notSup as getDelegatedRoot, getHydrationKey, notSup as getNextElement, notSup as getNextMarker, notSup as getNextMatch, getRequestEvent, notSup as hydrate, notSup as insert, isDev, isServer, memo, notSup as ref, notSup as registerDelegatedContainer, notSup as registerDelegatedRoot, notSup as render, renderToStream, renderToString, renderToStringAsync, notSup as runHydrationEvents, notSup as setAttribute, notSup as setAttributeNS, notSup as setProperty, notSup as setStyleProperty, notSup as spread, ssr, ssrAttribute, ssrClassName, ssrElement, ssrGroup, ssrHydrationKey, ssrStyle, ssrStyleProperty, notSup as style, notSup as template, notSup as unregisterDelegatedContainer, notSup as unregisterDelegatedRoot, useAssets };