@agentshouse/mdruntime 0.1.0-c8f3163f32f93 → 0.1.0-c907ac1fbed44

package/dist/bootstrap.js

@@ -1,96 +1,165 @@
 import { transferIdentity } from './identity.js';
-import { advancement } from './refresh.js';
-import { acceptedBinaries } from './overlay.js';
-import { readStaged } from './replica.js';
+import { advancement, pageEntries } from './refresh.js';
 import { unconfirmed } from './transfer.js';
+const NOTHING_DONE = { parts: 0, bytes: 0 };
 const RESUMABLE = new Set([
     'transport-uncertainty',
     'retryable-refusal',
     'unconfirmed',
 ]);
-function pageLayer(page) {
+const NOTHING_PRIOR = () => Promise.resolve(new Map());
+async function pageOf(page) {
     return {
-        documents: page.documents,
-        revisions: page.revisions,
-        changes: page.changes,
-        written: Object.fromEntries(Object.keys(page.documents).map((path) => [path, page.roomVersion])),
-        binaries: acceptedBinaries(page.binaryFiles),
+        entries: await pageEntries(page, [], page.roomVersion, NOTHING_PRIOR),
+        folders: page.folders ?? [],
     };
 }
-async function heldTransfer(staging, room) {
-    const record = staging.held(room.locator);
-    if (record === null)
-        return null;
-    if (record.selection === room.replica.selection) {
-        return { record, layer: await staging.staged(record) };
-    }
-    await staging.abandon(room.locator);
-    return null;
-}
-function pooled(pool, layer) {
+function heldTogether(first, second) {
+    if (first === null)
+        return second;
     return {
-        documents: { ...pool?.documents, ...layer.documents },
-        revisions: { ...pool?.revisions, ...layer.revisions },
+        async files(after, limit) {
+            const [left, right] = await Promise.all([
+                first.files(after, limit),
+                second.files(after, limit),
+            ]);
+            const merged = new Map([...left, ...right].map((file) => [file.path, file]));
+            return [...merged.values()]
+                .sort((one, other) => (one.path < other.path ? -1 : one.path > other.path ? 1 : 0))
+                .slice(0, limit);
+        },
+        async contents(paths) {
+            const [left, right] = await Promise.all([first.contents(paths), second.contents(paths)]);
+            return new Map([...left, ...right]);
+        },
     };
 }
+const NO_CONTENT = {
+    files: () => Promise.resolve([]),
+    contents: () => Promise.resolve(new Map()),
+};
 export async function bootstrapRoom(adapter, authorization, room, held, remodel, continuing, staging, reuse) {
-    const first = await bundle(adapter, authorization, room, held, remodel, continuing, staging, await heldTransfer(staging, room), reuse);
+    const kept = staging.held(room.locator);
+    const resumed = kept !== null && kept.selection === room.replica.selection ? kept : null;
+    if (kept !== null && resumed === null)
+        await staging.abandon(room.locator);
+    const first = await bundle(adapter, authorization, room, held, remodel, continuing, staging, resumed, reuse);
     if (first.kind !== 'expired')
         return first;
-    await staging.abandon(room.locator);
-    const replacement = await bundle(adapter, authorization, room, held, remodel, continuing, staging, null, pooled(reuse, first.held));
-    if (replacement.kind !== 'expired')
-        return replacement;
-    await staging.abandon(room.locator);
-    return unconfirmed;
+    await staging.setAside(room.locator);
+    try {
+        const replacement = await bundle(adapter, authorization, room, held, remodel, continuing, staging, null, heldTogether(reuse, first.held));
+        if (replacement.kind !== 'expired')
+            return replacement;
+        await staging.abandon(room.locator);
+        return unconfirmed;
+    }
+    finally {
+        if (first.key !== null)
+            await staging.release(first.key);
+    }
+}
+const RESUMED_LOOKUPS = 2;
+function compositionFor(room, models) {
+    return {
+        model: models.collection,
+        selection: room.typedSelection === undefined
+            ? null
+            : { roots: room.typedSelection.roots, model: models.selection },
+    };
 }
 async function bundle(adapter, authorization, room, held, remodel, continuing, staging, kept, pool) {
     const locator = room.locator;
     const selection = room.replica.selection;
-    const documents = { ...kept?.layer.documents };
-    const revisions = { ...kept?.layer.revisions };
-    const changes = { ...kept?.layer.changes };
-    const written = { ...kept?.layer.written };
-    const binaries = { ...kept?.layer.binaries };
-    let transfer = kept?.record ?? null;
-    while (transfer === null || transfer.pageToken !== null) {
-        if (!continuing())
-            return unconfirmed;
+    let transfer = kept;
+    let lookups = kept === null ? 0 : RESUMED_LOOKUPS;
+    let ahead = null;
+    const arriving = staging.arriving(locator);
+    const asking = async (token) => {
+        const looked = token !== null && lookups > 0;
+        if (looked)
+            lookups -= 1;
+        const received = looked ? await staging.received(locator, token) : null;
         const page = await adapter.bootstrap(authorization, {
             locator,
             selection,
-            ...(transfer?.pageToken == null ? {} : { pageToken: transfer.pageToken }),
+            ...(token === null
+                ? {}
+                : { pageToken: token, arriving: (bytes) => arriving.at(token, bytes) }),
             ...(pool === null ? {} : { held: pool }),
+            ...(received === null ? {} : { received }),
         });
-        if (page.kind === 'beyond-horizon')
-            return { kind: 'expired', held: { documents, revisions } };
-        if (page.kind !== 'bootstrap') {
-            if (!RESUMABLE.has(page.kind))
-                await staging.abandon(locator);
-            return page;
+        if (token !== null && page.kind === 'bootstrap' && page.received !== undefined) {
+            await staging.keep(locator, token, page.received);
         }
-        transfer = {
-            locator,
-            transfer: transfer?.transfer ?? transferIdentity(),
-            selection,
-            from: transfer !== null && adapter.reached(locator, page.roomVersion, transfer.from)
-                ? transfer.from
-                : page.roomVersion,
-            last: transfer !== null && !adapter.reached(locator, page.roomVersion, transfer.last)
-                ? transfer.last
-                : page.roomVersion,
-            pageToken: page.pageToken ?? null,
-            models: remodel(page.models, transfer?.models ?? held),
-        };
-        const staged = pageLayer(page);
-        if (!(await staging.stage(transfer, staged)))
-            return unconfirmed;
-        Object.assign(documents, staged.documents);
-        Object.assign(revisions, staged.revisions);
-        Object.assign(changes, staged.changes);
-        Object.assign(written, staged.written);
-        Object.assign(binaries, staged.binaries);
+        return page;
+    };
+    try {
+        while (transfer === null || transfer.writing !== null || transfer.pageToken !== null) {
+            if (!continuing())
+                return unconfirmed;
+            const writing = transfer?.writing ?? null;
+            const asked = writing === null ? (transfer?.pageToken ?? null) : writing.token;
+            const fetched = ahead !== null && ahead.token === asked ? ahead : null;
+            if (ahead !== fetched)
+                ahead?.release();
+            ahead = null;
+            const turned = fetched?.release ??
+                (await staging.turn(locator, transfer === null ? 'listing' : 'downloading'));
+            try {
+                if (!continuing())
+                    return unconfirmed;
+                const page = await (fetched?.page ?? asking(asked));
+                if (page.kind === 'beyond-horizon') {
+                    const key = transfer?.key ?? null;
+                    return { kind: 'expired', held: key === null ? NO_CONTENT : staging.content(key), key };
+                }
+                if (page.kind !== 'bootstrap') {
+                    if (!RESUMABLE.has(page.kind))
+                        await staging.abandon(locator);
+                    return page;
+                }
+                const later = page.pageToken;
+                const spare = later === undefined || !continuing() ? null : staging.spare();
+                if (later !== undefined && spare !== null) {
+                    const answer = asking(later);
+                    answer.catch(() => { });
+                    ahead = { token: later, page: answer, release: spare };
+                }
+                const next = {
+                    locator,
+                    transfer: transfer?.transfer ?? transferIdentity(),
+                    selection,
+                    from: transfer !== null && adapter.reached(locator, page.roomVersion, transfer.from)
+                        ? transfer.from
+                        : page.roomVersion,
+                    last: transfer !== null && !adapter.reached(locator, page.roomVersion, transfer.last)
+                        ? transfer.last
+                        : page.roomVersion,
+                    pageToken: later ?? null,
+                    writing: { token: asked, written: asked === null ? 0 : (writing?.written ?? 0) },
+                    inventory: page.inventory ?? transfer?.inventory ?? null,
+                    done: transfer?.done ?? NOTHING_DONE,
+                    models: remodel(page.models, transfer?.models ?? held),
+                    key: transfer?.key ?? null,
+                };
+                const staged = await staging.stage(next, await pageOf(page), compositionFor(room, next.models), page.received ?? null);
+                if (staged === null)
+                    return unconfirmed;
+                transfer = staged;
+            }
+            finally {
+                turned();
+            }
+        }
+    }
+    finally {
+        ahead?.release();
+        arriving.end();
     }
+    await staging.turn(locator, 'replaying');
+    if (!continuing())
+        return unconfirmed;
     const record = {
         locator,
         name: room.name,
@@ -103,25 +172,26 @@ async function bundle(adapter, authorization, room, held, remodel, continuing, s
         providerOwnedPaths: room.providerOwnedPaths,
         roomVersion: transfer.from,
         transfer: transfer.transfer,
-        documents,
-        binaries,
-        revisions,
-        changes,
-        written,
+        inventory: transfer.inventory,
+        key: transfer.key,
     };
-    const reconciled = transfer.last === transfer.from
+    const due = [room.roomVersion, ...staging.announced(locator)];
+    const last = transfer.last;
+    const reconciled = last === transfer.from && due.every((version) => adapter.reached(locator, last, version))
         ? { kind: 'still-current' }
-        : await advancement(adapter, authorization, record, remodel, continuing);
+        : await advancement(adapter, authorization, record, remodel, continuing, await staging.refreshing(locator, record.key));
     if (reconciled.kind === 'advanced' || reconciled.kind === 'still-current') {
-        const read = readStaged(reconciled.kind === 'advanced' ? reconciled.record : record);
-        if (read.kind === 'refused') {
+        const refreshed = reconciled.kind === 'advanced';
+        const result = refreshed ? reconciled.record : record;
+        const refused = await staging.validate(result, refreshed ? 'refreshed' : 'confirmed');
+        if (refused !== null) {
             await staging.abandon(locator);
-            return read;
+            return refused;
         }
-        return { kind: 'staged', confirmed: read.confirmed, stored: record };
+        return { kind: 'staged', record: result, refreshed };
     }
     if (reconciled.kind === 'beyond-horizon') {
-        return { kind: 'expired', held: { documents, revisions } };
+        return { kind: 'expired', held: staging.content(record.key), key: record.key };
     }
     if (!RESUMABLE.has(reconciled.kind))
         await staging.abandon(locator);

package/dist/chain.d.ts

@@ -0,0 +1,11 @@
+import type { MdRuntimeClient } from './client.js';
+import type { DocumentQuery, DocumentResult, GroupQuery, GroupResult, PendingResult } from './query.js';
+type Rows = DocumentResult | GroupResult;
+export type WindowAnswer = Rows | PendingResult;
+export type WindowChain = {
+    want(count: number): void;
+    close(): void;
+};
+export declare function chainedWindows(runtime: MdRuntimeClient, query: DocumentQuery | GroupQuery, count: number, publish: (answers: readonly (WindowAnswer | null)[], settled: boolean) => void): WindowChain;
+export {};
+//# sourceMappingURL=chain.d.ts.map

package/dist/chain.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"chain.d.ts","sourceRoot":"","sources":["../src/chain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EACd,UAAU,EACV,WAAW,EACX,aAAa,EACd,MAAM,YAAY,CAAC;AAEpB,KAAK,IAAI,GAAG,cAAc,GAAG,WAAW,CAAC;AAEzC,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG,aAAa,CAAC;AAEhD,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AAaF,wBAAgB,cAAc,CAC5B,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,aAAa,GAAG,UAAU,EACjC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAC7E,WAAW,CAkEb"}

package/dist/chain.js

@@ -0,0 +1,64 @@
+function answered(answer) {
+    return answer !== null && !('pending' in answer);
+}
+export function chainedWindows(runtime, query, count, publish) {
+    let links = [];
+    let wanted = count;
+    let closed = false;
+    const observe = runtime.observe;
+    const open = (after, shown) => {
+        const link = { after, observation: null, value: shown, fresh: false };
+        void observe('query', after === undefined ? query : { ...query, after }).then((observation) => {
+            if (closed || !links.includes(link)) {
+                observation.close();
+                return;
+            }
+            link.observation = observation;
+            const take = (value) => {
+                link.value = value;
+                link.fresh = true;
+                settle();
+            };
+            observation.subscribe(take);
+            take(observation.current());
+        }, () => { });
+        return link;
+    };
+    const settle = () => {
+        if (closed)
+            return;
+        const next = [];
+        for (let at = 0; at < wanted; at += 1) {
+            const before = next[at - 1];
+            if (before !== undefined && !before.fresh) {
+                next.push(...links.slice(at, wanted));
+                break;
+            }
+            if (before !== undefined && (!answered(before.value) || before.value.next === undefined)) {
+                break;
+            }
+            const after = before === undefined ? undefined : before.value.next;
+            const held = links[at];
+            next.push(held !== undefined && held.after === after ? held : open(after, held?.value ?? null));
+        }
+        for (const link of links)
+            if (!next.includes(link))
+                link.observation?.close();
+        links = next;
+        publish(links.map((link) => link.value), links.every((link) => link.fresh));
+    };
+    settle();
+    return {
+        want(count) {
+            if (count === wanted)
+                return;
+            wanted = count;
+            settle();
+        },
+        close() {
+            closed = true;
+            for (const link of links)
+                link.observation?.close();
+        },
+    };
+}

package/dist/change-set.d.ts

@@ -1,14 +1,6 @@
-import { type Replica } from './replica.js';
-import { type Row } from './rows.js';
 export type DocumentChange = {
-    locator: string;
-    path: string;
-    before: readonly Row[];
-    after: readonly Row[];
-};
-export type MessageChange = {
-    conversation: string;
-    identity: string;
+    readonly locator: string;
+    readonly path: string | null;
 };
 export type ChangeSet = {
     documents: readonly DocumentChange[];
@@ -19,15 +11,18 @@ export type ChangeSet = {
     rooms: readonly string[];
     queues: readonly string[];
     presentations: readonly string[];
-    messages: readonly MessageChange[];
     conversations: readonly string[];
 };
-export declare function changeSet(locator: string, before: Replica | null, after: Replica | null, changed?: {
+type Changed = {
+    documents?: readonly string[] | null;
     drafts?: readonly string[];
     room?: boolean;
     queue?: boolean;
     presentation?: string;
-}): ChangeSet;
-export declare function conversationChangeSet(messages: readonly MessageChange[], conversations: readonly string[]): ChangeSet;
+};
+export declare function changeSet(locator: string, changed?: Changed): ChangeSet;
+export declare function conversationChangeSet(conversations: readonly string[]): ChangeSet;
 export declare function mergeChangeSets(sets: readonly ChangeSet[]): ChangeSet;
+export declare function touches(set: ChangeSet, locator: string, path: string): boolean;
+export {};
 //# sourceMappingURL=change-set.d.ts.map

package/dist/change-set.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"change-set.d.ts","sourceRoot":"","sources":["../src/change-set.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,KAAK,OAAO,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAwB,KAAK,GAAG,EAAE,MAAM,WAAW,CAAC;AAE3D,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,GAAG,EAAE,CAAC;IACvB,KAAK,EAAE,SAAS,GAAG,EAAE,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvE,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,SAAS,cAAc,EAAE,CAAC;IACrC,MAAM,EAAE,SAAS;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrD,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAC;IACnC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC,CAAC;AAuBF,wBAAgB,SAAS,CACvB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,OAAO,GAAG,IAAI,EACtB,KAAK,EAAE,OAAO,GAAG,IAAI,EACrB,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CAClB,GACL,SAAS,CAoDX;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,SAAS,aAAa,EAAE,EAClC,aAAa,EAAE,SAAS,MAAM,EAAE,GAC/B,SAAS,CAUX;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,SAAS,EAAE,GAAG,SAAS,CAUrE"}
+{"version":3,"file":"change-set.d.ts","sourceRoot":"","sources":["../src/change-set.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAExF,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,SAAS,cAAc,EAAE,CAAC;IACrC,MAAM,EAAE,SAAS;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrD,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;IACrC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,OAAY,GAAG,SAAS,CAe3E;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CASjF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,SAAS,EAAE,GAAG,SAAS,CASrE;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAI9E"}

package/dist/change-set.js

@@ -1,79 +1,25 @@
-import { passingDocument } from './collection.js';
-import { binaryRecord } from './binary.js';
-import { sameBinary, sameChange } from './overlay.js';
-import { beneath } from './paths.js';
-import { compositionOf, sameMembership } from './replica.js';
-import { markdownPath, rowsOf } from './rows.js';
-function rowsAt(locator, replica, path) {
-    if (replica === null)
-        return [];
-    const visible = replica.visible;
-    const document = markdownPath(path) ? passingDocument(visible.collection, path) : null;
-    const held = visible.documents[path] !== undefined && document !== undefined;
-    const binary = visible.binaries[path];
-    if (!held && binary === undefined)
-        return [];
-    return rowsOf(locator, path, document ?? null, compositionOf(replica.confirmed.record), visible.changes[path] ?? null, binary === undefined ? null : binaryRecord(path, binary, visible.revisions[path]));
-}
-function modelShape(model) {
-    return model.status === 'unavailable' ? 'unavailable' : JSON.stringify(model.types);
-}
-export function changeSet(locator, before, after, changed = {}) {
-    const paths = new Set([
-        ...Object.keys(before?.visible.documents ?? {}),
-        ...Object.keys(after?.visible.documents ?? {}),
-        ...Object.keys(before?.visible.binaries ?? {}),
-        ...Object.keys(after?.visible.binaries ?? {}),
-    ]);
-    const documents = [];
-    const oldRoom = before?.confirmed.record;
-    const newRoom = after?.confirmed.record;
-    const collectionChanged = oldRoom !== undefined &&
-        newRoom !== undefined &&
-        modelShape(oldRoom.model) !== modelShape(newRoom.model);
-    const selectionChanged = oldRoom !== undefined &&
-        newRoom !== undefined &&
-        modelShape(oldRoom.selectionModel) !== modelShape(newRoom.selectionModel);
-    const reclassified = oldRoom !== undefined && newRoom !== undefined && !sameMembership(oldRoom, newRoom);
-    for (const path of paths) {
-        const selected = newRoom?.typedSelection?.roots.some((root) => beneath(root, path)) ?? false;
-        const retyped = selected ? selectionChanged : collectionChanged;
-        if (before?.visible.documents[path] === after?.visible.documents[path] &&
-            sameBinary(before?.visible.binaries[path], after?.visible.binaries[path]) &&
-            before?.visible.revisions[path] === after?.visible.revisions[path] &&
-            sameChange(before?.visible.changes[path], after?.visible.changes[path]) &&
-            !retyped &&
-            !reclassified)
-            continue;
-        documents.push({
-            locator,
-            path,
-            get before() {
-                return rowsAt(locator, before, path);
-            },
-            get after() {
-                return rowsAt(locator, after, path);
-            },
-        });
-    }
+export function changeSet(locator, changed = {}) {
+    const documents = changed.documents;
     return {
-        documents,
+        documents: documents === undefined
+            ? []
+            : documents === null
+                ? [{ locator, path: null }]
+                : documents.map((path) => ({ locator, path })),
         drafts: (changed.drafts ?? []).map((path) => ({ locator, path })),
         rooms: changed.room ? [locator] : [],
         queues: changed.queue ? [locator] : [],
         presentations: changed.presentation === undefined ? [] : [changed.presentation],
-        messages: [],
         conversations: [],
     };
 }
-export function conversationChangeSet(messages, conversations) {
+export function conversationChangeSet(conversations) {
     return {
         documents: [],
         drafts: [],
         rooms: [],
         queues: [],
         presentations: [],
-        messages,
         conversations: [...new Set(conversations)],
     };
 }
@@ -84,7 +30,9 @@ export function mergeChangeSets(sets) {
         rooms: [...new Set(sets.flatMap((set) => set.rooms))],
         queues: [...new Set(sets.flatMap((set) => set.queues))],
         presentations: [...new Set(sets.flatMap((set) => set.presentations))],
-        messages: sets.flatMap((set) => set.messages),
         conversations: [...new Set(sets.flatMap((set) => set.conversations))],
     };
 }
+export function touches(set, locator, path) {
+    return set.documents.some((change) => change.locator === locator && (change.path === null || change.path === path));
+}

package/dist/change.d.ts

@@ -1,3 +1,4 @@
+import type { BinaryFile, HeadChange } from './adapter.js';
 export type Change = {
     readonly kind: 'field';
     readonly path: string;
@@ -29,7 +30,6 @@ export type Change = {
     readonly kind: 'binary';
     readonly path: string;
     readonly localId: string;
-    readonly blob: Blob;
     readonly byteLength: number;
     readonly mediaType: string;
     readonly sha256: string;
@@ -40,6 +40,32 @@ export type Change = {
 } | {
     readonly kind: 'remove';
     readonly path: string;
+} | (Arriving & {
+    readonly content: string;
+}) | (Arriving & {
+    readonly binary: BinaryFile;
+});
+type Arriving = {
+    readonly kind: 'arrival';
+    readonly path: string;
+    readonly revision?: string;
+    readonly fileId?: string;
+    readonly change?: HeadChange;
+};
+export type RoomMove = {
+    readonly source: {
+        readonly room: string;
+        readonly baseRoomVersion: string;
+    };
+    readonly destination: {
+        readonly room: string;
+        readonly baseRoomVersion: string;
+        readonly handle: string;
+    };
+    readonly moves: readonly {
+        readonly path: string;
+        readonly to: string;
+    }[];
 };
 export type Precondition = {
     readonly kind: 'field';
@@ -81,9 +107,13 @@ export type ChangeBatch = {
     readonly changes: readonly Change[];
     readonly preconditions: readonly Precondition[];
     readonly writtenBy?: WrittenBy;
+    readonly between?: RoomMove;
 };
 export declare function immutable(batch: ChangeBatch): ChangeBatch;
+export declare function partnerOf(batch: ChangeBatch, locator: string): string | null;
+export declare function leaving(batch: ChangeBatch, locator: string): boolean;
 export declare function landing(changes: readonly Change[], index: number, path: string): string | null;
 export declare function departure(changes: readonly Change[], index: number): string;
 export declare function queuedFile(batch: ChangeBatch, path: string, localId: string): number;
+export {};
 //# sourceMappingURL=change.d.ts.map

package/dist/change.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"change.d.ts","sourceRoot":"","sources":["../src/change.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"change.d.ts","sourceRoot":"","sources":["../src/change.ts"],"names":[],"mappings":"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"}

package/dist/change.js

@@ -1,7 +1,7 @@
 function frozen(value) {
     if (Array.isArray(value))
         return Object.freeze(value.map((item) => frozen(item)));
-    if (value === null || typeof value !== 'object' || value instanceof Blob)
+    if (value === null || typeof value !== 'object')
         return value;
     const copy = {};
     for (const [name, item] of Object.entries(value))
@@ -11,6 +11,15 @@ function frozen(value) {
 export function immutable(batch) {
     return frozen(batch);
 }
+export function partnerOf(batch, locator) {
+    const between = batch.between;
+    if (between === undefined)
+        return null;
+    return between.source.room === locator ? between.destination.room : between.source.room;
+}
+export function leaving(batch, locator) {
+    return batch.between?.source.room === locator;
+}
 export function landing(changes, index, path) {
     let at = path;
     for (const change of changes.slice(index + 1)) {