@agentshouse/mdruntime 0.1.0-c44866799613e → 0.1.0-c44d5cc00aee5

package/dist/retried.js

@@ -0,0 +1,72 @@
+import { refusedForSpace } from './durability.js';
+export const STEPS = [
+    'database',
+    'sign_in',
+    'connection',
+    'code',
+    'download',
+    'conversations',
+    'sending',
+    'reading',
+];
+export class Unanswered extends Error {
+}
+export function uncertainError(uncertainty) {
+    return 'failure' in uncertainty ? uncertainty.failure : new Unanswered();
+}
+export function createRetries(shell) {
+    const failing = new Map();
+    const handedErrors = new WeakSet();
+    function failingIn(step, instance) {
+        const instances = failing.get(step) ?? new Set();
+        instances.add(instance);
+        failing.set(step, instances);
+    }
+    function handed(failure, instance) {
+        failingIn(failure.step, instance);
+        shell.retried?.(failure);
+    }
+    const retries = {
+        failed(step, instance, error) {
+            if (refusedForSpace(error))
+                return;
+            if (typeof error === 'object' && error !== null) {
+                if (handedErrors.has(error)) {
+                    failingIn(step, instance);
+                    return;
+                }
+                handedErrors.add(error);
+            }
+            if (error instanceof Unanswered)
+                retries.unanswered(step, instance);
+            else
+                handed({ step, answered: true, error }, instance);
+        },
+        unanswered(step, instance) {
+            handed({ step, answered: false }, instance);
+        },
+        uncertain(step, instance, uncertainty) {
+            if ('failure' in uncertainty)
+                retries.failed(step, instance, uncertainty.failure);
+            else
+                retries.unanswered(step, instance);
+        },
+        succeeded(step, instance) {
+            const instances = failing.get(step);
+            if (instances === undefined || !instances.delete(instance) || instances.size > 0)
+                return;
+            failing.delete(step);
+            shell.succeeded?.(step);
+        },
+    };
+    return retries;
+}
+export function retrying(retries, step, instance, ask) {
+    return () => ask().then((answer) => {
+        retries.succeeded(step, instance);
+        return answer;
+    }, (error) => {
+        retries.failed(step, instance, error);
+        throw error;
+    });
+}

package/dist/room-draft.d.ts

@@ -1,3 +1,4 @@
+import { type DefinitionOf } from '@agentshouse/mdmodel';
 import type { ProviderRefusal } from './adapter.js';
 import type { Open } from './open.js';
 import type { Change, Precondition } from './change.js';
