@agentshouse/mdruntime 0.1.0-alpha.9 → 0.1.0-c3903a68dcbbf

package/dist/client.js

@@ -1,227 +1,171 @@
-import { answer, AUTHORIZATION_ENDED, carried, envelope, PROTOCOL_MISMATCH } from './wire.js';
+import { observed } from './observation.js';
+import { answer, AUTHORIZATION_ENDED, carried, envelope, PORT_CLOSED, PROTOCOL_MISMATCH, } from './wire.js';
 export function connectMdRuntime(port) {
     let sequence = 0;
     let refusal = null;
-    let ended = false;
+    let ended = null;
     const calls = new Map();
-    const acks = new Map();
-    const listeners = new Map();
-    const send = (message)=>{
+    const opening = new Map();
+    const observations = new Map();
+    const send = (message) => {
         port.postMessage(envelope(message));
     };
+    function begin(id, topic, first) {
+        const handle = observed(first, () => {
+            observations.delete(id);
+            if (refusal === null)
+                send({ kind: 'stop', id });
+        }, topic === 'query');
+        observations.set(id, { topic, handle });
+        return handle.observation;
+    }
     function refuse(reported) {
         refusal = reported;
-        for (const waiting of acks.values())waiting.settle();
-        acks.clear();
+        for (const { topic, handle } of observations.values()) {
+            if (topic === 'connection-refusal')
+                handle.receive(reported);
+        }
         const failure = new Error(reported.reason);
-        for (const waiting of calls.values())waiting.fail(failure);
-        calls.clear();
-        for (const listener of listeners.values()){
-            if (listener.topic === 'connection-refusal') listener.notify(reported);
+        for (const [id, waiting] of opening) {
+            if (waiting.topic === 'connection-refusal')
+                waiting.settle(begin(id, waiting.topic, reported));
+            else
+                waiting.fail(failure);
         }
+        opening.clear();
+        for (const waiting of calls.values())
+            waiting.fail(failure);
+        calls.clear();
     }
-    function end() {
-        ended = true;
-        const failure = new Error(AUTHORIZATION_ENDED);
-        for (const waiting of acks.values())waiting.fail(failure);
-        acks.clear();
-        for (const waiting of calls.values())waiting.fail(failure);
+    function end(reason) {
+        if (ended !== null)
+            return;
+        ended = reason;
+        const failure = new Error(reason);
+        for (const waiting of opening.values())
+            waiting.fail(failure);
+        opening.clear();
+        for (const waiting of calls.values())
+            waiting.fail(failure);
         calls.clear();
-        listeners.clear();
+        for (const { handle } of observations.values())
+            handle.end();
+        observations.clear();
     }
-    port.addEventListener('message', (event)=>{
+    port.addEventListener('message', (event) => {
         const wire = carried(event.data);
-        if (wire === null) return;
+        if (wire === null)
+            return;
         if (!wire.matching) {
             refuse(PROTOCOL_MISMATCH);
             return;
         }
         const message = answer(wire.message);
-        if (message === null) return;
+        if (message === null)
+            return;
         if (message.kind === 'refusal') {
             refuse(message.refusal);
             return;
         }
         if (message.kind === 'ended') {
-            end();
+            end(AUTHORIZATION_ENDED);
             return;
         }
         if (message.kind === 'event') {
-            listeners.get(message.id)?.notify(message.value);
+            observations.get(message.id)?.handle.receive(message.value);
             return;
         }
-        const subscribing = acks.get(message.id);
-        if (subscribing !== undefined) {
-            acks.delete(message.id);
-            if (message.kind === 'failure') {
-                listeners.delete(message.id);
-                subscribing.fail(new Error(message.message));
-            } else subscribing.settle();
+        const waiting = opening.get(message.id);
+        if (waiting !== undefined) {
+            opening.delete(message.id);
+            if (message.kind === 'failure')
+                waiting.fail(new Error(message.message));
+            else
+                waiting.settle(begin(message.id, waiting.topic, message.value));
             return;
         }
-        const waiting = calls.get(message.id);
-        if (waiting === undefined) return;
+        const called = calls.get(message.id);
+        if (called === undefined)
+            return;
         calls.delete(message.id);
-        if (message.kind === 'failure') waiting.fail(new Error(message.message));
-        else waiting.settle(message.value);
+        if (message.kind === 'failure')
+            called.fail(new Error(message.message));
+        else
+            called.settle(message.value);
     });
-    port.start();
-    send({
-        kind: 'hello'
+    port.addEventListener('close', () => {
+        end(PORT_CLOSED);
     });
+    port.start();
+    send({ kind: 'hello' });
     function ask(member, input) {
-        if (ended) return Promise.reject(new Error(AUTHORIZATION_ENDED));
-        if (refusal !== null) return Promise.reject(new Error(refusal.reason));
-        const id = sequence += 1;
-        return new Promise((settle, fail)=>{
-            calls.set(id, {
-                settle: settle,
-                fail
-            });
-            send({
-                kind: 'call',
-                id,
-                member,
-                input
-            });
+        if (ended !== null)
+            return Promise.reject(new Error(ended));
+        if (refusal !== null)
+            return Promise.reject(new Error(refusal.reason));
+        const id = (sequence += 1);
+        return new Promise((settle, fail) => {
+            calls.set(id, { settle: settle, fail });
+            send({ kind: 'call', id, member, input });
         });
     }
-    function watch(topic, input, notify) {
-        if (ended) return Promise.reject(new Error(AUTHORIZATION_ENDED));
-        const id = sequence += 1;
-        listeners.set(id, {
-            topic,
-            notify
-        });
-        const end = ()=>{
-            if (!listeners.delete(id)) return;
-            if (refusal === null) send({
-                kind: 'stop',
-                id
-            });
-        };
+    function watch(topic, input) {
+        if (ended !== null)
+            return Promise.reject(new Error(ended));
+        const id = (sequence += 1);
         if (refusal !== null) {
-            if (topic === 'connection-refusal') notify(refusal);
-            return Promise.resolve(end);
+            return topic === 'connection-refusal'
+                ? Promise.resolve(begin(id, topic, refusal))
+                : Promise.reject(new Error(refusal.reason));
         }
-        return new Promise((settle, fail)=>{
-            acks.set(id, {
-                settle: ()=>settle(end),
-                fail
-            });
-            send({
-                kind: 'observe',
-                id,
-                topic,
-                input
-            });
+        return new Promise((settle, fail) => {
+            opening.set(id, { topic, settle, fail });
+            send({ kind: 'observe', id, topic, input });
         });
     }
     return {
-        rooms: ()=>ask('rooms', []),
-        query: (options)=>ask('query', [
-                options
-            ]),
-        types: (locator)=>ask('types', [
-                locator
-            ]),
-        syncStatus: ()=>ask('syncStatus', []),
-        draft: {
-            list: ()=>ask('draft.list', []),
-            read: (locator, path)=>ask('draft.read', [
-                    locator,
-                    path
-                ]),
-            replace: (locator, path, content)=>ask('draft.replace', [
-                    locator,
-                    path,
-                    content
-                ]),
-            discard: (locator, path)=>ask('draft.discard', [
-                    locator,
-                    path
-                ])
-        },
-        save: (locator, changes, replacing)=>ask('save', [
-                locator,
-                changes,
-                replacing
-            ]),
-        outcome: (identifier)=>ask('outcome', [
-                identifier
-            ]),
-        queue: {
-            discard: (locator, identifier)=>ask('queue.discard', [
-                    locator,
-                    identifier
-                ])
+        rooms: () => ask('rooms', []),
+        slots: () => ask('slots', []),
+        query: ((query) => ask('query', [query])),
+        search: (request) => ask('search', [request]),
+        types: (locator) => ask('types', [locator]),
+        syncStatus: () => ask('syncStatus', []),
+        serviceMode: () => ask('serviceMode', []),
+        roomDraft: {
+            list: () => ask('roomDraft.list', []),
+            read: (room, path) => ask('roomDraft.read', [room, path]),
+            write: (room, path, revision, parts) => ask('roomDraft.write', [room, path, revision, parts]),
+            discard: (room, path, revision) => ask('roomDraft.discard', [room, path, revision]),
         },
+        save: (room, roomDrafts) => ask('save', [room, roomDrafts]),
+        outcome: (identifier) => ask('outcome', [identifier]),
         presentation: {
-            read: ()=>ask('presentation.read', []),
-            write: (value)=>ask('presentation.write', [
-                    value
-                ])
+            read: () => ask('presentation.read', []),
+            write: (value) => ask('presentation.write', [value]),
         },
         conversation: {
-            list: ()=>ask('conversation.list', []),
-            read: (conversation)=>ask('conversation.read', [
-                    conversation
-                ]),
-            older: (conversation)=>ask('conversation.older', [
-                    conversation
-                ]),
-            compose: (conversation, instruction)=>ask('conversation.compose', [
-                    conversation,
-                    instruction
-                ]),
-            discard: (conversation)=>ask('conversation.discard', [
-                    conversation
-                ]),
-            create: (input)=>ask('conversation.create', [
-                    input
-                ]),
-            send: (conversation)=>ask('conversation.send', [
-                    conversation
-                ]),
-            answer: (conversation, answer)=>ask('conversation.answer', [
-                    conversation,
-                    answer
-                ]),
-            interrupt: (conversation)=>ask('conversation.interrupt', [
-                    conversation
-                ]),
-            kill: (conversation)=>ask('conversation.kill', [
-                    conversation
-                ]),
-            cancel: (conversation, turn)=>ask('conversation.cancel', [
-                    conversation,
-                    turn
-                ]),
-            delete: (conversation)=>ask('conversation.delete', [
-                    conversation
-                ])
+            list: () => ask('conversation.list', []),
+            read: (conversation, options) => ask('conversation.read', [conversation, options]),
+            create: (input) => ask('conversation.create', [input]),
+            send: (conversation) => ask('conversation.send', [conversation]),
+            answer: (conversation, answer) => ask('conversation.answer', [conversation, answer]),
+            interrupt: (conversation) => ask('conversation.interrupt', [conversation]),
+            kill: (conversation) => ask('conversation.kill', [conversation]),
+            cancel: (conversation, turn) => ask('conversation.cancel', [conversation, turn]),
+            delete: (conversation) => ask('conversation.delete', [conversation]),
         },
-        history: (locator, path, query)=>ask('history', [
-                locator,
-                path,
-                query
-            ]),
-        call: (name, input)=>ask('call', [
-                name,
-                input
-            ]),
-        log: ()=>ask('log', []),
-        storageLoss: ()=>ask('storageLoss', []),
-        persistence: ()=>ask('persistence', []),
-        observe (topic, second, third) {
-            const positional = topic === 'query' || topic === 'queue' || topic === 'conversation';
-            const notify = positional ? third : second;
-            return watch(topic, positional ? [
-                second
-            ] : [], notify);
+        chatDraft: {
+            write: (conversation, draft) => ask('chatDraft.write', [conversation, draft]),
+            discard: (conversation) => ask('chatDraft.discard', [conversation]),
         },
-        reauthorize: ()=>ask('reauthorize', [])
+        history: (locator, path, query) => ask('history', [locator, path, query]),
+        call: (name, input) => ask('call', [name, input]),
+        reached: (locator, roomVersion, path) => ask('reached', [locator, roomVersion, path]),
+        log: () => ask('log', []),
+        storageLoss: () => ask('storageLoss', []),
+        persistence: () => ask('persistence', []),
+        deploymentFacts: () => ask('deploymentFacts', []),
+        observe: ((topic, ...input) => watch(topic, input)),
+        reauthorize: () => ask('reauthorize', []),
     };
 }
-
-//# sourceMappingURL=client.js.map

package/dist/collection.d.ts

@@ -1,33 +1,32 @@
 import { type Document, type Validation } from '@agentshouse/mdmodel';
-import type { Selector } from '@agentshouse/query';
-import type { AttachedModelBinding, ModelState } from './model.js';
+import type { ModelState } from './model.js';
 import type { MdModelIdentity } from './adapter.js';
+import type { Refused } from './transfer.js';
 export declare const MD_MODEL: MdModelIdentity;
-export declare const PRESENTED: Selector;
-export type MdType = {
-    name: string;
-    path: string;
-    fields: Readonly<Record<string, unknown>>;
-    sections: Readonly<Record<string, unknown>>;
-};
 export type Collection = {
     documents: Readonly<Record<string, Document>>;
     composition: Composition;
 };
 export type Composition = {
-    collectionRoot: string;
     model: ModelState;
     selection: {
         roots: readonly string[];
         model: ModelState;
     } | null;
+    untypedFolders: readonly string[];
 };
+export declare function untyped(roots: readonly string[], path: string): boolean;
 export declare function governing(composition: Composition, path: string): ModelState;
-export declare function typesAt(composition: Composition, path: string): readonly MdType[];
-export declare function parseCollection(text: Readonly<Record<string, string>>, composition: Composition): Collection;
-export declare function readCollection(text: Readonly<Record<string, string>>, composition: Composition): Collection | null;
-export declare function validRoot(root: unknown): root is string;
-export declare function validateCollection(text: Readonly<Record<string, string>>, binaryTargets: readonly string[], composition: Composition, binding: AttachedModelBinding | null): Validation & {
-    source?: 'content' | 'model';
+type Previous = {
+    text: Readonly<Record<string, string>>;
+    collection: Collection;
 };
+export declare function parseCollection(text: Readonly<Record<string, string>>, composition: Composition, previous?: Previous): Collection;
+export declare function readCollection(text: Readonly<Record<string, string>>, composition: Composition, previous?: Previous): {
+    kind: 'read';
+    collection: Collection;
+} | Refused;
+export declare function validRoot(root: unknown): root is string;
+export declare function validateCollection(text: Readonly<Record<string, string>>, binaryTargets: readonly string[], composition: Composition): Validation;
+export {};
 //# sourceMappingURL=collection.d.ts.map

package/dist/collection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../src/collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAChG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,eAAO,MAAM,QAAQ,EAAE,eAAwE,CAAC;AAEhG,eAAO,MAAM,SAAS,EAAE,QAAyC,CAAC;AAElE,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1C,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC9C,WAAW,EAAE,WAAW,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE;QAAE,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,IAAI,CAAC;CACnE,CAAC;AASF,wBAAgB,SAAS,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,UAAU,CAI5E;AAED,wBAAgB,OAAO,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAGjF;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACtC,WAAW,EAAE,WAAW,GACvB,UAAU,CAOZ;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACtC,WAAW,EAAE,WAAW,GACvB,UAAU,GAAG,IAAI,CAenB;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,MAAM,CAEvD;AAyCD,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACtC,aAAa,EAAE,SAAS,MAAM,EAAE,EAChC,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,oBAAoB,GAAG,IAAI,GACnC,UAAU,GAAG;IAAE,MAAM,CAAC,EAAE,SAAS,GAAG,OAAO,CAAA;CAAE,CA4C/C"}
+{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../src/collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,QAAQ,EAEb,KAAK,UAAU,EAEhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,eAAO,MAAM,QAAQ,EAAE,eAAwE,CAAC;AAIhG,MAAM,MAAM,UAAU,GAAG;IACvB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC9C,WAAW,EAAE,WAAW,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE;QAAE,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,IAAI,CAAC;IAClE,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC,CAAC;AASF,wBAAgB,OAAO,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvE;AAED,wBAAgB,SAAS,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,UAAU,CAI5E;AAED,KAAK,QAAQ,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,CAAC;AAanF,wBAAgB,eAAe,CAC7B,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACtC,WAAW,EAAE,WAAW,EACxB,QAAQ,CAAC,EAAE,QAAQ,GAClB,UAAU,CAQZ;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACtC,WAAW,EAAE,WAAW,EACxB,QAAQ,CAAC,EAAE,QAAQ,GAClB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,GAAG,OAAO,CASpD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,MAAM,CAEvD;AAwBD,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACtC,aAAa,EAAE,SAAS,MAAM,EAAE,EAChC,WAAW,EAAE,WAAW,GACvB,UAAU,CA4BZ"}

package/dist/collection.js

@@ -1,115 +1,82 @@
-import { parse, validate, VERSION } from '@agentshouse/mdmodel';
+import { parse, validate, VERSION, } from '@agentshouse/mdmodel';
 import { beneath, normalize } from './paths.js';
-export const MD_MODEL = {
-    identity: '@agentshouse/mdmodel',
-    version: VERSION
-};
-export const PRESENTED = {
-    path: {
-        $regex: '\\.md$'
-    }
-};
+export const MD_MODEL = { identity: '@agentshouse/mdmodel', version: VERSION };
+const NO_TYPES = { types: {} };
 function selected(composition, path) {
-    return composition.selection !== null && composition.selection.roots.some((root)=>beneath(root, path));
+    return (composition.selection !== null &&
+        composition.selection.roots.some((root) => beneath(root, path)));
+}
+export function untyped(roots, path) {
+    return roots.some((root) => beneath(root, path));
 }
 export function governing(composition, path) {
-    return composition.selection !== null && selected(composition, path) ? composition.selection.model : composition.model;
+    return composition.selection !== null && selected(composition, path)
+        ? composition.selection.model
+        : composition.model;
 }
-export function typesAt(composition, path) {
-    const model = governing(composition, path);
-    return model.status === 'unavailable' ? [] : model.types;
+function parsedAt(text, path, previous) {
+    const retained = previous?.collection.documents[path];
+    return retained !== undefined && previous?.text[path] === text[path]
+        ? { ok: true, document: retained }
+        : parse(text[path], path);
 }
-export function parseCollection(text, composition) {
+export function parseCollection(text, composition, previous) {
     const documents = {};
-    for (const path of Object.keys(text).sort()){
-        const parsed = parse(text[path], path);
-        if (parsed.ok) documents[path] = parsed.document;
+    for (const path of Object.keys(text).sort()) {
+        if (untyped(composition.untypedFolders, path))
+            continue;
+        const parsed = parsedAt(text, path, previous);
+        if (parsed.ok)
+            documents[path] = parsed.document;
     }
-    return {
-        documents,
-        composition
-    };
+    return { documents, composition };
 }
-export function readCollection(text, composition) {
-    if (!validRoot(composition.collectionRoot)) return null;
-    const collection = parseCollection(text, composition);
-    if (Object.keys(collection.documents).length !== Object.keys(text).length) return null;
-    if (Object.entries(collection.documents).some(([path, document])=>!member(path, composition.collectionRoot) && !selected(composition, path) && document.type !== undefined && document.type !== 'any')) return null;
-    return collection;
+export function readCollection(text, composition, previous) {
+    const documents = {};
+    for (const path of Object.keys(text).sort()) {
+        if (untyped(composition.untypedFolders, path))
+            continue;
+        const parsed = parsedAt(text, path, previous);
+        if (!parsed.ok)
+            return { kind: 'refused', refusal: parsed.refusal };
+        documents[path] = parsed.document;
+    }
+    return { kind: 'read', collection: { documents, composition } };
 }
 export function validRoot(root) {
     return typeof root === 'string' && normalize(root) === root;
 }
-function member(path, root) {
-    return root === '' || path.startsWith(`${root}/`);
-}
-function validateAgainst(documents, binaryTargets, prefix, model, binding) {
-    if (model.status === 'unavailable' || binding === null) {
-        const typed = Object.entries(documents).find(([, content])=>{
+function validateAgainst(documents, binaryTargets, model) {
+    if (model.status === 'unavailable') {
+        const typed = Object.entries(documents).find(([, content]) => {
             const parsed = parse(content);
             return parsed.ok && parsed.document.type !== undefined && parsed.document.type !== 'any';
         });
-        if (typed !== undefined) return {
-            verdict: 'refuse',
-            rule: 'model-unavailable',
-            file: `${prefix}${typed[0]}`,
-            version: VERSION
-        };
-        return validate(documents, {
-            binaryTargets
-        });
+        if (typed !== undefined)
+            return { verdict: 'refuse', rule: 'model-unavailable', file: typed[0] };
     }
-    const verdict = binding.validate({
-        model: model.snapshot,
-        documents,
-        binaryTargets
-    });
-    if (verdict.verdict === 'refuse' && verdict.source === 'model') return verdict;
-    if (verdict.verdict === 'accept') return verdict;
-    return {
-        ...verdict,
-        file: `${prefix}${verdict.file}`,
-        ...verdict.referrers === undefined ? {} : {
-            referrers: verdict.referrers.map((path)=>`${prefix}${path}`)
-        }
-    };
+    return validate(documents, { binaryTargets }, model.status === 'unavailable' ? NO_TYPES : { types: model.types });
 }
-export function validateCollection(text, binaryTargets, composition, binding) {
-    const prefix = composition.collectionRoot === '' ? '' : `${composition.collectionRoot}/`;
+export function validateCollection(text, binaryTargets, composition) {
     const collection = {};
     const selection = {};
-    for (const [path, content] of Object.entries(text)){
-        if (member(path, composition.collectionRoot)) {
-            collection[path.slice(prefix.length)] = content;
+    for (const [path, content] of Object.entries(text)) {
+        if (untyped(composition.untypedFolders, path))
             continue;
-        }
-        if (selected(composition, path)) {
+        if (selected(composition, path))
             selection[path] = content;
-            continue;
-        }
-        const parsed = parse(content, path);
-        if (!parsed.ok) return {
-            verdict: 'refuse',
-            ...parsed.refusal
-        };
-        if (Object.hasOwn(parsed.document.fields, 'type') && parsed.document.fields.type !== 'any') {
-            return {
-                verdict: 'refuse',
-                rule: 'outside-collection-type',
-                file: path,
-                version: VERSION
-            };
-        }
+        else
+            collection[path] = content;
     }
+    const linked = binaryTargets.filter((path) => !untyped(composition.untypedFolders, path));
     const verdicts = [
-        validateAgainst(collection, binaryTargets.filter((path)=>member(path, composition.collectionRoot)).map((path)=>path.slice(prefix.length)), prefix, composition.model, binding)
+        validateAgainst(collection, linked.filter((path) => !selected(composition, path)), composition.model),
     ];
     if (composition.selection !== null) {
-        verdicts.push(validateAgainst(selection, binaryTargets.filter((path)=>selected(composition, path)), '', composition.selection.model, binding));
+        verdicts.push(validateAgainst(selection, linked.filter((path) => selected(composition, path)), composition.selection.model));
     }
-    const refusals = verdicts.filter((verdict)=>verdict.verdict === 'refuse');
-    if (refusals.length === 0) return verdicts[0];
-    return refusals.find((refusal)=>refusal.rule !== 'model-unavailable') ?? refusals[0];
+    const refusals = verdicts.filter((verdict) => verdict.verdict === 'refuse');
+    if (refusals.length === 0)
+        return verdicts[0];
+    return refusals.find((refusal) => refusal.rule !== 'model-unavailable') ?? refusals[0];
 }
-
-//# sourceMappingURL=collection.js.map