@agentshouse/mdruntime 0.1.0-cf08ada271a7f → 0.1.0-cf0c43fc48aad

package/dist/room-draft.js

@@ -1,4 +1,5 @@
 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';
@@ -72,7 +73,7 @@ const PART_NAMES = [
     'removal',
     'file',
 ];
-const NAMED_PARTS = `a part named ${PART_NAMES.slice(0, -1).join(', ')} or ${PART_NAMES.at(-1)}`;
+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');
@@ -255,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;
@@ -266,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;
@@ -276,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)
@@ -335,7 +339,7 @@ export function lineEnded(text) {
 }
 function written(start, changes, definition) {
     const next = apply(start, changes, definition);
-    return next.outcome === 'applied' ? serialize(next.document) : malformed();
+    return next.outcome === 'applied' ? next.document : malformed();
 }
 function empty(definition) {
     const parsed = parse('', '', definition);
@@ -347,25 +351,24 @@ export function partsAfter(markdown, parts, definitions) {
     if (fields.length === 0 && sections.length === 0 && parts.preamble === undefined)
         return markdown;
     const whole = parse(markdown, '', definitions);
-    const definition = whole.ok ? definitions?.(whole.document.type) : undefined;
-    const head = [
-        ...fields.map(([name, part]) => ({
+    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,
-        })),
-        ...(parts.preamble === undefined
-            ? []
-            : [{ kind: 'preamble', value: lineEnded(parts.preamble.value), prior: '' }]),
-    ];
+        })), definition);
+    const head = parts.preamble === undefined
+        ? valued
+        : written(valued, [{ kind: 'preamble', value: lineEnded(parts.preamble.value), prior: valued.preamble }], definition);
     const pieces = [
-        ...(head.length === 0
-            ? []
-            : [
-                written(fields.length === 0 ? empty(definition) : create(undefined, definition), head, definition),
-            ]),
-        ...sections.map(([name, part]) => written(empty(definition), [{ kind: 'section', name, value: lineEnded(part.value), prior: undefined }], definition)),
+        ...(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))),
     ];
     return `${lineEnded(markdown)}\n${pieces.join('')}`;
 }
