@agentshouse/mdmodel 0.1.0-ce8ce7ff57e88 → 0.1.0-cf26f43c2e4d9

package/dist/condition.js

@@ -1,13 +1,26 @@
-import { ARRAY_INDEX, escapePointer, fieldFacts, itemFacts, memberFacts, pointerSegments, } from './definition.js';
+import { ARRAY_INDEX, escapePointer, fieldFacts, itemFacts, memberFacts, pointerFacts, pointerSegments, } from './definition.js';
 import { roomPath, target } from './paths.js';
-import { isRecord, plain } from './yaml.js';
-export const WRITE_DOORS = ['browser', 'agent', 'client'];
+import { plain } from './yaml.js';
+export const CONDITION_OPERATORS = [
+    'eq',
+    'in',
+    'exists',
+    'contains',
+    'gt',
+    'gte',
+    'lt',
+    'lte',
+    'prefix',
+];
+export const TEXT_FIELD = '/text';
+export const WRITE_DOORS = ['browser', 'agent', 'client', 'function'];
 const PROSE = { kind: 'prose' };
 const NULL = { kind: 'null' };
 const UNREADABLE = { kind: 'unreadable' };
 const UNREAD = { present: undefined, values: [undefined], items: [undefined] };
 const NO_ITEM = { present: false, values: [], items: [] };
 const DATE = /^\d{4}-\d{2}-\d{2}$/u;
