preact-render-to-string 6.5.7 → 6.5.9

package/dist/stream/node/index.module.js

@@ -4,7 +4,7 @@ import { options, h, Fragment } from 'preact';
 const UNSAFE_NAME = /[\s\n\\/='"\0<>]/;
 const NAMESPACE_REPLACE_REGEX = /^(xlink|xmlns|xml)([A-Z])/;
 const HTML_LOWER_CASE = /^accessK|^auto[A-Z]|^cell|^ch|^col|cont|cross|dateT|encT|form[A-Z]|frame|hrefL|inputM|maxL|minL|noV|playsI|popoverT|readO|rowS|spellC|src[A-Z]|tabI|useM|item[A-Z]/;
-const SVG_CAMEL_CASE = /^ac|^ali|arabic|basel|cap|clipPath$|clipRule$|color|dominant|enable|fill|flood|font|glyph[^R]|horiz|image|letter|lighting|marker[^WUH]|overline|panose|pointe|paint|rendering|shape|stop|strikethrough|stroke|text[^L]|transform|underline|unicode|units|^v[^i]|^w|^xH/; // DOM properties that should NOT have "px" added when numeric
+const SVG_CAMEL_CASE = /^ac|^ali|arabic|basel|cap|clipPath$|clipRule$|color|dominant|enable|fill|flood|font|glyph[^R]|horiz|image|letter|lighting|marker[^WUH]|overline|panose|pointe|paint|rendering|shape|stop|strikethrough|stroke|spel|text[^L]|transform|underline|unicode|units|^v[^i]|^w|^xH/; // DOM properties that should NOT have "px" added when numeric
 
 const ENCODED_ENTITIES = /["&<]/;
 /** @param {string} str */
@@ -36,13 +36,13 @@ function encodeEntities(str) {
     } // Append skipped/buffered characters and the encoded entity:
 
 
-    if (i !== last) out += str.slice(last, i);
-    out += ch; // Start the next seek/buffer after the entity's offset:
+    if (i !== last) out = out + str.slice(last, i);
+    out = out + ch; // Start the next seek/buffer after the entity's offset:
 
     last = i + 1;
   }
 
-  if (i !== last) out += str.slice(last, i);
+  if (i !== last) out = out + str.slice(last, i);
   return out;
 }
 const JS_TO_CSS = {};
@@ -70,6 +70,24 @@ function styleObjToCss(s) {
 
   return str || undefined;
 }
+
+function markAsDirty() {
+  this.__d = true;
+}
+
+function createComponent(vnode, context) {
+  return {
+    __v: vnode,
+    context,
+    props: vnode.props,
+    // silently drop state updates
+    setState: markAsDirty,
+    forceUpdate: markAsDirty,
+    __d: true,
+    // hooks
+    __h: new Array(0)
+  };
+} // Necessary for createContext api. Setting this property will pass
 /**
  * @template T
  */
@@ -104,9 +122,11 @@ const DIRTY = '__d';
 const NEXT_STATE = '__s';
 const CHILD_DID_SUSPEND = '__c';
 
+const EMPTY_OBJ = {};
 const EMPTY_ARR = [];
 const isArray = Array.isArray;
