pawajs 1.4.36 → 1.4.37

package/index.js

@@ -295,7 +295,10 @@ export const createIntersectionObserver = (element, observeBy) => {
                     while (instances.length > 0) {
                         const { element: el, func } = instances.shift();
                         if (el) {
-                            if (el._component) el._component.component = compoFunc;
+                            if (el._component){
+                              el._component.component = compoFunc;
+                              el._component.validPropRule=compoFunc?.validateProps || {}
+                            } 
                             
                             keepContext(el._stateContext);
                             el._stateContext._hasRun = false;
@@ -921,8 +924,9 @@ const component = (el, resume = false, attr, notRender, stopResume) => {
               if (!lazyComponentElement.has(name)) {
                 createInsectObserver(trackElement,el)
               }
+            }else{
+                resumer.resume_component?.(el, attr, setStateContext, mapsPlugins, formerStateContext, pawaContext, stateWatch, { comment, endComment, name, serialized, id, children })
             }
-        resumer.resume_component?.(el, attr, setStateContext, mapsPlugins, formerStateContext, pawaContext, stateWatch, { comment, endComment, name, serialized, id, children })
     }
 }
 

package/merger/switch.js

@@ -52,7 +52,7 @@ export const merger_switch=(el,attr,stateContext,resume=false,{comment,endCommen
                 }
             }
             const setElement=(newElement,exp)=>{
-                newElement.removeAttribute(exp)
+                newElement.removeAttribute(exp === 'default'?'s-default':exp)
                 if (stateContext._hasRun) {
                     stateContext._hasRun = false
                     keepContext(stateContext)

package/normal/component.js

@@ -153,13 +153,15 @@ export const normal_component=(el,stateContext,setStateContext,mapsPlugin,former
     }
     const context=el._context
        const propsSetter=()=>{   
+         const findElement=div.querySelector('[--]') || div.querySelector('[rest]')
+         if (findElement) {
+        findElement.removeAttribute('--')
+        findElement.removeAttribute('rest')
+        }
     if(Object.entries(el._restProps).length > 0){
-      const findElement=div.querySelector('[--]') || div.querySelector('[rest]')
       if (findElement) {
         for (const [key,value] of Object.entries(el._restProps)) {
             findElement.setAttribute(value.name,value.value)
-            findElement.removeAttribute('--')
-            findElement.removeAttribute('rest')
           }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pawajs",
-  "version": "1.4.36",
+  "version": "1.4.37",
   "type":"module",
   "description": "pawajs library (reactive web runtime) for easily building web ui, enhancing html element, micro frontend etc ",
   "main": "index.js",

package/pawaElement.js

@@ -1,5 +1,5 @@
 import {components,lazyComponents ,escapePawaAttribute,getPawaAttributes,getDependentAttribute,getPrimaryDirectives } from './index.js';
-import {splitAndAdd,replaceTemplateOperators,setPawaDevError,getEvalValues} from './utils.js';
+import {splitAndAdd,replaceTemplateOperators,setPawaDevError,getEvalValues, checkKeywordsExistence} from './utils.js';
 import PawaComponent from './pawaComponent.js';
 import { createIntersectionObserver } from './index.js';
 import { addLazyComponentElement } from './index.js';
@@ -293,14 +293,49 @@ export class PawaElement {
       const pawaAttribute=getPawaAttributes()
       const dependAttribute=getDependentAttribute()
       this._attributes.forEach((attr) => {
+        
         if (!attr.name.startsWith(':') && !pawaAttribute.has(attr.name) && !dependAttribute.has(attr.name)) {
           let name=''
-                if (attr.name.startsWith('-')) {
-                  name=attr.name.slice(1)
-                } else {
-                  name=attr.name
+          if (attr.name.startsWith('-')) {
+            name=attr.name.slice(1)
+          } else {
+            name=attr.name
+          }
+          const context=this._context
+                const setProps=()=>{
+                 delete this._restProps[name]
+                 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.safeEval(context, expression, 'props', true)
+                         return res
+                     }
+                 });
+                 return value
+                 }else if( attr.name.startsWith('on-') || attr.name.startsWith('out-')){
+                  const res=this.safeEval(context,`(e)=>{
+                    ${attr.value}
+                  }`, 'props',true)
+                  return res
+                 }
+                 return attr.value
+                }
+                
+                if (this._props[name] || name === 'class' && this._props['className'] || name === 'defaultValue' && this._props['defaultValue']) return
+                name=name.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
+                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}    
+                
+                this._restProps[name]={name:name,value:attr.value} 
        }else if(!pawaAttribute.has(attr.name) && attr.name.startsWith(':')){
         
         const propsName=attr.name.slice(1)