Compare commits

...

7 Commits

Author SHA1 Message Date
21ec8a759e add h 2023-04-30 17:24:16 -04:00
ca892eed6a remove flash server 2023-04-30 16:45:35 -04:00
3feb8d3b6b remove app path inference 2023-04-30 16:24:43 -04:00
35592bb183 more logs 2023-04-30 15:57:12 -04:00
f5d7ca2e95 client boot as file 2023-04-30 15:28:46 -04:00
70a0c2e96f split boot option 2023-04-30 15:11:54 -04:00
b18df9ff89 plunking (note Deno.mainModule) 2023-04-30 07:31:04 -04:00
11 changed files with 277 additions and 218 deletions

13
circ/a.tsx Normal file
View File

@ -0,0 +1,13 @@
import { doSomething } from './b.tsx';
export function doSomethingElse() {
if(Deno.env.get("a") && Deno.env.get("b")){return;}
Deno.env.set("a", "called");
console.log("a action");
doSomething();
}
import.meta.main

22
circ/b.tsx Normal file
View File

@ -0,0 +1,22 @@
import * as mod from "https://deno.land/std@0.185.0/path/mod.ts";
import { doSomethingElse } from './a.tsx';
export function doSomething() {
const pathInit = Deno.mainModule;
const pathProj = mod.toFileUrl(Deno.cwd());
console.log(pathInit);
console.log(import.meta.url);
console.log(pathInit.split(pathProj));
console.log("b main?", Deno.mainModule);
console.log("deno main?", Deno.cwd());
Deno.env.set("b", "called");
console.log("b action");
doSomethingElse();
}

3
circ/start.tsx Normal file
View File

@ -0,0 +1,3 @@
import { doSomethingElse } from "./a.tsx";
doSomethingElse();

View File

@ -4,9 +4,8 @@
]}, ]},
"imports": { "imports": {
"react": "https://esm.sh/preact@10.13.2/compat", "react": "https://esm.sh/preact@10.13.2/compat",
"preact": "https://esm.sh/preact@10.13.2/compat",
"react-original": "https://esm.sh/preact@10.13.2/compat", "react-original": "https://esm.sh/preact@10.13.2/compat",
"@eno/app": "./example/app.tsx",
"@eno/iso": "./lib/iso.tsx" "@eno/iso": "./lib/iso.tsx"
}, },
"tasks": "tasks":

View File

@ -3,34 +3,36 @@ import * as Iso from "@eno/iso";
const Comp = React.lazy(()=>import("./deep/component.tsx")); const Comp = React.lazy(()=>import("./deep/component.tsx"));
export default ()=> Iso.Boot(
{ ()=>
return <div class="p-4 font-sans"> {
<Iso.Meta.Metas title="Main Page!"/> return <div class="p-4 font-sans">
<nav class="p-4"> <Iso.Meta.Metas title="Main Page!"/>
<a class="text-red-500" href="/">Home</a> <nav class="p-4">
<a href="/about">About</a> <a class="text-red-500" href="/">Home</a>
</nav> <a href="/about">About</a>
</nav>
<h1 class="my-2 font(bold serif) text(3xl)">Title!!</h1>
<h2>suspended:</h2> <h1 class="my-2 font(bold serif) text(3xl)">Title!!!!!!</h1>
<React.Suspense fallback={<div>Loading!</div>}> <h2>suspended:</h2>
<Comp/> <React.Suspense fallback={<div>Loading!</div>}>
</React.Suspense> <Comp/>
<Iso.Switch> </React.Suspense>
<Iso.Case value="page"> <Iso.Switch>
<Iso.Switch> <Iso.Case value="page">
<Iso.Case value="about-us"> <Iso.Switch>
<> <Iso.Case value="about-us">
<Iso.Meta.Metas title="About US"/> <>
About us! <Iso.Meta.Metas title="About US"/>
</> About us!
</Iso.Case> </>
<Iso.Case default>sorry no page</Iso.Case> </Iso.Case>
</Iso.Switch> <Iso.Case default>sorry no page</Iso.Case>
</Iso.Case> </Iso.Switch>
<Iso.Case value="lol/idk">lol/idk</Iso.Case> </Iso.Case>
<Iso.Case default><p>404!</p></Iso.Case> <Iso.Case value="lol/idk">lol/idk</Iso.Case>
</Iso.Switch> <Iso.Case default><p>404!</p></Iso.Case>
</div>; </Iso.Switch>
}; </div>;
}
);

View File