-const assign = Object.assign; // Global state for the current render pass
+const assign = Object.assign;
+const EMPTY_STR = ''; // Global state for the current render pass
 
 let beforeDiff, afterDiff, renderHook, ummountHook;
 /**
@@ -136,8 +156,8 @@ function renderToString(vnode, context, _rendererState) {
   try {
     const rendered = _renderToString(vnode, context || EMPTY_OBJ, false, undefined, parent, false, _rendererState);
 
-    if (Array.isArray(rendered)) {
-      return rendered.join('');
+    if (isArray(rendered)) {
+      return rendered.join(EMPTY_STR);
     }
 
     return rendered;
@@ -155,12 +175,6 @@ function renderToString(vnode, context, _rendererState) {
     EMPTY_ARR.length = 0;
   }
 }
-
-function markAsDirty() {
-  this.__d = true;
-}
-
-const EMPTY_OBJ = {};
 /**
  * @param {VNode} vnode
  * @param {Record<string, unknown>} context
@@ -222,36 +236,40 @@ function renderClassComponent(vnode, context) {
 
 function _renderToString(vnode, context, isSvgMode, selectValue, parent, asyncMode, renderer) {
   // Ignore non-rendered VNodes/values
-  if (vnode == null || vnode === true || vnode === false || vnode === '') {
-    return '';
-  } // Text VNodes: escape as HTML
+  if (vnode == null || vnode === true || vnode === false || vnode === EMPTY_STR) {
+    return EMPTY_STR;
+  }
 
+  let vnodeType = typeof vnode; // Text VNodes: escape as HTML
 
-  if (typeof vnode !== 'object') {
-    if (typeof vnode === 'function') return '';
-    return encodeEntities(vnode + '');
+  if (vnodeType != 'object') {
+    if (vnodeType == 'function') return EMPTY_STR;
+    return vnodeType == 'string' ? encodeEntities(vnode) : vnode + EMPTY_STR;
   } // Recurse into children / Arrays
 
 
   if (isArray(vnode)) {
-    let rendered = '',
+    let rendered = EMPTY_STR,
         renderArray;
     parent[CHILDREN] = vnode;
 
     for (let i = 0; i < vnode.length; i++) {
       let child = vnode[i];
-      if (child == null || typeof child === 'boolean') continue;
+      if (child == null || typeof child == 'boolean') continue;
 
       const childRender = _renderToString(child, context, isSvgMode, selectValue, parent, asyncMode, renderer);
 
-      if (typeof childRender === 'string') {
-        rendered += childRender;
+      if (typeof childRender == 'string') {
+        rendered = rendered + childRender;
       } else {
-        renderArray = renderArray || [];
+        if (!renderArray) {
+          renderArray = [];
+        }
+
         if (rendered) renderArray.push(rendered);
-        rendered = '';
+        rendered = EMPTY_STR;
 
-        if (Array.isArray(childRender)) {
+        if (isArray(childRender)) {
           renderArray.push(...childRender);
         } else {
           renderArray.push(childRender);
@@ -268,43 +286,44 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, asyncMo
   } // VNodes have {constructor:undefined} to prevent JSON injection:
 
 
-  if (vnode.constructor !== undefined) return '';
+  if (vnode.constructor !== undefined) return EMPTY_STR;
   vnode[PARENT] = parent;
   if (beforeDiff) beforeDiff(vnode);
   let type = vnode.type,
-      props = vnode.props,
-      cctx = context,
-      contextType,
-      rendered,
-      component; // Invoke rendering on Components
+      props = vnode.props; // Invoke rendering on Components
+
+  if (typeof type == 'function') {
+    let cctx = context,
+        contextType,
+        rendered,
+        component;
 
-  if (typeof type === 'function') {
     if (type === Fragment) {
       // Serialized precompiled JSX.
-      if (props.tpl) {
-        let out = '';
+      if ('tpl' in props) {
+        let out = EMPTY_STR;
 
         for (let i = 0; i < props.tpl.length; i++) {
-          out += props.tpl[i];
+          out = out + props.tpl[i];
 
           if (props.exprs && i < props.exprs.length) {
             const value = props.exprs[i];
             if (value == null) continue; // Check if we're dealing with a vnode or an array of nodes
 
-            if (typeof value === 'object' && (value.constructor === undefined || isArray(value))) {
-              out += _renderToString(value, context, isSvgMode, selectValue, vnode, asyncMode, renderer);
+            if (typeof value == 'object' && (value.constructor === undefined || isArray(value))) {
+              out = out + _renderToString(value, context, isSvgMode, selectValue, vnode, asyncMode, renderer);
             } else {
               // Values are pre-escaped by the JSX transform
-              out += value;
+              out = out + value;
             }
           }
         }
 
         return out;
-      } else if (props.UNSTABLE_comment) {
+      } else if ('UNSTABLE_comment' in props) {
         // Fragments are the least used components of core that's why
         // branching here for comments has the least effect on perf.
-        return '<!--' + encodeEntities(props.UNSTABLE_comment || '') + '-->';
+        return '<!--' + encodeEntities(props.UNSTABLE_comment) + '-->';
       }
 
       rendered = props.children;
@@ -316,24 +335,17 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, asyncMo
         cctx = provider ? provider.props.value : contextType.__;
       }
 
-      if (type.prototype && typeof type.prototype.render === 'function') {
+      let isClassComponent = type.prototype && typeof type.prototype.render == 'function';
+
+      if (isClassComponent) {
         rendered =
         /**#__NOINLINE__**/
         renderClassComponent(vnode, cctx);
         component = vnode[COMPONENT];
       } else {
-        component = {
-          __v: vnode,
-          props,
-          context: cctx,
-          // silently drop state updates
-          setState: markAsDirty,
-          forceUpdate: markAsDirty,
-          __d: true,
-          // hooks
-          __h: []
-        };
-        vnode[COMPONENT] = component; // If a hook invokes setState() to invalidate the component during rendering,
+        vnode[COMPONENT] = component =
+        /**#__NOINLINE__**/
+        createComponent(vnode, cctx); // If a hook invokes setState() to invalidate the component during rendering,
         // re-render it up to 25 times to allow "settling" of memoized states.
         // Note:
         //   This will need to be updated for Preact 11 to use internal.flags rather than component._dirty:
@@ -354,23 +366,21 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, asyncMo
         context = assign({}, context, component.getChildContext());
       }
 
