Merge pull request 'start-file' (#5) from start-file into master

Reviewed-on: #5

deno.json

@@ -7,13 +7,13 @@
     {
         "react":"https://esm.sh/preact@10.15.1/compat",
         "react-original":"https://esm.sh/preact@10.15.1/compat",
-        ">able/": "http://localhost:4507/"
+        "able/": "http://localhost:4507/"
     },
     "tasks":
     {
-        "local": "deno run -A --reload=http://localhost --no-lock ./run-local.tsx --port=1234",
+        "local": "deno run -A --reload=http://localhost:4507 --no-lock ./run-local.tsx --port=1234",
-        "serve": "deno run -A --reload=http://localhost --no-lock ./run-serve.tsx --port=1234",
+        "serve": "deno run -A --reload=http://localhost:4507 --no-lock ./run-serve.tsx --port=1234",
-        "debug": "deno run -A --reload=http://localhost --inspect-wait --no-lock ./run-serve.tsx --port=1234",
+        "debug": "deno run -A --reload=http://localhost:4507 --inspect-wait --no-lock ./run-serve.tsx --port=1234",
-        "deploy":"deno run -A --no-lock --reload=http://localhost http://localhost:4507/run-deploy.tsx"
+        "deploy":"deno run -A --no-lock --reload=http://localhost:4507 http://localhost:4507/run-deploy.tsx"
     }
 }

deno.lock

@@ -0,0 +1,28 @@
+{
+  "version": "2",
+  "remote": {
+    "http://localhost:4507/hmr-static.tsx": "b88a33a019b7a6090d05a43d15843b36fe294196c4423c753fe3654ab369f1b1",
+    "http://localhost:4507/run-local.tsx": "2c0bf9b994677f2c0bb6ef26616960f25f61e3f8b4767891a95896fb7752a74e",
+    "http://localhost:4507/run-serve.tsx": "400828ea6457485c3bfcfe3bfdd60b1844e6e66f56a3606d250ce9a7481c6ead",
+    "http://localhost:4507/run.tsx": "f7f2a90d2bda35e5de3b307e36666120439f516d88f44a4388a3251679a99e3e",
+    "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://esm.sh/@swc/wasm-web@1.3.62": "e077889c90bd43ad29e9cf086818efc334bdf31b933575e0c27972173053a3c6",
+    "https://esm.sh/preact@10.15.1/compat/jsx-runtime": "3f191e04473646ff8f5f76fb4378fc502a7cc892d9e147584d4f7531981bc86b",
+    "https://esm.sh/stable/preact@10.15.1/denonext/compat.js": "bad6b5b4d4fdfa5975b7a8d30410bd6877247f058e4952799fab39f66a94b8cf",
+    "https://esm.sh/stable/preact@10.15.1/denonext/compat/jsx-runtime.js": "e5c016fa258601ca873ba29188e56cede90372a0bdb52e58b0dfb801f2e2f219",
+    "https://esm.sh/stable/preact@10.15.1/denonext/hooks.js": "5c989ad368cf4f2cb3a5d7d1801843d9348c599fe3e7731d04728f7b845d724e",
+    "https://esm.sh/stable/preact@10.15.1/denonext/jsx-runtime.js": "52806054f5b3477005ab4bdc17de3d219ccc6c130d0cd803c45667b0cac2f6ed",
+    "https://esm.sh/stable/preact@10.15.1/denonext/preact.mjs": "30710ac1d5ff3711ae0c04eddbeb706f34f82d97489f61aaf09897bc75d2a628",
+    "https://esm.sh/v130/@swc/wasm-web@1.3.62/denonext/wasm-web.mjs": "57046d46c9ef1398a294ba7447034f5966e48866a05c309cccec4bb4d6e7c61b"
+  }
+}

example-config/app.tsx

@@ -39,7 +39,7 @@ export default ()=>
     return <CTXString.Provider value="intradestink">
         <Router.Provider>
             <div class="my-4 font-sans">
-                <h1 class="font-black text-xl text-red-500">Title?????</h1>
+                <h1 class="font-black text-xl text-red-500">Title</h1>
                 <h2 class="font-black text-blue-500 p-4">subtitle</h2>
                 <p>
                     <button onClick={e=>Dispatch(1)}>{Store.name}|{Store.age}?</button>

example-config/deno.json

