Merge branch 'master' of https://gitea.hptrow.me/SethTrowbridge/able-baker

Reviewed-on: #14

.gitingore

@@ -1 +1,2 @@
 deno.lock
+.env

.vscode/launch.json

@@ -5,13 +5,17 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "request": "launch",
             "name": "Debug Serve Mode",
+            "request": "launch",
             "type": "node",
-            "cwd": "${workspaceFolder}/example",
             "runtimeExecutable": "deno",
             "runtimeArgs": ["task", "debug"],
             "attachSimplePort": 9229
+        },
+        {
+            "name":"Attach",
+            "request": "attach",
+            "type": "node"
         }
     ]
 }

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "deno.enable": true
-}

app.tsx

@@ -1,3 +1,7 @@
+import * as ISO from ">able/iso-elements.tsx";
+
+console.log(ISO)
+
 export default ()=><div>
-    <h1>App!</h1>
+    <h1 class="p-4 bg-red-500 text-white">App</h1>
 </div>;

checker.tsx

@@ -167,10 +167,10 @@ export async function Check()
             const importMap = imports.json.imports as Record<string, string>;
             const bake =async(obj:ConfigCheck)=> await Deno.writeTextFile(Deno.cwd()+"/"+obj.path, JSON.stringify(obj.json, null, "\t")); 
 
-            importMap["react"] = `https://esm.sh/preact@10.18.1/compat`;
+            importMap["react"] = `https://esm.sh/preact@10.20.2/compat`;
-            importMap["react/"] = `https://esm.sh/preact@10.18.1/compat/`;
+            importMap["react/"] = `https://esm.sh/preact@10.20.2/compat/`;
-            importMap["@preact/signals"] = `https://esm.sh/@preact/signals@1.2.1`;
+            importMap["@preact/signals"] = `https://esm.sh/@preact/signals@1.2.3?deps=preact@10.20.2`;
-            importMap["@twind/core"] = `https://esm.sh/@twind/core@1.1.3`;
+            importMap["@twind/core"] = `https://esm.sh/v126/@twind/core@1.1.3/es2022/core.mjs`;
             importMap[">able/"] = `${RootHost}`;
             if(!importMap[">able/app.tsx"])
             {
@@ -199,8 +199,7 @@ export async function Check()
             const optionsRequired = 
             {
                 "lib": ["deno.window", "dom", "dom.iterable", "dom.asynciterable"],
-                "jsx": "react-jsx",
+                "jsx": "react-jsx"
-                "jsxImportSource": "react"
             }
             const optionsCurrent = config.json.compilerOptions as Record<string, string|string[]> || {};
             //const compLib:string[] = compOpts.lib as string[] || [];
@@ -218,7 +217,6 @@ export async function Check()
             });
 
             optionsCurrent.jsx = optionsRequired.jsx;
-            optionsCurrent.jsxImportSource = optionsRequired.jsxImportSource;
             config.json.compilerOptions = optionsCurrent;
 
             await bake(imports);

cli.tsx

@@ -118,12 +118,12 @@ if(arg._.length)
                 "-A",
                 "--no-lock",
                 `--config=${config.path}`,
-                "https://deno.land/x/deploy/deployctl.ts",
+                "https://deno.land/x/deploy@1.12.0/deployctl.ts",
                 "deploy",
                 `--project=${useProject}`,
                 `--token=${useToken}`,
                 `--import-map=${imports.path}`,
-                `--exclude=.*,.*/,`,
+                `--exclude=.*`,
                 ...scanProd,
                 RootHost+"run.tsx"];
 

deno.jsonc

