nesoi 3.0.20 → 3.1.0

package/lib/elements/entities/message/message.builder.d.ts

@@ -16,17 +16,7 @@ export declare class MessageBuilder<Space extends $Space, Module extends $Module
     private _template;
     constructor(module: string, name: string);
     as(alias: string): this;
-    template<Def extends MessageTemplateDef<Space, Module, Message['name']>>($: Def): MessageBuilder<Space, Module, $MessageInfer<Message["name"], Def, ReturnType<Def>, import("./message.infer").$MessageInputInfer<ReturnType<Def>, ReturnType<Def> extends infer T ? { [K in keyof T]: ReturnType<Def>[K] extends import("./template/message_template_field.builder").MessageTemplateFieldBuilder<any, any, infer I, any, any, infer Opt extends [undefined, undefined], infer Nul extends [null, null]> ? {
-        path: `${K & string}${keyof I & string}`;
-        data: I[keyof I];
-        opt: Opt[0];
-        nul: Nul[0];
-    } : never; } : never>, import("./message.infer").$MessageOutputInfer<ReturnType<Def>, ReturnType<Def> extends infer T_1 ? { [K_1 in keyof T_1]: ReturnType<Def>[K_1] extends import("./template/message_template_field.builder").MessageTemplateFieldBuilder<any, any, any, infer O, any, infer Opt_1 extends [undefined, undefined], infer Nul_1 extends [null, null]> ? {
-        path: `${K_1 & string}${keyof O & string}`;
-        data: O[keyof O];
-        opt: Opt_1[1];
-        nul: Nul_1[1];
-    } : never; } : never>>>;
+    template<Def extends MessageTemplateDef<Space, Module, Message['name']>>($: Def): MessageBuilder<Space, Module, $MessageInfer<Message["name"], Def, ReturnType<Def>, import("./message.infer").$MessageInputInfer<ReturnType<Def>>, import("./message.infer").$MessageOutputInfer<ReturnType<Def>>>>;
     static build(node: MessageBuilderNode, tree: ModuleTree, module: $Module): $Message;
     static buildInlines(node: ResolvedBuilderNode, tree: ModuleTree, module: $Module): Record<string, $Message>;
 }

package/lib/elements/entities/message/message.builder.js

@@ -21,8 +21,8 @@ class MessageBuilder {
         return this;
     }
     template($) {
-        const fieldBuilder = new message_template_field_builder_1.MessageTemplateFieldFactory(this.module);
-        const fields = $(fieldBuilder);
+        const factory = new message_template_field_builder_1.MessageTemplateFieldFactory(this.module);
+        const fields = $(factory);
         this._template.fields(fields);
         return this;
     }

package/lib/elements/entities/message/message.infer.d.ts

@@ -2,39 +2,15 @@ import { MessageTemplateFieldBuilder, MessageTemplateFieldBuilders } from './tem
 import { MessageTemplateDef } from './template/message_template.builder';
 import { $Module } from "../../../schema";
 import { $Message } from './message.schema';