@@ -40,6 +41,7 @@ export type RoomDraftParts = {
     };
     readonly file?: {
         readonly blob: Blob;
+        readonly base?: string | null;
     };
 };
 export type HeldFile = {
@@ -89,9 +91,9 @@ type ChangedUnderneath = {
     readonly file?: string | null;
 };
 export type ReturnReason = ProviderRefusal & {
-    readonly kind: Open<'conflicted' | 'rejected' | 'expired' | 'withdrawn'>;
+    readonly kind: Open<'conflicted' | 'rejected' | 'withdrawn'>;
 };
-export declare function returnedBy(kind: 'expired' | 'withdrawn'): ReturnReason;
+export declare function returnedBy(): ReturnReason;
 export type RoomDraft = {
     readonly room: string;
     readonly path: string;
@@ -105,14 +107,12 @@ export type RoomDraftWrite = {
     readonly roomDraft: RoomDraft | null;
 } | {
     readonly outcome: 'stale';
-    readonly code: string;
-    readonly retryable: boolean;
     readonly current: RoomDraft | null;
 };
 export declare function staleWrite(current: RoomDraft | null): RoomDraftWrite;
 export type ChangedPart = {
     readonly path: string;
-    readonly part: Open<'field' | 'section' | 'preamble' | 'markdown' | 'creation' | 'move' | 'removal' | 'file'>;
+    readonly part: Open<'field' | 'section' | 'preamble' | 'markdown' | 'move' | 'removal' | 'file'>;
     readonly name?: string;
 };
 export type RoomDraftRecord = {
@@ -126,13 +126,14 @@ export type SavedDraft = {
     readonly path: string;
     readonly parts: HeldParts;
 };
-export declare function readParts(value: unknown): RoomDraftParts;
+export declare function readParts(value: unknown, path: string): RoomDraftParts;
 export declare function gatheredParts(earlier: unknown, later: unknown): unknown;
 export declare function held(current: HeldParts | undefined, parts: RoomDraftParts, file?: HeldFile): HeldParts;
 export declare function underneath(parts: HeldParts, path: string, visible: VisibleLayer | undefined): ChangedUnderneath;
 export declare function heldFile(blob: Blob, base: string | null): Promise<HeldFile>;
 export declare function binaryBase(visible: VisibleLayer | undefined, path: string): string | null;
-export declare function changedParts(path: string, report: ChangedUnderneath): readonly ChangedPart[];
+export declare function changedParts(path: string, parts: HeldParts, visible: VisibleLayer | undefined): readonly ChangedPart[];
+export declare function lineEnded(text: string): string;
 export type TextParts = {
     readonly fields?: Readonly<Record<string, {
         readonly value: unknown;
@@ -144,16 +145,29 @@ export type TextParts = {
         readonly value: string;
     };
 };
-export declare function partsAfter(markdown: string, parts: TextParts): string;
-export declare function returnedInto(existing: HeldParts | undefined, returned: HeldParts): HeldParts;
+export declare function partsAfter(markdown: string, parts: TextParts, definitions?: DefinitionOf): string | null;
+export declare function returnedInto(existing: HeldParts | undefined, returned: HeldParts, definitions?: DefinitionOf): HeldParts | null;
 export declare function moveTarget(move: {
     readonly to: string;
 }): string;
+export declare function readSavedParts(named: readonly {
+    readonly path: string;
+    readonly parts: unknown;
+}[]): readonly {
+    readonly path: string;
+    readonly parts: RoomDraftParts;
+}[];
+export declare function partsChanges(named: readonly {
+    readonly path: string;
+    readonly parts: unknown;
+}[]): {
+    readonly changes: readonly Change[];
+    readonly preconditions: readonly Precondition[];
+};
 export declare function changesOf(path: string, parts: HeldParts): {
     changes: readonly Change[];
     bases: readonly Precondition[];
 };
-export declare function joinedDraft(carried: SavedDraft, saved: readonly SavedDraft[]): SavedDraft;
 export declare function withdrawnDrafts(drafts: readonly SavedDraft[], changes: readonly Change[]): readonly SavedDraft[];
 export {};
 //# sourceMappingURL=room-draft.d.ts.map

package/dist/room-draft.d.ts.map

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

package/dist/room-draft.js

@@ -1,60 +1,69 @@
-import { apply, equalValue, frontmatterValue, parse, serialize, } from '@agentshouse/mdmodel';
+import { apply, create, equalValue, frontmatterValue, parse, serialize, } from '@agentshouse/mdmodel';
+import { governing } from './collection.js';
 import { runtimeError } from './failure.js';
 import { sha256 } from './digest.js';
 import { binaryLocalId } from './identity.js';
 import { normalize } from './paths.js';
-export function returnedBy(kind) {
-    return { kind, code: kind, fields: {}, retryable: false };
+export function returnedBy() {
+    return { kind: 'withdrawn', code: 'withdrawn', fields: {}, retryable: false };
 }
 export function staleWrite(current) {
-    return { outcome: 'stale', code: 'stale', retryable: false, current };
+    return { outcome: 'stale', current };
 }
-function malformed() {
-    throw runtimeError('room-draft-malformed');
+function malformed(at, needs) {
+    throw runtimeError('room-draft-malformed', at === undefined ? 'room-draft-malformed' : `room-draft-malformed at ${at}: ${needs}`);
 }
 function plain(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
-function text(value) {
-    return typeof value === 'string' ? value : malformed();
+function text(value, at) {
+    return typeof value === 'string' ? value : malformed(at, 'text');
 }
-function optionalText(value) {
-    return value === undefined ? undefined : text(value);
+function optionalText(value, at) {
+    return value === undefined ? undefined : text(value, at);
 }
-function markdownBase(value) {
-    return value === null ? null : optionalText(value);
+function markdownBase(value, at) {
+    return value === null ? null : optionalText(value, at);
 }
-function entries(value, each) {
+function entries(value, at, each) {
     if (!plain(value))
-        malformed();
+        malformed(at, 'an object of named values');
     const read = {};
     for (const [name, item] of Object.entries(value))
-        read[name] = each(item);
+        read[name] = each(item, `${at}.${name}`);
     return read;
 }
-function fieldValue(value) {
+function frontmatter(item, at) {
+    return frontmatterValue(item) ? item : malformed(at, 'a frontmatter value');
+}
+function fieldValue(value, at) {
     if (value === null)
         return null;
     if (!plain(value) || !Object.hasOwn(value, 'value') || !frontmatterValue(value.value)) {
-        malformed();
+        malformed(at, '{ value } with a frontmatter value, or null where the document lacks it');
     }
     return { value: value.value };
 }
-function textPart(value) {
+function textPart(value, at) {
     if (!plain(value))
-        malformed();
-    const base = optionalText(value.base);
-    return { value: text(value.value), ...(base === undefined ? {} : { base }) };
+        malformed(at, '{ value, base }');
+    const base = optionalText(value.base, `${at}.base`);
+    return { value: text(value.value, `${at}.value`), ...(base === undefined ? {} : { base }) };
 }
-function creationOf(value) {
+function creationOf(value, at) {
     if (!plain(value))
-        malformed();
+        malformed(at, '{ type, fields, sections }, or { markdown }');
     if (Object.hasOwn(value, 'markdown'))
-        return { markdown: text(value.markdown) };
-    const fields = entries(value.fields, (item) => (frontmatterValue(item) ? item : malformed()));
-    return { type: text(value.type), fields, sections: entries(value.sections, text) };
+        return { markdown: text(value.markdown, `${at}.markdown`) };
+    if (typeof value.type !== 'string')
+        malformed(`${at}.type`, 'a type name, or markdown in place of type, fields and sections');
+    return {
+        type: value.type,
+        fields: entries(value.fields, `${at}.fields`, frontmatter),
+        sections: entries(value.sections, `${at}.sections`, text),
+    };
 }
-const PART_NAMES = new Set([
+const PART_NAMES = [
     'fields',
     'sections',
     'preamble',
@@ -63,52 +72,57 @@ const PART_NAMES = new Set([
     'move',
     'removal',
     'file',
-]);
-export function readParts(value) {
-    if (!plain(value) || Object.keys(value).some((name) => !PART_NAMES.has(name)))
-        malformed();
+];
+const NAMED_PARTS = `a part named ${PART_NAMES.slice(0, -1).join(', ')} or ${PART_NAMES.slice(-1).join('')}`;
+export function readParts(value, path) {
+    if (!plain(value))
+        malformed(path, 'an object of parts');
+    const unknown = Object.keys(value).find((name) => !PART_NAMES.includes(name));
+    if (unknown !== undefined)
+        malformed(`${path} ${unknown}`, NAMED_PARTS);
     const parts = {};
     if (value.fields !== undefined) {
-        parts.fields = entries(value.fields, (item) => {
+        parts.fields = entries(value.fields, `${path} fields`, (item, at) => {
             if (!plain(item) || !Object.hasOwn(item, 'value') || !frontmatterValue(item.value)) {
-                malformed();
+                malformed(at, '{ value, base } with a frontmatter value');
             }
             return item.base === undefined
                 ? { value: item.value }
-                : { value: item.value, base: fieldValue(item.base) };
+                : { value: item.value, base: fieldValue(item.base, `${at}.base`) };
         });
     }
     if (value.sections !== undefined)
-        parts.sections = entries(value.sections, textPart);
+        parts.sections = entries(value.sections, `${path} sections`, textPart);
     if (value.preamble !== undefined)
-        parts.preamble = textPart(value.preamble);
+        parts.preamble = textPart(value.preamble, `${path} preamble`);
     if (value.markdown !== undefined)
-        parts.markdown = textPart(value.markdown);
+        parts.markdown = textPart(value.markdown, `${path} markdown`);
     if (value.creation !== undefined)
-        parts.creation = creationOf(value.creation);
+        parts.creation = creationOf(value.creation, `${path} creation`);
     if (value.move !== undefined) {
         if (!plain(value.move))
-            malformed();
-        const base = markdownBase(value.move.base);
-        const room = optionalText(value.move.room);
+            malformed(`${path} move`, '{ to, room, base }');
+        const base = markdownBase(value.move.base, `${path} move.base`);
+        const room = optionalText(value.move.room, `${path} move.room`);
         parts.move = {
-            to: text(value.move.to),
+            to: text(value.move.to, `${path} move.to`),
             ...(room === undefined ? {} : { room }),
             ...(base === undefined ? {} : { base }),
         };
     }
     if (value.removal !== undefined) {
         if (!plain(value.removal))
-            malformed();
-        const base = markdownBase(value.removal.base);
+            malformed(`${path} removal`, '{ base }');
+        const base = markdownBase(value.removal.base, `${path} removal.base`);
         parts.removal = base === undefined ? {} : { base };
     }
     if (value.file !== undefined) {
         if (!plain(value.file) || !(value.file.blob instanceof Blob))
-            malformed();
+            malformed(`${path} file`, '{ blob, base } with a Blob');
         if (Object.keys(value).length > 1)
             throw runtimeError('room-draft-file-exclusive');
-        parts.file = { blob: value.file.blob };
+        const base = markdownBase(value.file.base, `${path} file.base`);
+        parts.file = base === undefined ? { blob: value.file.blob } : { blob: value.file.blob, base };
     }
     return parts;
 }
@@ -242,8 +256,10 @@ export function underneath(parts, path, visible) {
     const markdown = visible?.documents[path] ?? null;
     const document = visible?.collection.document(path);
     const report = {};
+    const unread = document?.type !== undefined &&
+        governing(visible.collection.composition, path).status === 'unavailable';
     const fields = {};
-    for (const [name, part] of named(parts.fields)) {
+    for (const [name, part] of unread ? [] : named(parts.fields)) {
         const current = document !== undefined && Object.hasOwn(document.fields, name)
             ? { value: document.fields[name] }
             : null;
@@ -253,7 +269,7 @@ export function underneath(parts, path, visible) {
     if (Object.keys(fields).length > 0)
         report.fields = fields;
     const sections = {};
-    for (const [name, part] of named(parts.sections)) {
+    for (const [name, part] of unread ? [] : named(parts.sections)) {
         const current = document !== undefined && Object.hasOwn(document.sections, name)
             ? document.sections[name]
             : null;
@@ -263,8 +279,9 @@ export function underneath(parts, path, visible) {
     if (Object.keys(sections).length > 0)
         report.sections = sections;
     const preamble = document?.preamble ?? null;
-    if (parts.preamble !== undefined && preamble !== parts.preamble.base)
+    if (!unread && parts.preamble !== undefined && preamble !== parts.preamble.base) {
         report.preamble = preamble;
+    }
     if (parts.markdown !== undefined && markdown !== parts.markdown.base)
         report.markdown = markdown;
     if (parts.creation !== undefined && markdown !== null)
@@ -292,18 +309,22 @@ export async function heldFile(blob, base) {
     };
 }
 export function binaryBase(visible, path) {
-    return visible?.binaries[path] === undefined ? null : (visible.revisions[path] ?? null);
+    const binary = visible?.binaries[path];
+    if (binary === undefined)
+        return null;
+    return visible?.revisions[path] ?? (binary.state === 'pending' ? binary.localId : null);
 }
-export function changedParts(path, report) {
+export function changedParts(path, parts, visible) {
+    const report = underneath(parts, path, visible);
+    const made = parts.file?.base === null;
     return [
-        ...(report.creation === undefined ? [] : [{ path, part: 'creation' }]),
         ...named(report.fields).map(([name]) => ({ path, part: 'field', name })),
         ...named(report.sections).map(([name]) => ({ path, part: 'section', name })),
         ...(report.preamble === undefined ? [] : [{ path, part: 'preamble' }]),
         ...(report.markdown === undefined ? [] : [{ path, part: 'markdown' }]),
         ...(report.move === undefined ? [] : [{ path, part: 'move' }]),
         ...(report.removal === undefined ? [] : [{ path, part: 'removal' }]),
-        ...(report.file === undefined ? [] : [{ path, part: 'file' }]),
+        ...(report.file === undefined || made ? [] : [{ path, part: 'file' }]),
     ];
 }
 function joined(existing, returned) {
@@ -313,33 +334,45 @@ function joined(existing, returned) {
             merged[name] = part;
     return Object.keys(merged).length === 0 ? undefined : merged;
 }
-function ended(text) {
+export function lineEnded(text) {
     return text === '' || text.endsWith('\n') ? text : `${text}\n`;
 }
-function frontmatterOf(fields) {
-    const opened = parse('---\n---\n');
-    if (!opened.ok)
-        return malformed();
-    const next = apply(opened.document, fields.map(([name, part]) => ({
-        kind: 'field',
-        name,
-        value: part.value,
-        prior: undefined,
-    })));
-    return next.outcome === 'applied' ? serialize(next.document) : malformed();
+function written(start, changes, definition) {
+    const next = apply(start, changes, definition);
+    return next.outcome === 'applied' ? next.document : malformed();
+}
+function empty(definition) {
+    const parsed = parse('', '', definition);
+    return parsed.ok ? parsed.document : malformed();
 }
-export function partsAfter(markdown, parts) {
+export function partsAfter(markdown, parts, definitions) {
     const fields = named(parts.fields);
+    const sections = named(parts.sections);
+    if (fields.length === 0 && sections.length === 0 && parts.preamble === undefined)
+        return markdown;
+    const whole = parse(markdown, '', definitions);
+    const type = whole.ok ? whole.document.type : undefined;
+    const definition = definitions?.(type);
+    if (type !== undefined && definition === undefined)
+        return null;
+    const valued = fields.length === 0
+        ? empty(definition)
+        : written(create(type, definition), fields.map(([name, part]) => ({
+            kind: 'field',
+            name,
+            value: part.value,
+            prior: undefined,
+        })), definition);
+    const head = parts.preamble === undefined
+        ? valued
+        : written(valued, [{ kind: 'preamble', value: lineEnded(parts.preamble.value), prior: valued.preamble }], definition);
     const pieces = [
-        ...(fields.length === 0 ? [] : [frontmatterOf(fields)]),
-        ...(parts.preamble === undefined ? [] : [parts.preamble.value]),
-        ...named(parts.sections).map(([name, part]) => `## ${name}\n${part.value}`),
+        ...(fields.length === 0 && parts.preamble === undefined ? [] : [serialize(head)]),
+        ...sections.map(([name, part]) => serialize(written(empty(definition), [{ kind: 'section', name, value: lineEnded(part.value), prior: undefined }], definition))),
     ];
-    if (pieces.length === 0)
-        return markdown;
-    return `${ended(markdown)}\n${pieces.map(ended).join('')}`;
+    return `${lineEnded(markdown)}\n${pieces.join('')}`;
 }
-export function returnedInto(existing, returned) {
+export function returnedInto(existing, returned, definitions) {
     if (existing === undefined)
         return returned;
     const next = { ...existing };
@@ -359,7 +392,9 @@ export function returnedInto(existing, returned) {
         delete next.fields;
         delete next.sections;
         delete next.preamble;
-        const value = partsAfter(whole.value, existing.markdown === undefined ? existing : returned);
+        const value = partsAfter(whole.value, existing.markdown === undefined ? existing : returned, definitions);
+        if (value === null)
+            return null;
         next.markdown = { value, base: whole.base };
     }
     const creation = existing.creation ?? returned.creation;
@@ -380,6 +415,36 @@ export function moveTarget(move) {
     const to = normalize(move.to);
     return to === null || to === '' ? move.to : to;
 }
+export function readSavedParts(named) {
+    const read = named.map(({ path, parts }) => ({ path, parts: readParts(parts, path) }));
+    read.forEach(({ path }, at) => {
+        if (path === '' || normalize(path) !== path)
+            malformed(path, 'a path inside the Room, such as notes/a.md');
+        if (read.findIndex((one) => one.path === path) !== at)
+            malformed(path, 'each path once in one save');
+    });
+    return read;
+}
+export function partsChanges(named) {
+    const changes = [];
+    const preconditions = [];
+    for (const { path, parts } of readSavedParts(named)) {
+        const parted = held(undefined, parts);
+        const made = changesOf(path, parted);
+        changes.push(...made.changes);
+        preconditions.push(...made.bases);
+        for (const change of made.changes) {
+            if (change.kind === 'create')
+                preconditions.push({ kind: 'absent', path });
+            if (change.kind === 'move')
+                preconditions.push({ kind: 'absent', path: change.to });
+        }
+        const revision = parted.markdown?.base ?? parted.move?.base ?? parted.removal?.base;
+        if (typeof revision === 'string')
+            preconditions.push({ kind: 'revision', path, revision });
+    }
+    return { changes, preconditions };
+}
 export function changesOf(path, parts) {
     const changes = [];
     const bases = [];
@@ -399,11 +464,11 @@ export function changesOf(path, parts) {
         bases.push({ kind: 'field', path, name, value: part.base?.value });
     }
     for (const [name, part] of named(parts.sections)) {
-        changes.push({ kind: 'section', path, name, value: part.value });
+        changes.push({ kind: 'section', path, name, value: lineEnded(part.value) });
         bases.push({ kind: 'section', path, name, value: part.base });
     }
     if (parts.preamble !== undefined) {
-        changes.push({ kind: 'preamble', path, value: parts.preamble.value });
+        changes.push({ kind: 'preamble', path, value: lineEnded(parts.preamble.value) });
         bases.push({ kind: 'preamble', path, value: parts.preamble.base });
     }
     if (parts.markdown !== undefined) {
@@ -415,7 +480,7 @@ export function changesOf(path, parts) {
         if (base !== null && at !== path)
             changes.push({ kind: 'move', path, to: at });
         changes.push({ kind: 'binary', path: at, ...file });
-        if (base === null && at !== path)
+        if (base === null)
             bases.push({ kind: 'absent', path: at });
         return { changes, bases };
     }
@@ -427,35 +492,6 @@ export function changesOf(path, parts) {
         changes.push({ kind: 'remove', path });
     return { changes, bases };
 }
-function rebased(before, after) {
-    return before === undefined ? after : { ...after, base: before.base };
-}
-function rebasedAll(before, after) {
-    return {
-        ...before,
-        ...Object.fromEntries(Object.entries(after).map(([name, part]) => [name, rebased(before?.[name], part)])),
-    };
-}
-export function joinedDraft(carried, saved) {
-    const draft = saved.find((item) => item.path === carried.path);
-    if (draft === undefined)
-        return carried;
-    const held = carried.parts;
-    const next = draft.parts;
-    return {
-        path: carried.path,
-        parts: {
-            ...held,
-            ...next,
-            ...(next.fields === undefined ? {} : { fields: rebasedAll(held.fields, next.fields) }),
-            ...(next.sections === undefined
-                ? {}
-                : { sections: rebasedAll(held.sections, next.sections) }),
-            ...(next.preamble === undefined ? {} : { preamble: rebased(held.preamble, next.preamble) }),
-            ...(next.markdown === undefined ? {} : { markdown: rebased(held.markdown, next.markdown) }),
-        },
-    };
-}
 export function withdrawnDrafts(drafts, changes) {
     return drafts.flatMap((draft) => {
         const file = draft.parts.file;

package/dist/room-drafts.d.ts

@@ -0,0 +1,24 @@
+import { type ChangeSet } from './change-set.js';
+import { type VisibleLayer } from './replica.js';
+import { type RoomDraft, type RoomDraftWrite } from './room-draft.js';
+import type { Runtime } from './runtime.js';
+import type { Store } from './store.js';
+export type RoomDraftSurface = {
+    list(): Promise<readonly RoomDraft[]>;
+    read(room: string, path: string): Promise<RoomDraft | null>;
+    write(room: string, path: string, revision: string | null, parts: unknown, next?: string): Promise<RoomDraftWrite>;
+    discard(room: string, path: string, revision: string): Promise<RoomDraftWrite>;
+};
+export type PresentationSurface = {
+    read(app: string): Promise<unknown>;
+    write(app: string, value: unknown): Promise<void>;
+    edit(app: string, members: Readonly<Record<string, unknown>>): Promise<void>;
+};
+export declare function visibleOf(store: Store, locator: string, paths: readonly string[]): Promise<VisibleLayer | undefined>;
+export declare function publishRoomDrafts({ store, socket }: Runtime, waitingOnly: boolean, touched?: ChangeSet['documents'] | null): Promise<void>;
+export declare function emitPresentation({ store, socket }: Runtime, app: string): Promise<void>;
+export declare function roomDraftSurface(runtime: Runtime): RoomDraftSurface;
+export declare function presentationSurface(runtime: Runtime): PresentationSurface;
+export declare function watchRoomDrafts({ store, socket }: Runtime, deliver: (value: unknown) => void): () => void;
+export declare function watchPresentation({ store, socket }: Runtime, app: string, deliver: (value: unknown) => void): () => void;
+//# sourceMappingURL=room-drafts.d.ts.map

package/dist/room-drafts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"room-drafts.d.ts","sourceRoot":"","sources":["../src/room-drafts.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK5D,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAQL,KAAK,SAAS,EAEd,KAAK,cAAc,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGxC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,IAAI,OAAO,CAAC,SAAS,SAAS,EAAE,CAAC,CAAC;IACtC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IAC5D,KAAK,CACH,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,CAAC,CAAC;IAC3B,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CAChF,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9E,CAAC;AAMF,wBAAsB,SAAS,CAC7B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,SAAS,MAAM,EAAE,GACvB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnC;AA0CD,wBAAgB,iBAAiB,CAC/B,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAC1B,WAAW,EAAE,OAAO,EACpB,OAAO,GAAE,SAAS,CAAC,WAAW,CAAC,GAAG,IAAW,GAC5C,OAAO,CAAC,IAAI,CAAC,CAuBf;AAOD,wBAAgB,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUvF;AAoDD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,CAkDnE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,mBAAmB,CA8BzE;AAED,wBAAgB,eAAe,CAC7B,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAChC,MAAM,IAAI,CAiBZ;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAC1B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAChC,MAAM,IAAI,CASZ"}