nesoi 3.1.8 → 3.2.2

package/lib/engine/apps/distributed/inc/sandbox.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const inc_server_1 = require("./inc.server");
+const inc_client_1 = require("./inc.client");
+const log_1 = require("../../../util/log");
+log_1.Log.level = 'debug';
+async function main() {
+    const server = new inc_server_1.INCServer({
+        name: 'mandala-alpha-1',
+        port: 2222
+    });
+    await server.start();
+    const client = new inc_client_1.INCClient({
+        name: 'mandala-beta-2',
+        server: {
+            host: 'localhost',
+            port: 2222
+        }
+    });
+    await client.start();
+    await client.send('Oi do cliente!');
+    await server.send(Object.keys(server.clients)[0], 'Oi do servidor!');
+}
+main();

package/lib/engine/apps/inline.app.d.ts

@@ -4,7 +4,7 @@ import { IService } from './service';
 import { AnyTrxEngine } from '../transaction/trx_engine';
 import { AnyBuilder, AnyModule, Module } from '../module';
 import { AnyDaemon, Daemon } from '../daemon';
-import { AppConfigFactory } from './app.config';
+import { AppConfigBuilder } from './app.config';
 /**
  * @category App
  */
@@ -45,7 +45,7 @@ export declare class InlineApp<S extends $Space, ModuleNames extends string = Mo
     protected linkAppValues(modules: Record<string, Module<S, $Module>>): void;
     modules<M extends ModuleName<S>>(modules: M[]): InlineApp<S, M & ModuleNames>;
     service<T extends IService>($: T): InlineApp<S, ModuleNames, Services & { [K in T["name"]]: T; }>;