-export type $MessageInputInfer<Builder, Fields extends Record<string, {
-    path: any;
-    data: any;
-    opt: any;
-    nul: any;
-}> = {
-    [K in keyof Builder]: Builder[K] extends MessageTemplateFieldBuilder<any, any, infer I, any, any, infer Opt, infer Nul> ? {
-        path: `${K & string}${keyof I & string}`;
-        data: I[keyof I];
-        opt: Opt[0];
-        nul: Nul[0];
-    } : never;
-}> = {
-    [K in keyof Fields as Fields[K]['opt'] extends never ? Fields[K]['path'] : never]: Fields[K]['data'] | Fields[K]['nul'];
+export type $MessageInputInfer<Fields extends MessageTemplateFieldBuilders> = {
+    [K in keyof Fields as Fields[K]['#optional'][0] extends true ? never : `${K & string}${Fields[K]['#input_suffix']}`]: Fields[K]['#input'];
 } & {
-    [K in keyof Fields as Fields[K]['opt'] extends never ? never : Fields[K]['path']]?: Fields[K]['data'] | Fields[K]['nul'];
+    [K in keyof Fields as Fields[K]['#optional'][0] extends true ? `${K & string}${Fields[K]['#input_suffix']}` : never]?: Fields[K]['#input'];
 };
-export type $MessageOutputInfer<Builder, Fields extends Record<string, {
-    path: any;
-    data: any;
-    opt: any;
-    nul: any;
-}> = {
-    [K in keyof Builder]: Builder[K] extends MessageTemplateFieldBuilder<any, any, any, infer O, any, infer Opt, infer Nul> ? {
-        path: `${K & string}${keyof O & string}`;
-        data: O[keyof O];
-        opt: Opt[1];
-        nul: Nul[1];
-    } : never;
-}> = {
-    [K in keyof Fields as Fields[K]['opt'] extends never ? Fields[K]['path'] : never]: Fields[K]['data'] | Fields[K]['nul'];
+export type $MessageOutputInfer<Fields extends MessageTemplateFieldBuilders> = {
+    [K in keyof Fields as Fields[K]['#optional'][1] extends true ? never : K]: Fields[K]['#output'];
 } & {
-    [K in keyof Fields as Fields[K]['opt'] extends never ? never : Fields[K]['path']]?: Fields[K]['data'] | Fields[K]['nul'];
+    [K in keyof Fields as Fields[K]['#optional'][1] extends true ? K : never]?: Fields[K]['#output'];
 };
 export interface $MessageInfer<Name extends string, Def extends MessageTemplateDef<any, any, any>, Builders extends MessageTemplateFieldBuilders = ReturnType<Def>, Raw = $MessageInputInfer<Builders>, Parsed = $MessageOutputInfer<Builders>> extends $Message {
     name: Name;

package/lib/elements/entities/message/message.schema.js

@@ -25,7 +25,7 @@ class $Message {
                 if (field.type === 'id') {
                     str += `(${field.meta.id.bucket.refName})`;
                 }
-                if (field.type === 'enum') {
+                else if (field.type === 'enum') {
                     const options = field.meta.enum.options;
                     if (typeof options === 'object') {
                         str += `(${Object.keys(options)})`;
@@ -34,7 +34,7 @@ class $Message {
                         str += `(${options})`;
                     }
                 }
-                if (field.array) {
+                else if (field.type === 'list') {
                     str += '[]';
                 }
                 str += '\n';

package/lib/elements/entities/message/message_parser.d.ts

@@ -11,6 +11,5 @@ export declare class MessageParser<$ extends $Message> {
     constructor(schema: $);
     static parseWithTrxModule(trx: AnyTrxNode, raw: RawMessageInput<any, any>, sigKey?: string): Promise<any>;
     parse(trx: AnyTrxNode, raw: $['#raw'], sigKey?: string): Promise<Message<$>>;
-    private sanitize;
 }
 export type AnyMessageParser = MessageParser<$Message>;

package/lib/elements/entities/message/message_parser.js

@@ -28,78 +28,11 @@ class MessageParser {
         }
         return parser.parse(trx, raw, sigKey);
     }
-    // TODO: OPTIMIZATION
-    // Parse everything that's static first, then move on to
-    // parsing ids etc.
     async parse(trx, raw, sigKey) {
         log_1.Log.debug('trx', trx.globalId, `${(0, log_1.scopeTag)('message', this.schema.name)} Parse${sigKey ? ' (signed)' : ''}`, raw);
-        const applyFieldRules = async (field, parent, value, path) => {
-            // Apply rules to the field
-            // If field is an array, the value passed to the rule is the array itself
-            for (const r in field.rules) {
-                const rule = field.rules[r];
-                const res = await rule({ field, value, path: path.join('.'), msg: parsed });
-                if (typeof res === 'object') {
-                    parent[path.at(-1)] = res.set;
-                }
-                else if (res !== true) {
-                    throw error_1.NesoiError.Message.RuleFailed({ rule, error: res });
-                }
-            }
-            if (!value)
-                return;
-            if (field.type === 'obj') {
-                if (field.array) {
-                    for (let i = 0; i < value?.length; i++) {
-                        await applyRules(field.children, value[i] || {}, [...path, i.toString()]);
-                    }
-                }
-                else {
-                    await applyRules(field.children, value || {}, path);
-                }
-            }
-            else if (field.type === 'dict') {
-                if (field.array) {
-                    for (let i = 0; i < value?.length; i++) {
-                        for (const k in value[i]) {
-                            await applyFieldRules(field.children.__dict, value[i], value[i][k], [...path, i.toString(), k]);
-                        }
-                    }
-                }
-                else {
-                    for (const k in value) {
-                        await applyFieldRules(field.children.__dict, value, value[k], [...path, k]);
-                    }
-                }
-            }
-        };
-        const applyRules = async (fields, parent, path = []) => {
-            for (const f in fields) {
-                const field = fields[f];
-                const value = parent[field.name];
-                const _path = [...path, field.name];
-                await applyFieldRules(field, parent, value, _path);
-            }
-        };
         const fields = this.schema.template.fields;
-        const parsed = {};
-        for (const k in fields) {
-            const field = fields[k];
-            const key_raw = field.path_raw.split('.')[0];
-            const key_parsed = field.path_parsed.split('.')[0];
-            const value = raw[key_raw];
-            this.sanitize(value);
-            parsed[key_parsed] = await (0, message_template_parser_1.MessageTemplateFieldParser)(raw, trx, field, value);
-        }
-        await applyRules(this.schema.template.fields, parsed);
+        const parsed = await (0, message_template_parser_1.MessageTemplateFieldParser)(trx, fields, raw);
         return message_1.Message.new(this.schema.name, parsed, sigKey);
     }
-    sanitize(value) {
-        if (typeof value === 'function') {
-            throw error_1.NesoiError.Message.UnsanitaryValue({
-                details: 'Functions not allowed as message inputs.'
-            });
-        }
-    }
 }
 exports.MessageParser = MessageParser;

package/lib/elements/entities/message/template/message_template.builder.js

@@ -17,7 +17,7 @@ class MessageTemplateBuilder {
     }
     /// Build
     static build(builder, tree, module) {
-        const fields = message_template_field_builder_1.MessageTemplateFieldBuilder.buildChildren(builder._fields, tree, module);
+        const fields = message_template_field_builder_1.MessageTemplateFieldBuilder.buildMany(builder._fields, tree, module);
         return new message_template_schema_1.$MessageTemplate(fields);
     }
 }

package/lib/elements/entities/message/template/message_template.schema.d.ts

@@ -6,6 +6,7 @@ export type $MessageTemplateRule = (def: {
     path: string;
     value: any;
     msg: $Message['#raw'];
+    inject: Record<string, any>;
 }) => {
     set: any;
 } | true | string | Promise<{
@@ -47,17 +48,15 @@ export declare class $MessageTemplateField {
     /** A human name for the field */
     alias: string;
     /** The absolute path for reading the field value on the raw object */
-    path_raw: string;
+    pathRaw: string;
     /** The absolute path for writing the field value on the parsed object */
-    path_parsed: string;
-    array: boolean;
+    pathParsed: string;
     required: boolean;
     defaultValue: any;
     nullable: boolean;
     rules: $MessageTemplateRule[];
     meta: $MessageTemplateFieldMeta;
     children?: $MessageTemplateFields | undefined;
-    or?: $MessageTemplateField | undefined;
     '#raw': unknown;
     '#parsed': unknown;
     $t: string;
@@ -72,9 +71,14 @@ export declare class $MessageTemplateField {
     /** A human name for the field */
     alias: string, 
     /** The absolute path for reading the field value on the raw object */
-    path_raw: string, 
+    pathRaw: string, 
     /** The absolute path for writing the field value on the parsed object */
-    path_parsed: string, array: boolean, required: boolean, defaultValue: any, nullable: boolean, rules: $MessageTemplateRule[], meta: $MessageTemplateFieldMeta, children?: $MessageTemplateFields | undefined, or?: $MessageTemplateField | undefined);
+    pathParsed: string, required: boolean, defaultValue: any, nullable: boolean, rules: $MessageTemplateRule[], meta: $MessageTemplateFieldMeta, children?: $MessageTemplateFields | undefined);
+    /**
+     * Warning: this does not clone the field's children or union.
+     * @returns
+     */
+    static clone(schema: $MessageTemplateField): $MessageTemplateField;
 }
 export type $MessageTemplateFields = {
     [x: string]: $MessageTemplateField;
@@ -88,4 +92,5 @@ export declare class $MessageTemplate {
     $t: string;
     constructor(fields?: $MessageTemplateFields);
     static fieldsOfType(template: $MessageTemplate, type: $MessageTemplateFieldType): $MessageTemplateField[];
+    static forEachField(template: $MessageTemplate, predicate: (field: $MessageTemplateField, path: string) => void): void;
 }

package/lib/elements/entities/message/template/message_template.schema.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.$MessageTemplate = exports.$MessageTemplateField = void 0;
+const deep_1 = require("../../../../engine/util/deep");
 /**
  * @category Schemas
  * @subcategory Entity
@@ -17,24 +18,29 @@ class $MessageTemplateField {
     /** A human name for the field */
     alias, 
     /** The absolute path for reading the field value on the raw object */
-    path_raw, 
+    pathRaw, 
     /** The absolute path for writing the field value on the parsed object */
-    path_parsed, array, required, defaultValue, nullable, rules, meta, children, or) {
+    pathParsed, required, defaultValue, nullable, rules, meta, children) {
         this.type = type;
         this.name = name;
         this.alias = alias;
-        this.path_raw = path_raw;
-        this.path_parsed = path_parsed;
-        this.array = array;
+        this.pathRaw = pathRaw;
+        this.pathParsed = pathParsed;
         this.required = required;
         this.defaultValue = defaultValue;
         this.nullable = nullable;
         this.rules = rules;
         this.meta = meta;
         this.children = children;
-        this.or = or;
         this.$t = 'message.template.field';
     }
+    /**
+     * Warning: this does not clone the field's children or union.
+     * @returns
+     */
+    static clone(schema) {
+        return new $MessageTemplateField(schema.type, schema.name, schema.alias, schema.pathRaw, schema.pathParsed, schema.required, schema.defaultValue, schema.nullable, [...schema.rules], deep_1.Deep.copy(schema.meta), undefined);
+    }
 }
 exports.$MessageTemplateField = $MessageTemplateField;
 /**
@@ -63,5 +69,22 @@ class $MessageTemplate {
         }
         return fields;
     }
+    static forEachField(template, predicate) {
+        let poll = Object.entries(template.fields).map(([path, field]) => ({ path, field }));
+        while (poll.length) {
+            const next = [];
+            for (const obj of poll) {
+                predicate(obj.field, obj.path);
+                if (obj.field.children) {
+                    next.push(...Object.values(obj.field.children)
+                        .map((field, i) => ({
+                        field,
+                        path: obj.path + '.' + (obj.field.type === 'union' ? i : field.name)
+                    })));
+                }
+            }
+            poll = next;
+        }
+    }
 }
 exports.$MessageTemplate = $MessageTemplate;

package/lib/elements/entities/message/template/message_template_field.builder.d.ts

@@ -4,7 +4,6 @@ import { $MessageInputInfer, $MessageOutputInfer, $MessageTemplateBuilderInfer }
 import { NesoiDate } from "../../../../engine/data/date";
 import { $Message } from '../message.schema';
 import { ModuleTree } from "../../../../engine/tree";
-import { NesoiObj } from "../../../../engine/data/obj";
 import { MessageEnumpath } from '../../constants/constants.schema';
 import { NesoiDecimal } from "../../../../engine/data/decimal";
 import { NesoiDatetime } from "../../../../engine/data/datetime";
@@ -18,235 +17,83 @@ export declare class MessageTemplateFieldFactory<Space extends $Space, Module ex
     private module;
     private alias?;
     constructor(module: string);
+    /**
+     * Specifies an alias for the field.
+    */
     as(alias: string): Omit<typeof this, "as">;
-    get any(): MessageTemplateFieldBuilder<Module, Message, {
-        '': any;
-    }, {
-        '': any;
-    }, {}, [never, never], [never, never]>;
-    ts<T = any>(): MessageTemplateFieldBuilder<Module, Message, {
-        '': T;
-    }, {
-        '': T;
-    }, {}, [never, never], [never, never]>;
-    get boolean(): MessageTemplateFieldBuilder<Module, Message, {
-        '': boolean;
-    }, {
-        '': boolean;
-    }, {}, [never, never], [never, never]>;
-    get date(): MessageTemplateFieldBuilder<Module, Message, {
-        '': string;
-    }, {
-        '': NesoiDate;
-    }, {}, [never, never], [never, never]>;
-    get datetime(): MessageTemplateFieldBuilder<Module, Message, {
-        '': string;
-    }, {
-        '': NesoiDatetime;
-    }, {}, [never, never], [never, never]>;
-    get duration(): MessageTemplateFieldBuilder<Module, Message, {
-        '': string;
-    }, {
-        '': NesoiDuration;
-    }, {}, [never, never], [never, never]>;
-    decimal(config?: $MessageTemplateFieldMeta['decimal']): MessageTemplateFieldBuilder<Module, Message, {
-        '': string;
-    }, {
-        '': NesoiDecimal;
-    }, {}, [never, never], [never, never]>;
-    enum<Enumpaths extends MessageEnumpath<Module, Module['messages'][MsgName], Space['modules']>, Options extends (keyof Enumpaths & string) | readonly string[] | Record<string, any>>(options: Options): MessageTemplateFieldBuilder<Module, Message, {
-        '': (Options extends string ? keyof Enumpaths[Options & keyof Enumpaths]["options" & keyof Enumpaths[Options & keyof Enumpaths]] : Options extends (infer X)[] | readonly (infer X)[] ? X : keyof Options) & string;
-    }, {
-        '': (Options extends string ? keyof Enumpaths[Options & keyof Enumpaths]["options" & keyof Enumpaths[Options & keyof Enumpaths]] : Options extends (infer X)[] | readonly (infer X)[] ? X : keyof Options) & string;
-    }, {}, [never, never], [never, never]>;
-    file(config?: $MessageTemplateFieldMeta['file']): MessageTemplateFieldBuilder<Module, Message, {
-        '': NesoiFile;
-    }, {
-        '': NesoiFile;
-    }, {}, [never, never], [never, never]>;
-    get float(): MessageTemplateFieldBuilder<Module, Message, {
-        '': number;
-    }, {
-        '': number;
-    }, {}, [never, never], [never, never]>;
-    id<Name extends BucketName<Module>, View extends ViewName<Module['buckets'][Name]> | undefined>(bucket: Name, view?: View): MessageTemplateFieldBuilder<Module, Message, {
-        _id: (Module["buckets"][Name]["#data"] & NesoiObj)["id"];
-    }, {
-        '': undefined extends View ? Module["buckets"][Name]["#data"] : Module["buckets"][Name]["views"][NonNullable<View>]["#data"];
-    }, {}, [never, never], [never, never]>;
-    get int(): MessageTemplateFieldBuilder<Module, Message, {
-        '': number;
-    }, {
-        '': number;
-    }, {}, [never, never], [never, never]>;
-    get string(): MessageTemplateFieldBuilder<Module, Message, {
-        '': string;
-    }, {
-        '': string;
-    }, {}, [never, never], [never, never]>;
-    get string_or_number(): MessageTemplateFieldBuilder<Module, Message, {
-        '': string | number;
-    }, {
-        '': string | number;
-    }, {}, [never, never], [never, never]>;
-    obj<Builders extends MessageTemplateFieldBuilders>(children: Builders): MessageTemplateFieldBuilder<Module, Message, {
-        '': $MessageInputInfer<Builders>;
-    }, {
-        '': $MessageOutputInfer<Builders>;
-    }, Builders, [never, never], [never, never]>;
-    dict<Builder extends MessageTemplateFieldBuilder<Module, Message, any, any, any>>(item: Builder): MessageTemplateFieldBuilder<Module, Message, {
-        '': Record<string, Builder extends MessageTemplateFieldBuilder<any, any, infer X, any, any, [never, never], [never, never]> ? X[keyof X] : never>;
-    }, {
-        '': Record<string, Builder extends MessageTemplateFieldBuilder<any, any, any, infer X_1, any, [never, never], [never, never]> ? X_1[keyof X_1] : never>;
-    }, {
+    get any(): MessageTemplateFieldBuilder<Module, Message, any, any, {}, [false, false], "">;
+    ts<T = any>(): MessageTemplateFieldBuilder<Module, Message, T, T, {}, [false, false], "">;
+    get boolean(): MessageTemplateFieldBuilder<Module, Message, boolean, boolean, {}, [false, false], "">;
+    get date(): MessageTemplateFieldBuilder<Module, Message, string, NesoiDate, {}, [false, false], "">;
+    get datetime(): MessageTemplateFieldBuilder<Module, Message, string, NesoiDatetime, {}, [false, false], "">;
+    get duration(): MessageTemplateFieldBuilder<Module, Message, string, NesoiDuration, {}, [false, false], "">;
+    decimal(config?: $MessageTemplateFieldMeta['decimal']): MessageTemplateFieldBuilder<Module, Message, string, NesoiDecimal, {}, [false, false], "">;
+    enum<Enumpaths extends MessageEnumpath<Module, Module['messages'][MsgName], Space['modules']>, Options extends (keyof Enumpaths & string) | readonly string[] | Record<string, any>>(options: Options): MessageTemplateFieldBuilder<Module, Message, (Options extends string ? keyof Enumpaths[Options & keyof Enumpaths]["options" & keyof Enumpaths[Options & keyof Enumpaths]] : Options extends (infer X)[] | readonly (infer X)[] ? X : keyof Options) & string, (Options extends string ? keyof Enumpaths[Options & keyof Enumpaths]["options" & keyof Enumpaths[Options & keyof Enumpaths]] : Options extends (infer X)[] | readonly (infer X)[] ? X : keyof Options) & string, {}, [false, false], "">;
+    file(config?: $MessageTemplateFieldMeta['file']): MessageTemplateFieldBuilder<Module, Message, NesoiFile, NesoiFile, {}, [false, false], "">;
+    get float(): MessageTemplateFieldBuilder<Module, Message, number, number, {}, [false, false], "">;
+    id<Name extends BucketName<Module>, View extends ViewName<Module['buckets'][Name]> | undefined>(bucket: Name, view?: View): MessageTemplateFieldBuilder<Module, Message, Module["buckets"][Name]["#data"]["id"], undefined extends View ? Module["buckets"][Name]["#data"] : Module["buckets"][Name]["views"][NonNullable<View>]["#data"], {}, [false, false], "_id">;
+    get int(): MessageTemplateFieldBuilder<Module, Message, number, number, {}, [false, false], "">;
+    get string(): MessageTemplateFieldBuilder<Module, Message, string, string, {}, [false, false], "">;
+    get string_or_number(): MessageTemplateFieldBuilder<Module, Message, string | number, string | number, {}, [false, false], "">;
+    obj<Builders extends MessageTemplateFieldBuilders>(children: Builders): MessageTemplateFieldBuilder<Module, Message, $MessageInputInfer<Builders>, $MessageOutputInfer<Builders>, Builders, [false, false], "">;
+    dict<Builder extends MessageTemplateFieldBuilder<Module, Message, any, any, any, any, any>>(item: Builder): MessageTemplateFieldBuilder<Module, Message, Record<string, Builder["#input"]>, Record<string, Builder["#output"]>, {
         __dict: Builder;
-    }, [never, never], [never, never]>;
-    msg<MessageName extends keyof Module['messages'], Message extends Module['messages'][MessageName], Builders extends MessageTemplateFieldBuilders>(msg: MessageName, extra: Builders): MessageTemplateFieldBuilder<Module, Message, {
-        '': Omit<Message["#raw"], "$"> & {
-            $: any;
-        } & { [K_1 in keyof { [K in keyof Builders]: Builders[K] extends MessageTemplateFieldBuilder<any, any, infer I, any, any, infer Opt extends [undefined, undefined], infer Nul extends [null, null]> ? {
-            path: `${K & string}${keyof I & string}`;
-            data: I[keyof I];
-            opt: Opt[0];
-            nul: Nul[0];
-        } : never; } as { [K in keyof Builders]: Builders[K] extends MessageTemplateFieldBuilder<any, any, infer I, any, any, infer Opt extends [undefined, undefined], infer Nul extends [null, null]> ? {
-            path: `${K & string}${keyof I & string}`;
-            data: I[keyof I];
-            opt: Opt[0];
-            nul: Nul[0];
-        } : never; }[K_1]["opt"] extends never ? { [K in keyof Builders]: Builders[K] extends MessageTemplateFieldBuilder<any, any, infer I, any, any, infer Opt extends [undefined, undefined], infer Nul extends [null, null]> ? {
-            path: `${K & string}${keyof I & string}`;
-            data: I[keyof I];
-            opt: Opt[0];
-            nul: Nul[0];
-        } : never; }[K_1]["path"] : never]: { [K in keyof Builders]: Builders[K] extends MessageTemplateFieldBuilder<any, any, infer I, any, any, infer Opt extends [undefined, undefined], infer Nul extends [null, null]> ? {
-            path: `${K & string}${keyof I & string}`;
-            data: I[keyof I];
-            opt: Opt[0];
-            nul: Nul[0];
-        } : never; }[K_1]["data"] | { [K in keyof Builders]: Builders[K] extends MessageTemplateFieldBuilder<any, any, infer I, any, any, infer Opt extends [undefined, undefined], infer Nul extends [null, null]> ? {
-            path: `${K & string}${keyof I & string}`;
-            data: I[keyof I];
-            opt: Opt[0];
-            nul: Nul[0];
-        } : never; }[K_1]["nul"]; } & { [K_2 in keyof { [K in keyof Builders]: Builders[K] extends MessageTemplateFieldBuilder<any, any, infer I, any, any, infer Opt extends [undefined, undefined], infer Nul extends [null, null]> ? {
-            path: `${K & string}${keyof I & string}`;
-            data: I[keyof I];
-            opt: Opt[0];
-            nul: Nul[0];
-        } : never; } as { [K in keyof Builders]: Builders[K] extends MessageTemplateFieldBuilder<any, any, infer I, any, any, infer Opt extends [undefined, undefined], infer Nul extends [null, null]> ? {
-            path: `${K & string}${keyof I & string}`;
-            data: I[keyof I];
-            opt: Opt[0];
-            nul: Nul[0];
-        } : never; }[K_2]["opt"] extends never ? never : { [K in keyof Builders]: Builders[K] extends MessageTemplateFieldBuilder<any, any, infer I, any, any, infer Opt extends [undefined, undefined], infer Nul extends [null, null]> ? {
-            path: `${K & string}${keyof I & string}`;
-            data: I[keyof I];
-            opt: Opt[0];
-            nul: Nul[0];
-        } : never; }[K_2]["path"]]?: { [K in keyof Builders]: Builders[K] extends MessageTemplateFieldBuilder<any, any, infer I, any, any, infer Opt extends [undefined, undefined], infer Nul extends [null, null]> ? {
-            path: `${K & string}${keyof I & string}`;
-            data: I[keyof I];
-            opt: Opt[0];
-            nul: Nul[0];
-        } : never; }[K_2]["data"] | { [K in keyof Builders]: Builders[K] extends MessageTemplateFieldBuilder<any, any, infer I, any, any, infer Opt extends [undefined, undefined], infer Nul extends [null, null]> ? {
-            path: `${K & string}${keyof I & string}`;
-            data: I[keyof I];
-            opt: Opt[0];
-            nul: Nul[0];
-        } : never; }[K_2]["nul"] | undefined; };
-    }, {
-        '': Omit<Message["#parsed"], "$"> & {
-            $: any;
-        } & { [K_4 in keyof { [K_3 in keyof Builders]: Builders[K_3] extends MessageTemplateFieldBuilder<any, any, any, infer O, any, infer Opt_1 extends [undefined, undefined], infer Nul_1 extends [null, null]> ? {
-            path: `${K_3 & string}${keyof O & string}`;
-            data: O[keyof O];
-            opt: Opt_1[1];
-            nul: Nul_1[1];
-        } : never; } as { [K_3 in keyof Builders]: Builders[K_3] extends MessageTemplateFieldBuilder<any, any, any, infer O, any, infer Opt_1 extends [undefined, undefined], infer Nul_1 extends [null, null]> ? {
-            path: `${K_3 & string}${keyof O & string}`;
-            data: O[keyof O];
-            opt: Opt_1[1];
-            nul: Nul_1[1];
-        } : never; }[K_4]["opt"] extends never ? { [K_3 in keyof Builders]: Builders[K_3] extends MessageTemplateFieldBuilder<any, any, any, infer O, any, infer Opt_1 extends [undefined, undefined], infer Nul_1 extends [null, null]> ? {
-            path: `${K_3 & string}${keyof O & string}`;
-            data: O[keyof O];
-            opt: Opt_1[1];
-            nul: Nul_1[1];
-        } : never; }[K_4]["path"] : never]: { [K_3 in keyof Builders]: Builders[K_3] extends MessageTemplateFieldBuilder<any, any, any, infer O, any, infer Opt_1 extends [undefined, undefined], infer Nul_1 extends [null, null]> ? {
-            path: `${K_3 & string}${keyof O & string}`;
-            data: O[keyof O];
-            opt: Opt_1[1];
-            nul: Nul_1[1];
-        } : never; }[K_4]["data"] | { [K_3 in keyof Builders]: Builders[K_3] extends MessageTemplateFieldBuilder<any, any, any, infer O, any, infer Opt_1 extends [undefined, undefined], infer Nul_1 extends [null, null]> ? {
-            path: `${K_3 & string}${keyof O & string}`;
-            data: O[keyof O];
-            opt: Opt_1[1];
-            nul: Nul_1[1];
-        } : never; }[K_4]["nul"]; } & { [K_5 in keyof { [K_3 in keyof Builders]: Builders[K_3] extends MessageTemplateFieldBuilder<any, any, any, infer O, any, infer Opt_1 extends [undefined, undefined], infer Nul_1 extends [null, null]> ? {
-            path: `${K_3 & string}${keyof O & string}`;
-            data: O[keyof O];
-            opt: Opt_1[1];
-            nul: Nul_1[1];
-        } : never; } as { [K_3 in keyof Builders]: Builders[K_3] extends MessageTemplateFieldBuilder<any, any, any, infer O, any, infer Opt_1 extends [undefined, undefined], infer Nul_1 extends [null, null]> ? {
-            path: `${K_3 & string}${keyof O & string}`;
-            data: O[keyof O];
-            opt: Opt_1[1];
-            nul: Nul_1[1];
-        } : never; }[K_5]["opt"] extends never ? never : { [K_3 in keyof Builders]: Builders[K_3] extends MessageTemplateFieldBuilder<any, any, any, infer O, any, infer Opt_1 extends [undefined, undefined], infer Nul_1 extends [null, null]> ? {
-            path: `${K_3 & string}${keyof O & string}`;
-            data: O[keyof O];
-            opt: Opt_1[1];
-            nul: Nul_1[1];
-        } : never; }[K_5]["path"]]?: { [K_3 in keyof Builders]: Builders[K_3] extends MessageTemplateFieldBuilder<any, any, any, infer O, any, infer Opt_1 extends [undefined, undefined], infer Nul_1 extends [null, null]> ? {
-            path: `${K_3 & string}${keyof O & string}`;
-            data: O[keyof O];
-            opt: Opt_1[1];
-            nul: Nul_1[1];
-        } : never; }[K_5]["data"] | { [K_3 in keyof Builders]: Builders[K_3] extends MessageTemplateFieldBuilder<any, any, any, infer O, any, infer Opt_1 extends [undefined, undefined], infer Nul_1 extends [null, null]> ? {
-            path: `${K_3 & string}${keyof O & string}`;
-            data: O[keyof O];
-            opt: Opt_1[1];
-            nul: Nul_1[1];
-        } : never; }[K_5]["nul"] | undefined; };
-    }, {}, [never, never], [never, never]>;
+    }, [false, false], "">;
+    list<Builder extends MessageTemplateFieldBuilder<Module, Message, any, any, any, any, any>>(item: Builder): MessageTemplateFieldBuilder<Module, Message, Builder["#input"][], Builder["#output"][], {
+        '#': Builder;
+    }, [false, false], "">;
+    union<Builders extends AnyMessageTemplateFieldBuilder[]>(...children: Builders): MessageTemplateFieldBuilder<Module, Message, Builders[number]["#input"], Builders[number]["#output"], {
+        [x: number]: Builders[number];
+    }, [false, false], "">;
+    msg<MessageName extends keyof Module['messages'], Message extends Module['messages'][MessageName], Builders extends MessageTemplateFieldBuilders>(msg: MessageName, extra?: Builders): MessageTemplateFieldBuilder<Module, Message, Omit<Message["#raw"], "$"> & {
+        $: any;
+    } & { [K in keyof Builders as Builders[K]["#optional"][0] extends true ? never : `${K & string}${Builders[K]["#input_suffix"]}`]: Builders[K]["#input"]; } & { [K_1 in keyof Builders as Builders[K_1]["#optional"][0] extends true ? `${K_1 & string}${Builders[K_1]["#input_suffix"]}` : never]?: Builders[K_1]["#input"] | undefined; }, Omit<Message["#parsed"], "$"> & {
+        $: any;
+    } & { [K_2 in keyof Builders as Builders[K_2]["#optional"][1] extends true ? never : K_2]: Builders[K_2]["#output"]; } & { [K_3 in keyof Builders as Builders[K_3]["#optional"][1] extends true ? K_3 : never]?: Builders[K_3]["#output"] | undefined; }, {}, [false, false], "">;
     extend<MsgName extends keyof Module['messages'], Builders extends MessageTemplateFieldBuilders>(name: MsgName, fields: Builders): $MessageTemplateBuilderInfer<Module, Module["messages"][MsgName], Module["messages"][MsgName]["#raw"], Module["messages"][MsgName]["#parsed"]> & Builders;
 }
 /**
  * @category Builders
  * @subcategory Entity
  * */
-export declare class MessageTemplateFieldBuilder<Module extends $Module, Message extends $Message, DefinedInput, DefinedOutput, Children extends MessageTemplateFieldBuilders, Optional extends [undefined | never, undefined | never] = [never, never], // Used to infer the message type
-Nullable extends [null | never, null | never] = [never, never]> {
+export declare class MessageTemplateFieldBuilder<Module extends $Module, Message extends $Message, Input, Output, Children extends MessageTemplateFieldBuilders, Optional = [false, false], InputSuffix extends string = ''> {
     private type;
     private value;
     private alias?;
     private children?;
-    private _array;
+    '#input': Input;
+    '#input_suffix': InputSuffix;
+    '#output': Output;
+    '#optional': Optional;
     private _required;
     private _defaultValue?;
     private _nullable;
     private _rules;
-    private _or?;
     constructor(type: $MessageTemplateFieldType, value: $MessageTemplateFieldMeta, alias?: string | undefined, children?: Children | undefined);
     as(alias: string): this;
-    get optional(): MessageTemplateFieldBuilder<Module, Message, DefinedInput, DefinedOutput, Children, [undefined, undefined], Nullable>;
-    default(value: DefinedInput[keyof DefinedInput] | Nullable[0]): MessageTemplateFieldBuilder<Module, Message, DefinedInput, DefinedOutput, Children, [undefined, never], Nullable>;
-    get nullable(): MessageTemplateFieldBuilder<Module, Message, DefinedInput, DefinedOutput, Children, Optional, [null, null]>;
-    rule(rule: MessageTemplateRuleDef<DefinedOutput[keyof DefinedOutput], Message['#raw']>): this;
-    get array(): MessageTemplateFieldBuilder<Module, Message, { [K in keyof DefinedInput]: DefinedInput[K][]; }, { [K in keyof DefinedOutput]: DefinedOutput[K][]; }, Children, Optional, Nullable>;
-    or<Def extends AnyMessageTemplateFieldBuilder>(def: Def): MessageTemplateFieldBuilder<Module, Message, { [K in keyof DefinedInput]: DefinedInput[K] | (Def extends MessageTemplateFieldBuilder<any, any, infer X, any, any, [never, never], [never, never]> ? X : never)[keyof (Def extends MessageTemplateFieldBuilder<any, any, infer X, any, any, [never, never], [never, never]> ? X : never)]; }, { [K in keyof DefinedOutput]: DefinedOutput[K] | (Def extends MessageTemplateFieldBuilder<any, any, any, infer X, any, [never, never], [never, never]> ? X : never)[keyof (Def extends MessageTemplateFieldBuilder<any, any, any, infer X, any, [never, never], [never, never]> ? X : never)]; }, Children, Optional, Nullable>;
+    get optional(): MessageTemplateFieldBuilder<Module, Message, Input | undefined, Output | undefined, Children, [
+        true,
+        true
+    ], InputSuffix>;
+    default(value: Output): MessageTemplateFieldBuilder<Module, Message, Input | undefined, Output, Children, [
+        true,
+        (Optional & [boolean, boolean])[1]
+    ], InputSuffix>;
+    get nullable(): MessageTemplateFieldBuilder<Module, Message, Input | null, Output | null, Children, Optional, InputSuffix>;
+    rule(rule: MessageTemplateRuleDef<Output, Message['#raw']>): this;
     static build(builder: AnyMessageTemplateFieldBuilder, name: string, tree: ModuleTree, module: $Module, basePathRaw: string, basePathParsed: string): $MessageTemplateField;
-    static buildChildren(fields: MessageTemplateFieldBuilders, tree: ModuleTree, module: $Module, basePathRaw?: string, basePathParsed?: string): $MessageTemplateFields;
+    static buildMany(fields: MessageTemplateFieldBuilders, tree: ModuleTree, module: $Module, basePathRaw?: string, basePathParsed?: string, name?: string, key?: string): $MessageTemplateFields;
 }
 export type MessageTemplateFieldBuilders = {
     [x: string]: AnyMessageTemplateFieldBuilder;
 };
-export type AnyMessageTemplateFieldBuilder = MessageTemplateFieldBuilder<any, any, any, any, any>;
+export type AnyMessageTemplateFieldBuilder = MessageTemplateFieldBuilder<any, any, any, any, any, any, any>;
 export type MessageTemplateRuleDef<I, Msg> = (def: {
     field: $MessageTemplateField;
+    path: string;
     value: I;
     msg: Msg;
+    inject: Record<string, any>;
 }) => {
     set: I;
 } | true | string | Promise<{