nesoi 3.0.21 → 3.1.1

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";
@@ -20,238 +19,75 @@ export declare class MessageTemplateFieldFactory<Space extends $Space, Module ex
     constructor(module: string);
     /**
      * Specifies an alias for the field.
-     * - If this field is a union (.or), this alias is used when
-     * referring to the union and it's first option.
-     * - You can specify a different alias for the first options
-     * by also using the .as() after the type
     */
     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 _arrayRules;
-    private _or?;
-    private preAlias?;
     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;

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

@@ -14,10 +14,6 @@ class MessageTemplateFieldFactory {
     }
     /**
      * Specifies an alias for the field.
-     * - If this field is a union (.or), this alias is used when
-     * referring to the union and it's first option.
-     * - You can specify a different alias for the first options
-     * by also using the .as() after the type
     */
     as(alias) {
         const chain = new MessageTemplateFieldFactory(this.module);
@@ -82,10 +78,15 @@ class MessageTemplateFieldFactory {
         return new MessageTemplateFieldBuilder('obj', {}, this.alias, children);
     }
     dict(item) {
-        item = item.optional;
         return new MessageTemplateFieldBuilder('dict', {}, this.alias, { __dict: item });
     }
-    msg(msg, extra) {
+    list(item) {
+        return new MessageTemplateFieldBuilder('list', {}, this.alias, { '#': item });
+    }
+    union(...children) {
+        return new MessageTemplateFieldBuilder('union', {}, this.alias, Object.fromEntries(children.map((c, i) => [i, c])));
+    }
+    msg(msg, extra = {}) {
         // Module and tag are updated on build
         const ref = new dependency_1.$Dependency(this.module, 'message', msg);
         return new MessageTemplateFieldBuilder('msg', { msg: ref }, this.alias, extra);
@@ -109,13 +110,10 @@ class MessageTemplateFieldBuilder {
         this.value = value;
         this.alias = alias;
         this.children = children;
-        this._array = false;
         this._required = true;
         this._defaultValue = undefined;
-        this._nullable = true;
+        this._nullable = false;
         this._rules = [];
-        this._arrayRules = [];
-        this.preAlias = alias;
     }
     as(alias) {
         this.alias = alias;
@@ -123,105 +121,91 @@ class MessageTemplateFieldBuilder {
     }
     get optional() {
         this._required = false;
-        if (this._or) {
-            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            this._or.optional;
-        }
         return this;
     }
     default(value) {
         this._required = false;
         this._defaultValue = value;
-        if (this._or) {
-            this._or.default(value);
-        }
         return this;
     }
     get nullable() {
         this._nullable = true;
-        if (this._or) {
-            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            this._or.nullable;
-        }
         return this;
     }
     rule(rule) {
-        if (this._array) {
-            this._arrayRules.push(rule);
-        }
-        else {
-            this._rules.push(rule);
-        }
-        return this;
-    }
-    get array() {
-        this._array = true;
-        if (this._or) {
-            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            this._or.array;
-        }
-        return this;
-    }
-    or(def) {
-        this._or = def;
-        this._or.preAlias = this.preAlias;
-        this._or._array = this._array;
-        this._or._defaultValue = this._defaultValue;
-        this._or._nullable = this._nullable;
-        this._or._required = this._required;
-        this._or._arrayRules = this._arrayRules;
+        this._rules.push(rule);
         return this;
     }
     // Build
     static build(builder, name, tree, module, basePathRaw, basePathParsed) {
-        const or = builder._or
-            ? this.build(builder._or, name, tree, module, basePathRaw, basePathParsed)
-            : undefined;
+        const pathRaw = basePathRaw + (builder.type === 'id' ? `${name}_id` : name);
         const pathParsed = basePathParsed + name;
-        const pathRaw = basePathParsed + (builder.type === 'id'
-            ? builder._array ? `${name}_ids` : `${name}_id`
-            : name);
-        const childrenBasePathRaw = pathRaw + (builder._array ? '.#.' : '.');
-        const childrenBasePathParsed = pathParsed + (builder._array ? '.#.' : '.');
-        if (builder.value.id) {
+        const childrenBasePathRaw = pathRaw + '.';
+        const childrenBasePathParsed = pathParsed + '.';
+        let type = builder.type;
+        let children;
+        if (builder.type === 'id') {
             const bucket = tree.getSchema(builder.value.id.bucket);
             builder.value.id.type = bucket.model.fields.id.type;
         }
-        return new message_template_schema_1.$MessageTemplateField(builder.type, name, builder.alias || name, builder.preAlias || name, pathRaw, pathParsed, builder._array, builder._required, builder._defaultValue, builder._nullable, builder._rules, builder._arrayRules, builder.value, builder.children ? MessageTemplateFieldBuilder.buildChildren(builder.children, tree, module, childrenBasePathRaw, childrenBasePathParsed) : undefined, or);
+        // A .msg() parameter is an obj which takes fields from
+        // another message
+        else if (builder.type === 'msg') {
+            const dep = builder.value.msg;
+            if (dep.type !== 'message') {
+                throw error_1.NesoiError.Builder.Message.UnknownModuleMessage(dep.tag);
+            }
+            const $msg = tree.getSchema(dep);
+            if (!$msg) {
+                throw error_1.NesoiError.Builder.Message.UnknownModuleMessage(dep.tag);
+            }
+            if (dep.module !== module.name) {
+                if (!(dep.refName in module.externals.messages)) {
+                    throw error_1.NesoiError.Builder.Message.UnknownModuleMessage(dep.tag);
+                }
+            }
+            const injectFields = (target, fields) => {
+                for (const key in fields) {
+                    target[key] = message_template_schema_1.$MessageTemplateField.clone(fields[key]);
+                    target[key].pathRaw = childrenBasePathRaw + target[key].pathRaw;
+                    target[key].pathParsed = childrenBasePathParsed + target[key].pathParsed;
+                    if (fields[key].children) {
+                        target[key].children = {};
+                        injectFields(target[key].children, fields[key].children);
+                    }
+                }
+            };
+            type = 'obj';
+            children = {};
+            injectFields(children, $msg.template.fields);
+        }
+        else if (builder.type === 'list') {
+            children = MessageTemplateFieldBuilder.buildMany(builder.children, tree, module, childrenBasePathRaw, childrenBasePathParsed, '#', '#');
+        }
+        else if (builder.type === 'dict') {
+            children = MessageTemplateFieldBuilder.buildMany(builder.children, tree, module, childrenBasePathRaw, childrenBasePathParsed, '#', '#');
+        }
+        else if (builder.type === 'union') {
+            children = MessageTemplateFieldBuilder.buildMany(builder.children, tree, module, basePathRaw, basePathParsed, name, undefined);
+        }
+        // All other fields build their children directly
+        else if (builder.children) {
+            children = MessageTemplateFieldBuilder.buildMany(builder.children, tree, module, childrenBasePathRaw, childrenBasePathParsed);
+        }
+        return new message_template_schema_1.$MessageTemplateField(type, name, builder.alias || name, pathRaw, pathParsed, builder._required, builder._defaultValue, builder._nullable, builder._rules, builder.value, children);
     }
-    static buildChildren(fields, tree, module, basePathRaw = '', basePathParsed = '') {
+    static buildMany(fields, tree, module, basePathRaw = '', basePathParsed = '', name, key) {
         const schema = {};
         for (const c in fields) {
-            const child = fields[c];
-            // Extended fields inherit from other messages
-            if (child.__ext) {
-                const ext = tree.getSchema(child.__ext);
-                schema[c].children = Object.assign({}, ext.template.fields, schema[c].children || {});
-                continue;
-            }
-            const param = c;
-            // A .msg() parameter is an obj which takes fields from
-            // another message
-            if (child.type === 'msg') {
-                const name = child.value.msg.name;
-                const $msg = module.messages[name];
-                if (!$msg) {
-                    throw error_1.NesoiError.Builder.Message.UnknownModuleMessage(name);
-                }
-                const builder = new MessageTemplateFieldFactory(module.name).obj({});
-                builder.alias = child.alias;
-                builder._required = child._required;
-                builder._defaultValue = child._defaultValue;
-                builder._nullable = child._nullable;
-                builder._rules = child._rules.slice(0, -1);
-                builder.children = child.children;
-                schema[param] = MessageTemplateFieldBuilder.build(builder, c, tree, module, basePathRaw, basePathParsed);
-                schema[param].children = schema[param].children || {};
-                Object.assign(schema[param].children, $msg.template.fields);
+            if (c === '__ext')
                 continue;
-            }
-            // All other parameters are built directly
-            schema[param] = MessageTemplateFieldBuilder.build(child, c, tree, module, basePathRaw, basePathParsed);
+            const child = fields[c];
+            schema[key || c] = MessageTemplateFieldBuilder.build(child, name || c, tree, module, basePathRaw, basePathParsed);
+        }
+        // Extended field groups inherit from other messages
+        if ('__ext' in fields) {
+            const ext = tree.getSchema(fields.__ext);
+            Object.assign(schema, ext.template.fields);
         }
         return schema;
     }