nesoi 3.2.8 → 3.3.0

package/lib/engine/module.d.ts

@@ -12,21 +12,20 @@ import { Resource } from "../elements/blocks/resource/resource";
 import { Queue } from "../elements/blocks/queue/queue";
 import { Controller } from "../elements/edge/controller/controller";
 import { AnyBucket, Bucket } from "../elements/entities/bucket/bucket";
-import { $Constants } from "../elements/entities/constants/constants.schema";
+import { $ConstantEnum, $ConstantValue, $Constants } from "../elements/entities/constants/constants.schema";
 import { ConstantsBuilder } from "../elements/entities/constants/constants.builder";
 import { AnyControllerBuilder } from "../elements/edge/controller/controller.builder";
 import { AnyExternalsBuilder } from "../elements/edge/externals/externals.builder";
 import { $Externals } from "../elements/edge/externals/externals.schema";
-import { $Dependency, ResolvedBuilderNode } from './dependency';
+import { Tag } from './dependency';
 import { $Bucket } from "../elements/entities/bucket/bucket.schema";
 import { $Resource } from "../elements/blocks/resource/resource.schema";
 import { $Machine } from "../elements/blocks/machine/machine.schema";
 import { $Controller } from "../elements/edge/controller/controller.schema";
 import { $Job } from "../elements/blocks/job/job.schema";
-import { ModuleTree } from './tree';
 import { AnyResourceJobBuilder } from "../elements/blocks/job/internal/resource_job.builder";
-import { AnyApp } from './apps/app';
-import { AnyService } from './apps/service';
+import { AnyApp } from './app/app';
+import { AnyService } from './app/service';
 import { AnyMachineJobBuilder } from "../elements/blocks/job/internal/machine_job.builder";
 import { AnyQueueBuilder } from "../elements/blocks/queue/queue.builder";
 import { $Queue } from "../elements/blocks/queue/queue.schema";
@@ -36,7 +35,7 @@ import { AnyTopicBuilder } from "../elements/blocks/topic/topic.builder";
 import { $Topic } from "../elements/blocks/topic/topic.schema";
 import { Topic } from "../elements/blocks/topic/topic";
 export type AnyBuilder = AnyExternalsBuilder | ConstantsBuilder | AnyMessageBuilder | AnyBucketBuilder | AnyJobBuilder | AnyResourceJobBuilder | AnyMachineJobBuilder | AnyResourceBuilder | AnyMachineBuilder | AnyControllerBuilder | AnyQueueBuilder | AnyTopicBuilder;
-export type AnyElementSchema = $Externals | $Constants | $Message | $Bucket | $Job | $Resource | $Machine | $Controller | $Queue | $Topic;
+export type AnyElementSchema = $Constants | $ConstantEnum | $ConstantValue | $Externals | $Message | $Bucket | $Job | $Resource | $Machine | $Controller | $Queue | $Topic;
 export type AnyInlineElementSchema = $Message | $Job;
 export type VirtualModuleDef = {
     name: string;
@@ -45,9 +44,9 @@ export type VirtualModuleDef = {
         machines?: $Machine[];
     };
     externals?: {
-        messages?: $Dependency[];
-        buckets?: $Dependency[];
-        jobs?: $Dependency[];
+        messages?: Tag[];
+        buckets?: Tag[];
+        jobs?: Tag[];
     };
 };
 /**
@@ -131,22 +130,6 @@ export declare class Module<S extends $Space, $ extends $Module> {
         topics?: $Topic[];
         controllers?: $Controller[];
     }): this;
-    /**
-     * Include references for external elements on the module.
-     * This allows a module to use elements from other modules directly.
-     * This implementation also includes transitive dependencies.
-     *
-     * @param daemon A `Daemon` instance
-     * @param dependencies: A dictionary of dependencies by element type
-     * @returns The `Module`, for call-chaining
-     */
-    injectDependencies(modules: Record<string, AnyModule>, dependencies: {
-        buckets?: $Dependency[];
-        jobs?: $Dependency[];
-        messages?: $Dependency[];
-        machines?: $Dependency[];
-        enums?: $Dependency[];
-    }): this;
     /**
      * Include references for external elements on the module.
      *
@@ -165,29 +148,6 @@ export declare class Module<S extends $Space, $ extends $Module> {
      * @returns A list of file paths
      */
     scanFiles(dirpath: string, exclude?: string[]): string[];
