nesoi 3.2.8 → 3.3.0

package/lib/{compiler/apps → bundler}/monolyth/stages/4_dump_modules_stage.js

@@ -32,12 +32,16 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DumpModulesStage = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const log_1 = require("../../../../engine/util/log");
-const app_1 = require("../../../../engine/apps/app");
+const log_1 = require("../../../engine/util/log");
+const app_1 = require("../../../engine/app/app");
+const typescript_1 = __importDefault(require("typescript"));
 /**
  * [Monolyth Compiler Stage #4]
  * Dump modules to build/modules folder.
@@ -46,13 +50,13 @@ const app_1 = require("../../../../engine/apps/app");
  * @subcategory Stages
  */
 class DumpModulesStage {
-    constructor(monolyth, app) {
-        this.monolyth = monolyth;
+    constructor(bundler, app) {
+        this.bundler = bundler;
         this.app = app;
     }
     async run() {
         log_1.Log.info('compiler', 'monolyth', 'Dumping modules to build/modules folder...');
-        const { compiler, dirs } = this.monolyth;
+        const { compiler, dirs } = this.bundler;
         const info = app_1.App.getInfo(this.app);
         for (const name of info.spaceModules) {
             const module = compiler.modules[name];
@@ -61,8 +65,13 @@ class DumpModulesStage {
     }
     dumpModule(module, dir) {
         log_1.Log.debug('compiler', 'monolyth', `Dumping module ${module.lowName}`);
-        let str = `const { Module } = require('${module.compiler.config?.nesoiPath || 'nesoi'}/lib/engine/module');\n`;
-        str += `exports.default = new Module('${module.lowName}')\n`;
+        const esnext = this.bundler.tsconfig.module === typescript_1.default.ModuleKind.ESNext;
+        let str = esnext
+            ? `const { Module } = await import('${module.compiler.config?.nesoiPath || 'nesoi'}/lib/engine/module');\n`
+            : `const { Module } = require('${module.compiler.config?.nesoiPath || 'nesoi'}/lib/engine/module');\n`;
+        str += esnext
+            ? `export default new Module('${module.lowName}')\n`
+            : `exports.default = new Module('${module.lowName}')\n`;
         str += '  .inject({';
         const externals = module.module.schema.externals;
         if (externals) {
@@ -101,15 +110,17 @@ class DumpModulesStage {
             }
             str += '\n    },';
         }
+        const import_ = esnext ? '(await import' : 'require';
+        const _import = esnext ? ')).default' : ').default';
         const constants = module.module.schema.constants;
         if (constants && (Object.values(constants.values).length || Object.values(constants.enums).length)) {
-            str += `\n    constants: require('./${module.lowName}/constants__${module.lowName}').default,`;
+            str += `\n    constants: ${import_}('./${module.lowName}/constants__${module.lowName}'${_import},`;
         }
         const buckets = Object.values(module.module.schema.buckets || {});
         if (buckets.length) {
             str += '\n    buckets: [\n';
             buckets.forEach(bucket => {
-                str += `      require('./${module.lowName}/bucket__${bucket.name}').default,\n`;
+                str += `      ${import_}('./${module.lowName}/bucket__${bucket.name}'${_import},\n`;
             });
             str += '    ],';
         }
@@ -117,7 +128,9 @@ class DumpModulesStage {
         if (messages.length) {
             str += '\n    messages: [\n';
             messages.forEach(message => {
-                str += `      require('./${module.lowName}/message__${message.name}').default,\n`;
+                if (message.module !== module.lowName)
+                    return;
+                str += `      ${import_}('./${module.lowName}/message__${message.name}'${_import},\n`;
             });
             str += '    ],';
         }
@@ -125,7 +138,7 @@ class DumpModulesStage {
         if (jobs.length) {
             str += '\n    jobs: [\n';
             jobs.forEach(job => {
-                str += `      require('./${module.lowName}/job__${job.name}').default,\n`;
+                str += `      ${import_}('./${module.lowName}/job__${job.name}'${_import},\n`;
             });
             str += '    ],';
         }
@@ -133,7 +146,7 @@ class DumpModulesStage {
         if (resources.length) {
             str += '\n    resources: [\n';
             resources.forEach(resource => {
-                str += `      require('./${module.lowName}/resource__${resource.name}').default,\n`;
+                str += `      ${import_}('./${module.lowName}/resource__${resource.name}'${_import},\n`;
             });
             str += '    ],';
         }
@@ -141,7 +154,7 @@ class DumpModulesStage {
         if (machines.length) {
             str += '\n    machines: [\n';
             machines.forEach(machine => {
-                str += `      require('./${module.lowName}/machine__${machine.name}').default,\n`;
+                str += `      ${import_}('./${module.lowName}/machine__${machine.name}'${_import},\n`;
             });
             str += '    ],';
         }
@@ -149,7 +162,7 @@ class DumpModulesStage {
         if (controllers.length) {
             str += '\n    controllers: [\n';
             controllers.forEach(controller => {
-                str += `      require('./${module.lowName}/controller__${controller.name}').default,\n`;
+                str += `      ${import_}('./${module.lowName}/controller__${controller.name}'${_import},\n`;
             });
             str += '    ],';
         }
@@ -157,7 +170,7 @@ class DumpModulesStage {
         if (queues.length) {
             str += '\n    queues: [\n';
             queues.forEach(queue => {
-                str += `      require('./${module.lowName}/queue__${queue.name}').default,\n`;
+                str += `      ${import_}('./${module.lowName}/queue__${queue.name}'${_import},\n`;
             });
             str += '    ],';
         }
@@ -165,7 +178,7 @@ class DumpModulesStage {
         if (topics.length) {
             str += '\n    topics: [\n';
             topics.forEach(topic => {
-                str += `      require('./${module.lowName}/topic__${topic.name}').default,\n`;
+                str += `      ${import_}('./${module.lowName}/topic__${topic.name}'${_import},\n`;
             });
             str += '    ],';
         }

package/lib/{compiler/apps → bundler}/monolyth/stages/5_copy_static_stage.d.ts

@@ -1,5 +1,5 @@
-import { MonolythApp } from "../../../../engine/apps/monolyth/monolyth.app";
-import { MonolythCompiler } from '../monolyth_compiler';
+import { MonolythApp } from "../monolyth.app";
+import { MonolythBundler } from '../monolyth.bundler';
 /**
  * [Monolyth Compiler Stage #5]
  * Copy the paths passed to `staticPaths` on the compiler
@@ -9,8 +9,8 @@ import { MonolythCompiler } from '../monolyth_compiler';
  * @subcategory Stages
  */
 export declare class CopyStaticStage {
-    private monolyth;
+    private bundler;
     private app;
-    constructor(monolyth: MonolythCompiler, app: MonolythApp<any, any>);
+    constructor(bundler: MonolythBundler, app: MonolythApp<any, any>);
     run(): Promise<void>;
 }

package/lib/{compiler/apps → bundler}/monolyth/stages/5_copy_static_stage.js

@@ -36,8 +36,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopyStaticStage = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const log_1 = require("../../../../engine/util/log");
-const space_1 = require("../../../../engine/space");
+const log_1 = require("../../../engine/util/log");
+const space_1 = require("../../../engine/space");
 /**
  * [Monolyth Compiler Stage #5]
  * Copy the paths passed to `staticPaths` on the compiler
@@ -47,15 +47,15 @@ const space_1 = require("../../../../engine/space");
  * @subcategory Stages
  */
 class CopyStaticStage {
-    constructor(monolyth, app) {
-        this.monolyth = monolyth;
+    constructor(bundler, app) {
+        this.bundler = bundler;
         this.app = app;
     }
     async run() {
         log_1.Log.info('compiler', 'monolyth', 'Copying static paths to build folder...');
-        for (const staticPath of this.monolyth.config.staticPaths || []) {
-            const from = space_1.Space.path(this.monolyth.compiler.space, staticPath);
-            const to = path.join(this.monolyth.dirs.build, staticPath);
+        for (const staticPath of this.bundler.config.staticPaths || []) {
+            const from = space_1.Space.path(this.bundler.compiler.space, staticPath);
+            const to = path.join(this.bundler.dirs.build, staticPath);
             fs.cpSync(from, to, {
                 recursive: true
             });

package/lib/bundler/monolyth/stages/6_dump_cli_stage.d.ts

@@ -0,0 +1,15 @@
+import { MonolythApp } from "../monolyth.app";
+import { MonolythBundler } from '../monolyth.bundler';
+/**
+ * [Monolyth Compiler Stage #6]
+ * Dump the cli.js file to build/bin folder.
+ *
+ * @category Monolyth Compiler
+ * @subcategory Stages
+ */
+export declare class DumpCLIStage {
+    private bundler;
+    private app;
+    constructor(bundler: MonolythBundler, app: MonolythApp<any, any>);
+    run(): Promise<void>;
+}

package/lib/{compiler/apps → bundler}/monolyth/stages/6_dump_cli_stage.js

@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DumpCLIStage = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const log_1 = require("../../../../engine/util/log");
+const log_1 = require("../../../engine/util/log");
 /**
  * [Monolyth Compiler Stage #6]
  * Dump the cli.js file to build/bin folder.
@@ -45,13 +45,13 @@ const log_1 = require("../../../../engine/util/log");
  * @subcategory Stages
  */
 class DumpCLIStage {
-    constructor(monolyth, app) {
-        this.monolyth = monolyth;
+    constructor(bundler, app) {
+        this.bundler = bundler;
         this.app = app;
     }
     async run() {
         log_1.Log.info('compiler', 'monolyth', 'Dumping cli.js file to build/bin folder...');
-        const { dirs } = this.monolyth;
+        const { dirs } = this.bundler;
         let str = '';
         str += 'require("nesoi/tools/dotenv");\n';
         str += 'const app = require(\'../app\').default\n';

package/lib/{compiler/apps → bundler}/monolyth/stages/7_dump_package_json_stage.d.ts

@@ -1,5 +1,5 @@
-import { MonolythCompiler } from '../monolyth_compiler';
-import { MonolythApp } from "../../../../engine/apps/monolyth/monolyth.app";
+import { MonolythBundler } from '../monolyth.bundler';
+import { MonolythApp } from "../monolyth.app";
 /**
  * [Monolyth Compiler Stage #7]
  * Dump the package.json file to build folder.
@@ -8,8 +8,8 @@ import { MonolythApp } from "../../../../engine/apps/monolyth/monolyth.app";
  * @subcategory Stages
  */
 export declare class DumpPackageJsonStage {
-    private monolyth;
+    private bundler;
     private app;
-    constructor(monolyth: MonolythCompiler, app: MonolythApp<any, any>);
+    constructor(bundler: MonolythBundler, app: MonolythApp<any, any>);
     run(): Promise<void>;
 }

package/lib/{compiler/apps → bundler}/monolyth/stages/7_dump_package_json_stage.js

@@ -36,9 +36,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DumpPackageJsonStage = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const log_1 = require("../../../../engine/util/log");
-const space_1 = require("../../../../engine/space");
-const monolyth_app_1 = require("../../../../engine/apps/monolyth/monolyth.app");
+const log_1 = require("../../../engine/util/log");
+const space_1 = require("../../../engine/space");
+const monolyth_app_1 = require("../monolyth.app");
+const app_1 = require("../../../engine/app/app");
 /**
  * [Monolyth Compiler Stage #7]
  * Dump the package.json file to build folder.
@@ -47,13 +48,13 @@ const monolyth_app_1 = require("../../../../engine/apps/monolyth/monolyth.app");
  * @subcategory Stages
  */
 class DumpPackageJsonStage {
-    constructor(monolyth, app) {
-        this.monolyth = monolyth;
+    constructor(bundler, app) {
+        this.bundler = bundler;
         this.app = app;
     }
     async run() {
         log_1.Log.info('compiler', 'monolyth', 'Dumping package.json to build folder...');
-        const { config, compiler, dirs } = this.monolyth;
+        const { config, compiler, dirs } = this.bundler;
         const packageJsonPath = config.nesoiPath
             ? path.join(config.nesoiPath, 'package.json')
             : path.join('..', '..', '..', '..', '..', 'package.json');
@@ -67,11 +68,13 @@ class DumpPackageJsonStage {
             const jspath = path.replace(/\.ts/, '.js');
             scripts[name] = `node ${jspath}`;
         });
+        const info = app_1.App.getInfo(this.app);
+        const { nesoi: _, spaceDependencies } = spacePackageJson.dependencies || {};
         const dependencies = {
-            ...spacePackageJson.dependencies,
-            nesoi: config.nesoiPath
-                ? `file:${config.nesoiPath}`
-                : nesoiPackageJson.version
+            ...spaceDependencies,
+            [info.nesoiNpmPkg]: config.nesoiPath
+                ? `file:${config.nesoiPath || config.nesoiVersion}`
+                : config.nesoiVersion || nesoiPackageJson.version
         };
         const packageJson = monolyth_app_1.MonolythApp.package(this.app, scripts, dependencies);
         fs.writeFileSync(filePath, JSON.stringify(packageJson, undefined, 2));

package/lib/compiler/compiler.d.ts

@@ -3,12 +3,7 @@ import { ModuleTree } from "../engine/tree";
 import { Space } from "../engine/space";
 import { $Space } from "../schema";
 import { TypeScriptCompiler } from './typescript/typescript_compiler';
-export type CompilerConfig = {
-    nesoiPath?: string;
-    exclude?: string[];
-    reset?: boolean;
-    diagnose?: boolean;
-};
+import { CompilerConfig } from "../engine/app/app.config";
 export declare class Compiler {
     space: Space<$Space>;
     config?: CompilerConfig | undefined;

package/lib/compiler/compiler.js

@@ -24,7 +24,7 @@ class Compiler {
         this.config = config;
         this.modules = {};
         this.tree = new tree_1.ModuleTree({}, this.config);
-        console_1.default.header('Elements Compiler');
+        console_1.default.header('Compiler');
         log_1.Log.info('compiler', 'ts', 'Loading TypeScript...');
         this.tsCompiler = new typescript_compiler_1.TypeScriptCompiler(space, config?.nesoiPath);
     }

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

@@ -1,5 +1,6 @@
 import { $BucketModel, $BucketModelFields } from "../../elements/entities/bucket/model/bucket_model.schema";
-import { Element, ObjTypeAsObj, TypeAsObj } from './element';
+import { Element } from './element';
+import { TypeAsObj, ObjTypeAsObj } from "../../engine/util/type";
 import { $Bucket } from "../../elements/entities/bucket/bucket.schema";
 export declare class BucketElement extends Element<$Bucket> {
     protected prepare(): void;

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

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BucketElement = void 0;
 const bucket_model_schema_1 = require("../../elements/entities/bucket/model/bucket_model.schema");
 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 BucketElement extends element_1.Element {
     // Prepare
     prepare() {
@@ -78,23 +77,11 @@ class BucketElement 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);
-                if (tag.module || constants.module !== this.module) {
-                    const moduleName = constName.high + 'Module';
-                    type = `keyof ${moduleName}['constants']['enums']['${tag.name || options}']['options']`;
-                }
-                else {
-                    type = `keyof ${constName.type}['enums']['${options}']['options']`;
-                }
-            }
-            else if (Array.isArray(options)) {
+            if (Array.isArray(options)) {
                 type = options.map(v => dump_helpers_1.DumpHelpers.dumpValueToType(v, undefined, singleLine));
             }
             else if (typeof options === 'object') {
-                type = Object.values(options || []).map(v => dump_helpers_1.DumpHelpers.dumpValueToType(v, undefined, singleLine));
+                type = Object.keys(options).map(v => dump_helpers_1.DumpHelpers.dumpValueToType(v, undefined, singleLine));
             }
         }
         else if (field.type === 'file') {
@@ -109,6 +96,14 @@ class BucketElement extends element_1.Element {
         else if (field.type === 'string') {
             type = 'string';
         }
+        else if (field.type === 'literal') {
+            const regex = field.meta.literal.template;
+            const rtype = regex
+                .replace(/[.][*+]/g, '${string}')
+                .replace(/\\d[*+]?/g, '${number}')
+                .replace(/\\(.)/g, '$1');
+            type = `\`${rtype}\``;
+        }
         else if (field.type === 'obj') {
             type = this.buildModelType(field.children, singleLine);
         }
@@ -145,7 +140,7 @@ class BucketElement extends element_1.Element {
         const composition = {};
         Object.values(this.schema.graph.links).forEach(link => {
             if (link.rel === 'composition') {
-                const bucket = dependency_1.$Dependency.typeName(link.bucket, this.module);
+                const bucket = name_helpers_1.NameHelpers.tagType(link.bucket, this.module);
                 composition[link.name] = {
                     bucket,
                     many: link.many.toString(),
@@ -186,7 +181,7 @@ class BucketElement extends element_1.Element {
         const links = {};
         Object.entries(this.schema.graph.links).forEach(([key, link]) => {
             links[key] = dump_helpers_1.DumpHelpers.dumpValueToType(link);
-            const bucket = dependency_1.$Dependency.typeName(link.bucket, this.module);
+            const bucket = name_helpers_1.NameHelpers.tagType(link.bucket, this.module);
             Object.assign(links[key], {
                 '#bucket': bucket,
                 '#many': link.many.toString()
@@ -226,7 +221,7 @@ class BucketElement extends element_1.Element {
                 }
                 else if (field.scope === 'graph' && 'graph' in field.meta) {
                     const link = this.schema.graph.links[field.meta.graph.link];
-                    const bucket = dependency_1.$Dependency.typeName(link.bucket, this.module);
+                    const bucket = name_helpers_1.NameHelpers.tagType(link.bucket, this.module);
                     if (field.meta.graph.view) {
                         data[key] = `${bucket}['views']['${field.meta.graph.view}']['#data']${link.many ? '[]' : ''}${link.optional ? ' | undefined' : ''}`;
                     }
@@ -266,10 +261,10 @@ class BucketElement extends element_1.Element {
         // This currently breaks with enum, which are module-level
         // Since this method is used to build space-level models
         const el = {
-            buildModel: BucketElement.prototype.buildModelType,
+            buildModelType: BucketElement.prototype.buildModelType,
             buildModelFieldType: BucketElement.prototype.buildModelFieldType
         };
-        return el.buildModel.bind(el)(model.fields);
+        return el.buildModelType.bind(el)(model.fields);
     }
 }
 exports.BucketElement = BucketElement;

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

@@ -1,8 +1,8 @@
+import { ProgressiveBuildCache } from '../progressive';
 import { ResolvedBuilderNode } from "../../engine/dependency";
 import { Compiler } from '../compiler';
 import { Element } from './element';
 import { AnyElementSchema } from "../../engine/module";
-import { ProgressiveBuildCache } from '../progressive';
 export declare class CachedElement extends Element<AnyElementSchema> {
     constructor(compiler: Compiler, node: ResolvedBuilderNode);
     protected prepare(): void;

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

@@ -4,7 +4,7 @@ exports.CachedElement = void 0;
 const element_1 = require("./element");
 class CachedElement extends element_1.Element {
     constructor(compiler, node) {
-        super(compiler, node.module, node.type, [node.filepath], node.progressive.schema, [], undefined, {});
+        super(compiler, node.tag.module, node.tag.type, [node.filepath], node.progressive.schema, [], undefined, {});
     }
     prepare() {
     }
@@ -12,7 +12,7 @@ class CachedElement extends element_1.Element {
         return '';
     }
     dumpTypeSchema(cache) {
-        return cache.types.elements[this.tag];
+        return cache.types.elements[this.tag.full];
     }
 }
 exports.CachedElement = CachedElement;

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

@@ -2,7 +2,7 @@ import { Element } from './element';
 import { $Constants } from "../../elements/entities/constants/constants.schema";
 export declare class ConstantsElement extends Element<$Constants> {
     protected prepare(): void;
-    protected buildType(): import("./element").TypeAsObj;
+    protected buildType(): import("../../engine/util/type").TypeAsObj;
     private buildEnums;
     private buildEnumTree;
     private buildEnumPaths;

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

@@ -38,6 +38,8 @@ class ConstantsElement extends element_1.Element {
             });
             enums[key] = {
                 '#data': data,
+                $t: dump_helpers_1.DumpHelpers.dumpValueToType('constants.enum'),
+                module: dump_helpers_1.DumpHelpers.dumpValueToType(val.module),
                 name: dump_helpers_1.DumpHelpers.dumpValueToType(val.name),
                 options: type
             };

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ControllerElement = void 0;
-const dependency_1 = require("../../engine/dependency");
 const element_1 = require("./element");
 const dump_helpers_1 = require("../helpers/dump_helpers");
+const name_helpers_1 = require("../../engine/util/name_helpers");
 class ControllerElement extends element_1.Element {
     prepare() {
         this.schema['#authn'] = element_1.Element.Any;
@@ -11,9 +11,9 @@ class ControllerElement extends element_1.Element {
     }
     buildType() {
         const type = dump_helpers_1.DumpHelpers.dumpValueToType(this.schema);
-        const input = this.schema.input.map(dep => dependency_1.$Dependency.typeName(dep, this.module)).join(' | ');
+        const input = this.schema.input.map(tag => name_helpers_1.NameHelpers.tagType(tag, this.module)).join(' | ');
         return {
-            '#authn': element_1.Element.makeAuthnType(this.schema.authn),
+            '#authn': element_1.Element.makeAuthnType(this.schema.auth),
             '#input': input,
             ...type
         };

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

@@ -1,20 +1,13 @@
-import { ResolvedBuilderNode } from "../../engine/dependency";
+import { ResolvedBuilderNode, Tag } from "../../engine/dependency";
 import { AnyElementSchema } from "../../engine/module";
 import { $Machine, $MachineState, $MachineTransition } from "../../elements/blocks/machine/machine.schema";
 import { $Job } from "../../elements/blocks/job/job.schema";
 import { $Queue } from "../../elements/blocks/queue/queue.schema";
 import { Compiler } from '../compiler';
-import { $Block } from "../../elements/blocks/block.schema";
-import { ProgressiveBuildCache } from '../progressive';
+import { $Block, $BlockAuth } from "../../elements/blocks/block.schema";
 import { $Topic } from "../../elements";
-export type TypeAsObj = string | ({
-    [x: string]: TypeAsObj;
-} & {
-    __array?: boolean;
-    __optional?: boolean;
-    __or?: TypeAsObj;
-});
-export type ObjTypeAsObj = TypeAsObj & Record<string, any>;
+import { ProgressiveBuildCache } from '../progressive';
+import { TypeAsObj } from "../../engine/util/type";
 export declare abstract class Element<T extends AnyElementSchema> {
     protected compiler: Compiler;
     protected module: string;
@@ -27,7 +20,7 @@ export declare abstract class Element<T extends AnyElementSchema> {
     static Any: any;
     static Never: any;
     type: TypeAsObj;
-    tag: string;
+    tag: Tag;
     lowName: string;
     highName: string;
     typeName: string;
@@ -39,7 +32,7 @@ export declare abstract class Element<T extends AnyElementSchema> {
     protected customImports(nesoiPath: string): string;
     dumpFileSchema(nesoiPath: string): string;
     dumpTypeSchema(cache?: ProgressiveBuildCache): string;
-    static makeAuthnType(authn: string[]): ({
+    static makeAuthnType(auth: $BlockAuth[]): ({
         [x: string]: TypeAsObj;
     } & {
         __array?: boolean;

package/lib/compiler/elements/element.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Element = void 0;
-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");
+/* @nesoi:browser ignore-end */
 class Element {
     constructor(compiler, module, $t, files, schema, dependencies, inlineRoot, bridge) {
         this.compiler = compiler;
@@ -14,7 +16,7 @@ class Element {
         this.inlineRoot = inlineRoot;
         this.bridge = bridge;
         const names = name_helpers_1.NameHelpers.names(schema);
-        this.tag = `${module}::${$t}:${names.low}`;
+        this.tag = new dependency_1.Tag(module, $t, names.low);
         this.lowName = names.low;
         this.highName = names.high;
         this.typeName = names.type;
@@ -62,19 +64,19 @@ class Element {
         }[this.$t];
         return `export interface ${this.typeName} extends ${typeschema} ${dump_helpers_1.DumpHelpers.dumpType(this.type)};\n`;
     }
-    static makeAuthnType(authn) {
-        if (authn.length === 0) {
+    static makeAuthnType(auth) {
+        if (auth.length === 0) {
             return '{}';
         }
         const type = {};
-        authn.forEach(provider => {
-            type[provider] = `AuthnUsers['${provider}']`;
+        auth.forEach(a => {
+            type[a.provider] = `AuthnUsers['${a.provider}']`;
         });
         return type;
     }
     static makeIOType(compiler, schema) {
         const input = schema.input.map(msg => {
-            const schema = compiler.tree.getSchema(msg);
+            const schema = dependency_1.Tag.resolve(msg, compiler.tree);
             const msgName = name_helpers_1.NameHelpers.names(schema);
             return msgName.type;
         });
@@ -88,12 +90,12 @@ class Element {
     static makeOutputType(compiler, schema) {
         const raw = schema.output?.raw ? dump_helpers_1.DumpHelpers.dumpType(schema.output.raw) : undefined;
         const msgs = schema.output?.msg?.map(msg => {
-            const schema = compiler.tree.getSchema(msg);
+            const schema = dependency_1.Tag.resolve(msg, compiler.tree);
             const msgName = name_helpers_1.NameHelpers.names(schema);
             return msgName.type;
         });
         const objs = schema.output?.obj?.map(bucket => {
-            const schema = compiler.tree.getSchema(bucket.dep);
+            const schema = dependency_1.Tag.resolve(bucket.tag, compiler.tree);
             const bucketName = name_helpers_1.NameHelpers.names(schema);
             return bucketName.high + (bucket.many ? '[]' : '');
         });

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

@@ -42,8 +42,8 @@ class ExternalsElement extends element_1.Element {
         // Add imports for external elements
         this.compiler.modules[this.module].elements.forEach(el => {
             el.dependencies.forEach(dep => {
-                if (dep.module !== this.module) {
-                    externalModules.add(dep.module);
+                if (dep.tag.module !== this.tag.module) {
+                    externalModules.add(dep.tag.module);
                 }
             });
         });

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

@@ -3,5 +3,5 @@ import { $Job } from "../../elements/blocks/job/job.schema";
 export declare class JobElement extends Element<$Job> {
     protected prepare(): void;
     protected customImports(nesoiPath: string): string;
-    protected buildType(): import("./element").TypeAsObj;
+    protected buildType(): import("../../engine/util/type").TypeAsObj;
 }

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

@@ -51,7 +51,7 @@ class JobElement extends element_1.Element {
         });
         Object.assign(type, {
             'input': 'any',
-            '#authn': element_1.Element.makeAuthnType(this.schema.authn),
+            '#authn': element_1.Element.makeAuthnType(this.schema.auth),
             '#input': input,
             '#output': output,
             '#extra': 'any // TODO: Typescript API'