vaderjs 2.0.4 → 2.0.6

package/main.js

@@ -5,16 +5,8 @@ import { Glob } from 'bun'
 const args = Bun.argv.slice(2)
 globalThis.isBuilding = false;
 import fs from 'fs'
-import { platform } from 'os'
 import path from 'path'
 
-let bunPath = 'bun'; // Default for Linux/Mac
-if (platform() === 'win32') {
-    bunPath = 'bun'; // Bun path for Windows
-} else {
-    bunPath = path.resolve(process.env.HOME || process.env.USERPROFILE, '.bun', 'bin', 'bun');
-}
-
 
 if (!fs.existsSync(process.cwd() + '/app') && !args.includes('init')) {
     console.error(`App directory not found in ${process.cwd()}/app`)
@@ -29,21 +21,21 @@ if (!fs.existsSync(process.cwd() + '/src')) {
 if (!fs.existsSync(process.cwd() + '/vader.config.ts')) {
     fs.writeFileSync(process.cwd() + '/vader.config.ts',
         `import defineConfig from 'vaderjs/config'
-export default defineConfig({
- port: 8080,
- host_provider: 'apache'
+export default  defineConfig({
+    port: 8080,
+    host_provider: 'apache'
 })`)
 }
 var config = require(process.cwd() + '/vader.config.ts').default
 const mode = args.includes('dev') ? 'development' : args.includes('prod') || args.includes('build') ? 'production' : args.includes('init') ? 'init' : args.includes('serve') ? 'serve' : null;
 if (!mode) {
     console.log(`
- Usage:
- bun vaderjs serve - Start the server
- bun vaderjs dev - Start development server output in dist/
- bun vaderjs prod - Build for production output in dist/
- bun vaderjs init - Initialize a new vaderjs project
- `)
+    Usage:
+     bun vaderjs serve - Start the server
+     bun vaderjs dev - Start development server output in dist/
+     bun vaderjs prod - Build for production output in dist/
+     bun vaderjs init - Initialize a new vaderjs project
+    `)
     process.exit(1)
 }
 
@@ -60,11 +52,11 @@ if (mode === 'init') {
 
 console.log(
     `VaderJS - v${require(process.cwd() + '/node_modules/vaderjs/package.json').version} 🚀
- Mode: ${mode}
- SSR: ${require(process.cwd() + '/vader.config.ts').default.ssr ? 'Enabled' : 'Disabled'}
- PORT: ${require(process.cwd() + '/vader.config.ts').default.port || 8080}
- ${mode == 'serve' ? `SSL: ${require(process.cwd() + '/vader.config.ts').default?.ssl?.enabled ? 'Enabled' : 'Disabled'} ` : ``}
- `
+  Mode: ${mode}
+  SSR: ${require(process.cwd() + '/vader.config.ts').default.ssr ? 'Enabled' : 'Disabled'}
+  PORT: ${require(process.cwd() + '/vader.config.ts').default.port || 8080}
+  ${mode == 'serve' ? `SSL: ${require(process.cwd() + '/vader.config.ts').default?.ssl?.enabled ? 'Enabled' : 'Disabled'} ` : ``}
+    `
 )
 
 
@@ -83,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 }) {
@@ -104,11 +95,6 @@ const vader = {
                 }
             })
 
-            setTimeout(() => {
-                c.kill()
-                reject()
-            }, 5000)
-
 
         })
     },
@@ -119,7 +105,6 @@ const vader = {
     },
     injectHTML: (html) => {
         bindes.push(html)
-        globalThis.bindes = bindes
     },
 }
 const handleReplacements = (code) => {
@@ -142,10 +127,10 @@ const handleReplacements = (code) => {
                 url = url.replace(/\\/g, '/')
                 if (!bindes.includes(`<link rel="stylesheet" href="${url}">`)) {
                     bindes.push(`
- <style>
- ${fs.readFileSync(p, 'utf-8')}
- </style>
- `)
+                    <style>
+                      ${fs.readFileSync(p, 'utf-8')}
+                    </style>
+                    `)
                 }
             } catch (error) {
                 console.error(error)
@@ -175,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
         }
@@ -188,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(`Starting build at ${new Date().toLocaleTimeString()}`)
     let plugins = config.plugins || []
     for (let plugin of plugins) {
         if (plugin.onBuildStart) {
@@ -219,43 +201,24 @@ async function generateApp() {
 
             let r = routes.routes[route]
             let code = await Bun.file(r).text()
-            code = handleReplacements(code)
             let size = code.length / 1024
             r = r.replace(process.cwd().replace(/\\/g, '/') + '/app', '')
-            r = r.replace('.jsx', '.js').replace('.tsx', '.js')
+            var beforeR = r
+            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`)
@@ -264,32 +227,37 @@ async function generateApp() {
             fs.writeFileSync(process.cwd() + '/dist/src/vader/index.js', await new Bun.Transpiler({
                 loader: 'ts',
             }).transformSync(await Bun.file(require.resolve('vaderjs')).text()))
+
             Bun.spawn({
-                cmd: [bunPath, 'run', './dev/bundler.js'],
+                cmd: ['bun', 'run', './dev/bundler.js'],
                 cwd: process.cwd(),
                 stdout: 'inherit',
                 env: {
-                    ENTRYPOINT: path.join(process.cwd(), 'dist', path.dirname(r), path.basename(r)),
-                    ROOT: path.join(process.cwd(), 'app/'),
+                    ENTRYPOINT: path.join(process.cwd() + '/dist/' + path.dirname(r) + '/' + path.basename(r)),
+                    ROOT: process.cwd() + '/app/',
                     OUT: path.dirname(r),
-                    file: path.join(process.cwd(), 'dist', path.dirname(r), path.basename(r)),
+                    file: process.cwd() + '/dist/' + path.dirname(r) + '/' + path.basename(r),
                     DEV: mode === 'development',
                     size,
                     bindes: bindes.join('\n'),
+                    isTs: beforeR.endsWith(".tsx"),
                     filePath: r,
+
+                    isJsx: beforeR.endsWith('.tsx') || beforeR.endsWith(".jsx"),
                     isAppFile: true,
-                    isJsx: true,
-                    INPUT: `../app/${r.replace('.js', '.jsx').replace('.tsx', '.js')}`,
+                    INPUT: `../app/${beforeR}`,
                 },
                 onExit({ exitCode: code }) {
                     if (code === 0) {
-                        bindes = [];
-                        resolve();
+                        bindes = []
+                        console.log(`Built ${r} in ${Date.now() - start}ms`)
+                        resolve()
                     } else {
-                        reject();
+                        reject()
                     }
-                },
-            });
+                }
+            })
+
         })
 
         switch (host_provider) {
@@ -329,7 +297,6 @@ async function generateApp() {
                 await plugin.onBuildFinish(vader)
             }
         }
