@solidjs/web 2.0.0-beta.11 → 2.0.0-beta.12

package/dist/server.cjs

@@ -617,6 +617,19 @@ function ssrFirstGroupHit(hole) {
     return buildAsyncWrap(err, hole);
   }
 }
+function tryResolveFunctionHole(hole) {
+  let value;
+  try {
+    value = hole();
+  } catch (err) {
+    return buildAsyncWrap(err, hole) || "";
+  }
+  const t = typeof value;
+  if (t === "string") return value;
+  if (t === "number") return "" + value;
+  if (value == null || t === "boolean") return "";
+  return tryResolveString(value);
+}
 function mergeTemplateInto(result, node) {
   result.t[result.t.length - 1] += node.t[0];
   if (node.t.length > 1) {
@@ -625,6 +638,13 @@ function mergeTemplateInto(result, node) {
     result.p.push(...node.p);
   }
 }
+function appendResolvedNode(result, node) {
+  if (node.fn !== undefined) {
+    result.h.push(node.fn);
+    result.p.push(node.p);
+    result.t.push("");
+  } else if (node.merge !== undefined) mergeTemplateInto(result, node.merge);else resolveSSRNode(node.bail, result);
+}
 let _lastGroupFn = null;
 let _lastGroupArr = null;
 let _lastGroupErr = null;
@@ -715,6 +735,17 @@ function ssr(t) {
       }
     } else if (result !== null) {
       resolveSSRNode(hole, result);
+    } else if (ht === "function") {
+      const r = tryResolveFunctionHole(hole);
+      if (typeof r === "string") s += r;else {
+        result = {
+          t: [s],
+          h: [],
+          p: []
+        };
+        s = "";
+        appendResolvedNode(result, r);
+      }
     } else {
       const r = tryResolveString(hole);
       if (typeof r === "string") {
@@ -726,11 +757,7 @@ function ssr(t) {
           p: []
         };
         s = "";
-        if (r.fn !== undefined) {
-          result.h.push(r.fn);
-          result.p.push(r.p);
-          result.t.push("");
-        } else if (r.merge !== undefined) mergeTemplateInto(result, r.merge);else resolveSSRNode(r.bail, result);
+        appendResolvedNode(result, r);
       }
     }
     const next = t[i];
