@agentshouse/mdmodel 0.1.0-ccf1367190878 → 0.1.0-cd90851746292

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,
@@ -216,8 +213,12 @@ const KEYWORDS = {
         return (Array.isArray(named) &&
             named.length > 0 &&
             strings(named) &&
-            named.every((name) => name === BUILT_IN_TYPE || name === ATTACHMENT || context.types.has(name)));
+            named.every((name) => name === BUILT_IN_TYPE ||
+                name === ATTACHMENT ||
+                context.types.has(name) ||
+                node.cross_room === true));
     },
+    cross_room: (value, _at, node) => typeof value === 'boolean' && node.reference !== undefined,
 };
 function sharedType(values) {
     if (values.length === 0)
@@ -290,6 +291,7 @@ function joined(left, right) {
     const format = left.format === right.format ? left.format : undefined;
     const values = united(left.values, right.values);
     const reference = united(left.reference, right.reference);
+    const crossRoom = left.crossRoom === true || right.crossRoom === true;
     const items = both(left.items, right.items);
     const prefix = left.prefix === undefined && right.prefix === undefined
         ? undefined
@@ -310,6 +312,7 @@ function joined(left, right) {
         ...(format === undefined ? {} : { format }),
         ...(values === undefined ? {} : { values }),
         ...(reference === undefined ? {} : { reference }),
+        ...(reference !== undefined && crossRoom ? { crossRoom: true } : {}),
         prose: left.prose && right.prose,
         ...(prefix === undefined ? {} : { prefix }),
         ...(items === undefined ? {} : { items }),
@@ -388,6 +391,7 @@ function factsOf(nodes, defs, ancestry) {
         : Array.isArray(node.reference)
             ? node.reference
             : undefined) ?? alternatives.find((facts) => facts.reference !== undefined)?.reference;
+    const crossRoom = firstOf(held, (node) => node.reference === undefined ? undefined : node.cross_room === true) ?? alternatives.find((facts) => facts.reference !== undefined)?.crossRoom === true;
     const format = firstOf(held, (node) => (typeof node.format === 'string' ? node.format : undefined)) ??
         alternatives.find((facts) => facts.format !== undefined)?.format;
     const prose = type === 'string' &&
@@ -422,6 +426,7 @@ function factsOf(nodes, defs, ancestry) {
         ...(format === undefined ? {} : { format }),
         ...(values === undefined ? {} : { values }),
         ...(reference === undefined ? {} : { reference }),
+        ...(reference !== undefined && crossRoom ? { crossRoom: true } : {}),
         prose,
         ...(prefix === undefined ? {} : { prefix }),
         ...(items === undefined ? {} : { items }),
@@ -439,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) {
@@ -542,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);
@@ -649,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))
@@ -665,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;
@@ -704,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));
@@ -722,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)
@@ -731,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) {
@@ -741,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) });
 }