+const HEADER = /^\/headers\/[!#$%&'*+.^_`|~0-9a-z-]+$/u;
 const DATE_TIME = /^(\d{4})-(\d{2})-(\d{2})[Tt](\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?(?:[Zz]|([+-])(\d{2}):(\d{2}))$/u;
 export function factKind(facts) {
     if (facts.reference !== undefined)
@@ -71,8 +84,7 @@ function factOf(value, declared, place) {
         return UNREADABLE;
     if (kind !== 'reference')
         return { kind, value };
-    const reached = target(place.path, value) ??
-        (declared.crossRoom === true ? roomPath(value) : null);
+    const reached = target(place.path, value) ?? roomPath(value);
     const resolved = reached === null ? undefined : place.resolve(reached);
     if (resolved === undefined)
         return UNREADABLE;
@@ -182,10 +194,9 @@ function documentRead({ reached, several, missing }, held) {
     };
 }
 function readDocument(facts, path) {
-    if (path === '/path')
-        return single({ kind: 'path', value: facts.path });
-    if (path === '/type')
-        return facts.type === null ? undefined : single({ kind: 'string', value: facts.type });
+    const own = tested(DOCUMENT_TESTS, path);
+    if (own !== undefined)
+        return own.read(facts, path);
     if (path.startsWith('/sections/'))
         return facts.sections.includes(path.slice('/sections/'.length))
             ? single({ kind: 'prose' })
@@ -196,22 +207,147 @@ function readDocument(facts, path) {
         return documentRead(walked(rootOf(facts, '/members'), path.slice('/members'.length)), memberHeld);
     return undefined;
 }
-function readActor(actor, path) {
-    const value = path === '/user'
-        ? actor.user
-        : path === '/site'
-            ? actor.site
-            : path === '/door'
-                ? actor.door
-                : undefined;
-    return value === undefined ? undefined : single({ kind: 'actor', value });
-}
 export function datePointers(fields) {
     return Object.entries(fields)
         .filter(([, facts]) => facts.type === 'string' && facts.format === 'date')
-        .map(([name]) => `/fields/${name}`)
+        .map(([name]) => `/fields/${escapePointer(name)}`)
         .sort();
 }
+export function valuedChange(definition, field) {
+    if (!field.startsWith('/fields/'))
+        return false;
+    const reached = pointerFacts(definition, field.slice('/fields'.length));
+    return (reached !== undefined &&
+        !reached.through &&
+        reached.facts.type !== 'array' &&
+        !reached.facts.prose &&
+        factKind(reached.facts) !== null);
+}
+export function changeFields(definition) {
+    return [
+        ...Object.keys(definition.fields).map((name) => `/fields/${escapePointer(name)}`),
+        ...Object.keys(definition.sections).map((heading) => `/sections/${heading}`),
+    ];
+}
+export function memberPointers(definition, memberType) {
+    return Object.entries(definition.fields)
+        .filter(([, facts]) => (facts.type === 'array' ? facts.items : facts)?.reference?.includes(memberType) === true)
+        .map(([name]) => `/members/${escapePointer(name)}`);
+}
+function kindOperators(kind) {
+    switch (kind) {
+        case 'string':
+            return ['eq', 'in', 'prefix', 'exists'];
+        case 'boolean':
+            return ['eq', 'exists'];
+        case 'number':
+        case 'date':
+        case 'time':
+            return ['eq', 'in', 'gt', 'gte', 'lt', 'lte', 'exists'];
+        default:
+            return ['eq', 'in', 'exists'];
+    }
+}
+function pointerOperators({ facts, through }) {
+    const scalar = facts.type === 'array' ? facts.items : facts;
+    const kind = scalar === undefined || scalar.prose ? null : factKind(scalar);
+    if (kind === null)
+        return ['exists'];
+    if (facts.type === 'array')
+        return ['contains', 'exists'];
+    const own = kindOperators(kind);
+    return through ? [...own.filter((operator) => operator !== 'exists'), 'contains', 'exists'] : own;
+}
+function typeOperators(definition, path, memberType) {
+    if (path.startsWith('/sections/'))
+        return Object.hasOwn(definition.sections, path.slice('/sections/'.length)) ? ['exists'] : [];
+    const pointer = path.startsWith('/fields/')
+        ? path.slice('/fields'.length)
+        : memberType !== null && memberPointers(definition, memberType).includes(path)
+            ? path.slice('/members'.length)
+            : undefined;
+    const reached = pointer === undefined ? undefined : pointerFacts(definition, pointer);
+    return reached === undefined ? [] : pointerOperators(reached);
+}
+function envelope(path, kind, value) {
+    return {
+        path,
+        names: (named) => named === path,
+        kind,
+        operators: kindOperators(kind),
+        read: (facts) => {
+            const held = value(facts);
+            return held === null || held === undefined ? undefined : single({ kind, value: held });
+        },
+    };
+}
+function tested(tests, path) {
+    return tests.find(({ names }) => names(path));
+}
+function reader(tests, facts) {
+    return (path) => tested(tests, path)?.read(facts, path);
+}
+const DOCUMENT_TESTS = [
+    {
+        path: '/path',
+        names: (named) => named === '/path',
+        kind: 'string',
+        operators: ['eq', 'in', 'prefix'],
+        read: (facts) => single({ kind: 'string', value: facts.path }),
+    },
+    envelope('/type', 'enum', (facts) => facts.type),
+];
+const ACTOR_TESTS = [
+    envelope('/user', 'enum', (actor) => actor.user),
+    envelope('/site', 'enum', (actor) => actor.site),
+    envelope('/app', 'enum', (actor) => actor.app),
+    envelope('/door', 'enum', (actor) => actor.door),
+];
+const ITEM_TESTS = [
+    envelope('/delivery', 'enum', (item) => item.delivery),
+    envelope('/source', 'enum', (item) => item.source),
+    envelope('/container', 'string', (item) => item.container),
+    envelope('/author', 'string', (item) => item.author),
+    {
+        path: '/headers/<lowercase name>',
+        names: (named) => HEADER.test(named),
+        kind: 'string',
+        operators: kindOperators('string'),
+        read: (item, path) => {
+            const name = path.slice('/headers/'.length);
+            return Object.hasOwn(item.headers, name)
+                ? single({ kind: 'string', value: item.headers[name] })
+                : undefined;
+        },
+    },
+    {
+        path: '/json/<JSON Pointer>',
+        names: (named) => named.startsWith('/json/'),
+        kind: null,
+        operators: CONDITION_OPERATORS,
+        read: (item, path) => item.json === null ? UNREAD : jsonRead(pointed(item.json.value, path.slice('/json'.length))),
+    },
+];
+export const DOCUMENT_PATHS = DOCUMENT_TESTS.map(({ path }) => path);
+export const ACTOR_PATHS = ACTOR_TESTS.map(({ path }) => path);
+export const ITEM_PATHS = ITEM_TESTS.map(({ path }) => path);
+export function testOperators(definitions, path, memberType) {
+    const own = tested(DOCUMENT_TESTS, path);
+    if (own !== undefined)
+        return own.operators;
+    return [
+        ...new Set(definitions.flatMap((definition) => typeOperators(definition, path, memberType))),
+    ];
+}
+export function actorOperators(path) {
+    return tested(ACTOR_TESTS, path)?.operators ?? [];
+}
+export function itemOperators(path) {
+    return tested(ITEM_TESTS, path)?.operators ?? [];
+}
+export function itemKind(path) {
+    return tested(ITEM_TESTS, path)?.kind ?? null;
+}
 export function dated(value) {
     return (typeof value === 'string' && DATE.test(value) && instant(`${value}T00:00:00Z`) !== undefined);
 }
@@ -240,11 +376,8 @@ export function instant(value) {
     return (BigInt(at.getTime()) - BigInt(offset) * 60000n) * 1000000n + BigInt(fraction);
 }
 export function pointed(value, pointer) {
-    if (pointer === '')
-        return value;
     let reached = value;
-    for (const part of pointer.slice(1).split('/')) {
-        const token = part.replaceAll('~1', '/').replaceAll('~0', '~');
+    for (const token of pointerSegments(pointer)) {
         if (Array.isArray(reached)) {
             if (!ARRAY_INDEX.test(token))
                 return undefined;
@@ -283,44 +416,15 @@ function jsonRead(value) {
         return single({ kind: 'prose' });
     return { present: true, values: [], items: value.filter(scalar).map(jsonHeld), loose: true };
 }
-function readItem(item, path) {
-    if (path.startsWith('/json/')) {
-        if (item.json === null)
-            return UNREAD;
-        return jsonRead(pointed(item.json.value, path.slice('/json'.length)));
-    }
-    if (path.startsWith('/headers/')) {
-        const name = path.slice('/headers/'.length);
-        return Object.hasOwn(item.headers, name)
-            ? single({ kind: 'string', value: item.headers[name] })
-            : undefined;
-    }
-    if (path === '/has_attachment')
-        return single({ kind: 'boolean', value: item.has_attachment });
-    const value = path === '/delivery'
-        ? item.delivery
-        : path === '/source'
-            ? item.source
-            : path === '/container'
-                ? item.container
-                : path === '/author'
-                    ? item.author
-                    : null;
-    return value === null ? undefined : single({ kind: 'string', value });
-}
-function wanted(value, owner) {
-    return isRecord(value) && value.owner === true ? owner : value;
-}
-function equal(held, value, owner) {
+function equal(held, value) {
     if (!('value' in held))
         return undefined;
-    const expected = wanted(value, owner);
-    if (typeof expected !== typeof held.value)
+    if (typeof value !== typeof held.value)
         return undefined;
     if (held.kind !== 'time')
-        return expected === held.value;
+        return value === held.value;
     const left = instant(held.value);
-    const right = instant(expected);
+    const right = instant(value);
     return left === undefined || right === undefined ? undefined : left === right;
 }
 function sign(left, right) {
@@ -357,11 +461,11 @@ function allOf(truths) {
         return false;
     return truths.some((truth) => truth === undefined) ? undefined : true;
 }
-function compared(test, held, owner) {
+function compared(test, held) {
     if ('eq' in test)
-        return equal(held, test.eq, owner);
+        return equal(held, test.eq);
     if ('in' in test)
-        return anyOf(test.in.map((value) => equal(held, value, owner)));
+        return anyOf(test.in.map((value) => equal(held, value)));
     if ('prefix' in test) {
         if (!('value' in held) || typeof held.value !== 'string')
             return undefined;
@@ -377,7 +481,7 @@ function compared(test, held, owner) {
         return ordered(held, test.lt, (sign) => sign < 0);
     return ordered(held, test.lte, (sign) => sign <= 0);
 }
-function leaf(test, read, owner) {
+function leaf(test, read) {
     if ('exists' in test) {
         const present = read === undefined ? false : read.present;
         return present === undefined ? undefined : present === test.exists;
@@ -387,26 +491,37 @@ function leaf(test, read, owner) {
     if ('contains' in test) {
         if (read.items === null)
             return undefined;
-        const truths = read.items.map((item) => item === undefined ? undefined : equal(item, test.contains, owner));
+        const truths = read.items.map((item) => item === undefined ? undefined : equal(item, test.contains));
         return read.loose === true && !truths.includes(true) ? false : anyOf(truths);
     }
     if (read.values.length === 0)
         return read === NO_ITEM ? false : undefined;
-    return anyOf(read.values.map((value) => (value === undefined ? undefined : compared(test, value, owner))));
+    return anyOf(read.values.map((value) => (value === undefined ? undefined : compared(test, value))));
 }
-function evaluated(test, read, owner) {
+function evaluated(test, read) {
     if ('all' in test)
-        return allOf(test.all.map((part) => evaluated(part, read, owner)));
+        return allOf(test.all.map((part) => evaluated(part, read)));
     if ('any' in test)
-        return anyOf(test.any.map((part) => evaluated(part, read, owner)));
+        return anyOf(test.any.map((part) => evaluated(part, read)));
     if ('not' in test) {
-        const truth = evaluated(test.not, read, owner);
+        const truth = evaluated(test.not, read);
         return truth === undefined ? undefined : !truth;
     }
-    return leaf(test, read(test.path), owner);
+    return leaf(test, read(test.path));
 }
-export function holds(test, document, owner) {
-    return evaluated(test, (path) => readDocument(document, path), owner);
+export function members(document, path) {
+    if (!path.startsWith('/members/'))
+        return [];
+    const read = readDocument(document, path);
+    const values = read === undefined ? [] : [...read.values, ...(read.items ?? [])];
+    return [
+        ...new Set(values.flatMap((value) => value !== undefined && value.kind === 'member' && 'value' in value
+            ? [String(value.value)]
+            : [])),
+    ].sort();
+}
+export function holds(test, document) {
+    return evaluated(test, (path) => readDocument(document, path));
 }
 function inScope(scope, document) {
     if (document === null)
@@ -417,10 +532,10 @@ function inScope(scope, document) {
         return document.id === scope.document;
     return scope.folder === '/' || document.path.startsWith(`${scope.folder}/`);
 }
-function matched(condition, test, document, owner) {
+function matched(condition, test, document) {
     if (!inScope(condition.scope, document))
         return false;
-    return test === undefined || holds(test, document, owner) === true;
+    return test === undefined || holds(test, document) === true;
 }
 function reachedAt(document, field) {
     if (document === null)
@@ -453,10 +568,10 @@ function valueOf(fact) {
 function signature(reached) {
     return JSON.stringify(reached.map(({ fact }) => valueOf(fact)));
 }
-function among(values, document, field, owner) {
-    return holds({ path: field, in: values }, document, owner) === true;
+function among(values, document, field) {
+    return holds({ path: field, in: values }, document) === true;
 }
-function fieldChanged(condition, event, owner) {
+function fieldChanged(condition, event) {
     const { field, from, to } = condition;
     const before = reachedAt(event.before, field);
     const after = reachedAt(event.after, field);
@@ -470,32 +585,33 @@ function fieldChanged(condition, event, owner) {
         return false;
     if (from === 'new'
         ? event.before !== null
-        : from !== undefined && (event.before === null || !among(from, event.before, field, owner)))
+        : from !== undefined && (event.before === null || !among(from, event.before, field)))
         return false;
     if (to === 'deleted'
         ? event.after !== null
-        : to !== undefined && (event.after === null || !among(to, event.after, field, owner)))
+        : to !== undefined && (event.after === null || !among(to, event.after, field)))
         return false;
     return true;
 }
-export function fires(condition, event, owner) {
-    if (condition.by !== undefined &&
-        evaluated(condition.by, (path) => readActor(event.by, path), owner) !== true)
+export function fires(condition, event) {
+    if (condition.moved_between_rooms !== undefined &&
+        condition.moved_between_rooms !== event.moved_between_rooms)
+        return false;
+    if (condition.by !== undefined && evaluated(condition.by, reader(ACTOR_TESTS, event.by)) !== true)
         return false;
     if (condition.mode === 'starts_matching') {
         if (event.before === null && !condition.new_documents)
             return false;
-        return (matched(condition, condition.match, event.after, owner) &&
-            !matched(condition, condition.match, event.before, owner));
+        return (matched(condition, condition.match, event.after) &&
+            !matched(condition, condition.match, event.before));
     }
     const side = event.after ?? event.before;
-    return matched(condition, condition.match, side, owner) && fieldChanged(condition, event, owner);
+    return matched(condition, condition.match, side) && fieldChanged(condition, event);
 }
-export function itemFires(condition, item, owner) {
+export function itemFires(condition, item) {
     if (condition.source !== undefined && item.source !== condition.source)
         return false;
     if (condition.address !== undefined && item.address !== condition.address)
         return false;
-    return (condition.match === undefined ||
-        evaluated(condition.match, (path) => readItem(item, path), owner) === true);
+    return (condition.match === undefined || evaluated(condition.match, reader(ITEM_TESTS, item)) === true);
 }

package/dist/definition.d.ts

@@ -60,6 +60,7 @@ export declare const JSON_TYPES: readonly JsonType[];
 export declare const BUILT_IN_TYPE = "any";
 export declare const ATTACHMENT = "attachment";
 export declare const ARRAY_INDEX: RegExp;
+export declare const JSON_POINTER: RegExp;
 export declare function escapePointer(key: string): string;
 export declare function pointerSegments(pointer: string): string[];
 export declare function refTarget(reference: string, defs: Readonly<Record<string, unknown>>): {
@@ -77,5 +78,5 @@ export type PointerFacts = {
 export declare function crossedFacts(facts: ValueFacts): ValueFacts[];
 export declare function fieldFacts(definition: Definition, key: string): ValueFacts | undefined;
 export declare function pointerFacts(definition: Definition, pointer: string): PointerFacts | undefined;
-export declare function readSchema(text: string): VerifiedModel | Failure;
+export declare function readSchema(text: string, provided?: VerifiedModel): VerifiedModel | Failure;
 //# sourceMappingURL=definition.d.ts.map

package/dist/definition.d.ts.map

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

package/dist/definition.js

@@ -1,4 +1,5 @@
 import { MEMBER_FIELD, RECEIVED_FIELD, SITE_FIELD, TYPE_FIELD } from './fields.js';
+import { linearPattern } from './pattern.js';
 import { equalValue, isRecord, jsValue, parseYamlMapping, YamlError } from './yaml.js';
 export const JSON_TYPES = [
     'string',
@@ -24,9 +25,13 @@ const ANNOTATIONS = new Set([
     'writeOnly',
 ]);
 const FIELD_RULES = ['change_roles', 'initial_roles', 'transitions'];
+const PROVIDED_KEYWORDS = ['create_roles', 'delete_roles'];
+const NO_TYPES = Object.freeze({ types: Object.freeze({}) });
 const DEFS_REFERENCE = '#/$defs/';
+const UNBOUNDED_FORMAT = 'url';
 const UNRESOLVED = /[\u0000-\u001f\u007f%[\]\\^{|}]|\s$/u;
 export const ARRAY_INDEX = /^(?:0|[1-9][0-9]*)$/u;
+export const JSON_POINTER = /^(?:\/(?:[^~/]|~[01])*)*$/u;
 const HOUSE_KEYS = {
     [TYPE_FIELD]: { prose: false },
     [SITE_FIELD]: { prose: false },
@@ -45,12 +50,12 @@ export function pointerSegments(pointer) {
     return pointer.split('/').slice(1).map(unescapePointer);
 }
 export function refTarget(reference, defs) {
-    if (!reference.startsWith(DEFS_REFERENCE) || UNRESOLVED.test(reference))
-        return undefined;
-    const segments = reference.slice(DEFS_REFERENCE.length).split('/');
-    const [name = '', ...rest] = segments.map(unescapePointer);
-    if (segments.some((segment) => escapePointer(unescapePointer(segment)) !== segment))
+    const pointer = reference.slice('#'.length);
+    if (!reference.startsWith(DEFS_REFERENCE) ||
+        UNRESOLVED.test(reference) ||
+        !JSON_POINTER.test(pointer))
         return undefined;
+    const [, name = '', ...rest] = pointerSegments(pointer);
     if (!Object.hasOwn(defs, name))
         return undefined;
     let node = defs[name];
@@ -81,15 +86,7 @@ export function refTarget(reference, defs) {
     return { name, node };
 }
 function compiles(pattern) {
-    if (typeof pattern !== 'string')
-        return false;
-    try {
-        new RegExp(pattern, 'u');
-        return true;
-    }
-    catch {
-        return false;
-    }
+    return typeof pattern === 'string' && linearPattern(pattern) !== null;
 }
 function finite(value) {
     return typeof value === 'number' && Number.isFinite(value);
@@ -199,7 +196,7 @@ const KEYWORDS = {
     uniqueItems: FLAG,
     required: strings,
     dependentRequired: (value) => isRecord(value) && Object.values(value).every(strings),
-    format: TEXT,
+    format: (value) => typeof value === 'string' && value !== UNBOUNDED_FORMAT,
     contentEncoding: TEXT,
     contentMediaType: TEXT,
     title: TEXT,
@@ -447,7 +444,7 @@ export function itemFacts(facts, index) {
 export function memberFacts(facts, key) {
     if (facts.properties !== undefined && Object.hasOwn(facts.properties, key))
         return facts.properties[key];
-    const pattern = facts.patterns?.find((one) => new RegExp(one.pattern, 'u').test(key));
+    const pattern = facts.patterns?.find((one) => linearPattern(one.pattern).test(key));
     return pattern === undefined ? facts.additional : pattern.facts;
 }
 export function crossedFacts(facts) {
@@ -550,6 +547,56 @@ function readSections(value, at, context) {
     }
     return { sections };
 }
+function branchSectionsFailure(sections, declared, where) {
+    if (!isRecord(sections))
+        return refuse('sections', where);
+    for (const [name, spec] of Object.entries(sections)) {
+        const place = `${where}/${escapePointer(name)}`;
+        const own = isRecord(declared) && Object.hasOwn(declared, name) ? declared[name] : undefined;
+        if (!isRecord(spec) || !isRecord(own))
+            return refuse('sections', place);
+        const { required, ...kind } = spec;
+        const { required: _required, ...ownKind } = own;
+        if (required !== undefined && typeof required !== 'boolean')
+            return refuse('sections', `${place}/required`);
+        if (!equalValue(kind, ownKind))
+            return refuse('sections', place);
+    }
+    return undefined;
+}
+function withoutBranchSections(schema, declared, at) {
+    const kept = { ...schema };
+    if (Array.isArray(schema.allOf)) {
+        const entries = [];
+        for (const [index, entry] of schema.allOf.entries()) {
+            const read = isRecord(entry)
+                ? withoutBranchSections(entry, declared, `${at}/allOf/${index}`)
+                : { schema: entry };
+            if ('failure' in read)
+                return read;
+            entries.push(read.schema);
+        }
+        kept.allOf = entries;
+    }
+    if (schema.if === undefined)
+        return { schema: kept };
+    for (const branch of ['then', 'else']) {
+        const held = schema[branch];
+        if (!isRecord(held))
+            continue;
+        const { sections, ...rest } = held;
+        const failure = sections === undefined
+            ? undefined
+            : branchSectionsFailure(sections, declared, `${at}/${branch}/sections`);
+        if (failure !== undefined)
+            return { failure };
+        const read = withoutBranchSections(rest, declared, `${at}/${branch}`);
+        if ('failure' in read)
+            return read;
+        kept[branch] = read.schema;
+    }
+    return { schema: kept };
+}
 function deepFreeze(value) {
     if (value !== null && typeof value === 'object' && !Object.isFrozen(value)) {
         Object.freeze(value);
@@ -657,6 +704,26 @@ function unruled(schema) {
     }
     return { schema: written.size === 0 ? schema : { ...schema, properties }, written };
 }
+function providedType(name, value, provided) {
+    const at = `/${escapePointer(name)}`;
+    if (provided.nameable?.includes(name) !== true)
+        return refuse('provided-type', at);
+    if (!isRecord(value))
+        return refuse('schema', at);
+    const declared = Object.keys(value).find((key) => !PROVIDED_KEYWORDS.includes(key));
+    if (declared !== undefined)
+        return refuse('provided-type', `${at}/${escapePointer(declared)}`);
+    const { create_roles: createRoles, delete_roles: deleteRoles } = value;
+    if (createRoles !== undefined && !roleNames(createRoles))
+        return refuse('create_roles', `${at}/create_roles`);
+    if (deleteRoles !== undefined && !roleNames(deleteRoles))
+        return refuse('delete_roles', `${at}/delete_roles`);
+    return {
+        ...provided.types[name],
+        ...(createRoles === undefined ? {} : { createRoles }),
+        ...(deleteRoles === undefined ? {} : { deleteRoles }),
+    };
+}
 function readType(name, value, context) {
     const at = `/${escapePointer(name)}`;
     if (!isRecord(value))
@@ -673,7 +740,10 @@ function readType(name, value, context) {
         : readSections(declared, `${at}/sections`, context);
     if ('failure' in read)
         return read.failure;
-    const { schema, written } = unruled(ruled);
+    const unbranched = withoutBranchSections(ruled, declared, at);
+    if ('failure' in unbranched)
+        return unbranched.failure;
+    const { schema, written } = unruled(unbranched.schema);
     const failure = schemaFailure(schema, at, context);
     if (failure !== undefined)
         return failure;
@@ -712,7 +782,7 @@ function readType(name, value, context) {
 function lineAt(text, offset) {
     return text.slice(0, offset).split(/\r\n|\r|\n/).length;
 }
-export function readSchema(text) {
+export function readSchema(text, provided = NO_TYPES) {
     let root;
     try {
         root = jsValue(parseYamlMapping(text, 0, text.length));
@@ -730,7 +800,7 @@ export function readSchema(text) {
         if (name === '' || name.startsWith('$') || name === BUILT_IN_TYPE || name === ATTACHMENT)
             return refuse('schema-type-name', `/${escapePointer(name)}`);
     }
-    const context = { defs, types: new Set(names) };
+    const context = { defs, types: new Set([...names, ...Object.keys(provided.types)]) };
     for (const [name, def] of Object.entries(defs)) {
         const failure = schemaFailure(def, `/$defs/${escapePointer(name)}`, context);
         if (failure !== undefined)
@@ -739,7 +809,9 @@ export function readSchema(text) {
     const types = Object.create(null);
     let marked = false;
     for (const name of names) {
-        const definition = readType(name, root[name], context);
+        const definition = Object.hasOwn(provided.types, name)
+            ? providedType(name, root[name], provided)
+            : readType(name, root[name], context);
         if ('rule' in definition)
             return definition;
         if (definition.memberDocument) {
@@ -749,5 +821,9 @@ export function readSchema(text) {
         }
         types[name] = deepFreeze(definition);
     }
+    for (const [name, definition] of Object.entries(provided.types)) {
+        if (!Object.hasOwn(types, name))
+            types[name] = definition;
+    }
     return Object.freeze({ types: Object.freeze(types) });
 }