pawajs 1.3.9 → 1.4.0

package/CHANGELOG.md

@@ -0,0 +1,3 @@
+CHANGELOG.md
++ version 1.3.0 - v1.4.0 on experiment
++ version 1.4.0 for-key bug fixing

package/merger/for.js

@@ -48,9 +48,9 @@ export const merger_for = (el, stateContext, attr, arrayName, arrayItem, indexes
                 const removeElement = []
                 
                 const newElementsMap = new Map()
-                Array.from(div.children).forEach(child => {
-                    const key = child.getAttribute('for-key')
-                    if (key) newElementsMap.set(key, child)
+                Array.from(div.children).forEach((child,i) => {
+                    const key = child.getAttribute('for-key') || i
+                    if (key || key === 0) newElementsMap.set(key, child)
                 })
 
                 elementArray.forEach((keyComment) => {
@@ -103,7 +103,7 @@ export const merger_for = (el, stateContext, attr, arrayName, arrayItem, indexes
                                 keyMap.set(child._forKey, child)
                             })
                             Array.from(div.children).forEach((child, index) => {
-                                const key = child.getAttribute('for-key')
+                                const key = child.getAttribute('for-key') || index
                                 const context = el._context
                                 const itemContext = {
                                     [arrayItem]: array[index],

package/package.json

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

package/utils.js

@@ -33,23 +33,9 @@ export const processNode = (node, itemContext) => {
     return
   }
   
-  if (node.nodeType === 3) { // Text node
-    const text = node.textContent
-    const newText = text.replace(/{{(.+?)}}/g, (match, exp) => {
-      try {
-        const keys = Object.keys(itemContext)
-        
-        const values = keys.map(key => itemContext[key])
-        
-        return new Function(...keys, `return ${exp}`)(...values)
-      } catch {
-        return match
-      }
-    })
-    //console.log(newText)
-    node.textContent = newText
-  } else if (node.attributes) {
+  if (node.attributes) {
     Array.from(node.attributes).forEach(attr => {
+      if(attr.name !== 'for-key') return
       const newValue = attr.value.replace(/{{(.+?)}}/g, (match, exp) => {
         try {
           const keys = Object.keys(itemContext)
@@ -62,9 +48,7 @@ export const processNode = (node, itemContext) => {
       attr.value = newValue
     })
   }
-  Array.from(node.childNodes).forEach((n) => {
-    processNode(n, itemContext)
-  })
+  
 }
 
 export const extractContextValues = (context) => {