Compare commits
No commits in common. "master" and "issue/iso-components" have entirely different histories.
master
...
issue/iso-
23
.vscode/launch.json
vendored
23
.vscode/launch.json
vendored
@ -1,23 +0,0 @@
|
||||
{
|
||||
// Use IntelliSense to learn about possible attributes.
|
||||
// Hover to view descriptions of existing attributes.
|
||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"request": "launch",
|
||||
"name": "Launch Program",
|
||||
"type": "node",
|
||||
"program": "${workspaceFolder}/server.tsx",
|
||||
"cwd": "${workspaceFolder}",
|
||||
"runtimeExecutable": "deno.exe",
|
||||
"runtimeArgs": [
|
||||
"run",
|
||||
"--unstable",
|
||||
"--inspect-wait",
|
||||
"--allow-all"
|
||||
],
|
||||
"attachSimplePort": 9229
|
||||
}
|
||||
]
|
||||
}
|
||||
52
deno.lock
52
deno.lock
@ -1,52 +0,0 @@
|
||||
{
|
||||
"version": "2",
|
||||
"remote": {
|
||||
"https://deno.land/std@0.151.0/async/debounce.ts": "564273ef242bcfcda19a439132f940db8694173abffc159ea34f07d18fc42620",
|
||||
"https://deno.land/std@0.180.0/media_types/_db.ts": "7606d83e31f23ce1a7968cbaee852810c2cf477903a095696cdc62eaab7ce570",
|
||||
"https://deno.land/std@0.180.0/media_types/_util.ts": "916efbd30b6148a716f110e67a4db29d6949bf4048997b754415dd7e42c52378",
|
||||
"https://deno.land/std@0.180.0/media_types/content_type.ts": "c682589a0aeb016bfed355cc1ed6fbb3ead2ea48fc0000ac5de6a5730613ad1c",
|
||||
"https://deno.land/std@0.180.0/media_types/extension.ts": "7a4ef2813d7182f724a941f38161525996e4a67abc3cf6a0f9bc2168d73a0f0e",
|
||||
"https://deno.land/std@0.180.0/media_types/extensions_by_type.ts": "4358023feac696e6e9d49c0f1e76a859f03ca254df57812f31f8536890c3a443",
|
||||
"https://deno.land/std@0.180.0/media_types/format_media_type.ts": "1e35e16562e5c417401ffc388a9f8f421f97f0ee06259cbe990c51bae4e6c7a8",
|
||||
"https://deno.land/std@0.180.0/media_types/get_charset.ts": "8be15a1fd31a545736b91ace56d0e4c66ea0d7b3fdc5c90760e8202e7b4b1fad",
|
||||
"https://deno.land/std@0.180.0/media_types/mod.ts": "d3f0b99f85053bc0b98ecc24eaa3546dfa09b856dc0bbaf60d8956d2cdd710c8",
|
||||
"https://deno.land/std@0.180.0/media_types/parse_media_type.ts": "bed260d868ea271445ae41d748e7afed9b5a7f407d2777ead08cecf73e9278de",
|
||||
"https://deno.land/std@0.180.0/media_types/type_by_extension.ts": "6076a7fc63181d70f92ec582fdea2c927eb2cfc7f9c9bee9d6add2aca86f2355",
|
||||
"https://deno.land/std@0.180.0/media_types/vendor/mime-db.v1.52.0.ts": "6925bbcae81ca37241e3f55908d0505724358cda3384eaea707773b2c7e99586",
|
||||
"https://deno.land/std@0.185.0/_util/asserts.ts": "178dfc49a464aee693a7e285567b3d0b555dc805ff490505a8aae34f9cfb1462",
|
||||
"https://deno.land/std@0.185.0/json/common.ts": "ecd5e87d45b5f0df33238ed8b1746e1444da7f5c86ae53d0f0b04280f41a25bb",
|
||||
"https://deno.land/std@0.185.0/jsonc/mod.ts": "b88dce28eb3645667caa856538ae2fe87af51410822544a0b45a4177ef3bd7dd",
|
||||
"https://deno.land/std@0.185.0/jsonc/parse.ts": "2910e33bc7c3b243e3b6f3a39ce4d6ca84337b277a8df6f2ad2d9e4adbcddc08",
|
||||
"https://deno.land/x/denoflate@1.2.1/mod.ts": "f5628e44b80b3d80ed525afa2ba0f12408e3849db817d47a883b801f9ce69dd6",
|
||||
"https://deno.land/x/denoflate@1.2.1/pkg/denoflate.js": "b9f9ad9457d3f12f28b1fb35c555f57443427f74decb403113d67364e4f2caf4",
|
||||
"https://deno.land/x/denoflate@1.2.1/pkg/denoflate_bg.wasm.js": "d581956245407a2115a3d7e8d85a9641c032940a8e810acbd59ca86afd34d44d",
|
||||
"https://deno.land/x/esbuild@v0.17.4/mod.d.ts": "dc279a3a46f084484453e617c0cabcd5b8bd1920c0e562e4ea02dfc828c8f968",
|
||||
"https://deno.land/x/esbuild@v0.17.4/mod.js": "28f92694d79c8ef313e7ead7bb0e915551a805c3ad14dd2af24bbb0872e38c0d",
|
||||
"https://esm.sh/@twind/core@1.1.3": "022193fe0f683445f35b232bf4a105d2c2aa48cc035332b4939d4f795c7ed48f",
|
||||
"https://esm.sh/preact-ssr-prepass@1.2.0": "2ad461cd2ebd0ccb3b0345102e51f94923084f089b85805da5ca97d0b8db77d2",
|
||||
"https://esm.sh/preact@10.13.2/compat": "1cf68e0c8c6c84b60d42f30665403b67229c16ff5206824709b19df60ba9cdc3",
|
||||
"https://esm.sh/stable/preact@10.13.2/deno/compat.js": "3151a948abd84aa75dfc9e57733da7e1a45fff7a25de58c7b6025b923874b508",
|
||||
"https://esm.sh/stable/preact@10.13.2/deno/hooks.js": "c7a8e703bcbc6a05949f329b618c33d5d1ea5fee113ddcea44ff0f527af8556f",
|
||||
"https://esm.sh/stable/preact@10.13.2/deno/preact.mjs": "365fab897381f4f403f859c5d12939084560545567108cc90dae901bbe892578",
|
||||
"https://esm.sh/v113/preact-render-to-string@6.0.2": "9e27e8724b3e53ba3d006146efa7ac0d6764672e4cd7a2fb5738412526c2b16d",
|
||||
"https://esm.sh/v113/preact-render-to-string@6.0.2/deno/preact-render-to-string.mjs": "09ead691b3745189a4171a6ee0948592c7a862b1bf1a97fe651fb34f88eabe3b",
|
||||
"https://esm.sh/v113/preact-render-to-string@6.0.2/src/index.d.ts": "3df00ff7e5f6dc9d2d6b944a88c2e541b098c0e559bd3a918732f3aa35acf1af",
|
||||
"https://esm.sh/v113/preact@10.13.2/src/index.d.ts": "65398710de6aa0a07412da79784e05e6e96763f51c7c91b77344d2d0af06385c",
|
||||
"https://esm.sh/v113/preact@10.13.2/src/jsx.d.ts": "9ac9b82c199fa7b04748807d750eba1a106c0be52041b8617416f88d6fc0a257",
|
||||
"https://esm.sh/v115/@twind/core@1.1.3/es2022/core.mjs": "937e906c390266871215f71372af7fadf98274fb47670a7e1e8cf98e775357a8",
|
||||
"https://esm.sh/v115/@twind/preset-autoprefix@1.0.7/es2022/preset-autoprefix.mjs": "082486172119c516f5daf83cd178175302455fab8ed550a3cb58630864f0c4e3",
|
||||
"https://esm.sh/v115/@twind/preset-tailwind@1.1.4/es2022/preset-tailwind.mjs": "7c561cfa2c639b259c390d4412f88b2f0675431b995261f1a5ef0916f1b9b48b",
|
||||
"https://esm.sh/v115/style-vendorizer@2.2.3/es2022/style-vendorizer.mjs": "b0f813226f7c4a30e1742087311243bbb021ef9b201e064932fce1122625b29e",
|
||||
"https://esm.sh/v118/preact-ssr-prepass@1.2.0/deno/preact-ssr-prepass.mjs": "302a0da48c6fb2232c6f713f17957e409ec909ccb8f5a4074065eb0ca7553ee3",
|
||||
"https://esm.sh/v118/preact-ssr-prepass@1.2.0/typings/index.d.ts": "68d54a22a76ef21fd95266ba4d8c71b3228d5e7769baf899998d5348018671c4",
|
||||
"https://esm.sh/v118/preact@10.13.2/compat/src/index.d.ts": "d02f015638a40e32649151e011cfda7b520d66f7fbd3c12a28fa03de2a5e1421",
|
||||
"https://esm.sh/v118/preact@10.13.2/compat/src/suspense-list.d.ts": "b8e274324392157ce476ef3a48ae215c9f7003b08525d140645f19eab20d1948",
|
||||
"https://esm.sh/v118/preact@10.13.2/compat/src/suspense.d.ts": "81f5266e0977a94347505d11b8103024211f2b4f3b2eb2aa276a10d8fd169e65",
|
||||
"https://esm.sh/v118/preact@10.13.2/hooks/src/index.d.ts": "5c29febb624fc25d71cb0e125848c9b711e233337a08f7eacfade38fd4c14cc3",
|
||||
"https://esm.sh/v118/preact@10.13.2/src/index.d.ts": "65398710de6aa0a07412da79784e05e6e96763f51c7c91b77344d2d0af06385c",
|
||||
"https://esm.sh/v118/preact@10.13.2/src/jsx.d.ts": "9ac9b82c199fa7b04748807d750eba1a106c0be52041b8617416f88d6fc0a257",
|
||||
"https://esm.sh/v119/@twind/core@1.1.3/core.d.ts": "87836d90ff43c5bd5cbb53df7adbcad9d9515fae21f8a31d34203027b7d75d29",
|
||||
"https://esm.sh/v119/@twind/core@1.1.3/deno/core.mjs": "9a65476bdc46aeb10894c4496fbfbc863e45ffebf43e58d6320017f847aca7b2",
|
||||
"https://esm.sh/v119/csstype@3.1.2/index.d.ts": "4c68749a564a6facdf675416d75789ee5a557afda8960e0803cf6711fa569288"
|
||||
}
|
||||
}
|
||||
@ -1,66 +1,22 @@
|
||||
import TWPreTail from "https://esm.sh/@twind/preset-tailwind@1.1.4";
|
||||
import TWPreAuto from "https://esm.sh/@twind/preset-autoprefix@1.0.7";
|
||||
import React from "react";
|
||||
import Component from "./deep/component.tsx";
|
||||
import * as Iso from "@eno/iso";
|
||||
|
||||
/*
|
||||
const delay =(inMS:number)=>
|
||||
{
|
||||
return new Promise((accept)=>
|
||||
{
|
||||
setTimeout(()=>
|
||||
{
|
||||
accept({default:()=>
|
||||
{
|
||||
return <h1>loooooool</h1>;
|
||||
}});
|
||||
}, inMS);
|
||||
});
|
||||
}
|
||||
const LOL = React.lazy(()=>delay(3000));
|
||||
*/
|
||||
|
||||
const Comp = React.lazy(()=>import("./deep/component.tsx"));
|
||||
|
||||
|
||||
export default ()=>
|
||||
{
|
||||
|
||||
const [stack] = React.useContext(Iso.Meta.Context);
|
||||
|
||||
console.log(Iso.Meta);
|
||||
const [countGet, countSet] = React.useState(1);
|
||||
return <div class="p-4 font-sans">
|
||||
<Iso.Meta.Metas title="Main Page!" description="its great"/>
|
||||
<nav class="p-4">
|
||||
<a class="text-red-500" href="/">Home</a>
|
||||
<a href="/about">About</a>
|
||||
</nav>
|
||||
|
||||
<h1 class="my-2 font(bold serif) text(3xl)">Title!!</h1>
|
||||
<h2>suspended:</h2>
|
||||
<React.Suspense fallback={<div>Loading!</div>}>
|
||||
<Comp/>
|
||||
</React.Suspense>
|
||||
<Iso.Switch>
|
||||
<Iso.Case value="/">
|
||||
<p>thing1</p>
|
||||
<p>thing2</p>
|
||||
</Iso.Case>
|
||||
<Iso.Case value="page">
|
||||
<Iso.Switch>
|
||||
<Iso.Case value="about-us">
|
||||
<>
|
||||
<Iso.Meta.Metas title="About US" concatListed=" | "/>
|
||||
About us!
|
||||
</>
|
||||
</Iso.Case>
|
||||
<Iso.Case default>sorry no page</Iso.Case>
|
||||
</Iso.Switch>
|
||||
</Iso.Case>
|
||||
<Iso.Case value="lol/idk">lol/idk</Iso.Case>
|
||||
<Iso.Case default>
|
||||
<>
|
||||
<Iso.Meta.Metas description="a 404 has occurred"/>
|
||||
<p>404!</p>
|
||||
</>
|
||||
</Iso.Case>
|
||||
</Iso.Switch>
|
||||
<Iso.Metas title="Main Page!"/>
|
||||
<h1 class="my-2 font(bold serif) text(2xl)">Title!!</h1>
|
||||
<h2>subtitle</h2>
|
||||
<Component/>
|
||||
</div>;
|
||||
};
|
||||
};
|
||||
|
||||
export const CSS = {
|
||||
presets: [TWPreTail(), TWPreAuto()],
|
||||
hash:false
|
||||
};
|
||||
|
||||
@ -4,20 +4,8 @@ import * as Iso from "@eno/iso";
|
||||
export default ()=>
|
||||
{
|
||||
const [countGet, countSet] = React.useState(1);
|
||||
const [routeGet, routeSet] = Iso.Router.Consumer();
|
||||
|
||||
type CatFact = {fact:string, length:number}|undefined;
|
||||
const [Data, Updating] = Iso.Fetch.Use(`https://catfact.ninja/fact`);
|
||||
|
||||
|
||||
console.log("component.tsx render!!")
|
||||
|
||||
return <div class="p-4 text-red-500">
|
||||
<Iso.Meta.Metas title="Component!" description="components can set metas"/>
|
||||
Component Route is: {routeGet.Path.toString()}
|
||||
<button className="p-4 bg-green-500 text-white" onClick={e=>{countSet(countGet+1); routeSet(["lol", "idk"], {count:countGet+1});}}>{countGet}</button>
|
||||
<a href="/page/about-us" className="p-2 text(lg blue-500) font-bold">a link</a>
|
||||
<p>Data:{Data && (Data as CatFact)?.fact}</p>
|
||||
<p>Status:{Updating?'loading':'done'}</p>
|
||||
<Iso.Metas title="Component!"/>
|
||||
Component!!!
|
||||
</div>;
|
||||
};
|
||||
@ -2,12 +2,12 @@
|
||||
"compilerOptions": {"lib": ["deno.window", "dom"]},
|
||||
"imports":
|
||||
{
|
||||
"react": "https://esm.sh/stable/preact@10.13.2/compat",
|
||||
"react": "https://esm.sh/preact@10.13.2/compat",
|
||||
"@deep/": "./deep/",
|
||||
"@eno/app": "./app.tsx",
|
||||
"@eno/iso": "http://localhost:4507/lib/iso.tsx"
|
||||
},
|
||||
"tasks": {
|
||||
"dev": "deno run -A --unstable --reload=http://localhost:4507/ --no-lock app.tsx --dev",
|
||||
"run": "deno run -A --unstable --reload=http://localhost:4507/ --no-lock app.tsx"
|
||||
"dev": "deno run -A --unstable --reload=http://localhost:4507/ --no-lock --config=deno.json 'http://localhost:4507/server.tsx?reload=1'"
|
||||
}
|
||||
}
|
||||
@ -1,8 +1,7 @@
|
||||
|
||||
let reloads = 0;
|
||||
const listeners = new Map() as Map<string, Array<(module:unknown)=>void>>;
|
||||
const socket:WebSocket = new WebSocket("ws://"+document.location.host);
|
||||
socket.addEventListener('message', (event) =>
|
||||
new WebSocket("ws://"+document.location.host).addEventListener('message', (event) =>
|
||||
{
|
||||
let handlers = listeners.get(event.data)??[];
|
||||
reloads++;
|
||||
@ -14,7 +13,6 @@ socket.addEventListener('message', (event) =>
|
||||
})
|
||||
).then(()=>HMR.update());
|
||||
});
|
||||
const socketTimer = setInterval(()=>{socket.send("ping")}, 1000);
|
||||
|
||||
export const FileListen =(inPath:string, inHandler:()=>void)=>
|
||||
{
|
||||
|
||||
425
lib/iso.tsx
425
lib/iso.tsx
@ -1,409 +1,34 @@
|
||||
import TWPreTail from "https://esm.sh/v115/@twind/preset-tailwind@1.1.4/es2022/preset-tailwind.mjs";
|
||||
import TWPreAuto from "https://esm.sh/v115/@twind/preset-autoprefix@1.0.7/es2022/preset-autoprefix.mjs";
|
||||
import React, { JSX } from "react";
|
||||
import React from "react";
|
||||
|
||||
export const CSS = {
|
||||
presets: [TWPreTail(), TWPreAuto()],
|
||||
hash:false
|
||||
};
|
||||
|
||||
if(!window.innerWidth && !Deno.mainModule.endsWith("server.tsx"))
|
||||
{
|
||||
import(import.meta.resolve("../../server.tsx")).then(()=>{console.log("...imported!");});
|
||||
}
|
||||
|
||||
type MetasInputs = { [Property in MetaKeys]?: string };
|
||||
type MetasModeArgs = {concatListed?:string; dropUnlisted?:boolean};
|
||||
type MetasStackItem = MetasModeArgs&MetasInputs&{id:string, depth:number}
|
||||
type Meta = {title:string, description:string, keywords:string, image:string, canonical:string }
|
||||
type MetaKeys = keyof Meta;
|
||||
export const Meta:Meta = {
|
||||
title:"",
|
||||
description:"",
|
||||
keywords:"",
|
||||
image:"",
|
||||
canonical:""
|
||||
};
|
||||
|
||||
export const Meta =
|
||||
type MetasInputs = { [Property in MetaKeys]?: string };
|
||||
export const Metas =(props:{concatListed?:boolean; dropUnlisted?:boolean}&MetasInputs):null=>
|
||||
{
|
||||
Stack:[] as MetasStackItem[],
|
||||
Meta: {
|
||||
title:"",
|
||||
description:"",
|
||||
keywords:"",
|
||||
image:"",
|
||||
canonical:""
|
||||
} as Meta,
|
||||
ComputeFinal(inStack:MetasStackItem[], inStart=0)
|
||||
const additive = props.concatListed ? (key:MetaKeys, value:string)=> Meta[key] += value : (key:MetaKeys, value:string)=> Meta[key] = value;
|
||||
const subtractive = props.dropUnlisted ? (key:MetaKeys)=> Meta[key] = "" : (key:MetaKeys)=> {};
|
||||
|
||||
Object.keys(Meta).forEach((key)=>{
|
||||
const metaKey = key as MetaKeys;
|
||||
const propValue = props[metaKey]||"";
|
||||
propValue ? additive(metaKey, propValue) : subtractive(metaKey);
|
||||
})
|
||||
|
||||
console.log(`rendering metas`, Meta)
|
||||
|
||||
if(window.innerWidth)
|
||||
{
|
||||
const seed = {
|
||||
title:"",
|
||||
description:"",
|
||||
keywords:"",
|
||||
image:"",
|
||||
canonical:""
|
||||
};
|
||||
if(inStack.length>0)
|
||||
{
|
||||
let final = {...seed, ...inStack[0]};
|
||||
for(let i=inStart+1; i<inStack.length; i++)
|
||||
{
|
||||
const curr = inStack[i];
|
||||
Object.keys(seed).forEach(key=>
|
||||
{
|
||||
const lookup = key as MetaKeys
|
||||
const valPrev = final[lookup];
|
||||
const valCurr = curr[lookup];
|
||||
|
||||
if(valPrev && !valCurr)
|
||||
{
|
||||
final[lookup] = curr.dropUnlisted ? "" : valPrev;
|
||||
}
|
||||
else if(valPrev && valCurr)
|
||||
{
|
||||
final[lookup] = curr.concatListed ? valPrev + curr.concatListed + valCurr : valCurr
|
||||
}
|
||||
else
|
||||
{
|
||||
final[lookup] = valCurr||"";
|
||||
}
|
||||
});
|
||||
}
|
||||
return final;
|
||||
}
|
||||
else
|
||||
{
|
||||
return seed;
|
||||
}
|
||||
},
|
||||
Context: React.createContext([[], ()=>{}] as [Get:MetasStackItem[], Set:React.StateUpdater<MetasStackItem[]>]),
|
||||
Provider({children}:{children:Children})
|
||||
{
|
||||
const binding = React.useState([] as MetasStackItem[]);
|
||||
|
||||
type MetaDOM = {description:NodeListOf<Element>, title:NodeListOf<Element>, image:NodeListOf<Element>, url:NodeListOf<Element>};
|
||||
|
||||
const refElements = React.useRef(null as null | MetaDOM);
|
||||
|
||||
React.useEffect(()=>
|
||||
{
|
||||
refElements.current = {
|
||||
description:document.querySelectorAll(`head > meta[name$='description']`),
|
||||
title:document.querySelectorAll(`head > meta[name$='title']`),
|
||||
image:document.querySelectorAll(`head > meta[name$='image']`),
|
||||
url:document.querySelectorAll(`head > link[rel='canonical']`)
|
||||
};
|
||||
}, []);
|
||||
|
||||
React.useEffect(()=>
|
||||
{
|
||||
if(refElements.current)
|
||||
{
|
||||
const final = Meta.ComputeFinal(binding[0]);
|
||||
|
||||
refElements.current.url.forEach(e=>e.setAttribute("content", final.canonical||""));
|
||||
document.title = final.title;
|
||||
refElements.current.title.forEach(e=>e.setAttribute("content", final.title||""));
|
||||
refElements.current.image.forEach(e=>e.setAttribute("content", final.image||""));
|
||||
refElements.current.description.forEach(e=>e.setAttribute("content", final.description||""));
|
||||
}
|
||||
});
|
||||
return <Meta.Context.Provider value={binding}>{children}</Meta.Context.Provider>;
|
||||
},
|
||||
Metas({concatListed=undefined, dropUnlisted=false, ...props}:MetasModeArgs&MetasInputs):null
|
||||
{
|
||||
const id = React.useId();
|
||||
const [, metasSet] = React.useContext(Meta.Context);
|
||||
const {depth} = React.useContext(SwitchContext);
|
||||
|
||||
React.useEffect(()=>{
|
||||
metasSet((m)=>{
|
||||
console.log(`adding meta`, props, depth);
|
||||
const clone = [...m];
|
||||
let i;
|
||||
for(i=clone.length-1; i>-1; i--)
|
||||
{
|
||||
if(clone[i].depth <= depth)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
clone.splice(i+1, 0, {id, depth, concatListed, dropUnlisted, ...props});
|
||||
return clone;
|
||||
});
|
||||
return ()=>
|
||||
{
|
||||
metasSet((m)=>{
|
||||
const clone = [...m];
|
||||
const ind = clone.findIndex(i=>i.id === id);
|
||||
if(ind > -1)
|
||||
{
|
||||
console.log(`removing meta`, props, depth);
|
||||
clone.splice(ind, 1);
|
||||
}
|
||||
return clone;
|
||||
});
|
||||
|
||||
};
|
||||
}, []);
|
||||
|
||||
React.useEffect(()=>{
|
||||
metasSet((m)=>{
|
||||
const clone = [...m];
|
||||
const ind = clone.findIndex(i=>i.id === id);
|
||||
if(ind > -1)
|
||||
{
|
||||
console.log(`updating meta`, props, depth);
|
||||
clone[ind] = {...clone[ind], ...props};
|
||||
}
|
||||
return clone;
|
||||
});
|
||||
}, Object.keys(props).map( (key) => props[key as MetaKeys] ));
|
||||
|
||||
if(!window.innerWidth && props.title)
|
||||
{
|
||||
Meta.Stack.push({id, depth, concatListed, dropUnlisted, ...props});
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
export type Children = string | number | React.JSX.Element | React.JSX.Element[];
|
||||
|
||||
type RoutePath = Array<string>;
|
||||
type RouteParams = Record<string, string|number|boolean>;
|
||||
type RouteState = {URL:URL, Path:RoutePath, Params:RouteParams, Anchor:string};
|
||||
type RouteContext = [Route:RouteState, Update:(inPath?:RoutePath, inParams?:RouteParams, inAnchor?:string)=>void];
|
||||
type RouteProps = {children:Children, url?:URL };
|
||||
export const Router = {
|
||||
Parse(url:URL):RouteState
|
||||
{
|
||||
const Path = url.pathname.substring(1, url.pathname.endsWith("/") ? url.pathname.length-1 : url.pathname.length).split("/");
|
||||
const Params:RouteParams = {};
|
||||
new URLSearchParams(url.search).forEach((k, v)=> Params[k] = v);
|
||||
const Anchor = url.hash.substring(1);
|
||||
return {URL:url, Path, Params, Anchor} as RouteState;
|
||||
},
|
||||
Context:React.createContext([{URL:new URL("https://original.route/"), Path:[], Params:{}, Anchor:""}, ()=>{}] as RouteContext),
|
||||
Provider(props:RouteProps)
|
||||
{
|
||||
const [routeGet, routeSet] = React.useState(Router.Parse(props.url || new URL(document.location.href)));
|
||||
const [dirtyGet, dirtySet] = React.useState(true);
|
||||
|
||||
const routeUpdate:RouteContext[1] =(inPath, inParams, inAnchor)=>
|
||||
{
|
||||
const clone = new URL(routeGet.URL);
|
||||
inPath && (clone.pathname = inPath.join("/"));
|
||||
inParams && (clone.search = new URLSearchParams(inParams as Record<string, string>).toString());
|
||||
routeSet({
|
||||
URL:clone,
|
||||
Path: inPath || routeGet.Path,
|
||||
Params: inParams || routeGet.Params,
|
||||
Anchor: inAnchor || routeGet.Anchor
|
||||
});
|
||||
};
|
||||
|
||||
// when the state changes, update the page url
|
||||
React.useEffect(()=> dirtyGet ? dirtySet(false) : history.pushState({...routeGet, URL:undefined}, "", routeGet.URL), [routeGet.URL.href]);
|
||||
|
||||
React.useEffect(()=>{
|
||||
history.replaceState({...routeGet, URL:undefined}, "", routeGet.URL);
|
||||
window.addEventListener("popstate", ({state})=>
|
||||
{
|
||||
dirtySet(true);
|
||||
routeUpdate(state.Path, state.Params, state.Anchor);
|
||||
});
|
||||
document.addEventListener("click", e=>
|
||||
{
|
||||
const t = e.target as HTMLAnchorElement;
|
||||
const path = e.composedPath() as HTMLAnchorElement[];
|
||||
for(let i=0; i<path.length; i++)
|
||||
{
|
||||
if(path[i].href)
|
||||
{
|
||||
const u = new URL(t.href);
|
||||
if(u.origin == document.location.origin)
|
||||
{
|
||||
e.preventDefault();
|
||||
const parts = Router.Parse(u);
|
||||
routeUpdate(parts.Path, parts.Params, parts.Anchor);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
})
|
||||
}, []);
|
||||
|
||||
return <Router.Context.Provider value={[routeGet, routeUpdate]}>{props.children}</Router.Context.Provider>;
|
||||
},
|
||||
Consumer()
|
||||
{
|
||||
return React.useContext(Router.Context);
|
||||
}
|
||||
};
|
||||
|
||||
type SwitchContext = {depth:number, keys:Record<string, string>};
|
||||
export const SwitchContext = React.createContext({depth:0, keys:{}} as SwitchContext);
|
||||
export const Switch =({children}:{children:Children})=>
|
||||
{
|
||||
let fallback = null;
|
||||
if(Array.isArray(children))
|
||||
{
|
||||
const contextSelection = React.useContext(SwitchContext);
|
||||
const [contextRoute] = Router.Consumer();
|
||||
const routeSegment = contextRoute.Path.slice(contextSelection.depth);
|
||||
const checkChild =(inChild:{props:{value?:string}})=>
|
||||
{
|
||||
if(inChild?.props?.value)
|
||||
{
|
||||
const parts = inChild.props.value.split("/");
|
||||
if(parts.length > routeSegment.length)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
const output:SwitchContext = {depth:contextSelection.depth+parts.length, keys:{}};
|
||||
for(let i=0; i<parts.length; i++)
|
||||
{
|
||||
const partRoute = routeSegment[i];
|
||||
const partCase = parts[i];
|
||||
if(partCase[0] == ":")
|
||||
{
|
||||
output.keys[partCase.substring(1)] = partRoute;
|
||||
}
|
||||
else if(partCase != "*" && partCase != partRoute)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
for(let i=0; i<children.length; i++)
|
||||
{
|
||||
const childCase = children[i];
|
||||
const childCaseChildren = childCase.props?.__args?.slice(2) || childCase.props.children;
|
||||
const newContextValue = checkChild(childCase);
|
||||
if(newContextValue)
|
||||
{
|
||||
return <SwitchContext.Provider value={newContextValue}>{childCaseChildren}</SwitchContext.Provider>
|
||||
}
|
||||
if(childCase?.props?.default && !fallback)
|
||||
{
|
||||
//console.log(routeSegment);
|
||||
fallback = childCaseChildren;
|
||||
}
|
||||
}
|
||||
document.title = Meta.title;
|
||||
}
|
||||
|
||||
return fallback;
|
||||
};
|
||||
export const Case =({children, value}:{children:Children, value?:string, default?:true})=>null;
|
||||
export const useRouteVars =()=> React.useContext(SwitchContext).keys;
|
||||
|
||||
export type FetchCachOptions = {CacheFor:number, CacheOnServer:boolean, DelaySSR:boolean, Seed:boolean};
|
||||
export type FetchRecord = {URL:string, Promise?:Promise<FetchRecord>, CachedAt:number, Error?:string, JSON?:object} & FetchCachOptions;
|
||||
type FetchGuide = [Record:FetchRecord, Init:boolean, Listen:boolean];
|
||||
export type FetchHookState = [Data:undefined|object, Updating:boolean];
|
||||
export const Fetch = {
|
||||
Cache:new Map() as Map<string, FetchRecord>,
|
||||
ServerBlocking:false as false|Promise<FetchRecord>[],
|
||||
ServerTouched:false as false|Set<FetchRecord>,
|
||||
ServerRemove:false as false|Set<FetchRecord>,
|
||||
Seed(seed:FetchRecord[])
|
||||
{
|
||||
seed.forEach(r=>{
|
||||
//r.Promise = Promise.resolve(r);
|
||||
Fetch.Cache.set(r.URL, r)
|
||||
});
|
||||
},
|
||||
DefaultOptions:{CacheFor:60, CacheOnServer:true, DelaySSR:true, Seed:true} as FetchCachOptions,
|
||||
Request(URL:string, Init?:RequestInit|null, CacheFor:number = 60, CacheOnServer:boolean = true, DelaySSR:boolean = true, Seed:boolean = true):FetchGuide
|
||||
{
|
||||
let check = Fetch.Cache.get(URL);
|
||||
|
||||
const load =(inCheck:FetchRecord)=>
|
||||
{
|
||||
Fetch.Cache.set(URL, inCheck);
|
||||
inCheck.CachedAt = 0;
|
||||
inCheck.Promise = fetch(URL, Init?Init:undefined).then(resp=>resp.json()).then((json)=>{
|
||||
inCheck.JSON = json;
|
||||
inCheck.CachedAt = new Date().getTime();
|
||||
//console.log(`...cached!`);
|
||||
return inCheck;
|
||||
});
|
||||
return inCheck;
|
||||
};
|
||||
|
||||
if(!check)
|
||||
{
|
||||
// not in the cache
|
||||
// - listen
|
||||
|
||||
//console.log(`making new cache record...`);
|
||||
return [load({URL, CacheFor, CachedAt:0, CacheOnServer, DelaySSR, Seed}), false, true];
|
||||
}
|
||||
else if(check.CachedAt == 0)
|
||||
{
|
||||
// loading started but not finished
|
||||
// - listen
|
||||
// - possibly init if there is something in JSON
|
||||
|
||||
//console.log(`currently being cached...`);
|
||||
return [check, check.JSON ? true : false, true];
|
||||
}
|
||||
else
|
||||
{
|
||||
//console.log(`found in cache...`);
|
||||
let secondsAge = (new Date().getTime() - check.CachedAt)/1000;
|
||||
if(secondsAge > check.CacheFor)
|
||||
{
|
||||
// cached but expired
|
||||
// - listen
|
||||
// - init
|
||||
//console.log(`...outdated...`);
|
||||
return [load(check), true, true];
|
||||
}
|
||||
else
|
||||
{
|
||||
// cached and ready
|
||||
// - init
|
||||
//console.log(`...retrieved!`);
|
||||
return [check, true, false];
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
Use(URL:string, Init?:RequestInit|null, Options?:FetchCachOptions)
|
||||
{
|
||||
const config = {...Fetch.DefaultOptions, ...Options};
|
||||
const [receipt, init, listen] = Fetch.Request(URL, Init, config.CacheFor, config.CacheOnServer, config.DelaySSR, config.Seed);
|
||||
const initialState:FetchHookState = init ? [receipt.JSON, listen] : [undefined, true];
|
||||
const [cacheGet, cacheSet] = React.useState(initialState);
|
||||
|
||||
if(Fetch.ServerBlocking && Fetch.ServerTouched && config.DelaySSR) // if server-side rendering
|
||||
{
|
||||
if(listen) // if the request is pending
|
||||
{
|
||||
receipt.Promise && Fetch.ServerBlocking.push(receipt.Promise); // add promise to blocking list
|
||||
return [undefined, listen] as FetchHookState; // no need to return any actual data while waiting server-side
|
||||
}
|
||||
else // if request is ready
|
||||
{
|
||||
receipt.Seed && Fetch.ServerTouched.add(receipt); // add record to client seed list (if specified in receipt.seed)
|
||||
return [receipt.JSON, false] as FetchHookState;
|
||||
}
|
||||
}
|
||||
|
||||
React.useEffect(()=>
|
||||
{
|
||||
if(listen)
|
||||
{
|
||||
//const receipt = Fetch.Request(URL, Init, CacheFor, CacheOnServer, DelaySSR);
|
||||
receipt.Promise?.then(()=>cacheSet([receipt.JSON, receipt.CachedAt === 0]));
|
||||
}
|
||||
}
|
||||
, []);
|
||||
|
||||
return cacheGet;
|
||||
}
|
||||
};
|
||||
return null;
|
||||
}
|
||||
660
server.tsx
660
server.tsx
@ -1,448 +1,316 @@
|
||||
import * as ESBuild from 'https://deno.land/x/esbuild@v0.17.4/mod.js';
|
||||
import * as ESBuild from 'https://deno.land/x/esbuild@v0.14.45/mod.js';
|
||||
import * as MIME from "https://deno.land/std@0.180.0/media_types/mod.ts";
|
||||
import { debounce } from "https://deno.land/std@0.151.0/async/debounce.ts";
|
||||
import { parse as JSONC} from "https://deno.land/std@0.185.0/jsonc/mod.ts";
|
||||
import SSR from "https://esm.sh/v113/preact-render-to-string@6.0.2";
|
||||
import Prepass from "https://esm.sh/preact-ssr-prepass@1.2.0";
|
||||
import * as Twind from "https://esm.sh/@twind/core@1.1.3";
|
||||
import React from "react";
|
||||
import React, {JSX, createElement as h} from "react";
|
||||
import * as Iso from "@eno/iso";
|
||||
|
||||
Deno.env.set("initialized", "true");
|
||||
|
||||
/**
|
||||
* Setup a transpiler.
|
||||
* @param inDevMode When true, starts a file-watcher
|
||||
* @returns
|
||||
*/
|
||||
function Transpiler(inDevMode:boolean)
|
||||
const Transpiled = new Map();
|
||||
const Transpileable =(inFilePath:string):boolean=>
|
||||
{
|
||||
const Transpiled = new Map();
|
||||
const Transpileable =(inFilePath:string):boolean=>
|
||||
let dotIndex = inFilePath.length-4;
|
||||
if(inFilePath[dotIndex] !== ".")
|
||||
{
|
||||
let dotIndex = inFilePath.length-4;
|
||||
if(inFilePath[dotIndex] !== ".")
|
||||
if(inFilePath[++dotIndex] !== ".")
|
||||
{
|
||||
if(inFilePath[++dotIndex] !== ".")
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
if(inFilePath[dotIndex+2] == "s")
|
||||
}
|
||||
|
||||
if(inFilePath[dotIndex+2] == "s")
|
||||
{
|
||||
const first = inFilePath[dotIndex+1];
|
||||
return (first == "t" || first == "j");
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
const Transpile =async(inCode:string, inKey:string):Promise<string>=>
|
||||
{
|
||||
const transpile = await ESBuild.transform(inCode, { loader: "tsx", sourcemap: "inline", minify:true });
|
||||
Transpiled.set(inKey, transpile.code);
|
||||
return transpile.code;
|
||||
};
|
||||
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)
|
||||
{
|
||||
const first = inFilePath[dotIndex+1];
|
||||
return (first == "t" || first == "j");
|
||||
return cached;
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
const Transpile =async(inCode:string, inKey:string):Promise<string>=>
|
||||
}
|
||||
const body = await Deno.readTextFile(inPath);
|
||||
return Transpile(body, inKey);
|
||||
};
|
||||
const TranspileURL:Transpiler =async(inPath, inKey, inCheck)=>
|
||||
{
|
||||
if(inCheck)
|
||||
{
|
||||
const transpile = await ESBuild.transform(inCode, inDevMode ? { loader: "tsx", sourcemap:"inline", minify: false, sourcefile:inKey} :
|
||||
{ loader: "tsx",
|
||||
minify:true,
|
||||
jsx:"automatic",
|
||||
jsxImportSource:"https://esm.sh/preact@10.13.2"});
|
||||
|
||||
Transpiled.set(inKey, transpile.code);
|
||||
return transpile.code;
|
||||
};
|
||||
type Transpiler = (inPath:string, inKey:string, inCheck?:boolean)=>Promise<string>;
|
||||
const TranspileURL:Transpiler =async(inPath, inKey, inCheck)=>
|
||||
{
|
||||
if(inCheck)
|
||||
const cached = Transpiled.get(inKey);
|
||||
if(cached)
|
||||
{
|
||||
const cached = Transpiled.get(inKey);
|
||||
if(cached)
|
||||
{
|
||||
return cached;
|
||||
}
|
||||
return cached;
|
||||
}
|
||||
let body = await fetch(inPath);
|
||||
let text = await body.text();
|
||||
return Transpile(text, inKey);
|
||||
};
|
||||
|
||||
const Sockets:Set<WebSocket> = new Set();
|
||||
const SocketsBroadcast =(inData:string)=>{ for (const socket of Sockets){ socket.send(inData); } }
|
||||
const SocketsHandler = inDevMode ? (_req:Request)=>
|
||||
}
|
||||
const path = import.meta.resolve(`.${inPath}`);
|
||||
let body = await fetch(path);
|
||||
let text = await body.text();
|
||||
return Transpile(text, inKey);
|
||||
};
|
||||
|
||||
|
||||
const LibPath = "lib";
|
||||
type ImportMap = {imports?:Record<string, string>, importMap?:string};
|
||||
let ImportObject:ImportMap = {};
|
||||
try
|
||||
{
|
||||
const confDeno = await Deno.readTextFile(Deno.cwd()+"/deno.json");
|
||||
const confDenoParsed:ImportMap = JSON.parse(confDeno);
|
||||
if(confDenoParsed.importMap)
|
||||
{
|
||||
if(_req.headers.get("upgrade") == "websocket")
|
||||
try
|
||||
{
|
||||
const confImports = await Deno.readTextFile(confDenoParsed.importMap);
|
||||
try
|
||||
{
|
||||
const { response, socket } = Deno.upgradeWebSocket(_req);
|
||||
socket.onopen = () => Sockets.add(socket);
|
||||
socket.onclose = () => Sockets.delete(socket);
|
||||
socket.onmessage = (e) => {};
|
||||
socket.onerror = (e) => console.log("Socket errored:", e);
|
||||
return response;
|
||||
ImportObject = JSON.parse(confImports);
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
//
|
||||
console.log(`"importMap" "${confDenoParsed.importMap}" contains invalid JSON`);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
:
|
||||
()=>false;
|
||||
|
||||
let reloads = 0;
|
||||
const watcher =async()=>
|
||||
{
|
||||
const FilesChanged:Map<string, string> = new Map();
|
||||
const ProcessFiles =debounce(async()=>
|
||||
catch(e)
|
||||
{
|
||||
for await (const [path, action] of FilesChanged)
|
||||
{
|
||||
const key = path.substring(Deno.cwd().length).replaceAll("\\", "/");
|
||||
if(action != "remove")
|
||||
{
|
||||
if(Imports?.imports)
|
||||
{
|
||||
reloads++;
|
||||
const importApp = Imports.imports["@eno/app"];
|
||||
const imp = await import(Path.Active+importApp+"?reloads="+reloads);
|
||||
App = imp.default;
|
||||
}
|
||||
await TranspileURL(Path.Active+key, key, false);
|
||||
SocketsBroadcast(key);
|
||||
}
|
||||
else
|
||||
{
|
||||
Transpiled.delete(key);
|
||||
}
|
||||
}
|
||||
FilesChanged.clear();
|
||||
}, 1000);
|
||||
for await (const event of Deno.watchFs(Deno.cwd()))
|
||||
{
|
||||
event.paths.forEach( path =>
|
||||
{
|
||||
if(Transpileable(path))
|
||||
{
|
||||
FilesChanged.set(path, event.kind);
|
||||
}
|
||||
});
|
||||
if(FilesChanged.size)
|
||||
{
|
||||
ProcessFiles();
|
||||
}
|
||||
console.log(`"importMap" "${confDenoParsed.importMap}" cannot be found`);
|
||||
}
|
||||
}
|
||||
|
||||
if(inDevMode)
|
||||
else if(confDenoParsed.imports)
|
||||
{
|
||||
watcher().then(()=>{console.log("done watching");});
|
||||
ImportObject = {imports:confDenoParsed.imports};
|
||||
}
|
||||
|
||||
return {TranspileURL, Transpileable, SocketsHandler};
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Extract all configuration info form a project's deno.jsonc file
|
||||
* @param inDevMode When true, proxies react to an HMR-enabled version
|
||||
* @param inLibPath
|
||||
* @returns
|
||||
*/
|
||||
async function Configure(inDevMode:boolean, inLibPath:string)
|
||||
{
|
||||
type ImportMap = {imports?:Record<string, string>, importMap?:string};
|
||||
const output:{Imports?:ImportMap, App?:React.FunctionComponent, TwindInst?:Twind.Twind, Error?:string} = {};
|
||||
let ImportObject:ImportMap = {};
|
||||
try
|
||||
if(ImportObject.imports)
|
||||
{
|
||||
const confDeno = await fetch(`${Path.Active}/deno.jsonc`);
|
||||
const confText = await confDeno.text();
|
||||
const confDenoParsed = JSONC(confText) as ImportMap;
|
||||
if(confDenoParsed.importMap)
|
||||
const importReact = ImportObject.imports["react"];
|
||||
if(importReact)
|
||||
{
|
||||
try
|
||||
{
|
||||
const confImports = await Deno.readTextFile(confDenoParsed.importMap);
|
||||
try
|
||||
{
|
||||
output.Imports = JSON.parse(confImports);
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
output.Error = `"importMap" "${confDenoParsed.importMap}" contains invalid JSON`;
|
||||
return output;
|
||||
}
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
output.Error = `"importMap" "${confDenoParsed.importMap}" cannot be found`;
|
||||
return output;
|
||||
}
|
||||
}
|
||||
else if(confDenoParsed.imports)
|
||||
{
|
||||
output.Imports = {imports:confDenoParsed.imports};
|
||||
}
|
||||
|
||||
if(output.Imports?.imports)
|
||||
{
|
||||
if(inDevMode)
|
||||
{
|
||||
const importReact = output.Imports.imports["react"];
|
||||
if(importReact)
|
||||
{
|
||||
output.Imports.imports["react-original"] = importReact;
|
||||
output.Imports.imports["react"] = `/${inLibPath}/react.tsx`;
|
||||
}
|
||||
else
|
||||
{
|
||||
output.Error = `"imports" configuration does not alias "react"`;
|
||||
return output;
|
||||
}
|
||||
}
|
||||
|
||||
const importIso = output.Imports.imports["@eno/iso"];
|
||||
if(importIso)
|
||||
{
|
||||
output.Imports.imports["@eno/iso"] = `/${inLibPath}/iso.tsx`;
|
||||
}
|
||||
else
|
||||
{
|
||||
output.Error = `"imports" configuration does not alias "@eno/iso"`;
|
||||
return output;
|
||||
}
|
||||
|
||||
const importApp = output.Imports.imports["@eno/app"];
|
||||
if(importApp)
|
||||
{
|
||||
let appImport
|
||||
try
|
||||
{
|
||||
appImport = await import(Path.Active+importApp);
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
output.Error = `"@eno/app" entry-point (${importApp}) file not found`;
|
||||
return output;
|
||||
}
|
||||
|
||||
if(typeof appImport.default == "function" )
|
||||
{
|
||||
output.App = appImport.default;
|
||||
}
|
||||
else
|
||||
{
|
||||
output.Error = `"@eno/app" entry-point (${importApp}) needs to export a default function to use as the app root.`;
|
||||
return output;
|
||||
}
|
||||
|
||||
let twindConfig = Iso.CSS;
|
||||
if(typeof appImport.CSS == "object")
|
||||
{
|
||||
twindConfig = {...twindConfig, ...appImport.CSS};
|
||||
}
|
||||
try
|
||||
{
|
||||
// @ts-ignore
|
||||
output.TwindInst = Twind.install(twindConfig);
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
output.Error = `CSS configuration is malformed`;
|
||||
return output;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
output.Error = `"imports" configuration does not alias an entry-point file as "@eno/app"`;
|
||||
return output;
|
||||
}
|
||||
|
||||
|
||||
Object.entries(output.Imports.imports).forEach(([key, value])=>{
|
||||
if(value.startsWith("./") && output.Imports?.imports)
|
||||
{
|
||||
output.Imports.imports[key] = value.substring(1);
|
||||
}
|
||||
})
|
||||
ImportObject.imports["react-original"] = importReact;
|
||||
ImportObject.imports["react"] = `/${LibPath}/react.tsx`;
|
||||
}
|
||||
else
|
||||
{
|
||||
output.Error = `No "imports" found in configuration`;
|
||||
return output;
|
||||
console.log(`"imports" configuration does not alias "react"`);
|
||||
}
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
output.Error = `error during configuration: ${e}`;
|
||||
return output;
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
const Flags:Record<string, string|boolean> = {};
|
||||
Deno.args.forEach(arg=>
|
||||
{
|
||||
if(arg.startsWith("--"))
|
||||
{
|
||||
const kvp = arg.substring(2).split("=");
|
||||
Flags[kvp[0]] = kvp[1] ? kvp[1] : true;
|
||||
}
|
||||
});
|
||||
|
||||
let DevMode = Flags.dev ? true : false;
|
||||
let hosted = import.meta.resolve("./");
|
||||
const Path = {
|
||||
Hosted: hosted.substring(0, hosted.length-1),
|
||||
Active: `file://${Deno.cwd().replaceAll("\\", "/")}`,
|
||||
LibDir: "lib"
|
||||
};
|
||||
console.log(Path);
|
||||
console.log(`Dev Mode: ${DevMode}`);
|
||||
console.log(`Args seen: `, Flags);
|
||||
|
||||
const {Transpileable, TranspileURL, SocketsHandler} = Transpiler(DevMode);
|
||||
let {Imports, App, TwindInst, Error} = await Configure(DevMode, Path.LibDir);
|
||||
|
||||
if(Error)
|
||||
{
|
||||
console.log(Error);
|
||||
}
|
||||
else if(App && TwindInst)
|
||||
{
|
||||
Deno.serve({ port: Flags?.port||3000 }, async(_req:Request) =>
|
||||
{
|
||||
const url:URL = new URL(_req.url);
|
||||
const pathParts = url.pathname.substring(1, url.pathname.endsWith("/") ? url.pathname.length-1 : url.pathname.length).split("/");
|
||||
const pathLast = pathParts.at(-1);
|
||||
const pathExt:string|undefined = pathLast?.split(".")[1];
|
||||
const importApp = ImportObject.imports["@eno/app"];
|
||||
if(importApp)
|
||||
{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
console.log(`"imports" configuration does not alias an entry-point component with "@eno/app"`);
|
||||
}
|
||||
|
||||
const resp = SocketsHandler(_req);
|
||||
if(resp){ return resp; }
|
||||
|
||||
const importIso = ImportObject.imports["@eno/iso"];
|
||||
if(importIso)
|
||||
{
|
||||
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)
|
||||
{
|
||||
console.log(`deno.json not found`);
|
||||
}
|
||||
|
||||
|
||||
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}"...`);
|
||||
|
||||
if(_req.headers.get("upgrade") == "websocket")
|
||||
{
|
||||
try
|
||||
{
|
||||
// serve index by default
|
||||
let type = `text/html`;
|
||||
let body:BodyInit = ``;
|
||||
|
||||
const isLib = url.pathname.startsWith(`/${Path.LibDir}/`);
|
||||
|
||||
if(Transpileable(url.pathname))
|
||||
{
|
||||
type = `application/javascript`;
|
||||
if(isLib)
|
||||
{
|
||||
body = await TranspileURL(Path.Hosted+url.pathname, url.pathname, true);
|
||||
}
|
||||
else if(DevMode && !url.searchParams.get("reload"))
|
||||
{
|
||||
const imp = await import(Path.Active+url.pathname);
|
||||
const members = [];
|
||||
for( const key in imp ) { members.push(key); }
|
||||
body =
|
||||
`
|
||||
import {FileListen} from "/${Path.LibDir}/hmr.tsx";
|
||||
import * as Import from "${url.pathname}?reload=0";
|
||||
${ members.map(m=>`let proxy_${m} = Import.${m};
|
||||
export { proxy_${m} as ${m} };
|
||||
`).join(" ") }
|
||||
const reloadHandler = (updatedModule)=>
|
||||
const { response, socket } = Deno.upgradeWebSocket(_req);
|
||||
socket.onopen = () =>
|
||||
{
|
||||
Sockets.add(socket);
|
||||
console.log("Overwatch: Socket created");
|
||||
};
|
||||
socket.onclose = () =>
|
||||
{
|
||||
Sockets.delete(socket);
|
||||
console.log("Overwatch: Socket deleted");
|
||||
};
|
||||
socket.onmessage = (e) => {};
|
||||
socket.onerror = (e) => console.log("Overwatch: Socket errored:", e);
|
||||
return response;
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
//
|
||||
}
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
${ members.map(m=>`proxy_${m} = updatedModule.${m};`).join("\n") }
|
||||
};
|
||||
FileListen("${url.pathname}", reloadHandler);`;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
body = await TranspileURL(Path.Active+url.pathname, url.pathname, true);
|
||||
}
|
||||
}
|
||||
// serve static media
|
||||
else if( pathExt )
|
||||
// serve index by default
|
||||
let type = `text/html`;
|
||||
let body:BodyInit = ``;
|
||||
|
||||
const isLib = url.pathname.startsWith(`/${LibPath}/`);
|
||||
|
||||
if(Transpileable(pathLast))
|
||||
{
|
||||
type = `application/javascript`;
|
||||
if(isLib)
|
||||
{
|
||||
type = MIME.typeByExtension(pathExt) || "text/html";
|
||||
const _fetch = await fetch((Path.Active)+url.pathname);
|
||||
body = await TranspileURL(url.pathname, url.pathname, true);
|
||||
}
|
||||
else if(!url.searchParams.get("reload"))
|
||||
{
|
||||
const path = `file://${Deno.cwd().replaceAll("\\", "/")+url.pathname}`;
|
||||
const imp = await import(path);
|
||||
const members = [];
|
||||
for( const key in imp ) { members.push(key); }
|
||||
body =
|
||||
`
|
||||
import {FileListen} from "/${LibPath}/hmr.tsx";
|
||||
import * as Import from "${url.pathname}?reload=0";
|
||||
${ members.map(m=>`let proxy_${m} = Import.${m};
|
||||
export { proxy_${m} as ${m} };
|
||||
`).join(" ") }
|
||||
const reloadHandler = (updatedModule)=>
|
||||
{
|
||||
${ members.map(m=>`proxy_${m} = updatedModule.${m};`).join("\n") }
|
||||
};
|
||||
FileListen("${url.pathname}", reloadHandler);`;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
body = await TranspileFS(fsPath, url.pathname, true);
|
||||
}
|
||||
}
|
||||
// serve static media
|
||||
else if( pathExt )
|
||||
{
|
||||
type = MIME.typeByExtension(pathExt) || "text/html";
|
||||
if(isLib)
|
||||
{
|
||||
const _fetch = await fetch(import.meta.resolve(`.${url.pathname}`));
|
||||
body = await _fetch.text();
|
||||
}
|
||||
else
|
||||
{
|
||||
Iso.Fetch.ServerBlocking = [];
|
||||
Iso.Fetch.ServerTouched = new Set();
|
||||
Iso.Fetch.ServerRemove = new Set();
|
||||
let app = <Iso.Router.Provider url={url}><App/></Iso.Router.Provider>;
|
||||
await Prepass(app);
|
||||
Iso.Meta.Stack = [];
|
||||
let bake = SSR(app);
|
||||
while(Iso.Fetch.ServerBlocking.length)
|
||||
{
|
||||
await Promise.all(Iso.Fetch.ServerBlocking);
|
||||
Iso.Fetch.ServerBlocking = [];
|
||||
// at this point, anything that was requested that was not cached, has now been loaded and cached
|
||||
// this next render will use cached resources. using a cached resource (if its "Seed" is true) adds it to the "touched" set.
|
||||
app = <Iso.Router.Provider url={url}><App/></Iso.Router.Provider>;
|
||||
await Prepass(app);
|
||||
Iso.Meta.Stack = [];
|
||||
bake = SSR(app);
|
||||
}
|
||||
|
||||
const seed:Iso.FetchRecord[] = [];
|
||||
Iso.Fetch.ServerTouched.forEach((record)=>{
|
||||
const r:Iso.FetchRecord = {...record};
|
||||
delete r.Promise;
|
||||
seed.push(r);
|
||||
});
|
||||
Iso.Fetch.ServerTouched = false;
|
||||
|
||||
Iso.Meta.Meta = Iso.Meta.ComputeFinal(Iso.Meta.Stack);
|
||||
const results = Twind.extract(bake, TwindInst);
|
||||
|
||||
type = `text/html`;
|
||||
body =
|
||||
`<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>${Iso.Meta.Meta.title}</title>
|
||||
<meta property="og:title" content="${Iso.Meta.Meta.title}">
|
||||
<meta name="description" content="${Iso.Meta.Meta.description}">
|
||||
<meta property="og:description" content="${Iso.Meta.Meta.description}">
|
||||
<meta property="og:image" content="${Iso.Meta.Meta.image}">
|
||||
<meta property="og:url" content="${Iso.Meta.Meta.canonical}">
|
||||
<link rel="canonical" href="${Iso.Meta.Meta.canonical}" />
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta charset="utf-8"/>
|
||||
<style data-twind>${results.css}</style>
|
||||
<script type="importmap">${JSON.stringify(Imports)}</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="app">${results.html}</div>
|
||||
<script type="module">
|
||||
import {hydrate, createElement as H} from "react";
|
||||
import * as Twind from "https://esm.sh/v115/@twind/core@1.1.3/es2022/core.mjs";
|
||||
import * as App from "@eno/app";
|
||||
import {Router, Fetch, CSS, Meta} from "@eno/iso";
|
||||
Twind.install(App.CSS ? {...CSS, ...App.CSS} : CSS);
|
||||
Fetch.Seed(${JSON.stringify(seed)});
|
||||
const hmrWrap = H( ()=>H(App.default) );
|
||||
hydrate(
|
||||
H(Router.Provider, null,
|
||||
H(Meta.Provider, null, hmrWrap)
|
||||
),
|
||||
document.querySelector("#app")
|
||||
);
|
||||
</script>
|
||||
</body>
|
||||
</html>`;
|
||||
body = await Deno.readFile(fsPath);
|
||||
}
|
||||
|
||||
return new Response(body, {headers:{"content-type":type as string, "Access-Control-Allow-Origin":"*", charset:"utf-8"}});
|
||||
}
|
||||
catch(error)
|
||||
else
|
||||
{
|
||||
console.log(error);
|
||||
return new Response(error, {status:404});
|
||||
const results = Twind.extract(SSR(<App/>), TwindInst);
|
||||
|
||||
type = `text/html`;
|
||||
body = `<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>${Iso.Meta.title}</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta charset="utf-8"/>
|
||||
<style data-twind>${results.css}</style>
|
||||
<script type="importmap">${JSON.stringify(ImportObject)}</script>
|
||||
<script async src="https://ga.jspm.io/npm:es-module-shims@1.5.1/dist/es-module-shims.js" crossorigin="anonymous"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="app">${results.html}</div>
|
||||
<script type="module">
|
||||
import {render, createElement as H} from "react";
|
||||
import * as Twind from "https://esm.sh/@twind/core@1.1.3";
|
||||
import {default as App, CSS} from "@eno/app";
|
||||
Twind.install(CSS);
|
||||
render(H(()=>H(App)), document.querySelector("#app"));
|
||||
</script>
|
||||
</body>
|
||||
</html>`;
|
||||
}
|
||||
|
||||
return new Response(body, {headers:{"content-type":type as string, "Access-Control-Allow-Origin":"*", charset:"utf-8"}});
|
||||
}
|
||||
catch(error)
|
||||
{
|
||||
console.log(error);
|
||||
return new Response(error, {status:404});
|
||||
}
|
||||
});
|
||||
|
||||
import App, {CSS} from "@eno/app";
|
||||
const TwindInst = Twind.install(CSS);
|
||||
|
||||
const Sockets:Set<WebSocket> = new Set();
|
||||
const SocketsBroadcast =(inData:string)=>{ for (const socket of Sockets){ socket.send(inData); } }
|
||||
|
||||
const FilesChanged:Map<string, string> = new Map();
|
||||
const ProcessFiles =debounce(async()=>
|
||||
{
|
||||
console.log("Processing Files...", FilesChanged);
|
||||
for await (const [path, action] of FilesChanged)
|
||||
{
|
||||
const key = path.substring(Deno.cwd().length).replaceAll("\\", "/");
|
||||
console.log(key, action);
|
||||
|
||||
if(action != "remove")
|
||||
{
|
||||
await TranspileFS(path, key, false);
|
||||
console.log(` ...cached "${key}"`);
|
||||
SocketsBroadcast(key);
|
||||
}
|
||||
else
|
||||
{
|
||||
Transpiled.delete(key);
|
||||
}
|
||||
}
|
||||
FilesChanged.clear();
|
||||
}, 1000);
|
||||
for await (const event of Deno.watchFs(Deno.cwd()))
|
||||
{
|
||||
event.paths.forEach( path =>
|
||||
{
|
||||
if(Transpileable(path))
|
||||
{
|
||||
FilesChanged.set(path, event.kind);
|
||||
}
|
||||
});
|
||||
if(FilesChanged.size)
|
||||
{
|
||||
ProcessFiles();
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user