-      if ((type.getDerivedStateFromError || component.componentDidCatch) && options.errorBoundaries) {
-        let str = ''; // When a component returns a Fragment node we flatten it in core, so we
+      if (isClassComponent && options.errorBoundaries && (type.getDerivedStateFromError || component.componentDidCatch)) {
+        // When a component returns a Fragment node we flatten it in core, so we
         // need to mirror that logic here too
-
-        let isTopLevelFragment = rendered != null && rendered.type === Fragment && rendered.key == null;
+        let isTopLevelFragment = rendered != null && rendered.type === Fragment && rendered.key == null && rendered.props.tpl == null;
         rendered = isTopLevelFragment ? rendered.props.children : rendered;
 
         try {
-          str = _renderToString(rendered, context, isSvgMode, selectValue, vnode, asyncMode, renderer);
-          return str;
+          return _renderToString(rendered, context, isSvgMode, selectValue, vnode, asyncMode, renderer);
         } catch (err) {
           if (type.getDerivedStateFromError) {
             component[NEXT_STATE] = type.getDerivedStateFromError(err);
           }
 
           if (component.componentDidCatch) {
-            component.componentDidCatch(err, {});
+            component.componentDidCatch(err, EMPTY_OBJ);
           }
 
           if (component[DIRTY]) {
@@ -381,12 +391,12 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, asyncMo
               context = assign({}, context, component.getChildContext());
             }
 
-            let isTopLevelFragment = rendered != null && rendered.type === Fragment && rendered.key == null;
+            let isTopLevelFragment = rendered != null && rendered.type === Fragment && rendered.key == null && rendered.props.tpl == null;
             rendered = isTopLevelFragment ? rendered.props.children : rendered;
-            str = _renderToString(rendered, context, isSvgMode, selectValue, vnode, asyncMode, renderer);
+            return _renderToString(rendered, context, isSvgMode, selectValue, vnode, asyncMode, renderer);
           }
 
-          return str;
+          return EMPTY_STR;
         } finally {
           if (afterDiff) afterDiff(vnode);
           vnode[PARENT] = null;
@@ -415,32 +425,33 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, asyncMo
         if (res !== undefined) return res;
         let errorHook = options[CATCH_ERROR];
         if (errorHook) errorHook(error, vnode);
-        return '';
+        return EMPTY_STR;
       }
 
       if (!asyncMode) throw error;
-      if (!error || typeof error.then !== 'function') throw error;
+      if (!error || typeof error.then != 'function') throw error;
 
       const renderNestedChildren = () => {
         try {
           return _renderToString(rendered, context, isSvgMode, selectValue, vnode, asyncMode, renderer);
         } catch (e) {
-          if (!e || typeof e.then !== 'function') throw e;
-          return e.then(() => _renderToString(rendered, context, isSvgMode, selectValue, vnode, asyncMode, renderer), () => renderNestedChildren());
+          if (!e || typeof e.then != 'function') throw e;
+          return e.then(() => _renderToString(rendered, context, isSvgMode, selectValue, vnode, asyncMode, renderer), renderNestedChildren);
         }
       };
 
-      return error.then(() => renderNestedChildren());
+      return error.then(renderNestedChildren);
     }
   } // Serialize Element VNodes to HTML
 
 
   let s = '<' + type,
-      html = '',
+      html = EMPTY_STR,
       children;
 
   for (let name in props) {
     let v = props[name];
+    if (typeof v == 'function') continue;
 
     switch (name) {
       case 'children':
@@ -531,23 +542,27 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, asyncMo
             // serialize boolean aria-xyz or draggable attribute values as strings
             // `draggable` is an enumerated attribute and not Boolean. A value of `true` or `false` is mandatory
             // https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/draggable
-            v += '';
+            v = v + EMPTY_STR;
           } else if (isSvgMode) {
             if (SVG_CAMEL_CASE.test(name)) {
               name = name === 'panose1' ? 'panose-1' : name.replace(/([A-Z])/g, '-$1').toLowerCase();
             }
           } else if (HTML_LOWER_CASE.test(name)) {
             name = name.toLowerCase();
+
+            if (name === 'spellcheck') {
+              v = '' + v;
+            }
           }
         }
     } // write this attribute to the buffer
 
 
-    if (v != null && v !== false && typeof v !== 'function') {
-      if (v === true || v === '') {
+    if (v != null && v !== false) {
+      if (v === true || v === EMPTY_STR) {
         s = s + ' ' + name;
       } else {
-        s = s + ' ' + name + '="' + encodeEntities(v + '') + '"';
+        s = s + ' ' + name + '="' + (typeof v == 'string' ? encodeEntities(v) : v + EMPTY_STR) + '"';
       }
     }
   }
@@ -578,7 +593,7 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, asyncMo
 
   const endTag = '</' + type + '>';
   const startTag = s + '>';
-  if (Array.isArray(html)) return [startTag, ...html, endTag];else if (typeof html !== 'string') return [startTag, html, endTag];
+  if (isArray(html)) return [startTag, ...html, endTag];else if (typeof html != 'string') return [startTag, html, endTag];
   return startTag + html + endTag;
 }