@prestack/thread 0.1.21 → 0.1.23

package/dist/operations/generators/seed.js

@@ -50,6 +50,11 @@ export function builtFrom(row, known) {
     const found = (row.requires ?? []).filter((one) => known.has(one));
     return found.length === 1 ? found[0] : undefined;
 }
+export const HOLDING = {
+    nd_repeat: () => '1',
+    nd_branch: (first) => `async () => ${quoted(first)}`,
+};
+export const stepsOf = (one) => [...one.nodes, ...[...one.within.values()].flat()];
 const reaches = (pass, one) => pass.stated.has(one) && !under(pass, one, NODES_ID);
 const waiting = (held) => held !== undefined && ts.isNumericLiteral(held) ? Number(held.text.replace(/_/g, '')) : undefined;
 export function operations(pass, known) {
@@ -64,6 +69,7 @@ export function operations(pass, known) {
             nodes: [],
             takes: [],
             body: undefined,
+            within: new Map(),
             wants: new Set(stated?.takes ?? []),
             requires: asked.filter((one) => reaches(pass, one)),
             stray: asked.filter((one) => !reaches(pass, one)),
@@ -72,8 +78,17 @@ export function operations(pass, known) {
         found.set(id, made);
         return made;
     };
+    const steps = new Map();
     for (const [at, threadings] of pass.threaded) {
         for (const one of threadings) {
+            const holder = steps.get(one.by);
+            if (holder !== undefined && one.list === 'seeds') {
+                const within = held(holder).within;
+                within.set(one.by, [...(within.get(one.by) ?? []), one.row]);
+                if (one.row.id !== undefined)
+                    steps.set(one.row.id, holder);
+                continue;
+            }
             if (!isOperation(pass, one.by))
                 continue;
             if (one.list === 'derives' && one.row.by === COMPILES)
@@ -82,8 +97,11 @@ export function operations(pass, known) {
                 const mine = held(one.by);
                 if (mine.wants.has(one.row.id ?? ''))
                     mine.takes.push(one.row);
-                else
+                else {
                     mine.nodes.push(one.row);
+                    if (one.row.id !== undefined)
+                        steps.set(one.row.id, one.by);
+                }
             }
         }
     }
@@ -166,14 +184,18 @@ function planned(bodies) {
         for (const row of one.takes)
             if (row.at !== undefined)
                 found.push({ at: row.at, derived: false, text: takesFile(row.at) });
-        for (const row of one.nodes) {
+        for (const row of stepsOf(one)) {
             const from = builtFrom(row, known);
             const takes = one.takes[0]?.at;
             if (row.at === undefined || from === undefined || takes === undefined)
                 continue;
             const path = resolve(ROOT, row.at);
             const held = existsSync(path) ? readFileSync(path, 'utf8') : undefined;
-            const block = bodies.get(row.at) ?? (held === undefined ? undefined : blockIn(held));
+            const first = one.within.get(String(row.id))?.[0]?.id;
+            const fresh = first === undefined ? undefined : HOLDING[from]?.(first);
+            const written = held === undefined ? undefined : blockIn(held);
+            const untouched = held === undefined || written === scaffold(from, String(row.id));
+            const block = bodies.get(row.at) ?? (fresh !== undefined && untouched ? fresh : written);
             if (held !== undefined && block === undefined) {
                 found.push({
                     at: row.at,

package/dist/operations/nodes.d.ts

@@ -14,7 +14,7 @@ export declare const nd_read: <I, R extends string = never>(block: (opened: Read
 export declare const nd_action: <I, R extends string = never>(block: (opened: Opened<R>, held: Held<I>) => Promise<unknown>) => {
     type: 'nd_action';
 };
-export declare const nd_branch: <I, R extends string = never>(choose: (opened: Reads<Opened<R>>, held: Held<I>) => Promise<string>, ways: Readonly<Record<string, (opened: Opened<R>, held: Held<I>) => Promise<unknown>>>) => {
+export declare const nd_branch: <I, R extends string = never>(choose: (opened: Reads<Opened<R>>, held: Held<I>) => Promise<string>, ways?: Readonly<Record<string, (opened: Opened<R>, held: Held<I>) => Promise<unknown>>>) => {
     type: 'nd_branch';
 };
 export declare const nd_each: <I, R extends string = never>(over: (held: Held<I>) => readonly unknown[], block: (item: unknown, opened: Opened<R>, held: Held<I>) => Promise<unknown>) => {
@@ -23,7 +23,7 @@ export declare const nd_each: <I, R extends string = never>(over: (held: Held<I>
 export declare const nd_parallel: <I, R extends string = never>(blocks: readonly ((opened: Opened<R>, held: Held<I>) => Promise<unknown>)[]) => {
     type: 'nd_parallel';
 };
-export declare const nd_repeat: <I, R extends string = never>(ceiling: number, block: (pass: number, carried: unknown, opened: Opened<R>, held: Held<I>) => Promise<{
+export declare const nd_repeat: <I, R extends string = never>(ceiling: number, block?: (pass: number, carried: unknown, opened: Opened<R>, held: Held<I>) => Promise<{
     readonly done: boolean;
     readonly value: unknown;
 }>) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prestack/thread",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "type": "module",
   "files": [
     "dist",

package/dist/core/actor.ts

@@ -1,21 +0,0 @@
-export type Env = 'sandbox' | 'production'
-
-export const ENVIRONMENT = [
-  ['run', 'x-request-id', 'crypto.randomUUID()'],
-  ['address', 'x-forwarded-for', null],
-  ['device', 'user-agent', null],
-  ['replay', 'idempotency-key', null],
-  ['moment', null, 'new Date().toISOString()'],
-] as const
-
-export type Environment = { readonly [K in (typeof ENVIRONMENT)[number][0]]?: string }
-
-export type Actor = Environment & {
-  readonly id: string | null
-  readonly roles: readonly string[]
-  readonly entitlements: readonly string[]
-}
-
-export const PUBLIC_ROLE = 'role_public'
-
-export const ANONYMOUS: Actor = { id: null, roles: [PUBLIC_ROLE], entitlements: [] }