@@ -820,6 +847,8 @@ function escape(s, attr) {
   const t = typeof s;
   if (t !== "string") {
     if (!attr && Array.isArray(s)) {
+      const joined = tryJoinPlainSSRArray(s);
+      if (joined !== undefined) return joined;
       s = s.slice();
       for (let i = 0; i < s.length; i++) s[i] = escape(s[i]);
       return s;
@@ -872,6 +901,18 @@ function escapeSlow(s, attr, start) {
   }
   return left < s.length ? out + s.substring(left) : out;
 }
+function tryJoinPlainSSRArray(nodes) {
+  if (nodes.length === 0) return undefined;
+  let out = "";
+  for (let i = 0, len = nodes.length; i < len; i++) {
+    const node = nodes[i];
+    if (node == null || typeof node !== "object" || node.h || typeof node.t !== "string") {
+      return undefined;
+    }
+    out += node.t;
+  }
+  return out;
+}
 function mergeProps(...sources) {
   const target = {};
   for (let i = 0; i < sources.length; i++) {
@@ -1020,6 +1061,8 @@ function tryResolveString(node) {
   if (node == null || t === "boolean") return "";
   if (t === "object") {
     if (Array.isArray(node)) {
+      const joined = tryJoinPlainSSRArray(node);
+      if (joined !== undefined) return joined;
       let s = "";
       let prevNonObj = false;
       for (let i = 0, len = node.length; i < len; i++) {

package/dist/server.js

@@ -616,6 +616,19 @@ function ssrFirstGroupHit(hole) {
     return buildAsyncWrap(err, hole);
   }
 }
+function tryResolveFunctionHole(hole) {
+  let value;
+  try {
+    value = hole();
+  } catch (err) {
+    return buildAsyncWrap(err, hole) || "";
+  }
+  const t = typeof value;
+  if (t === "string") return value;
+  if (t === "number") return "" + value;
+  if (value == null || t === "boolean") return "";
+  return tryResolveString(value);
+}
 function mergeTemplateInto(result, node) {
   result.t[result.t.length - 1] += node.t[0];
   if (node.t.length > 1) {
@@ -624,6 +637,13 @@ function mergeTemplateInto(result, node) {
     result.p.push(...node.p);
   }
 }
+function appendResolvedNode(result, node) {
+  if (node.fn !== undefined) {
+    result.h.push(node.fn);
+    result.p.push(node.p);
+    result.t.push("");
+  } else if (node.merge !== undefined) mergeTemplateInto(result, node.merge);else resolveSSRNode(node.bail, result);
+}
 let _lastGroupFn = null;
 let _lastGroupArr = null;
 let _lastGroupErr = null;
@@ -714,6 +734,17 @@ function ssr(t) {
       }
     } else if (result !== null) {
       resolveSSRNode(hole, result);
+    } else if (ht === "function") {
+      const r = tryResolveFunctionHole(hole);
+      if (typeof r === "string") s += r;else {
+        result = {
+          t: [s],
+          h: [],
+          p: []
+        };
+        s = "";
+        appendResolvedNode(result, r);
+      }
     } else {
       const r = tryResolveString(hole);
       if (typeof r === "string") {
@@ -725,11 +756,7 @@ function ssr(t) {
           p: []
         };
         s = "";
-        if (r.fn !== undefined) {
-          result.h.push(r.fn);
-          result.p.push(r.p);
-          result.t.push("");
-        } else if (r.merge !== undefined) mergeTemplateInto(result, r.merge);else resolveSSRNode(r.bail, result);
+        appendResolvedNode(result, r);
       }
     }
     const next = t[i];
@@ -819,6 +846,8 @@ function escape(s, attr) {
   const t = typeof s;
   if (t !== "string") {
     if (!attr && Array.isArray(s)) {
+      const joined = tryJoinPlainSSRArray(s);
+      if (joined !== undefined) return joined;
       s = s.slice();
       for (let i = 0; i < s.length; i++) s[i] = escape(s[i]);
       return s;
@@ -871,6 +900,18 @@ function escapeSlow(s, attr, start) {
   }
   return left < s.length ? out + s.substring(left) : out;
 }
+function tryJoinPlainSSRArray(nodes) {
+  if (nodes.length === 0) return undefined;
+  let out = "";
+  for (let i = 0, len = nodes.length; i < len; i++) {
+    const node = nodes[i];
+    if (node == null || typeof node !== "object" || node.h || typeof node.t !== "string") {
+      return undefined;
+    }
+    out += node.t;
+  }
+  return out;
+}
 function mergeProps(...sources) {
   const target = {};
   for (let i = 0; i < sources.length; i++) {
@@ -1019,6 +1060,8 @@ function tryResolveString(node) {
   if (node == null || t === "boolean") return "";
   if (t === "object") {
     if (Array.isArray(node)) {
+      const joined = tryJoinPlainSSRArray(node);
+      if (joined !== undefined) return joined;
       let s = "";
       let prevNonObj = false;
       for (let i = 0, len = node.length; i < len; i++) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@solidjs/web",
   "description": "Solid's web runtime: client rendering, hydration, SSR, and DOM-specific control flow (Portal, Dynamic).",
-  "version": "2.0.0-beta.11",
+  "version": "2.0.0-beta.12",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -137,10 +137,10 @@
     "seroval-plugins": "^1.1.0"
   },
   "peerDependencies": {
-    "solid-js": "^2.0.0-beta.11"
+    "solid-js": "^2.0.0-beta.12"
   },
   "devDependencies": {
-    "solid-js": "2.0.0-beta.11"
+    "solid-js": "2.0.0-beta.12"
   },
   "scripts": {
     "build": "npm-run-all -nl build:clean types:copy-jsx build:js",