app.js

@@ -1,378 +1,120 @@
-/** @import * as TYPES from "./graph/types.ts" */
+/** @import * as TYPES from "./types.ts" */
+
 import * as FSHandle from "./store-directory-handle.js";
 
-import Styles from "./styles.js";
+/** @type {(type:string, attributes?:Record<string, string>, ...children:Array<string|HTMLElement>)=>HTMLElement} */
-const {DOM, Div, Tag} = Styles;
+const H =(type, attributes={}, ...children)=> {
-
+  const el =document.createElement(type);
-async function PickHandle()
+  Object.entries(attributes).forEach(([name, data])=>{
+    if(name.startsWith("on"))
     {
-    handle = await showDirectoryPicker();
+      el.addEventListener(name.substring(2), data);
-    await FSHandle.setDirectoryHandle(handle);
-    await LoadHandleFiles();
     }
-async function LoadHandleFiles()
+    else
     {
-    console.log("fetching room.js", handle);
+      el.setAttribute(name, data)
-    if(handle)
+    }
+    
+  });
+  
+  children.forEach(child=>
   {
+    el.appendChild(typeof child == "string" ? document.createTextNode(child) : child);
+  });
+  return el;
+}
+const button = H("button");
+const listRoom = H("ul");
+
+/** @type {(errorAction?:()=>void)=>Promise<void>} */
+async function ReloadAndRedraw(errorAction = ()=>{})
+{
+  listRoom.innerHTML = "";
+
   try
   {
-            const module = await import("./graph/room.js"+"?bust="+Math.random());
+    const handle = await FSHandle.getDirectoryHandle();
+    if(!handle)
+    {
+      console.log("no fs handle")
+      throw new Error("no fs handle set yet")
+    }
+    button.setAttribute("disabled", true);
+    button.innerText = "loading...";
+
+    const module = await import("./data/room.js"+"?rand="+Math.random());
     /** @type {Record<string, TYPES.GraphParts>} */
-            const read = module.default();
+    const rooms = module.default();
+    button.innerText = "change directory";
+    console.log("rooms loaded:", rooms);
 
-            for(const roomKey in read)
+    Redraw(rooms);
-            {
-                const room = read[roomKey]
-                for(const pass in room.Pass)
-                {
-                    await room.Pass[pass].load();
-                }
-            }
 
-            rooms.val = read;
   }
   catch(e)
   {
-            console.log("the handle exists, but the request failed. the service work must not be ready yet.", e)
+    errorAction();
-            rooms.val = {};
+    button.innerText = "select directory";
   }
+  button.removeAttribute("disabled")
 }
