nesoi 3.2.9 → 3.3.0

package/lib/compiler/elements/machine.element.d.ts

@@ -1,10 +1,10 @@
-import { Element } from './element';
 import { $Machine } from "../../elements/blocks/machine/machine.schema";
+import { Element } from './element';
 export declare class MachineElement extends Element<$Machine> {
     protected prepare(): void;
     private prepareStates;
     private prepareTransitions;
-    protected buildType(): import("./element").TypeAsObj;
+    protected buildType(): import("../../engine/util/type").TypeAsObj;
     private buildStatesType;
     private buildTransitionsType;
 }

package/lib/compiler/elements/machine.element.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MachineElement = void 0;
-const element_1 = require("./element");
-const dependency_1 = require("../../engine/dependency");
 const dump_helpers_1 = require("../helpers/dump_helpers");
+const name_helpers_1 = require("../../engine/util/name_helpers");
+const element_1 = require("./element");
 class MachineElement extends element_1.Element {
     prepare() {
         this.schema['#authn'] = element_1.Element.Any;
@@ -43,11 +43,11 @@ class MachineElement extends element_1.Element {
             }
         });
         const data = this.schema.buckets.map(bucket => {
-            const schema = this.compiler.tree.getSchema(bucket);
-            return dependency_1.$Dependency.typeName(bucket, this.module) + '[\'#data\']';
+            // const schema = bucket.resolve(this.compiler.tree);
+            return name_helpers_1.NameHelpers.tagType(bucket, this.module) + '[\'#data\']';
         });
         Object.assign(type, {
-            '#authn': element_1.Element.makeAuthnType(this.schema.authn),
+            '#authn': element_1.Element.makeAuthnType(this.schema.auth),
             '#input': element_1.Element.makeIOType(this.compiler, this.schema).input,
             '#output': 'never',
             '#data': data,
@@ -65,7 +65,7 @@ class MachineElement extends element_1.Element {
                     beforeLeave: type[key].jobs.beforeLeave ?? 'undefined',
                     afterLeave: type[key].jobs.afterLeave ?? 'undefined'
                 },
-                '#authn': element_1.Element.makeAuthnType(state.authn),
+                '#authn': element_1.Element.makeAuthnType(state.auth),
                 '#input': element_1.Element.makeIOType(this.compiler, state).input,
                 '#input.enter': element_1.Element.makeIOType(this.compiler, { input: state.inputEnter, output: 'never' }).input,
                 '#input.leave': element_1.Element.makeIOType(this.compiler, { input: state.inputLeave, output: 'never' }).input,
@@ -83,7 +83,7 @@ class MachineElement extends element_1.Element {
                 Object.values(msgTransitions).forEach(transition => {
                     const t = dump_helpers_1.DumpHelpers.dumpValueToType(transition, undefined, undefined, 4);
                     Object.assign(t, {
-                        '#authn': element_1.Element.makeAuthnType(transition.authn),
+                        '#authn': element_1.Element.makeAuthnType(transition.auth),
                         '#input': element_1.Element.makeIOType(this.compiler, transition).input,
                         '#output': 'never',
                     });

package/lib/compiler/elements/message.element.d.ts

@@ -4,6 +4,6 @@ export declare class MessageElement extends Element<$Message> {
     protected prepare(): void;
     private prepareFields;
     protected customImports(nesoiPath: string): string;
-    protected buildType(): import("./element").TypeAsObj;
+    protected buildType(): import("../../engine/util/type").TypeAsObj;
     private buildIO;
 }

package/lib/compiler/elements/message.element.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageElement = void 0;
 const element_1 = require("./element");
-const name_helpers_1 = require("../helpers/name_helpers");
-const dependency_1 = require("../../engine/dependency");
 const dump_helpers_1 = require("../helpers/dump_helpers");
+const name_helpers_1 = require("../../engine/util/name_helpers");
 class MessageElement extends element_1.Element {
     prepare() {
         this.schema['#raw'] = element_1.Element.Any;
@@ -59,29 +58,30 @@ class MessageElement extends element_1.Element {
             }
             else if (field.type === 'enum') {
                 const options = field.meta.enum.options;
-                if (typeof options === 'string') {
-                    const constants = this.compiler.tree.getSchema(field.meta.enum.dep);
-                    const constName = name_helpers_1.NameHelpers.names(constants);
-                    const tag = dependency_1.$Tag.parseOrFail(options);
-                    const moduleName = constName.high + 'Module';
-                    let enumkeys;
-                    if (tag.module || constants.module !== this.module) {
-                        const key = tag.name || options;
-                        const enumpath = key.match(/(.*)\.\{(.*)\}$/);
-                        enumkeys = enumpath
-                            ? `keyof ${moduleName}['constants']['enums']['${enumpath[1]}']['options']`
-                            : `keyof ${moduleName}['constants']['enums']['${key}']['options']`;
-                    }
-                    else {
-                        const enumpath = options.match(/(.*)\.\{(.*)\}$/);
-                        enumkeys = enumpath
-                            ? `keyof ${constName.type}['enums']['${enumpath[1]}']['options']`
-                            : `keyof ${constName.type}['enums']['${options}']['options']`;
-                    }
-                    input[key] = enumkeys;
-                    output[key] = enumkeys;
-                }
-                else if (Array.isArray(options)) {
+                // TODO: resolve this on builder
+                // if (typeof options === 'string') {
+                //     const constants = this.compiler.tree.getSchema(field.meta.enum!.dep!);
+                //     const constName = NameHelpers.names(constants);
+                //     const tag = $Tag.parseOrFail(options);
+                //     const moduleName = constName.high + 'Module';
+                //     let enumkeys;
+                //     if (tag.module || constants.module !== this.module) {
+                //         const key = tag.name || options;
+                //         const enumpath = key.match(/(.*)\.\{(.*)\}$/);
+                //         enumkeys = enumpath
+                //             ? `keyof ${moduleName}['constants']['enums']['${enumpath[1]}']['options']`
+                //             : `keyof ${moduleName}['constants']['enums']['${key}']['options']`;
+                //     }
+                //     else {
+                //         const enumpath = options.match(/(.*)\.\{(.*)\}$/);
+                //         enumkeys = enumpath
+                //             ? `keyof ${constName.type}['enums']['${enumpath[1]}']['options']`
+                //             : `keyof ${constName.type}['enums']['${options}']['options']`;
+                //     }
+                //     input[key] = enumkeys;
+                //     output[key] = enumkeys;
+                // }
+                if (Array.isArray(options)) {
                     input[key] = options.map(v => dump_helpers_1.DumpHelpers.dumpValueToType(v));
                     output[key] = options.map(v => dump_helpers_1.DumpHelpers.dumpValueToType(v));
                 }
@@ -100,7 +100,7 @@ class MessageElement extends element_1.Element {
             }
             else if (field.type === 'id') {
                 const ref = field.meta.id.bucket;
-                const modelName = dependency_1.$Dependency.typeName(ref, this.module);
+                const modelName = name_helpers_1.NameHelpers.tagType(ref, this.module);
                 input[key + '_id'] = `${modelName}['#data']['id']`;
                 output[key] = `${modelName}['#data']`;
             }

package/lib/compiler/elements/queue.element.js

@@ -14,7 +14,7 @@ class QueueElement extends element_1.Element {
         const type = dump_helpers_1.DumpHelpers.dumpValueToType(this.schema);
         delete type['output'];
         return {
-            '#authn': element_1.Element.makeAuthnType(this.schema.authn),
+            '#authn': element_1.Element.makeAuthnType(this.schema.auth),
             '#input': input,
             '#output': output,
             ...type,

package/lib/compiler/elements/resource.element.d.ts

@@ -2,6 +2,6 @@ import { Element } from './element';
 import { $Resource } from "../../elements/blocks/resource/resource.schema";
 export declare class ResourceElement extends Element<$Resource> {
     protected prepare(): void;
-    protected buildType(): import("./element").TypeAsObj;
+    protected buildType(): import("../../engine/util/type").TypeAsObj;
     protected buildCreate(): void;
 }

package/lib/compiler/elements/resource.element.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResourceElement = void 0;
 const element_1 = require("./element");
-const name_helpers_1 = require("../helpers/name_helpers");
-const dependency_1 = require("../../engine/dependency");
+const name_helpers_1 = require("../../engine/util/name_helpers");
 const dump_helpers_1 = require("../helpers/dump_helpers");
+const dependency_1 = require("../../engine/dependency");
 class ResourceElement extends element_1.Element {
     prepare() {
         this.schema['#authn'] = element_1.Element.Any;
@@ -18,36 +18,36 @@ class ResourceElement extends element_1.Element {
         this.schema['#input.delete'] = this.schema.jobs.delete ? element_1.Element.Any : element_1.Element.Never;
     }
     buildType() {
-        const bucketName = dependency_1.$Dependency.typeName(this.schema.bucket, this.module);
+        const bucketName = name_helpers_1.NameHelpers.tagType(this.schema.bucket, this.module);
         const input = {};
         if (this.schema.jobs.view) {
-            const msg = this.compiler.tree.getSchema(this.schema.jobs.view);
+            const msg = dependency_1.Tag.resolve(this.schema.jobs.view, this.compiler.tree);
             const msgName = name_helpers_1.NameHelpers.names({ $t: 'message', name: msg.name });
             input.view = msgName.type;
         }
         if (this.schema.jobs.query) {
-            const msg = this.compiler.tree.getSchema(this.schema.jobs.query);
+            const msg = dependency_1.Tag.resolve(this.schema.jobs.query, this.compiler.tree);
             const msgName = name_helpers_1.NameHelpers.names({ $t: 'message', name: msg.name });
             input.query = msgName.type;
         }
         if (this.schema.jobs.create) {
-            const msg = this.compiler.tree.getSchema(this.schema.jobs.create);
+            const msg = dependency_1.Tag.resolve(this.schema.jobs.create, this.compiler.tree);
             const msgName = name_helpers_1.NameHelpers.names({ $t: 'message', name: msg.name });
             input.create = msgName.type;
         }
         if (this.schema.jobs.update) {
-            const msg = this.compiler.tree.getSchema(this.schema.jobs.update);
+            const msg = dependency_1.Tag.resolve(this.schema.jobs.update, this.compiler.tree);
             const msgName = name_helpers_1.NameHelpers.names({ $t: 'message', name: msg.name });
             input.update = msgName.type;
         }
         if (this.schema.jobs.delete) {
-            const msg = this.compiler.tree.getSchema(this.schema.jobs.delete);
+            const msg = dependency_1.Tag.resolve(this.schema.jobs.delete, this.compiler.tree);
             const msgName = name_helpers_1.NameHelpers.names({ $t: 'message', name: msg.name });
             input.delete = msgName.type;
         }
         const allInputs = Object.values(input);
         return dump_helpers_1.DumpHelpers.dumpValueToType(this.schema, {
-            '#authn': () => element_1.Element.makeAuthnType(this.schema.authn),
+            '#authn': () => element_1.Element.makeAuthnType(this.schema.auth),
             '#input': () => allInputs.length ? allInputs.join(' | ') : 'never',
             '#output': () => 'never',
             '#bucket': () => bucketName,

package/lib/compiler/elements/topic.element.js

@@ -14,7 +14,7 @@ class TopicElement extends element_1.Element {
         const type = dump_helpers_1.DumpHelpers.dumpValueToType(this.schema);
         delete type['output'];
         return {
-            '#authn': element_1.Element.makeAuthnType(this.schema.authn),
+            '#authn': element_1.Element.makeAuthnType(this.schema.auth),
             '#input': input,
             '#output': input,
             ...type,

package/lib/compiler/error.d.ts

@@ -1,12 +1,8 @@
 export declare class CompilerError extends Error {
     constructor(message: string);
     static DirectoryDoesntExists(dir: string): CompilerError;
-    static FileDoesntExist(path: string): CompilerError;
-    static NoModulesFolder(): CompilerError;
-    static UnmetModuleDependency(from: string, name: string): CompilerError;
-    static UnmetDependency(from: string, name: string): CompilerError;
-    static CircularDependency(): CompilerError;
     static ExternalEnumNotFound(name: string): CompilerError;
+    static ExternalValueNotFound(name: string): CompilerError;
 }
 export declare class HelperError extends Error {
     constructor(message: string);

package/lib/compiler/error.js

@@ -8,24 +8,12 @@ class CompilerError extends Error {
     static DirectoryDoesntExists(dir) {
         return new CompilerError(`Directory doesn't exists: ${dir}.`);
     }
-    static FileDoesntExist(path) {
-        return new CompilerError(`File doesn't exist: ${path}`);
-    }
-    static NoModulesFolder() {
-        return new CompilerError('No modules folder found on project root.');
-    }
-    static UnmetModuleDependency(from, name) {
-        return new CompilerError(`Unment module dependency '${name}' while building '${from}'.`);
-    }
-    static UnmetDependency(from, name) {
-        return new CompilerError(`Unment dependency '${name}' while building '${from}'.`);
-    }
-    static CircularDependency() {
-        return new CompilerError('Circular dependency found while building.');
-    }
     static ExternalEnumNotFound(name) {
         return new CompilerError(`External enum '${name}' not found`);
     }
+    static ExternalValueNotFound(name) {
+        return new CompilerError(`External value '${name}' not found`);
+    }
 }
 exports.CompilerError = CompilerError;
 class HelperError extends Error {

package/lib/compiler/helpers/dump_helpers.d.ts

@@ -1,4 +1,4 @@
-import { TypeAsObj } from '../elements/element';
+import { TypeAsObj } from "../../engine/util/type";
 type TransformTypes = {
     [x: string]: TransformTypes | ((v?: any) => TypeAsObj);
 };

package/lib/compiler/helpers/dump_helpers.js

@@ -114,7 +114,7 @@ class DumpHelpers {
             }
             return '{' + lb +
                 Object.entries(val).map(([key, child]) => {
-                    const _key = key.match(/\W/) ? `'${key}'` : key;
+                    const _key = (key.match(/^\d/) || key.match(/\W/)) ? `'${key}'` : key;
                     return `${pad1}${_key}: ${this.dumpSchema(child, singleLine, d + 1)}`;
                 }).join(',' + lb)
                 + `${lb}${pad0}}`;

package/lib/compiler/index.d.ts

@@ -1,3 +1 @@
-export { Compiler } from './compiler';
-export { MonolythCompiler } from './apps/monolyth/monolyth_compiler';
-export { DistributedCompiler } from './apps/distributed/distributed_compiler';
+export * from './compiler';

package/lib/compiler/index.js

@@ -1,9 +1,17 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DistributedCompiler = exports.MonolythCompiler = exports.Compiler = void 0;
-var compiler_1 = require("./compiler");
-Object.defineProperty(exports, "Compiler", { enumerable: true, get: function () { return compiler_1.Compiler; } });
-var monolyth_compiler_1 = require("./apps/monolyth/monolyth_compiler");
-Object.defineProperty(exports, "MonolythCompiler", { enumerable: true, get: function () { return monolyth_compiler_1.MonolythCompiler; } });
-var distributed_compiler_1 = require("./apps/distributed/distributed_compiler");
-Object.defineProperty(exports, "DistributedCompiler", { enumerable: true, get: function () { return distributed_compiler_1.DistributedCompiler; } });
+__exportStar(require("./compiler"), exports);

package/lib/compiler/module.js

@@ -37,7 +37,7 @@ exports.CompilerModule = void 0;
 const fs = __importStar(require("fs"));
 const error_1 = require("./error");
 const module_1 = require("../engine/module");
-const name_helpers_1 = require("./helpers/name_helpers");
+const name_helpers_1 = require("../engine/util/name_helpers");
 const message_element_1 = require("./elements/message.element");
 const bucket_element_1 = require("./elements/bucket.element");
 const job_element_1 = require("./elements/job.element");
@@ -63,7 +63,7 @@ class CompilerModule {
         this.module = new module_1.Module(name, { dirpath: path }, subdir);
     }
     async buildElementNode(node) {
-        log_1.Log.trace('compiler', 'module', `${this.lowName}::${(0, log_1.scopeTag)(node.type, node.name)} Compiling${node.isInline ? ' (inline)' : ''}`);
+        log_1.Log.trace('compiler', 'module', `${this.lowName}::${(0, log_1.scopeTag)(node.tag.type, node.tag.name)} Compiling${node.isInline ? ' (inline)' : ''}`);
         // Progressive (Cached)
         if (node.progressive) {
             const el = new cached_element_1.CachedElement(this.compiler, node);
@@ -71,61 +71,61 @@ class CompilerModule {
             return el;
         }
         // Entities
-        if (node.type === 'constants') {
+        if (node.tag.type === 'constants') {
             const el = new constants_element_1.ConstantsElement(this.compiler, this.lowName, 'constants', node.filepath, node.schema, node.dependencies.map(dep => dep.node), undefined, node.bridge);
             this.elements.push(el);
             return el;
         }
-        if (node.type === 'externals') {
+        if (node.tag.type === 'externals') {
             const el = new externals_element_1.ExternalsElement(this.compiler, this.lowName, 'externals', node.filepath, node.schema, node.dependencies.map(dep => dep.node), undefined, node.bridge);
             this.elements.push(el);
             return el;
         }
-        if (node.type === 'message') {
+        if (node.tag.type === 'message') {
             const schema = node.schema;
             const el = new message_element_1.MessageElement(this.compiler, this.lowName, 'message', [node.filepath], schema, node.dependencies.map(dep => dep.node), node.root, node.bridge);
             this.elements.push(el);
             return el;
         }
-        if (node.type === 'bucket') {
+        if (node.tag.type === 'bucket') {
             const schema = node.schema;
             const el = new bucket_element_1.BucketElement(this.compiler, this.lowName, 'bucket', [node.filepath], schema, node.dependencies.map(dep => dep.node), undefined, node.bridge);
             this.elements.push(el);
             return el;
         }
         // Blocks
-        if (node.type === 'job') {
+        if (node.tag.type === 'job') {
             const schema = node.schema;
             const el = new job_element_1.JobElement(this.compiler, this.lowName, 'job', [node.filepath], schema, node.dependencies.map(dep => dep.node), node.root, node.bridge);
             this.elements.push(el);
             return el;
         }
-        if (node.type === 'resource') {
+        if (node.tag.type === 'resource') {
             const schema = node.schema;
             const el = new resource_element_1.ResourceElement(this.compiler, this.lowName, 'resource', [node.filepath], schema, node.dependencies.map(dep => dep.node), undefined, node.bridge);
             this.elements.push(el);
             return el;
         }
-        if (node.type === 'machine') {
+        if (node.tag.type === 'machine') {
             const schema = node.schema;
             const el = new machine_element_1.MachineElement(this.compiler, this.lowName, 'machine', [node.filepath], schema, node.dependencies.map(dep => dep.node), undefined, node.bridge);
             this.elements.push(el);
             return el;
         }
         // Edge
-        if (node.type === 'controller') {
+        if (node.tag.type === 'controller') {
             const schema = node.schema;
             const el = new controller_element_1.ControllerElement(this.compiler, this.lowName, 'controller', [node.filepath], schema, node.dependencies.map(dep => dep.node), undefined, node.bridge);
             this.elements.push(el);
             return el;
         }
-        if (node.type === 'queue') {
+        if (node.tag.type === 'queue') {
             const schema = node.schema;
             const el = new queue_element_1.QueueElement(this.compiler, this.lowName, 'queue', [node.filepath], schema, node.dependencies.map(dep => dep.node), undefined, node.bridge);
             this.elements.push(el);
             return el;
         }
-        if (node.type === 'topic') {
+        if (node.tag.type === 'topic') {
             const schema = node.schema;
             const el = new topic_element_1.TopicElement(this.compiler, this.lowName, 'topic', [node.filepath], schema, node.dependencies.map(dep => dep.node), undefined, node.bridge);
             this.elements.push(el);

package/lib/compiler/progressive.d.ts

@@ -1,8 +1,7 @@
-import { BuilderNode } from "../engine/dependency";
+import { BuilderNode, TagType } from "../engine/dependency";
 import { AnySpace } from "../engine/space";
-import { BuilderType } from "../schema";
 import { Compiler } from './compiler';
-import { ObjTypeAsObj } from './elements/element';
+import { ObjTypeAsObj } from "../engine/util/type";
 export type ProgressiveBuildCache = {
     nesoidir: string;
     hash: {
@@ -22,7 +21,7 @@ export type ProgressiveBuildCache = {
     };
     files: {
         [filepath: string]: {
-            type: BuilderType[];
+            type: TagType[];
             elements: string[];
         };
     };

package/lib/compiler/progressive.js

@@ -1,4 +1,5 @@
 "use strict";
+/* @nesoi:browser ignore-file */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -128,7 +129,7 @@ class ProgressiveBuild {
                 }
                 const hash = await hash_1.Hash.file(node.filepath);
                 out.files[node.filepath] = hash;
-                out.modules[name].nodes[node.tag] = hash;
+                out.modules[name].nodes[node.tag.full] = hash;
             }
             out.modules[name].$ = hash_1.Hash.merge(out.modules[name].nodes);
         }
@@ -143,9 +144,7 @@ class ProgressiveBuild {
         const file = cache.files[filepath];
         const schemas = await this.schemas(cache, file);
         return schemas.map(schema => new dependency_1.BuilderNode({
-            module: schema.module,
-            type: schema.$t,
-            name: schema.name,
+            tag: new dependency_1.Tag(schema.module, schema.$t, schema.name),
             filepath,
             dependencies: [],
             builder: undefined,

package/lib/compiler/stages/2_treeshake_stage.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TreeshakeStage = void 0;
 const log_1 = require("../../engine/util/log");
+/* @nesoi:browser ignore-start */
 const progressive_1 = require("../progressive");
+/* @nesoi:browser ignore-end */
 /**
  * [Compiler Stage #2]
  * Treeshake each module to finds it's nodes, inline nodes and dependencies,
@@ -23,9 +25,11 @@ class TreeshakeStage {
             modules[name] = module.module;
         });
         this.compiler.tree.modules = modules;
+        /* @nesoi:browser ignore-start */
         const cache = await progressive_1.ProgressiveBuild.cache(this.compiler);
         await this.compiler.tree.resolve(cache);
         await progressive_1.ProgressiveBuild.save(this.compiler.space, cache);
+        /* @nesoi:browser ignore-end */
         const t = new Date().getTime();
         log_1.Log.debug('compiler', 'stage.treeshake', `[t: ${(t - t0) / 1000} ms]`);
     }

package/lib/compiler/stages/3_extract_ts_stage.js

@@ -36,7 +36,7 @@ class ExtractTSStage {
             }
             const imports = extract_1.TSBridgeExtract.imports(this.compiler, node);
             if (imports) {
-                extract[node.tag] = { imports, types: [], functions: [] };
+                extract[node.tag.full] = { imports, types: [], functions: [] };
             }
             const types = extract_1.TSBridgeExtract.types(this.compiler, node);
             const functions = extract_1.TSBridgeExtract.functions(this.compiler, node);
@@ -54,20 +54,20 @@ class ExtractTSStage {
                 return;
             }
             const imports = node.isInline
-                ? extract[node.root.tag]?.imports
-                : extract[node.tag]?.imports;
+                ? extract[node.root.tag.full]?.imports
+                : extract[node.tag.full]?.imports;
             let e;
             if (node.builder.$b === 'bucket') {
-                e = organized.buckets[node.tag];
+                e = organized.buckets[node.tag.full];
             }
             else if (node.builder.$b === 'message') {
-                e = organized.messages[node.tag];
+                e = organized.messages[node.tag.full];
             }
             else if (node.builder.$b === 'job') {
-                e = organized.jobs[node.tag];
+                e = organized.jobs[node.tag.full];
             }
             else if (node.builder.$b === 'machine') {
-                e = organized.machines[node.tag];
+                e = organized.machines[node.tag.full];
             }
             node.bridge = {
                 imports,

package/lib/compiler/stages/4_build_schemas_stage.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuildSchemasStage = void 0;
 const log_1 = require("../../engine/util/log");
-const error_1 = require("../error");
+const builder_1 = require("../../engine/builder");
 /**
  * [Compiler Stage #4]
  * Build the node schemas, following the graph resolved on previous steps.
@@ -19,7 +19,7 @@ class BuildSchemasStage {
         const t0 = new Date().getTime();
         await this.compiler.tree.traverse('Building schemas ', async (node) => {
             var _a;
-            const module = this.compiler.modules[node.module].module;
+            const module = this.compiler.modules[node.tag.module].module;
             if (node.progressive) {
                 await module.inject({
                     [node.progressive.schema.$t + 's']: [node.progressive.schema]
@@ -41,20 +41,7 @@ class BuildSchemasStage {
             if (node.isInline) {
                 return;
             }
-            await module.buildNode(node, this.compiler.tree);
-            // Inject external enums on the module schema
-            if (node.type === 'externals') {
-                const schema = node.schema;
-                for (const e in schema.enums) {
-                    const enumDep = schema.enums[e];
-                    const enumModule = this.compiler.modules[enumDep.module].module;
-                    const constants = enumModule.schema.constants;
-                    if (!constants.enums[enumDep.name]) {
-                        throw error_1.CompilerError.ExternalEnumNotFound(e);
-                    }
-                    module.schema.constants.enums[enumDep.refName] = constants.enums[enumDep.name];
-                }
-            }
+            await builder_1.Builder.buildNode(module, node, this.compiler.tree);
         });
         const t = new Date().getTime();
         log_1.Log.debug('compiler', 'stage.build_schemas', `[t: ${(t - t0) / 1000} ms]`);

package/lib/compiler/stages/6_build_elements_stage.js

@@ -18,7 +18,7 @@ class BuildElementsStage {
         log_1.Log.info('compiler', 'stage.build_elements', 'Building Elements...');
         const t0 = new Date().getTime();
         await this.compiler.tree.traverse('Building elements ', async (node) => {
-            const module = this.compiler.modules[node.module];
+            const module = this.compiler.modules[node.tag.module];
             await module.buildElementNode(node);
         });
         const t = new Date().getTime();