pawa-ssr 1.3.7 → 1.3.9

package/index.js

@@ -1,7 +1,7 @@
 import {getServerInstance, setServer} from 'pawajs/server.js'
 import { DOMParser,parseHTML, HTMLElement} from 'linkedom'
 import PawaComponent from './pawaComponent.js'
-import { propsValidator, evaluateExpr,extractAtExpressions, reArrangeAttri,resumeAttribute, pawaGenerateId } from './utils.js'
+import { propsValidator, evaluateExpr,extractAtExpressions, reArrangeAttri,resumeAttribute, pawaGenerateId, escapeHtml } from './utils.js'
 import {AsyncLocalStorage} from'node:async_hooks'
 import { If,For,State,Switch, Key } from'./power.js';
 import PawaElement from'./pawaElement.js'
@@ -882,14 +882,14 @@ const attributeHandler =async (el, attr) => {
   const setSingle=(...string)=>{
     string.forEach(v => singleElement.add(v))
   }
-  setSingle('img','br')
+  setSingle('img', 'br', 'hr', 'input', 'meta', 'link', 'base', 'col', 'area', 'param', 'track', 'wbr');
   const partlyPawajsDirective=new Set()
   export const addToPartlyDirective=(...partly)=>{
     partly.forEach((v)=>{
       partlyPawajsDirective.add(v)
     })
   }
-  addToPartlyDirective('else','else-if','case')
+  addToPartlyDirective('else','else-if','case','default')
   const checkIfRemove=(el)=>{
     for (const v of partlyPawajsDirective) {
       if(el.hasAttribute(v)) return true
@@ -1034,27 +1034,28 @@ export const render =async (el, contexts = {},stream) => {
       }
     }
 if(!el._running){
-  const attr=Array.from(el.attributes).map(att=>`${att.name}="${att.value}"`).join(' ')
+  const attr = Array.from(el.attributes)
+    .map(att => `${att.name}="${escapeHtml(att.value)}"`)
+    .join(' ');
+  const attrStr = attr ? ` ${attr}` : '';
   const isSingle=singleElement.has(el.tagName.toLowerCase())
-  if (isSingle) {
-    stream(`<${el.tagName.toLowerCase()} ${attr} />`)
-  }else{
-    stream(`<${el.tagName.toLowerCase()} ${attr} >`)
-  }
+  const tagName = el.tagName.toLowerCase();
+
+  stream(`<${tagName}${attrStr}${isSingle ? ' />' : '>'}`);
+
+  if (!isSingle) {
    const children = el.childNodes;
    for(const child of children){
     if (child.nodeType === 3) {
-      stream(child.nodeValue)
+      stream(escapeHtml(child.nodeValue)) // Correct: linkedom decodes entities, so we must re-encode
     }else if (child.nodeType === 8) {
       stream(`<!--${child.nodeValue}-->`)
     }else if (child.nodeType === 1){
       await render(child, el._context,stream);
     }
    };
-   if (!isSingle) {
-    stream(`</${el.tagName.toLowerCase()}>`)
-   }
-  
+    stream(`</${tagName}>`)
+  }
 }
 
     el._setError()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pawa-ssr",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "type":"module",
   "description": "pawajs ssr libary",
   "main": "index.js",

package/power.js

@@ -13,31 +13,28 @@ export const If = async(el, attr,stream) => {
     }]
     const chainMap=new Map()
     chainMap.set(el.getAttribute('if'),{condition:'if',element:el})
-     const getChained=(nextSibling)=>{
-         if (nextSibling !== null) {
-             if (nextSibling && nextSibling.getAttribute('else') === '' || nextSibling.getAttribute('else-if')) {
-                 if (nextSibling.getAttribute('else-if')) {
-                     nextSibling.remove()
-                     chained.push({
-                         exp:nextSibling.getAttribute('else-if'),
-                         condition:'else-if',
-                         element:nextSibling
-                     })
-                     chainMap.set(nextSibling.getAttribute('else-if'),{condition:'else-if',element:nextSibling})
-                     getChained(nextSibling.nextElementSibling)
-                 }else if (nextSibling.getAttribute('else') === '') {
-                     chained.push({
-                         exp:'false',
-                         condition:'else',
-                         element:nextSibling
-                     })
-                     chainMap.set('else',{condition:'else',element:nextSibling})
-                     nextSibling.remove()
-                 }
-             }
-         }
-     }
-     getChained(nextSiblings)
+    const getChained = (sibling) => {
+        while (sibling) {
+            const next = sibling.nextElementSibling;
+            const isElseIf = sibling.hasAttribute('else-if');
+            const isElse = sibling.hasAttribute('else');
+            
+            if (isElseIf) {
+                const exp = sibling.getAttribute('else-if');
+                chained.push({ exp, condition: 'else-if', element: sibling });
+                chainMap.set(exp, { condition: 'else-if', element: sibling });
+                sibling.remove();
+            } else if (isElse) {
+                chained.push({ exp: 'false', condition: 'else', element: sibling });
+                chainMap.set('else', { condition: 'else', element: sibling });
+                sibling.remove();
+            } else {
+                break;
+            }
+            sibling = next;
+        }
+    }
+    getChained(nextSiblings)
 let func=new Map()
 let current
 let latestChain
@@ -66,24 +63,17 @@ let latestChain
   let stringHtml=''
   const template=document.createElement('template')
   const store=document.createElement('template')
-  chained.forEach((item,index) =>{
-    const clone=item.element.cloneNode(true)
-    clone._avoidPawaRender = true
-    if (index === 0) {
-        Array.from(clone.attributes).forEach(at => {
-        if (at.name.startsWith('c-')) {
-          clone.removeAttribute(at.name)
-          clone.removeAttribute('p:c')
-        }
-      });
-      // stringHtml+=clone.outerHTML
-      store.appendChild(clone)
-    }else{
-      store.appendChild(clone)
-    }
-      template.appendChild(item.element)
-      
-    })
+  chained.forEach((item) => {
+    const clone = item.element.cloneNode(true);
+    clone._avoidPawaRender = true;
+    Array.from(clone.attributes).forEach(at => {
+      if (at.name.startsWith('c-') || at.name === 'p:c') {
+        clone.removeAttribute(at.name);
+      }
+    });
+    store.appendChild(clone);
+    template.appendChild(item.element);
+  });
   const getRightElement=chainMap.get(latestChain.id)
   if (getRightElement) {
     const copyElement=getRightElement.element.cloneNode(true)
@@ -133,31 +123,28 @@ export const Switch = async(el, attr,stream) => {
     }]
     const chainMap=new Map()
     chainMap.set(el.getAttribute('case'),{condition:'case',element:el})
-     const getChained=(nextSibling)=>{
-         if (nextSibling !== null) {
-             if (nextSibling && nextSibling.getAttribute('default') === '' || nextSibling.getAttribute('case')) {
-                 if (nextSibling.getAttribute('case')) {
-                     chained.push({
-                         exp:nextSibling.getAttribute('case'),
-                         condition:'case',
-                         element:nextSibling
-                     })
-                     chainMap.set(nextSibling.getAttribute('case'),{condition:'case',element:nextSibling})
-                     getChained(nextSibling.nextElementSibling)
-                     nextSibling.remove()
-                 }else if (nextSibling.getAttribute('default') === '') {
-                     chained.push({
-                         exp:'false',
-                         condition:'default',
-                         element:nextSibling
-                     })
-                     chainMap.set('default',{condition:'default',element:nextSibling})
-                     nextSibling.remove()
-                 }
-             }
-         }
-     }
-     getChained(nextSiblings)
+    const getChained = (sibling) => {
+        while (sibling) {
+            const next = sibling.nextElementSibling;
+            const isCase = sibling.hasAttribute('case');
+            const isDefault = sibling.hasAttribute('default');
+
+            if (isCase) {
+                const exp = sibling.getAttribute('case');
+                chained.push({ exp, condition: 'case', element: sibling });
+                chainMap.set(exp, { condition: 'case', element: sibling });
+                sibling.remove();
+            } else if (isDefault) {
+                chained.push({ exp: 'false', condition: 'default', element: sibling });
+                chainMap.set('default', { condition: 'default', element: sibling });
+                sibling.remove();
+            } else {
+                break;
+            }
+            sibling = next;
+        }
+    }
+    getChained(nextSiblings)
 let func=new Map()
 let current
 let latestChain
@@ -187,24 +174,18 @@ const switchFunc=el._evaluateExpr(attr.value,el._context,`at switch directive ${
         let stringHtml='' 
         const template=document.createElement('template')
         const store=document.createElement('template')
-        let index=0
-        chained.forEach(item =>{
-          const clone=item.element.cloneNode(true)
-          clone._avoidPawaRender = true
-          if (index === 0) {
-        Array.from(clone.attributes).forEach(at => {
-        if (at.name.startsWith('c-')) {
-          clone.removeAttribute(at.name)
-        }
-      });
-
-      store.appendChild(clone)
-      }else{
-      store.appendChild(clone)
-      } 
-      index++
-      template.appendChild(item.element)
-        })
+        // let index=0
+        chained.forEach((item) => {
+          const clone = item.element.cloneNode(true);
+          clone._avoidPawaRender = true;
+          Array.from(clone.attributes).forEach(at => {
+            if (at.name.startsWith('c-') || at.name === 'p:c') {
+              clone.removeAttribute(at.name);
+            }
+          });
+          store.appendChild(clone);
+          template.appendChild(item.element);
+        });
         el.removeAttribute('switch')
   const getRightElement=chainMap.get(latestChain.id)
   if (getRightElement && (current || latestChain.condition === 'default')) {
@@ -394,9 +375,9 @@ export const Key=async(el,attr,stream)=>{
     const template=document.createElement('template')
     template.setAttribute('p:store-key',dirId)
     template.setAttribute('p:store','')
-    clone.attributes.forEach(at => {
-      if (at.name.startsWith('c-')) {
-        clone.removeAttribute(at.name)
+    Array.from(clone.attributes).forEach(at => {
+      if (at.name.startsWith('c-') || at.name === 'p:c') {
+        clone.removeAttribute(at.name);
       }
     });
     template.appendChild(clone)

package/utils.js

@@ -246,3 +246,12 @@ export const replaceTemplateOperators = (expression) => {
     .replace(/\*\//g, '`'); // Also replace closing */ with backtick if needed
 };
 
+export const escapeHtml = (unsafe) => {
+  if (unsafe === null || unsafe === undefined) return '';
+  return String(unsafe)
+    .replace(/&/g, "&")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&#039;");
+};