@@ -1,29 +1,28 @@
 {
 	"imports": {
-		"react": "https://esm.sh/preact@10.18.1/compat",
+
-		"react-original": "https://esm.sh/preact@10.18.1/compat",
+		"react": "https://esm.sh/preact@10.20.2/compat",
-		"react/": "https://esm.sh/preact@10.18.1/compat/",
+		"react-original": "https://esm.sh/preact@10.20.2/compat",
-		"@preact/signals": "https://esm.sh/@preact/signals@1.2.1",
+		"react-original/": "https://esm.sh/preact@10.20.2/compat/",
-		"signals-original": "https://esm.sh/@preact/signals@1.2.1",
+		"react/": "https://esm.sh/preact@10.20.2/compat/",
-		"@twind/core": "https://esm.sh/@twind/core@1.1.3",
+		"@preact/signals": "https://esm.sh/@preact/signals@1.2.3?deps=preact@10.20.2",
-		">able/": "http://localhost:4507/",
+		"signals-original": "https://esm.sh/@preact/signals@1.2.3?deps=preact@10.20.2",
+		"@twind/core": "https://esm.sh/v126/@twind/core@1.1.3/es2022/core.mjs",
+
+		">other/": "https://esm.sh/",
+		">able/": "./",
 		">able/app.tsx": "./app.tsx"
 	},
 	"tasks": {
-		"check": "deno run -A --no-lock http://localhost:4507/cli.tsx check",
+		"check": "deno run -A --no-lock ./cli.tsx check",
-		"local": "deno run -A --no-lock http://localhost:4507/cli.tsx local",
+		"local": "deno run -A --no-lock ./cli.tsx local",
-		"debug": "deno run -A --no-lock http://localhost:4507/cli.tsx debug",
+		"debug": "deno run -A --no-lock ./cli.tsx debug",
-		"serve": "deno run -A --no-lock http://localhost:4507/cli.tsx serve",
+		"serve": "deno run -A --no-lock ./cli.tsx serve",
-		"cloud": "deno run -A --no-lock http://localhost:4507/cli.tsx cloud",
+		"cloud": "deno run -A --no-lock ./cli.tsx cloud",
-		"install": "deno install -A -r -f -n able http://localhost:4507/cli.tsx"
+		"install": "deno install -A -r -f -n able ./cli.tsx"
 	},
 	"compilerOptions": {
 		"jsx": "react-jsx",
-		"jsxImportSource": "react",
+		"lib": ["deno.window", "dom", "dom.iterable", "dom.asynciterable"]
-		"lib": [
-			"deno.window",
-			"dom",
-			"dom.asynciterable"
-		]
 	}
 }

deno.lock

@@ -0,0 +1,32 @@
+{
+  "version": "3",
+  "remote": {
+    "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.194.0/_util/asserts.ts": "178dfc49a464aee693a7e285567b3d0b555dc805ff490505a8aae34f9cfb1462",
+    "https://deno.land/std@0.194.0/collections/filter_values.ts": "5b9feaf17b9a6e5ffccdd36cf6f38fa4ffa94cff2602d381c2ad0c2a97929652",
+    "https://deno.land/std@0.194.0/collections/without_all.ts": "a89f5da0b5830defed4f59666e188df411d8fece35a5f6ca69be6ca71a95c185",
+    "https://deno.land/std@0.194.0/dotenv/mod.ts": "39e5d19e077e55d7e01ea600eb1c6d1e18a8dfdfc65d68826257a576788da3a4",
+    "https://deno.land/std@0.194.0/flags/mod.ts": "17f444ddbee43c5487568de0c6a076c7729cfe90d96d2ffcd2b8f8adadafb6e8",
+    "https://deno.land/x/jsonct@v0.1.0/mod.ts": "dba7e7f3529be6369f5c718e3a18b69f15ffa176006d2a7565073ce6c5bd9f3f",
+    "https://deno.land/x/jsonct@v0.1.0/src/_util/asserts.ts": "178dfc49a464aee693a7e285567b3d0b555dc805ff490505a8aae34f9cfb1462",
+    "https://deno.land/x/jsonct@v0.1.0/src/parse.ts": "a3a016822446b0584b40bae9098df480db5590a9915c9e3c623ba2801cf1b8df",
+    "https://esm.sh/@swc/wasm-web@1.3.62": "b43fb5cde95beb7736182fa62250235dfa6b71717b9d38aa4e6077f05ec90e5e",
+    "https://esm.sh/preact@10.20.2/compat/jsx-runtime": "e3942a5ffd734d5eaf0790ada3ed4ad81c0c0c2ff56a8e4740247de259f7fb65",
+    "https://esm.sh/stable/preact@10.20.2/denonext/compat.js": "2e0564fd10e09b587503f9ecd4407ac8726c79beae80026ac89034a47b270c68",
+    "https://esm.sh/stable/preact@10.20.2/denonext/compat/jsx-runtime.js": "fbbbceb98af95d1c73181f9e5043fad6cdae30ef9e5fcf90d44ffd6fa6055c02",
+    "https://esm.sh/stable/preact@10.20.2/denonext/hooks.js": "91d64a217b2f2c9f724042d0ed1b87bf3edf721261e86358aa6fd55501ee915f",
+    "https://esm.sh/stable/preact@10.20.2/denonext/jsx-runtime.js": "2a5b981955e92e3ff86906ac0e5955ec0e6e5ca71032f3f063912cb85ae9a7f1",
+    "https://esm.sh/stable/preact@10.20.2/denonext/preact.mjs": "f418bc70c24b785703afb9d4dea8cdc1e315e43c8df620a0c52fd27ad9bd70eb",
+    "https://esm.sh/v135/@swc/wasm-web@1.3.62/denonext/wasm-web.mjs": "57046d46c9ef1398a294ba7447034f5966e48866a05c309cccec4bb4d6e7c61b"
+  }
+}