package/dist/divide.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"divide.d.ts","sourceRoot":"","sources":["../src/divide.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAgB,MAAM,YAAY,CAAC;AA4WpF,wBAAgB,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,QAAQ,CAc3F"}
+{"version":3,"file":"divide.d.ts","sourceRoot":"","sources":["../src/divide.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAgB,MAAM,YAAY,CAAC;AAwXpF,wBAAgB,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,QAAQ,CAc3F"}

package/dist/divide.js

@@ -1,7 +1,7 @@
 import { blockRanges, headingLines } from './blocks.js';
-import { projectionInput, rangeText } from './project.js';
+import { firstEditFrom, projectionInput, rangeText, } from './project.js';
 import { refusal } from './refuse.js';
-const SMALLEST_BUDGET = 2;
+const SMALLEST_BOUND = 2;
 function node(draft) {
     return {
         start: draft.start,
@@ -86,8 +86,8 @@ function isTrailingSurrogate(text, index) {
 function characterLength(text, index) {
     return isTrailingSurrogate(text, index + 1) ? 2 : 1;
 }
-function boundOf(cutting, from, to, budget) {
-    const limit = from + budget;
+function boundOf(cutting, from, to, bound) {
+    const limit = from + bound;
     if (limit >= to)
         return to;
     for (let index = limit; index > from + 1; index -= 1) {
@@ -131,16 +131,26 @@ function textOf(state, extent) {
     return rangeText(state.content, extent, state.edits);
 }
 function sourceCutting(state, extent) {
-    let text = state.content.slice(extent.start, extent.end);
+    const source = state.content.slice(extent.start, extent.end);
     const masks = [];
-    for (const edit of state.edits) {
-        if (edit.start < extent.start || edit.end > extent.end)
+    for (let index = firstEditFrom(state.edits, extent.start); index < state.edits.length; index += 1) {
+        const edit = state.edits[index];
+        if (edit.start > extent.end)
+            break;
+        if (edit.end > extent.end)
             continue;
-        const from = edit.start - extent.start;
-        const to = edit.end - extent.start;
-        text = `${text.slice(0, from)}${'x'.repeat(to - from)}${text.slice(to)}`;
-        masks.push({ start: from, end: to });
+        masks.push({ start: edit.start - extent.start, end: edit.end - extent.start });
     }
+    let text = '';
+    let cursor = 0;
+    for (const mask of masks) {
+        if (mask.end <= cursor)
+            continue;
+        const from = Math.max(mask.start, cursor);
+        text += `${source.slice(cursor, from)}${'x'.repeat(mask.end - from)}`;
+        cursor = mask.end;
+    }
+    text += source.slice(cursor);
     return {
         text,
         masks,
@@ -158,12 +168,12 @@ function valueCutting(value) {
     };
 }
 function prefixOf(state, body) {
-    if (body.emitted === 0 || body.heading.length >= state.budget)
+    if (body.emitted === 0 || body.heading.length >= state.bound)
         return '';
     return body.heading;
 }
 function available(state, body) {
-    return state.budget - prefixOf(state, body).length;
+    return state.bound - prefixOf(state, body).length;
 }
 function emit(state, body, piece, bare = false) {
     if (piece.text.trim() === '')
@@ -206,7 +216,7 @@ function divideBound(state, body, cutting, range) {
     let start = range.start;
     while (start < range.end) {
         const bare = available(state, body) < characterLength(cutting.text, start);
-        const room = bare ? state.budget : available(state, body);
+        const room = bare ? state.bound : available(state, body);
         const stop = boundOf(cutting, start, range.end, room);
         const piece = cutting.piece(start, stop);
         if (cutting.masks.length === 0 || piece.text.length <= room) {
@@ -293,8 +303,8 @@ function divideInput(state, input) {
     ]);
 }
 export function divide(document, file, context) {
-    if (!Number.isInteger(context.budget) || context.budget < SMALLEST_BUDGET) {
-        return { ok: false, refusal: refusal(file, 'division-budget') };
+    if (!Number.isInteger(context.bound) || context.bound < SMALLEST_BOUND) {
+        return { ok: false, refusal: refusal(file, 'division-bound') };
     }
     const result = projectionInput(document, file, context);
     if (!result.ok)
@@ -302,7 +312,7 @@ export function divide(document, file, context) {
     const state = {
         content: document.content,
         edits: result.input.edits,
-        budget: context.budget,
+        bound: context.bound,
         spans: [],
     };
     divideInput(state, result.input);

package/dist/document.d.ts

@@ -1,16 +1,16 @@
 import { type Definition } from './definition.js';
-import type { ApplyResult, BodyResult, FrontmatterResult, Change, Document, Link, LinkOccurrence, ParseResult } from './types.js';
+import { type LinkInventory } from './links.js';
+import type { ApplyResult, BodyResult, FrontmatterResult, Change, Document, Link, ParseResult } from './types.js';
 import { type YamlMap } from './yaml.js';
+export declare function inventoryOf(document: Document): LinkInventory;
 export declare function parseFrontmatter(content: string, file?: string): FrontmatterResult;
 export declare function parse(content: string, file?: string): ParseResult;
-export declare function relativize(document: Document, file: string, handle: string, definition?: Definition): ApplyResult;
+export declare function relativize(document: Document, file: string, handle: string, definition?: Definition, kept?: ReadonlySet<string>): ApplyResult;
 export declare function relativizeBody(body: string, file: string, handle: string): BodyResult;
 export declare function relinkBody(body: string, file: string, moves: ReadonlyMap<string, string>): BodyResult;
 export declare function links(document: Document, file: string): readonly Link[];
-export declare function linkOccurrences(document: Document, file: string): readonly LinkOccurrence[];
 export declare function bodyLinks(body: string, file: string): readonly Link[];
-export declare function apply(document: Document, change: Change): ApplyResult;
+export declare function apply(document: Document, changes: readonly Change[]): ApplyResult;
 export declare function serialize(document: Document): string;
-export declare function fieldStart(document: Document, pointer: string): number | undefined;
 export declare function frontmatter(document: Document): YamlMap | null;
 //# sourceMappingURL=document.d.ts.map

package/dist/document.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAMhF,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,iBAAiB,EACjB,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,WAAW,EAEZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAaL,KAAK,OAAO,EAEb,MAAM,WAAW,CAAC;AAmEnB,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,SAAK,GAAG,iBAAiB,CAW9E;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,SAAK,GAAG,WAAW,CAgB7D;AAqMD,wBAAgB,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,UAAU,GACtB,WAAW,CAYb;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CASrF;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,UAAU,CAeZ;AAuBD,wBAAgB,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,IAAI,EAAE,CAEvE;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,cAAc,EAAE,CAG3F;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,IAAI,EAAE,CAErE;AAED,wBAAgB,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAOrE;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAEpD;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGlF;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,IAAI,CAE9D"}
+{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,EAKL,KAAK,aAAa,EACnB,MAAM,YAAY,CAAC;AAcpB,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,iBAAiB,EACjB,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,WAAW,EAEZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAcL,KAAK,OAAO,EAEb,MAAM,WAAW,CAAC;AAgBnB,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,aAAa,CAM7D;AAgED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,SAAK,GAAG,iBAAiB,CAW9E;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,SAAK,GAAG,WAAW,CAgB7D;AAmED,wBAAgB,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,UAAU,EACvB,IAAI,GAAE,WAAW,CAAC,MAAM,CAAa,GACpC,WAAW,CAuBb;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAUrF;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,UAAU,CAkBZ;AAeD,wBAAgB,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,IAAI,EAAE,CAEvE;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,IAAI,EAAE,CAErE;AA4LD,wBAAgB,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,WAAW,CA4CjF;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAEpD;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,IAAI,CAE9D"}