@@ -390,6 +393,8 @@ export function returnedInto(existing, returned, definitions) {
         delete next.sections;
         delete next.preamble;
         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;

package/dist/runtime.d.ts

@@ -4,18 +4,20 @@ import type { LiveConversations } from './conversation-live.js';
 import type { WriteRule } from './declaration.js';
 import type { FiguresRead } from './figures.js';
 import type { LiveQueries } from './live.js';
-import type { Log } from './log.js';
 import type { ModelState } from './model.js';
+import type { Presence } from './presence.js';
 import type { ReadAnswers } from './reads.js';
 import type { Recovery } from './recovery.js';
+import type { Retries } from './retried.js';
 import type { RuntimeSocket } from './socket.js';
 import type { HeldCover, Store } from './store.js';
 import type { schemaTypes } from './attached-model.js';
 export type Runtime = {
     readonly store: Store;
     readonly socket: RuntimeSocket;
-    readonly journal: Log;
+    readonly presence: Presence;
     readonly recovery: Recovery;
+    readonly retries: Retries;
     readonly shell: RuntimeShell;
     readonly localSaves: boolean;
     readonly roomTypes: Parameters<typeof schemaTypes>[1];

package/dist/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,SAAS,SAAS,EAAE,CAAC;IAC1C,QAAQ,CAAC,SAAS,EAAE,CAAC,WAAW,EAAE,eAAe,KAAK,SAAS,CAAC;IAChE,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAC1C,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC,CAAC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,SAAS,SAAS,EAAE,CAAC;IAC1C,QAAQ,CAAC,SAAS,EAAE,CAAC,WAAW,EAAE,eAAe,KAAK,SAAS,CAAC;IAChE,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAC1C,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC,CAAC"}

package/dist/save.d.ts

@@ -11,6 +11,7 @@ export type SaveRefusal = {
     retryable: boolean;
     file?: string;
     location?: string;
+    line?: number;
     referrers?: readonly string[];
     parts?: readonly ChangedPart[];
 };

package/dist/save.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../src/save.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../src/save.ts"],"names":[],"mappings":"AACA,OAAO,EAsBL,KAAK,UAAU,EAChB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAmB,aAAa,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,EAML,KAAK,WAAW,EAGhB,KAAK,SAAS,EACf,MAAM,aAAa,CAAC;AACrB,OAAO,EAML,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAwB,KAAK,KAAK,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,EAKL,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,UAAU,EAChB,MAAM,iBAAiB,CAAC;AAIzB,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9B,KAAK,CAAC,EAAE,SAAS,WAAW,EAAE,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,cAAc,EAAE,SAAS,aAAa,EAAE,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,KAAK,EAAE,SAAS,WAAW,EAAE,CAAC;IACvC,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACzC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC,CAAC;IAC3D,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,SAAS,WAAW,EAAE,KAAK,SAAS,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;IAC1F,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACtD,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,SAAS,WAAW,EAAE,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC,CAAC;IAC3D,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,SAAS,eAAe,EAAE,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,QAAQ,GAChB;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAA;CAAE,GAC3D;IACE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,SAAS,WAAW,EAAE,CAAC;CACxC,CAAC;AAmBN,MAAM,MAAM,SAAS,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;AAkP9F,wBAAiB,iBAAiB,CAChC,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,YAAY,GACpB,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,CAOtC;AA4ED,wBAAgB,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAEtE;AAED,wBAAiB,WAAW,CAC1B,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,YAAY,GACpB,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,CAItC;AA6vCD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,UAAU,EAAE,GAAG,MAAM,GAAG,IAAI,CAKxF;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAE7F"}

package/dist/save.js

@@ -1,14 +1,14 @@
-import { apply, ARRAY_INDEX, ATTACHMENT, create, links, parse, pointerSegments, references, relative, relativize, retarget, roomReferences, serialize, target, } from '@agentshouse/mdmodel';
+import { apply, ARRAY_INDEX, ATTACHMENT, create, equalValue, links, parse, pointerSegments, references, relative, relativize, retarget, roomReferences, serialize, target, } from '@agentshouse/mdmodel';
 import { immutable, leaving, queuedFile, departure, } from './change.js';
 import { collectionOf, definitionsAt, documentsOf, governing, } from './collection.js';
 import { changeBatchIdentity, roomDraftRevision } from './identity.js';
-import { overlaying } from './overlay.js';
+import { composed, overlaying } from './overlay.js';
 import { ancestors } from './paths.js';
 import { entriesIn, sorting } from './shared.js';
 import { changedParts, changesOf, moveTarget, withdrawnDrafts, } from './room-draft.js';
 import { paced, ROW_WEIGHT, stepped } from './turn.js';
 import { validatedCollection } from './validation.js';
-function refuse(code, file, location) {
+function refuse(code, file, location, line) {
     return {
         kind: 'refused',
         refusal: {
@@ -16,9 +16,13 @@ function refuse(code, file, location) {
             retryable: false,
             ...(file === undefined ? {} : { file }),
             ...(location === undefined ? {} : { location }),
+            ...(line === undefined ? {} : { line }),
         },
     };
 }
+function refusedBy(refusal, file) {
+    return refuse(refusal.rule, file, refusal.location, refusal.line);
+}
 function repointed(document, definition, from, to, moves, settled) {
     const changes = [];
     const names = new Set();
@@ -51,6 +55,13 @@ function repointed(document, definition, from, to, moves, settled) {
 function edited(document, changes, definition) {
     const parts = new Map();
     for (const change of changes) {
+        if (change.kind === 'field')
+            parts.set(`field ${change.name}`, {
+                kind: 'field',
+                name: change.name,
+                value: change.value,
+                prior: document.fields[change.name],
+            });
         if (change.kind === 'preamble')
             parts.set('preamble', { kind: 'preamble', value: change.value, prior: document.preamble });
         if (change.kind === 'section')
@@ -68,6 +79,11 @@ function edited(document, changes, definition) {
 }
 function bodies(path, before, after) {
     const changes = [];
+    for (const [name, value] of Object.entries(after.fields)) {
+        if (equalValue(before.fields[name], value))
+            continue;
+        changes.push({ kind: 'field', path, name, value });
+    }
     if (after.preamble !== before.preamble) {
         changes.push({ kind: 'preamble', path, value: after.preamble });
     }
@@ -92,17 +108,8 @@ function relinks(path, moved, before, moves, definition) {
     if (changes.length === 0)
         return { kind: 'changes', changes: [] };
     const applied = apply(before, changes, definition);
-    if (applied.outcome === 'refuse') {
-        return {
-            kind: 'refused',
-            refusal: {
-                code: applied.refusal.rule,
-                retryable: false,
-                file: path,
-                ...(applied.refusal.location === undefined ? {} : { location: applied.refusal.location }),
-            },
-        };
-    }
+    if (applied.outcome === 'refuse')
+        return refusedBy(applied.refusal, path);
     const after = applied.document;
     if (after === before)
         return { kind: 'changes', changes: [] };
@@ -112,7 +119,9 @@ function relinks(path, moved, before, moves, definition) {
     return { kind: 'changes', changes: bodies(path, before, after) };
 }
 function partKey(change) {
-    return change.kind === 'section' ? `section ${change.name}` : change.kind;
+    return change.kind === 'section' || change.kind === 'field'
+        ? `${change.kind} ${change.name}`
+        : change.kind;
 }
 const NAMES_A_SKIP_TESTS = 64;
 const ENCODED = /[%&\\]/u;
@@ -174,7 +183,7 @@ function* rewrites(changes, visible) {
             if (change.kind === 'replace') {
                 for (const index of own) {
                     const kind = merged[index]?.kind;
-                    if (kind === 'section' || kind === 'preamble')
+                    if (kind === 'field' || kind === 'section' || kind === 'preamble')
                         merged[index] = null;
                 }
                 added.push(change);
@@ -239,11 +248,7 @@ function rewritten(path, document, changes, definition) {
     const after = applied.document;
     if (document.type === undefined)
         return [{ kind: 'replace', path, content: serialize(after) }];
-    const names = new Set(changes.flatMap((change) => change.kind === 'reference' ? [pointerSegments(change.pointer)[0] ?? ''] : []));
-    return [
-        ...[...names].map((name) => ({ kind: 'field', path, name, value: after.fields[name] })),
-        ...bodies(path, document, after),
-    ];
+    return bodies(path, document, after);
 }
 function roomPathOf(handle, path) {
     return `/rooms/${handle}/${path}`;
@@ -560,34 +565,50 @@ function relativeField(path, name, value, handle, definition) {
     return result.outcome === 'applied' ? result.document.fields[name] : value;
 }
 function relativeChanges(input) {
+    const changes = [];
+    for (const change of input.changes) {
+        const next = relativeChange(change, input);
+        if ('refusal' in next)
+            return next;
+        changes.push(next.change);
+    }
+    return { kind: 'changes', changes };
+}
+function relativeChange(change, input) {
     const { handle, composition, visible } = input;
-    const typed = (path) => definitionsAt(composition, path);
     const body = (path, text) => shellRelative(text, path, handle, () => undefined)?.content ?? text;
-    return input.changes.map((change) => {
-        const definition = typed(change.path);
-        if (change.kind === 'field') {
-            const type = visible.collection.document(change.path)?.type;
-            const value = relativeField(change.path, change.name, change.value, handle, definition(type));
-            return value === change.value ? change : { ...change, value };
-        }
-        if (change.kind === 'section' || change.kind === 'preamble') {
-            const value = body(change.path, change.value);
-            return value === change.value ? change : { ...change, value };
-        }
-        if (change.kind === 'replace' || (change.kind === 'create' && 'content' in change)) {
-            const content = shellRelative(change.content, change.path, handle, definition)?.content ?? change.content;
-            return content === change.content ? change : { ...change, content };
-        }
-        if (change.kind !== 'create')
-            return change;
-        const type = typeof change.fields.type === 'string' ? change.fields.type : undefined;
-        const fields = Object.fromEntries(Object.entries(change.fields).map(([name, value]) => [
-            name,
-            relativeField(change.path, name, value, handle, definition(type)),
-        ]));
-        const sections = Object.fromEntries(Object.entries(change.sections).map(([name, value]) => [name, body(change.path, value)]));
-        return { ...change, fields, sections };
-    });
+    const definition = definitionsAt(composition, change.path);
+    if (change.kind === 'field') {
+        const type = visible.collection.document(change.path)?.type;
+        const value = relativeField(change.path, change.name, change.value, handle, definition(type));
+        return { change: value === change.value ? change : { ...change, value } };
+    }
+    if (change.kind === 'section' || change.kind === 'preamble') {
+        const value = body(change.path, change.value);
+        return { change: value === change.value ? change : { ...change, value } };
+    }
+    if (change.kind === 'replace' || (change.kind === 'create' && 'content' in change)) {
+        const content = shellRelative(change.content, change.path, handle, definition)?.content ?? change.content;
+        return { change: content === change.content ? change : { ...change, content } };
+    }
+    if (change.kind !== 'create')
+        return { change };
+    const type = typeof change.fields.type === 'string' ? change.fields.type : undefined;
+    const fields = Object.fromEntries(Object.entries(change.fields).map(([name, value]) => [
+        name,
+        relativeField(change.path, name, value, handle, definition(type)),
+    ]));
+    const sections = Object.fromEntries(Object.entries(change.sections).map(([name, value]) => [name, body(change.path, value)]));
+    const written = composed(change.path, fields, sections, composition);
+    if (written.outcome === 'refuse')
+        return refusedBy(written.refusal, change.path);
+    if (written.outcome === 'stale')
+        throw new Error(`the creation of ${change.path} is stale`);
+    if (Object.keys(sections).length === 0)
+        return { change: { ...change, fields, sections } };
+    return {
+        change: { kind: 'create', path: change.path, content: serialize(written.document) },
+    };
 }
 function unqueueable(file) {
     return refuse('unknown-revision', file);
@@ -599,6 +620,26 @@ function touched(change) {
     return change.kind === 'move' ? [change.path, change.to] : [change.path];
 }
 function partsApplied(content, path, changes, composition) {
+    const applied = partsResult(content, path, changes, composition);
+    return applied?.outcome === 'applied' ? serialize(applied.document) : null;
+}
+function unapplied(changes, visible, composition) {
+    const parted = new Map();
+    for (const change of changes) {
+        if (isPart(change))
+            parted.set(change.path, [...(parted.get(change.path) ?? []), change]);
+    }
+    for (const [path, parts] of parted) {
+        const content = visible.documents[path];
+        if (content === undefined)
+            continue;
+        const applied = partsResult(content, path, parts, composition);
+        if (applied?.outcome === 'refuse')
+            return refusedBy(applied.refusal, path);
+    }
+    return null;
+}
+function partsResult(content, path, changes, composition) {
     const definitions = definitionsAt(composition, path);
     const parsed = parse(content, path, definitions);
     if (!parsed.ok)
@@ -623,8 +664,7 @@ function partsApplied(content, path, changes, composition) {
         else
             parts.set('preamble', { kind: 'preamble', value: change.value, prior: document.preamble });
     }
-    const applied = apply(document, [...parts.values()], definitions(document.type));
-    return applied.outcome === 'applied' ? serialize(applied.document) : null;
+    return apply(document, [...parts.values()], definitions(document.type));
 }
 function settledParts(changes, deferred, composition) {
     for (const [held, parts] of deferred) {
@@ -905,6 +945,7 @@ async function judging(visible, resulting, composition, validate, removed, touch
                 retryable: false,
                 file: verdict.file,
                 ...(verdict.location === undefined ? {} : { location: verdict.location }),
+                ...(verdict.line === undefined ? {} : { line: verdict.line }),
                 ...(verdict.referrers === undefined ? {} : { referrers: verdict.referrers }),
             },
         };
@@ -920,8 +961,6 @@ function placed(reference) {
     const key = roomPathOf(reference.handle, reference.path);
     if (reference.kind === 'link')
         return `link ${key}`;
-    if (reference.kind === 'item')
-        return `section ${reference.section} ${key}`;
     const pointer = reference.pointer
         .split('/')
         .map((segment) => (ARRAY_INDEX.test(segment) ? '-' : segment))
@@ -953,7 +992,7 @@ function* admittedRooms(changes, visible, resulting, composition) {
                 continue;
             if (held.has(placed(reference)))
                 continue;
-            return refuse('unresolved-reference', path, reference.kind === 'field' ? reference.pointer : reference.section);
+            return refuse('unresolved-reference', path, reference.pointer);
         }
         yield ROW_WEIGHT + now.length;
     }
@@ -971,7 +1010,10 @@ function validationOf(validated) {
         };
 }
 async function batching(input) {
-    const changes = relativeChanges(input);
+    const relative = relativeChanges(input);
+    if (relative.kind === 'refused')
+        return relative;
+    const { changes } = relative;
     const structural = changes.find((change) => change.kind === 'move' || change.kind === 'remove');
     if (structural !== undefined && input.unmodeled) {
         return refuse('model-unavailable', structural.path);
@@ -981,7 +1023,7 @@ async function batching(input) {
     const rewritten = await stepped(rewrites(changes, input.visible));
     if (rewritten.kind === 'refused')
         return rewritten;
-    const refusal = guard(changes, input, WRITE);
+    const refusal = guard(changes, input, WRITE) ?? unapplied(changes, input.visible, input.composition);
     if (refusal !== null)
         return refusal;
     const preconditions = await stepped(preconditionsOf(changes, input.visible, input.bases));
@@ -1120,6 +1162,14 @@ async function moving(input) {
         return limited;
     return { kind: 'moved', leaving: immutable(leavingBatch), arriving: immutable(arrivingBatch) };
 }
+function unreadable(saved, visible, composition) {
+    const path = saved.find(({ path: at, parts }) => (parts.fields !== undefined ||
+        parts.sections !== undefined ||
+        parts.preamble !== undefined) &&
+        typedText(visible.documents[at]) &&
+        governing(composition, at).status === 'unavailable')?.path;
+    return path === undefined ? null : refuse('model-unavailable', path);
+}
 function changedUnderneath(saved, visible) {
     const parts = saved.flatMap(({ path, parts: held }) => changedParts(path, held, visible));
     return parts.length === 0
@@ -1201,7 +1251,7 @@ async function plannedMove(ask, source, into) {
 async function plannedWithin(ask, room) {
     const { record } = room;
     const visible = await stepped(room.replay(room.queue));
-    const changed = changedUnderneath(ask.saved, visible);
+    const changed = unreadable(ask.saved, visible, room.composition) ?? changedUnderneath(ask.saved, visible);
     if (changed !== null)
         return changed;
     const parts = ask.saved.map(({ path, parts: held }) => changesOf(path, held));

package/dist/saves.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"saves.d.ts","sourceRoot":"","sources":["../src/saves.ts"],"names":[],"mappings":"AAGA,OAAO,EAA2B,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAOxF,OAAO,EAQL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAErB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACrB,MAAM,cAAc,CAAC;AAatB,OAAO,EAOL,KAAK,cAAc,EAEpB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAGL,KAAK,WAAW,EAGjB,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAsB,KAAK,EAAoB,MAAM,YAAY,CAAC;AAK9E,MAAM,MAAM,UAAU,GAClB;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACxC,CAAC;IAAE,OAAO,EAAE,SAAS,CAAA;CAAE,GAAG,WAAW,CAAC,CAAC;AAE3C,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAElF,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAA;CAAE,CAAC;AAEnF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/E,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/E,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IAC9E,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACxD,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;CAC9D,CAAC;AAYF,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,SAAS,cAAc,EAAE,EAChC,SAAS,EAAE,SAAS,GAAG,SAAS,GAC/B,OAAO,CAAC,UAAU,CAAC,CA+BrB;AAED,wBAAgB,SAAS,CACvB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,SAAS,UAAU,EAAE,EAC5B,SAAS,EAAE,SAAS,GAAG,SAAS,GAC/B,OAAO,CAAC,UAAU,CAAC,CAyBrB;AAiOD,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAK9F;AAkPD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,iBAAiB,CAQrE"}
+{"version":3,"file":"saves.d.ts","sourceRoot":"","sources":["../src/saves.ts"],"names":[],"mappings":"AAGA,OAAO,EAA2B,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAOxF,OAAO,EAQL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAErB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACrB,MAAM,cAAc,CAAC;AAatB,OAAO,EAOL,KAAK,cAAc,EAEpB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAGL,KAAK,WAAW,EAGjB,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAsB,KAAK,EAAoB,MAAM,YAAY,CAAC;AAK9E,MAAM,MAAM,UAAU,GAClB;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACxC,CAAC;IAAE,OAAO,EAAE,SAAS,CAAA;CAAE,GAAG,WAAW,CAAC,CAAC;AAE3C,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAElF,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAA;CAAE,CAAC;AAEnF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/E,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/E,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IAC9E,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACxD,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;CAC9D,CAAC;AAYF,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,SAAS,cAAc,EAAE,EAChC,SAAS,EAAE,SAAS,GAAG,SAAS,GAC/B,OAAO,CAAC,UAAU,CAAC,CA+BrB;AAED,wBAAgB,SAAS,CACvB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,SAAS,UAAU,EAAE,EAC5B,SAAS,EAAE,SAAS,GAAG,SAAS,GAC/B,OAAO,CAAC,UAAU,CAAC,CAyBrB;AAiOD,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAK9F;AA+OD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,iBAAiB,CAQrE"}

package/dist/saves.js

@@ -20,9 +20,9 @@ import { pendingShown } from './shown.js';
 import { paced, ROW_WEIGHT, stepped } from './turn.js';
 import { validatedNeighbourhood } from './validation.js';
 const FULL = { outcome: 'refused', code: 'durable-write', retryable: true };
-async function savedRoom(store, locator) {
+async function savedRoom({ store, presence }, locator) {
     const replica = await store.replica(locator);
-    if (replica === undefined || store.fences.has(locator)) {
+    if (replica === undefined || presence.lost(locator)) {
         throw runtimeError('unknown-room', `Unknown Room ${locator}`);
     }
     return replica;
@@ -32,7 +32,7 @@ export function saveRoomDrafts(runtime, locator, named, writtenBy) {
     return store.exclusive(async () => {
         if (store.space.full())
             return FULL;
-        const replica = await savedRoom(store, locator);
+        const replica = await savedRoom(runtime, locator);
         const drafts = new Map((await store.drafts(locator, named.map(({ path }) => path))).map((record) => [record.path, record]));
         const saved = [];
         for (const { path, revision } of named) {
@@ -52,7 +52,7 @@ export function saveParts(runtime, locator, named, writtenBy) {
         const read = readSavedParts(named);
         if (store.space.full())
             return FULL;
-        const replica = await savedRoom(store, locator);
+        const replica = await savedRoom(runtime, locator);
         const saved = [];
         const files = [];
         const filed = read.filter(({ parts }) => parts.file !== undefined).map(({ path }) => path);
@@ -120,7 +120,7 @@ function targetsOf(saved) {
 async function loaded(runtime, locator, replica, saved, consumed, files, writtenBy) {
     const { store, localSaves } = runtime;
     const into = destination(locator, saved);
-    const target = into === null ? undefined : await savedRoom(store, into);
+    const target = into === null ? undefined : await savedRoom(runtime, into);
     const paths = saved.map(({ path }) => path);
     const targets = targetsOf(saved);
     const parts = saved.map(({ path, parts: held }) => changesOf(path, held));
@@ -230,7 +230,7 @@ export function batchFile(store, batch) {
     };
 }
 async function transferBinary(runtime, request, transfer, answer) {
-    const { store, socket, journal } = runtime;
+    const { store, socket, presence } = runtime;
     const { session } = socket;
     if (socket.closed() || session.now().refusal !== null)
         return UNCERTAIN;
@@ -246,13 +246,11 @@ async function transferBinary(runtime, request, transfer, answer) {
     const { closed, authorization, refusal } = session.now();
     if (closed || authorization === undefined || refusal !== null)
         return UNCERTAIN;
-    const since = store.fences.count();
-    journal.record(`transfer binary ${request.locator} ${request.path}`);
+    const since = presence.losses();
     try {
         const result = await transfer(authorization);
         const settled = result;
-        journal.record(`outcome binary ${settled.kind}`);
-        if (store.fences.since(request.locator, since))
+        if (presence.lostSince(request.locator, since))
             return failure({ kind: 'room-not-readable', locator: request.locator });
         if (settled.kind === 'scoped-refusal') {
             const room = await store.record(settled.locator);
@@ -264,7 +262,6 @@ async function transferBinary(runtime, request, transfer, answer) {
         return answer(result);
     }
     catch {
-        journal.record('outcome binary transport-uncertainty');
         return UNCERTAIN;
     }
 }

package/dist/seed.js

@@ -82,9 +82,9 @@ function seedRoomHeld({ socket }, room, version, held) {
         socket.reads.reached(room, stored.roomVersion, version));
 }
 function seedHeld(runtime, at, held) {
-    const { socket } = runtime;
+    const { socket, presence } = runtime;
     return Object.entries(at).every(([room, version]) => (socket.session.now().roomsListed &&
-        socket.rooms.declared(room) === undefined &&
+        presence.room(room) === undefined &&
         !held.rooms.has(room)) ||
         seedRoomHeld(runtime, room, version, held));
 }

package/dist/shown.d.ts

@@ -1,4 +1,4 @@
-import type { DiscoveredRoom, Member } from './adapter.js';
+import type { Member } from './adapter.js';
 import { type ChangeSet } from './change-set.js';
 import type { QueueEntry } from './outcome.js';
 import type { Runtime } from './runtime.js';
@@ -27,6 +27,6 @@ export declare function pendingShown(runtime: Runtime): Promise<void>;
 export declare function entriesOf(runtime: Runtime, locator: string): Promise<readonly QueueEntry[]>;
 export declare function publishChangeSet(runtime: Runtime, set: ChangeSet): Promise<void>;
 export declare function submissionDue(runtime: Runtime, locators?: readonly string[]): Promise<void>;
-export declare function roomUnreadable(runtime: Runtime, room: DiscoveredRoom): void;
+export declare function roomUnreadable(runtime: Runtime, locator: string): void;
 export declare function rest(runtime: Runtime, progress: CycleProgress | null, live?: Live): Promise<void>;
 //# sourceMappingURL=shown.d.ts.map

package/dist/shown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shown.d.ts","sourceRoot":"","sources":["../src/shown.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,EAA8B,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAA6B,KAAK,aAAa,EAAmB,MAAM,aAAa,CAAC;AAiB7F,eAAO,MAAM,WAAW,UAAU,CAAC;AAEnC,eAAO,MAAM,YAAY,gBAAgB,CAAC;AAE1C,eAAO,MAAM,aAAa,uBAAuB,CAAC;AAElD,eAAO,MAAM,kBAAkB,iBAAiB,CAAC;AAEjD,eAAO,MAAM,kBAAkB,iBAAiB,CAAC;AAEjD,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC,eAAO,MAAM,eAAe,sBAAsB,CAAC;AAEnD,eAAO,MAAM,WAAW,UAAU,CAAC;AAEnC,eAAO,MAAM,UAAU,YAAa,MAAM,WAA4B,CAAC;AA0CvE,wBAAgB,YAAY,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,OAAO,QAG7D;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAMtF;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,QAI9C;AA6ED,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,QAK3C;AAED,wBAAgB,eAAe,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,QAGjD;AAED,wBAAgB,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,QAEnE;AAsBD,wBAAgB,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAepD;AAED,wBAAgB,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIpE;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3D;AAED,wBAAgB,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,GAAG,MAAM,CAExD;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAK5D;AAYD,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC,CAGjG;AAcD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBhF;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAQjG;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,QAIpE;AAED,wBAAsB,IAAI,CACxB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,aAAa,GAAG,IAAI,EAC9B,IAAI,GAAE,IAAqC,iBAgC5C"}
+{"version":3,"file":"shown.d.ts","sourceRoot":"","sources":["../src/shown.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAA8B,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAA6B,KAAK,aAAa,EAAmB,MAAM,aAAa,CAAC;AAiB7F,eAAO,MAAM,WAAW,UAAU,CAAC;AAEnC,eAAO,MAAM,YAAY,gBAAgB,CAAC;AAE1C,eAAO,MAAM,aAAa,uBAAuB,CAAC;AAElD,eAAO,MAAM,kBAAkB,iBAAiB,CAAC;AAEjD,eAAO,MAAM,kBAAkB,iBAAiB,CAAC;AAEjD,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC,eAAO,MAAM,eAAe,sBAAsB,CAAC;AAEnD,eAAO,MAAM,WAAW,UAAU,CAAC;AAEnC,eAAO,MAAM,UAAU,YAAa,MAAM,WAA4B,CAAC;AAqCvE,wBAAgB,YAAY,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,OAAO,QAG7D;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAMtF;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,QAI9C;AA6ED,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,QAK3C;AAED,wBAAgB,eAAe,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,QAGjD;AAED,wBAAgB,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,QAEnE;AAsBD,wBAAgB,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAepD;AAED,wBAAgB,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIpE;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3D;AAED,wBAAgB,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,GAAG,MAAM,CAExD;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAK5D;AAYD,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC,CAGjG;AAcD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBhF;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAOjG;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,QAG/D;AAED,wBAAsB,IAAI,CACxB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,aAAa,GAAG,IAAI,EAC9B,IAAI,GAAE,IAAqC,iBA6B5C"}