pawa-ssr 1.2.4 → 1.2.5

package/index.js

@@ -345,6 +345,13 @@ appContext.component._prop={children,...el._props,...slots}
             await fn(stateContext,app)
             } catch (error) {
               console.error(`Error in beforeCall for ${el._componentName}:`, error.message,error.stack)
+               __pawaDev.setError({ 
+                    el:el, 
+                    msg:`from  compoBeforeCall${el._componentName}:`+ error.message + error.stack, 
+                    directives:'plugin', 
+                    stack:error.stack, 
+                    template:el?._template, 
+                 })
             }
           } 
       
@@ -353,12 +360,20 @@ appContext.component._prop={children,...el._props,...slots}
     let compo=""
     try{
       if(done){
+      
         store.getStore().stateContext=appContext
         compo=await component.component(app)
       }
 
     }catch(error){
       console.error(`error from PawaComponent.${appContext.component._name}`,error.message,error.stack)
+             __pawaDev.setError({ 
+                    el:el, 
+                    msg:`error from PawaComponent.${appContext.component._name}`+ error.message + error.stack, 
+                    directives:el.tagName, 
+                    stack:error.stack, 
+                    template:el?._template, 
+                 })
     }
     if (appContext?.insert){
       Object.assign(el._context,appContext.insert)
@@ -424,7 +439,13 @@ appContext.component._prop={children,...el._props,...slots}
         store.getStore().stateContext=appContext.formerContext
          } catch (error) {
     console.log(error.message,error.stack,`at ${el.tagName} component`);
-    
+    __pawaDev.setError({ 
+                    el:el, 
+                    msg:`from  ${el.tagName} component`, 
+                    directives:'component', 
+                    stack:error.stack, 
+                    template:el?._template, 
+                 })
    }
 }
 const templates=async(el,context)=>{
@@ -478,7 +499,7 @@ const textContentHandler = async(el) => {
 
         const expressions = extractAtExpressions(value);
         expressions.forEach(({ fullMatch, expression }) => {
-          const func = evaluateExpr(
+          const func = el._evaluateExpr(
             expression,
             el._context,
             `from text interpolation @{} - ${expression} at ${currentHtmlString}`
@@ -494,6 +515,13 @@ const textContentHandler = async(el) => {
     } catch (error) {
       console.warn(`error at ${el._template} textcontent`);
       console.error(error.message, error.stack,`error at ${el._template} textcontent`);
+      __pawaDev.setError({ 
+           el:el, 
+           msg:`Error from textHandler`+ error.message + error.stack, 
+           directives:el.tagName, 
+           stack:error.stack, 
+           template:el?._template, 
+        }) 
     }
   };
   
@@ -536,6 +564,13 @@ const attributeHandler =async (el, attr) => {
       }
     } catch (error) {
       console.log(error.message, error.stack);
+      __pawaDev.setError({ 
+           el:el, 
+           msg:`error from Attribute Handler`+ error.message + error.stack, 
+           directives:'Attribute Handler', 
+           stack:error.stack, 
+           template:el?._template, 
+        })
     }
   };
 

package/package.json

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

package/pawaElement.js

@@ -4,6 +4,7 @@ import {components} from 'pawajs'
 import PawaComponent from "./pawaComponent.js"
 import { evaluateExpr, splitAndAdd,replaceTemplateOperators } from "./utils.js"
 
+const expressionCache = new Map();
 // changed the hydrateProps 
 
 class PawaElement {
@@ -37,6 +38,7 @@ class PawaElement {
         this._setError=this.setError
         this._hydrateProps={}
         this._resumeAttr=''
+        this._evaluateExpr=this.evaluateExpr
         this._reArrangeAttri=this.reArrange
         this._replaceResumeAttr=this.replaceResumeAttr
         this._setResumeAttr=this.setResumeAttr
@@ -117,7 +119,7 @@ class PawaElement {
         array[index]=newName
         const toString=array.join(';')
         this._el.setAttribute('p:c',toString)
-        
+        this._resumeAttr=toString
       }else{
         ele.setAttribute(newName,value)
         ele.setAttribute('p:c',`${newName};`)
@@ -172,14 +174,14 @@ class PawaElement {
       createError({message,stack}){
         this._error.push({message,stack})
       }
-      //set Component props
+     //set Component props
       setProps(){
         if (this._componentName) {
          const allServerAttr=getPawaAttributes()
           this._el.attributes.forEach(attr=>{
-            if(!allServerAttr.has(attr.name)){
+            if(!allServerAttr.has(attr.name) ){
               if ( !attr.name.startsWith(':')) {
-                if( attr.name.startsWith('c-') || attr.name.startsWith('p:c')) return
+                if( attr.name.startsWith('c-') || attr.name.startsWith('p:c') || attr.name.startsWith('state-')) return
                 let name=''
                 if (attr.name.startsWith('-')) {
                   name=attr.name.slice(1)
@@ -192,7 +194,7 @@ class PawaElement {
                 this._hydrateProps[attr.name.slice(1)]=attr.value
                 if(attr.value === '') attr.value=true;
                 try {
-                  const func = evaluateExpr(`()=>{
+                  const func = this.evaluateExpr(`()=>{
                   const prop= ${replaceTemplateOperators(attr.value)};
                   if(prop === '')return prop
                   return prop
@@ -202,12 +204,47 @@ class PawaElement {
                 this._props[name]=func
                 } catch (error) {
                   console.log(error.message,error.stack)
-                  this._createError({message:error.message,stack:error.stack})
+                __pawaDev.setError({ 
+                    el:this._el, 
+                    msg:`errors while setting props at runtime ${error.message}`, 
+                    directives:'setting props', 
+                    stack:error.stack, 
+                    template:el?._template, 
+                 })
                 }
               }
             }
           })
         }
       }
+evaluateExpr(expr, context = {},error){
+  try {
+    const keys = Object.keys(context);
+    // Create a cache key based on the expression and the available context keys
+    // We sort keys to ensure consistent cache hits regardless of key order
+    const cacheKey = expr + '|||' + keys.sort().join(',');
+
+    let func = expressionCache.get(cacheKey);
+    if (!func) {
+      func = new Function(...keys, `
+        const require=null
+        return ${expr}`);
+      expressionCache.set(cacheKey, func);
+    }
+
+    const values = keys.map((key) => context[key]);
+    return func(...values);
+  } catch (err) {
+    console.error(`Evaluation failed for: ${expr}`,error,err.message,err.stack);
+    __pawaDev.setError({ 
+         el:this._el, 
+         msg:`${error} ${err.message}`, 
+         directives:'expression', 
+         stack:err.stack, 
+         template:this._el?._template, 
+      })
+    return null;
+  }
+};
 }
 export default PawaElement

package/power.js

@@ -43,7 +43,7 @@ let current
 let latestChain
   chained.forEach((item)=>{
        if(item.condition === 'else' || current)return
-       const result = evaluateExpr(item.exp, el._context,`at condition  directives check - ${item.exp}`);
+       const result = el._evaluateExpr(item.exp, el._context,`at condition  directives check - ${item.exp} at ${item.element.toString()}`);
        current=result
        if (current) {
             latestChain={
@@ -117,8 +117,7 @@ let latestChain
 export const Switch = async(el, attr) => {
   if (el._running) return;
   el._running = true;
-try {
-  
+
   const nextSiblings = el.nextElementSibling || null;
   const cases =el.getAttribute('case')
   const chained=[{
@@ -156,10 +155,10 @@ try {
 let func=new Map()
 let current
 let latestChain
-const switchFunc=evaluateExpr(attr.value,el._context,`at switch directive ${attr.value}`)
+const switchFunc=el._evaluateExpr(attr.value,el._context,`at switch directive ${attr.value}`)
   chained.forEach((item)=>{
        if(item.condition === 'default' || current)return
-       const result = switchFunc === evaluateExpr(item.exp, el._context,`at condition  directives check - ${item.exp}`);
+       const result = switchFunc === el._evaluateExpr(item.exp, el._context,`at condition  directives check case - ${item.exp} ${item.element.toString()}`);
        current=result
        if (current || item.condition === 'default') {
             latestChain={
@@ -231,9 +230,6 @@ const switchFunc=evaluateExpr(attr.value,el._context,`at switch directive ${attr
     comment.parentElement.insertBefore(template, endComment);
     // No element rendered
   }
-} catch (error) {
-  console.log(error.message,error.stack,`at switch directive ${el._template}`)
-}
 };
 
 export const For=async(el,attr)=>{
@@ -258,7 +254,7 @@ export const For=async(el,attr)=>{
     const arrayItems=itemPart.split(',')
     const arrayItem=arrayItems[0].trim()
     const indexes=arrayItems[1]
-    const array=evaluateExpr(arrayName,el._context,`at for directives check - ${attr.value}`)
+    const array=el._evaluateExpr(arrayName,el._context,`at for directives check - ${attr.value}`)
     const copyElement=el.cloneNode(true)
     const store=[]
     Array.from(copyElement.attributes).forEach(at=>{
@@ -326,7 +322,14 @@ export const For=async(el,attr)=>{
     }
     
     } catch (error) {
-      console.error(error.message,error.stack,`at for directive ${el._template}`)
+      console.error(error.message,error.stack)
+       __pawaDev.setError({ 
+           el:el, 
+           msg:`error from for-each ${attr.value}`+ error.message + error.stack, 
+           directives:'for-each', 
+           stack:error.stack, 
+           template:el?._template, 
+        })
     }
 }
 
@@ -336,14 +339,21 @@ export const State=async(el,attr)=>{
   }
   try {
 
-    const result=evaluateExpr(attr.value,el._context,`at state directive ${attr.name}=${attr.value}`)
     const name=attr.name.split('-')[1]
     el._replaceResumeAttr(attr.name,`c-$-${name}`,attr.value)
+    el.removeAttribute(attr.name)
+    const result=el._evaluateExpr(attr.value,el._context,`at state directive ${attr.name}=${attr.value}`)
     // el.setAttribute(`resume-state-${name}`,attr.value)
     el._context[name]={value:result}
-    el.removeAttribute(attr.name)
   } catch (error) {
-    console.log(error.message,error.stack,`at ${el._template} from state`)
+    console.log(error.message,error.stack)
+     __pawaDev.setError({ 
+           el:el, 
+           msg:`error from state ${attr.name} : ${attr.value}`+ error.message + error.stack, 
+           directives:el.tagName, 
+           stack:error.stack, 
+           template:el?._template, 
+        })
   }
   
 }
@@ -371,7 +381,7 @@ export const Key=async(el,attr)=>{
     template.appendChild(clone)
     el.replaceWith(endComment)
     endComment.parentElement.insertBefore(comment,endComment)
-    const func=evaluateExpr(attr.value,el._context,`error at Key - ${attr.name} = ${attr.value}`,el)
+    const func=el._evaluateExpr(attr.value,el._context,`error at Key - ${attr.name} = ${attr.value}`)
     endComment.parentElement.insertBefore(template,endComment)
     comment.data=`key(${func})@-$@-$@${dirId}`
     endComment.data=`key(${func})@-$@-$@${dirId}`
@@ -381,6 +391,13 @@ export const Key=async(el,attr)=>{
      endComment.parentElement.insertBefore(newElement,endComment)
      await render(newElement,el._context)
 }catch(error){
-  console.error(error.message,error.stack,`at key ${el._template}`)
+  console.error(error.message,error.stack)
+   __pawaDev.setError({ 
+       el:el, 
+       msg:`error from Key at ${attr.value}`+ error.message + error.stack, 
+       directives:el.tagName, 
+       stack:error.stack, 
+       template:el?._template, 
+    })
 }
 }