deno__.json

@@ -1,20 +0,0 @@
-{
-    "compilerOptions": { "lib": ["deno.window", "dom"],
-        "jsx": "react-jsx",
-        "jsxImportSource": "react"
-    },
-    "imports":
-    {
-        "react":"https://esm.sh/preact@10.15.1/compat",
-        "react/":"https://esm.sh/preact@10.15.1/compat/",
-        "react-original":"https://esm.sh/preact@10.15.1/compat",
-
-    },
-    "tasks":
-    {
-        "local": "deno run -A --reload=http://localhost:4507 --no-lock ./run-local.tsx --port=1234",
-        "serve": "deno run -A --reload=http://localhost:4507 --no-lock ./run-serve.tsx --port=1234",
-        "cloud": "deno run -A --reload=http://localhost:4507 --no-lock ./run-deploy.tsx",
-        "debug": "deno run -A --reload=http://localhost:4507 --no-lock --inspect-wait  ./run-serve.tsx --port=1234",
-    }
-}

run-browser.tsx

@@ -10,17 +10,15 @@ const Configure =
   hash: false
 } as TW.TwindUserConfig;
 
-export const Shadow =(inElement:HTMLElement, inConfig?:TW.TwindUserConfig)=>
+export const Shadow =(inElement:HTMLElement, inConfig:TW.TwindUserConfig)=>
 {
-    const merge = inConfig ? {...Configure, ...inConfig} : Configure;
-
     const ShadowDOM = inElement.attachShadow({ mode: "open" });
     const ShadowDiv = document.createElement("div");
     const ShadowCSS = document.createElement("style");
 
     ShadowDOM.append(ShadowCSS);
     ShadowDOM.append(ShadowDiv);
-    TW.observe(TW.twind(merge, TW.cssom(ShadowCSS)), ShadowDiv);
+    TW.observe(TW.twind(inConfig, TW.cssom(ShadowCSS)), ShadowDiv);
     return ShadowDiv;
 };
 
