@agentshouse/mdruntime 0.1.0-c5d81e5d5cb58 → 0.1.0-c5fe3b2cddda7

package/dist/validation.js

@@ -1,6 +1,5 @@
-import { assess, checkDocument, parse, parseFrontmatter, resolves, verdicts, } from '@agentshouse/mdmodel';
-import { governing, selected } from './collection.js';
-import { sameTyping } from './model.js';
+import { assess, parse, parseFrontmatter, verdicts, } from '@agentshouse/mdmodel';
+import { selected } from './collection.js';
 import { paced, ROW_WEIGHT, yielded } from './turn.js';
 const NO_TYPES = { types: {} };
 function modelOf(model) {
@@ -60,103 +59,43 @@ function declared(content) {
     const read = parseFrontmatter(content);
     return read.ok ? (read.frontmatter.type ?? 'any') : undefined;
 }
-function typedIn(content) {
-    const type = declared(content);
-    return type !== undefined && type !== 'any';
+function shifted({ was, now }) {
+    return ((now === undefined) !== (was === undefined) ||
+        (now === null) !== (was === null) ||
+        declared(now) !== declared(was));
 }
-export function sameComposition(left, right) {
-    return (sameTyping(left.model, right.model) &&
-        (left.selection === null || right.selection === null
-            ? left.selection === right.selection
-            : sameTyping(left.selection.model, right.selection.model)) &&
-        JSON.stringify(left.selection?.roots ?? null) === JSON.stringify(right.selection?.roots ?? null));
-}
-function checked(path, content, composition) {
-    const model = governing(composition, path);
-    return checkDocument(path, content, modelOf(model), { anyRoom: true });
-}
-async function reachingAll(checks, composition, next) {
-    const targets = [
-        ...new Set(checks.flatMap(({ check }) => check.ok ? check.references.flatMap(({ target }) => (target === null ? [] : [target])) : [])),
-    ];
-    const known = await next(targets);
+const PAGE_TEXT = 1 << 20;
+export async function validatedNeighbourhood(changes, composition, source) {
     const pace = paced();
-    for (const { path, check } of checks) {
-        if (!check.ok)
-            return false;
-        const part = (other) => selected(composition, other) === selected(composition, path);
-        const resolved = check.references.every((reference) => resolves(reference, (other) => (part(other) ? known.get(other)?.type : undefined), (other) => part(other) && known.get(other)?.binary === true));
-        if (!resolved)
-            return false;
-        await pace((check.references.length + 1) * ROW_WEIGHT);
+    const changedAt = new Set();
+    const moved = [];
+    for (const change of changes) {
+        changedAt.add(change.path);
+        if (shifted(change))
+            moved.push(change.path);
+        await pace((change.now?.length ?? 0) + (change.was?.length ?? 0) + ROW_WEIGHT);
     }
-    return true;
-}
-export async function changedCleanly(changes, previous, composition, source) {
-    if (!sameComposition(previous, composition))
-        return false;
-    const changedAt = new Map(changes.map((change) => [change.path, change]));
-    const next = async (paths) => {
-        const asked = paths.filter((path) => !changedAt.has(path));
-        const known = new Map(await source.lookup(asked));
-        for (const path of paths) {
-            const change = changedAt.get(path);
-            if (change === undefined)
+    const referring = moved.length === 0
+        ? []
+        : (await source.referrers(moved)).filter((path) => !changedAt.has(path));
+    const texts = await source.texts(referring);
+    const total = changes.length + referring.length;
+    let at = 0;
+    const walk = async () => {
+        const entries = [];
+        let text = 0;
+        while (at < total && text < PAGE_TEXT) {
+            const change = changes[at];
+            const path = change?.path ?? referring[at - changes.length];
+            const content = change === undefined ? texts.get(path) : change.now;
+            at += 1;
+            text += ROW_WEIGHT;
+            if (content === undefined || content === null)
                 continue;
-            if (change.now === undefined)
-                known.delete(path);
-            else
-                known.set(path, { type: declared(change.now), binary: change.now === null });
+            entries.push({ path, content });
+            text += content.length;
         }
-        return known;
+        return { entries, next: at < total ? String(at) : null };
     };
-    const shifted = [];
-    const checks = [];
-    const pace = paced();
-    for (const { path, was, now } of changes) {
-        await pace((now?.length ?? 0) + (was?.length ?? 0) + ROW_WEIGHT);
-        const modeled = governing(composition, path).status !== 'unavailable';
-        if ((now === undefined) !== (was === undefined) ||
-            declared(now) !== declared(was) ||
-            (now === null) !== (was === null)) {
-            shifted.push(path);
-        }
-        if (!modeled && typedIn(was) && !typedIn(now))
-            return false;
-        if (now === undefined)
-            continue;
-        if (now === null)
-            return false;
-        if (!modeled) {
-            if (declared(now) === undefined)
-                return false;
-            if (typedIn(now))
-                continue;
-            const check = checked(path, now, composition);
-            if (!check.ok)
-                return false;
-            checks.push({ path, check });
-            continue;
-        }
-        checks.push({ path, check: checked(path, now, composition) });
-    }
-    if (!(await reachingAll(checks, composition, next)))
-        return false;
-    if (shifted.length === 0)
-        return true;
-    if (source.referrers === null)
-        return false;
-    const files = (await source.referrers(shifted)).filter((file) => !changedAt.has(file));
-    if (files.length === 0)
-        return true;
-    const texts = await source.texts(files);
-    const rechecked = [];
-    for (const file of files) {
-        const content = texts.get(file);
-        if (content === undefined || content === null)
-            return false;
-        await pace(content.length + ROW_WEIGHT);
-        rechecked.push({ path: file, check: checked(file, content, composition) });
-    }
-    return reachingAll(rechecked, composition, next);
+    return validatedCollection(walk, source.lookup, composition);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentshouse/mdruntime",
-  "version": "0.1.0-c5d81e5d5cb58",
+  "version": "0.1.0-c5fe3b2cddda7",
   "description": "The headless core of MD App",
   "license": "MIT",
   "type": "module",
@@ -54,7 +54,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@agentshouse/mdmodel": "0.1.0-c9952fa046c11"
+    "@agentshouse/mdmodel": "0.1.0-c96c61ea31316"
   },
   "peerDependencies": {
     "react": ">=18"

package/dist/reads.d.ts

@@ -1,11 +0,0 @@
-import type { Adapter } from './adapter.js';
-import type { Reads } from './bootstrap.js';
-export type DoorReads = Reads & {
-    carried(locator: string): number;
-    finished(locator: string, turn: number): void;
-    opened(): void;
-    applied(): void;
-    lost(): void;
-};
-export declare function doorReads(adapter: Adapter, declaration: (locator: string) => unknown, generation: () => number): DoorReads;
-//# sourceMappingURL=reads.d.ts.map

package/dist/reads.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"reads.d.ts","sourceRoot":"","sources":["../src/reads.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAOR,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG;IAC9B,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9C,MAAM,IAAI,IAAI,CAAC;IACf,OAAO,IAAI,IAAI,CAAC;IAChB,IAAI,IAAI,IAAI,CAAC;CACd,CAAC;AAkCF,wBAAgB,SAAS,CACvB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,EACzC,UAAU,EAAE,MAAM,MAAM,GACvB,SAAS,CA4FX"}

package/dist/reads.js

@@ -1,100 +0,0 @@
-function declaredAs(declaration) {
-    if (declaration === null || typeof declaration !== 'object')
-        return declaration;
-    const { roomVersion: _version, ...declared } = declaration;
-    return declared;
-}
-function sameHeld(one, other) {
-    return one === other;
-}
-function failed(answer) {
-    return answer?.kind === 'transport-uncertainty';
-}
-function continues(answer) {
-    const page = answer;
-    return page?.kind === 'net-advancement' && page.pageToken !== undefined;
-}
-export function doorReads(adapter, declaration, generation) {
-    const reading = new Map();
-    const taken = new Map();
-    let carrying = false;
-    function joined(read, authorization, request, ask) {
-        const key = `${read} ${request.locator} ${request.pageToken ?? ''}`;
-        const { held, received, ...named } = request;
-        const asked = JSON.stringify([declaredAs(declaration(request.locator)), named]);
-        const asking = generation();
-        const current = reading.get(key);
-        if (current !== undefined &&
-            current.authorization === authorization &&
-            current.asked === asked &&
-            sameHeld(current.held, held) &&
-            current.received === received &&
-            (!current.settled || current.holder < asking)) {
-            if (current.settled && !current.continued)
-                reading.delete(key);
-            else
-                current.holder = Math.max(current.holder, asking);
-            if (current.from === asking)
-                return current.answer;
-            const again = () => joined(read, authorization, request, ask);
-            return current.answer.then((answer) => {
-                if (failed(answer))
-                    return again();
-                taken.set(request.locator, (taken.get(request.locator) ?? 0) + 1);
-                return answer;
-            }, again);
-        }
-        const answer = ask();
-        const sent = {
-            locator: request.locator,
-            authorization,
-            asked,
-            held,
-            received,
-            answer,
-            from: asking,
-            holder: asking,
-            settled: false,
-            continued: false,
-        };
-        reading.set(key, sent);
-        const settled = (result, kept) => {
-            sent.settled = true;
-            sent.continued = kept && read === 'refresh' && continues(result);
-            if (reading.get(key) !== sent)
-                return;
-            const live = sent.holder === generation();
-            if (!kept || (live ? !sent.continued : !carrying))
-                reading.delete(key);
-        };
-        answer.then((result) => settled(result, !failed(result)), () => settled(null, false));
-        return answer;
-    }
-    return {
-        bootstrap: (authorization, request) => joined('bootstrap', authorization, request, () => adapter.bootstrap(authorization, request)),
-        refresh: (authorization, request) => joined('refresh', authorization, request, () => adapter.refresh(authorization, request)),
-        reached: (locator, roomVersion, target) => adapter.reached(locator, roomVersion, target),
-        carried: (locator) => taken.get(locator) ?? 0,
-        finished(locator, turn) {
-            for (const [key, held] of reading) {
-                if (held.locator !== locator || !held.settled || held.holder !== turn)
-                    continue;
-                if (turn === generation() || !carrying)
-                    reading.delete(key);
-            }
-        },
-        opened() {
-            carrying = true;
-        },
-        applied() {
-            carrying = false;
-            for (const [key, held] of reading) {
-                if (held.settled && held.holder !== generation())
-                    reading.delete(key);
-            }
-        },
-        lost() {
-            reading.clear();
-        },
-    };
-}