Compare commits

...

2 Commits

Author SHA1 Message Date
76d4c4be73 progress... 2025-11-05 14:15:40 -05:00
ef1fb55057 add typings/parsing 2025-11-05 08:18:24 -05:00
3 changed files with 82 additions and 34 deletions

View File

@ -1,6 +1,8 @@
/** @import * as TYPES from "./types.ts" */ /** @import * as TYPES from "./types.ts" */
import * as FSAccess from "../store-directory-handle.js"; import * as FSAccess from "../store-directory-handle.js";
export const noop = "no-op";
/** @type {TYPES.GraphBuilder} */ /** @type {TYPES.GraphBuilder} */
export function Room({user, role, part, desk, pass}) export function Room({user, role, part, desk, pass})
{ {
@ -32,8 +34,9 @@ export function Room({user, role, part, desk, pass})
const PartList = part; const PartList = part;
for(let partId in part) for(let partId in part)
{ {
const name = part[partId]; const [name, loop] = part[partId];
PartList[partId] = /** @type {TYPES.Part} */({name, id:partId, need:[], make:[], pass:new Map()});
PartList[partId] = /** @type {TYPES.Part} */({name, id:partId, need:[], make:[], pass:new Map(), loop:loop});
} }
// mutate desks // mutate desks
@ -42,7 +45,7 @@ export function Room({user, role, part, desk, pass})
const DeskList = desk; const DeskList = desk;
for(let deskId in desk) for(let deskId in desk)
{ {
const [name, roleIDs, mode, needObj, ...makePartIDs] = desk[deskId]; const [name, roleIDs, needObj, ...makePartIDs] = desk[deskId];
/** @type {TYPES.Part[]}*/ const need =[]; /** @type {TYPES.Part[]}*/ const need =[];
/** @type {number[]}*/ const time =[]; /** @type {number[]}*/ const time =[];
@ -50,7 +53,6 @@ export function Room({user, role, part, desk, pass})
const deskObj = { const deskObj = {
name, name,
id:deskId, id:deskId,
mode,
need, need,
time, time,
make:[], make:[],
@ -160,6 +162,7 @@ export function Room({user, role, part, desk, pass})
{ {
passCheck.time = latest; passCheck.time = latest;
} }
//payload.sort()
passCheck.work = /** @type {TYPES.Work[]}*/(payload); passCheck.work = /** @type {TYPES.Work[]}*/(payload);
} }
@ -225,31 +228,66 @@ const Scan =(desk, pass)=>
let makeMin = Infinity; let makeMin = Infinity;
let needMax = -Infinity; let needMax = -Infinity;
/*
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 // update needMax
for(let i=0; i<desk.need.length; i++) for(let i=0; i<desk.need.length; i++)
{ {
const part = desk.need[i]; const [time, value, part] = lookup(desk.need[i]);
const partPassTime = part.pass.get(pass)?.time || 0;
if(partPassTime > needMax) needMax = partPassTime; if(part.loop)
if(!partPassTime) emptyNeed.push(i) {
if(!value || value == noop)
{
continue;
}
}
if(time > needMax) needMax = time;
if(!time) emptyNeed.push(i)
} }
// update makeMin AND dirty check makes // update makeMin AND dirtyMakes
for(let i=0; i<desk.make.length; i++) for(let i=0; i<desk.make.length; i++)
{ {
const part = desk.make[i]; const [time, value, part] = lookup(desk.make[i]);
const partPassTime = part.pass.get(pass)?.time || 0;
if(partPassTime < makeMin) makeMin = partPassTime; if(time < makeMin) makeMin = time;
if(partPassTime < needMax) dirtyMake.push(i); if(time < needMax) dirtyMake.push(i);
if(!partPassTime) emptyMake.push(i) if(!time) emptyMake.push(i)
} }
// dirty check needs // dirtyNeeds
for(let i=0; i<desk.need.length; i++) for(let i=0; i<desk.need.length; i++)
{ {
const part = desk.need[i]; const [time, value, part] = lookup(desk.need[i]);
const partPassTime = part.pass.get(pass)?.time || 0;
if(partPassTime > makeMin) dirtyNeed.push(i); if(part.loop)
{
if(!value || value == noop)
{
continue;
}
}
if(time > makeMin) dirtyNeed.push(i);
} }
desk.pass.set(pass, {need_dirty:dirtyNeed, make_dirty:dirtyMake, need_empty:emptyNeed, make_empty:emptyMake}) desk.pass.set(pass, {need_dirty:dirtyNeed, make_dirty:dirtyMake, need_empty:emptyNeed, make_empty:emptyMake})

View File

@ -1,17 +1,25 @@
export type User = {name:string, id:string, desk:Set<Desk>}; export type User = {name:string, id:string, desk:Set<Desk>};
export type Role = {name:string, id:string, user:User[]}; 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>, mode:string, role:Role[]}; 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 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[]}; 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 Work = [time:number, data:string, user:User];
export type Scan = {need_dirty:number[], make_dirty:number[], need_empty:number[], make_empty:number[]} export type Scan = {need_dirty:number[], make_dirty:number[], need_empty:number[], make_empty:number[]}
/*
Loops:
- are considered clean when empty
- can receive a no-op value that considers them clean
*/
export type GraphBuilder= export type GraphBuilder=
< <
Users extends Record<string, string>, Users extends Record<string, string>,
Roles extends Record<string, [ name:string, ...users:Array<keyof Users>]>, Roles extends Record<string, [ name:string, ...users:Array<keyof Users>]>,
Parts extends Record<string, string>, Parts extends Record<string, [ name:string, loop?:"loop"] >,
Desks extends Record<string, [ name:string, roles:Array<keyof Roles>, mode:"all"|"one", need:Partial<Record<keyof Parts, number>>, ...make:Array<keyof Parts>]>, Desks extends Record<string, [ name:string, roles:Array<keyof Roles>, need:Partial<Record<keyof Parts, number>>, ...make:Array<keyof Parts>]>,
> >
( (
params:{ params:{

View File

@ -19,23 +19,25 @@ export default CreateAllRooms({
admin:["Admin", "u4"] admin:["Admin", "u4"]
}, },
part:{ part:{
p1:"Page title", p1:["Page title"],
p2:"Page slug", p2:["Page slug"],
p3:"Page preview", p3:["Page preview"],
p4:"Page Project", p4:["Page Project"],
p5:["Page Corrections", "loop"],
}, },
desk:{ desk:{
d1:["Write page metas", ["admin", "write"], "all", {}, "p1", "p2"], d1:["Write page metas", ["admin", "write"], { }, "p1", "p2"],
d2:["Build Page preview", ["admin", "dev"], "all", {p1:1, p2:1}, "p3", "p4"] d2:["Build Page preview", ["admin", "dev" ], {p1:1, p2:1, p5:1}, "p3", "p4"],
d3:["Proof Page", ["admin", "write"], {p3:1, }, "p5" ]
}, },
pass:{ pass:{
pass_01:["January"], pass_01:["January"],
pass_02:["February"], //pass_02:["February"],
pass_03:["March"], //pass_03:["March"],
pass_04:["April"], //pass_04:["April"],
pass_05:["May"], //pass_05:["May"],
pass_06:["June"], //pass_06:["June"],
pass_07:["July"], //pass_07:["July"],
} }
}) })
}); });