vaderjs 1.4.2-jpiml56 → 1.4.2-kml56

package/README.md

@@ -39,8 +39,8 @@ Keyword folders - all files are passed from these folders to the build folder
 
 ```md
 1. pages - used for jsx route files
-2. src  - used for your jsx components / javascript -typescript files
-3. public - used for anything / css / json etc
+2. src  - used for your jsx components / javascript files
+3. public - used for anything 
 ```
 
 
@@ -49,28 +49,18 @@ Keyword folders - all files are passed from these folders to the build folder
 ```ts
 import { defineConfig } from "vaderjs/config"; 
 import cloudflare from "vaderjs/plugins/cloudflare/functions"
-import tailwindcss from "vaderjs/plugins/tailwindcss"
 export default defineConfig({
     target: "web",
     host: {
         hostname: "localhost",
-        provider:'cloudflare' // used for ssg or ssr
+        provider:'cloudflare'
     }, 
     env: {
         PORT: 3000,
         SSR: true,
         apiRoute: "https://api.example.com"
     }, 
-     Router: {
-        tls: {
-            cert: "cert.pem",
-            key: "key.pem"
-        },
-        headers: {
-            "cache-control": "public, max-age=0, must-revalidate"
-        }
-    },
-    plugins: [cloudflare, tailwindcss],
+    plugins: [cloudflare],
 });
 
 ```

package/binaries/Kalix/index.js

@@ -67,7 +67,7 @@ export class HTMLTextNode {
     }
 
     insertBefore(node) {
-        this.nodeValue = `${node.nodeValue}${this.nodeValue}`;
+        this.nodeValue = `${node.toString()}${this.nodeValue}`;
         return this;
     }
 }
