vaderjs 2.0.3 → 2.0.5

package/main.js

@@ -75,16 +75,15 @@ if (!fs.existsSync(process.cwd() + '/jsconfig.json')) {
     await Bun.write(process.cwd() + '/jsconfig.json', JSON.stringify(json, null, 4))
 }
 
-globalThis.bindes = []
+var bindes = []
 var fnmap = []
 const vader = {
-    isDev: mode === 'development',
     onFileChange: (file, cb) => {
         fs.watch(file, cb)
     },
     runCommand: (cmd) => {
         return new Promise((resolve, reject) => {
-           let c =  Bun.spawn(cmd, {
+            Bun.spawn(cmd, {
                 stdout: 'inherit',
                 cwd: process.cwd(),
                 onExit({ exitCode: code }) {
@@ -96,11 +95,6 @@ const vader = {
                 }
             })
 
-            setTimeout(() => {
-                c.kill()
-                reject()
-            }, 5000)
-
 
         })
     },
@@ -111,7 +105,6 @@ const vader = {
     },
     injectHTML: (html) => {
         bindes.push(html)
-        globalThis.bindes = bindes
     },
 }
 const handleReplacements = (code) => {
@@ -167,9 +160,8 @@ const handleReplacements = (code) => {
             line = b4
         }
         if (!hasImport && line.includes('useRef')) {
-            line = line.replace(' ', '')
             let b4 = line
-            let key = line.split('=')[0].split(' ').filter(Boolean)[1] 
+            let key = line.split(' ')[1].split('=')[0]
             b4 = line.replace('useRef(', `this.useRef('${key}',`)
             line = b4
         }
@@ -180,14 +172,12 @@ const handleReplacements = (code) => {
     return c
 }
 
-if (!fs.existsSync(process.cwd() + '/dev/bundler.js')) { 
-    fs.mkdirSync(process.cwd() + '/dev', { recursive: true })
-    fs.copyFileSync(require.resolve('vaderjs/bundler/index.js'), process.cwd() + '/dev/bundler.js')
-}
+
 let start = Date.now()
 async function generateApp() {
     globalThis.isBuilding = true;
-    console.log(ansiColors.green('Building...')) 
+    console.log(ansiColors.green('Building...'))
+    console.log(`Starting build at ${new Date().toLocaleTimeString()}`)
     let plugins = config.plugins || []
     for (let plugin of plugins) {
         if (plugin.onBuildStart) {
@@ -216,38 +206,19 @@ async function generateApp() {
             r = r.replace(process.cwd().replace(/\\/g, '/') + '/app', '')
             r = r.replace('.jsx', '.js').replace('.tsx', '.js') 
             fs.mkdirSync(path.join(process.cwd() + '/dist', path.dirname(r)), { recursive: true })
-            let params = routes.match(route).params || {}
-            let base = routes.match(route) 
-            let paramIndexes = [] 
-            for (let param in params) {
-                let  routes = base.pathname.split('/')
-                let index = routes.indexOf('[' + param + ']')
-                paramIndexes.push(index)
-            } 
- 
-            // dont return
-            
-            fs.writeFileSync(
-                process.cwd() + '/dist/' + path.dirname(r) + '/' + path.basename(r),
-                `
-                      let route = window.location.pathname.split('/').filter(Boolean) 
-                      let params = {
-                        // get index tehn do route[index]
-                        ${Object.keys(params).map((param, i) => {
-                             if (paramIndexes[i] !== -1) {  
-                                var r_copy = r;
-                                r_copy = r_copy.split('/').filter(Boolean)
-                                var index = paramIndexes[i] - 1
-                                return `${param}: route[${index}]`
-                             }
-                            }).join(',\n')}
-                      }
-              
-                      \n${code}
-                  `
-            );
+            fs.writeFileSync(process.cwd() + '/dist/' + path.dirname(r) + '/' + path.basename(r), `
+        let route = window.location.pathname.split('/').filter(v => v !== '')
+        let params = {
+            ${Object.keys(routes.match(route).params || {}).length > 0 ? Object.keys(routes.match(route).params || {}).map(p => {
+                return `${p}: route[${Object.keys(routes.match(route).params).indexOf(p) + Object.keys(routes.match(route).params).length}]`
+            }).join(',') : ""}
+        }
+        \n${code}
+        `)
             fs.mkdirSync(process.cwd() + '/dev', { recursive: true })
-             
+            if (!fs.existsSync(process.cwd() + '/dev/bundler.js')) {
+                fs.copyFileSync(require.resolve('vaderjs/bundler/index.js'), process.cwd() + '/dev/bundler.js')
+            }
 
             if (!fs.existsSync(process.cwd() + '/dev/readme.md')) {
                 fs.writeFileSync(process.cwd() + '/dev/readme.md', `# Please do not edit the bundler.js file in the dev directory. This file is automatically generated by the bundler. \n\n`)
@@ -275,7 +246,8 @@ async function generateApp() {
                 },
                 onExit({ exitCode: code }) {
                     if (code === 0) {
-                        bindes = [] 
+                        bindes = []
+                        console.log(`Built ${r} in ${Date.now() - start}ms`)
                         resolve()
                     } else {
                         reject()
@@ -322,7 +294,6 @@ async function generateApp() {
                 await plugin.onBuildFinish(vader)
             }
         }
-         
     })
 
 
@@ -330,7 +301,8 @@ async function generateApp() {
 
 function handleFiles() {
     return new Promise(async (resolve, reject) => {
-        try { 
+        try {
+            console.log(Glob)
             let glob = new Glob('public/**/*')
             for await (var i of glob.scan()) {
                 let file = i
@@ -472,14 +444,13 @@ if (mode === 'development') {
 else if (mode == 'production') {
     await handleFiles()
     await generateApp()
-     
-    console.log(`Build complete in ${Date.now() - start}ms at ${new Date().toLocaleTimeString()}`);
 }
 else {
     if (isBuilding) console.log(`Build complete in ${Date.now() - start}ms at ${new Date().toLocaleTimeString()}`);
-     
+
 }
 
+
 if (mode == 'development' || mode == 'serve') {
     let server = Bun.serve({
         port: port || 8080,
@@ -530,44 +501,17 @@ if (mode == 'development' || mode == 'serve') {
             base = base.replace(path.join(process.cwd() + '/app').replace(/\\/g, '/'), '')
             base = base.replace(/\\/g, '/').replace('/app', '/dist')
             base = process.cwd() + "/dist/" + base
-            if(!fs.existsSync(path.join(base, 'index.html'))){
-                return new Response(`
-                <html>
-                <head>
-                <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
-                <meta http-equiv="refresh" content="5">
-                </head>
-                <body>
-                 <p>Rerouting to display changes from server</p>
-                </body>    
-                `, {
-                    headers: {
-                        'Content-Type': 'text/html',
-                        'Cache-Control': 'no-cache'
-                    }
-                })
-            }
             let data = await Bun.file(path.join(base, 'index.html')).text()
             if (mode == "development") {
                 return new Response(data + `
             <script>
-            let ws = new WebSocket(\`\${location.protocol === 'https:' ? 'wss' : 'ws'}://\${location.host}\`)
+            let ws = new WebSocket('ws://localhost:${server.port}')
             ws.onmessage = (e) => {
                 if(e.data === 'reload'){
                     console.log('Reloading to display changes from server')
                     window.location.reload()
                 }
             }
-            ws.onopen = () => {
-                console.log('Connected to hmr server')
-            }
-            
-            ws.onclose = () => {
-                // try to reconnect
-                 console.log('Reconnecting to hmr server')
-                 ws = new WebSocket(\`\${location.protocol === 'https:' ? 'wss' : 'ws'}://\${location.host}\`)    
-            }
-            
             </script>
             `, {
                     headers: {
@@ -587,6 +531,3 @@ if (mode == 'development' || mode == 'serve') {
 
     console.log(ansiColors.green('Server started at http://localhost:' + port || 8080))
 }
-
-
- 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "vaderjs",
-    "version": "2.0.3",
+    "version": "2.0.5",
     "description": "A simple and powerful JavaScript library for building modern web applications.", 
     "bin": {
         "vaderjs": "./main.js"