-
     })
 
 
@@ -352,15 +319,15 @@ function handleFiles() {
                 var file = i
                 fs.mkdirSync(path.join(process.cwd() + '/dist', path.dirname(file)), { recursive: true })
                 // turn jsx to js
-                if (file.includes('.jsx') || file.includes('.tsx')) {
+                if (file.endsWith('.jsx') || file.endsWith('.tsx')) {
                     let code = await Bun.file(file).text()
 
                     code = handleReplacements(code)
-
+                    var url = file
                     file = file.replace('.jsx', '.js').replace('.tsx', '.js')
                     fs.writeFileSync(path.join(process.cwd() + '/dist', file.replace('.jsx', '.js').replace('.tsx', '.js')), code)
                     await Bun.spawn({
-                        cmd: [bunPath, 'run', './dev/bundler.js'],
+                        cmd: ['bun', 'run', './dev/bundler.js'],
                         cwd: process.cwd(),
                         stdout: 'inherit',
                         env: {
@@ -372,8 +339,9 @@ function handleFiles() {
                             DEV: mode === 'development',
                             size: code.length / 1024,
                             filePath: file.replace('.jsx', '.js'),
-                            isTs: file.includes('.tsx'),
-                            INPUT: path.join(process.cwd(), file.replace('.js', '.jsx').replace('.tsx', '.js')),
+                            isJsx: url.endsWith('.tsx') || url.endsWith(".jsx"),
+                            isAppFile: false,
+                            INPUT: path.join(process.cwd(), url),
                         },
                         onExit({ exitCode: code }) {
                             if (code === 0) {
@@ -383,13 +351,13 @@ function handleFiles() {
                             }
                         }
                     })
-                } else if (file.includes('.ts')) {
+                } else if (file.endsWith('.ts')) {
                     let code = await Bun.file(file).text()
                     code = handleReplacements(code)
                     file = file.replace('.ts', '.js')
                     fs.writeFileSync(path.join(process.cwd() + '/dist', file.replace('.ts', '.js')), code)
                     await Bun.spawn({
-                        cmd: [bunPath, 'run', './dev/bundler.js'],
+                        cmd: ['bun', 'run', './dev/bundler.js'],
                         cwd: process.cwd(),
                         stdout: 'inherit',
                         env: {
@@ -424,8 +392,8 @@ function handleFiles() {
 globalThis.clients = []
 
 if (mode === 'development') {
-    await generateApp()
     await handleFiles()
+    await generateApp()
     const watcher = fs.watch(path.join(process.cwd() + '/'), { recursive: true })
     let isBuilding = false; // Flag to track build status
 
@@ -479,14 +447,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,
@@ -527,56 +494,29 @@ if (mode == 'development' || mode == 'serve') {
                 style: 'nextjs'
             })
             router.reload()
-            let route = router.match(url.pathname)
+            let route = router.match(url.pathname) 
             if (!route) {
                 return new Response('Not found', { status: 404 })
             }
             let p = route.pathname;
             let base = path.dirname(route.filePath)
             base = base.replace(/\\/g, '/')
-            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'
-                    }
-                })
-            }
+            base = base.replace(path.join(process.cwd() + '/app').replace(/\\/g, '/'), '');
+            base = base.replace(/\\/g, '/').replace(/\/app(\/|$)/, '/dist$1');
+            base = process.cwd() + '/dist/' + base; 
             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}\`)
- 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>
- `, {
+            <script>
+            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()
+                }
+            }
+            </script>
+            `, {
                     headers: {
                         'Content-Type': 'text/html'
                     }
@@ -593,4 +533,4 @@ 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.4",
+    "version": "2.0.6",
     "description": "A simple and powerful JavaScript library for building modern web applications.", 
     "bin": {
         "vaderjs": "./main.js"