vaderjs 1.3.3-alpha-24 → 1.3.3-alpha-26

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-24",
+  "version": "1.3.3-alpha-26",
   "bin": {
     "vader": "./vader.js"
   },

package/runtime/vader.js

@@ -360,7 +360,7 @@ export class Component {
       } else {
         const targetElement = document.querySelector(`[key="${this.key}"]`);
         if (targetElement) {
-          targetElement.innerHTML = this.render();
+          targetElement.outerHTML = this.render();
         } else {
           console.error('Target element not found.');
         }
@@ -659,6 +659,7 @@ export const require = async (path, noresolve = false) => {
   let file = ''
   try {
     file = await fetch(path).then((res) => res.text());
+    cache
   } catch (error) {
      console.error(error)
   }
@@ -683,9 +684,11 @@ export const require = async (path, noresolve = false) => {
         file = file.replaceAll(exports, "");
       }
       
-      return new Function(`return (async () => { ${file} })()`)();
+      cache[path] = new Function(`return (async () => { ${file} })()`)();
+      return cache[path]
     case filetype === "jsx": 
-    return new Function(`return (async () => { ${file} })()`)()
+    cache[path] = new Function(`return (async () => { ${file} })()`)();
+    return  cache[path]
        
   } 
 };

package/vader.js

@@ -180,7 +180,10 @@ function Compiler(func) {
                   }
                 });
 
-                let replacement = `this.useFunction(${name} ${isJSXComponent ? "" : ","
+                if(isJSXComponent){
+                   continue
+                }
+                let replacement = `this.useFunction(${name},
                   } ${params || null}${isJSXComponent ? "" : ","} true ${isJSXComponent ? "" : ","
                   } '${ref}')`;
 
@@ -227,7 +230,7 @@ function Compiler(func) {
             let paramString = params ? params.split(' ').map(param => param + ',').join('') : "";
  
             paramString = paramString.replaceAll(',,', ',')
-            let jsxAttribute = `${attributeName}=function(${paramString}){${newvalue}},`
+            let jsxAttribute = `${attributeName}=function(${paramString}){${newvalue}}.bind(this),`
             let newatribute =  `${attributeName}="\${this.bind(\`${newvalue}\`, ${isJSXComponent ? true : false}, '${ref}', "${paramString}", ${params || null})}",`
 
             attribute[attributeName] = {
@@ -265,7 +268,7 @@ function Compiler(func) {
           newvalue = newvalue.split('\n').map(line => line.trim() ? line.trim() + ';' : line).join('\n'); 
           let paramString = params ? params.split(' ').map(param => param + ',').join('') : "";
           paramString = paramString.replaceAll(',,', ',')
-          let jsxAttribute = `${attributeName}=function(${paramString}){${newvalue}},`
+          let jsxAttribute = `${attributeName}=function(${paramString}){${newvalue}}.bind(this),`
           let newattribute = `${attributeName}="\${this.bind(\`${newvalue}\`, ${isJSXComponent ? true : false}, '${ref}', "${paramString}", ${params || null})}",`
           newattribute = newattribute.replace(/\s+/g, " ")
           string = string.replace(old,  isJSXComponent ? jsxAttribute : newattribute);
@@ -335,7 +338,7 @@ function Compiler(func) {
           if (value && value.includes("={")) {
             value = value.replace("=", "");
             value == "undefined" ? (value = '"') : (value = value);
-            console.log(value)
+            
             key == 'style' ? value = `{this.parseStyle({${value.split('{{')[1].split('}}')[0]}})}` : null
 
              
@@ -655,11 +658,12 @@ async function Build() {
     let obj = {
       url: isBasePath ? '/' : aburl,
       pathname: `/pages/${origin.split('pages/')[1].split('.jsx')[0].replace('.jsx', '')}.jsx`,
+      fullpath: origin,
     };
   
     // Read and compile file content
     let data = await fs.readFileSync(origin, "utf8");
-    data = Compiler(data); 
+    data = Compiler(data) 
    
     await writer(process.cwd() + "/dist/pages/" + fileName, data);
   
@@ -677,6 +681,12 @@ async function Build() {
     if (!before.includes(`//@desc ${obj.pathname}`)) {
       await writer(process.cwd() + "/dist/app.js", newfile);
     }
+
+    let beforeHTML = fs.existsSync(process.cwd() + "/dist/index.html") ? await reader(process.cwd() + "/dist/index.html") : '';
+    if(!beforeHTML.includes(`<link rel="prefetch" href="/pages/${origin.split('pages/')[1] }" as="fetch">`)){
+      let newHTML = beforeHTML + `\n<link rel="prefetch" href="/pages/${origin.split('pages/')[1] }" as="fetch">`
+      await writer(process.cwd() + "/dist/index.html", newHTML);
+    }
   }
    
  
@@ -709,7 +719,7 @@ async function Build() {
    
     let data = await reader(process.cwd() + "/src/" + name)
     if (name.includes('.jsx')) {
-      data = Compiler(data); 
+      data = Compiler(data)  
     }
     bundleSize += fs.statSync(process.cwd() + "/src/" + name).size;
     await writer(process.cwd() + "/dist/src/" + name, data);