@agentshouse/mdruntime 0.1.0-ca6edc1abd618 → 0.1.0-ca8707258fdde

package/dist/save.js

@@ -4,7 +4,7 @@ import { immutable, leaving, queuedFile, departure, } from './change.js';
 import { collectionOf, documentsOf, governing, } from './collection.js';
 import { changeBatchIdentity } from './identity.js';
 import { overlaying } from './overlay.js';
-import { covered, normalize } from './paths.js';
+import { ancestors, covered, normalize } from './paths.js';
 import { sorting } from './shared.js';
 import { paced, ROW_WEIGHT, stepped } from './turn.js';
 import { validatedCollection } from './validation.js';
@@ -321,6 +321,8 @@ function* incoming(collection, removed, candidates) {
 function affected(change) {
     return change.kind === 'move' ? [change.path, change.to] : [change.path];
 }
+const WRITE = ['write'];
+const MOVE_OUT = ['write', 'erase'];
 function guard(changes, input, removing) {
     const overridden = new Map();
     const existing = {
@@ -329,6 +331,7 @@ function guard(changes, input, removing) {
         add: (path) => void overridden.set(path, true),
         delete: (path) => void overridden.set(path, false),
     };
+    const occupied = (path) => input.folders.has(path) ? path : (ancestors(path).find((one) => existing.has(one)) ?? null);
     for (const [index, change] of changes.entries()) {
         for (const path of affected(change)) {
             const normalized = normalize(path);
@@ -337,13 +340,14 @@ function guard(changes, input, removing) {
             if (covered(input.providerOwnedPaths, normalized)) {
                 return refuse('provider-owned-path', normalized);
             }
-            const operation = change.kind === 'remove' ? removing : 'write';
-            if (!input.local && !covered(input.operations[operation], normalized))
-                return refuse(`${operation}-grant`, normalized);
+            for (const operation of change.kind === 'remove' ? removing : WRITE)
+                if (!input.local && !covered(input.operations[operation], normalized))
+                    return refuse(`${operation}-grant`, normalized);
         }
         if (change.kind === 'create' || change.kind === 'arrival') {
-            if (existing.has(change.path))
-                return refuse('path-collision', change.path);
+            const taken = existing.has(change.path) ? change.path : occupied(change.path);
+            if (taken !== null)
+                return refuse('path-collision', taken);
             existing.add(change.path);
             continue;
         }
@@ -353,6 +357,9 @@ function guard(changes, input, removing) {
                     input.bases.some((base) => base.kind === 'absent' && base.path === change.path))) {
                 return refuse('path-collision', change.path);
             }
+            const taken = occupied(change.path);
+            if (taken !== null)
+                return refuse('path-collision', taken);
             if (!input.local &&
                 existing.has(change.path) &&
                 input.visible.revisions[departure(changes, index)] === undefined) {
@@ -364,8 +371,9 @@ function guard(changes, input, removing) {
         if (change.kind === 'move') {
             if (!existing.has(change.path))
                 return refuse('path-absent', change.path);
-            if (existing.has(change.to))
-                return refuse('path-collision', change.to);
+            const taken = existing.has(change.to) ? change.to : occupied(change.to);
+            if (taken !== null)
+                return refuse('path-collision', taken);
             if (unrevised(input, change.path)) {
                 return refuse('unknown-revision', change.path);
             }
@@ -968,7 +976,7 @@ function roomReferencesIn(path, content, composition) {
     const parsed = parse(content, path);
     if (!parsed.ok)
         return [];
-    return roomReferences(path, content, definitionOf(governing(composition, path), parsed.document.type));
+    return roomReferences(parsed.document, definitionOf(governing(composition, path), parsed.document.type));
 }
 function* admittedRooms(changes, visible, resulting, composition) {
     const from = new Map();
@@ -1014,7 +1022,7 @@ async function batching(input) {
     const rewritten = await stepped(rewrites(changes, input.visible));
     if (rewritten.kind === 'refused')
         return rewritten;
-    const refusal = guard(changes, input, 'delete');
+    const refusal = guard(changes, input, WRITE);
     if (refusal !== null)
         return refusal;
     const preconditions = await stepped(preconditionsOf(changes, input.visible, input.bases));
@@ -1063,9 +1071,10 @@ function arrivingText(path, to, source, moved) {
     return applied.outcome === 'applied' ? serialize(applied.document) : content;
 }
 function arrivalOf({ path, to }, source, moved) {
-    const { documents, revisions, fileIds, changes, binaries } = source.visible;
+    const { documents, revisions, fileIds, created, changes, binaries } = source.visible;
     const kept = {
         ...(fileIds[path] === undefined ? {} : { fileId: fileIds[path] }),
+        ...(created[path] === undefined ? {} : { created: created[path] }),
         ...(changes[path] === undefined ? {} : { change: changes[path] }),
     };
     const heads = {
@@ -1095,7 +1104,7 @@ async function moving(input) {
     if (moves.length === 0)
         return refuse('no-change');
     const removals = moves.map(({ path }) => ({ kind: 'remove', path }));
-    const leaves = guard(removals, { ...source, local: input.local, bases: [] }, 'write');
+    const leaves = guard(removals, { ...source, local: input.local, bases: [] }, MOVE_OUT);
     if (leaves !== null)
         return leaves;
     const uploading = moves.find(({ path }) => source.visible.binaries[path]?.state === 'pending');
@@ -1103,7 +1112,7 @@ async function moving(input) {
         return refuse('unknown-revision', uploading.path);
     const moved = new Map(moves.map(({ path, to }) => [path, to]));
     const arrivals = moves.map((move) => arrivalOf(move, source, moved));
-    const arrives = guard(arrivals, { ...destination, local: input.local, bases: [] }, 'write');
+    const arrives = guard(arrivals, { ...destination, local: input.local, bases: [] }, WRITE);
     if (arrives !== null)
         return arrives;
     const bound = input.providerLimits.find((limit) => limit.name === MOVE_DOCUMENTS)?.value;

package/dist/saves.d.ts

@@ -0,0 +1,96 @@
+import type { Authorization, DiscoveredRoom, ScopedRefusal } from './adapter.js';
+import { type ChangeSet } from './change-set.js';
+import { type ChangeBatch, type WrittenBy } from './change.js';
+import { type Composition } from './collection.js';
+import type { Log } from './log.js';
+import { type AttachAnswer, type BinaryLinkAnswer, type HeldBinaryAnswer, type HeldShownAnswer } from './outcome.js';
+import type { ConnectionAvailability } from './readiness.js';
+import { type HeldReplica, type ReplicaRecord, type Slice, type VisibleLayer } from './replica.js';
+import { type ReturnReason, type RoomDraftParts } from './room-draft.js';
+import { type SaveRefusal } from './save.js';
+import type { RuntimeSocket } from './socket.js';
+import type { AuthoredWrite, CommittedWrite, PendingState, RoomCommit, RuntimeStore, Store, StoredEntry, View, Work } from './store.js';
+export type SaveResult = {
+    outcome: 'saved';
+    identifier: string;
+} | ({
+    outcome: 'refused';
+} & SaveRefusal);
+export type SavedRoomDraft = {
+    readonly path: string;
+    readonly revision: string;
+};
+export type SavedParts = {
+    readonly path: string;
+    readonly parts: RoomDraftParts;
+};
+export type BinaryFileSurface = {
+    read(room: string, path: string, revision?: string): Promise<HeldBinaryAnswer>;
+    link(room: string, path: string, revision?: string): Promise<BinaryLinkAnswer>;
+    show(room: string, path: string, revision?: string): Promise<HeldShownAnswer>;
+    attach(room: string, file: File): Promise<AttachAnswer>;
+    part(file: string, part: number): Promise<Uint8Array | null>;
+};
+export type Leaving = {
+    batch: ChangeBatch;
+    returned: ReturnReason | null;
+};
+export type Saver = {
+    readonly store: Store;
+    readonly socket: RuntimeSocket;
+    readonly journal: Log;
+    readonly localSaves: boolean;
+    readonly ready: Promise<void>;
+    readonly firstDiscovery: Promise<void>;
+    full(): boolean;
+    closed(): boolean;
+    refused(): boolean;
+    roomsNamed(): boolean;
+    authorized(): Authorization | undefined;
+    ensureAuthorization(): Promise<void>;
+    connectionNow(): Promise<ConnectionAvailability>;
+    scoped(result: ScopedRefusal, room: ReplicaRecord | DiscoveredRoom, local: RuntimeStore): Promise<void>;
+    refuse(reason: 'revoked-authorization'): Promise<void>;
+    compositionFor(record: ReplicaRecord): Composition;
+    prepare(locators: readonly string[]): void;
+    publishChangeSet(set: ChangeSet): Promise<void>;
+    pendingShown(): Promise<void>;
+    submitLater(locator: string): void;
+};
+export declare function withdrawable(states: ReadonlyMap<string, PendingState>): (batch: ChangeBatch) => boolean;
+export declare function sliceAt(store: Store, record: ReplicaRecord, view: View, queue: readonly ChangeBatch[], extra?: Iterable<string>, moved?: Iterable<string>): Promise<Slice>;
+export declare function landedWhole(store: Store, locator: string, batch: ChangeBatch, confirmedLayer: Slice, current?: Readonly<Record<string, string>>): Promise<boolean>;
+export type Settling = {
+    leaving?: readonly Leaving[];
+    room?: boolean;
+    view?: View;
+    commit?: Pick<RoomCommit, 'published' | 'refreshed'>;
+    changes?: {
+        readonly set: readonly StoredEntry[];
+        readonly removed: readonly string[];
+    };
+};
+export declare function preparedAfter({ prepare }: Saver, locator: string, answer: CommittedWrite): void;
+export declare function replayed(store: Store, record: ReplicaRecord, confirmedLayer: Slice, queue: readonly ChangeBatch[]): import("./turn.js").Later<import("./replica.js").Replayed>;
+export declare function overlayDiff(record: ReplicaRecord, before: HeldReplica | undefined, visible: VisibleLayer, touched: ReadonlySet<string>): Promise<{
+    overlay: NonNullable<RoomCommit['overlay']>;
+    touched: ReadonlySet<string>;
+}>;
+export type Settlement = {
+    readonly locator: string;
+    readonly left: readonly ChangeBatch[];
+    readonly commit: {
+        readonly rooms: readonly RoomCommit[];
+        readonly writes: readonly AuthoredWrite[];
+    };
+    apply(answer: CommittedWrite): ChangeSet;
+};
+export declare function settle(saver: Saver, local: RuntimeStore, locator: string, work: Work, record: ReplicaRecord, queue: readonly ChangeBatch[], settling?: Settling): Promise<ChangeSet>;
+export declare function together(saver: Saver, local: RuntimeStore, settlements: readonly Settlement[]): Promise<ChangeSet>;
+export declare function settlement(saver: Saver, local: RuntimeStore, locator: string, work: Work, record: ReplicaRecord, queue: readonly ChangeBatch[], settling?: Settling): Promise<Settlement>;
+export declare function unpairing(saver: Saver, local: RuntimeStore, locator: string, batches: readonly ChangeBatch[]): Promise<Settlement>;
+export declare function saveRoomDrafts(saver: Saver, locator: string, named: readonly SavedRoomDraft[], writtenBy: WrittenBy | undefined): Promise<SaveResult>;
+export declare function saveParts(saver: Saver, locator: string, named: readonly SavedParts[], writtenBy: WrittenBy | undefined): Promise<SaveResult>;
+export declare function batchFile(store: Store, batch: ChangeBatch): (localId: string) => Promise<Blob>;
+export declare function binaryFileSurface(saver: Saver): BinaryFileSurface;
+//# sourceMappingURL=saves.d.ts.map

package/dist/saves.d.ts.map

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