-    else
+
+
+function Redraw(rooms)
 {
-        console.log("no fs handle has been set, cannot get room graph")
+  Object.entries(rooms).forEach(([roomID, roomData])=>
-        rooms.val = {};
-    }
-}
-
-/** @type {Van.State<Record<string, TYPES.GraphParts>>} */
-const rooms = van.state({});
-let handle = await FSHandle.getDirectoryHandle();
-await LoadHandleFiles();
-
-
-
-/** @type {Van.State<TYPES.User|false>} */
-const loggedIn = van.state(false);
-
-const blocking = van.state(false);
-
-const showDesks = van.state(true, "desks");
-
-/** @type {(inParts:Record<string, TYPES.Part>, inPasses:Record<string, TYPES.Pass>)=>HTMLElement} */
-function Parts(inParts, inPasses)
   {
-    const rows = [];
+    const listPass = H("ul");
+    Object.entries(roomData.Pass).forEach(([passID, passData])=>{
 
-    const row = [DOM.th()]
+      listPass.appendChild(H("li", {}, 
-    for(const pass in inPasses)
+        H("button", { onclick:async()=>
           {
-        row.push(DOM.th(inPasses[pass].name));
+            await passData.load();
-    }
+            globalThis.ROOM=roomData;
-    rows.push(DOM.thead(row));
+            Redraw(rooms)
-
+          } }, passData.name),
-    Object.entries(inParts).map(([part_id, part])=>{
+      ))
-
-        const row = [DOM.th(part.name)];
-        for(const [pass, data] of part.pass)
-        {
-            row.push(DOM.td.Part(data.work.map(w=>Div.Plain(w[1]) )))
-        }
-        rows.push(DOM.tr(row))
     });
 
-    return DOM.table.GapVertical(rows);
-}
     
-//const deskRender = van.state(0);
+    const listPart = H("ul");
+    Object.entries(roomData.Part).forEach(([partId, partData])=>{
 
-/** @type {(part:TYPES.Part, pass:TYPES.Pass, closeHandler:()=>void)=>HTMLElement} */
+      const listWork = H("dl");
-function PartEditor(part, pass, closeHandler)
-{
-    const partPass = part.pass?.get(pass);
 
-    const hist = van.state(false);
+      partData.pass.entries().forEach(([pass, passMapper])=>{
-    const edit = van.state(false);
+        listWork.appendChild(H("dt", {}, pass.name))
+        passMapper.work.forEach((w)=>{
+          listWork.appendChild(H("dd", {}, w.join(" ")))
+        })
+      })
 
-    const upper = ()=>{
+      listPart.appendChild(H("li", {}, 
-        if(partPass?.work.length)
+        H("h2", {}, partData.name),
-        {
+        listWork
-            return DOM.div(
+      ));
-                DOM.button(
+    })
-                    {
+
-                        onclick()
+    listRoom.innerHTML = "";
-                        {
+    listRoom.appendChild(
-                            hist.val=!hist.val;
+      H("li", {},
-                        }
+        H("div", {}, roomID),
-                    }, ()=>(hist.val ? "hide" : "show")+" changes"
+        listPass,
-                ),
+        H("div", {}, listPart)
-                hist.val ? partPass.work.map(w=>{
+      )
-                    const date = new Date(w[0]);
-                    return DOM.div(`${date.getMonth()}/${date.getDate()}`, DOM.strong(w[1]), w[2].name);
-                }) : ""
     );
-        }
-        else
-        {
-            return "";
-        }
-    }
-
-    const lower = ()=>
-    {
-        return DOM.div(
-            ()=>{
-                return loggedIn.rawVal ? DOM.button(
-                    {onclick(){edit.val = !edit.val;}},
-                    ()=>(edit.val ? "cancel" : "make") + " changes"
-                ) : DOM.p("log in to make changes")
-            },
-            ()=>{
-                const textarea = DOM.textarea()
-                return edit.val ? DOM.div(
-                    textarea,
-                    DOM.button({
-                        onclick(){
-                            if(loggedIn.rawVal && partPass)
-                            {
-                                blocking.val = true;
-                                partPass.make(loggedIn.rawVal, textarea.value).then(()=>{
-                                    blocking.val = false;
-                                    //deskRender.val++;
   })
 }
-                            else
+
+await ReloadAndRedraw();
+
+button.addEventListener("click", async()=>
 {
-                                return false;
+  const directory = await globalThis.showDirectoryPicker();
-                            }
+  await FSHandle.setDirectoryHandle(directory);
-                        }
+  await ReloadAndRedraw(()=>alert("Invalid directory"));
-                    }, "save changes")
+});
-                ) : ""
-            }
-        )
-    }
 
-    const self = DOM.div(
+document.body.appendChild(button);
-        upper,
+document.body.appendChild(listRoom);
-        ()=>DOM.button({onclick(e){e.stopPropagation(); closeHandler(this.parentElement)}}, "close"),
-        DOM.div(
-            ()=>{
-                if(partPass)
-                {
-                    return partPass.work.find((w)=>w[0] == partPass.time)?.[1] || ""
-                }
-                return "(no data yet)";
-            }
-        ),
-        lower,
-    );
-
-    return self;
-}
-
-/** @type {(inDesks:Record<string, TYPES.Desk>)=>HTMLElement} */
-function Desks(inDesks)
-{
-    return Div.PartGroup(
-        Object.entries(inDesks).map(([desk_id, desk])=>{
-
-            //loggedIn.val;
-
-            //deskRender.val;
-            //console.log("reredering desk", desk.name);
-
-            if (loggedIn.val)
-            {
-                let userInRole = false;
-                for(const role of desk.role)
-                {
-                    if(role.user.includes(loggedIn.val))
-                    {
-                        userInRole = true;
-                    }
-                }
-                if(!userInRole)
-                {
-                    return null;
-                }
-            }
-
-
-            const work = [];
-            for(const [pass, scan] of desk.pass)
-            {
-
-                // at least one but not all need fields are empty
-                const caution = scan.need_empty.length>0 && scan.need_empty.length<desk.need.length;
-
-                work.push(DOM.tr(
-                    DOM.td(pass.name),
-                    desk.need.map((part, index, array)=>
-                    {
-                        const partPass = part.pass.get(pass);
-                        if(!partPass){ return null }
-                        const latest = partPass.work.find(t=>t[0] == partPass.time)?.[1];
-
-                        const attributes = {};
-
-                        if(latest)
-                        {
-                            attributes.class = Tag("PartGood")
-                        }
-                        else
-                        {
-                            attributes.class = Tag("PartEmpty")
-                        }
-
-                        if(scan.need_dirty.includes(index))
-                        {
-                            attributes.class = Tag("PartDirty")
-                        }
-
-                        return DOM.td(
-                            Div.Part(
-                                attributes,
-                                latest
-                            )
-                        );
-                    }),
-                    DOM.td(
-                        Div.Icon("⇉"),
-                        scan.due_date ? Div.Part(
-                            scan.due_date.toLocaleDateString(),
-                            scan.due_date.toLocaleTimeString()
-                        ) : " "
-                    ),
-                    desk.make.map((part, index, array)=>
-                    {
-                        const partPass = part.pass.get(pass);
-                        if(!partPass){ return null }
-                        const latest = partPass.work.find(t=>t[0] == partPass.time)?.[1];
-                        
-                        const attr = "data-editing"
-                        function close(editor){
-                            editor.remove();
-                            this.setAttribute(attr, "false");
-                        }
-
-                        const attributes = {
-                            onclick(){
-                                
-                                const check = this.getAttribute(attr);
-                                if(check !== "true")
-                                {
-                                    this.setAttribute(attr, "true");
-                                    this.appendChild(PartEditor(part, pass, close.bind(this)));
-                                }
-                            }
-                        };
-                        
-                        if(latest)
-                        {
-                            attributes.class = Tag("PartGood")
-                        }
-                        else
-                        {
-                            attributes.class = Tag("PartEmpty")
-                        }
-
-                        if( (desk.need.length==0 && !latest) || scan.make_dirty.includes(index))
-                        {
-                            
-                            if(!latest && caution)
-                            {
-                                attributes.class = Tag("PartCaution")
-                            }
-                            else
-                            {
-                                attributes.class = Tag("PartDirty");
-                            }
-                        }   
-
-                        return DOM.td(
-                            Div.Part(
-                                attributes,
-                                latest
-                            )
-                        );
-                    }),
-                ))
-            }
-
-            return Div.DeskContainer(
-                DOM.h3(desk.name),
-                DOM.table.GapHorizontal(
-
-                    DOM.thead(
-                        DOM.tr(
-                            DOM.th(),
-                            desk.need.map((part, index)=>DOM.th(part.name)),
-                            DOM.th("→"),
-                            desk.make.map((part, index)=>DOM.th(part.name))
-                        )
-                    ),
-                    work
-                )
-            )
-
-
-        }),
-    )
-}
-
-/** @type {(room_id:string, graphParts:TYPES.GraphParts)=>HTMLElement} */
-function Room(room_id, graphParts)
-{
-    const rerender = van.state(0);
-    blocking.val;
-
-    return Div.Plain(
-
-        Div.Plain("Users:"),
-        Div.PartGroup(
-            Object.entries(graphParts.User).map(([user_id, user])=>{
-                return Div.Part(
-                        DOM.div.Plain(user.name),
-                        ()=>{
-                            return DOM.button.Plain(
-                                {onclick(){
-                                    loggedIn.val = (loggedIn.val == user) ? false : user;
-                                }},
-                                loggedIn.val == user ? "this is me" : "impersonate"
-                            )
-                        },
-                )
-
-            })
-        ),
-
-        ()=>{
-            return DOM.button({onclick(){
-                showDesks.val = !showDesks.val;
-            }}, showDesks.val ? "Show Parts" : "Show Desks")
-        },
-
-        ()=>{
-            rerender.val;
-            return showDesks.val ? Desks(graphParts.Desk) : Parts(graphParts.Part, graphParts.Pass);
-        },
-
-
-        ()=>{
-            return blocking.val ? Div.BlockScreen() : null
-        }
-
-    )
-}
-
-function App()
-{
-    return Div.Plain(
-        DOM.button({onclick:PickHandle}, "Pick Directory"),
-        Object.entries(rooms.val).map(([room_id, graphParts])=>
-            Room(room_id, graphParts)
-        )
-    )
-}
-
-van.add(document.body, App);

data/room.js

@@ -0,0 +1,27 @@
+import Graph from "../graph.js";
+import User from "./user.js";
+
+export default Graph(
+    {
+        room_01:{
+            user:User,
+            role:
+            {
+                dev:["Development", "u1"]
+            },
+            part:
+            {
+                p1:"hey",
+                p2:"sup"
+            },
+            desk:
+            {
+                d1:["Desk 01", ["dev"], "one", {p1:3}, "p2"]
+            },
+            pass:{
+                pass_01:["pass 01"],
+                pass_02:["pass 02"]
+            }
+        }
+    }
+);

data/user.js

@@ -0,0 +1,4 @@
+export default {
+    u1:"seth",
+    u2:"seth2"
+}

deep/mock-user-folder/graph/room.js

@@ -1,43 +0,0 @@
-//@ts-check
-import CreateAllRooms, {Room} from "../../graph/graph.js";
-
-const user = {
-    u1:"Seth T",
-    u4:"Sarah S",
-    u5:"Adam M",
-    u6:"Matt Y",
-    u7:"Seth F",
-    u8:"Brittany F"
-};
-
-export default CreateAllRooms({
-    room_01:Room({
-        user,
-        role:{
-              dev:["Development", "u1"],
-            write:["Writing", "u5"],
-            admin:["Admin", "u4"]
-        },
-        part:{
-            p1:["Page title"],
-            p2:["Page slug"],
-            p3:["Page preview"],
-            p4:["Page Project"],
-            p5:["Page Corrections", "loop"],
-        },
-        desk:{
-            d1:["Write page metas",   ["admin", "write"], {                }, "p1", "p2"],
-            d2:["Build Page preview", ["admin", "dev"  ], {p1:1, p2:1, p5:4}, "p3", "p4"],
-            d3:["Proof Page",         ["admin", "write"], {p3:1,           }, "p5"      ]
-        },
-        pass:{
-            pass_01:["January"],
-            //pass_02:["February"],
-            //pass_03:["March"],
-            //pass_04:["April"],
-            //pass_05:["May"],
-            //pass_06:["June"],
-            //pass_07:["July"],
-        }
-    })
-});

deno.json

@@ -1,8 +1,8 @@
 {
-    "compilerOptions":
+    "compilerOptions": {
-    {
         "checkJs": true,
-            "lib": ["deno.window", "DOM"],
+        "lib":[
-          "types": ["https://treetopflyer.github.io/gale/types.d.ts"]
+            "deno.window", "dom"
+        ]
     }
 }

graph.js

@@ -1,10 +1,7 @@
 /** @import * as TYPES from "./types.ts" */
-import * as FSAccess from "../store-directory-handle.js";
-
-export const noop = "no-op";
 
 /** @type {TYPES.GraphBuilder} */
-export function Room({user, role, part, desk, pass})
+function Builder({user, role, part, desk, pass}, folderName)
 {
 
 // mutate users
@@ -14,8 +11,7 @@ export function Room({user, role, part, desk, pass})
     for(let userId in user)
     {
         const name = user[userId];
-
+        UserList[userId] = {name, desk:new Set()};
-        UserList[userId] = {name, id:userId, desk:new Set()};
     }
 
 // mutate roles
@@ -25,7 +21,7 @@ export function Room({user, role, part, desk, pass})
     for(let roleId in role)
     {
         const [name, ...userIds] = role[roleId];
-        RoleList[roleId] = {name, id:roleId, user:userIds.map(uId=>UserList[/**@type{string}*/(uId)])};
+        RoleList[roleId] = {name, user:userIds.map(uId=>UserList[/**@type{string}*/(uId)])};
     }
 
 // mutate parts
@@ -34,9 +30,8 @@ export function Room({user, role, part, desk, pass})
     const PartList = part;
     for(let partId in part)
     {
-        const [name, loop] = part[partId];
+        const name = part[partId];
-
+        PartList[partId] = /** @type {TYPES.Part} */({name, need:[], make:[], pass:new Map()});
-        PartList[partId] = /** @type {TYPES.Part} */({name, id:partId, need:[], make:[], pass:new Map(), loop:loop});
     }
 
 // mutate desks
@@ -45,14 +40,14 @@ export function Room({user, role, part, desk, pass})
     const DeskList = desk;
     for(let deskId in desk)
     {
-        const [name, roleIDs, needObj, ...makePartIDs] = desk[deskId];
+        const [name, roleIDs, mode, needObj, ...makePartIDs] = desk[deskId];
         /** @type {TYPES.Part[]}*/ const need =[];
         /** @type {number[]}*/ const time =[];
 
         /** @type {TYPES.Desk} */
         const deskObj = {
             name,
-            id:deskId,
+            mode,
             need,
             time,
             make:[],
@@ -94,33 +89,16 @@ export function Room({user, role, part, desk, pass})
         /** @type {TYPES.Pass} */
         const passObj = {
             name: pass[passID][0],
-            id:passID,
             path:passID,
             async load(){
 
+
                 // make room for this pass to each part and desk
                 Object.values(PartList).forEach((partObj)=>
                 {
-                    partObj.pass.set(passObj, {time:0, work:[], async make(user, data)
+                    partObj.pass.set(passObj, {time:0, work:[], make(user, data)
                     {
                         this.time = Date.now();
-
-                        const handle = await FSAccess.getDirectoryHandle();
-                        const path = ["store", context.Path, passID, user.id+".json"];
-                        let text = await FSAccess.Read(handle, path) || "{}";
-                        /** @type {TYPES.UserPassFile} */
-                        const json = JSON.parse(text);
-
-                        let field = json[partObj.id];
-                        if(!field)
-                        {
-                            field = [];
-                            json[partObj.id] = field;
-                        }
-                        field.push([this.time, data]);
-                        text = JSON.stringify(json, null, 2);
-                        await FSAccess.Write(handle, path, text);
-                        
                         this.work.push(/** @type {TYPES.Work}*/([this.time, data, user]));
                         partObj.make.forEach((arg)=>{Scan(arg, passObj)});
                         partObj.need.forEach((arg)=>{Scan(arg, passObj)});
@@ -139,10 +117,9 @@ export function Room({user, role, part, desk, pass})
                     const [userID, userObject] = userData[i];
                     try
                     {
-                        const handle = await FSAccess.getDirectoryHandle();
+                        const resp = await fetch(`./room/${folderName}/${passID}/${userID}.json`);
-                        const text = await FSAccess.Read(handle, ["store", context.Path, passID, userID+".json"]);
                         /** @type {TYPES.UserPassFile} */
-                        const json = JSON.parse(text);
+                        const json = await resp.json();
                         
                         Object.entries(json).forEach(([partID, payload])=>{
 
@@ -162,7 +139,6 @@ export function Room({user, role, part, desk, pass})
                                 {
                                     passCheck.time = latest;
                                 }
-                                //payload.sort()
                                 passCheck.work = /** @type {TYPES.Work[]}*/(payload);
                             }
 
@@ -175,6 +151,7 @@ export function Room({user, role, part, desk, pass})
                     }
 
                 }
+                console.log("load complete", PartList);
 
                 // update the graph
                 Object.values(DeskList).forEach((deskObj)=>Scan(deskObj, passObj));
@@ -192,28 +169,26 @@ export function Room({user, role, part, desk, pass})
         PassList[passID] = passObj;
     }
 
-    const context = {
+    return {
-        Path:"",
         Desk:DeskList,
         Part:PartList,
         User:UserList,
         Role:RoleList,
         Pass:PassList
+    };
 }
 
-    return context;
+/** @type {TYPES.MassDscription} */
-}
+export default function Graph(params)
-
-/** @type {TYPES.MassBuilder} */
-export default function MassBuild(params)
 {   
     return ()=>{
         Object.entries(params).forEach( ([roomFolderName, roomData])=>
         {
-            roomData.Path = roomFolderName;
+            params[roomFolderName] = Builder(roomData, roomFolderName);
         });
         return params;
     }
+
 }
 
 /** @type {TYPES.Scanner} */
@@ -222,93 +197,36 @@ const Scan =(desk, pass)=>
     const dirtyNeed = [];
     const dirtyMake = [];
 
-    const emptyNeed = [];
-    const emptyMake = [];
-
     let makeMin = Infinity;
     let needMax = -Infinity;
 
-    // added for estimation
-    let estMin = Infinity;
-    let estMax = -Infinity;
-    let estSum = 0;
-
-/*
-
-Loop parts:
-- always considered clean when the leading value is a no-op
-- as a need, considered clean when empty
-
-*/
-
-    /** @type {(part:TYPES.Part)=>[time:number, value:string|undefined, part:TYPES.Part]} */
-    const lookup =(part)=>
-    {
-        const partPass = part.pass.get(pass);
-        const partPassTime = partPass?.time || 0;
-        const partPassValue = partPass?.work.find(t=>t[0] == partPassTime)?.[1];
-        return [partPassTime, partPassValue, part];
-    }
-
-    // update needMax
     for(let i=0; i<desk.need.length; i++)
     {
-        const [time, value, part] = lookup(desk.need[i]);
+        const part = desk.need[i];
-
+        const partPassTime = part.pass.get(pass)?.time || 0;
-        if(part.loop)
+        if(partPassTime > needMax) needMax = partPassTime;
-        {
-            if(!value || value == noop)
-            {
-                continue;
-            }
     }
 
-        if(time > needMax) needMax = time;
-        if(!time) emptyNeed.push(i);
-    }
-
-    // update makeMin AND dirtyMakes
     for(let i=0; i<desk.make.length; i++)
     {
-        const [time] = lookup(desk.make[i]);
+        const part = desk.make[i];
-
+        const partPassTime = part.pass.get(pass)?.time || 0;
-        if(time < makeMin) makeMin = time;
+        if(partPassTime < makeMin) makeMin = partPassTime;
-        if(time < needMax) dirtyMake.push(i);
+        if(partPassTime < needMax)
-        if(!time) emptyMake.push(i) 
+        {
-
+            dirtyMake.push(i);
+        } 
     }
 
-    // dirtyNeeds
     for(let i=0; i<desk.need.length; i++)
     {
-        const [time, value, part] = lookup(desk.need[i]);
+        const part = desk.need[i];
-
+        const partPassTime = part.pass.get(pass)?.time || 0;
-        if(part.loop)
+        if(partPassTime > makeMin)
-        {
-            if(!value || value == noop)
-            {
-                continue;
-            }
-        }
-
-        if(time > makeMin)
         {
             dirtyNeed.push(i);
-
-            // estimation
-            if(time < estMin) estMin = time;
-            const allottedTime = desk.time[i] * 1000 * 60 * 60;
-            const projectedTime = time + allottedTime;
-            estSum += allottedTime;
-            if(projectedTime > estMax) estMax = projectedTime;
         }
     }
 
-    estSum += estMin;
+    desk.pass.set(pass, {need:dirtyNeed, make:dirtyMake})
-    let stamp = estSum;
-    if(estMax > estSum)
-    {
-        stamp = estMax;
-    }
-    desk.pass.set(pass, {need_dirty:dirtyNeed, make_dirty:dirtyMake, need_empty:emptyNeed, make_empty:emptyMake, due_date:isFinite(stamp) ? new Date(stamp) : undefined})
 };

graph/types.ts

@@ -1,44 +0,0 @@
-export type User = {name:string, id:string, desk:Set<Desk>};
-export type Role = {name:string, id:string, user:User[]};
-export type Desk = {name:string, id:string, need:Part[], time:number[], make:Part[], pass:Map<Pass, Scan>, role:Role[]};
-export type Pass = {name:string, id:string, path:string, live:boolean, load:()=>Promise<void>, dump:()=>void};
-export type Part = {name:string, id:string, pass:Map<Pass, {time:number, work:Work[], make:(user:User, data:string)=>Promise<void>}>, need:Desk[], make:Desk[], loop?:boolean};
-export type Work = [time:number, data:string, user:User];
-export type Scan = {need_dirty:number[], make_dirty:number[], need_empty:number[], make_empty:number[], due_date?:Date}
-
-export type GraphBuilder=
-<
-    Users extends Record<string, string>,
-    Roles extends Record<string, [ name:string, ...users:Array<keyof Users>]>,
-    Parts extends Record<string, [ name:string, loop?:"loop"] >,
-    Desks extends Record<string, [ name:string, roles:Array<keyof Roles>, need:Partial<Record<keyof Parts, number>>, ...make:Array<keyof Parts>]>,
->
-(
-    params:{
-        meta?:{name:string},
-        user:Users,
-        role:Roles,
-        part:Parts,
-        desk:Desks,
-        pass:Record<string, [name:string]>,
-    }
-)
-=>GraphParts
-
-
-export type GraphParts = {
-    Desk:Record<string, Desk>,
-    Part:Record<string, Part>,
-    User:Record<string, User>,
-    Role:Record<string, Role>,
-    Pass:Record<string, Pass>
-    Path:string
-}
-
-export type MassBuilder=<Params extends Record<string, GraphParts>>(rooms:Params)=>()=>{
-    [K in keyof Params]: GraphParts
-}
-
-export type UserPassFile = Record<string, Array<[time:number, data:string, user?:User]>>
-
-export type Scanner =(desk:Desk, pass:Pass)=>void;

index.html

@@ -3,55 +3,18 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Document</title>
-    <style>
-/* Basic CSS Reset */
-* {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-}
-
-html, body {
-  height: 100%;
-  font-family: sans-serif;
-  line-height: 1.5;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-img, picture, video, canvas, svg {
-  display: block;
-  max-width: 100%;
-}
-
-input, button, textarea, select {
-  font: inherit;
-}
-
-a {
-  text-decoration: none;
-  color: inherit;
-}
-
-ul, ol {
-  list-style: none;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-    </style>
 </head>
 <body>
     <script>
+        
 if ('serviceWorker' in navigator) {
     navigator.serviceWorker.register('/service-worker.js', {type:"module"})
     .then(reg => console.log('Service Worker registered:', reg))
     .catch(err => console.error('Service Worker registration failed:', err));
 }
+
+    </script>
+    <script src="app.js" type="module">
     </script>
-    <script type="module" src="https://treetopflyer.github.io/gale/boot.js?entry=/app.js"></script>
 </body>
 </html>

mock-user-folder/graph/room.js

@@ -1,43 +0,0 @@
-//@ts-check
-import CreateAllRooms, {Room} from "../../graph/graph.js";
-
-const user = {
-    u1:"Seth T",
-    u4:"Sarah S",
-    u5:"Adam M",
-    u6:"Matt Y",
-    u7:"Seth F",
-    u8:"Brittany F"
-};
-
-export default CreateAllRooms({
-    room_01:Room({
-        user,
-        role:{
-              dev:["Development", "u1"],
-            write:["Writing", "u5"],
-            admin:["Admin", "u4"]
-        },
-        part:{
-            p1:["Page title"],
-            p2:["Page slug"],
-            p3:["Page preview"],
-            p4:["Page Project"],
-            p5:["Page Corrections", "loop"],
-        },
-        desk:{
-            d1:["Write page metas",   ["admin", "write"], {                }, "p1", "p2"],
-            d2:["Build Page preview", ["admin", "dev"  ], {p1:1, p2:1, p5:1}, "p3", "p4"],
-            d3:["Proof Page",         ["admin", "write"], {p3:1,           }, "p5"      ]
-        },
-        pass:{
-            pass_01:["January"],
-            //pass_02:["February"],
-            //pass_03:["March"],
-            //pass_04:["April"],
-            //pass_05:["May"],
-            //pass_06:["June"],
-            //pass_07:["July"],
-        }
-    })
-});

mock-user-folder/store/room_01/pass_01/u4.json

@@ -1,14 +0,0 @@
-{
-  "p1": [
-    [
-      1762196165935,
-      "normal title"
-    ]
-  ],
-  "p2": [
-    [
-      1762196173135,
-      "normal slug"
-    ]
-  ]
-}

mock-user-folder/store/room_01/pass_02/u1.json

@@ -1,8 +0,0 @@
-{
-  "p4": [
-    [
-      1762193485093,
-      "Make made Late"
-    ]
-  ]
-}

mock-user-folder/store/room_01/pass_02/u3.json

@@ -1,8 +0,0 @@
-{
-    "p1":
-    [
-        [123456, "data"],
-        [4562358723, "more data"],
-        [789235072367, "even more data"]
-    ]
-}

mock-user-folder/store/room_01/pass_02/u5.json

@@ -1,8 +0,0 @@
-{
-  "p1": [
-    [
-      1762186057868,
-      "Need made Early"
-    ]
-  ]
-}

mock-user-folder/store/room_01/pass_03/u4.json

@@ -1,14 +0,0 @@
-{
-  "p4": [
-    [
-      1762196034794,
-      "Make made Early"
-    ]
-  ],
-  "p1": [
-    [
-      1762196047017,
-      "Need made Late"
-    ]
-  ]
-}

mock-user-folder/store/room_01/pass_04/u1.json

@@ -1,14 +0,0 @@
-{
-  "p3": [
-    [
-      1762196236384,
-      "complete 3"
-    ]
-  ],
-  "p4": [
-    [
-      1762196245327,
-      "complete 4"
-    ]
-  ]
-}

mock-user-folder/store/room_01/pass_04/u5.json

@@ -1,14 +0,0 @@
-{
-  "p1": [
-    [
-      1762196209704,
-      "complete 1"
-    ]
-  ],
-  "p2": [
-    [
-      1762196217319,
-      "complete 2"
-    ]
-  ]
-}

mock-user-folder/store/room_01/pass_05/u1.json

@@ -1,18 +0,0 @@
-{
-  "p3": [
-    [
-      1762196341950,
-      "complete 3"
-    ]
-  ],
-  "p4": [
-    [
-      1762196348950,
-      "complete 4"
-    ],
-    [
-      1762196393702,
-      "complete Later"
-    ]
-  ]
-}

mock-user-folder/store/room_01/pass_05/u5.json

@@ -1,18 +0,0 @@
-{
-  "p1": [
-    [
-      1762196328127,
-      "complete 1"
-    ]
-  ],
-  "p2": [
-    [
-      1762196335342,
-      "complete 2"
-    ],
-    [
-      1762196363079,
-      "complete Late"
-    ]
-  ]
-}

mock-user-folder/store/room_01/pass_07/u5.json

@@ -1,8 +0,0 @@
-{
-  "p1": [
-    [
-      1762201681431,
-      "underway"
-    ]
-  ]
-}

room/room_01/pass_01/u1.json

@@ -0,0 +1,8 @@
+{
+    "p1":
+    [
+        [123, "data"],
+        [456, "more data"],
+        [789, "even more data"]
+    ]
+}

room/room_01/pass_01/u2.json

@@ -0,0 +1,8 @@
+{
+    "p2":
+    [
+        [123, "data"],
+        [456, "more data"],
+        [789, "even more data"]
+    ]
+}

room/room_01/pass_02/u3.json

@@ -0,0 +1,8 @@
+{
+    "p1":
+    [
+        [123, "data"],
+        [456, "more data"],
+        [789, "even more data"]
+    ]
+}

service-worker.js

@@ -1,44 +1,40 @@
 import * as FSAccess from "./store-directory-handle.js";
 
-self.addEventListener('install', ()=>{console.log("SW INSTALL"); return self.skipWaiting()}); // Activate worker immediately);
+self.addEventListener('install', ()=> self.skipWaiting()); // Activate worker immediately);
-self.addEventListener('activate', ()=>{
+self.addEventListener('activate', ()=> self.clients.claim()); // Become available to all pages);
-  console.log("SW ACTIVATE");
-  return self.clients.claim();
-}); // Become available to all pages);
 self.addEventListener('fetch', (event) =>event.respondWith(Interceptor(event)));
 
-const options = {
-  headers: {
-    'Content-Type': 'application/javascript',
-    'Cache-Control': 'no-cache'
-  }
-}
-
-/** @type {(event:{request:Request})=>Promise<Response>} */
 async function Interceptor(event)
 {
   const url = new URL(event.request.url);
   const pathname = url.pathname.substring(1);
-  let parts = pathname.split("/");
+  const parts = pathname.split("/");
 
-  if(parts[0] == "graph")
+  if(parts[0] == "data" || parts[0] == "room")
   {
-    console.log("intercept:", pathname);
+    console.log("intercept:", pathname)
-
     const handle = await FSAccess.getDirectoryHandle();
-    const text = await FSAccess.Read(handle, parts);
+    if(handle)
-    if(text)
     {
-      console.log("successful intercept:", pathname);
+      const file = await FSAccess.drilldown(handle, parts);
-      return new Response(text, options);
+      if(file)
+      {
+        const content = await file.text();
+        return new Response(content, {
+          headers: {
+            'Content-Type': 'application/javascript',
+            'Cache-Control': 'no-cache'
+          }
+        });
+      }
+    }
+
+    console.log("couldnt find:", pathname);
+    return new Response("404", {status:404});
+    
   }
   else
   {
-      console.log("failed intercept:", pathname);
-    }
-
-  }
-
     return fetch(event.request);
-
+  }
 }

store-directory-handle.js

@@ -17,22 +17,17 @@ export async function setDirectoryHandle(handle) {
   const db = await openDB();
   const tx = db.transaction('handles', 'readwrite');
   tx.objectStore('handles').put(handle, 'user-folder');
-  console.log("handle set", handle);
   await tx.done;
 }
 
-
 // 📂 Retrieve a directory handle
 /** @type {()=>Promise<FileSystemDirectoryHandle|false>} */
 export async function getDirectoryHandle() {
-
   const db = await openDB();
   const tx = db.transaction('handles', 'readonly');
   return new Promise((resolve, reject) => {
     const getRequest = tx.objectStore('handles').get('user-folder');
-    getRequest.onsuccess = () => {
+    getRequest.onsuccess = () => resolve(getRequest.result);
-      return resolve(getRequest.result);
-    }
     getRequest.onerror = () => {
       console.error('Error retrieving directory handle:', getRequest.error);
       return resolve(false);
@@ -40,18 +35,18 @@ export async function getDirectoryHandle() {
   });
 }
 
-/** @type {(handle:FileSystemDirectoryHandle, parts:string[], create?:boolean)=>Promise<FileSystemFileHandle|false>} */
+/** @type {(handle:FileSystemDirectoryHandle, parts:string[])=>Promise<File|false>} */
-export async function Dig(handle, parts, create=false)
+export async function drilldown(handle, parts)
 {
   try
   {
     let filePointer = handle;
     for(let i=0; i<parts.length-1; i++)
     {
-      filePointer = await filePointer.getDirectoryHandle(parts[i], {create});
+      filePointer = await filePointer.getDirectoryHandle(parts[i], {create: false});
     }
-    const leaf = await filePointer.getFileHandle(parts[parts.length-1], {create});
+    const leaf = await filePointer.getFileHandle(parts[parts.length-1], {create: false});
-    return leaf;   
+    return await leaf.getFile();    
   }
   catch(e)
   {
@@ -59,36 +54,6 @@ export async function Dig(handle, parts, create=false)
   }
 }
 
-/** @type {(handle:FileSystemDirectoryHandle, parts:string[])=>Promise<string|false>} */
-export async function Read(handle, parts)
-{
-
-  const fileHandle = await Dig(handle, parts);
-  if(fileHandle)
-  {
-    const file = await fileHandle.getFile();
-    return await file.text();
-  }
-
-  return false;
-}
-
-/** @type {(handle:FileSystemDirectoryHandle, parts:string[], text:string)=>Promise<boolean>} */
-export async function Write(handle, parts, text)
-{
-  const fileHandle = await Dig(handle, parts, true);
-  if(fileHandle)
-  {
-    const writeable = await fileHandle.createWritable();
-    await writeable.write(text);
-    await writeable.close();
-    return true;
-  }
-  return false;
-}
-
-
-
 // // 🔐 Check or request permission
 // async function verifyPermission(handle, mode = 'readwrite') {
 //   const opts = { mode };

styles.js

@@ -1,64 +0,0 @@
-export default Gale({
-    Title:{
-        padding:"2rem",
-        background: "blue",
-        color:"white"
-    },
-    Plain:{},
-    PartGroup:{
-        display: `flex`,
-        flexWrap: `wrap`
-    },
-    Icon:{
-        background:"black",
-        color:"white",
-        borderRadius:"2rem",
-        fontWeight:"bolder",
-        padding:"0 0.8rem",
-        margin:"0 1rem"
-    },
-    Part:{
-        border: `1px solid black`,
-        borderRadius: `5px`,
-        padding: `0.5rem 1rem`,
-        minHeight: "2rem",
-    },
-    PartGood:{
-        background:"#009b2e",
-        color:"white",
-    },
-    PartEmpty:{
-        background:"#ddd"
-    },
-    PartDirty:{
-        background:"red",
-        color:"white",
-        fontWeight:"bold"
-    },
-    PartCaution:{
-        background:"yellow",
-        color:"black",
-    },
-    BlockScreen:{
-        position: "fixed",
-        zIndex: "9999",
-        top: "0",
-        left: "0",
-        width: "100%",
-        height: "100%",
-        background: "rgba(128, 128, 128, 0.5)"
-    },
-    DeskContainer:{
-        border: `1px solid black`,
-        borderRadius: `5px`,
-        padding: `1rem`
-    },
-    GapHorizontal:{
-        borderCollapse:"separate",
-        borderSpacing:"0.3rem 2rem",
-    },
-    GapVertical:{
-        borderCollapse:"separate",
-        borderSpacing:"2rem 0.2rem",
-    }
-});

types.ts

@@ -0,0 +1,44 @@
+export type User = {name:string, desk:Set<Desk>};
+export type Role = {name:string, user:User[]};
+export type Desk = {name:string, need:Part[], time:number[], make:Part[], pass:Map<Pass, {need:number[], make:number[]}>, mode:string, role:Role[]};
+export type Work = [time:number, data:string, user:User];
+export type Pass = {name:string, path:string, live:boolean, load:()=>Promise<void>, dump:()=>void};
+export type Part = {name:string, pass:Map<Pass, {time:number, work:Work[], make:(user:User, data:string)=>void}>, need:Desk[], make:Desk[]};
+
+export type GraphBuilder=
+<
+    Users extends Record<string, string>,
+    Roles extends Record<string, [ name:string, ...users:Array<keyof Users>]>,
+    Parts extends Record<string, string>,
+    Desks extends Record<string, [ name:string, roles:Array<keyof Roles>, mode:"all"|"one", need:Partial<Record<keyof Parts, number>>, ...make:Array<keyof Parts>]>,
+>
+(
+    params:{
+        meta?:{name:string},
+        user:Users,
+        role:Roles,
+        part:Parts,
+        desk:Desks,
+        pass:Record<string, [name:string]>,
+    },
+    folderName:string
+)
+=>GraphParts
+
+export type GraphParts = {
+    Desk:Record<string, Desk>,
+    Part:Record<string, Part>,
+    User:Record<string, User>,
+    Role:Record<string, Role>,
+    Pass:Record<string, Pass>
+}
+
+export type MassDscription=
+(
+    params:Record<string, Parameters<GraphBuilder>[0]>
+)
+=>()=>Record<string, GraphParts>
+
+export type UserPassFile = Record<string, Array<[time:number, data:string, user?:User]>>
+
+export type Scanner =(desk:Desk, pass:Pass)=>void;