From 0a5d96ce7ab594c469fb98c002ff5cea577fa0ee Mon Sep 17 00:00:00 2001
From: Seth Trowbridge <seth111@gmail.com>
Date: Fri, 7 Apr 2023 21:36:51 -0400
Subject: [PATCH] route fixes #12

---
 deno.json  |  1 -
 server.tsx | 27 +++++++++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/deno.json b/deno.json
index 6ca1e43..14eb980 100644
--- a/deno.json
+++ b/deno.json
@@ -12,7 +12,6 @@
     "tasks":
     {
         "install": "deno install -f -A --unstable --no-lock -n eno server.tsx",
-        "run": "deno run -A --unstable --no-lock server.tsx",
         "host": "deno run -A --unstable https://deno.land/std@0.181.0/http/file_server.ts",
         "example": "cd example && pwd && deno task dev"
     }
diff --git a/server.tsx b/server.tsx
index 1e7380a..f07399e 100644
--- a/server.tsx
+++ b/server.tsx
@@ -100,7 +100,7 @@ try
         if(importReact)
         {
             ImportObject.imports["react-original"] = importReact;
-            ImportObject.imports["react"] = `./${LibPath}/react.tsx`;
+            ImportObject.imports["react"] = `/${LibPath}/react.tsx`;
         }
         else
         {
@@ -120,18 +120,23 @@ try
         const importIso = ImportObject.imports["@eno/iso"];
         if(importIso)
         {
-            ImportObject.imports["@eno/iso"] = `./${LibPath}/iso.tsx`;
+            ImportObject.imports["@eno/iso"] = `/${LibPath}/iso.tsx`;
         }
         else
         {
 
         }
+        Object.entries(ImportObject.imports).forEach(([key, value])=>{
+            if(value.startsWith("./") && ImportObject.imports)
+            {
+                ImportObject.imports[key] = value.substring(1);
+            }
+        })
     }
     else
     {
         console.log(`No "imports" found in configuration`);
     }
-
 }
 catch(e)
 {
@@ -143,6 +148,11 @@ Deno.serve({ port: Deno.args[0]||3000 }, async(_req:Request) =>
 {
     const url:URL = new URL(_req.url);
     const fsPath = Deno.cwd()+url.pathname;
+    const pathParts = url.pathname.substring(1, url.pathname.endsWith("/") ? url.pathname.length-1 : url.pathname.length).split("/");
+    const pathLast = pathParts[pathParts.length-1];
+    const pathExt:string|undefined = pathLast.split(".")[1];
+
+    console.log(pathParts, pathLast, pathExt);
 
     console.log(`Request for "${url.pathname}"...`);
 
@@ -177,10 +187,9 @@ Deno.serve({ port: Deno.args[0]||3000 }, async(_req:Request) =>
         let type = `text/html`;
         let body:BodyInit = ``;
 
-        const isLib = url.pathname.startsWith(`/${LibPath}/`)
+        const isLib = url.pathname.startsWith(`/${LibPath}/`);
 
-        // serve .tsx .jsx .ts .js
-        if(Transpileable(url.pathname))
+        if(Transpileable(pathLast))
         {
             type = `application/javascript`;
             if(isLib)
@@ -190,8 +199,6 @@ Deno.serve({ port: Deno.args[0]||3000 }, async(_req:Request) =>
             else if(!url.searchParams.get("reload"))
             {
                 const path = `file://${Deno.cwd().replaceAll("\\", "/")+url.pathname}`;
-                console.log(path);
-
                 const imp = await import(path);
                 const members = [];
                 for( const key in imp ) { members.push(key); }
@@ -215,9 +222,9 @@ FileListen("${url.pathname}", reloadHandler);`;
             }
         }
         // serve static media
-        else if( url.pathname.endsWith("/") === false)
+        else if( pathExt )
         {
-            type = MIME.typeByExtension(url.pathname.substring(url.pathname.lastIndexOf("."))) || "text/html";
+            type = MIME.typeByExtension(pathExt) || "text/html";
             if(isLib)
             {
                 const _fetch = await fetch(import.meta.resolve(`.${url.pathname}`));