nesoi 3.3.17 → 3.3.19

package/lib/elements/entities/bucket/graph/bucket_graph.js

@@ -8,6 +8,7 @@ const memory_bucket_adapter_1 = require("../adapters/memory.bucket_adapter");
 const bucket_cache_1 = require("../cache/bucket_cache");
 const daemon_1 = require("../../../../engine/daemon");
 const dependency_1 = require("../../../../engine/dependency");
+const trx_1 = require("../../../../engine/transaction/trx");
 /**
  * @category Elements
  * @subcategory Entity
@@ -61,7 +62,7 @@ class BucketGraph {
                 ...schema.query,
                 '#and __tenancy__': tenancy
             };
-            const adapter = otherBucket.cache || otherBucket.adapter;
+            const adapter = await trx_1.Trx.getCache(trx, this.bucket) || otherBucket.cache || otherBucket.adapter;
             links = await adapter.query(trx, query, page, params, param_templates ? [param_templates] : undefined);
         }
         // Empty response
@@ -127,10 +128,10 @@ class BucketGraph {
                 '#and __tenancy__': tenancy
             };
             if (otherBucket.adapter instanceof memory_bucket_adapter_1.MemoryBucketAdapter) {
-                tempAdapter = otherBucket.cache || otherBucket.adapter;
+                tempAdapter = await trx_1.Trx.getCache(trx, this.bucket) || otherBucket.cache || otherBucket.adapter;
             }
             else {
-                const adapter = otherBucket.cache || otherBucket.adapter;
+                const adapter = await trx_1.Trx.getCache(trx, this.bucket) || otherBucket.cache || otherBucket.adapter;
                 const allLinks = await adapter.query(trx, query, undefined, params, param_templates);
                 const tempData = {};
                 for (const obj of allLinks.data)
@@ -238,7 +239,7 @@ class BucketGraph {
                 ...schema.query,
                 '#and__tenancy__': tenancy
             };
-            const adapter = otherBucket.cache || otherBucket.adapter;
+            const adapter = await trx_1.Trx.getCache(trx, this.bucket) || otherBucket.cache || otherBucket.adapter;
             links = await adapter.query(trx, query, page, params);
         }
         return !!links.data.length;

package/lib/elements/entities/bucket/query/nql_compiler.d.ts

@@ -55,3 +55,6 @@ export declare class NQL_CompiledQuery {
     constructor(parts: NQL_Part[]);
     describe(): string;
 }
+export declare class NQL_Decompiler {
+    static decompile(part: NQL_Part, params: Record<string, any>[], param_templates: Record<string, string>[]): NQL_AnyQuery;
+}

package/lib/elements/entities/bucket/query/nql_compiler.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NQL_CompiledQuery = exports.NQL_Compiler = exports.NQL_RuleTree = void 0;
+exports.NQL_Decompiler = exports.NQL_CompiledQuery = exports.NQL_Compiler = exports.NQL_RuleTree = void 0;
 const bucket_model_schema_1 = require("../model/bucket_model.schema");
 const string_1 = require("../../../../engine/util/string");
 const daemon_1 = require("../../../../engine/daemon");
@@ -708,3 +708,64 @@ class NQL_CompiledQuery {
     }
 }
 exports.NQL_CompiledQuery = NQL_CompiledQuery;
+class NQL_Decompiler {
+    static decompile(part, params, param_templates) {
+        const _union = (union, param, param_template, target) => {
+            for (let i = 0; i < union.inters.length; i++) {
+                const inter = union.inters[i];
+                const key = '#or' + Array.from({ length: i }).map(i => ' ').join('');
+                target[key] = {};
+                target = target[key];
+                for (let j = 0; j < inter.rules.length; j++) {
+                    const rule = inter.rules[j];
+                    if ('fieldpath' in rule) {
+                        const key = `${rule.fieldpath} ${rule.not ? 'not ' : ''}${rule.op}`;
+                        let value;
+                        if ('static' in rule.value) {
+                            value = rule.value.static;
+                        }
+                        else if ('param' in rule.value) {
+                            value = typeof rule.value.param === 'string'
+                                ? param[rule.value.param]
+                                : rule.value.param.map(p => param[p]);
+                        }
+                        else if ('param_with_$' in rule.value) {
+                            let path = rule.value.param_with_$;
+                            for (const key in param_template) {
+                                path = path.replace(new RegExp(key.replace('$', '\\$'), 'g'), param_template[key]);
+                            }
+                            value = param[path];
+                        }
+                        else if ('subquery' in rule.value) {
+                            const sq = rule.value.subquery;
+                            const subquery_key = `@${sq.bucket.module}::${sq.bucket.name}.${sq.select}`;
+                            value = {
+                                [subquery_key]: {}
+                            };
+                            _union(sq.union, param, param_template, value[subquery_key]);
+                        }
+                        target[key] = value;
+                    }
+                    else {
+                        const key = '#and' + Array.from({ length: j }).map(i => ' ').join('');
+                        target[key] = {};
+                        _union(rule, param, param_template, target[key]);
+                    }
+                }
+            }
+        };
+        const query = {};
+        let i = 0;
+        for (const param of params) {
+            for (const param_template of param_templates) {
+                const q = {};
+                _union(part.union, param, param_template, q);
+                const key = '#or' + Array.from({ length: i }).map(i => ' ').join('');
+                query[key] = q;
+                i++;
+            }
+        }
+        return query;
+    }
+}
+exports.NQL_Decompiler = NQL_Decompiler;

package/lib/elements/entities/bucket/view/bucket_view.js

@@ -292,14 +292,16 @@ class BucketView {
         // Step 1: Read many links from bucket
         // External
         if (node.bucket.tag.module !== module.name) {
-            linksObjs = await trx.bucket(node.bucket.tag.short).readManyLinks(node.data.map(entry => entry.raw.id), meta.path, node.data.map(entry => entry.index.map(i => i.toString())));
+            linksObjs = await trx.bucket(node.bucket.tag.short).readManyLinks(node.data.map(entry => entry.raw.id), //ids -> objs -> params
+            meta.path, [] // param templates temporarily disabled
+            );
         }
         // Internal
         else {
             const bucket = module.buckets[node.bucket.tag.name];
             linksObjs = await bucket.graph.readManyLinks(trx, node.data.map(entry => entry.raw), {
                 name: meta.link,
-                indexes: node.data.map(entry => entry.index.map(i => i.toString()))
+                indexes: [] // param templates temporarily disabled
             }, { silent: true });
         }
         // Step 2: Initialize target values

package/lib/engine/dependency.js

@@ -126,6 +126,10 @@ class Tag {
             return module.machines[self.name];
         if (self.type === 'controller')
             return module.controllers[self.name];
+        if (self.type === 'topic')
+            return module.topics[self.name];
+        if (self.type === 'queue')
+            return module.queues[self.name];
         throw new Error(`Schema with tag ${self.full} not found on module ${module.name}`);
     }
     static resolveExternal(self, externals) {

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

@@ -5,6 +5,8 @@ import { AnyTrxEngine, HeldTrxNode as TrxNodeHold, TrxEngineOrigin } from './trx
 import { AnyUsers, AuthRequest } from '../auth/authn';
 import { NesoiDatetime } from '../data/datetime';
 import { NesoiError } from '../data/error';
+import { AnyBucketCache } from "../../elements/entities/bucket/cache/bucket_cache";
+import { AnyBucket } from "../../elements/entities/bucket/bucket";
 type TrxOrigin = TrxEngineOrigin | `trx:${string}`;
 type TrxState = 'open' | 'hold' | 'ok' | 'error';
 /**
@@ -38,6 +40,8 @@ export declare class Trx<S extends $Space, M extends $Module, AuthUsers extends
     start: NesoiDatetime;
     end?: NesoiDatetime;
     ctx: Record<string, any>;
+    cache_config: Record<string, 'eager'>;
+    cache: Record<string, AnyBucketCache>;
     constructor(engine: AnyTrxEngine, module: Module<S, M>, origin: TrxOrigin, auth?: {
         tokens: AuthRequest<any>;
         users: AuthUsers;
@@ -45,6 +49,13 @@ export declare class Trx<S extends $Space, M extends $Module, AuthUsers extends
     addNode(node: TrxNode<S, M, AuthUsers>): void;
     holdNode(node: TrxNodeHold<any>): void;
     status(): TrxStatus<any>;
+    /**
+     * Cache
+     *
+     * This is used internally to initialize and access transaction-level bucket caches.
+     * These are configured through the TrxNode.cache method.
+     */
+    static getCache(node: AnyTrxNode, bucket: AnyBucket): Promise<AnyBucketCache | undefined>;
     /**
      * Context Manipulation
      *

package/lib/engine/transaction/trx.js

@@ -5,6 +5,8 @@ const trx_node_1 = require("./trx_node");
 const string_1 = require("../util/string");
 const log_1 = require("../util/log");
 const datetime_1 = require("../data/datetime");
+const bucket_cache_1 = require("../../elements/entities/bucket/cache/bucket_cache");
+const dependency_1 = require("../dependency");
 /*
     Transaction Status
 */
