@modelprofile.com/flexharness 10.12.0 → 10.13.0

package/dist_ts/utils.schemadeclarations.js

@@ -0,0 +1,315 @@
+/**
+ * Renders JSON Schema as TypeScript declarations for the tool catalog. The output depends only on
+ * the schema, so the same schema always renders to the same bytes.
+ */
+const identifierPattern = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
+const maxRenderDepth = 32;
+const maxInlineObjectCharacters = 100;
+const maxSafeInteger = Number.MAX_SAFE_INTEGER;
+export const isSchemaRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+export const isIdentifier = (value) => identifierPattern.test(value);
+const literal = (value) => {
+    if (typeof value === 'string')
+        return JSON.stringify(value);
+    if (typeof value === 'number' && Number.isFinite(value))
+        return String(value);
+    if (typeof value === 'boolean' || value === null)
+        return String(value);
+    return 'unknown';
+};
+/**
+ * Reports whether `character` occurs outside brackets, braces, parentheses, string literals and
+ * comments.
+ */
+const hasTopLevel = (text, character) => {
+    let depth = 0;
+    let quote;
+    for (let index = 0; index < text.length; index++) {
+        const current = text[index];
+        if (quote) {
+            if (current === '\\')
+                index++;
+            else if (current === quote)
+                quote = undefined;
+            continue;
+        }
+        if (current === '/' && text[index + 1] === '*') {
+            const end = text.indexOf('*/', index + 2);
+            if (end === -1)
+                return false;
+            index = end + 1;
+            continue;
+        }
+        if (current === '"' || current === "'")
+            quote = current;
+        else if (current === '{' || current === '[' || current === '(' || current === '<')
+            depth++;
+        else if (current === '}' || current === ']' || current === ')' || current === '>')
+            depth--;
+        else if (depth === 0 && current === character)
+            return true;
+    }
+    return false;
+};
+const union = (parts) => {
+    const unique = [...new Set(parts)];
+    if (unique.includes('unknown'))
+        return 'unknown';
+    const withoutNever = unique.length > 1 ? unique.filter((part) => part !== 'never') : unique;
+    return withoutNever.join(' | ');
+};
+const intersection = (parts) => {
+    const unique = [...new Set(parts)].filter((part) => part !== 'unknown');
+    if (unique.length === 0)
+        return 'unknown';
+    return unique.map((part) => hasTopLevel(part, '|') ? `(${part})` : part).join(' & ');
+};
+const arrayOf = (element) => hasTopLevel(element, '|') || hasTopLevel(element, '&') ? `(${element})[]` : `${element}[]`;
+const propertyKey = (name) => isIdentifier(name) ? name : JSON.stringify(name);
+/** A JSDoc block at `indent`; a short single line stays on one line. */
+export const docBlock = (text, indent) => {
+    const lines = text.replace(/\*\//g, '*\\/').split('\n').map((line) => line.trimEnd());
+    if (lines.length === 1 && indent.length + lines[0].length <= 100)
+        return `${indent}/** ${lines[0]} */\n`;
+    return `${indent}/**\n${lines.map((line) => line ? `${indent} * ${line}` : `${indent} *`).join('\n')}\n${indent} */\n`;
+};
+export const countOf = (count, unit) => `${count} ${unit}${count === 1 ? '' : 's'}`;
+/** Constraints a TypeScript type cannot state, in a short readable form. */
+const constraintsOf = (schema) => {
+    const constraints = [];
+    const types = Array.isArray(schema.type) ? schema.type : [schema.type];
+    if (types.includes('integer'))
+        constraints.push('integer');
+    if (typeof schema.format === 'string')
+        constraints.push(`format ${schema.format}`);
+    const bound = (value) => typeof value === 'number' && Number.isFinite(value) && Math.abs(value) !== maxSafeInteger;
+    if (bound(schema.exclusiveMinimum))
+        constraints.push(`> ${schema.exclusiveMinimum}`);
+    else if (bound(schema.minimum))
+        constraints.push(`${schema.exclusiveMinimum === true ? '>' : '>='} ${schema.minimum}`);
+    if (bound(schema.exclusiveMaximum))
+        constraints.push(`< ${schema.exclusiveMaximum}`);
+    else if (bound(schema.maximum))
+        constraints.push(`${schema.exclusiveMaximum === true ? '<' : '<='} ${schema.maximum}`);
+    if (bound(schema.multipleOf))
+        constraints.push(`multiple of ${schema.multipleOf}`);
+    const range = (min, max, unit) => {
+        const hasMin = bound(min) && min > 0;
+        const hasMax = bound(max);
+        if (hasMin && hasMax)
+            constraints.push(min === max ? countOf(min, unit) : `${min}-${countOf(max, unit)}`);
+        else if (hasMin)
+            constraints.push(`at least ${countOf(min, unit)}`);
+        else if (hasMax)
+            constraints.push(`at most ${countOf(max, unit)}`);
+    };
+    range(schema.minLength, schema.maxLength, 'character');
+    range(schema.minItems, schema.maxItems, 'item');
+    if (schema.uniqueItems === true)
+        constraints.push('unique items');
+    if (typeof schema.pattern === 'string')
+        constraints.push(`pattern /${schema.pattern}/`);
+    if (schema.default !== undefined) {
+        const value = JSON.stringify(schema.default);
+        if (value !== undefined && value.length <= 60)
+            constraints.push(`default ${value}`);
+    }
+    if (schema.deprecated === true)
+        constraints.push('deprecated');
+    return constraints;
+};
+/** The documentation of a property: its description and the constraints its type cannot state. */
+export const schemaDoc = (schema, description) => {
+    if (!isSchemaRecord(schema))
+        return description?.trim() || undefined;
+    const text = (description ?? (typeof schema.description === 'string' ? schema.description : '')).trim();
+    const constraints = constraintsOf(schema);
+    if (constraints.length === 0)
+        return text || undefined;
+    return text ? `${text} (${constraints.join(', ')})` : constraints.join(', ');
+};
+export class SchemaDeclarationWriter {
+    context;
+    used = new Set();
+    inlining = new Set();
+    constructor(context) {
+        this.context = context;
+    }
+    get usedTypes() {
+        return [...this.used].sort();
+    }
+    /** The TypeScript type of `schema`, with continuation lines indented relative to `indent`. */
+    type(schema, indent = '', depth = 0, omitMemberDocs = false) {
+        if (depth > maxRenderDepth)
+            return 'unknown';
+        if (schema === true)
+            return 'unknown';
+        if (schema === false)
+            return 'never';
+        if (!isSchemaRecord(schema))
+            return 'unknown';
+        const base = this.baseType(schema, indent, depth, omitMemberDocs);
+        return schema.nullable === true ? union([base, 'null']) : base;
+    }
+    /** The members of an object schema; undefined when the schema is not a plain object type. */
+    objectMembers(schema) {
+        if (!isSchemaRecord(schema) || !this.isPlainObject(schema))
+            return undefined;
+        const properties = isSchemaRecord(schema.properties) ? schema.properties : {};
+        return Object.entries(properties).map(([name, property]) => {
+            const doc = schemaDoc(property);
+            return { name, ...(doc === undefined ? {} : { doc }) };
+        });
+    }
+    /** Whether an object schema requires none of its properties. */
+    hasNoRequiredProperties(schema) {
+        return isSchemaRecord(schema)
+            && this.isPlainObject(schema)
+            && !(Array.isArray(schema.required) && schema.required.length > 0);
+    }
+    /** `interface Name { … }` for a plain object schema, otherwise `type Name = …;`. */
+    namedDeclaration(name, schema, description) {
+        const doc = isSchemaRecord(schema)
+            ? (description ?? (typeof schema.description === 'string' ? schema.description : undefined))?.trim()
+            : description?.trim();
+        const prefix = doc ? docBlock(doc, '') : '';
+        if (isSchemaRecord(schema) && this.isPlainObject(schema) && schema.nullable !== true) {
+            return `${prefix}interface ${name} ${this.objectType(schema, '', 0, false)}`;
+        }
+        return `${prefix}type ${name} = ${this.type(schema, '', 0)};`;
+    }
+    isPlainObject(schema) {
+        if (schema.$ref !== undefined || 'const' in schema || schema.enum !== undefined)
+            return false;
+        if (schema.anyOf !== undefined || schema.oneOf !== undefined || schema.allOf !== undefined)
+            return false;
+        if (schema.type === 'object')
+            return true;
+        return schema.type === undefined && isSchemaRecord(schema.properties);
+    }
+    baseType(schema, indent, depth, omitMemberDocs) {
+        if (typeof schema.$ref === 'string')
+            return this.reference(schema.$ref, indent, depth);
+        if ('const' in schema)
+            return literal(schema.const);
+        if (Array.isArray(schema.enum))
+            return schema.enum.length ? union(schema.enum.map(literal)) : 'never';
+        const alternatives = Array.isArray(schema.anyOf) ? schema.anyOf : Array.isArray(schema.oneOf) ? schema.oneOf : undefined;
+        if (alternatives?.length) {
+            return union(alternatives.map((alternative) => this.type(alternative, indent, depth + 1)));
+        }
+        if (Array.isArray(schema.allOf) && schema.allOf.length) {
+            const own = { ...schema };
+            delete own.allOf;
+            const hasOwnShape = own.type !== undefined || own.properties !== undefined;
+            return intersection([
+                ...schema.allOf.map((part) => this.type(part, indent, depth + 1)),
+                ...(hasOwnShape ? [this.type(own, indent, depth + 1)] : []),
+            ]);
+        }
+        const types = Array.isArray(schema.type)
+            ? schema.type.filter((type) => typeof type === 'string')
+            : typeof schema.type === 'string'
+                ? [schema.type]
+                : this.inferredTypes(schema);
+        if (types.length === 0)
+            return 'unknown';
+        return union(types.map((type) => {
+            switch (type) {
+                case 'string': return 'string';
+                case 'number':
+                case 'integer': return 'number';
+                case 'boolean': return 'boolean';
+                case 'null': return 'null';
+                case 'array': return this.arrayType(schema, indent, depth);
+                case 'object': return this.objectType(schema, indent, depth, omitMemberDocs);
+                default: return 'unknown';
+            }
+        }));
+    }
+    inferredTypes(schema) {
+        if (schema.properties !== undefined
+            || schema.additionalProperties !== undefined
+            || schema.patternProperties !== undefined
+            || schema.required !== undefined)
+            return ['object'];
+        if (schema.items !== undefined || schema.prefixItems !== undefined)
+            return ['array'];
+        return [];
+    }
+    reference(ref, indent, depth) {
+        const name = this.context.namedType(ref);
+        if (name) {
+            this.used.add(name);
+            return name;
+        }
+        const target = this.context.resolve(ref);
+        if (target === undefined || this.inlining.has(ref))
+            return 'unknown';
+        this.inlining.add(ref);
+        try {
+            return this.type(target, indent, depth + 1);
+        }
+        finally {
+            this.inlining.delete(ref);
+        }
+    }
+    arrayType(schema, indent, depth) {
+        const tuple = Array.isArray(schema.prefixItems)
+            ? schema.prefixItems
+            : Array.isArray(schema.items) ? schema.items : undefined;
+        if (tuple) {
+            const rest = Array.isArray(schema.prefixItems) ? schema.items : schema.additionalItems;
+            const members = tuple.map((item) => this.type(item, indent, depth + 1));
+            if (rest !== undefined && rest !== false) {
+                members.push(`...${arrayOf(this.type(rest, indent, depth + 1))}`);
+            }
+            return `[${members.join(', ')}]`;
+        }
+        if (schema.items === undefined)
+            return 'unknown[]';
+        return arrayOf(this.type(schema.items, indent, depth + 1));
+    }
+    objectType(schema, indent, depth, omitMemberDocs) {
+        const memberIndent = `${indent}  `;
+        const properties = isSchemaRecord(schema.properties) ? schema.properties : {};
+        const required = new Set(Array.isArray(schema.required)
+            ? schema.required.filter((name) => typeof name === 'string')
+            : []);
+        const members = [];
+        for (const [name, property] of Object.entries(properties)) {
+            const type = this.type(property, memberIndent, depth + 1);
+            const doc = omitMemberDocs ? undefined : schemaDoc(property);
+            members.push({
+                ...(doc === undefined ? {} : { doc }),
+                text: `${propertyKey(name)}${required.has(name) ? '' : '?'}: ${type}`,
+            });
+        }
+        const indexTypes = [];
+        if (isSchemaRecord(schema.patternProperties)) {
+            for (const property of Object.values(schema.patternProperties)) {
+                indexTypes.push(this.type(property, memberIndent, depth + 1));
+            }
+        }
+        if (isSchemaRecord(schema.additionalProperties)) {
+            indexTypes.push(this.type(schema.additionalProperties, memberIndent, depth + 1));
+        }
+        else if (schema.additionalProperties === true && members.length > 0) {
+            indexTypes.push('unknown');
+        }
+        if (indexTypes.length)
+            members.push({ text: `[key: string]: ${union(indexTypes)}` });
+        if (members.length === 0)
+            return schema.additionalProperties === false ? '{}' : 'Record<string, unknown>';
+        if (members.every((member) => member.doc === undefined && !member.text.includes('\n'))) {
+            const inline = `{ ${members.map((member) => member.text).join('; ')} }`;
+            if (inline.length <= maxInlineObjectCharacters)
+                return inline;
+        }
+        const lines = members.map((member) => `${member.doc === undefined ? '' : docBlock(member.doc, memberIndent)}${memberIndent}${member.text};`);
+        return `{\n${lines.join('\n')}\n${indent}}`;
+    }
+}
+/** Indents every non-empty line of `text`. */
+export const indentLines = (text, indent) => text.split('\n').map((line) => line ? `${indent}${line}` : line).join('\n');
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.schemadeclarations.js","sourceRoot":"","sources":["../ts/utils.schemadeclarations.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAiBH,MAAM,iBAAiB,GAAG,4BAA4B,CAAC;AACvD,MAAM,cAAc,GAAG,EAAE,CAAC;AAC1B,MAAM,yBAAyB,GAAG,GAAG,CAAC;AACtC,MAAM,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC;AAE/C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAc,EAAuC,EAAE,CACpF,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAEvE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAa,EAAW,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAEtF,MAAM,OAAO,GAAG,CAAC,KAAc,EAAU,EAAE;IACzC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9E,IAAI,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvE,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,SAAiB,EAAW,EAAE;IAC/D,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,KAAyB,CAAC;IAC9B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,OAAO,KAAK,IAAI;gBAAE,KAAK,EAAE,CAAC;iBACzB,IAAI,OAAO,KAAK,KAAK;gBAAE,KAAK,GAAG,SAAS,CAAC;YAC9C,SAAS;QACX,CAAC;QACD,IAAI,OAAO,KAAK,GAAG,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YAC1C,IAAI,GAAG,KAAK,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAC;YAC7B,KAAK,GAAG,GAAG,GAAG,CAAC,CAAC;YAChB,SAAS;QACX,CAAC;QACD,IAAI,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,GAAG;YAAE,KAAK,GAAG,OAAO,CAAC;aACnD,IAAI,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,GAAG;YAAE,KAAK,EAAE,CAAC;aACtF,IAAI,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,GAAG;YAAE,KAAK,EAAE,CAAC;aACtF,IAAI,KAAK,KAAK,CAAC,IAAI,OAAO,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;IAC7D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,CAAC,KAAe,EAAU,EAAE;IACxC,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IACnC,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC;QAAE,OAAO,SAAS,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5F,OAAO,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,KAAe,EAAU,EAAE;IAC/C,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IACxE,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACvF,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,OAAe,EAAU,EAAE,CAC1C,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,OAAO,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,CAAC;AAE7F,MAAM,WAAW,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AAE/F,wEAAwE;AACxE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,MAAc,EAAU,EAAE;IAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACtF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,GAAG;QAAE,OAAO,GAAG,MAAM,OAAO,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;IACzG,OAAO,GAAG,MAAM,QAAQ,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,OAAO,CAAC;AACzH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAa,EAAE,IAAY,EAAU,EAAE,CAAC,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;AAE5G,4EAA4E;AAC5E,MAAM,aAAa,GAAG,CAAC,MAAkC,EAAY,EAAE;IACrE,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvE,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC;QAAE,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3D,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ;QAAE,WAAW,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IACnF,MAAM,KAAK,GAAG,CAAC,KAAc,EAAmB,EAAE,CAChD,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,cAAc,CAAC;IAC5F,IAAI,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAAE,WAAW,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;SAChF,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;QAAE,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,gBAAgB,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IACvH,IAAI,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAAE,WAAW,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;SAChF,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;QAAE,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,gBAAgB,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IACvH,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;QAAE,WAAW,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IACnF,MAAM,KAAK,GAAG,CAAC,GAAY,EAAE,GAAY,EAAE,IAAY,EAAQ,EAAE;QAC/D,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,MAAM,IAAI,MAAM;YAAE,WAAW,CAAC,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;aACrG,IAAI,MAAM;YAAE,WAAW,CAAC,IAAI,CAAC,YAAY,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;aAC/D,IAAI,MAAM;YAAE,WAAW,CAAC,IAAI,CAAC,WAAW,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACrE,CAAC,CAAC;IACF,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACvD,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAChD,IAAI,MAAM,CAAC,WAAW,KAAK,IAAI;QAAE,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAClE,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ;QAAE,WAAW,CAAC,IAAI,CAAC,YAAY,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC;IACxF,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,IAAI,EAAE;YAAE,WAAW,CAAC,IAAI,CAAC,WAAW,KAAK,EAAE,CAAC,CAAC;IACtF,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,KAAK,IAAI;QAAE,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC/D,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,kGAAkG;AAClG,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAAuB,EAAE,WAAoB,EAAsB,EAAE;IAC7F,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;QAAE,OAAO,WAAW,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;IACrE,MAAM,IAAI,GAAG,CAAC,WAAW,IAAI,CAAC,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACxG,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,IAAI,SAAS,CAAC;IACvD,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC/E,CAAC,CAAC;AAEF,MAAM,OAAO,uBAAuB;IAIL;IAHZ,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IACzB,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IAE9C,YAA6B,OAAkC;QAAlC,YAAO,GAAP,OAAO,CAA2B;IAAG,CAAC;IAEnE,IAAW,SAAS;QAClB,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/B,CAAC;IAED,8FAA8F;IACvF,IAAI,CAAC,MAAuB,EAAE,MAAM,GAAG,EAAE,EAAE,KAAK,GAAG,CAAC,EAAE,cAAc,GAAG,KAAK;QACjF,IAAI,KAAK,GAAG,cAAc;YAAE,OAAO,SAAS,CAAC;QAC7C,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,SAAS,CAAC;QACtC,IAAI,MAAM,KAAK,KAAK;YAAE,OAAO,OAAO,CAAC;QACrC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;YAAE,OAAO,SAAS,CAAC;QAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAClE,OAAO,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACjE,CAAC;IAED,6FAA6F;IACtF,aAAa,CAClB,MAAuB;QAEvB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;YAAE,OAAO,SAAS,CAAC;QAC7E,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9E,OAAO,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE;YACzD,MAAM,GAAG,GAAG,SAAS,CAAC,QAA2B,CAAC,CAAC;YACnD,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;QACzD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,gEAAgE;IACzD,uBAAuB,CAAC,MAAuB;QACpD,OAAO,cAAc,CAAC,MAAM,CAAC;eACxB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;eAC1B,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,oFAAoF;IAC7E,gBAAgB,CAAC,IAAY,EAAE,MAAuB,EAAE,WAAoB;QACjF,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,CAAC;YAChC,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE;YACpG,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5C,IAAI,cAAc,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YACrF,OAAO,GAAG,MAAM,aAAa,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;QAC/E,CAAC;QACD,OAAO,GAAG,MAAM,QAAQ,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC;IAChE,CAAC;IAEO,aAAa,CAAC,MAAkC;QACtD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAC9F,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QACzG,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QAC1C,OAAO,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACxE,CAAC;IAEO,QAAQ,CACd,MAAkC,EAClC,MAAc,EACd,KAAa,EACb,cAAuB;QAEvB,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACvF,IAAI,OAAO,IAAI,MAAM;YAAE,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACpD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAAE,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QACtG,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QACzH,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAA8B,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAChH,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACvD,MAAM,GAAG,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;YAC1B,OAAO,GAAG,CAAC,KAAK,CAAC;YACjB,MAAM,WAAW,GAAG,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC;YAC3E,OAAO,YAAY,CAAC;gBAClB,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAuB,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;gBACpF,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;aAC5D,CAAC,CAAC;QACL,CAAC;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YACtC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC;YACxE,CAAC,CAAC,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;gBAC/B,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;gBACf,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACjC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QACzC,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9B,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,QAAQ,CAAC,CAAC,OAAO,QAAQ,CAAC;gBAC/B,KAAK,QAAQ,CAAC;gBACd,KAAK,SAAS,CAAC,CAAC,OAAO,QAAQ,CAAC;gBAChC,KAAK,SAAS,CAAC,CAAC,OAAO,SAAS,CAAC;gBACjC,KAAK,MAAM,CAAC,CAAC,OAAO,MAAM,CAAC;gBAC3B,KAAK,OAAO,CAAC,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;gBAC3D,KAAK,QAAQ,CAAC,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;gBAC7E,OAAO,CAAC,CAAC,OAAO,SAAS,CAAC;YAC5B,CAAC;QACH,CAAC,CAAC,CAAC,CAAC;IACN,CAAC;IAEO,aAAa,CAAC,MAAkC;QACtD,IACE,MAAM,CAAC,UAAU,KAAK,SAAS;eAC5B,MAAM,CAAC,oBAAoB,KAAK,SAAS;eACzC,MAAM,CAAC,iBAAiB,KAAK,SAAS;eACtC,MAAM,CAAC,QAAQ,KAAK,SAAS;YAChC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACpB,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS;YAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACrF,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,SAAS,CAAC,GAAW,EAAE,MAAc,EAAE,KAAa;QAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACpB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAO,SAAS,CAAC;QACrE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;QAC9C,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IAEO,SAAS,CAAC,MAAkC,EAAE,MAAc,EAAE,KAAa;QACjF,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;YAC7C,CAAC,CAAC,MAAM,CAAC,WAAW;YACpB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3D,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC;YACvF,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAuB,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;YAC3F,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;gBACzC,OAAO,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAuB,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACvF,CAAC;YACD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACnC,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS;YAAE,OAAO,WAAW,CAAC;QACnD,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAwB,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAChF,CAAC;IAEO,UAAU,CAChB,MAAkC,EAClC,MAAc,EACd,KAAa,EACb,cAAuB;QAEvB,MAAM,YAAY,GAAG,GAAG,MAAM,IAAI,CAAC;QACnC,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9E,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;YACrD,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC;YAC5E,CAAC,CAAC,EAAE,CAAC,CAAC;QACR,MAAM,OAAO,GAA0C,EAAE,CAAC;QAC1D,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,QAA2B,EAAE,YAAY,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YAC7E,MAAM,GAAG,GAAG,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,QAA2B,CAAC,CAAC;YAChF,OAAO,CAAC,IAAI,CAAC;gBACX,GAAG,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC;gBACrC,IAAI,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,EAAE;aACtE,CAAC,CAAC;QACL,CAAC;QACD,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,IAAI,cAAc,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC7C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC/D,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAA2B,EAAE,YAAY,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;YACnF,CAAC;QACH,CAAC;QACD,IAAI,cAAc,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAChD,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,YAAY,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;QACnF,CAAC;aAAM,IAAI,MAAM,CAAC,oBAAoB,KAAK,IAAI,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC;QACD,IAAI,UAAU,CAAC,MAAM;YAAE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,kBAAkB,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;QACrF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,MAAM,CAAC,oBAAoB,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,yBAAyB,CAAC;QAC1G,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACvF,MAAM,MAAM,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACxE,IAAI,MAAM,CAAC,MAAM,IAAI,yBAAyB;gBAAE,OAAO,MAAM,CAAC;QAChE,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACnC,GAAG,MAAM,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,YAAY,GAAG,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;QACzG,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,GAAG,CAAC;IAC9C,CAAC;CACF;AAED,8CAA8C;AAC9C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,MAAc,EAAU,EAAE,CAClE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC"}

package/package.json

@@ -2,7 +2,7 @@
   "author": "Task Venture Capital GmbH",
   "license": "MIT",
   "name": "@modelprofile.com/flexharness",
-  "version": "10.12.0",
+  "version": "10.13.0",
   "type": "module",
   "description": "Managed agent sessions with tools, MCP, chat, OCR, documents and browser control through focused subpath imports.",
   "main": "./dist_ts/index.js",
@@ -74,8 +74,9 @@
     }
   },
   "dependencies": {
-    "@modelprofile.com/flexharness-agent": "10.12.0",
-    "@modelprofile.com/flexharness-models": "10.12.0",
+    "@cfworker/json-schema": "^4.1.1",
+    "@modelprofile.com/flexharness-agent": "10.13.0",
+    "@modelprofile.com/flexharness-models": "10.13.0",
     "@push.rocks/smartrequest": "^5.5.1",
     "ai": "^7.0.111",
     "zod": "^4.6.5"

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@modelprofile.com/flexharness',
-  version: '10.12.0',
+  version: '10.13.0',
   description: 'The FlexHarness toolbox source repository and shared dependency catalog.'
 }

