#16 issue/router #18

Merged
SethTrowbridge merged 6 commits from issue/router into master 2023-04-18 19:39:56 -04:00
3 changed files with 18 additions and 32 deletions
Showing only changes of commit 4d3760d92c - Show all commits

View File

@ -6,6 +6,7 @@ export default ()=>
const [countGet, countSet] = React.useState(1); const [countGet, countSet] = React.useState(1);
return <div class="p-4 text-red-500"> return <div class="p-4 text-red-500">
<Iso.Metas title="Component!"/> <Iso.Metas title="Component!"/>
<button className="p-4 bg-red-500 text-white" onClick={e=>{countSet(countGet+1)}}>{countGet}</button>
Component!!! Component!!!
</div>; </div>;
}; };

View File

@ -8,6 +8,7 @@
"@eno/iso": "http://localhost:4507/lib/iso.tsx" "@eno/iso": "http://localhost:4507/lib/iso.tsx"
}, },
"tasks": { "tasks": {
"host": "deno run -A --unstable https://deno.land/std@0.181.0/http/file_server.ts",
"dev": "deno run -A --unstable --reload=http://localhost:4507/ --no-lock --config=deno.json 'http://localhost:4507/server.tsx?reload=1'" "dev": "deno run -A --unstable --reload=http://localhost:4507/ --no-lock --config=deno.json 'http://localhost:4507/server.tsx?reload=1'"
} }
} }

View File

@ -6,6 +6,13 @@ import * as Twind from "https://esm.sh/@twind/core@1.1.3";
import React, {JSX, createElement as h} from "react"; import React, {JSX, createElement as h} from "react";
import * as Iso from "@eno/iso"; import * as Iso from "@eno/iso";
let hosted = import.meta.resolve("./");
const Path = {
Hosted:hosted.substring(0, hosted.length-1),
Active:`file://${Deno.cwd().replaceAll("\\", "/")}`
};
console.log(Path);
const Transpiled = new Map(); const Transpiled = new Map();
const Transpileable =(inFilePath:string):boolean=> const Transpileable =(inFilePath:string):boolean=>
{ {
@ -33,19 +40,6 @@ const Transpile =async(inCode:string, inKey:string):Promise<string>=>
return transpile.code; return transpile.code;
}; };
type Transpiler = (inPath:string, inKey:string, inCheck?:boolean)=>Promise<string>; type Transpiler = (inPath:string, inKey:string, inCheck?:boolean)=>Promise<string>;
const TranspileFS:Transpiler =async(inPath, inKey, inCheck)=>
{
if(inCheck)
{
const cached = Transpiled.get(inKey);
if(cached)
{
return cached;
}
}
const body = await Deno.readTextFile(inPath);
return Transpile(body, inKey);
};
const TranspileURL:Transpiler =async(inPath, inKey, inCheck)=> const TranspileURL:Transpiler =async(inPath, inKey, inCheck)=>
{ {
if(inCheck) if(inCheck)
@ -56,8 +50,7 @@ const TranspileURL:Transpiler =async(inPath, inKey, inCheck)=>
return cached; return cached;
} }
} }
const path = import.meta.resolve(`.${inPath}`); let body = await fetch(inPath);
let body = await fetch(path);
let text = await body.text(); let text = await body.text();
return Transpile(text, inKey); return Transpile(text, inKey);
}; };
@ -68,8 +61,8 @@ type ImportMap = {imports?:Record<string, string>, importMap?:string};
let ImportObject:ImportMap = {}; let ImportObject:ImportMap = {};
try try
{ {
const confDeno = await Deno.readTextFile(Deno.cwd()+"/deno.json"); const confDeno = await fetch(`${Path.Active}/deno.json`);
const confDenoParsed:ImportMap = JSON.parse(confDeno); const confDenoParsed:ImportMap = await confDeno.json();
if(confDenoParsed.importMap) if(confDenoParsed.importMap)
{ {
try try
@ -147,7 +140,6 @@ catch(e)
Deno.serve({ port: Deno.args[0]||3000 }, async(_req:Request) => Deno.serve({ port: Deno.args[0]||3000 }, async(_req:Request) =>
{ {
const url:URL = new URL(_req.url); 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 pathParts = url.pathname.substring(1, url.pathname.endsWith("/") ? url.pathname.length-1 : url.pathname.length).split("/");
const pathLast = pathParts[pathParts.length-1]; const pathLast = pathParts[pathParts.length-1];
const pathExt:string|undefined = pathLast.split(".")[1]; const pathExt:string|undefined = pathLast.split(".")[1];
@ -194,12 +186,11 @@ Deno.serve({ port: Deno.args[0]||3000 }, async(_req:Request) =>
type = `application/javascript`; type = `application/javascript`;
if(isLib) if(isLib)
{ {
body = await TranspileURL(url.pathname, url.pathname, true); body = await TranspileURL(Path.Hosted+url.pathname, url.pathname, true);
} }
else if(!url.searchParams.get("reload")) else if(!url.searchParams.get("reload"))
{ {
const path = `file://${Deno.cwd().replaceAll("\\", "/")+url.pathname}`; const imp = await import(Path.Active+url.pathname);
const imp = await import(path);
const members = []; const members = [];
for( const key in imp ) { members.push(key); } for( const key in imp ) { members.push(key); }
body = body =
@ -218,24 +209,17 @@ FileListen("${url.pathname}", reloadHandler);`;
} }
else else
{ {
body = await TranspileFS(fsPath, url.pathname, true); body = await TranspileURL(Path.Active+url.pathname, url.pathname, true);
} }
} }
// serve static media // serve static media
else if( pathExt ) else if( pathExt )
{ {
type = MIME.typeByExtension(pathExt) || "text/html"; type = MIME.typeByExtension(pathExt) || "text/html";
if(isLib) const _fetch = await fetch((isLib ? Path.Hosted : Path.Active)+url.pathname);
{
const _fetch = await fetch(import.meta.resolve(`.${url.pathname}`));
body = await _fetch.text(); body = await _fetch.text();
} }
else else
{
body = await Deno.readFile(fsPath);
}
}
else
{ {
const results = Twind.extract(SSR(<App/>), TwindInst); const results = Twind.extract(SSR(<App/>), TwindInst);
@ -289,7 +273,7 @@ const ProcessFiles =debounce(async()=>
if(action != "remove") if(action != "remove")
{ {
await TranspileFS(path, key, false); await TranspileURL(Path.Active+key, key, false);
console.log(` ...cached "${key}"`); console.log(` ...cached "${key}"`);
SocketsBroadcast(key); SocketsBroadcast(key);
} }