@@ -74,6 +76,8 @@ class Trx {
     start = datetime_1.NesoiDatetime.now();
     end;
     ctx = {};
+    cache_config = {};
+    cache = {};
     constructor(engine, module, origin, auth, id, root, nodes) {
         this.engine = engine;
         this.module = module;
@@ -96,6 +100,35 @@ class Trx {
         const error = this.root.error;
         return new TrxStatus(this.id, this.origin, this.start, this.end, state, output, error, this.root.status().nodes);
     }
+    /**
+     * Cache
+     *
+     * This is used internally to initialize and access transaction-level bucket caches.
+     * These are configured through the TrxNode.cache method.
+     */
+    static async getCache(node, bucket) {
+        const trx = node.trx;
+        const tag = new dependency_1.Tag(bucket.schema.module, 'bucket', bucket.schema.name);
+        const config = trx.cache_config[tag.short];
+        if (!config)
+            return;
+        let cache = trx.cache[tag.short];
+        if (cache) {
+            return cache;
+        }
+        let mode;
+        switch (config) {
+            case 'eager':
+                mode = { get: 'eager', index: 'eager', query: 'eager' };
+                break;
+        }
+        trx.cache[tag.short] = new bucket_cache_1.BucketCache(bucket, { mode });
+        cache = trx.cache[tag.short];
+        if (config === 'eager') {
+            await cache.sync(node);
+        }
+        return cache;
+    }
     /**
      * Context Manipulation
      *

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

@@ -56,6 +56,7 @@ export declare class TrxNode<Space extends $Space, M extends $Module, AuthUsers
     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']>(name: K): M['constants']['values'][K]['value'];
     enum<EnumName extends keyof M['constants']['enums']>(name: EnumName): Enum<M['constants']['enums'][EnumName]>;
+    cache(config: Record<keyof M['buckets'], 'eager'>): this;
     bucket<Name extends keyof M['buckets'], Bucket extends M['buckets'][Name]>(name: Name): BucketTrxNode<M, Bucket>;
     job<Name extends keyof M['jobs'], Job extends M['jobs'][Name]>(name: Name): JobTrxNode<M, Job>;
     static jobWithCustomCtx<M extends $Module, JobName extends keyof M['jobs'], Job extends M['jobs'][JobName]>(node: AnyTrxNode, name: string, ctx?: Record<string, any>): JobTrxNode<M, Job>;
@@ -65,7 +66,7 @@ export declare class TrxNode<Space extends $Space, M extends $Module, AuthUsers
     topic<Name extends keyof M['topics'], topic extends M['topics'][Name]>(name: Name): TopicTrxNode<M, topic>;
     authenticate(tokens: AuthRequest<keyof AuthUsers>): Promise<TrxNode<$Space, $Module, AuthUsers>>;
     token<U extends keyof M['#authn']>(provider: U): Promise<string>;
-    user<U extends keyof AuthUsers & keyof M['#authn']>(provider: U): Promise<M['#authn'][U]>;
+    user<U extends keyof AuthUsers & keyof M['#authn']>(...providers: U[]): Promise<M['#authn'][U]>;
     virtual<T>(def: VirtualModuleDef, fn: ($: AnyTrxNode) => T | Promise<T>): Promise<T>;
     status(): TrxNodeStatus;
     static merge<Space extends $Space, M extends $Module, AuthUsers extends AnyUsers>(to: TrxNode<Space, M, AuthUsers>, from: TrxNode<Space, M, AuthUsers>): void;
@@ -77,6 +78,6 @@ export declare class TrxNode<Space extends $Space, M extends $Module, AuthUsers
         provider: string;
         user: any;
     } | undefined;
-    static checkAuth(node: AnyTrxNode, options?: $BlockAuth[]): Promise<void>;
+    static checkAuth(node: AnyTrxNode, options?: $BlockAuth[]): Promise<string | undefined>;
 }
 export type AnyTrxNode = TrxNode<any, any, any>;

package/lib/engine/transaction/trx_node.js

@@ -121,6 +121,17 @@ class TrxNode {
         return new constants_1.Enum(this.module.schema.constants.enums[key]);
     }
     // Blocks
+    /*
+        Cache
+    */
+    cache(config) {
+        this.trx.cache_config = {};
+        for (const key in config) {
+            const tag = dependency_1.Tag.fromNameOrShort(this.module.name, 'bucket', key);
+            this.trx.cache_config[tag.short] = config[key];
+        }
+        return this;
+    }
     bucket(name) {
         const tag = dependency_1.Tag.fromNameOrShort(this.module.name, 'bucket', name);
         return new bucket_trx_node_1.BucketTrxNode(this, tag);
@@ -161,8 +172,8 @@ class TrxNode {
     async token(provider) {
         return this.auth?.tokens[provider];
     }
-    async user(provider) {
-        await TrxNode.checkAuth(this, [{ provider: provider }]);
+    async user(...providers) {
+        const provider = await TrxNode.checkAuth(this, providers.map(p => ({ provider: p })));
         return this.auth?.users[provider];
     }
     // Virtual Module Transaction
@@ -263,7 +274,7 @@ class TrxNode {
                     continue;
                 }
                 log_1.Log.debug('trx', node.globalId, `User from provider '${opt.provider}' pre-authenticated${opt.resolver ? ' and authorized' : ''}`);
-                return;
+                return opt.provider;
             }
             // Non-eager providers
             else if (opt.provider in tokens) {
@@ -282,7 +293,7 @@ class TrxNode {
                     continue;
                 }
                 log_1.Log.debug('trx', node.globalId, `User from provider '${opt.provider}' authenticated${opt.resolver ? ' and authorized' : ''}`);
-                return;
+                return opt.provider;
             }
         }
         throw error_1.NesoiError.Trx.Unauthorized({ providers: options.map(opt => opt.provider) });

package/package.json

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