vaderjs 1.3.3-alpha-7 → 1.3.3-alpha-9

package/vader.js

@@ -599,58 +599,47 @@ async function Build() {
     cwd: process.cwd() + '/pages/',
     absolute: true,
     recursive: true
-  }); 
-  for await (let file of  glb) {
-    
-    let origin = file.split(process.cwd())[1] || file 
-    let fileName = file.split(process.cwd() + '/pages/')[1]
-    file = file.split(process.cwd() + '/pages/')[1]
+  });
   
-    file === 'index.jsx' ? file = '/' : null 
-    let isBasePath = file === '/' ? true : false 
-    // ex: /pages/index.jsx -  / or /pages/[id].jsx - /:id or /pages/folder/index.jsx - /folder
-    let aburl =  origin.split('pages')[1].split('.jsx')[0].replace('.jsx', '').replace('/index', '').replace('/_', '/:').replace('/[', '/:').replace(']', '')
-
-    aburl.includes('[') ? aburl = '/' +  aburl.split('[')[0].replace('/', '')   : null
-     
-
-    
-    
-     
-
+  // Process files in the 'pages' directory
+  for await (let file of glb) {
+    // Normalize file paths
+    let origin = file.replace(/\\/g, '/');
+    let fileName =  origin.split('/pages/')[1].split('.jsx')[0].replace('.jsx', '') + '.jsx';
+    let isBasePath = fileName === 'index.jsx';
+  
+    // Extract URL-related information from the file path
+    let aburl = origin.split('pages')[1].split('.jsx')[0].replace('.jsx', '').replace('/index', '').replace('/_', '/:').replace('/[', '/:').replace(']', '');
+    aburl.includes('[') ? aburl = '/' + aburl.split('[')[0].replace('/', '') : null;
+  
+    // Create an object with URL and pathname properties
     let obj = {
-      url:  isBasePath ? '/' : aburl,
-      pathname:  origin, 
-    }  
-    let data = await reader(process.cwd() + origin)
-    
-    data = Compiler(data)
+      url: isBasePath ? '/' : aburl,
+      pathname: `/pages/${origin.split('pages/')[1].split('.jsx')[0].replace('.jsx', '')}.jsx`,
+    };
+  
+    // Read and compile file content
+    let data = await fs.readFileSync(origin, "utf8");
+    data = Compiler(data);
+  
+    // Write compiled content to the 'dist/pages' directory
+    console.log(`Compiling ${fileName} to ${obj.url}`)
     await writer(process.cwd() + "/dist/pages/" + fileName, data);
-    let params = obj.params ? Object.keys(obj.params).map((r) => {
-      r = r.replace('[', '').replace(']', '')
-      return `:${r}`
-    }) : ''
-
-   
-
-
-
+  
+    // Generate routing logic
     let js = `
-       router.get('${obj.url}', async (req, res) => {
-         res.render(await require('.${obj.pathname}'), req, res)
-       }) 
-       //@desc ${obj.pathname}
-       ` + '\n'
-
-
-
-    let before = fs.existsSync(process.cwd() + "/dist/app.js") ? await reader(process.cwd() + "/dist/app.js") : ''
-
-    let newfile = before + '\n' + js
+      router.get('${obj.url}', async (req, res) => {
+        res.render(await require('.${obj.pathname}'), req, res)
+      }) 
+      //@desc ${obj.pathname}
+    ` + '\n';
+  
+    // Update 'app.js' file with routing logic
+    let before = fs.existsSync(process.cwd() + "/dist/app.js") ? await reader(process.cwd() + "/dist/app.js") : '';
+    let newfile = before + '\n' + js;
     if (!before.includes(`//@desc ${obj.pathname}`)) {
       await writer(process.cwd() + "/dist/app.js", newfile);
     }
-
   }
    
  
@@ -659,16 +648,30 @@ async function Build() {
     cwd: process.cwd() + '/src/',
     absolute: true,
   });
-  scannedSourceFiles.forEach(async (file) => { 
+  const scannedVaderFiles = await glob("**/**.{html,js}", { 
+    cwd: process.cwd() + '/node_modules/vaderjs/runtime',
+    absolute: true,
+  }); 
+  scannedVaderFiles.forEach(async (file) => { 
+    file = file.replace(/\\/g, '/');
      
-    file = file.split(process.cwd() + '/src/')[1]
-    let data = await reader(process.cwd() + "/src/" + file)
-    bundleSize += fs.statSync(process.cwd() + "/src/" + file).size;
-    if(file.endsWith('.jsx')){
-      data = Compiler(data)
+    let name = file.split( '/node_modules/vaderjs/runtime/')[1]
+    let data = await reader(file)
+    bundleSize += fs.statSync(file).size;
+    await writer(process.cwd() + "/dist/" + name, data);
+  })
+  scannedSourceFiles.forEach(async (file) => { 
+     file = file.replace(/\\/g, '/');
+    let name = file.split('/src/')[1]
+    console.log(`Compiling ${name} to /src/${name}`)
+    //parse jsx 
+   
+    let data = await reader(process.cwd() + "/src/" + name)
+    if (name.includes('.jsx')) {
+      data = Compiler(data); 
     }
- 
-    await writer(process.cwd() + "/dist/src/" + file, data);
+    bundleSize += fs.statSync(process.cwd() + "/src/" + name).size;
+    await writer(process.cwd() + "/dist/src/" + name, data);
   })
  
   const scannedPublicFiles =  await glob("**/**.{css,js,html}", {
@@ -677,7 +680,8 @@ async function Build() {
     absolute: true, 
   });
   scannedPublicFiles.forEach(async (file) => {
-    file = file.split(process.cwd() + '/public/')[1]
+    file = file.replace(/\\/g, '/');
+    file = file.split('/public/')[1]
     let data = await reader(process.cwd() + "/public/" + file)
     bundleSize += fs.statSync(process.cwd() + "/public/" + file).size;
     await writer(process.cwd() + "/dist/public/" + file, data);
@@ -706,8 +710,7 @@ async function Build() {
   console.log(`Compilation completed`)
   globalThis.isBuilding = false
 }
-import { watch } from "fs";
-import { url } from "inspector";
+import { watch } from "fs"; 
 
 switch (true) {
   case process.argv.includes('--watch'):
@@ -741,15 +744,14 @@ Building to ./dist
     break;
   default:
     console.log(`
-Vader.js is a reactive framework for building interactive applications inspired by React.js and Next.js
+Vader.js is a reactive framework for building interactive applications for the web built ontop of bun.js!
 
 Usage: vader <command> 
 
 Commands:
   --watch     Watch the pages folder for changes and recompile 
 
-  --build     Build the project - use this to initialize the project
-  
+  --build     Build the project
 Learn more about vader:           https://vader-js.pages.dev/
     
 `)