package/ts/classes.flexharness.ts

@@ -29,7 +29,13 @@ import {
   FLEX_REVERSION_WORKSPACE_ID_MAX_BYTES,
   FLEX_REVERSION_WORKSPACE_LABEL_MAX_BYTES,
   FLEX_SESSION_IMPORT_MAX_DEPTH,
+  FLEX_TOOL_CATALOG_TOOL_NAMES,
 } from './interfaces.js';
+import {
+  FlexToolCatalog,
+  assertNoCatalogCollisions,
+  catalogToolInputSchema,
+} from './classes.toolcatalog.js';
 import type {
   IFlexAgentContextCompactionOptions,
   IFlexAgentContextInvocation,
@@ -112,6 +118,9 @@ import type {
   IFlexSubagentDefinition,
   IFlexSubagentProvenance,
   IFlexTerminalProjection,
+  IFlexCatalogDescribeInput,
+  IFlexCatalogSearchInput,
+  IFlexToolCatalogOptions,
   IFlexToolHandle,
   IFlexToolMessagePart,
   IFlexToolProviderContext,
@@ -168,6 +177,7 @@ import {
   normalizeAgentSessionPolicy,
   normalizeBuiltInTools,
   normalizeSlashCommands,
+  normalizeToolCatalogOptions,
   normalizeSubagents,
   requireHarnessStores,
   resolveBoundedPositiveInteger,
@@ -431,6 +441,10 @@ interface IActiveRun {
   reservedUserMessage?: IFlexMessage;
   reservedAssistantMessage?: IFlexMessage;
   modelResolution?: IFlexResolvedModel;
+  /** The tool-provider context of the run, passed to catalog methods. */
+  toolProviderContext?: Readonly<IFlexToolProviderContext<unknown>>;
+  /** The catalog methods the run offers through search_tools, describe_tools and execute. */
+  toolCatalog?: FlexToolCatalog<unknown>;
   subagents: ReadonlyMap<string, Readonly<IFlexSubagentDefinition>>;
   allowedTools?: readonly string[];
   agentAllowedTools?: readonly string[];
@@ -851,6 +865,7 @@ export class FlexHarness<TScope = unknown> {
   private readonly externalErrorProjector?: TFlexExternalErrorProjector;
   private readonly subagents: ReadonlyMap<string, Readonly<IFlexSubagentDefinition>>;
   private readonly builtInTools: INormalizedBuiltInTools;
+  private readonly toolCatalogOptions: Readonly<Required<IFlexToolCatalogOptions>>;
   private readonly slashCommands: ReadonlyMap<string, TRegisteredSlashCommand<TScope>>;
   private readonly maxSubagentDepth: number;
   private readonly maxSubagentCallsPerRun: number;
@@ -937,6 +952,7 @@ export class FlexHarness<TScope = unknown> {
     this.externalErrorProjector = options.externalErrorProjector;
     this.subagents = normalizeSubagents(options.subagents);
     this.builtInTools = normalizeBuiltInTools(options.builtInTools);
+    this.toolCatalogOptions = normalizeToolCatalogOptions(options.toolCatalog);
     this.slashCommands = normalizeSlashCommands(options.slashCommands);
     this.maxSubagentDepth = resolveBoundedPositiveInteger(
       options.maxSubagentDepth,
@@ -5823,18 +5839,37 @@ export class FlexHarness<TScope = unknown> {
       }
       signal.throwIfAborted();
       run.modelResolution = model!;
+      run.toolProviderContext = toolProviderContext as Readonly<IFlexToolProviderContext<unknown>>;
+      let catalog: FlexToolCatalog<unknown> | undefined;
+      if (toolHandle?.catalog) {
+        try {
+          catalog = await FlexToolCatalog.create(toolHandle.catalog, this.toolCatalogOptions);
+        } catch (error) {
+          throw this.projectExternalError(run, error, 'toolProvider');
+        }
+        signal.throwIfAborted();
+      }
       let tools: TFlexAgentToolSet | undefined;
       try {
         const providedTools = toolHandle?.tools;
         const combinedTools: Record<string, unknown> = { ...(providedTools ?? {}) };
         Object.assign(combinedTools, this.createBuiltInTools(run));
+        if (catalog) assertNoCatalogCollisions(catalog, combinedTools);
         const globalNames = run.allowedTools === undefined ? undefined : new Set(run.allowedTools);
         const agentNames = run.agentAllowedTools === undefined ? undefined : new Set(run.agentAllowedTools);
+        const admitted = (name: string): boolean =>
+          (globalNames === undefined || globalNames.has(name))
+          && (agentNames === undefined || agentNames.has(name));
         const admittedTools = globalNames === undefined && agentNames === undefined
           ? combinedTools
-          : Object.fromEntries(Object.entries(combinedTools).filter(([name]) =>
-              (globalNames === undefined || globalNames.has(name))
-              && (agentNames === undefined || agentNames.has(name))));
+          : Object.fromEntries(Object.entries(combinedTools).filter(([name]) => admitted(name)));
+        const admittedCatalog = catalog && (globalNames === undefined && agentNames === undefined
+          ? catalog
+          : catalog.restrict(catalog.methods.filter(admitted)));
+        if (admittedCatalog && admittedCatalog.methods.length > 0) {
+          run.toolCatalog = admittedCatalog;
+          Object.assign(admittedTools, this.createCatalogTools(run, admittedCatalog));
+        }
         tools = Object.keys(admittedTools).length > 0
           ? wrapToolSet(
               admittedTools as TFlexAgentToolSet,
@@ -5913,6 +5948,59 @@ export class FlexHarness<TScope = unknown> {
     }
   }
 
+  /**
+   * search_tools, describe_tools and execute. `execute` validates the call and runs the method
+   * inside this tool call, so the tool wrapper bounds its output and projects its errors, and the
+   * call's part, events and permission requests carry the method's path.
+   */
+  private createCatalogTools(run: IActiveRun, catalog: FlexToolCatalog<unknown>): Record<string, unknown> {
+    const names = FLEX_TOOL_CATALOG_TOOL_NAMES;
+    const definitions = catalog.toolDefinitions();
+    const describeBytes = Math.max(1024, this.toolOutputLimits.maxBytes - 1024);
+    return {
+      [names.search]: plugins.tool({
+        description: definitions[names.search].description,
+        strict: false,
+        inputSchema: catalogToolInputSchema<IFlexCatalogSearchInput>(definitions[names.search]),
+        execute: async (input: IFlexCatalogSearchInput) => catalog.search(input),
+      }),
+      [names.describe]: plugins.tool({
+        description: definitions[names.describe].description,
+        strict: false,
+        inputSchema: catalogToolInputSchema<IFlexCatalogDescribeInput>(definitions[names.describe]),
+        execute: async (input: IFlexCatalogDescribeInput, options?: { messages?: plugins.ModelMessage[] }) =>
+          catalog.describe(input, {
+            declaredTypes: catalog.declaredTypesIn(options?.messages),
+            maxBytes: describeBytes,
+          }).output,
+      }),
+      [names.execute]: plugins.tool({
+        description: definitions[names.execute].description,
+        strict: false,
+        inputSchema: catalogToolInputSchema<{ method: string; params?: Record<string, unknown> }>(
+          definitions[names.execute],
+        ),
+        execute: async (
+          input: { method: string; params?: Record<string, unknown> },
+          options?: { toolCallId?: string; abortSignal?: AbortSignal },
+        ) => {
+          const call = await catalog.prepareCall(input.method, input.params);
+          if (!call.success) {
+            const error = this.trustInternalError(new FlexHarnessValidationError(JSON.stringify(call.error)));
+            if (options?.toolCallId) run.trustedToolExecutionErrors.set(options.toolCallId, error);
+            throw error;
+          }
+          return call.run({
+            method: call.method,
+            toolCallId: options?.toolCallId ?? '',
+            abortSignal: options?.abortSignal ?? run.controller.signal,
+            provider: run.toolProviderContext!,
+          });
+        },
+      }),
+    };
+  }
+
   private createBuiltInTools(run: IActiveRun): Record<string, unknown> {
     const tools: Record<string, unknown> = {};
     if (run.subagents.size > 0 && (run.stored.session.depth ?? 0) < this.maxSubagentDepth) {
@@ -8422,13 +8510,17 @@ export class FlexHarness<TScope = unknown> {
     const run = this.callbackRun(state, sessionId);
     if (!run || run.toolPartIds.has(event.toolCallId)) return;
     try {
-      const input = normalizeJsonValue(event.input, this.toolOutputLimits);
+      // An execute call is the call of the catalog method it names.
+      const target = event.toolName === FLEX_TOOL_CATALOG_TOOL_NAMES.execute
+        ? run.toolCatalog?.callTarget(event.input)
+        : undefined;
+      const input = normalizeJsonValue(target ? target.params : event.input, this.toolOutputLimits);
       if (!this.reserveCallbackCapacity(run, 1, jsonBytes(input), 1)) return;
       const part: IFlexToolMessagePart = {
         partId: plugins.crypto.randomUUID(),
         type: 'tool',
         toolCallId: this.boundedIdentifier(event.toolCallId, 'toolCallId'),
-        toolName: this.boundedIdentifier(event.toolName, 'toolName'),
+        toolName: this.boundedIdentifier(target ? target.method : event.toolName, 'toolName'),
         status: 'running',
         input,
         startedAt: new Date().toISOString(),
@@ -9129,9 +9221,14 @@ export class FlexHarness<TScope = unknown> {
       }
       const tools = handle.tools;
       this.assertNoBuiltInToolCollisions(run, tools);
+      const catalog = handle.catalog;
+      if (catalog !== undefined && (typeof catalog !== 'object' || catalog === null)) {
+        throw new FlexHarnessValidationError('Tool handle catalog must be an object.');
+      }
       const closeHandle = close;
       return {
         tools,
+        ...(catalog === undefined ? {} : { catalog }),
         ...(closeHandle ? { close: () => closeHandle.call(handle) } : {}),
       };
     } catch (error) {
@@ -9218,6 +9315,9 @@ export class FlexHarness<TScope = unknown> {
         );
         if (!handle) continue;
         owned.push({ handle, closed: false });
+        if (handle.catalog !== undefined) {
+          throw new FlexHarnessValidationError('Resource tool providers cannot supply a tool catalog.');
+        }
         for (const [toolName, tool] of Object.entries(handle.tools)) {
           const exposedName = createFlexResourceToolName(namespace, toolName);
           if (Object.prototype.hasOwnProperty.call(tools, exposedName)) {
@@ -9229,6 +9329,7 @@ export class FlexHarness<TScope = unknown> {
       if (owned.length === 0 && Object.keys(tools).length === 0) return undefined;
       return {
         tools: tools as TFlexAgentToolSet,
+        ...(applicationHandle?.catalog === undefined ? {} : { catalog: applicationHandle.catalog }),
         ...(owned.some((entry) => entry.handle.close) ? { close: closeOwned } : {}),
       };
     } catch (error) {