@@ -40,13 +38,15 @@ export default async(inSelector:string, inModulePath:string, inMemberApp="defaul
 
   const module = await import(inModulePath);
 
+  const merge = inMemberCSS ? {...Configure, ...module[inMemberCSS]} : Configure;
+
   if(inShadow)
   {
-    dom = Shadow(dom as HTMLElement, module[inMemberCSS]);
+    dom = Shadow(dom as HTMLElement, merge);
   }
   else
   {
-    TW.install(Configure);
+    TW.install(merge);
   }
 
   const app = React.createElement(()=> React.createElement(module[inMemberApp], null), null);

run-local.tsx

@@ -1,4 +1,5 @@
-import {Configure, Transpile, Extension, Root} from "./run-serve.tsx";
+import {Configure, Transpile, Extension} from "./run-serve.tsx";
+import { Root } from "./checker.tsx";
 import * as Collect from "./hmr-static.tsx";
 
 const SocketsLive:Set<WebSocket> = new Set();

run-serve.tsx

@@ -1,49 +1,33 @@
 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 { HuntConfig } from "./checker.tsx";
+import { HuntConfig, Root } from "./checker.tsx";
 import CustomServe from ">able/api.tsx"; 
 
-export const Root = new URL(`file://${Deno.cwd().replaceAll("\\", "/")}`).toString();
-
 type DenoConfig = {imports:Record<string, string>};
 const ImportMap:DenoConfig = {imports:{}};
-let ImportMapProxies:Record<string, string> = {};
 
 const ImportMapReload =async()=>
 {
-    const [, {json, path}] = await HuntConfig();
+    const [, {json}] = await HuntConfig();
     const imports = (json as DenoConfig).imports;
 
     if(imports)
     {
-        ImportMapProxies = {};
         Object.entries(imports).forEach(([key, value])=>
         {
+            // re-write deno project-relative paths (e.g. "./app.tsx") to root-relative for the browser ("/app.tsx"); 
             if(value.startsWith("./"))
             {
                 imports[key] = value.substring(1);
             }
-            if(key.startsWith(">"))
+
+            if(key.startsWith(">") && key.endsWith("/"))
             {
-                if(value.startsWith("./"))
-                {
-                    ImportMapProxies[encodeURI(key)] = value.substring(1);
-                    imports[key] = value.substring(1); 
-                }
-                else
-                {
-                    ImportMapProxies["/"+encodeURI(key)] = value;
                 imports[key] = "/"+key;
             }
-            }
         });
 
         ImportMap.imports = Configuration.Remap(imports, Configuration);
-
-    }
-    else
-    {
-
     }
 
 };
@@ -193,21 +177,9 @@ export default async()=>
         // proxy imports
         if(url.pathname.startsWith(encodeURI("/>")))
         {
-            let bestMatch="";
+            /** pathname with no leading slash */
-            for(let key in ImportMapProxies)
+            const clippedPath = decodeURI(url.pathname.substring(1));
-            {
+            proxy = import.meta.resolve(clippedPath);
-                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;
-    
-            }     
         }
     
         // allow for custom handlers
@@ -225,7 +197,6 @@ export default async()=>
         // transpileable files
         if(Transpile.Check(ext))
         {
-            console.log("transpiling:", proxy);
             const code = await Transpile.Fetch(proxy, url.pathname);    
             if(code)
             {

things.md

@@ -1,56 +0,0 @@
-# Outpost
-
-## Deno Deploy
-```
-accept:  */*
-accept-encoding:  gzip, br
-accept-language:  *
-cdn-loop:  deno;s=deno;d=ah40t9m8n54g
-host:  bad-goat-66.deno.dev
-user-agent:  Deno/1.34.1
-```
-
-## Deno
-```
-accept:  */*
-accept-encoding:  gzip, br
-accept-language:  *
-host:  bad-goat-66.deno.dev
-user-agent:  Deno/1.34.3
-```
-
-## Edge
-```
-accept:  text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7
-accept-encoding:  gzip, deflate, br
-accept-language:  en-US,en;q=0.9
-host:  bad-goat-66.deno.dev
-referer:  https://dash.deno.com/
-sec-ch-ua:  "Microsoft Edge";v="117", "Not;A=Brand";v="8", "Chromium";v="117"
-sec-ch-ua-mobile:  ?0
-sec-ch-ua-platform:  "Windows"
-sec-fetch-dest:  iframe
-sec-fetch-mode:  navigate
-sec-fetch-site:  cross-site
-upgrade-insecure-requests:  1
-user-agent:  Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36 Edg/117.0.0.0
-```
-
-## Firefox
-```
-accept:  text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8
-accept-encoding:  gzip, deflate, br
-accept-language:  en-US,en;q=0.5
-host:  bad-goat-66.deno.dev
-sec-fetch-dest:  document
-sec-fetch-mode:  navigate
-sec-fetch-site:  cross-site
-te:  trailers
-upgrade-insecure-requests:  1
-user-agent:  Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/114.0
-```
-
-When a requet comes in:
-- if its for a transpile-able document:
-  - if its a request from deno:
-    -