@agentshouse/mdruntime-adapter 0.1.0-ce3fe65a95f49 → 0.1.0-ce5ef9afd7e9a

package/dist/upload.d.ts

@@ -0,0 +1,12 @@
+import { type HouseDoorAnswer, type HouseTransport } from './transport.js';
+export type HouseUpload = {
+    readonly id: string;
+    readonly partBytes: number;
+    readonly parts: readonly {
+        readonly part: number;
+        readonly url: string;
+    }[];
+};
+export declare function houseUpload(value: unknown): HouseUpload | null;
+export declare function finishedUpload(transport: HouseTransport, first: HouseUpload, blob: Blob): Promise<HouseDoorAnswer | null>;
+//# sourceMappingURL=upload.d.ts.map

package/dist/upload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../src/upload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAE9F,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,SAAS;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC5E,CAAC;AAkBF,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,WAAW,GAAG,IAAI,CAQ9D;AAWD,wBAAsB,cAAc,CAClC,SAAS,EAAE,cAAc,EACzB,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAgBjC"}

package/dist/upload.js

@@ -0,0 +1,52 @@
+import { DOOR_FILES_FINISH } from './transport.js';
+// A finishing call that finds House still reading the stored bytes back answers checking; the runtime asks again after five seconds, as the Kit does.
+const CHECKING_WAIT_MS = 5_000;
+const FINISHING_ROUNDS = 24;
+function record(value) {
+    return value !== null && typeof value === 'object' ? value : {};
+}
+function part(value) {
+    const { part: number, url } = record(value);
+    return Number.isSafeInteger(number) && number > 0 && typeof url === 'string'
+        ? { part: number, url }
+        : null;
+}
+export function houseUpload(value) {
+    const { id, part_bytes: partBytes, parts } = record(value);
+    if (typeof id !== 'string' || !Number.isSafeInteger(partBytes) || partBytes <= 0)
+        return null;
+    if (!Array.isArray(parts))
+        return null;
+    const named = parts.map(part);
+    if (named.some((one) => one === null))
+        return null;
+    return { id, partBytes: partBytes, parts: named };
+}
+async function sent(transport, upload, blob) {
+    for (const { part: number, url } of upload.parts) {
+        const start = (number - 1) * upload.partBytes;
+        if ((await transport.put(url, blob.slice(start, start + upload.partBytes))) !== 200)
+            return false;
+    }
+    return true;
+}
+export async function finishedUpload(transport, first, blob) {
+    let upload = first;
+    for (let round = 0; round < FINISHING_ROUNDS; round += 1) {
+        if (!(await sent(transport, upload, blob)))
+            return null;
+        const answer = await transport.door(DOOR_FILES_FINISH, { upload: upload.id });
+        if (answer.status !== 200)
+            return answer;
+        const missing = houseUpload(record(answer.body).upload);
+        if (missing !== null) {
+            upload = missing;
+            continue;
+        }
+        if (record(answer.body).checking !== true)
+            return answer;
+        upload = { ...upload, parts: [] };
+        await new Promise((resolve) => setTimeout(resolve, CHECKING_WAIT_MS));
+    }
+    return null;
+}

package/dist/version.d.ts

@@ -11,6 +11,7 @@ export declare function roomVersion(at: LogPosition): string;
 export declare function logPosition(version: string): LogPosition | null;
 export declare function readPosition(held: Readonly<Record<string, unknown>>): LogPosition | null;
 export declare function presented(authority: string, at: LogPosition): PresentedPosition;
+export declare const DECIMAL: RegExp;
 export declare function reachedVersion(roomVersion: string, target: string, currentEpoch: string | undefined): boolean;
 export declare function followsVersion(roomVersion: string, next: string): boolean;
 //# sourceMappingURL=version.d.ts.map