@@ -0,0 +1,19 @@
+{
+    "imports":
+    {
+        "react": "https://esm.sh/preact@10.15.1/compat",
+        ">able/": "http://localhost:4507/",
+        ">able/app.tsx": "./app.tsx"
+    },
+    "tasks":
+    {
+        "serve": "deno run -A --no-lock --config=deno.json --reload=http://localhost:4507 http://localhost:4507/run.tsx",
+        "local": "deno run -A --no-lock --config=deno.json --reload=http://localhost:4507 http://localhost:4507/run.tsx --dev",
+        "debug": "deno run -A --no-lock --config=deno.json --reload=http://localhost:4507 --inspect-wait http://localhost:4507/run.tsx",
+        "cloud": "deno run -A --no-lock --config=deno.json --reload=http://localhost:4507 http://localhost:4507/run.tsx --dep"
+    },
+    "compilerOptions":
+    {
+        "lib": ["deno.window", "dom"]
+    }
+}

example-script/app.tsx

@@ -0,0 +1,56 @@
+import { Router, Switch, Case } from ">able/iso-elements.tsx";
+
+import React from "react";
+
+const CTXString = React.createContext("lol");
+
+type StateBinding<T> = [get:T, set:React.StateUpdater<T>];
+const CTXState = React.createContext(null) as React.Context<StateBinding<number>|null>;
+const Outer =(props:{children:React.JSX.Element})=>
+{
+    const binding = React.useState(11);
+    return <CTXState.Provider value={binding}>
+        {props.children}
+    </CTXState.Provider>
+};
+const Inner =()=>
+{
+    const [stateGet, stateSet] = React.useContext(CTXState) || ["default", ()=>{}];
+    return <button onClick={e=>stateSet((old)=>old+1)}>count: {stateGet} :)</button>
+};
+
+
+type Store = {name:string, age:number}
+const reducer =(inState:Store, inAction:number)=>
+{
+    return {...inState, age:inState.age+inAction};
+}
+
+const builder =(inState:Store):Store=>
+{
+    inState.age = 100;
+    return inState;
+}
+
+
+export default ()=>
+{
+    const [Store, Dispatch] = React.useReducer(reducer, {name:"seth", age:24} as Store, builder)
+    return <CTXString.Provider value="intradestink">
+        <Router.Provider>
+            <div class="my-4 font-sans">
+                <h1 class="font-black text-xl text-red-500">Title</h1>
+                <h2 class="font-black text-blue-500 p-4">subtitle</h2>
+                <p>
+                    <button onClick={e=>Dispatch(1)}>{Store.name}|{Store.age}?</button>
+                </p>
+            </div>
+            <Outer>
+                <Inner/>
+            </Outer>
+            <Outer>
+                <Inner/>
+            </Outer>
+        </Router.Provider>
+    </CTXString.Provider>;         
+}

example-script/deno.json

@@ -0,0 +1,15 @@
+{
+    "compilerOptions": { "lib": ["deno.window", "dom"] },
+    "imports":
+    {
+        "react": "https://esm.sh/preact@10.15.1/compat",
+        ">able/": "http://localhost:4507/"
+    },
+    "tasks":
+    {
+        "local": "deno run -A --no-lock --reload=http://localhost:4507 run__.tsx --dev",
+        "serve": "deno run -A --no-lock --reload=http://localhost:4507 run__.tsx",
+        "debug": "deno run -A --no-lock --reload=http://localhost:4507 --inspect-wait run__.tsx",
+        "cloud": "deno run -A --no-lock --reload=http://localhost:4507 run__.tsx --dep"
+    }
+}

example-script/run__.tsx

@@ -0,0 +1,9 @@
+import Configure from ">able/run.tsx";
+
+Configure({
+    Start:"/app.tsx",
+    Serve()
+    {
+        return false;     
+    }
+})

example/.env

@@ -1 +0,0 @@
-DENO_DEPLOY_TOKEN=1

example/api.tsx

@@ -1,4 +0,0 @@
-export default (inReq:Request)=>
-{
-    return false;
-}

example/deno.json

@@ -1,17 +0,0 @@
-{
-    "compilerOptions": { "lib": ["deno.window", "dom"] },
-    "imports":
-    {
-        "react": "https://esm.sh/preact@10.15.1/compat",
-        ">able/": "http://localhost:4507/",
-        ">able/app": "./app.tsx",
-        ">able/api": "./api.tsx"
-    },
-    "tasks":
-    {
-        "local": "deno run --config=deno.json -A --no-lock --reload=http://localhost:4507 http://localhost:4507/run-local.tsx",
-        "serve": "deno run --config=deno.json -A --no-lock --reload=http://localhost:4507 http://localhost:4507/run-serve.tsx",
-        "deploy":"deno run -A --no-lock --reload=http://localhost:4507 http://localhost:4507/run-deploy.tsx",
-        "debug": "deno run --config=deno.json -A --inspect-wait --no-lock --reload=http://localhost:4507 http://localhost:4507/run-serve.tsx"
-    }
-}