-    /**
-     * Build a resolved builder node, then merge the
-     * resulting schema(s) to the module.
-     * This also merges the resulting inline nodes of building a node.
-     *
-     * @param node A resolved builder node
-     * @param tree A module tree
-     */
-    buildNode(node: ResolvedBuilderNode, tree: ModuleTree): Promise<void>;
-    /**
-     * Merge inline message schemas into the module.
-     *
-     * @param node A resolved builder node
-     * @param schemas A dictionary of Message schemas by name
-     */
-    private mergeInlineMessages;
-    /**
-     * Merge inline job schemas into the module.
-     *
-     * @param node A resolved builder node
-     * @param schemas A dictionary of job schemas by name
-     */
-    private mergeInlineJobs;
     /**
      * Create elements from schemas, and the NQL engine for this module.
      *
@@ -213,5 +173,15 @@ export declare class Module<S extends $Space, $ extends $Module> {
      * @returns A `Module` instance
      */
     static virtual(daemon: AnyDaemon, def: VirtualModuleDef): Promise<Module<$Space, $Module>>;
+    /**
+     * Include references for external elements on the module.
+     * This is used to create virtual modules and inline apps.
+     * This implementation also includes transitive dependencies.
+     *
+     * @param daemon A `Daemon` instance
+     * @param dependencies: A dictionary of dependencies by element type
+     * @returns The `Module`, for call-chaining
+     */
+    private injectDependencies;
 }
 export type AnyModule = Module<any, any>;

package/lib/engine/module.js

@@ -38,29 +38,17 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const log_1 = require("./util/log");
 const machine_1 = require("../elements/blocks/machine/machine");
-const message_builder_1 = require("../elements/entities/message/message.builder");
-const bucket_builder_1 = require("../elements/entities/bucket/bucket.builder");
-const resource_builder_1 = require("../elements/blocks/resource/resource.builder");
-const machine_builder_1 = require("../elements/blocks/machine/machine.builder");
 const job_1 = require("../elements/blocks/job/job");
-const job_builder_1 = require("../elements/blocks/job/job.builder");
 const message_parser_1 = require("../elements/entities/message/message_parser");
 const resource_1 = require("../elements/blocks/resource/resource");
 const queue_1 = require("../elements/blocks/queue/queue");
 const controller_1 = require("../elements/edge/controller/controller");
 const bucket_1 = require("../elements/entities/bucket/bucket");
 const constants_schema_1 = require("../elements/entities/constants/constants.schema");
-const constants_builder_1 = require("../elements/entities/constants/constants.builder");
-const controller_builder_1 = require("../elements/edge/controller/controller.builder");
-const externals_builder_1 = require("../elements/edge/externals/externals.builder");
-const error_1 = require("./data/error");
 const externals_schema_1 = require("../elements/edge/externals/externals.schema");
-const app_1 = require("./apps/app");
-const queue_builder_1 = require("../elements/blocks/queue/queue.builder");
 const nql_engine_1 = require("../elements/entities/bucket/query/nql_engine");
 const daemon_1 = require("./daemon");
 const trash_1 = require("./data/trash");