@@ -111,7 +111,7 @@ export class HTMLElement {
                     if (key !== 'style' && key !== 'ref' && !key.startsWith('on')) {
                         props += `${key}="${this.props[key]}" `
                     }
-                }  
+                } 
                 let children = this.children
                     .map((child) => {
                         return child.toString();
@@ -155,7 +155,12 @@ export class HTMLElement {
                     .join(""); 
                 return string;
              
-           
+            case "innerText":
+                return this.children
+                    .map((child) => {
+                        return child.toString();
+                    })
+                    .join("");
             default:
                 break;
         }
@@ -182,8 +187,8 @@ export class HTMLElement {
      * @returns {HTMLElement}
      */
      setContent(content) {
-        let textNode = new  HTMLTextNode(content)
-        this.children = [textNode];
+        let textNode = new HTMLTextNode(content);
+        this.children = [textNode]; 
         this.outerHTML = this.toString("outerHTML");
         this.innerHTML = this.toString("innerHTML");
         return this;
@@ -351,7 +356,7 @@ export class HTMLElement {
                     this.textContent = this.toString("innerText");    
                     this.children.forEach((c) => {
                         if (c.children) {
-                            child = c.children.find((child) => { 
+                            child = c.children.find((child) => {
                                 child.outerHTML = child.toString("outerHTML");
                                 child.innerHTML = child.toString("innerHTML");
                                 return child.tagName === selector;
@@ -439,9 +444,6 @@ export class Document {
      * @returns {HTMLElement}
      */
     createElement(nodeData) {
-        if(!nodeData){
-            return new HTMLElement("div", {}, [])
-        }
         if (typeof nodeData === 'string') {
             return new HTMLElement(nodeData, {}, [])
         }
@@ -561,17 +563,7 @@ function handleStyles(styles, nodeEl) {
  */
 export function Element(tag, props = {}, ...children) {
     if(typeof tag === 'function'){
-        let childObj = children.map((child) => {
-            if (child.tagName === "TEXT_ELEMENT") {
-                return new HTMLTextNode(child);
-            }
-            if (child instanceof HTMLElement) {
-                return child;
-            }
-            return new HTMLElement(child.tagName, child.props, child.children);
-        })
-        childObj = childObj[0]
-        let el = tag({...props, children: childObj})
+        let el = tag(props, children)
         return el
     }
     if(props === null){

package/binaries/compiler/main.js

@@ -261,7 +261,7 @@ export async function Compile(){
               }  
               copy = copy.replace(old, newLine)
             break;
-            case !line.includes('import') && line.includes('useState') && !line.includes('let useState') && !line.includes('var useState') && !line.includes('console'):
+            case !line.includes('import') && line.includes('useState') && !line.includes('let useState'): 
             let varType = line.split('[', 1)[0];
             let before =  line.split('useState(')[1].split(',')[0]; 
             let key = line.split('[')[1].split(',')[0]; 
@@ -331,32 +331,27 @@ export async function Compile(){
           old = line; 
           copy = copy.replace(old, newStatereducer);
            break;
-           case line.includes('vaderjs/client') && line.includes('import') || line.includes('vaderjs') && line.includes('import'): 
-            let b4 = line  
-            copy = copy.replace(b4, '')
-          break;
           
-           case line.includes('import') && !line.includes('vaderjs/client') && !line.includes('vaderjs') && !line.includes('import.meta') && !line.includes('import.meta.url') && !line.includes('import.meta.env'): 
-              
-              let filePath = line.split('from')[1].trim().replace(/'/g, '').replace(/"/g, '').replace(';', '').replaceAll('../','').replace(/\\/g, '/')
-              let contents = fs.readFileSync(filePath, 'utf8')
-              // remove default exports
-
-              if(contents.match(/export\s+default\s+/g)){
-                contents = contents.replace(/export\s+default\s+/g, '')
-              }
-              
-              copy = copy.replace(line, contents)
-            
-            break;
-             
+         case line.includes('vaderjs/client') && line.includes('import') || line.includes('vaderjs') && line.includes('import'):
+             let b4 = line
+             let isUsingProvider = config?.host?.provider
+             let replacement = isUsingProvider === 'cloudflare' ? 'remove' : '/src/client.js'
+             if(replacement === 'remove'){
+                copy = copy.replace(b4, '') 
+                break;
+             }
+             let after = line.replace('vaderjs/client',  replacement).replace('vaderjs',  replacement)
+             copy = copy.replace(b4, after)
+           break;
+ 
         }
       }
-     
+      if(!contents.includes('import Element')){ 
+   
+   }
       return copy
   }    
    
-
   
    
    async function gen(){ 
@@ -387,11 +382,9 @@ export async function Compile(){
              'jsxDev':JSON.stringify('this.Element'),
              'jsx':  JSON.stringify('this.Element'),
            }
-       })
-       let contents =  await Bun.file(process.cwd() + file).text() 
-        contents = data.transformSync(await main(contents, file)) 
-        contents = contents.split('\n').filter((line) => !line.includes('vaderjs/client') && !line.includes('vaderjs')).join('\n') 
-        let variables = grabVariables(contents, file) 
+       }).transformSync(await Bun.file(process.cwd() + file).text())  
+        let variables = grabVariables(data, file)
+       let contents = await main(data, file)
         
       variables.forEach((variable) => { 
         contents.split('\n').forEach((line, index) => {
@@ -415,14 +408,10 @@ export async function Compile(){
               fs.mkdirSync(process.cwd() + '/build/pages/' + file.split('/').slice(0, -1).join('/'), { recursive: true })
               file = '/build/pages/' + file.replace('.tsx', '.js').replace('.ts', '.js').replace('.jsx', '.js')
               break;
-            case isUsingProvider === 'vercel': 
-              fs.mkdirSync(process.cwd() + '/build/pages/' + file.split('/').slice(0, -1).join('/'), { recursive: true })
-              file = '/build/pages/' + file.replace('.tsx', '.js').replace('.ts', '.js').replace('.jsx', '.js')
-              break;
             default:
               file = '/build/' + file.replace('./', '').replace('.tsx', '.js').replace('.ts', '.js').replace('.jsx', '.js') 
            }
-        }    
+        }  
         fs.writeFileSync(process.cwd() + file, contents)
 
          
@@ -436,74 +425,6 @@ export async function Compile(){
         await Bun.write(process.cwd() + '/build/src/router.js',  await Bun.file(process.cwd() + '/node_modules/vaderjs/client/runtime/router.js').text())
       }  
     
-      // handle src files
-      const src = new Glob("/src/**/*.{ts,tsx,js,jsx}", {
-        absolute: true,
-        ignore: ["**/node_modules/**"]
-      });
-
-      const publics  = new Glob("/public/**/*", {
-        absolute: true,
-        ignore: ["**/node_modules/**"]
-      })
-      let srcArray = await Array.fromAsync(src.scan())
-      srcArray = srcArray.map((file) => {
-        file = file.replaceAll('\\', '/')
-        file ='./' + file
-        return file
-      })
-
-      for(var file of srcArray){
-        let data =  new Bun.Transpiler({
-          loader: "tsx",
-           tsconfig: {
-             'compilerOptions':{
-               'jsx':'react',
-               'jsxFactory': 'this.Element'
-             }
-           },
-           define:{ 
-             
-             'jsxDev':JSON.stringify('this.Element'),
-             'jsx':  JSON.stringify('this.Element'),
-           }
-       }).transformSync(await Bun.file(process.cwd() + file).text())  
-        let variables = grabVariables(data, file)
-        let contents = await main(data, file)
-        variables.forEach((variable) => { 
-          contents.split('\n').forEach((line, index) => {
-            if(line.includes(variable) && !line.includes('import') && !line.includes('let') && !line.includes('var') && !line.includes('const') 
-            && !line.includes(variable + '()') &&
-            !line.includes('.' + variable) && 
-            // not an occurence like variable1, variable2, variable3 or variabless
-            !line.match(new RegExp(variable + '[0-9]')) && !line.match(new RegExp(variable + '(w+)'))
-            && !line.includes(variable + ':')  
-            ){ 
-              let newLine = line.replaceAll(variable, variable + '()')
-              contents = contents.replace(line, newLine)
-            }
-          });
-        })
-        file = file.split('/src')[1]
-        fs.mkdirSync(process.cwd() + '/build/src/' + file.split('/').slice(0, -1).join('/'), { recursive: true })
-        fs.writeFileSync(process.cwd() +  '/build/src' + file, contents)
-      }
-
-      let publicArray = await Array.fromAsync(publics.scan())
-      publicArray = publicArray.map((file) => {
-        file = file.replaceAll('\\', '/')
-        file ='./' + file
-        return file
-      })
-
-      for(var file of publicArray){
-        file = file.split('/public')[1]
-        fs.mkdirSync(process.cwd() + '/build/public/' + file.split('/').slice(0, -1).join('/'), { recursive: true })
-        let out = `/build/public${file}` 
-        let contents = await Bun.file(process.cwd() + '/public' + file).text()
-        fs.writeFileSync(process.cwd() + out, contents)
-         
-      }
        
       resolve()
     })

package/binaries/watcher/hmr.js

@@ -1,5 +1,4 @@
 import { watch } from 'fs'
-import fs from 'fs'
 globalThis.hasLogged = false
 export function watchDir(cwd, _){
     process.chdir(cwd)
@@ -13,11 +12,7 @@ export function watchDir(cwd, _){
     let paths = ['src', 'pages', 'public', 'routes', 'vader.config.ts']
     for(var i in paths){
         let path = paths[i]
-        if(!fs.existsSync(process.cwd() + '/' + path)){ 
-            continue;
-        }
         watch(process.cwd() + '/' + path, { recursive: true, absolute:true }, (event, filename) => { 
-            if(!filename.endsWith('.ts') && !filename.endsWith('.tsx') && !filename.endsWith('.js') && !filename.endsWith('.jsx')) return
            if(filename && !filename.includes('node_modules') && !globalThis.hasLogged){ 
             console.log(`\x1b[36mwait \x1b[0m  - compiling (client and server)`)
                 globalThis.hasLogged = true