pawajs 1.4.9 → 1.4.11

package/CHANGELOG.md

@@ -2,4 +2,5 @@ CHANGELOG.md
 + version 1.3.0 - v1.4.0 on experiment
 + version 1.4.0 for-key bug fixing
 + version 1.4.4 added onSuspense and fix out- (document event)
-+ version 1.4.7 solving resuming issue when wrapping with template
++ version 1.4.7 - 1.4.10 solving resuming issue when wrapping with template
++ version 1.4.11 - added more event modifiers

package/index.js

@@ -261,7 +261,7 @@ export const PluginSystem = (...func) => {
                 if (attrPlugins?.fullName) {
                     if (pawaAttributes.has(attrPlugins.fullName)) {
                         console.warn(`attribute plugin already exist ${attrPlugins.fullName}`)
-                        return
+                        // return
                     }
                     
                     applyMode(attrPlugins?.mode, () => {
@@ -273,7 +273,7 @@ export const PluginSystem = (...func) => {
                 } else if (attrPlugins?.startsWith) {
                     if (pawaAttributes.has(attrPlugins.startsWith)) {
                         console.warn(`attribute plugin already exist ${attrPlugins.startsWith}`)
-                        return
+                        // return
                     }
                     applyMode(attrPlugins?.mode, () => {
                         pawaAttributes.add(attrPlugins.startsWith)
@@ -284,8 +284,6 @@ export const PluginSystem = (...func) => {
                 }
             })
 
-
-
         }
         if (getPlugin?.component) {
             if (getPlugin.component?.beforeCall && typeof getPlugin.component?.beforeCall === 'function') {
@@ -900,7 +898,7 @@ const component = (el, resume = false, attr, notRender, stopResume) => {
             // el has no previous Sibling
         }
         el.removeAttribute(attr.name)
-        const numberComponentChildren = notRender.index + children.length - 1
+        const numberComponentChildren = notRender.index -2 + children.length
         notRender.notRender = numberComponentChildren
         resumer.resume_component?.(el, attr, setStateContext, mapsPlugins, formerStateContext, pawaContext, stateWatch, { comment, endComment, name, serialized, id, children })
     }

package/normal/template.js

@@ -13,15 +13,19 @@ export const templates=(el,notRender)=>{
         pawaWayRemover(comment,endComment)
         comment.remove(),endComment.remove();
     }
+    if (!endComment.parentElement) {
+        return
+    }
     endComment.parentElement.insertBefore(comment,endComment)
+    
     el._underControl=comment
     let element=[]
          Array.from(el.content.children).forEach((child) => {
              endComment.parentElement.insertBefore(child,endComment)
              element.push(child)  
          })
-        
+         
          element.forEach(child=>{
-            render(child,el._context,isResume?notRender:{ notRender: null, index: null }) 
-        })
+             render(child,el._context,isResume?notRender:{ notRender: null, index: null }) 
+            })
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "pawajs",
-  "version": "1.4.9",
+  "version": "1.4.11",
   "type":"module",
-  "description": "pawajs library (html runtime) for easily building web ui, enhancing html element, micro frontend etc ",
+  "description": "pawajs library (reactive web runtime) for easily building web ui, enhancing html element, micro frontend etc ",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/power.js

@@ -138,8 +138,11 @@ export const event = (el, attr, stateContext) => {
     if (el._running || checkKeywordsExistence(el._staticContext,attr.value)) {
         return
     }
-    const splitName = attr.name.split('-')
-    const eventType = splitName[1]
+    const directive = attr.name.substring(3); // from 'on-click.prevent' to 'click.prevent'
+    const parts = directive.split('.');
+    const eventType = parts[0];
+    const modifiers = new Set(parts.slice(1));
+
     el.removeAttribute(attr.name)
     const context = el._context
     const keys = Object.keys(context);
@@ -155,7 +158,64 @@ export const event = (el, attr, stateContext) => {
     __pawaDev.setError({el:e.target,msg:error.message,stack:error.stack,directives:'on-event'})
     }
     `)
-    el.addEventListener(eventType, (e) => {
+    
+    const handler = (e) => {
+        // Early return modifiers
+        if (modifiers.has('self') && e.target !== el) return;
+        if (modifiers.has('left') && 'button' in e && e.button !== 0) return;
+        if (modifiers.has('middle') && 'button' in e && e.button !== 1) return;
+        if (modifiers.has('right') && 'button' in e && e.button !== 2) return;
+        if (modifiers.has('ctrl') && !e.ctrlKey) return;
+        if (modifiers.has('alt') && !e.altKey) return;
+        if (modifiers.has('shift') && !e.shiftKey) return;
+        if (modifiers.has('meta') && !e.metaKey) return;
+        if (modifiers.has('exact')) {
+            if (e.ctrlKey && !modifiers.has('ctrl')) return;
+            if (e.altKey && !modifiers.has('alt')) return;
+            if (e.shiftKey && !modifiers.has('shift')) return;
+            if (e.metaKey && !modifiers.has('meta')) return;
+        }
+
+        // Key modifiers
+        if (eventType.startsWith('key')) {
+            const keyAlias = {
+                'enter': 'Enter',
+                'tab': 'Tab',
+                'delete': ['Backspace', 'Delete'],
+                'esc': 'Escape',
+                'space': ' ',
+                'up': 'ArrowUp',
+                'down': 'ArrowDown',
+                'left': 'ArrowLeft',
+                'right': 'ArrowRight'
+            };
+            
+            let shouldRun = false;
+            let hasKeyModifier = false;
+            for (const mod of modifiers) {
+                if (keyAlias[mod]) {
+                    hasKeyModifier = true;
+                    const expectedKey = keyAlias[mod];
+                    if (Array.isArray(expectedKey)) {
+                        if (expectedKey.includes(e.key)) {
+                            shouldRun = true;
+                            break;
+                        }
+                    } else if (e.key === expectedKey) {
+                        shouldRun = true;
+                        break;
+                    }
+                }
+            }
+            if (hasKeyModifier && !shouldRun) {
+                return;
+            }
+        }
+
+        // Action modifiers
+        if (modifiers.has('prevent')) e.preventDefault();
+        if (modifiers.has('stop')) e.stopPropagation();
+
         try {
             func(e, ...values)
         } catch (error) {
@@ -165,8 +225,15 @@ export const event = (el, attr, stateContext) => {
                 template: el._template
             })
         }
-    })
+    };
 
+    const options = {
+        capture: modifiers.has('capture'),
+        once: modifiers.has('once'),
+        passive: modifiers.has('passive')
+    };
+    
+    el.addEventListener(eventType, handler, options)
 }
 
 export const mountElement = (el, attr) => {
@@ -335,10 +402,14 @@ export const documentEvent = (el, attr) => {
     if (el._running || checkKeywordsExistence(el._staticContext,attr.value)) {
         return
     }
-    if (attr.name.split('-')[2]) {
-        return
-    }
-    const eventName = attr.name.split('-')[1]
+    const directive = attr.name.substring(4); // from 'out-click.prevent' to 'click.prevent'
+    const parts = directive.split('.');
+    const eventType = parts[0];
+    const modifiers = new Set(parts.slice(1));
+
+    if (!eventType) return;
+
+    el.removeAttribute(attr.name)
     const keys = Object.keys(el._context);
     const resolvePath = (path, obj) => {
         return path.split('.').reduce((acc, key) => acc?.[key], obj);
@@ -348,27 +419,85 @@ export const documentEvent = (el, attr) => {
     ${attr.value}
     }catch(error){
     console.error(error.message,error.stack)
-    __pawaDev({msg:error.message,stack:error.stack,directives:'out-event'})
+    __pawaDev.setError({msg:error.message,stack:error.stack,directives:'out-event'})
     }`)
     const values = keys.map((key) => resolvePath(key, el._context));
-    const functions = (e) => {
+    const handler = (e) => {
+        // Modifier checks
+        if (modifiers.has('left') && 'button' in e && e.button !== 0) return;
+        if (modifiers.has('middle') && 'button' in e && e.button !== 1) return;
+        if (modifiers.has('right') && 'button' in e && e.button !== 2) return;
+        if (modifiers.has('ctrl') && !e.ctrlKey) return;
+        if (modifiers.has('alt') && !e.altKey) return;
+        if (modifiers.has('shift') && !e.shiftKey) return;
+        if (modifiers.has('meta') && !e.metaKey) return;
+        if (modifiers.has('exact')) {
+            if (e.ctrlKey && !modifiers.has('ctrl')) return;
+            if (e.altKey && !modifiers.has('alt')) return;
+            if (e.shiftKey && !modifiers.has('shift')) return;
+            if (e.metaKey && !modifiers.has('meta')) return;
+        }
+
+        // Key modifiers
+        if (eventType.startsWith('key')) {
+            const keyAlias = {
+                'enter': 'Enter',
+                'tab': 'Tab',
+                'delete': ['Backspace', 'Delete'],
+                'esc': 'Escape',
+                'space': ' ',
+                'up': 'ArrowUp',
+                'down': 'ArrowDown',
+                'left': 'ArrowLeft',
+                'right': 'ArrowRight'
+            };
+            
+            let shouldRun = false;
+            let hasKeyModifier = false;
+            for (const mod of modifiers) {
+                if (keyAlias[mod]) {
+                    hasKeyModifier = true;
+                    const expectedKey = keyAlias[mod];
+                    if (Array.isArray(expectedKey)) {
+                        if (expectedKey.includes(e.key)) {
+                            shouldRun = true;
+                            break;
+                        }
+                    } else if (e.key === expectedKey) {
+                        shouldRun = true;
+                        break;
+                    }
+                }
+            }
+            if (hasKeyModifier && !shouldRun) {
+                return;
+            }
+        }
+
+        // Action modifiers
+        if (modifiers.has('prevent')) e.preventDefault();
+        if (modifiers.has('stop')) e.stopPropagation();
+
         try { 
             const $element=el
             func(e,$element, ...values)
         } catch (error) {
             setPawaDevError({
-                message: `Error from out-${eventName} directive ${error.message}`,
+                message: `Error from out-${eventType} directive ${error.message}`,
                 error: error,
                 template: el._template
             })
         }
     }
-    el.removeAttribute(attr.name)
-    el._MountFunctions.push( ()=> {
-        document.addEventListener(eventName, functions)
-    })
 
-    const unMount = () => document.removeEventListener(eventName, functions);
+    const options = {
+        capture: modifiers.has('capture'),
+        once: modifiers.has('once'),
+        passive: modifiers.has('passive')
+    };
+    const target = modifiers.has('window') ? window : document;
+    el._MountFunctions.push(() => target.addEventListener(eventType, handler, options))
+    const unMount = () => target.removeEventListener(eventType, handler, options);
     el._setUnMount(unMount)
 
 }