-const topic_builder_1 = require("../elements/blocks/topic/topic.builder");
 const topic_1 = require("../elements/blocks/topic/topic");
 /**
  * A `Module` is an isolated named collection of _Elements_.
@@ -169,68 +157,6 @@ class Module {
         });
         return this;
     }
-    /**
-     * Include references for external elements on the module.
-     * This allows a module to use elements from other modules directly.
-     * This implementation also includes transitive dependencies.
-     *
-     * @param daemon A `Daemon` instance
-     * @param dependencies: A dictionary of dependencies by element type
-     * @returns The `Module`, for call-chaining
-     */
-    injectDependencies(modules, dependencies) {
-        dependencies.buckets?.forEach(dep => {
-            const bucketModule = modules[dep.module];
-            const bucket = bucketModule.buckets[dep.name];
-            if (!bucket) {
-                throw new Error(`Internal Error: unable to find bucket '${dep.tag}' during injection to module '${this.name}'`);
-            }
-            this.buckets[dep.refName] = bucket;
-        });
-        dependencies.jobs?.forEach(dep => {
-            const jobModule = modules[dep.module];
-            const job = jobModule.jobs[dep.name];
-            if (!job) {
-                throw new Error(`Internal Error: unable to find job '${dep.tag}' during injection to module '${this.name}'`);
-            }
-            this.jobs[dep.refName] = job;
-            const schema = job.schema;
-            this.injectDependencies(modules, {
-                messages: schema.input
-            });
-        });
-        dependencies.messages?.forEach(dep => {
-            const messageModule = modules[dep.module];
-            const message = messageModule.messages[dep.name];
-            if (!message) {
-                throw new Error(`Internal Error: unable to find message '${dep.tag}' during injection to module '${this.name}'`);
-            }
-            this.messages[dep.refName] = message;
-        });
-        dependencies.machines?.forEach(dep => {
-            const machineModule = modules[dep.module];
-            const machine = machineModule.machines[dep.name];
-            if (!machine) {
-                throw new Error(`Internal Error: unable to find machine '${dep.tag}' during injection to module '${this.name}'`);
-            }
-            this.machines[dep.refName] = machine;
-            const schema = machine.schema;
-            this.injectDependencies(modules, {
-                messages: schema.input,
-                buckets: schema.buckets,
-                jobs: schema.jobs
-            });
-        });
-        dependencies.enums?.forEach(dep => {
-            const enumModule = modules[dep.module];
-            const _enum = enumModule.schema.constants.enums[dep.name];
-            if (!_enum) {
-                throw new Error(`Internal Error: unable to find enum '${dep.refName}' during injection to module '${this.name}'`);
-            }
-            this.schema.constants.enums[`${dep.refName}`] = _enum;
-        });
-        return this;
-    }
     /**
      * Include references for external elements on the module.
      *
@@ -239,8 +165,8 @@ class Module {
      * @returns The `Module`, for call-chaining
      */
     injectRunners(elements) {
-        Object.entries(elements.jobs || {}).forEach(([refName, job]) => {
-            this.jobs[refName] = job;
+        Object.entries(elements.jobs || {}).forEach(([shortTag, job]) => {
+            this.jobs[shortTag] = job;
         });
         return this;
     }
@@ -276,87 +202,6 @@ class Module {
         });
         return files;
     }