-    get config(): AppConfigFactory<S, ModuleNames, Services, typeof this>;
+    get config(): AppConfigBuilder<S, ModuleNames, Services, typeof this>;
     static package(app: InlineApp<any, any>, scripts: Record<string, string>, dependencies: Record<string, string>): {
         name: string;
         version: string;

package/lib/engine/apps/inline.app.js

@@ -73,7 +73,7 @@ class InlineApp extends app_1.App {
         for (const m in modules) {
             const module = modules[m];
             module.start(this, services);
-            const trxConfig = this._config.trxEngine?.[m];
+            const trxConfig = this._config.modules?.[m]?.trx;
             const authn = {};
             for (const a in this._config?.authn || {}) {
                 const prov = this._config.authn?.[a]?.();
@@ -158,7 +158,7 @@ class InlineApp extends app_1.App {
         return this;
     }
     get config() {
-        return new app_config_1.AppConfigFactory(this);
+        return new app_config_1.AppConfigBuilder(this);
     }
     //
     static package(app, scripts, dependencies) {

package/lib/engine/apps/monolyth/monolyth.app.d.ts

@@ -4,7 +4,7 @@ import { InlineApp } from './../inline.app';
 import { AnyTrxEngine } from '../../transaction/trx_engine';
 import { Space } from '../../space';
 import { Daemon } from "../../daemon";
-import { AppConfigFactory } from '../app.config';
+import { AppConfigBuilder } from '../app.config';
 /**
  * @category App
  * @subcategory Monolyth
@@ -20,7 +20,7 @@ export declare class MonolythApp<S extends $Space, ModuleNames extends string =
     remake(): Promise<void>;
     modules<M extends ModuleName<S>>(modules: M[]): MonolythApp<S, M & ModuleNames>;
     service<T extends IService>($: T): MonolythApp<S, ModuleNames, Services & { [K in T["name"]]: T; }>;
-    get config(): AppConfigFactory<S, ModuleNames, Services, typeof this>;
+    get config(): AppConfigBuilder<S, ModuleNames, Services, typeof this>;
 }
 /**
  * @category App

package/lib/engine/apps/monolyth/monolyth.app.js

@@ -101,7 +101,7 @@ class MonolythApp extends inline_app_1.InlineApp {
         return this;
     }
     get config() {
-        return new app_config_1.AppConfigFactory(this);
+        return new app_config_1.AppConfigBuilder(this);
     }
 }
 exports.MonolythApp = MonolythApp;

package/lib/engine/module.d.ts

@@ -4,7 +4,7 @@ import { AnyMessageBuilder } from "../elements/entities/message/message.builder"
 import { AnyBucketBuilder } from "../elements/entities/bucket/bucket.builder";
 import { AnyResourceBuilder } from "../elements/blocks/resource/resource.builder";
 import { AnyMachineBuilder } from "../elements/blocks/machine/machine.builder";
-import { Job } from "../elements/blocks/job/job";
+import { AnyJob, Job } from "../elements/blocks/job/job";
 import { AnyJobBuilder } from "../elements/blocks/job/job.builder";
 import { MessageParser } from "../elements/entities/message/message_parser";
 import { $Message } from "../elements/entities/message/message.schema";
@@ -147,6 +147,16 @@ export declare class Module<S extends $Space, $ extends $Module> {
         messages?: $Dependency[];
         machines?: $Dependency[];
     }): this;
+    /**
+     * Include references for external elements on the module.
+     *
+     * @param daemon A `Daemon` instance
+     * @param dependencies: A dictionary of dependencies by element type
+     * @returns The `Module`, for call-chaining
+     */
+    injectRunners(elements: {
+        jobs?: Record<string, AnyJob>;
+    }): this;
     /**
      * Recursively find all files inside the module dir.
      *

package/lib/engine/module.js

@@ -224,6 +224,19 @@ class Module {
         });
         return this;
     }
+    /**
+     * Include references for external elements on the module.
+     *
+     * @param daemon A `Daemon` instance
+     * @param dependencies: A dictionary of dependencies by element type
+     * @returns The `Module`, for call-chaining
+     */
+    injectRunners(elements) {
+        Object.entries(elements.jobs || {}).forEach(([refName, job]) => {
+            this.jobs[refName] = job;
+        });
+        return this;
+    }
     // Treeshaking
     /**
      * Recursively find all files inside the module dir.
@@ -348,7 +361,7 @@ class Module {
         const info = app_1.App.getInfo(app);
         const config = info.config;
         Object.entries(this.schema.buckets).forEach(([name, schema]) => {
-            const bucketConfig = config.buckets?.[this.name]?.[name];
+            const bucketConfig = config.modules?.[this.name]?.buckets?.[name];
             this.buckets[name] = new bucket_1.Bucket(this, schema, bucketConfig, services);
         });
         Object.entries(this.schema.messages).forEach(([name, schema]) => {
@@ -364,7 +377,7 @@ class Module {
             this.machines[name] = new machine_1.Machine(this, schema);
         });
         Object.entries(this.schema.controllers).forEach(([name, schema]) => {
-            const controllerConfig = config.controllers?.[this.name]?.[name];
+            const controllerConfig = config.modules?.[this.name]?.controllers?.[name];
             this.controllers[name] = new controller_1.Controller(this, schema, controllerConfig, services);
         });
         Object.entries(this.schema.queues).forEach(([name, schema]) => {
@@ -374,8 +387,8 @@ class Module {
             this.topics[name] = new topic_1.Topic(this, schema);
         });
         this.nql = new nql_engine_1.NQL_Engine(this);
-        if (config.trash?.[this.name]) {
-            this.trash = new bucket_1.Bucket(this, trash_1.$TrashBucket, config.trash[this.name], services);
+        if (config.modules?.[this.name]?.trash) {
+            this.trash = new bucket_1.Bucket(this, trash_1.$TrashBucket, config.modules?.[this.name]?.trash, services);
         }
     }
     // Destroy

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

@@ -64,6 +64,11 @@ export declare class BucketTrxNode<M extends $Module, $ extends $Bucket> {
      * or `undefined` if the graph link doesn't resolve.
      */
     readLink<LinkName extends keyof $['graph']['links'], Link extends $['graph']['links'][LinkName], Obj extends Link['#bucket']['#data']>(id: $['#data']['id'], link: LinkName): Promise<Link['#many'] extends true ? Obj[] : (Obj | undefined)>;
+    /**
+     * Returns one or more objects referenced by the graph link,
+     * or `undefined` if the graph link doesn't resolve.
+     */
+    readManyLinks<LinkName extends keyof $['graph']['links'], Link extends $['graph']['links'][LinkName], Obj extends Link['#bucket']['#data']>(ids: $['#data']['id'][], link: LinkName): Promise<Link['#many'] extends true ? Obj[] : (Obj | undefined)>;
     /**
      * Returns one or more objects referenced by the graph link built with a view,
      * or `undefined` if the graph link doesn't resolve.

package/lib/engine/transaction/nodes/bucket.trx_node.js

@@ -133,6 +133,16 @@ class BucketTrxNode {
             no_tenancy: !this.enableTenancy
         }));
     }
+    /**
+     * Returns one or more objects referenced by the graph link,
+     * or `undefined` if the graph link doesn't resolve.
+     */
+    async readManyLinks(ids, link) {
+        return this.wrap('readLinks', { ids, link }, trx => this.bucket.readManyLinks(trx, ids, link, {
+            silent: true,
+            no_tenancy: !this.enableTenancy
+        }));
+    }
     /**
      * Returns one or more objects referenced by the graph link built with a view,
      * or `undefined` if the graph link doesn't resolve.

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

@@ -14,8 +14,10 @@ export declare class BucketQueryTrxNode<M extends $Module, B extends $Bucket, V
     private query;
     private enableTenancy;
     private view?;
+    private _params?;
     constructor(trx: TrxNode<any, M, any>, bucket: Bucket<M, B>, query: NQL_AnyQuery, enableTenancy: boolean, view?: V | undefined);
     merge($: NQL_Query<M, B>): void;
+    params(value: Record<string, any>): this;
     first(): Promise<Obj | undefined>;
     firstOrFail(): Promise<Obj>;
     all(): Promise<Obj[]>;

package/lib/engine/transaction/nodes/bucket_query.trx_node.js

@@ -14,6 +14,7 @@ class BucketQueryTrxNode {
         this.query = query;
         this.enableTenancy = enableTenancy;
         this.view = view;
+        this._params = [];
     }
     merge($) {
         const and = $['#and'];
@@ -24,6 +25,10 @@ class BucketQueryTrxNode {
         this.query['#and*'] = and; // TODO: make this a little better
         this.query['#or*'] = or; // TODO: make this a little better
     }
+    params(value) {
+        this._params = [value];
+        return this;
+    }
     async first() {
         await trx_node_1.TrxNode.open(this.trx, 'queryFirst', { schema: this.query, view: this.view });
         let results;
@@ -31,7 +36,8 @@ class BucketQueryTrxNode {
             results = await this.bucket.query(this.trx, this.query, {
                 perPage: 1
             }, this.view, {
-                no_tenancy: !this.enableTenancy
+                no_tenancy: !this.enableTenancy,
+                params: this._params
             });
         }
         catch (e) {
@@ -47,7 +53,8 @@ class BucketQueryTrxNode {
         let results;
         try {
             results = await this.bucket.query(this.trx, this.query, undefined, this.view, {
-                no_tenancy: !this.enableTenancy
+                no_tenancy: !this.enableTenancy,
+                params: this._params
             });
         }
         catch (e) {
@@ -64,7 +71,9 @@ class BucketQueryTrxNode {
         await trx_node_1.TrxNode.open(this.trx, 'queryAll', { schema: this.query, view: this.view });
         let results;
         try {
-            results = await this.bucket.query(this.trx, this.query, undefined, this.view);
+            results = await this.bucket.query(this.trx, this.query, undefined, this.view, {
+                params: this._params
+            });
         }
         catch (e) {
             throw await trx_node_1.TrxNode.error(this.trx, e); // Bucket unexpected error
@@ -81,7 +90,9 @@ class BucketQueryTrxNode {
         await trx_node_1.TrxNode.open(this.trx, 'queryPage', { schema: this.query, pagination, view: this.view });
         let result;
         try {
-            result = await this.bucket.query(this.trx, this.query, pagination, this.view);
+            result = await this.bucket.query(this.trx, this.query, pagination, this.view, {
+                params: this._params
+            });
         }
         catch (e) {
             throw await trx_node_1.TrxNode.error(this.trx, e); // Bucket unexpected error

package/lib/engine/util/log.d.ts

@@ -1,7 +1,7 @@
 import { $BlockType } from "../../elements/blocks/block.schema";
 declare const LogLevel: readonly ["off", "error", "warn", "info", "debug", "trace"];
 export type LogLevel = typeof LogLevel[number];
-export type LogScope = $BlockType | 'compiler' | 'trx' | 'daemon' | 'app' | 'module' | 'layer' | 'message' | 'bucket' | 'job' | 'resource' | 'controller' | 'queue' | 'topic' | 'constants' | 'externals';
+export type LogScope = $BlockType | 'compiler' | 'trx' | 'daemon' | 'app' | 'module' | 'layer' | 'message' | 'bucket' | 'job' | 'resource' | 'controller' | 'queue' | 'topic' | 'constants' | 'externals' | 'nql' | 'inc.server' | 'inc.client';
 export declare function scopeTag(scope: LogScope, scope_id: string): string;
 export declare function anyScopeTag(scopeWithId: string): string;
 export declare class Log {

package/lib/engine/util/log.js

@@ -25,6 +25,9 @@ function scopeTag(scope, scope_id) {
         machine: 'lightblue',
         queue: 'lightblue',
         topic: 'lightblue',
+        nql: 'lightpurple',
+        'inc.server': 'lightgreen',
+        'inc.client': 'lightcyan',
     }[scope] || 'lightgray';
     return (0, string_1.colored)(`${scope}:${scope_id}`, color);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nesoi",
-    "version": "3.1.8",
+    "version": "3.2.2",
     "description": "Declarative framework for data-driven applications",
     "repository": {
         "type": "git",

package/tools/joaquin/bucket.d.ts

@@ -1,9 +1,29 @@
-import { AnyBucketBuilder } from "../../src/elements/entities/bucket/bucket.builder";
+import { AnyBucketBuilder, BucketBuilder } from "../../src/elements/entities/bucket/bucket.builder";
 import { NesoiError } from "../../src/engine/data/error";
 import { AnyBuilder } from "../../src/engine/module";
-export declare function expectBucket(def: (builder: AnyBucketBuilder) => any, inject?: AnyBuilder[]): {
+export declare function givenBucket<Def>(name: string, def: (builder: AnyBucketBuilder) => any): {
+    builder: BucketBuilder<import("../../src/elements").$Space, import("../../src/elements").$Module, Omit<import("../../src/elements").$Bucket, "views"> & {
+        views: {};
+    }>;
+    data: Record<string, any>;
+    withData(mock: Record<string, any>): {
+        builder: BucketBuilder<import("../../src/elements").$Space, import("../../src/elements").$Module, Omit<import("../../src/elements").$Bucket, "views"> & {
+            views: {};
+        }>;
+        data: Record<string, any>;
+        withData(mock: Record<string, any>): /*elided*/ any;
+    };
+};
+export declare function expectBucket(def: (builder: AnyBucketBuilder) => any, inject?: (AnyBuilder | {
+    builder: AnyBucketBuilder;
+    data: Record<string, any>;
+})[]): {
     toBuildOne(raw: Record<string, any>, view: string): {
-        as(parsed: Record<string, any>): Promise<void>;
+        as(parsed: Record<string, any> | Record<string, any>[]): Promise<void>;
+        butFail(error: (...args: any[]) => NesoiError.BaseError): Promise<void>;
+    };
+    toBuildMany(raws: Record<string, any>[], view: string): {
+        as(parsed: Record<string, any> | Record<string, any>[]): Promise<void>;
         butFail(error: (...args: any[]) => NesoiError.BaseError): Promise<void>;
     };
 };

package/tools/joaquin/bucket.js

@@ -1,43 +1,71 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.givenBucket = givenBucket;
 exports.expectBucket = expectBucket;
 const bucket_builder_1 = require("../../src/elements/entities/bucket/bucket.builder");
 const inline_app_1 = require("../../src/engine/apps/inline.app");
+const elements_1 = require("../../src/elements");
+function givenBucket(name, def) {
+    const builder = new bucket_builder_1.BucketBuilder('test', name);
+    const data = {};
+    def(builder);
+    return {
+        builder,
+        data,
+        withData(mock) {
+            Object.assign(data, mock);
+            return this;
+        }
+    };
+}
 function expectBucket(def, inject = []) {
     const builder = new bucket_builder_1.BucketBuilder('test', 'test');
     def(builder);
-    const app = new inline_app_1.InlineApp('test', [...inject, builder]);
+    const injectBuilders = inject.map(i => 'builder' in i ? i.builder : i);
+    const app = new inline_app_1.InlineApp('test', [...injectBuilders, builder]);
+    // Configure buckets
+    const bucketConfig = {};
+    for (const i of inject) {
+        if (!('data' in i))
+            continue;
+        bucketConfig[i.builder.name] = {
+            adapter: (schema) => new elements_1.MemoryBucketAdapter(schema, i.data)
+        };
+    }
+    app.config.module('test', {
+        buckets: bucketConfig
+    });
     let promise;
     const step1 = {
         toBuildOne(raw, view) {
-            promise = Promise.all([raw].map(raw => app.daemon().then(daemon => daemon.trx('test').run(trx => trx.bucket('test').buildOne(raw, view)))));
+            promise = () => app.daemon().then(daemon => daemon.trx('test').run(trx => trx.bucket('test').buildOne(raw, view)));
+            return step2;
+        },
+        toBuildMany(raws, view) {
+            promise = () => app.daemon().then(daemon => daemon.trx('test').run(trx => trx.bucket('test').buildMany(raws, view)));
             return step2;
         }
     };
     const step2 = {
         async as(parsed) {
-            const status = await promise;
-            status.forEach(st => {
-                if (st.state === 'error') {
-                    console.log(st.summary());
-                    console.error(st.error?.data);
-                    console.error(st.error?.data?.unionErrors);
-                    console.error(st.error?.stack);
-                }
-                expect(st.state).toEqual('ok');
-                expect(st.output)
-                    .toEqual(parsed);
-            });
+            const status = await promise();
+            if (status.state === 'error') {
+                console.log(status.summary());
+                console.error(status.error?.data);
+                console.error(status.error?.data?.unionErrors);
+                console.error(status.error?.stack);
+            }
+            expect(status.state).toEqual('ok');
+            expect(status.output)
+                .toEqual(parsed);
         },
         async butFail(error) {
             const errorObj = error({});
             try {
-                const status = await promise;
-                status.forEach(st => {
-                    expect(st.state).toEqual('error');
-                    expect(st.error?.name)
-                        .toEqual(errorObj.name);
-                });
+                const status = await promise();
+                expect(status.state).toEqual('error');
+                expect(status.error?.name)
+                    .toEqual(errorObj.name);
             }
             catch (e) {
                 expect(e.toString())

package/tools/joaquin/job.js

@@ -13,18 +13,18 @@ function expectJob(def) {
     const step1 = {
         onRaw(_raw) {
             raw = _raw;
-            promise = app.daemon().then(daemon => daemon.trx('test').run(trx => trx.job('test').run(_raw)));
+            promise = () => app.daemon().then(daemon => daemon.trx('test').run(trx => trx.job('test').run(_raw)));
             return step2;
         },
         onMessage(_msg) {
             msg = _msg;
-            promise = app.daemon().then(daemon => daemon.trx('test').run(trx => trx.job('test').forward(_msg)));
+            promise = () => app.daemon().then(daemon => daemon.trx('test').run(trx => trx.job('test').forward(_msg)));
             return step2;
         }
     };
     const step2 = {
         async toResolve(value) {
-            const status = await promise;
+            const status = await promise();
             expect(status.state).toEqual('ok');
             expect(status.output)
                 .toEqual(value({ raw, msg }));
@@ -32,7 +32,7 @@ function expectJob(def) {
         async toReject(error) {
             const errorObj = error({ raw, msg })({});
             try {
-                const status = await promise;
+                const status = await promise();
                 expect(status.state).toEqual('error');
                 expect(status.error?.name)
                     .toEqual(errorObj.name);