pawa-ssr 1.3.10 → 1.3.13

package/index.js

@@ -783,8 +783,9 @@ const textContentHandler = async(el) => {
   const nodesMap = new Map();
   const currentHtmlString = el.outerHTML;
   el.setAttribute('c-t',true)
+  const newString=el.innerHTML.replace('-','(//)')
   const document = el.ownerDocument
-  const comment=document.createComment(`textEvaluator-${el.innerHTML}`)
+  const comment=document.createComment(`textEvaluator-${newString}`)
   el.appendChild(comment)
   // Get all text nodes and store their original content
   const textNodes = Array.from(el.childNodes).filter(node => node.nodeType === 3);
@@ -889,7 +890,7 @@ const attributeHandler =async (el, attr) => {
       partlyPawajsDirective.add(v)
     })
   }
-  addToPartlyDirective('else','else-if','case','default')
+  addToPartlyDirective('else','else-if','case','s-default')
   const checkIfRemove=(el)=>{
     for (const v of partlyPawajsDirective) {
       if(el.hasAttribute(v)) return true
@@ -1017,11 +1018,15 @@ export const render =async (el, contexts = {},stream) => {
       }
       if (el._componentName) {
         if(el._lazy && lazyComponents.has(el.tagName)){
-          const lazyComponent=lazyComponents.has(el.tagName)
+          const lazyComponent=lazyComponents.get(el.tagName)
           const {name,component} =lazyComponent()
-          components.set(name,component)
-          el._component.component=component
-          lazyComponents.delete(el.tagName)
+          const compo=await component()
+          if(compo[name]){
+            components.set(name,compo[name])
+            el._component.component=compo[name]
+            el._component.validPropRule=compo[name]?.validateProps || {};
+            lazyComponents.delete(el.tagName)
+          }
         }
         if(isStream){
           await streamingComponent(el,stream)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pawa-ssr",
-  "version": "1.3.10",
+  "version": "1.3.13",
   "type":"module",
   "description": "pawajs ssr libary",
   "main": "index.js",
@@ -25,6 +25,6 @@
   "homepage": "https://github.com/Allisboy/pawajs-ssr#readme",
   "dependencies": {
     "linkedom": "^0.18.11",
-    "pawajs": "^1.4.35"
+    "pawajs": "^1.4.36"
   }
 }

package/pawaElement.js

@@ -79,7 +79,7 @@ class PawaElement {
       })
     }
     checkLazy(){
-      if (lazyComponents.has(this._el.tagName)) {
+      if (lazyComponents.has(splitAndAdd(this._el.tagName))) {
         this._lazy=true        
       }
     }
@@ -195,6 +195,47 @@ class PawaElement {
                 }else{
                   name=attr.name
                 }
+                const setProps=()=>{
+                 delete this._restProps[name]
+                 let hydatename
+                 if(name === 'class'){
+                  hydatename=':'+'className'
+                 }else if(name === 'default'){
+                  hydatename=':'+'defaultValue'
+                 }else{
+                  hydatename=':'+name
+                 }
+                 this._hydrateProps[name]=attr.value
+                  let value=attr.value
+                 if (value.includes('@{')) {
+                   const regex = /@{([^}]*)}/g;
+                 value = value.replace(regex, (match, expression) => {
+                     if (checkKeywordsExistence(this._staticContext, expression)) {
+                         return value
+                     } else {
+                         const res = this.evaluateExpr(expression,this._context,`evaluating props with template operators at ${attr.name} - ${attr.value} : ${this._template}`)
+                         return res
+                     }
+                 });
+                 return value
+                 }else if( attr.name.startsWith('on-') || attr.name.startsWith('out-')){
+                  const res=this.evaluateExpr(`(e)=>{
+                    ${attr.value}
+                  }`, this._context,`evaluating props with template operators at ${attr.name} - ${attr.value} : ${this._template}`)
+                  return res
+                 }
+                 return attr.value
+                }
+                name=name.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
+                if (this._props[name] || this._props.className || this._props.defaultValue) return
+                if (name === 'class') {
+                  this._props['className']=setProps
+                }else if(name === 'default'){
+                  this._props['defaultValue']=setProps
+                }else{
+                  this._props[name]=setProps
+                }
+
                 this._restProps[name]={name:name,value:attr.value}
                 
               } else if(attr.name.startsWith(':')) {

package/power.js

@@ -126,8 +126,8 @@ export const Switch = async(el, attr,stream) => {
     const getChained = (sibling) => {
         while (sibling) {
             const next = sibling.nextElementSibling;
-            const isCase = sibling.hasAttribute('case');
-            const isDefault = sibling.hasAttribute('default');
+            const isCase = sibling.hasAttribute('case') && !sibling.hasAttribute('switch');
+            const isDefault = sibling.hasAttribute('s-default');
 
             if (isCase) {
                 const exp = sibling.getAttribute('case');
@@ -190,6 +190,7 @@ const switchFunc=el._evaluateExpr(attr.value,el._context,`at switch directive ${
   const getRightElement=chainMap.get(latestChain.id)
   if (getRightElement && (current || latestChain.condition === 'default')) {
     const copyElement=getRightElement.element.cloneNode(true)
+
     copyElement.attributes.forEach((att)=>{
       if(att.name.startsWith('c-')){
         copyElement.removeAttribute(att.name)
@@ -200,7 +201,7 @@ const switchFunc=el._evaluateExpr(attr.value,el._context,`at switch directive ${
       el._replaceResumeAttr(latestChain.condition,`c-sw-${id}`,latestChain.id)
        newElement = el.cloneNode(true);
       }else{
-        el._replaceResumeAttr(latestChain.condition,`c-sw-${id}`,latestChain.id,copyElement)
+        el._replaceResumeAttr(latestChain.condition === 's-default'?'s-default':latestChain.condition ,`c-sw-${id}`,latestChain.id,copyElement)
         newElement = copyElement;
       }
       newElement.removeAttribute(latestChain.condition)

package/utils.js

@@ -187,7 +187,12 @@ export const convertToNumber=(str)=>{
   return hash
 };
 export const ComponentProps=(somes,message,name)=>{
-let some=somes?.() || somes
+let some
+if (typeof somes === 'function') {
+    some=somes()
+  }else{
+    some=somes
+  }
     return({
     Array:()=>{