run-browser.tsx

@@ -26,6 +26,13 @@ export const Shadow =(inElement:HTMLElement, inConfig?:TW.TwindUserConfig)=>
 
 export default async(inSelector:string, inModulePath:string, inMemberApp="default", inMemberCSS="CSS"):Promise<(()=>void)|false>=>
 {
+
+  if(!inModulePath)
+  {
+    return false;
+  }
+
+
   let dom = document.querySelector(inSelector);
   if(!dom)
   {

run-deploy.tsx

@@ -30,6 +30,7 @@ const collect =async(inKey:string, inArg:Record<string, string>, inEnv:Record<st
         console.log("Exiting...");
         Deno.exit();
     }
+    return scanUser;
 };
 
 const prompt =async(question: string):Promise<string>=>
@@ -45,8 +46,7 @@ const prompt =async(question: string):Promise<string>=>
 
 try
 {
-    console.log("Runing deploy!");
+    console.log("Runing deploy!", Deno.mainModule);
-    const serveScript = import.meta.resolve("./run-serve.tsx");
 
     let arg = parse(Deno.args);
     let env = await Env.load();
@@ -54,6 +54,17 @@ try
     let useToken = await collect("DENO_DEPLOY_TOKEN", arg, env);
     let useProject = await collect("DENO_DEPLOY_PROJECT", arg, env);
     
+    let scanProd:string|string[] = await prompt(`Do you want to deploy to *production*? [y/n]`);
+    if(scanProd == "y")
+    {
+        scanProd = await prompt(`This will update the live project at ${useProject} are you sure you want to continue? [y/n]`);
+        scanProd = scanProd=="y" ? ["--prod"] : [];
+    }
+    else
+    {
+        scanProd = [];
+    }
+
     const command = new Deno.Command(
         `deno`,
         {
@@ -66,7 +77,8 @@ try
                 `--project=${useProject}`,
                 `--import-map=./deno.json`,
                 `--token=${useToken}`,
-                serveScript
+                ...scanProd,
+                Deno.mainModule
             ],
             stdin: "piped",
             stdout: "piped"

run-local.tsx

@@ -25,7 +25,7 @@ Configure({
         inImports["react"] = `/>able/hmr-react.tsx`;
         return inImports;
     },
-    async Serve(inReq, inURL, inExt, inMap, inConfig)
+    async Extra(inReq, inURL, inExt, inMap, inConfig)
     {
         if(!inURL.pathname.startsWith(encodeURI("/>")))
         {

run-serve.tsx

@@ -1,20 +1,10 @@
 import * as MIME from "https://deno.land/std@0.180.0/media_types/mod.ts";
 import * as SWCW from "https://esm.sh/@swc/wasm-web@1.3.62";
 
-import Api from ">able/api";
+import CustomServe from ">able/api.tsx"; 
-
 
 export const Root = new URL(`file://${Deno.cwd().replaceAll("\\", "/")}`).toString();
 
-Deno.args.forEach(arg=>
-{
-    if(arg.startsWith("--"))
-    {
-        const kvp = arg.substring(2).split("=");
-        Deno.env.set(kvp[0], kvp[1] || "true");
-    }
-});
-
 type DenoConfig = {imports:Record<string, string>};
 const ImportMap:DenoConfig = {imports:{}};
 let ImportMapOriginal = {};
@@ -77,15 +67,17 @@ const ImportMapReload =async()=>
     ImportMap.imports = Configuration.Remap(json.imports, Configuration);
 };
 
-type CustomHTTPHandler = (inReq:Request, inURL:URL, inExt:string|false, inMap:{imports:Record<string, string>}, inConfig:Configuration)=>void|false|Response|Promise<Response|void|false>;
+export type CustomHTTPHandler = (inReq:Request, inURL:URL, inExt:string|false, inMap:{imports:Record<string, string>}, inConfig:Configuration)=>void|false|Response|Promise<Response|void|false>;
-type CustomRemapper = (inImports:Record<string, string>, inConfig:Configuration)=>Record<string, string>;
+export type CustomRemapper = (inImports:Record<string, string>, inConfig:Configuration)=>Record<string, string>;
-type Configuration     = {Allow:string, Reset:string, SWCOp:SWCW.Options, Serve:CustomHTTPHandler, Shell:CustomHTTPHandler, Remap:CustomRemapper};
+export type Configuration     = {Start:string, Allow:string, Reset:string, SWCOp:SWCW.Options, Serve:CustomHTTPHandler, Extra:CustomHTTPHandler, Shell:CustomHTTPHandler, Remap:CustomRemapper};
-type ConfigurationArgs = {Allow?:string, Reset?:string, SWCOp?:SWCW.Options, Serve?:CustomHTTPHandler, Shell?:CustomHTTPHandler, Remap?:CustomRemapper};
+export type ConfigurationArgs = Partial<Configuration>;
 let Configuration:Configuration =
 {
+    Start: ">able/app.tsx",
     Allow: "*",
     Reset: "/clear-cache",
-    async Serve(inReq, inURL, inExt, inMap, inConfig){},
+    async Extra(inReq, inURL, inExt, inMap, inConfig){},
+    Serve: CustomServe,
     Remap: (inImports, inConfig)=>
     {
         return inImports;
@@ -104,7 +96,7 @@ let Configuration:Configuration =
                     <script type="importmap">${JSON.stringify(inMap)}</script>
                     <script type="module">
                         import Mount from ">able/run-browser.tsx";
-                        Mount("#app", ">able/app");
+                        Mount("#app", "${inConfig.Start}");
                     </script>
                 </body>
             </html>`, {status:200, headers:{"content-type":"text/html"}});
@@ -254,19 +246,6 @@ export const Transpile =
     }
 };
 
-
-export const ExtensionPrefix =(string:string, suffix:string)=>
-{
-    const lastDotIndex = string.lastIndexOf(".");
-    if (lastDotIndex === -1) {
-        return string;
-    }
-    
-    const prefix = string.substring(0, lastDotIndex);
-    const suffixString = string.substring(lastDotIndex + 1);
-    return prefix + "." + suffix + "." + suffixString;
-};
-
 export const Extension =(inPath:string)=>
 {
     const posSlash = inPath.lastIndexOf("/");
@@ -280,105 +259,111 @@ export const Configure =(config:ConfigurationArgs)=>
     ImportMapReload();
 }
 
-await ImportMapReload();
-try
-{
-    await SWCW.default();
-}
-catch(e)
-{
-    console.log("swc init error:", e);
-}
 
-
+let running = false;
-const server = Deno.serve({port:parseInt(Deno.env.get("port")||"8000")}, async(req: Request)=>
+export default async()=>
 {
-    const url:URL = new URL(req.url);
+    if(running){return};
-    const ext = Extension(url.pathname);
+    running = true;
-    const headers = {"content-type":"application/json", "Access-Control-Allow-Origin": Configuration.Allow, "charset":"UTF-8"};
-    let proxy = Root + url.pathname;
     
-    if(url.pathname.includes("/__"))
+    await ImportMapReload();
+    try
     {
-        return new Response(`{"error":"unmatched route", "path":"${url.pathname}"}`, {status:404, headers});
+        await SWCW.default();
+    }
+    catch(e)
+    {
+        console.log("swc init error:", e);
     }
     
-    // proxy imports
+    
-    if(url.pathname.startsWith(encodeURI("/>")))
+    const server = Deno.serve({port:parseInt(Deno.env.get("port")||"8000")}, async(req: Request)=>
     {
-        let bestMatch="";
+        const url:URL = new URL(req.url);
-        for(let key in ImportMapProxies)
+        const ext = Extension(url.pathname);
+        const headers = {"content-type":"application/json", "Access-Control-Allow-Origin": Configuration.Allow, "charset":"UTF-8"};
+        let proxy = Root + url.pathname;
+    
+        if(url.pathname.includes("__/") || url.pathname.lastIndexOf("__.") > -1)
         {
-            if(url.pathname.startsWith(key) && key.length > bestMatch.length)
+            return new Response(`{"error":"unmatched route", "path":"${url.pathname}"}`, {status:404, headers});
+        }
+    
+        // proxy imports
+        if(url.pathname.startsWith(encodeURI("/>")))
+        {
+            let bestMatch="";
+            for(let key in ImportMapProxies)
             {
-                bestMatch = key;
+                if(url.pathname.startsWith(key) && key.length > bestMatch.length)
+                {
+                    bestMatch = key;
+                }
+            }
+            if(bestMatch.length)
+            {
+                const match = ImportMapProxies[bestMatch];
+                const path = url.pathname.substring(bestMatch.length);
+                proxy = path ? match + path : Root + match;
+    
             }     
         }
-        if(bestMatch.length)
+    
+        // allow for custom handlers
+        const custom = await Configuration.Extra(req, url, ext, ImportMap, Configuration);
+        if(custom)
         {
-            const match = ImportMapProxies[bestMatch];
+            return custom;
-            const path = url.pathname.substring(bestMatch.length);
-            proxy = path ? match + path : Root + match;
-
         }
-    }
+        const api = await Configuration.Serve(req, url, ext, ImportMap, Configuration);
-
+        if(api)
-    // allow for custom handler
-    const custom = await Configuration.Serve(req, url, ext, ImportMap, Configuration);
-    if(custom)
-    {
-        return custom;
-    }
-
-    const api = Api(req);
-    if(api)
-    {
-        return api;
-    }
-
-    // transpileable files
-    if(Transpile.Check(ext))
-    {
-        console.log("transpiling:", proxy);
-        const code = await Transpile.Fetch(proxy, url.pathname);    
-        if(code)
         {
-            return new Response(code, {headers:{...headers, "content-type":"application/javascript"}} );     
+            return api;
         }
-    }
     
-    // custom page html
+        // transpileable files
-    if(!ext)
+        if(Transpile.Check(ext))
-    {
-        const shell = await Configuration.Shell(req, url, ext, ImportMap, Configuration);
-        if(shell)
         {
-            return shell;
+            console.log("transpiling:", proxy);
+            const code = await Transpile.Fetch(proxy, url.pathname);    
+            if(code)
+            {
+                return new Response(code, {headers:{...headers, "content-type":"application/javascript"}} );     
+            } 
         }
-    }
     
-    // cache-reset route
+        // custom page html
-    if(url.pathname === Configuration.Reset)
+        if(!ext)
-    {
-        return new Response(`{"cleared":${Transpile.Clear()}}`, {headers});
-    }
-
-    // all other static files
-    if(ext)
-    {
-        try
         {
-            const type = MIME.typeByExtension(ext);
+            const shell = await Configuration.Shell(req, url, ext, ImportMap, Configuration);
-            const file = await fetch(proxy);
+            if(shell)
-            return new Response(file.body, {headers:{...headers, "content-type":type||""}});
+            {
+                return shell;
+            }
         }
-        catch(e)
+    
+        // cache-reset route
+        if(url.pathname === Configuration.Reset)
         {
-            return new Response(`{"error":"${e}", "path":"${url.pathname}"}`, {status:404, headers});
+            return new Response(`{"cleared":${Transpile.Clear()}}`, {headers});
         }
-    }
     
-    return new Response(`{"error":"unmatched route", "path":"${url.pathname}"}`, {status:404, headers});
+        // all other static files
+        if(ext)
+        {
+            try
+            {
+                const type = MIME.typeByExtension(ext);
+                const file = await fetch(proxy);
+                return new Response(file.body, {headers:{...headers, "content-type":type||""}});
+            }
+            catch(e)
+            {
+                return new Response(`{"error":"${e}", "path":"${url.pathname}"}`, {status:404, headers});
+            }
+        }
     
-});
+        return new Response(`{"error":"unmatched route", "path":"${url.pathname}"}`, {status:404, headers});
     
+    });
+}

run.tsx

@@ -0,0 +1,34 @@
+import * as Serve from "./run-serve.tsx";
+
+Deno.args.forEach(arg=>
+{
+    if(arg.startsWith("--"))
+    {
+        const kvp = arg.substring(2).split("=");
+        Deno.env.set(kvp[0], kvp[1] || "true");
+    }
+});
+const isDeploy = Deno.env.get("dep");
+const isDevelop = Deno.env.get("dev");
+
+export default function(config:Serve.ConfigurationArgs)
+{
+    if(!isDeploy)
+    {
+        Serve.Configure(config)
+        Serve.default();
+    }
+}
+
+if(isDeploy)
+{
+    import("./run-deploy.tsx");
+}
+else
+{
+    if(isDevelop)
+    {
+        await import("./run-local.tsx");
+    }
+    Serve.default();
+}