-    // Build Nodes
-    /**
-     * Build a resolved builder node, then merge the
-     * resulting schema(s) to the module.
-     * This also merges the resulting inline nodes of building a node.
-     *
-     * @param node A resolved builder node
-     * @param tree A module tree
-     */
-    async buildNode(node, tree) {
-        log_1.Log.trace('compiler', 'module', `Building ${this.name}::${(0, log_1.scopeTag)(node.builder.$b, node.builder.name)}`);
-        if (node.builder.$b === 'constants') {
-            this.schema.constants = constants_builder_1.ConstantsBuilder.build(node);
-        }
-        else if (node.builder.$b === 'externals') {
-            this.schema.externals = externals_builder_1.ExternalsBuilder.build(node);
-        }
-        else if (node.builder.$b === 'bucket') {
-            this.schema.buckets[node.name] = bucket_builder_1.BucketBuilder.build(node, tree);
-        }
-        else if (node.builder.$b === 'message') {
-            this.schema.messages[node.name] = message_builder_1.MessageBuilder.build(node, tree, this.schema);
-        }
-        else if (node.builder.$b === 'job') {
-            const { schema, inlineMessages } = job_builder_1.JobBuilder.build(node, tree, this.schema);
-            this.schema.jobs[node.name] = schema;
-            this.mergeInlineMessages(inlineMessages);
-        }
-        else if (node.builder.$b === 'resource') {
-            const { schema, inlineMessages, inlineJobs } = resource_builder_1.ResourceBuilder.build(node, tree, this.schema);
-            this.schema.resources[schema.name] = schema;
-            this.mergeInlineMessages(inlineMessages);
-            this.mergeInlineJobs(inlineJobs);
-        }
-        else if (node.builder.$b === 'machine') {
-            const { schema, inlineMessages, inlineJobs } = machine_builder_1.MachineBuilder.build(node, tree, this.schema);
-            this.schema.machines[schema.name] = schema;
-            this.mergeInlineMessages(inlineMessages);
-            this.mergeInlineJobs(inlineJobs);
-        }
-        else if (node.builder.$b === 'controller') {
-            this.schema.controllers[node.name] = controller_builder_1.ControllerBuilder.build(node);
-        }
-        else if (node.builder.$b === 'queue') {
-            const { schema, inlineMessages } = queue_builder_1.QueueBuilder.build(node, tree, this.schema);
-            this.schema.queues[node.name] = schema;
-            this.mergeInlineMessages(inlineMessages);
-        }
-        else if (node.builder.$b === 'topic') {
-            const { schema, inlineMessages } = topic_builder_1.TopicBuilder.build(node, tree, this.schema);
-            this.schema.topics[node.name] = schema;
-            this.mergeInlineMessages(inlineMessages);
-        }
-        else {
-            throw error_1.NesoiError.Module.UnknownBuilderType(this, node.filepath.toString(), node.name, node.builder.$b);
-        }
-    }
-    /**
-     * Merge inline message schemas into the module.
-     *
-     * @param node A resolved builder node
-     * @param schemas A dictionary of Message schemas by name
-     */
-    mergeInlineMessages(schemas) {
-        for (const name in schemas) {
-            const $msg = schemas[name];
-            this.schema.messages[name] = $msg;
-        }
-    }
-    /**
-     * Merge inline job schemas into the module.
-     *
-     * @param node A resolved builder node
-     * @param schemas A dictionary of job schemas by name
-     */
-    mergeInlineJobs(schemas) {
-        for (const name in schemas) {
-            const $job = schemas[name];
-            this.schema.jobs[name] = $job;
-        }
-    }
     // Start
     /**
      * Create elements from schemas, and the NQL engine for this module.
@@ -365,7 +210,12 @@ class Module {
      * @param services A dictionary of services by name
      */
     start(app, services) {
-        const info = app_1.App.getInfo(app);
+        // .getInfo() avoided due to circular dependency
+        const info = {
+            spaceModules: app._spaceModuleNames,
+            config: app._config,
+            nesoiNpmPkg: app._nesoiNpmPkg,
+        };
         const config = info.config;
         Object.entries(this.schema.buckets).forEach(([name, schema]) => {
             const bucketConfig = config.modules?.[this.name]?.buckets?.[name];
@@ -473,5 +323,75 @@ class Module {
         }
         return virtualModule;
     }
+    /**
+     * Include references for external elements on the module.
+     * This is used to create virtual modules and inline apps.
+     * This implementation also includes transitive dependencies.
+     *
+     * @param daemon A `Daemon` instance
+     * @param dependencies: A dictionary of dependencies by element type
+     * @returns The `Module`, for call-chaining
+     */
+    injectDependencies(modules, externals) {
+        externals.buckets?.forEach(tag => {
+            const bucketModule = modules[tag.module];
+            const bucket = bucketModule.buckets[tag.name];
+            if (!bucket) {
+                throw new Error(`Internal Error: unable to find '${tag.full}' during injection to module '${this.name}'`);
+            }
+            this.buckets[tag.short] = bucket;
+        });
+        externals.jobs?.forEach(tag => {
+            const jobModule = modules[tag.module];
+            const job = jobModule.jobs[tag.name];
+            if (!job) {
+                throw new Error(`Internal Error: unable to find '${tag.full}' during injection to module '${this.name}'`);
+            }
+            this.jobs[tag.short] = job;
+            const schema = job.schema;
+            this.injectDependencies(modules, {
+                messages: schema.input
+            });
+        });
+        externals.messages?.forEach(tag => {
+            const messageModule = modules[tag.module];
+            const message = messageModule.messages[tag.name];
+            if (!message) {
+                throw new Error(`Internal Error: unable to find '${tag.full}' during injection to module '${this.name}'`);
+            }
+            this.messages[tag.short] = message;
+        });
+        externals.machines?.forEach(tag => {
+            const machineModule = modules[tag.module];
+            const machine = machineModule.machines[tag.name];
+            if (!machine) {
+                throw new Error(`Internal Error: unable to find '${tag.full}' during injection to module '${this.name}'`);
+            }
+            this.machines[tag.short] = machine;
+            const schema = machine.schema;
+            this.injectDependencies(modules, {
+                messages: schema.input,
+                buckets: schema.buckets,
+                jobs: schema.jobs
+            });
+        });
+        externals.enums?.forEach(tag => {
+            const enumModule = modules[tag.module];
+            const _enum = enumModule.schema.constants.enums[tag.name];
+            if (!_enum) {
+                throw new Error(`Internal Error: unable to find enum '${tag.short}' during injection to module '${this.name}'`);
+            }
+            this.schema.constants.enums[`${tag.short}`] = _enum;
+        });
+        externals.values?.forEach(tag => {
+            const valueModule = modules[tag.module];
+            const _value = valueModule.schema.constants.values[tag.name];
+            if (!_value) {
+                throw new Error(`Internal Error: unable to find value '${tag.short}' during injection to module '${this.name}'`);
+            }
+            this.schema.constants.values[`${tag.short}`] = _value;
+        });
+        return this;
+    }
 }
 exports.Module = Module;

package/lib/engine/space.d.ts

@@ -41,13 +41,13 @@ export declare class Space<$ extends $Space> {
     name(name: string): this;
     /**
      * Set one authentication model.
-     * This model MUST be yielded by the `AuthnProvider` assigned
+     * This model MUST be yielded by the `AuthProvider` assigned
      * to the same name.
      * > This method MUST be called on the root `nesoi.ts` file.
      * @param name A name for the authentication
      * @returns The current Space, for call-chaining
      */
-    authn<Name extends string, Def extends BucketModelDef<$, never>>(name: Name, $: Def): this;
+    auth<Name extends string, Def extends BucketModelDef<$, never>>(name: Name, $: Def): this;
     /**
      * > Elements / Entities / Constants
      *

package/lib/engine/space.js

@@ -47,9 +47,9 @@ const controller_builder_1 = require("../elements/edge/controller/controller.bui
 const bucket_builder_1 = require("../elements/entities/bucket/bucket.builder");
 const bucket_model_builder_1 = require("../elements/entities/bucket/model/bucket_model.builder");
 const bucket_model_field_builder_1 = require("../elements/entities/bucket/model/bucket_model_field.builder");
-const error_1 = require("../compiler/error");
 const queue_builder_1 = require("../elements/blocks/queue/queue.builder");
 const topic_builder_1 = require("../elements/blocks/topic/topic.builder");
+const error_1 = require("./data/error");
 /**
  * When using Nesoi as a framework (not a library), the `Space`
  * is a collection of all modules.
@@ -86,17 +86,17 @@ class Space {
     }
     /**
      * Set one authentication model.
-     * This model MUST be yielded by the `AuthnProvider` assigned
+     * This model MUST be yielded by the `AuthProvider` assigned
      * to the same name.
      * > This method MUST be called on the root `nesoi.ts` file.
      * @param name A name for the authentication
      * @returns The current Space, for call-chaining
      */
-    authn(name, $) {
+    auth(name, $) {
         const fieldBuilder = new bucket_model_field_builder_1.BucketModelFieldFactory('*');
         const fields = $(fieldBuilder);
         const builder = new bucket_model_builder_1.BucketModelBuilder('*').fields(fields);
-        this._authn[name] = bucket_model_builder_1.BucketModelBuilder.build(builder);
+        this._authn[name] = bucket_model_builder_1.BucketModelBuilder.build(builder, {});
         return this;
     }
     /*
@@ -303,11 +303,11 @@ class Space {
      */
     static scan(space, buildFn) {
         if (!fs.existsSync(space.dirpath)) {
-            throw error_1.CompilerError.DirectoryDoesntExists(space.dirpath);
+            throw error_1.NesoiError.Space.DirectoryDoesntExists(space.dirpath);
         }
         const modulesPath = this.path(space, './modules');
         if (!fs.existsSync(modulesPath)) {
-            throw error_1.CompilerError.NoModulesFolder();
+            throw error_1.NesoiError.Space.NoModulesFolder();
         }
         const perform = (dirpath, subdir) => {
             const dirs = fs.readdirSync(dirpath, { withFileTypes: true })

package/lib/engine/transaction/nodes/bucket.trx_node.d.ts

@@ -6,17 +6,20 @@ import { Bucket } from "../../../elements/entities/bucket/bucket";
 import { CreateObj, PatchObj, PutObj } from "../../../elements/entities/bucket/bucket.types";
 import { NQL_Query } from "../../../elements/entities/bucket/query/nql.schema";
 import { NesoiFile } from "../../data/file";
+import { Tag } from "../../dependency";
 /**
  * @category Engine
  * @subcategory Transaction
  */
 export declare class BucketTrxNode<M extends $Module, $ extends $Bucket> {
-    private parentTrx;
-    private bucket;
+    private trx;
+    private tag;
     private enableTenancy;
-    constructor(parentTrx: TrxNode<any, M, any>, bucket: Bucket<M, $>);
+    private external;
+    private bucket?;
+    constructor(trx: TrxNode<any, M, any>, tag: Tag);
     get no_tenancy(): this;
-    wrap(action: string, input: Record<string, any>, fn: (trx: AnyTrxNode) => Promise<any>, fmtTrxOut?: (out: any) => any): Promise<any>;
+    wrap(action: string, input: Record<string, any>, fn: (trx: AnyTrxNode, element: Bucket<M, $>) => Promise<any>, fmtTrxOut?: (out: any) => any): Promise<any>;
     /**
      * Returns one object by `id`, without pre-formatting,
      * or `undefined` if the object was not found.