@ -1,13 +1,6 @@
{ {
"compilerOptions": {"lib": ["deno.window", "dom"]}, "compilerOptions": {"lib": ["deno.window", "dom"]},
"imports": "importMap": "./deno.map.json",
{
"react": "https://esm.sh/stable/preact@10.13.2/compat",
"preact": "https://esm.sh/stable/preact@10.13.2/",
"@deep/": "./deep/",
"@eno/app": "./app.tsx",
"@eno/iso": "http://localhost:4507/lib/iso.tsx"
},
"tasks": { "tasks": {
"dev": "deno run -A --unstable --reload=http://localhost:4507/ --no-lock app.tsx --dev" "dev": "deno run -A --unstable --reload=http://localhost:4507/ --no-lock app.tsx --dev"
} }

10
example/deno.map.json Normal file
View File

@ -0,0 +1,10 @@
{
"imports":
{
"react": "https://esm.sh/stable/preact@10.13.2/compat",
"preact": "https://esm.sh/stable/preact@10.13.2/",
"@deep/": "./deep/",
"@eno/iso": "http://localhost:4507/lib/iso.tsx",
"@eno/app": "./app.tsx"
}
}

30
lib/boot-client.tsx Normal file
View File

@ -0,0 +1,30 @@
import React, {hydrate} from "react";
import * as Twind from "https://esm.sh/v115/@twind/core@1.1.3/es2022/core.mjs";
import {Router, CSS, Meta} from "@eno/iso";
export function Boot(inApp:()=>React.JSX.Element, inCSS?:object)
{
console.log(inApp, inCSS);
Twind.install(inCSS ? {...CSS, ...inCSS} : CSS);
const HMRWrap =()=> React.createElement(inApp, null, null);
const root = document.querySelector("#app");
if(root)
{
hydrate(
<Router.Provider url={new URL(window.location.href)}>
<Meta.Provider>
<HMRWrap/>
</Meta.Provider>
</Router.Provider>,
root
);
}
else
{
console.log(`no "#app" element is present!`)
}
};

View File

@ -1,16 +1,24 @@
import TWPreTail from "https://esm.sh/v115/@twind/preset-tailwind@1.1.4/es2022/preset-tailwind.mjs"; 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 TWPreAuto from "https://esm.sh/v115/@twind/preset-autoprefix@1.0.7/es2022/preset-autoprefix.mjs";
import React from "react"; import React, {createElement as h} from "react";
import { Boot as _Boot } from "../server.tsx";
export const CSS = { export const CSS = {
presets: [TWPreTail(), TWPreAuto()], presets: [TWPreTail(), TWPreAuto()],
hash:false hash:false
}; };
/*
if(!window.innerWidth) if(!window.innerWidth)
{ {
import(import.meta.resolve("../../server.tsx")).then(()=>{console.log("...imported!");}); import(import.meta.resolve("../../server.tsx")).then(()=>{console.log("...imported!");});
} }
*/
export function Boot(inApp:React.FunctionComponent, inCSS?:object)
{
_Boot(inApp, inCSS);
}
type MetasInputs = { [Property in MetaKeys]?: string }; type MetasInputs = { [Property in MetaKeys]?: string };
type MetasModeArgs = {concatListed?:boolean; dropUnlisted?:boolean}; type MetasModeArgs = {concatListed?:boolean; dropUnlisted?:boolean};

0
lib/mid.tsx Normal file
View File

View File

@ -2,13 +2,22 @@ import * as ESBuild from 'https://deno.land/x/esbuild@v0.17.4/mod.js';
import * as MIME from "https://deno.land/std@0.180.0/media_types/mod.ts"; 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 { 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 { parse as JSONC} from "https://deno.land/std@0.185.0/jsonc/mod.ts";
import * as HTTP from "https://deno.land/std@0.185.0/http/server.ts"
import SSR from "https://esm.sh/v113/preact-render-to-string@6.0.2"; 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 Prepass from "https://esm.sh/preact-ssr-prepass@1.2.0";
import * as Twind from "https://esm.sh/@twind/core@1.1.3"; import * as Twind from "https://esm.sh/@twind/core@1.1.3";
import React from "react"; import React, {createElement as h} from "react";
import * as Iso from "@eno/iso"; import * as Iso from "@eno/iso";
Deno.env.set("initialized", "true"); /**
* things you cant do on deno deploy:
* imports inside deno.json
* dynamic imports
* Deno.mainModule
* Deno.serve
* unspecified h
* ESBuild
*/
/** /**
* Setup a transpiler. * Setup a transpiler.
@ -66,7 +75,7 @@ function Transpiler(inDevMode:boolean)
const Sockets:Set<WebSocket> = new Set(); const Sockets:Set<WebSocket> = new Set();
const SocketsBroadcast =(inData:string)=>{ for (const socket of Sockets){ socket.send(inData); } } const SocketsBroadcast =(inData:string)=>{ for (const socket of Sockets){ socket.send(inData); } }
const SocketsHandler = inDevMode ? (_req:Request)=> const SocketsHandler = inDevMode ? (_req:Request):false|Response=>
{ {
if(_req.headers.get("upgrade") == "websocket") if(_req.headers.get("upgrade") == "websocket")
{ {
@ -87,7 +96,7 @@ function Transpiler(inDevMode:boolean)
return false; return false;
} }
: :
()=>false; ():false=>false;
const watcher =async()=> const watcher =async()=>
{ {
@ -134,6 +143,7 @@ function Transpiler(inDevMode:boolean)
} }
type ImportMap = {imports?:Record<string, string>, importMap?:string};
/** /**
* Extract all configuration info form a project's deno.jsonc file * Extract all configuration info form a project's deno.jsonc file
* @param inDevMode When true, proxies react to an HMR-enabled version * @param inDevMode When true, proxies react to an HMR-enabled version
@ -142,8 +152,7 @@ function Transpiler(inDevMode:boolean)
*/ */
async function Configure(inDevMode:boolean, inLibPath:string) async function Configure(inDevMode:boolean, inLibPath:string)
{ {
type ImportMap = {imports?:Record<string, string>, importMap?:string}; const output:{Imports?:ImportMap, Error?:string} = {};
const output:{Imports?:ImportMap, App?:React.FunctionComponent, TwindInst?:Twind.Twind, Error?:string} = {};
let ImportObject:ImportMap = {}; let ImportObject:ImportMap = {};
try try
{ {
@ -204,52 +213,6 @@ async function Configure(inDevMode:boolean, inLibPath:string)
return output; 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])=>{ Object.entries(output.Imports.imports).forEach(([key, value])=>{
if(value.startsWith("./") && output.Imports?.imports) if(value.startsWith("./") && output.Imports?.imports)
@ -272,158 +235,174 @@ async function Configure(inDevMode:boolean, inLibPath:string)
return output; return output;
} }
const Flags:Record<string, string|boolean> = {};
Deno.args.forEach(arg=> Deno.args.forEach(arg=>
{ {
if(arg.startsWith("--")) if(arg.startsWith("--"))
{ {
const kvp = arg.substring(2).split("="); const kvp = arg.substring(2).split("=");
Flags[kvp[0]] = kvp[1] ? kvp[1] : true; Deno.env.set(kvp[0], kvp[1] ? kvp[1] : "true");
} }
}); });
let DevMode = Flags.dev ? true : false; let DevMode = Deno.env.get("dev") ? true : false;
let hosted = import.meta.resolve("./"); let hosted = import.meta.resolve("./");
const Path = { const Path = {
Hosted: hosted.substring(0, hosted.length-1), Hosted: hosted.substring(0, hosted.length-1),
Active: `file://${Deno.cwd().replaceAll("\\", "/")}`, Active: `file://${Deno.cwd().replaceAll("\\", "/")}`,
LibDir: "lib" LibDir: "lib",
AppDir: ""
}; };
console.log(Path); console.log(Path);
console.log(`Dev Mode: ${DevMode}`); console.log(`Dev Mode: ${DevMode}`);
console.log(`Args seen: `, Flags); console.log(`import.meta.url:`, import.meta.url);
console.log(`Deno.cwd():`, Deno.cwd());
console.log(`Deno.mainModule:`, Deno.mainModule);
const {Transpileable, TranspileURL, SocketsHandler} = Transpiler(DevMode);
const {Imports, App, TwindInst, Error} = await Configure(DevMode, Path.LibDir); let Booted = false;
if(Error) let TwindInst:Twind.Twind;
export function Boot(inApp:React.FunctionComponent, inCSS?:object)
{ {
console.log(Error); if(Booted){return;}
Booted = true;
//@ts-ignore
TwindInst = Twind.install({...Iso.CSS, ...inCSS||{}});
Server(inApp, TwindInst);
} }
else if(App && TwindInst)
async function Server(App:React.FunctionComponent, TwindInst:Twind.Twind)
{ {
Deno.serve({ port: Flags?.port||3000 }, async(_req:Request) => const {Transpileable, TranspileURL, SocketsHandler} = Transpiler(DevMode);
const {Imports, Error} = await Configure(DevMode, Path.LibDir);
if(Error)
{ {
const url:URL = new URL(_req.url); console.log(Error);
const pathParts = url.pathname.substring(1, url.pathname.endsWith("/") ? url.pathname.length-1 : url.pathname.length).split("/"); }
const pathLast = pathParts.at(-1); else if(App && TwindInst)
const pathExt:string|undefined = pathLast?.split(".")[1]; {
HTTP.serve(async(_req:Request) =>
const resp = SocketsHandler(_req);
if(resp){ return resp; }
try
{ {
// serve index by default const url:URL = new URL(_req.url);
let type = `text/html`; const pathParts = url.pathname.substring(1, url.pathname.endsWith("/") ? url.pathname.length-1 : url.pathname.length).split("/");
let body:BodyInit = ``; const pathLast = pathParts.at(-1);
const pathExt:string|undefined = pathLast?.split(".")[1];
const isLib = url.pathname.startsWith(`/${Path.LibDir}/`);
const resp = SocketsHandler(_req);
if(Transpileable(url.pathname)) if(resp){ return resp;}
console.log(url.pathname);
try
{ {
type = `application/javascript`; // serve index by default
if(isLib) let type = `text/html`;
let body:BodyInit = ``;
const isLib = url.pathname.startsWith(`/${Path.LibDir}/`);
if(Transpileable(url.pathname))
{ {
body = await TranspileURL(Path.Hosted+url.pathname, url.pathname, true); type = `application/javascript`;
if(isLib)
{
body = await TranspileURL(Path.Hosted+url.pathname, url.pathname, true);
}
else if(url.pathname == "/server.tsx")
{
body = await TranspileURL(`${Path.Hosted}/${Path.LibDir}/boot-client.tsx`, 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)=>
{
${ members.map(m=>`proxy_${m} = updatedModule.${m};`).join("\n") }
};
FileListen("${url.pathname}", reloadHandler);`;
}
else
{
body = await TranspileURL(Path.Active+url.pathname, url.pathname, true);
}
} }
else if(DevMode && !url.searchParams.get("reload")) // serve static media
else if( pathExt )
{ {
const imp = await import(Path.Active+url.pathname); type = MIME.typeByExtension(pathExt) || "text/html";
const members = []; const _fetch = await fetch((Path.Active)+url.pathname);
for( const key in imp ) { members.push(key); } body = await _fetch.text();
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)=>
{
${ members.map(m=>`proxy_${m} = updatedModule.${m};`).join("\n") }
};
FileListen("${url.pathname}", reloadHandler);`;
} }
else else
{ {
body = await TranspileURL(Path.Active+url.pathname, url.pathname, true);
}
}
// serve static media
else if( pathExt )
{
type = MIME.typeByExtension(pathExt) || "text/html";
const _fetch = await fetch((Path.Active)+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)
let bake = SSR(app);
while(Iso.Fetch.ServerBlocking.length)
{
await Promise.all(Iso.Fetch.ServerBlocking);
Iso.Fetch.ServerBlocking = []; Iso.Fetch.ServerBlocking = [];
// at this point, anything that was requested that was not cached, has now been loaded and cached Iso.Fetch.ServerTouched = new Set();
// this next render will use cached resources. using a cached resource (if its "Seed" is true) adds it to the "touched" set. Iso.Fetch.ServerRemove = new Set();
app = <Iso.Router.Provider url={url}><App/></Iso.Router.Provider>; let app = <Iso.Router.Provider url={url}><Iso.Meta.Provider><App/></Iso.Meta.Provider></Iso.Router.Provider>;
await Prepass(app) await Prepass(app)
bake = SSR(app); 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}><Iso.Meta.Provider><App/></Iso.Meta.Provider></Iso.Router.Provider>;
await Prepass(app)
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;
const results = Twind.extract(bake, TwindInst);
type = `text/html`;
body =
`<!doctype html>
<html lang="en">
<head>
<title>${Iso.Meta.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(Imports)}</script>
</head>
<body>
<div id="app">${results.html}</div>
<script type="module">
import {Fetch} from "@eno/iso";
Fetch.Seed(${JSON.stringify(seed)});
import "@eno/app";
</script>
</body>
</html>`;
} }
const seed:Iso.FetchRecord[] = []; return new Response(body, {headers:{"content-type":type as string, "Access-Control-Allow-Origin":"*", charset:"utf-8"}});
Iso.Fetch.ServerTouched.forEach((record)=>{
const r:Iso.FetchRecord = {...record};
delete r.Promise;
seed.push(r);
});
Iso.Fetch.ServerTouched = false;
const results = Twind.extract(bake, TwindInst);
type = `text/html`;
body =
`<!doctype html>
<html lang="en">
<head>
<title>${Iso.Meta.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(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>`;
} }
catch(error)
return new Response(body, {headers:{"content-type":type as string, "Access-Control-Allow-Origin":"*", charset:"utf-8"}}); {
} console.log(error);
catch(error) return new Response(error, {status:404});
{ }
console.log(error); }, { port: parseInt(Deno.env.get("port")||"3000" )});
return new Response(error, {status:404}); }
} }
});
}