vaderjs 1.9.8 → 2.0.0

package/index.ts

@@ -3,6 +3,8 @@ let isClassComponent = function (element) {
   return element.toString().startsWith("class");
 };
 
+
+
  
 
 const memoizes = new Map();
@@ -96,8 +98,11 @@ export const A = (props: {
     if (props.openInNewTab) {
       window.open(props.href, "_blank");
       return void 0;
-    }
-    window.location.href = props.href;
+    }   
+    window.history.pushState({}, "", props.href);
+    window.dispatchEvent(new Event("popstate")); 
+    window.dispatchEvent(new Event("load"));
+    window.location.reload();
     return void 0;
   }
   return e("a", { ...props, onClick: handleClick }, props.children);
@@ -192,7 +197,9 @@ interface SwitchProps {
 export function Switch({ children = [] }: SwitchProps) {
   for (let child of children) {
     if (child.props.when) { 
-      return child
+      return { type: "div", props: {
+        idKey: crypto.randomUUID()
+      }, children: [child] };
     }
   }
   return { type: "div", props: {}, children: [] };
@@ -675,7 +682,7 @@ export class Component {
   }
   toElement() {
     let children = this.render(this.props); 
-    let el = this.parseToElement(children);
+    let el = this.parseToElement(children); 
     el.setAttribute("idKey", this.key);
     return el;
   }

package/main.js

@@ -218,13 +218,12 @@ async function generateApp() {
             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 = []
-            console.log(base)
+            let paramIndexes = [] 
             for (let param in params) {
                 let  routes = base.pathname.split('/')
                 let index = routes.indexOf('[' + param + ']')
                 paramIndexes.push(index)
-            }
+            } 
  
             // dont return
             
@@ -233,7 +232,15 @@ async function generateApp() {
                 `
                       let route = window.location.pathname.split('/').filter(Boolean) 
                       let params = {
-                       ${Object.keys(params).map(p =>  `${p}: route[${paramIndexes[Object.keys(params).indexOf(p)]}]`).join(',\n')}
+                        // 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}
@@ -324,8 +331,7 @@ async function generateApp() {
 
 function handleFiles() {
     return new Promise(async (resolve, reject) => {
-        try {
-            console.log(Glob)
+        try { 
             let glob = new Glob('public/**/*')
             for await (var i of glob.scan()) {
                 let file = i
@@ -546,13 +552,23 @@ if (mode == 'development' || mode == 'serve') {
             if (mode == "development") {
                 return new Response(data + `
             <script>
-            let ws = new WebSocket('ws://localhost:${server.port}')
+            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>
             `, {
                     headers: {

package/package.json

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