nesoi 3.0.9 → 3.0.10

package/lib/engine/transaction/trx.d.ts

@@ -1,9 +1,10 @@
 import { $Module, $Space } from "../../schema";
 import { Module } from '../module';
 import { AnyTrxNode, TrxNode, TrxNodeStatus } from './trx_node';
-import { TrxEngineOrigin } from './trx_engine';
+import { AnyTrxEngine, TrxEngineOrigin } from './trx_engine';
 import { AnyUsers, AuthnRequest } from '../auth/authn';
 import { NesoiDatetime } from '../data/datetime';
+import { NesoiError } from '../data/error';
 type TrxOrigin = TrxEngineOrigin | `trx:${string}`;
 type TrxState = 'open' | 'ok' | 'error';
 /**
@@ -17,9 +18,9 @@ export declare class TrxStatus<Output> {
     end?: NesoiDatetime | undefined;
     state?: TrxState | undefined;
     output?: Output | undefined;
-    error?: string | undefined;
+    error?: NesoiError.BaseError | undefined;
     nodes: TrxNodeStatus[];
-    constructor(id: string, origin: TrxOrigin, start: NesoiDatetime, end?: NesoiDatetime | undefined, state?: TrxState | undefined, output?: Output | undefined, error?: string | undefined, nodes?: TrxNodeStatus[]);
+    constructor(id: string, origin: TrxOrigin, start: NesoiDatetime, end?: NesoiDatetime | undefined, state?: TrxState | undefined, output?: Output | undefined, error?: NesoiError.BaseError | undefined, nodes?: TrxNodeStatus[]);
     summary(): string;
 }
 /**
@@ -27,6 +28,7 @@ export declare class TrxStatus<Output> {
  * @subcategory Transaction
  */
 export declare class Trx<S extends $Space, M extends $Module, Authn extends AnyUsers> {
+    engine: AnyTrxEngine;
     private module;
     id: string;
     private origin;
@@ -35,7 +37,7 @@ export declare class Trx<S extends $Space, M extends $Module, Authn extends AnyU
     start: NesoiDatetime;
     end?: NesoiDatetime;
     ctx: Record<string, any>;
-    constructor(module: Module<S, M>, origin: TrxOrigin, authn?: {
+    constructor(engine: AnyTrxEngine, module: Module<S, M>, origin: TrxOrigin, authn?: {
         tokens: AuthnRequest<any>;
         users: Authn;
     }, id?: string, root?: TrxNode<S, M, Authn>, nodes?: Record<string, TrxNode<S, M, Authn>>);

package/lib/engine/transaction/trx.js

@@ -54,7 +54,8 @@ exports.TrxStatus = TrxStatus;
  * @subcategory Transaction
  */
 class Trx {
-    constructor(module, origin, authn, id, root, nodes) {
+    constructor(engine, module, origin, authn, id, root, nodes) {
+        this.engine = engine;
         this.start = datetime_1.NesoiDatetime.now();
         this.ctx = {};
         this.module = module;

package/lib/engine/transaction/trx_engine.config.d.ts

@@ -4,10 +4,10 @@ import { AnyTrx, Trx } from './trx';
 import { AnyUsers } from '../auth/authn';
 import { TrxNode, TrxNodeStatus } from './trx_node';
 export type TrxEngineWrapFn<S extends $Space, M extends $Module> = (trx: TrxNode<S, M, any>) => Promise<TrxNodeStatus>;
-export type TrxEngineConfig<S extends $Space, M extends $Module, Authn extends AnyUsers, Providers extends Record<string, any>> = {
+export type TrxEngineConfig<S extends $Space, M extends $Module, Authn extends AnyUsers, Services extends Record<string, any>> = {
     /**
      * Adapter used to store transactions of this module.
      */
     adapter?: (schema: M) => BucketAdapter<AnyTrx>;
-    wrap?: <T extends Trx<S, M, Authn>>(trx: T, fn: TrxEngineWrapFn<S, M>, providers: Providers) => Promise<any>;
+    wrap?: <T extends Trx<S, M, Authn>>(trx: T, fn: TrxEngineWrapFn<S, M>, services: Services) => Promise<any>;
 };

package/lib/engine/transaction/trx_engine.d.ts

@@ -4,6 +4,7 @@ import { Trx } from './trx';
 import { TrxNode, TrxNodeStatus } from './trx_node';
 import { AnyAuthnProviders, AuthnRequest } from '../auth/authn';
 import { TrxEngineConfig } from './trx_engine.config';
+import { IService } from '../apps/service';
 export type TrxEngineOrigin = `app:${string}`;
 /**
  * @category Engine
@@ -14,17 +15,17 @@ export declare class TrxEngine<S extends $Space, M extends $Module, Authn extend
     private module;
     private authnProviders?;
     private config?;
-    private providers;
+    private services;
     /**
      * Transaction used to read/write transactions on the adapter
      */
     private innerTrx;
     private adapter;
-    constructor(origin: TrxEngineOrigin, module: Module<S, M>, authnProviders?: Authn | undefined, config?: TrxEngineConfig<S, M, any, any> | undefined, providers?: Record<string, any>);
+    constructor(origin: TrxEngineOrigin, module: Module<S, M>, authnProviders?: Authn | undefined, config?: TrxEngineConfig<S, M, any, any> | undefined, services?: Record<string, IService>);
     getModule(): Module<S, M>;
     get(id?: string): Promise<Trx<S, M, any>>;
     trx(fn: (trx: TrxNode<S, M, any>) => Promise<TrxNodeStatus>, authn?: AuthnRequest<keyof Authn>): Promise<import("./trx").TrxStatus<any>>;
-    private authenticate;
+    authenticate(node: TrxNode<S, M, any>, request?: AuthnRequest<keyof Authn>): Promise<void>;
     private commit;
     private rollback;
 }

package/lib/engine/transaction/trx_engine.js

@@ -11,13 +11,13 @@ const memory_bucket_adapter_1 = require("../../elements/entities/bucket/adapters
  * @subcategory Transaction
  */
 class TrxEngine {
-    constructor(origin, module, authnProviders, config, providers = {}) {
+    constructor(origin, module, authnProviders, config, services = {}) {
         this.origin = origin;
         this.module = module;
         this.authnProviders = authnProviders;
         this.config = config;
-        this.providers = providers;
-        this.innerTrx = new trx_1.Trx(this.module, `trx:${origin}`);
+        this.services = services;
+        this.innerTrx = new trx_1.Trx(this, this.module, `trx:${origin}`);
         this.adapter = config?.adapter?.(module.schema) || new memory_bucket_adapter_1.MemoryBucketAdapter({}, {});
     }
     getModule() {
@@ -26,7 +26,7 @@ class TrxEngine {
     async get(id) {
         let trx = undefined;
         if (!id) {
-            trx = new trx_1.Trx(this.module, this.origin);
+            trx = new trx_1.Trx(this, this.module, this.origin);
             log_1.Log.info('module', this.module.name, `Begin ${(0, log_1.scopeTag)('trx', trx.id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
             return this.adapter.create(this.innerTrx.root, trx);
         }
@@ -37,7 +37,7 @@ class TrxEngine {
             }
             else {
                 log_1.Log.info('module', this.module.name, `Chain ${(0, log_1.scopeTag)('trx', id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
-                trx = new trx_1.Trx(this.module, this.origin, undefined, id);
+                trx = new trx_1.Trx(this, this.module, this.origin, undefined, id);
                 return this.adapter.create(this.innerTrx.root, trx);
             }
         }
@@ -46,13 +46,10 @@ class TrxEngine {
     async trx(fn, authn) {
         const trx = await this.get(undefined);
         try {
-            const users = authn ? await this.authenticate(trx.root, authn) : undefined;
-            if (users) {
-                trx_node_1.TrxNode.addAuthn(trx.root, authn, users);
-            }
+            await this.authenticate(trx.root, authn);
             let output;
             if (this.config?.wrap) {
-                output = await this.config?.wrap(trx, fn, this.providers);
+                output = await this.config?.wrap(trx, fn, this.services);
             }
             else {
                 output = await fn(trx.root);
@@ -65,19 +62,25 @@ class TrxEngine {
         return trx.status();
     }
     // authentication
-    async authenticate(trx, request) {
+    async authenticate(node, request = {}) {
         if (!this.authnProviders) {
             throw error_1.NesoiError.Authn.NoProvidersRegisteredForModule(this.module.name);
         }
         const users = {};
-        for (const provider in request) {
-            const token = request[provider];
-            if (!(provider in this.authnProviders)) {
-                throw error_1.NesoiError.Authn.NoProviderRegisteredForModule(this.module.name, provider);
+        const tokens = {};
+        for (const providerName in this.authnProviders) {
+            const provider = this.authnProviders[providerName];
+            const reqToken = request[providerName];
+            if (provider.eager || reqToken) {
+                if (!provider) {
+                    throw error_1.NesoiError.Authn.NoProviderRegisteredForModule(this.module.name, providerName);
+                }
+                const { user, token } = await provider.authenticate({ trx: node, token: reqToken });
+                users[providerName] = user;
+                tokens[providerName] = token;
             }
-            users[provider] = await this.authnProviders[provider].authenticate({ trx, token });
         }
-        return users;
+        trx_node_1.TrxNode.addAuthn(node, tokens, users);
     }
     //
     async commit(trx, output) {

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

@@ -1,4 +1,5 @@
 import { $Module, $Space } from "../../schema";
+import { NesoiError } from '../data/error';
 import { AnyModule, VirtualModuleDef } from '../module';
 import { AnyTrx } from './trx';
 import { BucketTrxNode } from './nodes/bucket.trx_node';
@@ -18,7 +19,7 @@ export type TrxNodeStatus = {
     action?: string;
     input?: Record<string, any>;
     output?: Record<string, any>;
-    error?: string;
+    error?: NesoiError.BaseError;
     nodes: TrxNodeStatus[];
     app: number;
 };
@@ -47,7 +48,7 @@ export declare class TrxNode<Space extends $Space, M extends $Module, Authn exte
     } | undefined, id?: string);
     static open(node: AnyTrxNode, action: string, input: Record<string, any>): Promise<void>;
     static ok(node: AnyTrxNode, output?: Record<string, any>): Promise<void>;
-    static error(node: AnyTrxNode, error: any): Promise<void>;
+    static error(node: AnyTrxNode, error: any): Promise<any>;
     message<Raw extends M['#input']['#raw'], Msg extends $Message = M['messages'][Raw['$'] & keyof M['messages']]>(raw: Raw): Promise<M['#input']['#parsed']>;
     value<K extends keyof M['constants']['values']>(key: K): M["constants"]["values"][K]["value"];
     enum<EnumName extends KeysOfUnion<Space['modules'][keyof Space['modules']]['constants']['enums']>>(name: EnumName): Enum<M['constants']['enums'][EnumName]>;
@@ -57,6 +58,7 @@ export declare class TrxNode<Space extends $Space, M extends $Module, Authn exte
     resource<Name extends keyof M['resources'], Resource extends M['resources'][Name]>(name: Name): ResourceTrxNode<M, Resource>;
     machine<Name extends keyof M['machines'], Machine extends M['machines'][Name]>(name: Name): MachineTrxNode<M, Machine>;
     queue<Name extends keyof M['queues'], Queue extends M['queues'][Name]>(name: Name): QueueTrxNode<M, Queue>;
+    authenticate(authnRequest: AuthnRequest<keyof Authn>): Promise<TrxNode<$Space, $Module, Authn>>;
     token<U extends keyof Authn & keyof M['#authn']>(provider: U): M['#authn'][U];
     user<U extends keyof Authn & keyof M['#authn']>(provider: U): M['#authn'][U];
     virtual<T>(def: VirtualModuleDef, fn: ($: AnyTrxNode) => T | Promise<T>): Promise<T>;

package/lib/engine/transaction/trx_node.js

@@ -51,8 +51,15 @@ class TrxNode {
     }
     static async error(node, error) {
         node.state = 'error';
-        node.error = i18n_1.i18n.error(error, node.trx.root.module.daemon);
+        if (error instanceof error_1.NesoiError.BaseError) {
+            error.message = i18n_1.i18n.error(error, node.trx.root.module.daemon);
+        }
+        else {
+            error = new error_1.NesoiError.BaseError('UnknownError', error.toString());
+        }
+        node.error = error;
         node.time.end = datetime_1.NesoiDatetime.now();
+        return error;
     }
     // Entities
     async message(raw) {
@@ -121,6 +128,11 @@ class TrxNode {
         return new queue_trx_node_1.QueueTrxNode(this, queue);
     }
     // Authentication
+    async authenticate(authnRequest) {
+        const newNode = new TrxNode(this.scope, this.trx, this, this.module, this.authn);
+        await this.trx.engine.authenticate(newNode, authnRequest);
+        return newNode;
+    }
     token(provider) {
         if (!this.authn?.tokens) {
             throw error_1.NesoiError.Authn.NoUsersAuthenticatedForTrxNode(this.globalId);

package/lib/engine/tree.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleTree = void 0;
+const dependency_1 = require("./dependency");
 const error_1 = require("../compiler/error");
 const log_1 = require("./util/log");
 const string_1 = require("./util/string");
@@ -253,23 +254,11 @@ class ModuleTree {
      */
     getSchema(node) {
         const mod = this.modules[node.module];
-        if (node.type === 'constants')
-            return mod.schema.constants;
-        if (node.type === 'externals')
-            return mod.schema.externals;
-        if (node.type === 'bucket')
-            return mod.schema.buckets[node.name];
-        if (node.type === 'message')
-            return mod.schema.messages[node.name];
-        if (node.type === 'job')
-            return mod.schema.jobs[node.name];
-        if (node.type === 'resource')
-            return mod.schema.resources[node.name];
-        if (node.type === 'machine')
-            return mod.schema.machines[node.name];
-        if (node.type === 'controller')
-            return mod.schema.controllers[node.name];
-        throw error_1.CompilerError.UnmetDependency('tree', node.name);
+        const schema = dependency_1.$Dependency.resolve(mod.schema, node);
+        if (!schema) {
+            throw error_1.CompilerError.UnmetDependency('tree', node.name);
+        }
+        return schema;
     }
     /**
      * Return a list of all nodes of all modules on the tree.

package/lib/schema.d.ts

@@ -44,7 +44,7 @@ export type $Module = {
     };
     '#input': $Message;
     '#authn': AnyUsers;
-    '#providers': Record<string, any>;
+    '#services': Record<string, any>;
 };
 export type ModuleName<$ extends $Space> = keyof $['modules'];
 export type MessageName<$ extends $Module> = keyof $['messages'];

package/package.json

@@ -1,14 +1,13 @@
 {
     "name": "nesoi",
-    "version": "3.0.9",
+    "version": "3.0.10",
     "description": "Declarative framework for data-driven applications",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/nesoi-org/nesoi.git"
     },
     "keywords": [
-        "nesoi",
-        "postgresql"
+        "nesoi"
     ],
     "author": "Hugo Aboud",
     "license": "MIT",

package/tools/joaquin/job.js

@@ -34,8 +34,8 @@ function expectJob(def) {
             try {
                 const status = await promise;
                 expect(status.state).toEqual('error');
-                expect(status.error)
-                    .toMatch(new RegExp(`^\\[${errorObj.name}\\]`));
+                expect(status.error?.name)
+                    .toEqual(errorObj.name);
             }
             catch (e) {
                 expect(e.toString())

package/tools/joaquin/message.js

@@ -33,8 +33,8 @@ function expectMessage(def) {
                 const status = await promise;
                 status.forEach(st => {
                     expect(st.state).toEqual('error');
-                    expect(st.error)
-                        .toMatch(new RegExp(`^\\[${errorObj.name}\\]`));
+                    expect(st.error?.name)
+                        .toEqual(errorObj.name);
                 });
             }
             catch (e) {

package/tools/joaquin/mock.d.ts

@@ -1,9 +1,9 @@
-import { $Bucket, $Message, $Module, $Space } from "../../src/elements";
-import { Daemon } from "../../src/engine/daemon";
-import { NesoiDate } from "../../src/engine/data/date";
-import { NesoiDatetime } from "../../src/engine/data/datetime";
-import { NesoiDecimal } from "../../src/engine/data/decimal";
-import { DeepPartial } from "../../src/engine/util/deep";
+import { $Bucket, $Message, $Module, $Space } from "../../lib/elements";
+import { Daemon } from "../../lib/engine/daemon";
+import { NesoiDate } from "../../lib/engine/data/date";
+import { NesoiDatetime } from "../../lib/engine/data/datetime";
+import { NesoiDecimal } from "../../lib/engine/data/decimal";
+import { DeepPartial } from "../../lib/engine/util/deep";
 export declare class BucketMockObj<$ extends $Bucket, T> {
     private module;
     private bucketName;