circ/a.tsx

@@ -1,13 +0,0 @@
-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

circ/b.tsx

@@ -1,22 +0,0 @@
-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();
-}

circ/start.tsx

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

deno.json

@@ -4,8 +4,9 @@
     ]},
     "imports": {
         "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",
+        "@eno/app": "./example/app.tsx",
         "@eno/iso": "./lib/iso.tsx"
     },
     "tasks":

example/app.tsx

@@ -3,9 +3,8 @@ import * as Iso from "@eno/iso";
 
 const Comp = React.lazy(()=>import("./deep/component.tsx"));
 
-Iso.Boot(
+export default ()=>
-    ()=>
+{
-    {
     return <div class="p-4 font-sans">
         <Iso.Meta.Metas title="Main Page!"/>
         <nav class="p-4">
@@ -13,7 +12,7 @@ Iso.Boot(
             <a href="/about">About</a>
         </nav>
 
-            <h1 class="my-2 font(bold serif) text(3xl)">Title!!!!!!</h1>
+        <h1 class="my-2 font(bold serif) text(3xl)">Title!!</h1>
         <h2>suspended:</h2>
         <React.Suspense fallback={<div>Loading!</div>}>
             <Comp/>
@@ -34,5 +33,4 @@ Iso.Boot(
             <Iso.Case default><p>404!</p></Iso.Case>
         </Iso.Switch>
     </div>;
-    }
+};
-);

example/deno.jsonc

@@ -5,9 +5,10 @@
         "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": {
-        "dev": "deno run -A --unstable --reload=http://localhost:4507/ --no-lock app.tsx"
+        "dev": "deno run -A --unstable --reload=http://localhost:4507/ --no-lock app.tsx --dev"
     }
 }

lib/boot-client.tsx

@@ -1,30 +0,0 @@
-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!`)
-    }
-
-};

lib/iso.tsx

@@ -1,24 +1,16 @@
 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 from "react";
-import { Boot as _Boot } from "../server.tsx";
 
 export const CSS = {
     presets: [TWPreTail(), TWPreAuto()],
     hash:false
 };
-/*
+
 if(!window.innerWidth)
 {
     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 MetasModeArgs = {concatListed?:boolean; dropUnlisted?:boolean};

server.tsx

@@ -2,13 +2,14 @@ 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 { 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 { toFileUrl } from "https://deno.land/std@0.185.0/path/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 * as Iso from "@eno/iso";
 
+Deno.env.set("initialized", "true");
+
 /**
  * Setup a transpiler.
  * @param inDevMode When true, starts a file-watcher
@@ -133,7 +134,6 @@ function Transpiler(inDevMode:boolean)
 
 }
 
-type ImportMap = {imports?:Record<string, string>, importMap?:string};
 /**
  * Extract all configuration info form a project's deno.jsonc file
  * @param inDevMode When true, proxies react to an HMR-enabled version
@@ -142,7 +142,8 @@ type ImportMap = {imports?:Record<string, string>, importMap?:string};
  */
 async function Configure(inDevMode:boolean, inLibPath:string)
 {
-    const output:{Imports?:ImportMap, Error?: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
     {
@@ -203,6 +204,52 @@ async function Configure(inDevMode:boolean, inLibPath:string)
                 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)
@@ -225,58 +272,36 @@ async function Configure(inDevMode:boolean, inLibPath:string)
     return output;
 }
 
+const Flags:Record<string, string|boolean> = {};
 Deno.args.forEach(arg=>
 {
     if(arg.startsWith("--"))
     {
         const kvp = arg.substring(2).split("=");
-        Deno.env.set(kvp[0], kvp[1] ? kvp[1] : "true");
+        Flags[kvp[0]] = kvp[1] ? kvp[1] : true; 
     }
 });
 
-let DevMode = Deno.env.get("dev") ? true : false;
+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",
+    LibDir: "lib"
-    AppDir: ""
 };
 console.log(Path);
 console.log(`Dev Mode: ${DevMode}`);
-console.log(`Args seen: `, Deno.env.toObject);
+console.log(`Args seen: `, Flags);
 
-
+const {Transpileable, TranspileURL, SocketsHandler} = Transpiler(DevMode);
-let Booted = false;
+const {Imports, App, TwindInst, Error} = await Configure(DevMode, Path.LibDir);
-let TwindInst:Twind.Twind;
+if(Error)
-export function Boot(inApp:React.FunctionComponent, inCSS?:object)
 {
-    if(Booted){return;}
-    Booted = true;
-
-    const pathInit = Deno.mainModule;
-    const pathProj = toFileUrl(Deno.cwd());
-    
-    //@ts-ignore
-    TwindInst = Twind.install({...Iso.CSS, ...inCSS||{}});
-
-    const App = inApp;
-    Path.AppDir = pathInit.split(pathProj.toString())[1];
-
-    Server(App, Path.AppDir, TwindInst);
-}
-
-async function Server(App:React.FunctionComponent, AppPath:string, TwindInst:Twind.Twind)
-{
-    const {Transpileable, TranspileURL, SocketsHandler} = Transpiler(DevMode);
-    const {Imports, Error} = await Configure(DevMode, Path.LibDir);
-    if(Error)
-    {
     console.log(Error);
-    }
+}
-    else if(App && TwindInst)
+else if(App && TwindInst)
-    {
+{
-        Deno.serve({ port: Deno.env.get("port")||3000 }, async(_req:Request) =>
+    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("/");
@@ -286,8 +311,6 @@ async function Server(App:React.FunctionComponent, AppPath:string, TwindInst:Twi
         const resp = SocketsHandler(_req);
         if(resp){ return resp; }
     
-            console.log(url.pathname);
-
         try
         {
             // serve index by default
@@ -303,10 +326,6 @@ async function Server(App:React.FunctionComponent, AppPath:string, TwindInst:Twi
                 {
                     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);
@@ -343,7 +362,7 @@ async function Server(App:React.FunctionComponent, AppPath:string, TwindInst:Twi
                 Iso.Fetch.ServerBlocking = [];
                 Iso.Fetch.ServerTouched = new Set();
                 Iso.Fetch.ServerRemove = new Set();
-                    let app = <Iso.Router.Provider url={url}><Iso.Meta.Provider><App/></Iso.Meta.Provider></Iso.Router.Provider>;
+                let app = <Iso.Router.Provider url={url}><App/></Iso.Router.Provider>;
                 await Prepass(app)
                 let bake = SSR(app);
                 while(Iso.Fetch.ServerBlocking.length)
@@ -352,7 +371,7 @@ async function Server(App:React.FunctionComponent, AppPath:string, TwindInst:Twi
                     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>;
+                    app = <Iso.Router.Provider url={url}><App/></Iso.Router.Provider>;
                     await Prepass(app)
                     bake = SSR(app);
                 }
@@ -381,10 +400,19 @@ async function Server(App:React.FunctionComponent, AppPath:string, TwindInst:Twi
         <body>
             <div id="app">${results.html}</div>
             <script type="module">
-                    import {Fetch} from "@eno/iso";
+                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) );
-                    import "${AppPath}";
+                hydrate(
+                    H(Router.Provider, null,
+                        H(Meta.Provider, null, hmrWrap)
+                    ),
+                    document.querySelector("#app")
+                );
             </script>
         </body>
     </html>`;
@@ -398,5 +426,4 @@ async function Server(App:React.FunctionComponent, AppPath:string, TwindInst:Twi
             return new Response(error, {status:404});
         }
     });
-    }
 }