package/dist/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,wBAAgB,WAAW,CAAC,EAAE,EAAE,WAAW,GAAG,MAAM,CAEnD;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAI/D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,WAAW,GAAG,IAAI,CAKxF;AAED,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,GAAG,iBAAiB,CAE/E;AAID,wBAAgB,cAAc,CAC5B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GAAG,SAAS,GAC/B,OAAO,CAQT;AAED,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAMzE"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,wBAAgB,WAAW,CAAC,EAAE,EAAE,WAAW,GAAG,MAAM,CAEnD;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAI/D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,WAAW,GAAG,IAAI,CAKxF;AAED,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,GAAG,iBAAiB,CAE/E;AAED,eAAO,MAAM,OAAO,QAAwB,CAAC;AAE7C,wBAAgB,cAAc,CAC5B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GAAG,SAAS,GAC/B,OAAO,CAQT;AAED,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAMzE"}

package/dist/version.js

@@ -18,7 +18,7 @@ export function readPosition(held) {
 export function presented(authority, at) {
     return { authority, position: at.position, log_epoch: at.logEpoch };
 }
-const DECIMAL = /^(?:0|[1-9][0-9]*)$/;
+export const DECIMAL = /^(?:0|[1-9][0-9]*)$/;
 export function reachedVersion(roomVersion, target, currentEpoch) {
     if (roomVersion === target)
         return true;

package/dist/write.d.ts

@@ -10,6 +10,7 @@ export type ChangeMapping = {
     rule: string;
 };
 export declare function houseChanges(batch: ChangeBatch, handle: string): ChangeMapping;
+export declare function houseMove(batch: ChangeBatch, source: string, destination: string): ChangeMapping;
 export type OperationHead = {
     readonly operation_id: string;
     readonly app_ref?: string;
@@ -21,7 +22,17 @@ export declare function deltaBody(changes: readonly HouseOperation[]): string;
 export declare function deltaBytes(delta: string): number;
 export declare function uploadable(inline: Readonly<Record<string, unknown>>, bytes: number, bounds: Pick<HouseBounds, 'max_inline_body_bytes' | 'max_upload_bytes'>): boolean;
 export declare function deltaDigest(delta: string): Promise<string>;
-export declare function mutationOutcome(status: number, body: unknown, locator: string, handle: string): MutationResult;
+export type MoveAuthorities = {
+    readonly source: {
+        readonly authority: string;
+        readonly handle: string;
+    };
+    readonly destination: {
+        readonly authority: string;
+        readonly handle: string;
+    };
+};
+export declare function mutationOutcome(status: number, body: unknown, locator: string, handle: string, move?: MoveAuthorities): Generator<number, MutationResult, void>;
 export declare function rejectedMapping(mapping: Extract<ChangeMapping, {
     kind: 'unmapped';
 }>): {

package/dist/write.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../src/write.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,WAAW,EAEhB,KAAK,aAAa,EAElB,KAAK,cAAc,EAEpB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAOlD,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAE/D,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,SAAS,cAAc,EAAE,CAAA;CAAE,GACvD;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAwHrD,wBAAgB,YAAY,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,CAQ9E;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,wBAAgB,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,aAAa,CAK/D;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,SAAS,cAAc,EAAE,GAAG,SAAS,MAAM,EAAE,CAQhF;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,SAAS,cAAc,EAAE,GAAG,MAAM,CAEpE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,UAAU,CACxB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,uBAAuB,GAAG,kBAAkB,CAAC,GACtE,OAAO,CAKT;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAE1D;AAiDD,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,cAAc,CA8EhB;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC;IAEjF,IAAI,EAAE,UAAU;IAChB,QAAQ;IACR,IAAI;IACJ,MAAM;QAAI,IAAI;;IACd,SAAS;EAEZ;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAM1B;AA4BD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3C,aAAa,CAyDf"}
+{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../src/write.ts"],"names":[],"mappings":"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"}

package/dist/write.js

@@ -1,5 +1,5 @@
-import { departure, } from '@agentshouse/mdruntime';
-import { binaryFileOf, headChange } from './read.js';
+import { departure, ROW_WEIGHT, } from '@agentshouse/mdruntime';
+import { answered, answering, binaryFileOf, headChange, revised } from './read.js';
 import { sha256Hex, textBytes } from './digest.js';
 import { nativePath, roomLocalPath } from './map.js';
 import { classifyDoor, doorRefusal, scopedRefusal } from './refusal.js';
@@ -120,6 +120,24 @@ export function houseChanges(batch, handle) {
     }
     return { kind: 'changes', changes };
 }
+export function houseMove(batch, source, destination) {
+    const changes = [];
+    for (const { path, to } of batch.between?.moves ?? []) {
+        const existence = priorExistence(batch, path);
+        if (existence === undefined)
+            return { kind: 'unmapped', path, rule: 'precondition-missing' };
+        if (!('base' in existence)) {
+            return { kind: 'unmapped', path, rule: 'presence-base-unrepresentable' };
+        }
+        changes.push({
+            op: 'rename',
+            path: nativePath(path, source),
+            to: nativePath(to, destination),
+            base: existence.base,
+        });
+    }
+    return { kind: 'changes', changes };
+}
 export function operationHead(batch) {
     const writer = batch.writtenBy;
     return writer === undefined
@@ -129,7 +147,7 @@ export function operationHead(batch) {
 export function batchPaths(changes) {
     return [
         ...new Set(changes.flatMap((change) => change.op === 'rename' ? [String(change.path), String(change.to)] : [String(change.path)])),
-    ].sort();
+    ];
 }
 export function deltaBody(changes) {
     return JSON.stringify({ changes });
@@ -144,16 +162,19 @@ export function uploadable(inline, bytes, bounds) {
 export function deltaDigest(delta) {
     return sha256Hex(delta);
 }
-function material(value, handle) {
+function* material(value, handle, within = () => true) {
     if (!Array.isArray(value))
         return null;
     const held = [];
     for (const entry of value) {
+        yield ROW_WEIGHT;
         if (typeof entry !== 'object' || entry === null)
             return null;
         const file = entry;
         if (typeof file.path !== 'string')
             return null;
+        if (!within(file.path))
+            continue;
         if (file.content !== null && typeof file.content !== 'string')
             return null;
         if (file.revision !== null && file.revision !== undefined && typeof file.revision !== 'string')
@@ -181,27 +202,74 @@ function material(value, handle) {
     }
     return held;
 }
-function affectedOf(held) {
+function* affectedOf(held) {
     const affected = {};
     for (const entry of held) {
         if (entry.content !== null)
             affected[entry.path] = entry.content;
+        yield ROW_WEIGHT;
     }
     return affected;
 }
-export function mutationOutcome(status, body, locator, handle) {
+function* acceptedOf(at, contents) {
+    const answer = answering();
+    for (const entry of contents) {
+        yield ROW_WEIGHT + (entry.content?.length ?? 0);
+        if (entry.revision === null) {
+            answer.removals.add(entry.path);
+            continue;
+        }
+        if (entry.content !== null)
+            answer.documents.set(entry.path, entry.content);
+        if (entry.binary !== undefined)
+            answer.binaryFiles.set(entry.path, entry.binary);
+        revised(answer, entry.path, entry.revision);
+        if (entry.head !== undefined)
+            answer.changes.set(entry.path, entry.head);
+    }
+    const unbinaried = answer.binaryFiles.size === 0;
+    const { binaryFiles, ...room } = yield* answered(answer);
+    return { roomVersion: roomVersion(at), ...room, ...(unbinaried ? {} : { binaryFiles }) };
+}
+function* movedOutcome(held, move) {
+    const authorities = Array.isArray(held.authorities) ? held.authorities : [];
+    const at = (authority) => {
+        const entry = authorities.find((one) => typeof one === 'object' &&
+            one !== null &&
+            one.authority === authority);
+        return entry === undefined ? null : readPosition(entry);
+    };
+    const left = at(move.source.authority);
+    const arrived = at(move.destination.authority);
+    if (left === null || arrived === null)
+        return { kind: 'transport-uncertainty' };
+    const under = (handle) => (path) => path.startsWith(`/rooms/${handle}/`);
+    const leaving = yield* material(held.contents, move.source.handle, under(move.source.handle));
+    const arriving = yield* material(held.contents, move.destination.handle, under(move.destination.handle));
+    if (leaving === null || arriving === null)
+        return { kind: 'transport-uncertainty' };
+    return {
+        kind: 'accepted',
+        ...(yield* acceptedOf(left, leaving)),
+        destination: yield* acceptedOf(arrived, arriving),
+    };
+}
+export function* mutationOutcome(status, body, locator, handle, move) {
     const refusal = doorRefusal(body);
     if (refusal !== null && refusal.code === 'service_mode_write_halted') {
         return { kind: 'write-halted' };
     }
-    if (refusal !== null && refusal.code === 'expired')
-        return { kind: 'expired' };
+    if (refusal !== null && refusal.code === 'expired') {
+        return refusal.fields.restored === true
+            ? { kind: 'expired', restored: true }
+            : { kind: 'expired' };
+    }
     if (refusal !== null && refusal.code === 'edit_conflict') {
         const { current, ...fields } = refusal.fields;
-        const held = material(current, handle) ?? [];
+        const held = (yield* material(current, handle)) ?? [];
         return {
             kind: 'conflicted',
-            affected: affectedOf(held),
+            affected: yield* affectedOf(held),
             code: refusal.code,
             fields,
             retryable: refusal.retryable,
@@ -225,8 +293,9 @@ export function mutationOutcome(status, body, locator, handle) {
     }
     if (classified !== null && classified.kind !== 'scoped-refusal')
         return classified;
-    if (classified !== null && status === 403)
+    if (classified !== null && status === 403 && refusal?.code === 'operation_denied') {
         return classified;
+    }
     if (refusal !== null && status >= 400) {
         return {
             kind: 'rejected',
@@ -240,39 +309,15 @@ export function mutationOutcome(status, body, locator, handle) {
         return { kind: 'transport-uncertainty' };
     }
     const held = body;
+    if (move !== undefined)
+        return yield* movedOutcome(held, move);
     const at = readPosition(held);
     if (at === null)
         return { kind: 'transport-uncertainty' };
-    const contents = material(held.contents, handle);
+    const contents = yield* material(held.contents, handle);
     if (contents === null)
         return { kind: 'transport-uncertainty' };
-    const documents = {};
-    const revisions = {};
-    const changes = {};
-    const binaryFiles = {};
-    const removals = [];
-    for (const entry of contents) {
-        if (entry.revision === null) {
-            removals.push(entry.path);
-            continue;
-        }
-        if (entry.content !== null)
-            documents[entry.path] = entry.content;
-        if (entry.binary !== undefined)
-            binaryFiles[entry.path] = entry.binary;
-        revisions[entry.path] = entry.revision;
-        if (entry.head !== undefined)
-            changes[entry.path] = entry.head;
-    }
-    return {
-        kind: 'accepted',
-        roomVersion: roomVersion(at),
-        documents,
-        revisions,
-        changes,
-        removals: removals.sort(),
-        ...(Object.keys(binaryFiles).length === 0 ? {} : { binaryFiles }),
-    };
+    return { kind: 'accepted', ...(yield* acceptedOf(at, contents)) };
 }
 export function rejectedMapping(mapping) {
     return {
@@ -293,12 +338,19 @@ export function revisionBody(input) {
 function revisionAuthor(entry) {
     const user = entry.author_user;
     const site = entry.author_site;
-    const name = entry.author_site_name;
-    if (typeof user === 'string' && site === undefined && name === undefined) {
+    const siteName = entry.author_site_name;
+    const inbox = entry.author_inbox;
+    const inboxName = entry.author_inbox_name;
+    const named = [site, siteName, inbox, inboxName].filter((held) => held !== undefined);
+    if (typeof user === 'string' && named.length === 0)
         return { kind: 'user', id: user };
+    if (user !== null || named.length !== 2)
+        return null;
+    if (typeof site === 'string' && typeof siteName === 'string') {
+        return { kind: 'site', id: site, name: siteName };
     }
-    if (user === null && typeof site === 'string' && typeof name === 'string') {
-        return { kind: 'site', id: site, name };
+    if (typeof inbox === 'string' && typeof inboxName === 'string') {
+        return { kind: 'inbox', id: inbox, name: inboxName };
     }
     return null;
 }
@@ -337,7 +389,7 @@ export function historyOutcome(status, body, locator, request) {
             return {
                 kind: 'scoped-refusal',
                 locator,
-                scope: 'content',
+                scope: 'operation',
                 code: 'retained_history_unavailable',
                 fields: { path: request.path, revision: request.revision },
                 retryable: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentshouse/mdruntime-adapter",
-  "version": "0.1.0-ce3fe65a95f49",
+  "version": "0.1.0-ce5ef9afd7e9a",
   "description": "Agents House Adapter for the MD Runtime",
   "license": "MIT",
   "type": "module",
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@agentshouse/mdruntime": "0.1.0-c56daf494ecb4"
+    "@agentshouse/mdruntime": "0.1.0-c03e7b79830dd"
   }
 }

package/dist/handed.d.ts

@@ -1,15 +0,0 @@
-import type { HeldRoom, MutationResult } from '@agentshouse/mdruntime';
-import type { HouseScope, HouseView } from './read.js';
-import type { StreamedAdvancement } from './stream.js';
-export type HandedRoom = {
-    roomVersion: string;
-    revisions: ReadonlyMap<string, string>;
-};
-export declare function scopeHanded(scope: HouseScope): HandedRoom;
-export declare function heldHanded(held: HeldRoom): HandedRoom;
-export declare function acceptedHanded(held: HandedRoom, accepted: Extract<MutationResult, {
-    kind: 'accepted';
-}>, roomVersion: string): HandedRoom;
-export declare function enumeratedHanded(view: HouseView, earlier: HandedRoom | undefined): HandedRoom;
-export declare function streamedHanded(held: HandedRoom, advanced: StreamedAdvancement): HandedRoom;
-//# sourceMappingURL=handed.d.ts.map

package/dist/handed.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"handed.d.ts","sourceRoot":"","sources":["../src/handed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGvD,MAAM,MAAM,UAAU,GAAG;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CASzD;AAOD,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,GAAG,UAAU,CAErD;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,EACvD,WAAW,EAAE,MAAM,GAClB,UAAU,CAKZ;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,GAAG,SAAS,GAAG,UAAU,CAM7F;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,mBAAmB,GAAG,UAAU,CAM1F"}

package/dist/handed.js

@@ -1,38 +0,0 @@
-import { roomVersion } from './version.js';
-export function scopeHanded(scope) {
-    return {
-        roomVersion: roomVersion(scope),
-        revisions: new Map(scope.files.flatMap(({ path, revision }) => revision === undefined ? [] : [[path, revision]])),
-    };
-}
-function revised(revisions, path, revision) {
-    if (revision === undefined)
-        revisions.delete(path);
-    else
-        revisions.set(path, revision);
-}
-export function heldHanded(held) {
-    return { roomVersion: held.roomVersion, revisions: new Map(Object.entries(held.revisions)) };
-}
-export function acceptedHanded(held, accepted, roomVersion) {
-    const revisions = new Map(held.revisions);
-    for (const [path, revision] of Object.entries(accepted.revisions))
-        revisions.set(path, revision);
-    for (const path of accepted.removals)
-        revisions.delete(path);
-    return { roomVersion, revisions };
-}
-export function enumeratedHanded(view, earlier) {
-    const revisions = new Map(earlier?.revisions);
-    for (const change of view.changes) {
-        revised(revisions, change.path, 'removed' in change ? undefined : change.revision);
-    }
-    return { roomVersion: roomVersion(view), revisions };
-}
-export function streamedHanded(held, advanced) {
-    const revisions = new Map(held.revisions);
-    for (const entry of advanced.entries) {
-        revised(revisions, entry.path, entry.kind === 'removed' ? undefined : entry.revision);
-    }
-    return { roomVersion: advanced.page.roomVersion, revisions };
-}