vaderjs 1.3.3-alpha-15 → 1.3.3-alpha-17

package/package.json

@@ -2,7 +2,7 @@
   "name": "vaderjs",
   "description": "A Reactive library aimed to helping you build reactive applications inspired by react.js",
   "module": "vader.js",
-  "version": "1.3.3-alpha-15",
+  "version": "1.3.3-alpha-17",
   "bin": {
     "vader": "./vader.js"
   },

package/vader.js

@@ -25,17 +25,18 @@ function Compiler(func) {
   let savedfuncnames = [];
   let functions = string
     .match(
-      /(?:const|let)\s*([a-zA-Z0-9_-]+)\s*=\s*function\s*\(([^)]*)\)|function\s*([a-zA-Z0-9_-]+)\s*\(([^)]*)\)/gs
+      /(?:const|let|var)?\s*([a-zA-Z0-9_-]+)\s*(?:=|function)\s*\(([^)]*)\)|function\s*([a-zA-Z0-9_-]+)\s*\(([^)]*)\)|(?:const|let|var)?\s*([a-zA-Z0-9_-]+)\s*=\s*\(([^)]*)\)/gs
     )
     ?.map((match) => match.trim());
 
+ 
   let functionNames = [];
 
   if (functions) {
     functions.forEach((func) => {
       if (
         !func.match(
-          /(?:const|let)\s*([a-zA-Z0-9_-]+)\s*=\s*function\s*\(([^)]*)\)|function\s*([a-zA-Z0-9_-]+)\s*\(([^)]*)\)/gs
+          /(?:const|let|var)?\s*([a-zA-Z0-9_-]+)\s*(?:=|function)\s*\(([^)]*)\)|function\s*([a-zA-Z0-9_-]+)\s*\(([^)]*)\)|(?:const|let|var)?\s*([a-zA-Z0-9_-]+)\s*=\s*\(([^)]*)\)/gs
         )
       ) {
         return;
@@ -133,11 +134,12 @@ function Compiler(func) {
         if (functionNames.length > 0) {
           functionNames.forEach((name) => {
             string.split("\n").forEach((line) => {
-              if (line.includes(name) && line.includes("function")) {
+              if (line.includes(name) && line.includes("function") || line.includes(name) && line.includes("=>")) {
                 line = line.trim();
                 line = line.replace(/\s+/g, " ");
 
-                let ps = line.split("(").slice(1).join("(").split(")")[0].trim();
+                let ps =  line.split("(")[1].split(")")[0].trim();
+               
 
                 // remove comments
                 ps = ps.match(/\/\*.*\*\//gs)
@@ -158,6 +160,7 @@ function Compiler(func) {
                 let params = hasParams
                   ? line.split("(")[1].split(")")[0].trim()
                   : null;
+                 
 
                 if (
                   functionparams.length > 0 &&
@@ -184,8 +187,9 @@ function Compiler(func) {
                   } ${params || null}${isJSXComponent ? "" : ","} true ${isJSXComponent ? "" : ","
                   } '${ref}')`;
 
+                  console.log(replacement)
                 newvalue = newvalue.replace(
-                  hasParams ? `${name}(${params})` : name,
+                  line,
                   `this.callFunction(\${${replacement}}, ${isJSXComponent ? true : false
                   }, event,${params || null})`
                 );
@@ -219,9 +223,9 @@ function Compiler(func) {
             otherdata["ref"] = ref;
  
             newvalue = newvalue.split('\n').map(line => line.trim() ? line.trim() + ';' : line).join('\n');
-
-            let newatribute = `${attributeName}="\${this.bind(\`${newvalue}\` ${isJSXComponent ? "" : ","
-              }${JSON.stringify(otherdata)} )}"`;
+            newvalue =  newvalue.replaceAll('"', "'")
+            otherdata = JSON.stringify(otherdata).replaceAll('"', "'")
+            let newatribute = `${attributeName}="\${this.bind(\`${newvalue}\`${isJSXComponent ? "" : ","}${otherdata} )}"`;
 
 
             attribute[attributeName] = {
@@ -532,10 +536,13 @@ function Compiler(func) {
       });
 
        
-      // turn props into object
-      props = props.replace(/(\w+)=["']([^"']+)["']/g, '"$1": `$2`,');
+      // turn props into object 
+      props = props.replaceAll('=', ':').replaceAll('/', '')
       
-      props = props.replace("/", ""); 
+      // class="text-red-500" => class:"text-red-500", omit quotes if value is a variable
+      props = props.replaceAll(/([a-zA-Z0-9_-]+)\s*:\s*("([^"\\]*(\\.[^"\\]*)*)"|'([^'\\]*(\\.[^'\\]*)*)')/gs, (match, p1, p2) => {
+       return match + ','
+    });
       let replace = "";
       replace = isChild
         ? `this.memoize(this.createComponent(${savedname.replaceAll('/', '')}, {${props}}, [${myChildrens.length > 0 ? myChildrens.join(",") : ""