@agentshouse/mdruntime 0.1.0-ce131cb435f8b → 0.1.0-ce9f29a01a271

package/dist/overlay.js

@@ -1,6 +1,6 @@
-import { apply, parse, serialize } from '@agentshouse/mdmodel';
-import { differences, differing, drafted, patched, settled } from './shared.js';
-import { finished } from './turn.js';
+import { apply, frontmatterValue, parse, serialize, } from '@agentshouse/mdmodel';
+import { differences, drafted, patching, settling } from './shared.js';
+import { ROW_WEIGHT } from './turn.js';
 export function acceptedBinaries(files) {
     return Object.fromEntries(Object.entries(files).map(([path, file]) => [path, { state: 'accepted', ...file }]));
 }
@@ -24,10 +24,13 @@ export function sameChange(left, right) {
         left.author?.name === right.author?.name);
 }
 const EMPTY_FRONTMATTER = '---\n---\n';
+function isPart(change) {
+    return change.kind === 'field' || change.kind === 'section' || change.kind === 'preamble';
+}
 function at(path, name) {
     return `${path} ${name}`;
 }
-function priorsOf(preconditions) {
+function* priorsOf(preconditions) {
     const fields = new Map();
     const sections = new Map();
     const preambles = new Map();
@@ -41,6 +44,7 @@ function priorsOf(preconditions) {
         if (precondition.kind === 'preamble') {
             preambles.set(precondition.path, precondition.value);
         }
+        yield ROW_WEIGHT;
     }
     return {
         field: (path, name) => fields.get(at(path, name)),
@@ -56,51 +60,50 @@ function compose(fields, sections) {
     const opened = parse(skeleton);
     if (!opened.ok)
         return skeleton;
-    let document = opened.document;
-    for (const [name, value] of Object.entries(fields)) {
-        const next = apply(document, { kind: 'field', name, value, prior: undefined });
-        if (next.outcome === 'applied')
-            document = next.document;
-    }
-    return serialize(document);
+    const next = apply(opened.document, Object.entries(fields).flatMap(([name, value]) => frontmatterValue(value) ? [{ kind: 'field', name, value, prior: undefined }] : []));
+    return serialize(next.outcome === 'applied' ? next.document : opened.document);
 }
-function edited(document, change, priors) {
-    if (change.kind === 'field') {
-        return apply(document, {
+function edited(change, priors) {
+    if (change.kind === 'field')
+        return {
             kind: 'field',
             name: change.name,
             value: change.value,
             prior: priors.field(change.path, change.name),
-        });
-    }
-    if (change.kind === 'preamble') {
-        return apply(document, {
-            kind: 'preamble',
-            value: change.value,
-            prior: priors.preamble(change.path),
-        });
-    }
-    if (change.kind !== 'section')
-        return null;
-    return apply(document, {
+        };
+    if (change.kind === 'preamble')
+        return { kind: 'preamble', value: change.value, prior: priors.preamble(change.path) };
+    return {
         kind: 'section',
         name: change.name,
         value: change.value,
         prior: priors.section(change.path, change.name),
-    });
+    };
 }
-function edit(staged, change, priors) {
-    const text = staged.documents[change.path];
+function edit(staged, changes, priors) {
+    const path = changes[0].path;
+    delete staged.revisions[path];
+    const text = staged.documents[path];
     if (text === undefined)
-        return false;
-    const parsed = parse(text, change.path);
+        return changes.length;
+    const parsed = parse(text, path);
     if (!parsed.ok)
-        return false;
-    const next = edited(parsed.document, change, priors);
-    if (next?.outcome !== 'applied')
-        return false;
-    staged.documents[change.path] = serialize(next.document);
-    return true;
+        return changes.length;
+    const wanted = changes.map((change) => edited(change, priors));
+    const first = apply(parsed.document, wanted);
+    if (first.outcome === 'refuse')
+        return changes.length;
+    if (first.outcome === 'applied') {
+        staged.documents[path] = serialize(first.document);
+        return 0;
+    }
+    const stale = new Set(first.stale);
+    const kept = wanted.filter((_, at) => !stale.has(at));
+    const rest = apply(parsed.document, kept);
+    if (rest.outcome !== 'applied')
+        return changes.length;
+    staged.documents[path] = serialize(rest.document);
+    return first.stale.length;
 }
 function relocate(staged, from, to) {
     const text = staged.documents[from];
@@ -141,11 +144,7 @@ function erase(staged, path) {
     delete staged.changes[path];
     delete staged.binaries[path];
 }
-function stage(staged, change, priors) {
-    if (change.kind === 'field' || change.kind === 'section' || change.kind === 'preamble') {
-        delete staged.revisions[change.path];
-        return edit(staged, change, priors);
-    }
+function stage(staged, change) {
     if (change.kind === 'create') {
         staged.documents[change.path] =
             'content' in change ? change.content : compose(change.fields, change.sections);
@@ -180,7 +179,7 @@ function stage(staged, change, priors) {
     erase(staged, change.path);
     return true;
 }
-export function overlay(base, queue, unapplied) {
+export function* overlaying(base, queue, unapplied) {
     const staged = {
         documents: drafted(base.documents),
         binaries: drafted(base.binaries),
@@ -189,140 +188,178 @@ export function overlay(base, queue, unapplied) {
         changes: drafted(base.changes),
     };
     for (const batch of queue) {
-        const priors = priorsOf(batch.preconditions);
-        for (const change of batch.changes) {
-            if (!stage(staged, change, priors))
+        const priors = yield* priorsOf(batch.preconditions);
+        for (let index = 0; index < batch.changes.length; index += 1) {
+            const change = batch.changes[index];
+            if (!isPart(change)) {
+                if (!stage(staged, change))
+                    unapplied?.();
+                yield ROW_WEIGHT;
+                continue;
+            }
+            const run = [change];
+            while (index + 1 < batch.changes.length) {
+                const next = batch.changes[index + 1];
+                if (!isPart(next) || next.path !== change.path)
+                    break;
+                run.push(next);
+                index += 1;
+            }
+            const text = staged.documents[change.path] ?? '';
+            for (let left = edit(staged, run, priors); left > 0; left -= 1)
                 unapplied?.();
+            yield ROW_WEIGHT + text.length;
         }
     }
     return {
-        documents: settled(staged.documents),
-        binaries: settled(staged.binaries),
-        revisions: settled(staged.revisions),
-        fileIds: settled(staged.fileIds),
-        changes: settled(staged.changes),
+        documents: yield* settling(staged.documents),
+        binaries: yield* settling(staged.binaries),
+        revisions: yield* settling(staged.revisions),
+        fileIds: yield* settling(staged.fileIds),
+        changes: yield* settling(staged.changes),
     };
 }
-function pathsOf(batch) {
-    return batch.changes.flatMap((change) => change.kind === 'move' ? [change.path, change.to] : [change.path]);
-}
-export function sameLayerText(left, right) {
-    return finished(sameText(left, right));
+function* pathsOf(batch) {
+    const paths = new Set();
+    for (const change of batch.changes) {
+        paths.add(change.path);
+        if (change.kind === 'move')
+            paths.add(change.to);
+        yield ROW_WEIGHT;
+    }
+    return paths;
 }
 export function* sameText(left, right) {
     return ((yield* differences(left.documents, right.documents)).size === 0 &&
         (yield* differences(left.binaries, right.binaries, sameBinary)).size === 0);
 }
-export function changedPaths(left, right) {
+export function* changedPaths(left, right) {
     return new Set([
-        ...differing(left.documents, right.documents),
-        ...differing(left.revisions, right.revisions),
-        ...differing(left.fileIds, right.fileIds),
-        ...differing(left.changes, right.changes, sameChange),
-        ...differing(left.binaries, right.binaries, sameBinary),
+        ...(yield* differences(left.documents, right.documents)),
+        ...(yield* differences(left.revisions, right.revisions)),
+        ...(yield* differences(left.fileIds, right.fileIds)),
+        ...(yield* differences(left.changes, right.changes, sameChange)),
+        ...(yield* differences(left.binaries, right.binaries, sameBinary)),
     ]);
 }
-function replayHeads(base, queue) {
+function* sameItems(left, right) {
+    if (left.length !== right.length)
+        return false;
+    for (let index = 0; index < left.length; index += 1) {
+        const item = JSON.stringify(left[index]);
+        if (item !== JSON.stringify(right[index]))
+            return false;
+        yield ROW_WEIGHT + item.length;
+    }
+    return true;
+}
+function* sameBatch(left, right) {
+    if (left === right)
+        return true;
+    const { changes, preconditions, ...rest } = left;
+    const { changes: others, preconditions: priors, ...held } = right;
+    return (JSON.stringify(rest) === JSON.stringify(held) &&
+        (yield* sameItems(changes, others)) &&
+        (yield* sameItems(preconditions, priors)));
+}
+function* replayHeads(base, batch) {
     const heads = {
         revisions: drafted(base.revisions),
         fileIds: drafted(base.fileIds),
         changes: drafted(base.changes),
     };
-    for (const batch of queue) {
-        for (const change of batch.changes) {
-            if (change.kind === 'remove') {
-                delete heads.revisions[change.path];
-                delete heads.fileIds[change.path];
-                delete heads.changes[change.path];
-            }
-            else if (change.kind === 'create') {
-                delete heads.fileIds[change.path];
-                delete heads.changes[change.path];
-            }
-            else if (change.kind === 'replace' ||
-                change.kind === 'field' ||
-                change.kind === 'section' ||
-                change.kind === 'preamble') {
-                delete heads.revisions[change.path];
-            }
-            else if (change.kind === 'binary') {
-                delete heads.revisions[change.path];
-                delete heads.changes[change.path];
-            }
-            else if (change.kind === 'move') {
-                moveHead(heads, change.path, change.to);
-            }
+    for (const change of batch.changes) {
+        if (change.kind === 'remove') {
+            delete heads.revisions[change.path];
+            delete heads.fileIds[change.path];
+            delete heads.changes[change.path];
+        }
+        else if (change.kind === 'create') {
+            delete heads.fileIds[change.path];
+            delete heads.changes[change.path];
         }
+        else if (change.kind === 'replace' ||
+            change.kind === 'field' ||
+            change.kind === 'section' ||
+            change.kind === 'preamble') {
+            delete heads.revisions[change.path];
+        }
+        else if (change.kind === 'binary') {
+            delete heads.revisions[change.path];
+            delete heads.changes[change.path];
+        }
+        else if (change.kind === 'move') {
+            moveHead(heads, change.path, change.to);
+        }
+        yield ROW_WEIGHT;
     }
     return {
-        revisions: settled(heads.revisions),
-        fileIds: settled(heads.fileIds),
-        changes: settled(heads.changes),
+        revisions: yield* settling(heads.revisions),
+        fileIds: yield* settling(heads.fileIds),
+        changes: yield* settling(heads.changes),
     };
 }
-export function overlayChanged(base, queue, previousBase, previousQueue, previousVisible) {
-    const before = previousQueue.map((batch) => JSON.stringify(batch));
-    const after = queue.map((batch) => JSON.stringify(batch));
-    if (before.length === after.length &&
-        before.every((id, index) => id === after[index]) &&
-        sameLayerText(base, previousBase)) {
+function* repatched(held, paths, value) {
+    const set = [];
+    const removed = [];
+    for (const path of paths) {
+        const found = value(path);
+        if (found === undefined)
+            removed.push(path);
+        else
+            set.push([path, found]);
+        yield ROW_WEIGHT;
+    }
+    return yield* patching(held, set, removed);
+}
+export function* overlayChanged(base, batch, previousBase, previousBatch, previousVisible) {
+    const same = yield* sameBatch(batch, previousBatch);
+    if (same && (yield* sameText(base, previousBase))) {
         return {
             documents: previousVisible.documents,
             binaries: previousVisible.binaries,
-            ...replayHeads(base, queue),
+            ...(yield* replayHeads(base, batch)),
         };
     }
-    const affected = new Set(changedPaths(base, previousBase));
-    const oldIds = new Set(before);
-    const newIds = new Set(after);
-    for (const batch of previousQueue) {
-        if (!newIds.has(JSON.stringify(batch)))
-            for (const path of pathsOf(batch))
-                affected.add(path);
-    }
-    for (const batch of queue) {
-        if (!oldIds.has(JSON.stringify(batch)))
-            for (const path of pathsOf(batch))
-                affected.add(path);
-    }
-    let expanded = true;
-    while (expanded) {
-        expanded = false;
-        for (const batch of queue) {
-            const touched = pathsOf(batch);
-            if (!touched.some((path) => affected.has(path)))
-                continue;
-            for (const path of touched) {
-                if (affected.has(path))
-                    continue;
-                affected.add(path);
-                expanded = true;
-            }
-        }
+    const affected = new Set(yield* changedPaths(base, previousBase));
+    const touched = yield* pathsOf(batch);
+    let replayed = !same;
+    if (replayed)
+        for (const path of yield* pathsOf(previousBatch))
+            affected.add(path);
+    for (const path of touched) {
+        if (affected.has(path))
+            replayed = true;
+        yield ROW_WEIGHT;
     }
-    const documents = {};
-    const revisions = {};
-    const fileIds = {};
-    const changes = {};
-    const binaries = {};
-    for (const path of affected) {
+    const restricted = {
+        documents: {},
+        revisions: {},
+        fileIds: {},
+        changes: {},
+        binaries: {},
+    };
+    for (const path of replayed ? touched : []) {
+        affected.add(path);
         if (base.documents[path] !== undefined)
-            documents[path] = base.documents[path];
+            restricted.documents[path] = base.documents[path];
         if (base.revisions[path] !== undefined)
-            revisions[path] = base.revisions[path];
+            restricted.revisions[path] = base.revisions[path];
         if (base.fileIds[path] !== undefined)
-            fileIds[path] = base.fileIds[path];
+            restricted.fileIds[path] = base.fileIds[path];
         if (base.changes[path] !== undefined)
-            changes[path] = base.changes[path];
+            restricted.changes[path] = base.changes[path];
         if (base.binaries[path] !== undefined)
-            binaries[path] = base.binaries[path];
+            restricted.binaries[path] = base.binaries[path];
+        yield ROW_WEIGHT;
     }
-    const staged = overlay({ documents, revisions, fileIds, changes, binaries }, queue.filter((batch) => pathsOf(batch).some((path) => affected.has(path))));
+    const staged = replayed ? yield* overlaying(restricted, [batch]) : base;
+    const from = (path) => (touched.has(path) ? staged : base);
     return {
-        documents: patched(previousVisible.documents, Object.entries(staged.documents), affected),
-        revisions: patched(previousVisible.revisions, Object.entries(staged.revisions), affected),
-        fileIds: patched(previousVisible.fileIds, Object.entries(staged.fileIds), affected),
-        changes: patched(previousVisible.changes, Object.entries(staged.changes), affected),
-        binaries: patched(previousVisible.binaries, Object.entries(staged.binaries), affected),
+        documents: yield* repatched(previousVisible.documents, affected, (path) => from(path).documents[path]),
+        revisions: yield* repatched(previousVisible.revisions, affected, (path) => from(path).revisions[path]),
+        fileIds: yield* repatched(previousVisible.fileIds, affected, (path) => from(path).fileIds[path]),
+        changes: yield* repatched(previousVisible.changes, affected, (path) => from(path).changes[path]),
+        binaries: yield* repatched(previousVisible.binaries, affected, (path) => from(path).binaries[path]),
     };
 }

package/dist/read-side.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read-side.d.ts","sourceRoot":"","sources":["../src/read-side.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,YAAY,EAElB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAOV,aAAa,EACb,IAAI,EAEJ,aAAa,EAGb,SAAS,EAIV,MAAM,YAAY,CAAC;AAEpB,OAAO,EAA8B,KAAK,KAAK,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAkDpD,MAAM,MAAM,KAAK,GAAG;IAAE,QAAQ,EAAE,aAAa,CAAA;CAAE,GAAG,aAAa,CAAC;AAwBhE,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IACtD,OAAO,IAAI,IAAI,CAAC;IAChB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,SAAS,CAAC;QAAC,EAAE,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;IACvE,KAAK,CACH,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,KAAK,EAClB,OAAO,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,GACvC,MAAM,IAAI,CAAC;IACd,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAC9D,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AAucF,wBAAgB,UAAU,CACxB,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,WAAW,GAChB;IAAE,KAAK,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,GAAG,IAAI,CA+CtD;AA4BD,wBAAgB,cAAc,IAAI,QAAQ,CA8WzC"}
+{"version":3,"file":"read-side.d.ts","sourceRoot":"","sources":["../src/read-side.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,YAAY,EAElB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAOV,aAAa,EACb,IAAI,EAEJ,aAAa,EAGb,SAAS,EAIV,MAAM,YAAY,CAAC;AAEpB,OAAO,EAA8B,KAAK,KAAK,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAkDpD,MAAM,MAAM,KAAK,GAAG;IAAE,QAAQ,EAAE,aAAa,CAAA;CAAE,GAAG,aAAa,CAAC;AAwBhE,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IACtD,OAAO,IAAI,IAAI,CAAC;IAChB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,SAAS,CAAC;QAAC,EAAE,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;IACvE,KAAK,CACH,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,KAAK,EAClB,OAAO,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,GACvC,MAAM,IAAI,CAAC;IACd,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAC9D,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AAycF,wBAAgB,UAAU,CACxB,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,WAAW,GAChB;IAAE,KAAK,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,GAAG,IAAI,CA+CtD;AA4BD,wBAAgB,cAAc,IAAI,QAAQ,CA+WzC"}

package/dist/read-side.js

@@ -317,6 +317,7 @@ function documentOf(key, row, shape, bodies) {
 function weight(row) {
     return ROW_WEIGHT + (typeof row?.text === 'string' ? row.text.length : 0);
 }
+const HELD_PER_WEIGHT = 16;
 function groupValues(shape, [key, row]) {
     return [...shape.orderBy.map(({ by }) => (by === 'count' ? row.count : row[`key${by}`])), key];
 }
@@ -617,14 +618,15 @@ export function createReadSide() {
         return inUnits(set.documents, (change) => {
             if (closed)
                 return 0;
+            const shifted = rows.size / HELD_PER_WEIGHT;
             let spent = 0;
             for (const row of change.before) {
                 unit.set(row.key, null);
-                spent += ROW_WEIGHT;
+                spent += ROW_WEIGHT + shifted;
             }
             for (const row of change.after) {
                 unit.set(row.key, row);
-                spent += weight(row);
+                spent += weight(row) + shifted;
             }
             return spent;
         }, () => {

package/dist/refresh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../src/refresh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAe,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEjG,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAe,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5E,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,aAAa,CAAA;CAAE,GAC3C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,cAAc,CAAC;AAEnB,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,cAAc,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,OAAO,GACP,cAAc,CAAC;AAEnB,wBAAsB,WAAW,CAC/B,OAAO,EAAE,KAAK,EACd,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,WAAW,CAAC,CA8EtB;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,KAAK,EACd,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,cAAc,EACzB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,cAAc,CAAC,CAKzB"}
+{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../src/refresh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAe,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEjG,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,EAAe,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5E,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,aAAa,CAAA;CAAE,GAC3C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,cAAc,CAAC;AAEnB,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,cAAc,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,OAAO,GACP,cAAc,CAAC;AAEnB,wBAAsB,WAAW,CAC/B,OAAO,EAAE,KAAK,EACd,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,WAAW,CAAC,CAgGtB;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,KAAK,EACd,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,cAAc,EACzB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,cAAc,CAAC,CAKzB"}

package/dist/refresh.js

@@ -1,6 +1,7 @@
 import { acceptedBinaries } from './overlay.js';
 import { readStaged } from './replica.js';
-import { drafted, settled } from './shared.js';
+import { drafted, settling } from './shared.js';
+import { ROW_WEIGHT, stepped } from './turn.js';
 import { unconfirmed } from './transfer.js';
 export async function advancement(adapter, authorization, held, remodel, continuing) {
     const locator = held.locator;
@@ -23,24 +24,41 @@ export async function advancement(adapter, authorization, held, remodel, continu
     const changes = drafted(held.changes);
     const written = drafted(held.written);
     const binaries = drafted(held.binaries);
-    const stage = (page) => {
+    const stage = function* (page) {
         for (const path of Object.keys(page.documents)) {
             delete binaries[path];
             delete fileIds[path];
             delete changes[path];
             written[path] = roomVersion;
+            yield ROW_WEIGHT;
         }
         for (const path of Object.keys(page.binaryFiles)) {
             delete documents[path];
             delete fileIds[path];
             delete changes[path];
             delete written[path];
+            yield ROW_WEIGHT;
+        }
+        for (const [path, content] of Object.entries(page.documents)) {
+            documents[path] = content;
+            yield ROW_WEIGHT + content.length;
+        }
+        for (const [path, binary] of Object.entries(acceptedBinaries(page.binaryFiles))) {
+            binaries[path] = binary;
+            yield ROW_WEIGHT;
+        }
+        for (const [path, revision] of Object.entries(page.revisions)) {
+            revisions[path] = revision;
+            yield ROW_WEIGHT;
+        }
+        for (const [path, fileId] of Object.entries(page.fileIds ?? {})) {
+            fileIds[path] = fileId;
+            yield ROW_WEIGHT;
+        }
+        for (const [path, change] of Object.entries(page.changes)) {
+            changes[path] = change;
+            yield ROW_WEIGHT;
         }
-        Object.assign(documents, page.documents);
-        Object.assign(binaries, acceptedBinaries(page.binaryFiles));
-        Object.assign(revisions, page.revisions);
-        Object.assign(fileIds, page.fileIds);
-        Object.assign(changes, page.changes);
         for (const path of page.removals) {
             delete documents[path];
             delete revisions[path];
@@ -48,9 +66,10 @@ export async function advancement(adapter, authorization, held, remodel, continu
             delete changes[path];
             delete written[path];
             delete binaries[path];
+            yield ROW_WEIGHT;
         }
     };
-    stage(first);
+    await stepped(stage(first));
     let pageToken = first.pageToken;
     while (pageToken !== undefined) {
         if (!continuing())
@@ -67,7 +86,7 @@ export async function advancement(adapter, authorization, held, remodel, continu
             return page;
         if (page.roomVersion !== roomVersion)
             return unconfirmed;
-        stage(page);
+        await stepped(stage(page));
         pageToken = page.pageToken;
     }
     return {
@@ -77,12 +96,12 @@ export async function advancement(adapter, authorization, held, remodel, continu
             model: models.collection,
             selectionModel: models.selection,
             roomVersion,
-            documents: settled(documents),
-            binaries: settled(binaries),
-            revisions: settled(revisions),
-            fileIds: settled(fileIds),
-            changes: settled(changes),
-            written: settled(written),
+            documents: await stepped(settling(documents)),
+            binaries: await stepped(settling(binaries)),
+            revisions: await stepped(settling(revisions)),
+            fileIds: await stepped(settling(fileIds)),
+            changes: await stepped(settling(changes)),
+            written: await stepped(settling(written)),
         },
     };
 }

package/dist/replica.d.ts

@@ -40,12 +40,13 @@ type Accepted = Extract<MutationResult, {
     kind: 'accepted';
 }>;
 export declare function applyReturned(confirmed: ConfirmedLayer, submitted: ChangeBatch, accepted: Accepted, roomVersion: string, writtenAt: string): Later<Staged>;
+export declare function replicating(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], previous?: Replica): Generator<number, Replica, void>;
 export declare function replicaOf(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], previous?: Replica): Replica;
 export declare function landed(batch: ChangeBatch, confirmed: ConfirmedLayer, current?: Readonly<Record<string, string>>): boolean;
 export type Standing = {
     readonly withdrawn: readonly ChangeBatch[];
     readonly kept: readonly ChangeBatch[];
 };
-export declare function standing(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], withdrawable: (batch: ChangeBatch) => boolean, local: boolean): Standing;
+export declare function standing(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], withdrawable: (batch: ChangeBatch) => boolean, local: boolean): Generator<number, Standing, void>;
 export {};
 //# sourceMappingURL=replica.d.ts.map

package/dist/replica.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replica.d.ts","sourceRoot":"","sources":["../src/replica.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"replica.d.ts","sourceRoot":"","sources":["../src/replica.ts"],"names":[],"mappings":"AACA,OAAO,EAAmC,KAAK,WAAW,EAAqB,MAAM,aAAa,CAAC;AACnG,OAAO,EAKL,KAAK,UAAU,EACf,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAML,KAAK,KAAK,EACX,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAqB,KAAK,KAAK,EAAE,MAAM,WAAW,CAAC;AAE1D,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG;IACjC,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,cAAc,CAAA;CAAE,GAAG,OAAO,CAAC;AAE7E,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,cAAc,CAAC;IAC1B,KAAK,EAAE,SAAS,WAAW,EAAE,CAAC;IAC9B,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;CAC/B,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,WAAW,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,WAAW,CAQhE;AAmBD,wBAAgB,WAAW,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,cAAc,CAE5F;AAaD,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAKnF;AAiDD,wBAAgB,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC,CAE1F;AAkBD,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,cAAc,GACvB,KAAK,CAAC,MAAM,GAAG;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,CAEtC;AAoBD,KAAK,QAAQ,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,CAAC;AAE9D,wBAAgB,aAAa,CAC3B,SAAS,EAAE,cAAc,EACzB,SAAS,EAAE,WAAW,EACtB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,KAAK,CAAC,MAAM,CAAC,CAoCf;AAgDD,wBAAiB,WAAW,CAC1B,SAAS,EAAE,cAAc,EACzB,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,QAAQ,CAAC,EAAE,OAAO,GACjB,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CA+BlC;AAED,wBAAgB,SAAS,CACvB,SAAS,EAAE,cAAc,EACzB,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAET;AA0ED,wBAAgB,MAAM,CACpB,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,cAAc,EACzB,OAAO,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM,GAC7C,OAAO,CAoBT;AAgBD,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,CAAC,SAAS,EAAE,SAAS,WAAW,EAAE,CAAC;IAC3C,QAAQ,CAAC,IAAI,EAAE,SAAS,WAAW,EAAE,CAAC;CACvC,CAAC;AAEF,wBAAiB,QAAQ,CACvB,SAAS,EAAE,cAAc,EACzB,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,YAAY,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,EAC7C,KAAK,EAAE,OAAO,GACb,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CA6BnC"}