@agentshouse/mdruntime 0.1.0-cbb8d8acc9d19 → 0.1.0-cc56db96f86ae

package/dist/memory.js

@@ -1,7 +1,7 @@
 import { sameChange } from './overlay.js';
 const FIXTURE_RETENTION = {
     history: { kind: 'duration', seconds: 1 },
-    outcome: 1,
+    outcome: 604_800,
     refreshHorizon: 1,
 };
 function declaredRetention(value) {
@@ -55,6 +55,7 @@ export function createMemoryAdapter(options = {}) {
     const scripted = new Map();
     const unsealed = new Map();
     const sealed = new Set();
+    const sentTurns = new Map();
     const historyPageSize = options.historyPageSize;
     let held = [];
     let expiring = [];
@@ -107,30 +108,35 @@ export function createMemoryAdapter(options = {}) {
             providerOwnedPaths: room.providerOwnedPaths,
         };
     }
-    function page(room, from) {
+    function page(room, after) {
         const paths = Object.keys(room.documents ?? {}).sort();
+        const opening = after === undefined;
+        const from = opening ? 0 : paths.filter((path) => path <= after).length;
         const size = pageSize ?? paths.length;
         const taken = paths.slice(from, from + size);
         const next = from + taken.length;
-        const targets = from === 0 ? (room.binaryTargets ?? []) : [];
+        const targets = opening ? Object.keys(room.binaryFiles ?? {}) : [];
         return {
             kind: 'bootstrap',
             roomVersion: room.roomVersion,
-            ...(from === 0 ? { models: modelsOf(room) } : {}),
+            ...(opening ? { models: modelsOf(room) } : {}),
             documents: named(room.documents ?? {}, taken),
-            revisions: named(room.revisions ?? {}, taken),
+            revisions: named(room.revisions ?? {}, [...taken, ...targets]),
+            ...(room.fileIds === undefined
+                ? {}
+                : { fileIds: named(room.fileIds, [...taken, ...targets]) }),
             changes: named(room.changes ?? {}, [...taken, ...targets]),
-            binaryTargets: targets,
-            ...(from === 0 && room.attachments !== undefined ? { attachments: room.attachments } : {}),
-            ...(next < paths.length ? { pageToken: String(next) } : {}),
+            binaryFiles: named(room.binaryFiles ?? {}, targets),
+            ...(next < paths.length ? { pageToken: taken.at(-1) } : {}),
         };
     }
     function advancement(room, from, at) {
         const current = room.documents ?? {};
         const previous = from.documents ?? {};
-        const currentTargets = new Set(room.binaryTargets ?? []);
-        const previousTargets = new Set(from.binaryTargets ?? []);
+        const currentTargets = new Set(Object.keys(room.binaryFiles ?? {}));
+        const previousTargets = new Set(Object.keys(from.binaryFiles ?? {}));
         const headMoved = (path) => room.revisions?.[path] !== from.revisions?.[path] ||
+            room.fileIds?.[path] !== from.fileIds?.[path] ||
             !sameChange(room.changes?.[path], from.changes?.[path]);
         const changed = Object.keys(current)
             .filter((path) => current[path] !== previous[path] || headMoved(path))
@@ -145,24 +151,24 @@ export function createMemoryAdapter(options = {}) {
         const targets = opening
             ? [...currentTargets].filter((target) => !previousTargets.has(target) || headMoved(target))
             : [];
-        const attachments = room.attachments ?? [];
-        const declared = opening && JSON.stringify(attachments) !== JSON.stringify(from.attachments ?? []);
         const models = opening ? changedModels(room, from) : undefined;
         return {
             kind: 'net-advancement',
             roomVersion: room.roomVersion,
             ...(models === undefined ? {} : { models }),
             documents: named(current, taken),
-            revisions: named(room.revisions ?? {}, taken),
+            revisions: named(room.revisions ?? {}, [...taken, ...targets]),
+            ...(room.fileIds === undefined
+                ? {}
+                : { fileIds: named(room.fileIds, [...taken, ...targets]) }),
             changes: named(room.changes ?? {}, [...taken, ...targets]),
-            binaryTargets: targets,
+            binaryFiles: named(room.binaryFiles ?? {}, targets),
             removals: opening
                 ? [
                     ...Object.keys(previous).filter((path) => !(path in current) && !currentTargets.has(path)),
                     ...[...previousTargets].filter((target) => !currentTargets.has(target) && !(target in current)),
                 ].sort()
                 : [],
-            ...(declared ? { attachments } : {}),
             ...(pageToken === undefined ? {} : { pageToken }),
         };
     }
@@ -183,7 +189,7 @@ export function createMemoryAdapter(options = {}) {
     function historiesOf(input) {
         const asked = input?.conversations;
         if (!Array.isArray(asked))
-            return { kind: 'rejected', code: 'invalid_request', fields: {} };
+            return { kind: 'rejected', code: 'invalid_request', fields: {}, retryable: false };
         const histories = [];
         for (const entry of asked) {
             const conversation = typeof entry.conversation === 'string' ? scripted.get(entry.conversation) : undefined;
@@ -211,21 +217,32 @@ export function createMemoryAdapter(options = {}) {
         const named = typeof input.conversation === 'string' ? input.conversation : '';
         const conversation = scripted.get(named);
         if (conversation === undefined) {
-            return { kind: 'rejected', code: 'unknown-conversation', fields: { conversation: named } };
+            return {
+                kind: 'rejected',
+                code: 'unknown-conversation',
+                fields: { conversation: named },
+                retryable: false,
+            };
         }
         const outcome = conversation.outcomes?.[name];
         if (outcome !== undefined)
             return outcome;
         if (name === 'conversation.send') {
+            const operation = typeof input.operation_id === 'string' ? input.operation_id : null;
+            const answered = operation === null ? undefined : sentTurns.get(operation);
+            if (answered !== undefined)
+                return { kind: 'action', result: { turn: answered } };
             issued += 1;
             const turn = `turn-${issued}`;
             unsealed.set(turn, named);
+            if (operation !== null)
+                sentTurns.set(operation, turn);
             return { kind: 'action', result: { turn } };
         }
         if (name === 'conversation.cancel') {
             const turn = typeof input.turn === 'string' ? input.turn : '';
             if (sealed.has(turn) || !unsealed.has(turn)) {
-                return { kind: 'rejected', code: 'turn-sealed', fields: { turn } };
+                return { kind: 'rejected', code: 'turn-sealed', fields: { turn }, retryable: false };
             }
             unsealed.delete(turn);
             return { kind: 'action', result: { turn, cancelled: true } };
@@ -246,9 +263,11 @@ export function createMemoryAdapter(options = {}) {
             capabilities,
             providerLimits,
             retention,
+            ...(options.member === undefined ? {} : { member: options.member }),
         };
     }
     return {
+        ...(options.exhaustiveDiscovery === undefined ? {} : { exhaustiveDiscovery: true }),
         setRooms(next) {
             rooms = [...next];
             retain(rooms);
@@ -261,9 +280,9 @@ export function createMemoryAdapter(options = {}) {
             for (const observer of observers)
                 observer({ kind: 'opened' });
         },
-        close(revoked = false) {
+        close({ revoked = false, lost = !revoked } = {}) {
             for (const observer of observers)
-                observer({ kind: 'closed', revoked });
+                observer({ kind: 'closed', revoked, lost });
         },
         expire(locators) {
             expiring = [...locators];
@@ -272,6 +291,13 @@ export function createMemoryAdapter(options = {}) {
             for (const observer of observers)
                 observer({ kind: 'room-version', locator, roomVersion });
         },
+        notifyAuthorityChanged(scope) {
+            for (const observer of observers) {
+                observer(scope === undefined
+                    ? { kind: 'authority-changed' }
+                    : { kind: 'authority-changed', scope });
+            }
+        },
         notifyConversation(event) {
             if (event.kind === 'accepted-message') {
                 sealed.add(event.message.turn);
@@ -332,17 +358,19 @@ export function createMemoryAdapter(options = {}) {
             },
             reopen() {
                 queueMicrotask(() => {
-                    for (const observer of observers)
-                        observer({ kind: 'closed', revoked: false });
+                    for (const observer of observers) {
+                        observer({ kind: 'closed', revoked: false, lost: false });
+                    }
                 });
             },
+            published() { },
             observe(notify) {
                 observers.add(notify);
                 queueMicrotask(() => {
                     if (!observers.has(notify))
                         return;
                     if (options.unopened === true) {
-                        notify({ kind: 'closed', revoked: false });
+                        notify({ kind: 'closed', revoked: false, lost: true });
                         return;
                     }
                     announceList();
@@ -385,7 +413,7 @@ export function createMemoryAdapter(options = {}) {
                 if (room === undefined) {
                     return { kind: 'room-not-readable', locator: request.locator };
                 }
-                return page(room, request.pageToken === undefined ? 0 : Number(request.pageToken));
+                return page(room, request.pageToken);
             }, request).then((answer) => note(request.locator, answer));
         },
         async refresh(_authorization, request) {
@@ -418,8 +446,20 @@ export function createMemoryAdapter(options = {}) {
                 if (room === undefined) {
                     return { kind: 'room-not-readable', locator: request.locator };
                 }
-                return { kind: 'rejected', code: 'unscripted-mutation', fields: {}, affected: {} };
-            }, request).then((answer) => note(request.locator, answer));
+                return {
+                    kind: 'rejected',
+                    code: 'unscripted-mutation',
+                    fields: {},
+                    retryable: false,
+                    affected: {},
+                };
+            }, request).then((answer) => {
+                const destination = request.changeBatch.between?.destination.room;
+                if (answer.kind === 'accepted' && answer.destination !== undefined && destination) {
+                    note(destination, answer.destination);
+                }
+                return note(request.locator, answer);
+            });
         },
         async history(_authorization, request) {
             return resolveScript(scripts.history, () => {
@@ -433,11 +473,36 @@ export function createMemoryAdapter(options = {}) {
                 };
             }, request);
         },
+        async binary(_authorization, request) {
+            return resolveScript(scripts.binary, () => {
+                if (request.kind === 'reference') {
+                    return { kind: 'rejected', code: 'unscripted-binary', fields: {}, retryable: false };
+                }
+                const room = rooms.find((entry) => entry.locator === request.locator);
+                if (room === undefined)
+                    return { kind: 'room-not-readable', locator: request.locator };
+                const blob = room.blobs?.[request.path];
+                return blob === undefined
+                    ? { kind: 'rejected', code: 'file_not_found', fields: {}, retryable: false }
+                    : { kind: 'binary', blob };
+            }, request);
+        },
+        async link(_authorization, request) {
+            return resolveScript(scripts.link, () => ({ kind: 'rejected', code: 'unscripted-link', fields: {}, retryable: false }), request);
+        },
+        referrerScope(referrer) {
+            if (typeof referrer !== 'object' || referrer === null)
+                return null;
+            const { room, path } = referrer;
+            if (typeof room !== 'string')
+                return null;
+            return { locator: room, ...(typeof path === 'string' ? { path } : {}) };
+        },
         async action(_authorization, request) {
             return resolveScript(scripts.action, () => {
                 if (request.name.startsWith('conversation.'))
                     return conversationAction(request);
-                return { kind: 'rejected', code: 'unscripted-action', fields: {} };
+                return { kind: 'rejected', code: 'unscripted-action', fields: {}, retryable: false };
             }, request).then((answer) => {
                 if (answer.kind === 'action' && answer.at !== undefined)
                     note(answer.at.locator, answer.at);

package/dist/model.d.ts

@@ -1,4 +1,5 @@
 import type { Definition, ValueFacts, VerifiedModel } from '@agentshouse/mdmodel';
+import type { Open } from './open.js';
 export type ModelIdentity = {
     identity: string;
     version: string;
@@ -7,7 +8,7 @@ export type ModelSnapshot = ModelIdentity & {
     schema: string | null;
     revision: string | null;
 };
-export type ModelUnavailableReason = 'not-readable' | 'revoked' | 'not-acquired' | 'invalid';
+export type ModelUnavailableReason = Open<'not-readable' | 'revoked' | 'not-acquired' | 'invalid'>;
 export type ModelResult = {
     kind: 'model';
     snapshot: ModelSnapshot;
@@ -28,12 +29,13 @@ export type ModelState = {
     types: VerifiedModel['types'];
 };
 export type TypesResult = {
-    status: 'unavailable';
+    status: Open<'unavailable'>;
     reason: ModelUnavailableReason;
+    types: null;
     schema?: string | null;
     revision?: string | null;
 } | {
-    status: 'current' | 'cached';
+    status: Open<'current' | 'cached'>;
     identity: string;
     version: string;
     verifiedWith: ModelIdentity;
@@ -44,12 +46,13 @@ export type TypesResult = {
 export type ValidationReceipt = {
     identity: string;
     version: string;
-    source: 'current' | 'cached';
+    source: Open<'current' | 'cached'>;
 };
 export declare const NO_MODEL: ModelState;
 export declare function definitionOf(state: ModelState, type: string | undefined): Definition | undefined;
 export declare function modelTypes(state: ModelState): TypesResult;
 export declare function cached(state: ModelState): ModelState;
 export declare function sameModel(left: ModelIdentity, right: ModelIdentity): boolean;
+export declare function sameTyping(left: ModelState, right: ModelState): boolean;
 export declare function referenceField(facts: ValueFacts | undefined): boolean;
 //# sourceMappingURL=model.d.ts.map

package/dist/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAElF,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAC/F,MAAM,MAAM,sBAAsB,GAAG,cAAc,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAAC;AAC7F,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,MAAM,GAAG,UAAU,CAAC;AAChC,MAAM,MAAM,UAAU,GAClB;IACE,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,sBAAsB,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,GACD;IACE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CAC/B,CAAC;AACN,MAAM,MAAM,WAAW,GACnB;IACE,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,sBAAsB,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,GACD;IACE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AACN,MAAM,MAAM,iBAAiB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAA;CAAE,CAAC;AACpG,eAAO,MAAM,QAAQ,EAAE,UAA8D,CAAC;AACtF,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,SAAS,CAGhG;AACD,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,WAAW,CAgBzD;AACD,wBAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAEpD;AACD,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAE5E;AACD,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAErE"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAClF,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAC/F,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,cAAc,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAAC,CAAC;AACnG,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,MAAM,GAAG,UAAU,CAAC;AAChC,MAAM,MAAM,UAAU,GAClB;IACE,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,sBAAsB,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,GACD;IACE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CAC/B,CAAC;AACN,MAAM,MAAM,WAAW,GACnB;IACE,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAC5B,MAAM,EAAE,sBAAsB,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,GACD;IACE,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,CAAC;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AACN,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,CAAC;CACpC,CAAC;AACF,eAAO,MAAM,QAAQ,EAAE,UAA8D,CAAC;AACtF,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,SAAS,CAGhG;AACD,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,WAAW,CAgBzD;AACD,wBAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAEpD;AACD,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAE5E;AACD,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CASvE;AACD,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAErE"}

package/dist/model.js

@@ -6,7 +6,7 @@ export function definitionOf(state, type) {
 }
 export function modelTypes(state) {
     return state.status === 'unavailable'
-        ? { ...state }
+        ? { ...state, types: null }
         : {
             status: state.status,
             identity: state.snapshot.identity,
@@ -23,6 +23,15 @@ export function cached(state) {
 export function sameModel(left, right) {
     return left.identity === right.identity && left.version === right.version;
 }
+export function sameTyping(left, right) {
+    if (left === right)
+        return true;
+    if (left.status === 'unavailable' || right.status === 'unavailable') {
+        return left.status === right.status;
+    }
+    return (left.snapshot.schema === right.snapshot.schema &&
+        sameModel(left.verifiedWith, right.verifiedWith));
+}
 export function referenceField(facts) {
     return facts?.reference !== undefined || facts?.items?.reference !== undefined;
 }

package/dist/observation.d.ts

@@ -1,4 +1,4 @@
-import type { QueryDocument, QueryGroup, QueryResult } from './query.js';
+import type { QueryCoverage, QueryDocument, QueryGroup, QueryResult } from './query.js';
 export type Observation<T> = {
     current(): T;
     subscribe(listener: (value: T) => void): () => void;
@@ -13,14 +13,19 @@ export type QueryChange = {
     changed: readonly (readonly [RowKey, QueryDocument | QueryGroup])[];
     removed: readonly RowKey[];
     order: readonly RowKey[] | null;
+    coverage?: QueryCoverage;
+    next?: string | null;
+    total?: number;
 };
+export type QueryMessage = KeyedResult | QueryChange;
 export type Observed = {
     observation: Observation<unknown>;
     receive(message: unknown): void;
     end(): void;
 };
 export declare function rowsOf(result: QueryResult): readonly (QueryDocument | QueryGroup)[];
-export declare function applied(keyed: KeyedResult, change: QueryChange): KeyedResult;
+export declare function whole(message: QueryMessage): message is KeyedResult;
+export declare function applied(keyed: KeyedResult, message: QueryMessage): KeyedResult;
 export declare function observed(first: unknown, stop: () => void, keyed: boolean): Observed;
 export declare function opened(watch: (deliver: (message: unknown) => void) => () => void, keyed: boolean): Promise<Observation<unknown>>;
 export declare function observing<Topic extends string>(watch: (topic: Topic, input: readonly unknown[], deliver: (message: unknown) => void) => () => void): (topic: Topic, ...input: unknown[]) => Promise<Observation<unknown>>;

package/dist/observation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observation.d.ts","sourceRoot":"","sources":["../src/observation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzE,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,OAAO,IAAI,CAAC,CAAC;IACb,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACpD,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAErC,MAAM,MAAM,WAAW,GAAG;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAE3E,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC;IACpE,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAChC,GAAG,IAAI,IAAI,CAAC;CACb,CAAC;AAEF,wBAAgB,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC,aAAa,GAAG,UAAU,CAAC,EAAE,CAEnF;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,CAc5E;AAiBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,EAAE,KAAK,EAAE,OAAO,GAAG,QAAQ,CAkCnF;AAED,wBAAgB,MAAM,CACpB,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,KAAK,MAAM,IAAI,EAC1D,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAiB/B;AAED,wBAAgB,SAAS,CAAC,KAAK,SAAS,MAAM,EAC5C,KAAK,EAAE,CACL,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,SAAS,OAAO,EAAE,EACzB,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,KAChC,MAAM,IAAI,WAEA,KAAK,YAAY,OAAO,EAAE,KAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAQ1E"}
+{"version":3,"file":"observation.d.ts","sourceRoot":"","sources":["../src/observation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAExF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,OAAO,IAAI,CAAC,CAAC;IACb,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACpD,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAErC,MAAM,MAAM,WAAW,GAAG;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAE3E,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC;IACpE,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;IAChC,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,WAAW,CAAC;AAErD,MAAM,MAAM,QAAQ,GAAG;IACrB,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAChC,GAAG,IAAI,IAAI,CAAC;CACb,CAAC;AAEF,wBAAgB,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC,aAAa,GAAG,UAAU,CAAC,EAAE,CAGnF;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,IAAI,WAAW,CAEnE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,GAAG,WAAW,CAwB9E;AAiBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,EAAE,KAAK,EAAE,OAAO,GAAG,QAAQ,CAkCnF;AAED,wBAAgB,MAAM,CACpB,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,KAAK,MAAM,IAAI,EAC1D,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAiB/B;AAED,wBAAgB,SAAS,CAAC,KAAK,SAAS,MAAM,EAC5C,KAAK,EAAE,CACL,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,SAAS,OAAO,EAAE,EACzB,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,KAChC,MAAM,IAAI,WAEA,KAAK,YAAY,OAAO,EAAE,KAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAQ1E"}

package/dist/observation.js

@@ -1,19 +1,36 @@
 export function rowsOf(result) {
-    return 'groups' in result ? result.groups : result.documents;
+    if ('groups' in result)
+        return result.groups;
+    return 'documents' in result ? result.documents : [];
 }
-export function applied(keyed, change) {
-    const rows = rowsOf(keyed.result);
+export function whole(message) {
+    return 'result' in message;
+}
+export function applied(keyed, message) {
+    if (whole(message))
+        return message;
+    const result = keyed.result;
+    if ('pending' in result)
+        return keyed;
+    const rows = rowsOf(result);
     const byKey = new Map(keyed.keys.map((key, index) => [key, rows[index]]));
-    for (const key of change.removed)
+    for (const key of message.removed)
         byKey.delete(key);
-    for (const [key, row] of change.changed)
+    for (const [key, row] of message.changed)
         byKey.set(key, row);
-    const keys = change.order ?? keyed.keys.filter((key) => byKey.has(key));
-    const next = keys.map((key) => byKey.get(key));
+    const keys = message.order ?? keyed.keys.filter((key) => byKey.has(key));
+    const kept = keys.map((key) => byKey.get(key));
+    const coverage = message.coverage ?? result.coverage;
+    const next = message.next === undefined ? result.next : (message.next ?? undefined);
+    const total = message.total ?? result.total;
+    const window = {
+        ...(next === undefined ? {} : { next }),
+        ...(total === undefined ? {} : { total }),
+    };
     return {
-        result: 'groups' in keyed.result
-            ? { groups: next }
-            : { documents: next },
+        result: 'groups' in result
+            ? { groups: kept, coverage, ...window }
+            : { documents: kept, coverage, ...window },
         keys,
     };
 }
@@ -27,11 +44,11 @@ function keyedResult(first) {
         },
     };
 }
-function whole(first) {
+function replaced(first) {
     return { value: first, next: (message) => message };
 }
 export function observed(first, stop, keyed) {
-    const reducer = keyed ? keyedResult(first) : whole(first);
+    const reducer = keyed ? keyedResult(first) : replaced(first);
     let value = reducer.value;
     let open = true;
     const listeners = new Set();

package/dist/open.d.ts

@@ -0,0 +1,2 @@
+export type Open<Value extends string> = Value | (string & {});
+//# sourceMappingURL=open.d.ts.map

package/dist/open.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"open.d.ts","sourceRoot":"","sources":["../src/open.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,IAAI,CAAC,KAAK,SAAS,MAAM,IAAI,KAAK,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC"}

package/dist/open.js

@@ -0,0 +1 @@
+export {};

package/dist/outcome.d.ts

@@ -1,8 +1,59 @@
-import type { ActionResult } from './adapter.js';
+import type { ActionResult, AdapterFailure, BinaryLinkResult, BinaryResult, HistoryResult, HistoryRevision, ProviderRefusal, RoomVersionAt, ScopedRefusal } from './adapter.js';
 import type { ChangeBatch } from './change.js';
-export type CallResult = ActionResult | {
-    kind: 'undeclared';
+type Refused<Kind extends string> = ProviderRefusal & {
+    kind: Kind;
 };
+export type Failure = Refused<'transport-uncertainty'> | Refused<'revoked-authorization'> | (Refused<'room-not-readable'> & {
+    locator: string;
+}) | (Refused<'room-locked'> & {
+    locator: string;
+}) | ScopedRefusal;
+export type CallResult = {
+    kind: 'action';
+    result: unknown;
+    at?: RoomVersionAt;
+} | Refused<'rejected'> | Refused<'undeclared'> | Failure;
+export type HistoryAnswer = Exclude<HistoryResult, {
+    kind: Failure['kind'];
+}> | Failure;
+export type BinaryAnswer = {
+    kind: 'binary';
+    blob: Blob;
+} | Refused<'rejected'> | Refused<'absent'> | Failure;
+export type BinaryLinkAnswer = {
+    kind: 'link';
+    url: string;
+    name: string;
+} | Refused<'rejected'> | Refused<'absent'> | Failure;
+export type Resolution = {
+    readonly kind: 'document';
+    readonly room: string;
+    readonly path: string;
+} | {
+    readonly kind: 'deleted';
+    readonly room: string;
+    readonly path: string;
+    readonly revision: HistoryRevision;
+} | Refused<'unreadable'> | Refused<'absent'> | Failure;
+export declare const UNREADABLE: Refused<'unreadable'>;
+export declare const LOCKED_UNREADABLE: Refused<'unreadable'>;
+export declare const ABSENT_TARGET: Refused<'absent'>;
+export declare function absentBinary(path: string): Refused<'absent'>;
+export declare function binaryAnswer(result: BinaryResult): BinaryAnswer;
+export declare function binaryLinkAnswer(result: BinaryLinkResult): BinaryLinkAnswer;
+export declare const ROOM_LOCKED = "room-locked";
+export declare function lockedRoom(locator: string): Refused<'room-locked'> & {
+    locator: string;
+};
+export type Offline = {
+    readonly kind: 'offline';
+};
+export declare const OFFLINE: Offline;
+export declare const UNCERTAIN: Failure;
+export declare function undeclared(name: string): CallResult;
+export declare function failure(result: AdapterFailure): Failure;
+export declare function calledResult(result: ActionResult): CallResult;
+export declare function historyAnswer(result: HistoryResult): HistoryAnswer;
 export type Submission = {
     readonly state: 'waiting' | 'submitted';
 } | {
@@ -12,7 +63,10 @@ export type Submission = {
 export type QueueEntry = {
     readonly batch: ChangeBatch;
 } & (Submission | {
+    readonly state: 'local';
+} | {
     readonly state: 'accepted';
     readonly roomVersion: string;
 });
+export {};
 //# sourceMappingURL=outcome.d.ts.map

package/dist/outcome.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outcome.d.ts","sourceRoot":"","sources":["../src/outcome.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC;AAE/D,MAAM,MAAM,UAAU,GAClB;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,CAAA;CAAE,GAC3C;IAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAAE,GAAG,CACvD,UAAU,GACV;IAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAC/D,CAAC"}
+{"version":3,"file":"outcome.d.ts","sourceRoot":"","sources":["../src/outcome.ts"],"names":[],"mappings":"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"}

package/dist/outcome.js

@@ -1 +1,67 @@
-export {};
+export const UNREADABLE = {
+    kind: 'unreadable',
+    code: 'room-not-readable',
+    fields: {},
+    retryable: false,
+};
+export const LOCKED_UNREADABLE = {
+    kind: 'unreadable',
+    code: 'room-locked',
+    fields: {},
+    retryable: true,
+};
+export const ABSENT_TARGET = {
+    kind: 'absent',
+    code: 'reference-absent',
+    fields: {},
+    retryable: false,
+};
+export function absentBinary(path) {
+    return { kind: 'absent', code: 'binary-file-absent', fields: { path }, retryable: false };
+}
+export function binaryAnswer(result) {
+    return result.kind === 'binary' || result.kind === 'rejected' ? result : failure(result);
+}
+export function binaryLinkAnswer(result) {
+    return result.kind === 'link' || result.kind === 'rejected' ? result : failure(result);
+}
+export const ROOM_LOCKED = 'room-locked';
+export function lockedRoom(locator) {
+    return { kind: ROOM_LOCKED, locator, code: ROOM_LOCKED, fields: {}, retryable: true };
+}
+export const OFFLINE = { kind: 'offline' };
+export const UNCERTAIN = {
+    kind: 'transport-uncertainty',
+    code: 'transport-uncertainty',
+    fields: {},
+    retryable: true,
+};
+export function undeclared(name) {
+    return { kind: 'undeclared', code: 'action-undeclared', fields: { name }, retryable: false };
+}
+export function failure(result) {
+    switch (result.kind) {
+        case 'transport-uncertainty':
+            return UNCERTAIN;
+        case 'revoked-authorization':
+            return { kind: result.kind, code: result.kind, fields: {}, retryable: false };
+        case 'room-not-readable':
+            return {
+                kind: result.kind,
+                locator: result.locator,
+                code: result.kind,
+                fields: {},
+                retryable: false,
+            };
+        case 'scoped-refusal':
+            return result;
+    }
+}
+export function calledResult(result) {
+    return result.kind === 'action' || result.kind === 'rejected' ? result : failure(result);
+}
+export function historyAnswer(result) {
+    return result.kind === 'history' || result.kind === 'revision' || result.kind === 'no-history'
+        ? result
+        : failure(result);
+}

package/dist/overlay.d.ts

@@ -1,15 +1,28 @@
-import type { HeadChange } from './adapter.js';
+import type { BinaryFile, HeadChange } from './adapter.js';
 import type { ChangeBatch } from './change.js';
 export type Heads = {
     revisions: Readonly<Record<string, string>>;
+    fileIds: Readonly<Record<string, string>>;
     changes: Readonly<Record<string, HeadChange>>;
 };
+export type HeldBinary = ({
+    readonly state: 'accepted';
+} & BinaryFile) | {
+    readonly state: 'pending';
+    readonly localId: string;
+    readonly byteLength: number;
+    readonly mediaType: string;
+    readonly sha256: string;
+};
 export type Layer = Heads & {
     documents: Readonly<Record<string, string>>;
-    binaryTargets: readonly string[];
+    binaries: Readonly<Record<string, HeldBinary>>;
 };
+export declare function acceptedBinaries(files: Readonly<Record<string, BinaryFile>>): Generator<readonly [string, HeldBinary]>;
+export declare function sameBinary(left: HeldBinary | undefined, right: HeldBinary | undefined): boolean;
 export declare function sameChange(left: HeadChange | undefined, right: HeadChange | undefined): boolean;
-export declare function overlay(base: Layer, queue: readonly ChangeBatch[]): Layer;
-export declare function sameLayerText(left: Layer, right: Layer): boolean;
-export declare function overlayChanged(base: Layer, queue: readonly ChangeBatch[], previousBase: Layer, previousQueue: readonly ChangeBatch[], previousVisible: Layer): Layer;
+export declare function overlaying(base: Layer, queue: readonly ChangeBatch[], unapplied?: () => void): Generator<number, Layer, void>;
+export declare function sameText(left: Layer, right: Layer): Generator<number, boolean, void>;
+export declare function changedPaths(left: Layer, right: Layer): Generator<number, ReadonlySet<string>, void>;
+export declare function overlayChanged(base: Layer, batch: ChangeBatch, previousBase: Layer, previousBatch: ChangeBatch, previousVisible: Layer): Generator<number, Layer, void>;
 //# sourceMappingURL=overlay.d.ts.map