pawa-ssr 1.0.21 → 1.0.23

package/index.js

@@ -11,7 +11,9 @@ exports.getPawaComponentsMap =()=>{
   return components ;
 }
 
-
+let isDevelopment
+const getDevelopment=()=>isDevelopment
+exports.getDevelopment=getDevelopment
 const $state = (arg) => {
     return {
         value: arg
@@ -194,7 +196,8 @@ stateContext._name=el._componentName
         children,
         app:{
           insert,
-          useValidateProps
+          useValidateProps,
+          useInnerContext:()=>el._context
         },
         ...slots,
         ...el._props
@@ -221,19 +224,18 @@ stateContext._name=el._componentName
       }
 
       div.innerHTML=compo
-      if(Object.entries(el._restProps).length > 0){
-          const findElement=div.querySelector('[--]') || div.querySelector('[rest]')
+          const findElement=div.querySelector('[--]') || div.querySelector('[r-]')
           if (findElement) {
-            for (const [key,value] of Object.entries(el._restProps)) {
+            for (const [key,value] of Object.entries(el?._restProps)) {
                 findElement.setAttribute(value.name,value.value)
-                findElement.removeAttribute('--')
-                findElement.removeAttribute('rest')
               }
-          }
+              findElement.removeAttribute('--')
+              findElement.removeAttribute('r-')
+          
         }
         for (const fn of compoAfterCall) {
           try {
-            fn(stateContext,div?.firstElementChild)
+            fn(stateContext,div?.firstElementChild,el)
           } catch (error) {
             console.error(error.message,error.stack)
           }
@@ -499,6 +501,7 @@ const render = (el, contexts = {}) => {
             render(child,el._context)
         })
     }
+    el._setError()
 }
 exports.render=render
 const { If,Else,ElseIf,For } = require('./power.js');
@@ -508,7 +511,8 @@ const directives={
     's-else-if':ElseIf,
     's-for':For
 }
-exports.startApp = (html, context = {}) => {
+exports.startApp = (html, context = {},devlopment=false) => {
+isDevelopment=devlopment
     const app=new DOMParser()
     const {document}=parseHTML()
    const body= app.parseFromString(html,'text/html')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pawa-ssr",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "pawajs ssr libary",
   "main": "index.js",
   "scripts": {

package/pawaElement.js

@@ -1,5 +1,5 @@
 const { HTMLElement, parseHTML } = require("linkedom")
-const { getAllServerAttrArray, getPawaComponentsMap } =require("./index.js")
+const { getAllServerAttrArray, getPawaComponentsMap, getDevelopment } =require("./index.js")
 const PawaComponent = require("./pawaComponent.js")
 const { evaluateExpr, splitAndAdd,replaceTemplateOperators } =require("./utils.js")
 
@@ -23,8 +23,12 @@ class PawaElement {
         this._template=element.outerHTML
         this._component=null
         this._componentName=''
+        /**@type {Array<{message:string,stack:string}>} */
+        this._error=[]
         this._running=false
         this._hasForOrIf=this.hasForOrIf
+        this._createError=this.createError
+        this._setError=this.setError
         if(this._avoidPawaRender){
       element.removeAttribute('s-pawa-avoid')
       Array.from(element.children).forEach((child) => {
@@ -76,12 +80,19 @@ class PawaElement {
           })
           this._componentChildren=this._el.innerHTML
         }else{
-          if(this._el.getAttribute('client')){
+          if(this._el.hasAttribute('client')){
             this._el.removeAttribute('client')
           }
         }
       }
-
+      setError(){
+        if (getDevelopment() && this._error.length > 0) {
+          this._el.setAttribute('ssr-error',JSON.stringify(this._error))
+        }
+      }
+      createError({message,stack}){
+        this._error.push({message,stack})
+      }
       //set Component props
       setProps(){
         if (this._componentName) {
@@ -105,6 +116,7 @@ class PawaElement {
                 this._props[name]=func
                 } catch (error) {
                   console.log(error.message,error.stack)
+                  this._createError({message:error.message,stack:error.stack})
                 }
               }
             }

package/test/index.js

@@ -6,10 +6,10 @@ const component=({app})=>{
     app.insert({user,array})
     return `
         <div>
-            <h1>
+            <h1 -->
                 <span>Hello World</span>
-                <span s-if="user">Allwell</span>
-                <span s-else>Login</span>
+                <span s-if="users">Allwell</span>
+                <span s-else>@(man.value)</span>
             </h1> 
             <div s-for="items in array" s-pawa-avoid>
                 <span>@(items)</span>
@@ -25,5 +25,5 @@ const html=()=>{
         </div>
     `
 }
-const newHtml=pawa.startApp(html())
+const newHtml=pawa.startApp(html(),{},true)
 console.log(newHtml.toString())

package/utils.js

@@ -37,7 +37,8 @@ exports.matchRoute = (pattern, path) => {
 };
 exports.sanitizeTemplate = (temp) => {
   if (typeof temp !== 'string') return '';
-  return temp.replace(/<script\b[^>]*>([\s\S]*?)<\/script>/gi, '');
+  // return temp.replace(/<script\b[^>]*>([\s\S]*?)<\/script>/gi, '');
+  return temp
 };
 /**
  * Safely evaluates a JavaScript expression in a sandbox.
@@ -47,7 +48,7 @@ exports.sanitizeTemplate = (temp) => {
  * @param {string} error - pass in error message 
  * @returns {any} - The result of the evaluated expression or null on error.
  */
-exports.evaluateExpr = (expr, context = {},error) => {
+exports.evaluateExpr = (expr, context = {},error,element) => {
   try {
     const keys = Object.keys(context);
     const resolvePath = (path, obj) => {
@@ -59,6 +60,9 @@ const values = keys.map((key) => resolvePath(key, context));
       return ${expr}`)(...values)
   } catch (err) {
     console.error(`Evaluation failed for: ${expr}`,error,err.message,err.stack);
+    if (element) {
+      element._createError({message:`${error} ${err.message}`,stack:err.stack})
+    }
     return null;
   }
 };