nesoi 3.2.9 → 3.3.1

package/lib/elements/entities/message/template/message_template_field.builder.js

@@ -42,17 +42,29 @@ class MessageTemplateFieldFactory {
         return new MessageTemplateFieldBuilder('decimal', { decimal: config }, this.alias);
     }
     enum(options) {
-        let dep;
+        let meta;
         if (typeof options === 'string') {
-            const tag = dependency_1.$Tag.parseOrFail(options);
-            if (tag.module) {
-                dep = new dependency_1.$Dependency(this.module, 'constants', `${tag.module}::*`);
+            const enumpath = options.match(/(.*)\.\{(.*)\}$/);
+            if (enumpath) {
+                meta = { enumpath: [enumpath[1], enumpath[2]] };
             }
             else {
-                dep = new dependency_1.$Dependency(this.module, 'constants', '*');
+                const tag = dependency_1.Tag.fromNameOrShort(this.module, 'constants.enum', options);
+                meta = {
+                    dep: new dependency_1.Dependency(this.module, tag, { build: true })
+                };
             }
         }
-        return new MessageTemplateFieldBuilder('enum', { enum: { options, dep } }, this.alias, undefined);
+        else if (Array.isArray(options)) {
+            const opts = {};
+            for (const opt of options)
+                opts[opt] = opt;
+            meta = { options: opts };
+        }
+        else {
+            meta = { options: options };
+        }
+        return new MessageTemplateFieldBuilder('enum', { enum: meta }, this.alias, undefined);
     }
     file(config) {
         return new MessageTemplateFieldBuilder('file', { file: config }, this.alias);
@@ -61,9 +73,9 @@ class MessageTemplateFieldFactory {
         return new MessageTemplateFieldBuilder('float', {}, this.alias);
     }
     id(bucket, view) {
-        // Module and tag are updated on build
-        const ref = new dependency_1.$Dependency(this.module, 'bucket', bucket);
-        return new MessageTemplateFieldBuilder('id', { id: { bucket: ref, view: view } }, this.alias, undefined);
+        const tag = dependency_1.Tag.fromNameOrShort(this.module, 'bucket', bucket);
+        const dep = new dependency_1.Dependency(this.module, tag, { build: true, compile: true, runtime: true });
+        return new MessageTemplateFieldBuilder('id', { id: { bucket: dep, view: view } }, this.alias, undefined);
     }
     get int() {
         return new MessageTemplateFieldBuilder('int', {}, this.alias);
@@ -94,14 +106,15 @@ class MessageTemplateFieldFactory {
         return new MessageTemplateFieldBuilder('union', {}, this.alias, Object.fromEntries(children.map((c, i) => [i, c])));
     }
     msg(msg, extra = {}) {
-        // Module and tag are updated on build
-        const ref = new dependency_1.$Dependency(this.module, 'message', msg);
-        return new MessageTemplateFieldBuilder('msg', { msg: ref }, this.alias, extra);
+        const tag = dependency_1.Tag.fromNameOrShort(this.module, 'message', msg);
+        const dep = new dependency_1.Dependency(this.module, tag, { build: true });
+        return new MessageTemplateFieldBuilder('msg', { msg: dep }, this.alias, extra);
     }
     extend(name, fields) {
-        const ref = new dependency_1.$Dependency(this.module, 'message', name);
+        const tag = dependency_1.Tag.fromNameOrShort(this.module, 'message', name);
+        const dep = new dependency_1.Dependency(this.module, tag, { build: true });
         return {
-            __ext: ref,
+            __ext: dep,
             ...fields
         };
     }
@@ -112,9 +125,9 @@ exports.MessageTemplateFieldFactory = MessageTemplateFieldFactory;
  * @subcategory Entity
  * */
 class MessageTemplateFieldBuilder {
-    constructor(type, value, alias, children) {
+    constructor(type, meta, alias, children) {
         this.type = type;
-        this.value = value;
+        this.meta = meta;
         this.alias = alias;
         this.children = children;
         this._required = true;
@@ -152,24 +165,28 @@ class MessageTemplateFieldBuilder {
         let type = builder.type;
         let children;
         if (builder.type === 'id') {
-            const bucket = tree.getSchema(builder.value.id.bucket);
-            builder.value.id.type = bucket.model.fields.id.type;
+            const bucket = dependency_1.Tag.resolve(builder.meta.id.bucket.tag, tree);
+            builder.meta.id.type = bucket.model.fields.id.type;
+            builder.meta.id.bucket = builder.meta.id.bucket.tag;
+        }
+        else if (builder.type === 'enum') {
+            if ('dep' in builder.meta.enum) {
+                const _enum = dependency_1.Tag.resolve(builder.meta.enum.dep.tag, tree);
+                builder.meta.enum = {
+                    options: _enum.options
+                };
+            }
         }
         // A .msg() parameter is an obj which takes fields from
         // another message
         else if (builder.type === 'msg') {
-            const dep = builder.value.msg;
-            if (dep.type !== 'message') {
-                throw error_1.NesoiError.Builder.Message.UnknownModuleMessage(dep.tag);
+            const dep = builder.meta.msg;
+            if (dep.tag.type !== 'message') {
+                throw error_1.NesoiError.Builder.Message.UnknownModuleMessage(dep.tag.name);
             }
-            const $msg = tree.getSchema(dep);
+            const $msg = dependency_1.Tag.resolve(dep.tag, tree);
             if (!$msg) {
-                throw error_1.NesoiError.Builder.Message.UnknownModuleMessage(dep.tag);
-            }
-            if (dep.module !== module.name) {
-                if (!(dep.refName in module.externals.messages)) {
-                    throw error_1.NesoiError.Builder.Message.UnknownModuleMessage(dep.tag);
-                }
+                throw error_1.NesoiError.Builder.Message.UnknownModuleMessage(dep.tag.name);
             }
             const injectFields = (target, fields) => {
                 for (const key in fields) {
@@ -185,6 +202,7 @@ class MessageTemplateFieldBuilder {
             type = 'obj';
             children = {};
             injectFields(children, $msg.template.fields);
+            builder.meta.msg = { tag: dep.tag };
         }
         else if (builder.type === 'list') {
             children = MessageTemplateFieldBuilder.buildMany(builder.children, tree, module, childrenBasePathRaw, childrenBasePathParsed, '#', '#');
@@ -199,7 +217,7 @@ class MessageTemplateFieldBuilder {
         else if (builder.children) {
             children = MessageTemplateFieldBuilder.buildMany(builder.children, tree, module, childrenBasePathRaw, childrenBasePathParsed);
         }
-        return new message_template_schema_1.$MessageTemplateField(type, name, builder.alias || name, pathRaw, pathParsed, builder._required, builder._defaultValue, builder._nullable, builder._rules, builder.value, children);
+        return new message_template_schema_1.$MessageTemplateField(type, name, builder.alias || name, pathRaw, pathParsed, builder._required, builder._defaultValue, builder._nullable, builder._rules, builder.meta, children);
     }
     static buildMany(fields, tree, module, basePathRaw = '', basePathParsed = '', name, key) {
         const schema = {};
@@ -211,7 +229,8 @@ class MessageTemplateFieldBuilder {
         }
         // Extended field groups inherit from other messages
         if ('__ext' in fields) {
-            const ext = tree.getSchema(fields.__ext);
+            const dep = fields.__ext;
+            const ext = dependency_1.Tag.resolve(dep.tag, tree);
             Object.assign(schema, ext.template.fields);
         }
         return schema;

package/lib/elements/entities/message/template/message_template_parser.js

@@ -105,7 +105,7 @@ async function _runParseMethod(trx, field, path, raw, value, inject) {
         case 'decimal':
             return (0, parse_1.parseDecimal)(field, path, value);
         case 'enum':
-            return (0, parse_1.parseEnum)(raw, field, path, value, field.meta.enum.options, trx);
+            return (0, parse_1.parseEnum)(raw, field, path, value, field.meta.enum, trx);
         case 'file':
             return (0, parse_1.parseFile)(field, path, value, field.meta.file);
         case 'float':
@@ -164,7 +164,7 @@ async function parseIdField(trx, field, path, value) {
     const bucket = field.meta.id.bucket;
     const type = field.meta.id.type;
     const view = field.meta.id.view;
-    const parsed = await (0, parse_1.parseId)(field, path, value, trx, bucket.refName, type, view);
+    const parsed = await (0, parse_1.parseId)(field, path, value, trx, bucket, type, view);
     return parsed.obj;
 }
 function sanitize(field, path, value) {

package/lib/engine/{apps → app}/app.config.d.ts

@@ -3,7 +3,6 @@ import { BucketConfig } from "../../elements/entities/bucket/bucket.config";
 import { AuthnProvider } from '../auth/authn';
 import { ControllerConfig } from "../../elements/edge/controller/controller.config";
 import { TrxEngineConfig } from '../transaction/trx_engine.config';
-import { CompilerConfig } from "../../compiler/compiler";
 import { App } from './app';
 import { IService } from './service';
 import { CLIConfig } from '../cli/cli';
@@ -20,7 +19,7 @@ export type AppModuleConfig<S extends $Space, M extends ModuleName<S>, Services
     trx?: TrxEngineConfig<S, S['modules'][M], any, Services>;
 };
 export type AppConfig<S extends $Space, Modules extends ModuleName<S>, Services extends Record<string, IService>> = {
-    authn?: AppAuthnConfig<S>;
+    auth?: AppAuthConfig<S>;
     modules?: Partial<{
         [M in (Modules & keyof S['modules'])]: AppModuleConfig<S, M, Services>;
     }>;
@@ -32,8 +31,8 @@ export type AnyAppConfig = AppConfig<any, any, any>;
 export type AppI18nConfig = {
     [x: string]: ($: Record<string, any>) => string;
 };
-export type AppAuthnConfig<S extends $Space> = {
-    [K in keyof S['authnUsers']]: () => AuthnProvider<S['authnUsers'][K]>;
+export type AppAuthConfig<S extends $Space> = {
+    [K in keyof S['authnUsers']]?: () => AuthnProvider<S['authnUsers'][K], any>;
 };
 export type AppBucketConfig<S extends $Space, M extends keyof S['modules'], Services extends Record<string, IService>> = Partial<{
     [K in keyof S['modules'][M]['buckets']]: BucketConfig<S['modules'][M], S['modules'][M]['buckets'][K], Services>;
@@ -51,6 +50,13 @@ export type AppAuditConfig = {
     }>) => BucketAdapter<NesoiObj>;
     transform?: (trx: TrxStatus<any>) => Record<string, any>;
 };
+export type CompilerConfig = {
+    nesoiPath?: string;
+    nesoiVersion?: string;
+    exclude?: string[];
+    reset?: boolean;
+    diagnose?: boolean;
+};
 /**
  * Factory
  */
@@ -61,7 +67,7 @@ export declare class AppConfigBuilder<S extends $Space, Modules extends string =
     private app;
     private config;
     constructor(app: _App);
-    authn(config: AppAuthnConfig<S>): _App;
+    auth(config: AppAuthConfig<S>): _App;
     module<M extends Modules>(name: M, config: AppModuleConfig<S, M, Services>): _App;
     audit(config: AppI18nConfig): _App;
     i18n(config: AppI18nConfig): _App;

package/lib/engine/{apps → app}/app.config.js

@@ -12,8 +12,8 @@ class AppConfigBuilder {
         this.app = app;
         this.config = app._config;
     }
-    authn(config) {
-        this.config.authn = config;
+    auth(config) {
+        this.config.auth = config;
         return this.app;
     }
     module(name, config) {

package/lib/engine/{apps → app}/app.d.ts

@@ -4,13 +4,13 @@ import { Space } from '../space';
 import { Daemon } from '../daemon';
 import { AnyAppConfig, AppConfigBuilder } from './app.config';
 import { IService } from './service';
-import { DistributedAppConfigBuilder } from './distributed/distributed.app.config';
 /**
  * @category App
  */
 export declare abstract class App<S extends $Space, Modules extends string = ModuleName<S> & string, Services extends Record<string, any> = Record<string, any>> {
     name: string;
     protected _config: AnyAppConfig;
+    protected _nesoiNpmPkg: string;
     protected _spaceModuleNames: ModuleName<S>[];
     protected _injectedModules: AnyModule[];
     protected _services: Record<string, IService>;
@@ -54,12 +54,13 @@ export declare abstract class App<S extends $Space, Modules extends string = Mod
      * @param $ object with an `up` and `down` method to create/destroy the service
      */
     protected service<T extends IService>($: T): App<S, Modules, Services & { [K in T["name"]]: T; }>;
-    protected get config(): AppConfigBuilder<S, Modules, Services> | DistributedAppConfigBuilder<S, any, Modules, Services>;
+    protected get config(): AppConfigBuilder<S, Modules, Services>;
     protected makeModules(): Record<string, AnyModule>;
     static getServices(app: AnyApp): Record<string, IService>;
     static getInfo(app: AnyApp): {
         spaceModules: (string | number | symbol)[];
         config: AnyAppConfig;
+        nesoiNpmPkg: string;
     };
 }
 export type AnyApp = App<any, any>;

package/lib/engine/{apps → app}/app.js

@@ -14,6 +14,7 @@ class App {
     constructor(name, boot) {
         this.name = name;
         this._config = {};
+        this._nesoiNpmPkg = 'nesoi';
         // This is a list of names to be read from the space.
         // If the app is not booted with a space, this does nothing.
         this._spaceModuleNames = [];
@@ -100,7 +101,8 @@ class App {
     static getInfo(app) {
         return {
             spaceModules: app._spaceModuleNames,
-            config: app._config
+            config: app._config,
+            nesoiNpmPkg: app._nesoiNpmPkg,
         };
     }
 }

package/lib/engine/{apps/distributed → app}/inc/inc.client.js

@@ -35,7 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.INCClient = void 0;
 const net = __importStar(require("net"));
-const log_1 = require("../../../util/log");
+const log_1 = require("../../util/log");
 class INCClient {
     constructor(config) {
         this.config = config;

package/lib/engine/{apps/distributed → app}/inc/inc.server.js

@@ -34,9 +34,9 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.INCServer = void 0;
-const crypto_1 = require("crypto");
 const net = __importStar(require("net"));
-const log_1 = require("../../../util/log");
+const log_1 = require("../../util/log");
+const random_1 = require("../../util/random");
 class INCServer {
     constructor(config) {
         this.config = config;
@@ -108,7 +108,7 @@ class INCServer {
         log_1.Log.warn('inc.server', this.config.name, 'Closed');
     }
     async onConnection(socket) {
-        const id = (0, crypto_1.randomUUID)();
+        const id = random_1.Random.uuid();
         socket.id = id;
         this.clients[id] = socket;
         const serverAddress = this.server.address();

package/lib/engine/{apps/distributed → app}/inc/sandbox.js

@@ -2,7 +2,7 @@
 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");
+const log_1 = require("../../util/log");
 log_1.Log.level = 'debug';
 async function main() {
     const server = new inc_server_1.INCServer({

package/lib/engine/{apps → app}/inline.app.d.ts

@@ -5,6 +5,7 @@ import { AnyTrxEngine } from '../transaction/trx_engine';
 import { AnyBuilder, AnyElementSchema, AnyModule, Module } from '../module';
 import { AnyDaemon, Daemon } from '../daemon';
 import { AppConfigBuilder } from './app.config';
+import { Tag } from '../dependency';
 /**
  * @category App
  */
@@ -31,13 +32,6 @@ export declare class InlineApp<S extends $Space, ModuleNames extends string = Mo
     daemon(): Promise<Daemon<S, ModuleNames>>;
     protected makeDaemon(trxEngines: Record<ModuleNames, AnyTrxEngine>, services: Record<string, IService>): AnyDaemon;
     package(_package: Record<string, any>): this;
-    /**
-     * This method injects elements flagged as externals by referencing them
-     * from the other module directly, given this is a single-threaded App.
-     *
-     * TODO: allow overriding this behavior with adapters
-     */
-    protected linkExternals(modules: Record<string, Module<S, $Module>>): void;
     /**
      * This method injects values from environment variables into each module's
      * app constants.
@@ -56,9 +50,5 @@ export declare class InlineApp<S extends $Space, ModuleNames extends string = Mo
     };
 }
 export declare class InlineDaemon<S extends $Space, Modules extends ModuleName<S>> extends Daemon<S, Modules> {
-    protected getSchema(tag: {
-        module: Modules;
-        type: string;
-        name: string;
-    }): Promise<AnyElementSchema>;
+    protected getSchema(tag: Tag): Promise<AnyElementSchema>;
 }

package/lib/engine/{apps → app}/inline.app.js

@@ -12,6 +12,7 @@ const daemon_1 = require("../daemon");
 const app_config_1 = require("./app.config");
 const promise_1 = __importDefault(require("../util/promise"));
 const dependency_1 = require("../dependency");
+const builder_1 = require("../builder");
 /**
  * @category App
  */
@@ -44,8 +45,8 @@ class InlineApp extends app_1.App {
             if (node.isInline) {
                 return;
             }
-            const module = this._modules[node.module];
-            await module.buildNode(node, tree);
+            const module = this._modules[node.tag.module];
+            await builder_1.Builder.buildNode(module, node, tree);
         });
     }
     /**
@@ -75,17 +76,17 @@ class InlineApp extends app_1.App {
             const module = modules[m];
             module.start(this, services);
             const trxConfig = this._config.modules?.[m]?.trx;
-            const authn = {};
-            for (const a in this._config?.authn || {}) {
-                const prov = this._config.authn?.[a]?.();
+            const authnProviders = {};
+            for (const a in this._config?.auth || {}) {
+                const prov = this._config.auth?.[a]?.();
                 if (prov) {
-                    authn[a] = prov;
+                    authnProviders[a] = prov;
                 }
             }
-            trxEngines[m] = new trx_engine_1.TrxEngine(`app:${this.name}`, module, authn, trxConfig, services);
+            trxEngines[m] = new trx_engine_1.TrxEngine(`app:${this.name}`, module, authnProviders, trxConfig, services);
         }
-        log_1.Log.debug('app', this.name, 'Linking externals');
-        this.linkExternals(modules);
+        // Log.debug('app', this.name, 'Injecting external constants and messages');
+        // this.linkExternals(modules);
         log_1.Log.debug('app', this.name, 'Linking app values');
         this.linkAppValues(modules);
         return {
@@ -115,27 +116,27 @@ class InlineApp extends app_1.App {
         this.packageJson = _package;
         return this;
     }
-    /**
-     * This method injects elements flagged as externals by referencing them
-     * from the other module directly, given this is a single-threaded App.
-     *
-     * TODO: allow overriding this behavior with adapters
-     */
-    linkExternals(modules) {
-        Object.values(modules).forEach(module => {
-            module.injectDependencies(modules, {
-                buckets: Object.values(module.schema.externals.buckets),
-                messages: Object.values(module.schema.externals.messages),
-                jobs: Object.values(module.schema.externals.jobs),
-                machines: Object.values(module.schema.externals.machines),
-                enums: Object.values(module.schema.externals.enums)
-            });
-            const buckets = module.schema.externals.buckets;
-            Object.values(buckets).forEach(bucket => {
-                module.nql.linkExternal(modules[bucket.module].buckets[bucket.name]);
-            });
-        });
-    }
+    // /**
+    //  * This method injects elements flagged as externals by referencing them
+    //  * from the other module directly, given this is a single-threaded App.
+    //  * 
+    //  * TODO: allow overriding this behavior with adapters
+    //  */
+    // protected linkExternals(modules: Record<string, Module<S, $Module>>) {
+    //     Object.values(modules).forEach(module => {
+    //         module.injectDependencies(modules, {
+    //             buckets: Object.values(module.schema.externals.buckets),
+    //             messages: Object.values(module.schema.externals.messages),
+    //             jobs: Object.values(module.schema.externals.jobs),
+    //             machines: Object.values(module.schema.externals.machines),
+    //             enums: Object.values(module.schema.externals.enums)
+    //         })
+    //         const buckets = module.schema.externals.buckets;
+    //         Object.values(buckets).forEach(bucket => {
+    //             module.nql.linkExternal(modules[bucket.module].buckets[bucket.name]);
+    //         })
+    //     })
+    // }
     /**
      * This method injects values from environment variables into each module's
      * app constants.
@@ -146,7 +147,12 @@ class InlineApp extends app_1.App {
             Object.values(values).forEach(value => {
                 if (value.scope !== 'app')
                     return;
+                /* @nesoi:browser ignore-start */
                 value.value = process.env[value.key];
+                /* @nesoi:browser ignore-end */
+                /* @nesoi:browser add
+                value.value = localStorage.getItem(value.key)
+                */
             });
         });
     }
@@ -180,10 +186,7 @@ class InlineDaemon extends daemon_1.Daemon {
     async getSchema(tag) {
         const trxEngine = this.trxEngines[tag.module];
         const _module = trxEngine.getModule();
-        const schema = dependency_1.$Dependency.resolve(_module.schema, tag);
-        if (!schema) {
-            throw new Error(`Unable to reach schema '${tag}'`);
-        }
+        const schema = dependency_1.Tag.resolveFrom(tag, _module.schema);
         return Promise.resolve(schema);
     }
 }

package/lib/engine/auth/authn.d.ts

@@ -1,34 +1,32 @@
 import { NesoiObjId } from '../data/obj';
 import { AnyTrxNode } from '../transaction/trx_node';
+export type AuthToken = string;
+export type AuthRequest<P extends keyof any> = {
+    [K in P]?: AuthToken;
+};
 export type User = {
     id: NesoiObjId;
     [x: string]: any;
 };
-export type AuthnToken = string;
-export type AuthnRequest<P extends keyof any> = {
-    [K in P]?: AuthnToken;
-};
 /**
  * @category Engine
  * @subcategory Auth
  */
-export declare abstract class AuthnProvider<U extends User> {
+export declare abstract class AuthnProvider<U extends User, Eager extends boolean> {
     /**
-     * - If `true`, this provider is run for all transactions, regardless
-     * of a token being sent on the authentication request.
-     * - If `false`, the `$.token` is always defined.
+     * - If `true`, this provider is run at the start of all transactions.
+     * - If `false`, it only runs once an element requires it, and if a token is present.
      */
-    abstract eager: boolean;
+    abstract eager: Eager;
     abstract authenticate($: {
         trx: AnyTrxNode;
-        token?: AuthnToken;
+        token: Eager extends true ? (AuthToken | undefined) : AuthToken;
     }): Promise<{
-        token: AuthnToken;
         user: U;
     }>;
 }
 export type AnyAuthnProviders = {
-    [K: string]: AuthnProvider<any>;
+    [K: string]: AuthnProvider<any, any>;
 };
 export type AnyUsers = {
     [K: string]: User;

package/lib/engine/auth/zero.authn_provider.d.ts

@@ -8,12 +8,11 @@ type ZeroUser = {
  * @category Engine
  * @subcategory Auth
  */
-export declare class ZeroAuthnProvider extends AuthnProvider<ZeroUser> {
-    eager: boolean;
+export declare class ZeroAuthnProvider extends AuthnProvider<ZeroUser, false> {
+    eager: false;
     authenticate($: {
-        token?: string;
-    }): Promise<{
         token: string;
+    }): Promise<{
         user: {
             id: number;
             name: string;

package/lib/engine/auth/zero.authn_provider.js

@@ -13,7 +13,6 @@ class ZeroAuthnProvider extends authn_1.AuthnProvider {
     }
     authenticate($) {
         return Promise.resolve({
-            token: $.token,
             user: {
                 id: 0,
                 name: $.token

package/lib/engine/builder.d.ts

@@ -0,0 +1,28 @@
+import { ResolvedBuilderNode } from './dependency';
+import { ModuleTree } from './tree';
+import { AnyModule } from './module';
+export declare class Builder {
+    /**
+     * 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
+     */
+    static buildNode(module: AnyModule, node: ResolvedBuilderNode, tree: ModuleTree): void;
+    /**
+     * Merge inline message schemas into the module.
+     *
+     * @param node A resolved builder node
+     * @param schemas A dictionary of Message schemas by name
+     */
+    private static mergeInlineMessages;
+    /**
+     * Merge inline job schemas into the module.
+     *
+     * @param node A resolved builder node
+     * @param schemas A dictionary of job schemas by name
+     */
+    private static mergeInlineJobs;
+}