@solidjs/web 2.0.0-experimental.3 → 2.0.0-experimental.5

package/dist/server.cjs

@@ -49,6 +49,8 @@ const SVGNamespace = {
 };
 const DOMElements = /*#__PURE__*/new Set(["html", "base", "head", "link", "meta", "style", "title", "body", "address", "article", "aside", "footer", "header", "main", "nav", "section", "body", "blockquote", "dd", "div", "dl", "dt", "figcaption", "figure", "hr", "li", "ol", "p", "pre", "ul", "a", "abbr", "b", "bdi", "bdo", "br", "cite", "code", "data", "dfn", "em", "i", "kbd", "mark", "q", "rp", "rt", "ruby", "s", "samp", "small", "span", "strong", "sub", "sup", "time", "u", "var", "wbr", "area", "audio", "img", "map", "track", "video", "embed", "iframe", "object", "param", "picture", "portal", "source", "svg", "math", "canvas", "noscript", "script", "del", "ins", "caption", "col", "colgroup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "button", "datalist", "fieldset", "form", "input", "label", "legend", "meter", "optgroup", "option", "output", "progress", "select", "textarea", "details", "dialog", "menu", "summary", "details", "slot", "template", "acronym", "applet", "basefont", "bgsound", "big", "blink", "center", "content", "dir", "font", "frame", "frameset", "hgroup", "image", "keygen", "marquee", "menuitem", "nobr", "noembed", "noframes", "plaintext", "rb", "rtc", "shadow", "spacer", "strike", "tt", "xmp", "a", "abbr", "acronym", "address", "applet", "area", "article", "aside", "audio", "b", "base", "basefont", "bdi", "bdo", "bgsound", "big", "blink", "blockquote", "body", "br", "button", "canvas", "caption", "center", "cite", "code", "col", "colgroup", "content", "data", "datalist", "dd", "del", "details", "dfn", "dialog", "dir", "div", "dl", "dt", "em", "embed", "fieldset", "figcaption", "figure", "font", "footer", "form", "frame", "frameset", "head", "header", "hgroup", "hr", "html", "i", "iframe", "image", "img", "input", "ins", "kbd", "keygen", "label", "legend", "li", "link", "main", "map", "mark", "marquee", "menu", "menuitem", "meta", "meter", "nav", "nobr", "noembed", "noframes", "noscript", "object", "ol", "optgroup", "option", "output", "p", "param", "picture", "plaintext", "portal", "pre", "progress", "q", "rb", "rp", "rt", "rtc", "ruby", "s", "samp", "script", "section", "select", "shadow", "slot", "small", "source", "spacer", "span", "strike", "strong", "style", "sub", "summary", "sup", "table", "tbody", "td", "template", "textarea", "tfoot", "th", "thead", "time", "title", "tr", "track", "tt", "u", "ul", "var", "video", "wbr", "xmp", "input", "h1", "h2", "h3", "h4", "h5", "h6"]);
 
+const memo = fn => solidJs.createMemo(() => fn());
+
 const ES2017FLAG = seroval.Feature.AggregateError
 | seroval.Feature.BigIntTypedArray;
 const GLOBAL_IDENTIFIER = '_$HY.r';
@@ -78,12 +80,15 @@ const VOID_ELEMENTS = /^(?:area|base|br|col|embed|hr|img|input|keygen|link|menui
 const REPLACE_SCRIPT = `function $df(e,n,o,t){if(n=document.getElementById(e),o=document.getElementById("pl-"+e)){for(;o&&8!==o.nodeType&&o.nodeValue!=="pl-"+e;)t=o.nextSibling,o.remove(),o=t;_$HY.done?o.remove():o.replaceWith(n.content)}n.remove(),_$HY.fe(e)}`;
 function renderToString(code, options = {}) {
   const {
-    renderId
+    renderId = "",
+    nonce,
+    noScripts
   } = options;
   let scripts = "";
   const serializer = createSerializer({
     scopeId: renderId,
     onData(script) {
+      if (noScripts) return;
       if (!scripts) {
         scripts = getLocalHeaderScript(renderId);
       }
@@ -92,23 +97,22 @@ function renderToString(code, options = {}) {
     onError: options.onError
   });
   solidJs.sharedConfig.context = {
-    id: renderId || "",
-    count: 0,
-    suspense: {},
-    lazy: {},
+    id: renderId,
+    resources: {},
     assets: [],
-    nonce: options.nonce,
+    nonce,
+    resolve(value) {
+      return resolveSSRNode(escape(value));
+    },
     serialize(id, p) {
       !solidJs.sharedConfig.context.noHydrate && serializer.write(id, p);
-    },
-    roots: 0,
-    nextRoot() {
-      return this.renderId + "i-" + this.roots++;
     }
   };
   let html = solidJs.createRoot(d => {
     setTimeout(d);
     return resolveSSRNode(escape(code()));
+  }, {
+    id: renderId
   });
   solidJs.sharedConfig.context.noHydrate = true;
   serializer.close();
@@ -116,25 +120,12 @@ function renderToString(code, options = {}) {
   if (scripts.length) html = injectScripts(html, scripts, options.nonce);
   return html;
 }
-function renderToStringAsync(code, options = {}) {
-  const {
-    timeoutMs = 30000
-  } = options;
-  let timeoutHandle;
-  const timeout = new Promise((_, reject) => {
-    timeoutHandle = setTimeout(() => reject("renderToString timed out"), timeoutMs);
-  });
-  return Promise.race([renderToStream(code, options), timeout]).then(html => {
-    clearTimeout(timeoutHandle);
-    return html;
-  });
-}
 function renderToStream(code, options = {}) {
   let {
     nonce,
     onCompleteShell,
     onCompleteAll,
-    renderId,
+    renderId = "",
     noScripts
   } = options;
   let dispose;
@@ -196,12 +187,9 @@ function renderToStream(code, options = {}) {
     }
   };
   solidJs.sharedConfig.context = context = {
-    id: renderId || "",
-    count: 0,
+    id: renderId,
     async: true,
     resources: {},
-    lazy: {},
-    suspense: {},
     assets: [],
     nonce,
     block(p) {
@@ -226,9 +214,8 @@ function renderToStream(code, options = {}) {
         });
       } else if (!serverOnly) serializer.write(id, p);
     },
-    roots: 0,
-    nextRoot() {
-      return this.renderId + "i-" + this.roots++;
+    resolve(value) {
+      return resolveSSRNode(escape(value));
     },
     registerFragment(key) {
       if (!registry.has(key)) {
@@ -267,6 +254,8 @@ function renderToStream(code, options = {}) {
   let html = solidJs.createRoot(d => {
     dispose = d;
     return resolveSSRNode(escape(code()));
+  }, {
+    id: renderId
   });
   function doShell() {
     if (shellCompleted) return;
@@ -440,7 +429,7 @@ function ssrAttribute(key, value, isBoolean) {
 }
 function ssrHydrationKey() {
   const hk = getHydrationKey();
-  return hk ? ` data-hk=${hk}` : "";
+  return hk ? ` _hk=${hk}` : "";
 }
 function escape(s, attr) {
   const t = typeof s;
@@ -502,9 +491,38 @@ function resolveSSRNode(node, top) {
     return mapped;
   }
   if (t === "object") return node.t;
-  if (t === "function") return resolveSSRNode(node());
+  if (t === "function") {
+    try {
+      return resolveSSRNode(node());
+    } catch (err) {
+      if (!solidJs.ssrHandleError(err)) throw err;
+    }
+  }
   return String(node);
 }
+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 && !hydrate.noHydrate && solidJs.sharedConfig.getNextContextId();
@@ -522,7 +540,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 } = {}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>window._$HY||(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host.nodeType?e.host:e.parentNode));["${eventNames.join('", "')}"].forEach((o=>document.addEventListener(o,(o=>{if(!e.events)return;let s=t(o.composedPath&&o.composedPath()[0]||o.target);s&&!e.completed.has(s)&&e.events.push([s,o])}))))})(_$HY={events:[],completed:new WeakSet,r:{},fe(){}});</script><!--xs-->`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>window._$HY||(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("_hk")?e:t(e.host&&e.host.nodeType?e.host:e.parentNode));["${eventNames.join('", "')}"].forEach((o=>document.addEventListener(o,(o=>{if(!e.events)return;let s=t(o.composedPath&&o.composedPath()[0]||o.target);s&&!e.completed.has(s)&&e.events.push([s,o])}))))})(_$HY={events:[],completed:new WeakSet,r:{},fe(){}});</script><!--xs-->`;
 }
 function Hydration(props) {
   if (!solidJs.sharedConfig.context.noHydrate) return props.children;
@@ -538,8 +556,14 @@ function Hydration(props) {
   return res;
 }
 function NoHydration(props) {
-  if (solidJs.sharedConfig.context) solidJs.sharedConfig.context.noHydrate = true;
-  return props.children;
+  let context = solidJs.sharedConfig.context;
+  if (context) solidJs.sharedConfig.context = {
+    ...context,
+    noHydrate: true
+  };
+  const res = props.children;
+  if (context) solidJs.sharedConfig.context = context;
+  return res;
 }
 function queue(fn) {
   return Promise.resolve().then(fn);
@@ -599,8 +623,8 @@ const RequestContext = Symbol();
 function getRequestEvent() {
   return globalThis[RequestContext] ? globalThis[RequestContext].getStore() || solidJs.sharedConfig.context && solidJs.sharedConfig.context.event || console.log("RequestEvent is missing. This is most likely due to accessing `getRequestEvent` non-managed async scope in a partially polyfilled environment. Try moving it above all `await` calls.") : undefined;
 }
-function Assets(props) {
-  useAssets(() => props.children);
+function renderToStringAsync(code, options = {}) {
+  return renderToStream(code, options).then(html => html);
 }
 function notSup() {
   throw new Error("Client-only API called on the server side. Run client-only code in onMount, or conditionally run client-only component with <Show>.");
@@ -618,11 +642,11 @@ function createDynamic(component, props) {
   }
 }
 function Dynamic(props) {
-  const [, others] = solidJs.splitProps(props, ["component"]);
+  const others = solidJs.omit(props, "component");
   return createDynamic(() => props.component, others);
 }
 function Portal(props) {
-  return "";
+  throw new Error("Portal is not supported on the server");
 }
 
 Object.defineProperty(exports, "ErrorBoundary", {
@@ -633,14 +657,14 @@ Object.defineProperty(exports, "For", {
   enumerable: true,
   get: function () { return solidJs.For; }
 });
-Object.defineProperty(exports, "Index", {
-  enumerable: true,
-  get: function () { return solidJs.Index; }
-});
 Object.defineProperty(exports, "Match", {
   enumerable: true,
   get: function () { return solidJs.Match; }
 });
+Object.defineProperty(exports, "Repeat", {
+  enumerable: true,
+  get: function () { return solidJs.Repeat; }
+});
 Object.defineProperty(exports, "Show", {
   enumerable: true,
   get: function () { return solidJs.Show; }
@@ -649,10 +673,6 @@ Object.defineProperty(exports, "Suspense", {
   enumerable: true,
   get: function () { return solidJs.Suspense; }
 });
-Object.defineProperty(exports, "SuspenseList", {
-  enumerable: true,
-  get: function () { return solidJs.SuspenseList; }
-});
 Object.defineProperty(exports, "Switch", {
   enumerable: true,
   get: function () { return solidJs.Switch; }
@@ -669,19 +689,10 @@ Object.defineProperty(exports, "getOwner", {
   enumerable: true,
   get: function () { return solidJs.getOwner; }
 });
-Object.defineProperty(exports, "memo", {
-  enumerable: true,
-  get: function () { return solidJs.createMemo; }
-});
-Object.defineProperty(exports, "mergeProps", {
-  enumerable: true,
-  get: function () { return solidJs.mergeProps; }
-});
 Object.defineProperty(exports, "untrack", {
   enumerable: true,
   get: function () { return solidJs.untrack; }
 });
-exports.Assets = Assets;
 exports.ChildProperties = ChildProperties;
 exports.DOMElements = DOMElements;
 exports.DelegatedEvents = DelegatedEvents;
@@ -713,6 +724,8 @@ exports.hydrate = notSup;
 exports.insert = notSup;
 exports.isDev = isDev;
 exports.isServer = isServer;
+exports.memo = memo;
+exports.mergeProps = mergeProps;
 exports.render = notSup;
 exports.renderToStream = renderToStream;
 exports.renderToString = renderToString;