From 4d8dcf53c5c07a2e2ddaa731bb7d779e8d28b6c5 Mon Sep 17 00:00:00 2001
From: Seth Trowbridge <seth111@gmail.com>
Date: Sat, 29 Apr 2023 21:15:14 -0400
Subject: [PATCH] fix merge errors

---
 example/app.tsx            |   9 ++-
 example/deep/component.tsx |   4 +-
 example/deno.jsonc         |   2 +-
 lib/iso.tsx                | 130 +++++++++++++++++++++++++++----------
 server.tsx                 |  11 +++-
 5 files changed, 113 insertions(+), 43 deletions(-)

diff --git a/example/app.tsx b/example/app.tsx
index 3d6fac1..8a7cd9e 100644
--- a/example/app.tsx
+++ b/example/app.tsx
@@ -6,7 +6,7 @@ const Comp = React.lazy(()=>import("./deep/component.tsx"));
 export default ()=>
 {
     return <div class="p-4 font-sans">
-        <Iso.Metas title="Main Page!"/>
+        <Iso.Meta.Metas title="Main Page!"/>
         <nav class="p-4">
             <a class="text-red-500" href="/">Home</a>
             <a href="/about">About</a>
@@ -20,7 +20,12 @@ export default ()=>
         <Iso.Switch>
             <Iso.Case value="page">
                 <Iso.Switch>
-                    <Iso.Case value="about-us">About us!</Iso.Case>
+                    <Iso.Case value="about-us">
+                        <>
+                            <Iso.Meta.Metas title="About US"/>
+                            About us!
+                        </>
+                    </Iso.Case>
                     <Iso.Case default>sorry no page</Iso.Case>
                 </Iso.Switch>
             </Iso.Case>
diff --git a/example/deep/component.tsx b/example/deep/component.tsx
index 7fa1bf2..39f4ed4 100644
--- a/example/deep/component.tsx
+++ b/example/deep/component.tsx
@@ -10,10 +10,10 @@ export default ()=>
     const [Data, Updating] = Iso.Fetch.Use(`https://catfact.ninja/fact`);
 
 
-    console.log("render!!")
+    console.log("component.tsx render!!")
 
     return <div class="p-4 text-red-500">
-        <Iso.Metas title="Component!"/>
+        <Iso.Meta.Metas title="Component!"/>
         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>
diff --git a/example/deno.jsonc b/example/deno.jsonc
index dc2d7a4..2c2f6e0 100644
--- a/example/deno.jsonc
+++ b/example/deno.jsonc
@@ -9,6 +9,6 @@
         "@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"
     }
 }
\ No newline at end of file
diff --git a/lib/iso.tsx b/lib/iso.tsx
index 5a56087..42b621b 100644
--- a/lib/iso.tsx
+++ b/lib/iso.tsx
@@ -12,34 +12,89 @@ if(!window.innerWidth)
     import(import.meta.resolve("../../server.tsx")).then(()=>{console.log("...imported!");});
 }
 
+type MetasInputs = { [Property in MetaKeys]?: string };
+type MetasModeArgs = {concatListed?:boolean; 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:""
-};
 
-type MetasInputs = { [Property in MetaKeys]?: string };
-export const Metas =(props:{concatListed?:boolean; dropUnlisted?:boolean}&MetasInputs):null=>
+export const Meta =
 {
-    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);
-    })
-    if(window.innerWidth)
+    Stack:[] as Array<MetasStackItem>,
+    Meta: {
+        title:"",
+        description:"",
+        keywords:"",
+        image:"",
+        canonical:""
+    } as Meta,
+    Context: React.createContext([[], ()=>{}] as [Get:MetasStackItem[], Set:React.StateUpdater<MetasStackItem[]>]),
+    Provider({children}:{children:Children})
     {
-        document.title = Meta.title;
-    }
+        const binding = React.useState([] as MetasStackItem[]);
+        
+        React.useEffect(()=>{
+            const stack = binding[0];
+            const last = stack[stack.length-1];
+            console.log("updating page title", stack);
+            document.title = last?.title||"";
+        })
+        return <Meta.Context.Provider value={binding}>{children}</Meta.Context.Provider>;
+    },
+    Metas({concatListed=false, dropUnlisted=false, ...props}:MetasModeArgs&MetasInputs):null
+    {
+        const id = React.useId();
+        const [, metasSet] = React.useContext(Meta.Context);
+        const {depth} = React.useContext(SwitchContext);
 
-    return null;
-}
+        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] ));
+
+        return null;
+    }
+};
 
 
 export type Children = string | number | React.JSX.Element | React.JSX.Element[];
@@ -90,14 +145,19 @@ export const Router = {
             document.addEventListener("click", e=>
             {
                 const t = e.target as HTMLAnchorElement;
-                if(t.href)
+                const path = e.composedPath() as HTMLAnchorElement[];
+                for(let i=0; i<path.length; i++)
                 {
-                    const u = new URL(t.href);
-                    if(u.origin == document.location.origin)
+                    if(path[i].href)
                     {
-                        e.preventDefault();
-                        const parts = Router.Parse(u);
-                        routeUpdate(parts.Path, parts.Params, parts.Anchor);
+                        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;
                     }
                 }
             })
@@ -161,7 +221,7 @@ export const Switch =({children}:{children:Children})=>
             }
             if(childCase?.props?.default && !fallback)
             {
-                console.log(routeSegment);
+                //console.log(routeSegment);
                 fallback = childCaseChildren;
             }
         } 
@@ -200,7 +260,7 @@ export const Fetch = {
             inCheck.Promise = fetch(URL, Init?Init:undefined).then(resp=>resp.json()).then((json)=>{
                 inCheck.JSON = json;
                 inCheck.CachedAt = new Date().getTime();
-                console.log(`...cached!`);
+                //console.log(`...cached!`);
                 return inCheck;
             });
             return inCheck;
@@ -211,7 +271,7 @@ export const Fetch = {
             // not in the cache
             // - listen
 
-            console.log(`making new cache record...`);
+            //console.log(`making new cache record...`);
             return [load({URL, CacheFor, CachedAt:0, CacheOnServer, DelaySSR, Seed}), false, true];
         }
         else if(check.CachedAt == 0)
@@ -220,26 +280,26 @@ export const Fetch = {
             // - listen
             // - possibly init if there is something in JSON
 
-            console.log(`currently being cached...`);
+            //console.log(`currently being cached...`);
             return [check, check.JSON ? true : false, true];
         }
         else
         {
-            console.log(`found in cache...`);
+            //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...`);
+                //console.log(`...outdated...`);
                 return [load(check), true, true];
             }
             else
             {
                 // cached and ready
                 // - init
-                console.log(`...retrieved!`);
+                //console.log(`...retrieved!`);
                 return [check, true, false];
             }
 
diff --git a/server.tsx b/server.tsx
index c81d508..f912b27 100644
--- a/server.tsx
+++ b/server.tsx
@@ -391,7 +391,7 @@ else if(App && TwindInst)
     `<!doctype html>
     <html lang="en">
         <head>
-            <title>${Iso.Meta.title}</title>
+            <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>
@@ -403,11 +403,16 @@ else if(App && TwindInst)
                 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} from "@eno/iso";
+                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, hmrWrap), document.querySelector("#app"));
+                hydrate(
+                    H(Router.Provider, null,
+                        H(Meta.Provider, null, hmrWrap)
+                    ),
+                    document.querySelector("#app")
+                );
             </script>
         </body>
     </html>`;