nesoi 3.2.1 → 3.2.3

package/lib/elements/entities/bucket/cache/bucket_cache.js

@@ -4,16 +4,18 @@ exports.BucketCache = exports.BucketCacheEntry = void 0;
 const log_1 = require("../../../../engine/util/log");
 const memory_bucket_adapter_1 = require("../adapters/memory.bucket_adapter");
 const datetime_1 = require("../../../../engine/data/datetime");
+const bucket_schema_1 = require("../bucket.schema");
+const bucket_model_schema_1 = require("../model/bucket_model.schema");
+const bucket_graph_schema_1 = require("../graph/bucket_graph.schema");
 /**
  * @category Elements
  * @subcategory Entity
  * */
 class BucketCacheEntry {
-    constructor(id, obj, updateEpoch, syncEpoch) {
-        this.id = id;
-        this.obj = obj;
-        this.updateEpoch = updateEpoch;
-        this.syncEpoch = syncEpoch;
+    constructor(obj, __update_epoch, __sync_epoch) {
+        this.__update_epoch = __update_epoch;
+        this.__sync_epoch = __sync_epoch;
+        Object.assign(this, obj);
     }
 }
 exports.BucketCacheEntry = BucketCacheEntry;
@@ -22,28 +24,43 @@ exports.BucketCacheEntry = BucketCacheEntry;
  * @subcategory Entity
  * */
 class BucketCache {
-    constructor(bucketName, outerAdapter, config) {
-        this.bucketName = bucketName;
-        this.outerAdapter = outerAdapter;
+    constructor(bucket, config) {
+        this.bucket = bucket;
         this.config = config;
-        this.innerAdapter = this.config?.adapter || new memory_bucket_adapter_1.MemoryBucketAdapter({}, {});
+        const innerSchema = new bucket_schema_1.$Bucket(bucket.schema.module, bucket.schema.name, '[cache] ' + bucket.schema.alias, new bucket_model_schema_1.$BucketModel({
+            ...bucket.schema.model.fields,
+            __update_epoch: new bucket_model_schema_1.$BucketModelField('__update_epoch', '__update_epoch', 'int', '__update_epoch', true),
+            __sync_epoch: new bucket_model_schema_1.$BucketModelField('__sync_epoch', '__sync_epoch', 'int', '__sync_epoch', true),
+        }), new bucket_graph_schema_1.$BucketGraph(), {});
+        this.innerAdapter = this.config?.adapter || new memory_bucket_adapter_1.MemoryBucketAdapter(innerSchema, {});
+        this.outerAdapter = bucket.adapter;
     }
     async get(trx, id) {
         const mode = this.config?.mode?.get;
         if (mode === 'one') {
             const { action, sync } = await this.syncOne(trx, id);
-            log_1.Log.debug('bucket', this.bucketName, `CACHE get.one, ${action}`);
-            return sync?.obj;
+            log_1.Log.debug('bucket', this.bucket.schema.name, `CACHE get.one, ${action}`);
+            if (!sync)
+                return undefined;
+            const { __update_epoch, __sync_epoch, ...obj } = sync;
+            return obj;
         }
         if (mode === 'past') {
             const { action, sync } = await this.syncOneAndPast(trx, id);
-            log_1.Log.debug('bucket', this.bucketName, `CACHE get.past, ${action}`);
-            return sync?.obj;
+            log_1.Log.debug('bucket', this.bucket.schema.name, `CACHE get.past, ${action}`);
+            if (!sync)
+                return undefined;
+            const { __update_epoch, __sync_epoch, ...obj } = sync;
+            return obj;
         }
         if (mode === 'all') {
             const { action, sync } = await this.syncAll(trx);
-            log_1.Log.debug('bucket', this.bucketName, `CACHE get.sync, ${action}`);
-            return sync.find(s => s.obj.id === id)?.obj;
+            log_1.Log.debug('bucket', this.bucket.schema.name, `CACHE get.all, ${action}`);
+            const one = sync.find(s => s.id === id);
+            if (!one)
+                return undefined;
+            const { __update_epoch, __sync_epoch, ...obj } = one;
+            return one;
         }
         return this.outerAdapter.get(trx, id);
     }
@@ -51,50 +68,69 @@ class BucketCache {
         const mode = this.config?.mode?.index;
         if (mode === 'all') {
             const { action, sync } = await this.syncAll(trx);
-            log_1.Log.debug('bucket', this.bucketName, `CACHE index.sync, ${action}`);
-            return sync.map(s => s.obj);
+            log_1.Log.debug('bucket', this.bucket.schema.name, `CACHE index.all, ${action}`);
+            const data = [];
+            for (const e of sync) {
+                const { __update_epoch, __sync_epoch, ...obj } = e;
+                data.push(obj);
+            }
+            return data;
         }
         return this.outerAdapter.index(trx);
     }
-    async query(trx, view, query, pagination) {
+    async query(trx, query, pagination, params, config) {
         const mode = this.config?.mode?.query;
+        let data;
         if (mode === 'incremental') {
-            const { action, sync } = await this.syncQuery(trx, view, query, pagination);
-            log_1.Log.debug('bucket', this.bucketName, `CACHE query.incremental, ${action}`);
-            return sync.map(s => s.obj);
+            const { action, sync } = await this.syncQuery(trx, query, pagination, params);
+            log_1.Log.debug('bucket', this.bucket.schema.name, `CACHE query.incremental, ${action}`);
+            data = sync;
         }
-        if (mode === 'all') {
+        else if (mode === 'all') {
             const { action, sync } = await this.syncAll(trx);
-            log_1.Log.debug('bucket', this.bucketName, `CACHE query.sync, ${action}`);
-            return this.innerAdapter.query(trx, query);
+            log_1.Log.debug('bucket', this.bucket.schema.name, `CACHE query.all, ${action}`);
+            const entries = (await this.innerAdapter.query(trx, query, pagination, params, undefined, this.innerAdapter.nql)).data;
+            data = [];
+            for (const e of entries) {
+                const { __update_epoch, __sync_epoch, ...obj } = e;
+                data.push(obj);
+            }
+        }
+        else {
+            data = (await this.outerAdapter.query(trx, query, pagination, params)).data;
+        }
+        for (const entry of data) {
+            delete entry['__update_epoch'];
+            delete entry['__sync_epoch'];
         }
-        return this.outerAdapter.query(trx, query);
+        if (config?.view) {
+            data = await this.bucket.buildMany(trx, data, config.view);
+        }
+        return { data };
     }
     /* Cache modes */
     async syncOne(trx, id) {
-        const localObj = await this.innerAdapter.get(trx, id);
+        let localObj = await this.innerAdapter.get(trx, id);
         if (!localObj) {
             const obj = await this.outerAdapter.get(trx, id);
             if (obj) {
-                const entry = new BucketCacheEntry(obj.id, obj, this.outerAdapter.getUpdateEpoch(obj), this.lastSyncEpoch);
+                const entry = new BucketCacheEntry(obj, this.outerAdapter.getUpdateEpoch(obj), this.lastSyncEpoch);
                 await this.innerAdapter.create(trx, entry);
                 return { action: 'update', sync: entry };
             }
-            return { action: 'keep' };
+            return { action: 'none' };
         }
-        const sync = await this.outerAdapter.syncOne(trx, id, localObj.updateEpoch);
+        const sync = await this.outerAdapter.syncOne(trx, id, localObj.__update_epoch);
         if (sync === null) {
-            return { action: 'keep', sync: localObj };
+            return { action: 'none', sync: localObj };
         }
         if (sync === 'deleted') {
             await this.innerAdapter.delete(trx, id);
             return { action: 'delete' };
         }
-        localObj.obj = sync.obj;
-        localObj.updateEpoch = sync.updateEpoch;
-        localObj.syncEpoch = datetime_1.NesoiDatetime.now().epoch;
+        localObj = new BucketCacheEntry(sync.obj, sync.updateEpoch, datetime_1.NesoiDatetime.now().epoch);
         await this.innerAdapter.put(trx, localObj);
-        return { action: 'update', sync };
+        return { action: 'update', sync: localObj };
     }
     async syncOneAndPast(trx, id) {
         const localObj = await this.innerAdapter.get(trx, id);
@@ -102,54 +138,52 @@ class BucketCache {
             const obj = await this.outerAdapter.get(trx, id);
             if (obj) {
                 await this.innerAdapter.create(trx, obj);
-                return { action: 'update', sync: {
-                        obj,
-                        updateEpoch: this.outerAdapter.getUpdateEpoch(obj)
-                    } };
+                return { action: 'update', sync: new BucketCacheEntry(obj, this.outerAdapter.getUpdateEpoch(obj), datetime_1.NesoiDatetime.now().epoch) };
             }
-            return { action: 'keep' };
+            return { action: 'none' };
         }
-        const sync = await this.outerAdapter.syncOneAndPast(trx, id, localObj.updateEpoch);
+        const sync = await this.outerAdapter.syncOneAndPast(trx, id, localObj.__update_epoch);
         if (sync === null) {
-            return { action: 'keep', sync: localObj };
+            return { action: 'none', sync: localObj };
         }
         if (sync === 'deleted') {
             await this.innerAdapter.delete(trx, id);
             return { action: 'delete' };
         }
-        await this.innerAdapter.putMany(trx, sync.map(s => s.obj));
-        return { action: 'update', sync: sync.find(s => s.obj.id === id) };
+        const entries = sync.map(s => new BucketCacheEntry(s.obj, s.updateEpoch, datetime_1.NesoiDatetime.now().epoch));
+        await this.innerAdapter.putMany(trx, entries);
+        return { action: 'update', sync: entries.find(e => e.id === id) };
     }
     async syncAll(trx) {
         const sync = await this.outerAdapter.syncAll(trx, this.lastHash, this.lastUpdateEpoch);
         if (sync === null) {
             const all = await this.innerAdapter.index(trx);
-            return { action: 'keep', sync: all };
+            return { action: 'none', sync: all };
         }
         this.lastUpdateEpoch = sync.updateEpoch;
         this.lastHash = sync.hash;
         this.lastSyncEpoch = datetime_1.NesoiDatetime.now().epoch;
-        const entries = sync.sync.map(s => new BucketCacheEntry(s.obj.id, s.obj, s.updateEpoch, this.lastSyncEpoch));
+        const entries = sync.sync.map(s => new BucketCacheEntry(s.obj, s.updateEpoch, this.lastSyncEpoch));
         if (sync.reset) {
             await this.innerAdapter.deleteEverything(trx);
             await this.innerAdapter.putMany(trx, entries);
-            return { action: 'reset', sync: sync.sync };
+            return { action: 'reset', sync: entries };
         }
         await this.innerAdapter.putMany(trx, entries);
-        return { action: 'update', sync: sync.sync };
+        return { action: 'update', sync: entries };
     }
-    async syncQuery(trx, view, query, pagination) {
+    async syncQuery(trx, query, pagination, params) {
         // 1. Query id and epoch from outer adapter
-        const outerMetadata = await this.outerAdapter.query(trx, query, pagination, undefined, {
+        const outerMetadata = await this.outerAdapter.query(trx, query, pagination, params, {
             metadataOnly: true
         });
         if (!outerMetadata.data.length) {
-            return { action: 'keep', sync: [] };
+            return { action: 'none', sync: [] };
         }
         // 2. Read ids from the inner adapter
         const innerData = await this.innerAdapter.query(trx, {
             'id in': outerMetadata.data.map(obj => obj.id)
-        });
+        }, undefined, undefined, undefined, this.innerAdapter.nql);
         // 3. Filter modified query results
         const outerEpoch = {};
         for (const i in outerMetadata.data) {
@@ -159,18 +193,18 @@ class BucketCache {
         const queryResults = {};
         const modifiedIds = [];
         for (const i in innerData.data) {
-            const obj = innerData.data[i];
-            const epoch = outerEpoch[obj.id];
-            if (!epoch || epoch > obj.updateEpoch) {
-                modifiedIds.push(obj.id);
+            const entry = innerData.data[i];
+            const epoch = outerEpoch[entry.id];
+            if (!epoch || epoch > entry.__update_epoch) {
+                modifiedIds.push(entry.id);
             }
             else {
-                queryResults[obj.id] = obj;
+                queryResults[entry.id] = entry;
             }
         }
         // 4. Nothing changed, return current data
         if (!modifiedIds.length) {
-            return { action: 'keep', sync: innerData.data };
+            return { action: 'none', sync: innerData.data };
         }
         // 5. Query modified objects to outer adapter and merge them on results
         const outerData = await this.outerAdapter.query(trx, {
@@ -184,7 +218,7 @@ class BucketCache {
                 updateEpoch
             };
         }
-        return { action: 'update', sync: Object.values(queryResults) };
+        return { action: 'update', sync: Object.values(queryResults).map(r => new BucketCacheEntry(r.obj, r.updateEpoch, datetime_1.NesoiDatetime.now().epoch)) };
     }
 }
 exports.BucketCache = BucketCache;

package/lib/elements/entities/bucket/graph/bucket_graph.d.ts

@@ -22,6 +22,17 @@ export declare class BucketGraph<M extends $Module, $ extends $Bucket> {
         silent?: boolean;
         no_tenancy?: boolean;
     }): Promise<Obj | Obj[] | undefined>;
+    /**
+     * Read the data from a link
+     *
+     * - Options
+     *   - `silent`: If not found, returns undefined instead of raising an exception (default: `false`)
+     *   - `no_tenancy`: Don't apply tenancy rules (default: `false`)
+     */
+    readManyLinks<LinkName extends keyof $['graph']['links'], LinkBucketName extends $['graph']['links'][LinkName]['bucket']['refName'], LinkBucket extends M['buckets'][LinkBucketName], Obj = LinkBucket['#data']>(trx: AnyTrxNode, objs: $['#data'][], link: LinkName, options?: {
+        silent?: boolean;
+        no_tenancy?: boolean;
+    }): Promise<Obj[] | Obj[][]>;
     /**
      * Read the data from a link and build it with a given view
      *

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

@@ -4,6 +4,8 @@ exports.BucketGraph = void 0;
 const trx_node_1 = require("../../../../engine/transaction/trx_node");
 const log_1 = require("../../../../engine/util/log");
 const error_1 = require("../../../../engine/data/error");
+const memory_bucket_adapter_1 = require("../adapters/memory.bucket_adapter");
+const bucket_cache_1 = require("../cache/bucket_cache");
 /**
  * @category Elements
  * @subcategory Entity
@@ -30,12 +32,13 @@ class BucketGraph {
             : this.bucket.getTenancyQuery(trx);
         // Query
         const otherBucket = trx_node_1.TrxNode.getModule(trx).buckets[schema.bucket.refName];
-        const links = await otherBucket.adapter.query(trx, {
+        const adapter = otherBucket.cache || otherBucket.adapter;
+        const links = await adapter.query(trx, {
             ...schema.query,
             '#and': tenancy
         }, {
             perPage: schema.many ? undefined : 1,
-        }, { ...obj });
+        }, [{ ...obj }]);
         // Empty response
         if (!schema.many && !schema.optional && !links.data.length) {
             // silent = undefined
@@ -57,6 +60,57 @@ class BucketGraph {
             return links.data[0];
         }
     }
+    /**
+     * Read the data from a link
+     *
+     * - Options
+     *   - `silent`: If not found, returns undefined instead of raising an exception (default: `false`)
+     *   - `no_tenancy`: Don't apply tenancy rules (default: `false`)
+     */
+    async readManyLinks(trx, objs, link, options) {
+        log_1.Log.trace('bucket', this.bucketName, `Read link ${link}`);
+        const schema = this.schema.links[link];
+        // Make tenancy query
+        const tenancy = (options?.no_tenancy)
+            ? undefined
+            : this.bucket.getTenancyQuery(trx);
+        // Query
+        const otherBucket = trx_node_1.TrxNode.getModule(trx).buckets[schema.bucket.refName];
+        // let tempData: Record<string, any> = {};
+        let tempAdapter;
+        if (otherBucket.adapter instanceof memory_bucket_adapter_1.MemoryBucketAdapter) {
+            tempAdapter = otherBucket.cache || otherBucket.adapter;
+        }
+        else {
+            const adapter = otherBucket.cache || otherBucket.adapter;
+            const allLinks = await adapter.query(trx, {
+                ...schema.query,
+                '#and': tenancy
+            }, undefined, objs.map(obj => ({ ...obj })));
+            const tempData = {};
+            for (const obj of allLinks.data)
+                tempData[obj.id] = obj;
+            tempAdapter = new memory_bucket_adapter_1.MemoryBucketAdapter(otherBucket.schema, tempData);
+        }
+        const links = [];
+        for (const obj of objs) {
+            const result = tempAdapter instanceof bucket_cache_1.BucketCache
+                ? await tempAdapter.query(trx, schema.query, {
+                    perPage: schema.many ? undefined : 1,
+                }, [{ ...obj }], undefined)
+                : await tempAdapter.query(trx, schema.query, {
+                    perPage: schema.many ? undefined : 1,
+                }, [{ ...obj }], undefined, tempAdapter.nql);
+            if (schema.many) {
+                links.push(result.data);
+            }
+            else {
+                links.push(result.data[0]);
+            }
+        }
+        // Empty response
+        return links;
+    }
     /**
      * Read the data from a link and build it with a given view
      *
@@ -102,7 +156,7 @@ class BucketGraph {
             '#and': tenancy
         }, {
             perPage: 1,
-        }, { ...obj });
+        }, [{ ...obj }]);
         return !!links.data.length;
     }
 }

package/lib/elements/entities/bucket/model/bucket_model.schema.js

@@ -55,7 +55,6 @@ class $BucketModel {
                 }
                 // If it's a list or dict, or an object 
                 if (field.type === 'list' || field.type === 'dict') {
-                    // If not, iterate
                     next.push({
                         i: item.i + 1,
                         field: field.children['#']
@@ -70,6 +69,10 @@ class $BucketModel {
                     })));
                     continue;
                 }
+                if (field.type === 'unknown') {
+                    results.push(field);
+                    continue;
+                }
                 const child = field.children[path];
                 if (child) {
                     next.push({
@@ -127,53 +130,53 @@ class $BucketModel {
         while (poll.length) {
             const next = [];
             for (const entry of poll) {
-                const val = obj[entry.path];
+                const val = entry.obj[entry.path];
                 if (val === undefined) {
                     continue;
                 }
                 if (val === null) {
-                    copy[entry.path] = null;
+                    entry.copy[entry.path] = null;
                     continue;
                 }
                 if (entry.field.type === 'list') {
                     if (!Array.isArray(val))
                         continue;
-                    copy[entry.path] = [];
+                    entry.copy[entry.path] = [];
                     next.push(...val.map((_, i) => ({
                         path: i.toString(),
                         obj: val,
-                        copy: copy[entry.path],
-                        field: entry.field.children['*']
+                        copy: entry.copy[entry.path],
+                        field: entry.field.children['#']
                     })));
                 }
                 else if (entry.field.type === 'dict') {
                     if (typeof val !== 'object' || Array.isArray(val))
                         continue;
-                    copy[entry.path] = {};
+                    entry.copy[entry.path] = {};
                     next.push(...Object.keys(val).map((path) => ({
                         path,
                         obj: val,
-                        copy: copy[entry.path],
-                        field: entry.field.children['*']
+                        copy: entry.copy[entry.path],
+                        field: entry.field.children['#']
                     })));
                 }
                 else if (entry.field.type === 'obj') {
                     if (typeof val !== 'object' || Array.isArray(val))
                         continue;
-                    copy[entry.path] = {};
+                    entry.copy[entry.path] = {};
                     next.push(...Object.keys(entry.field.children).map(path => ({
                         path: path,
                         obj: val,
-                        copy: copy[entry.path],
+                        copy: entry.copy[entry.path],
                         field: entry.field.children[path]
                     })));
                 }
                 else if (entry.field.type === 'union') {
                     // TODO: ??????????   
-                    copy[entry.path] = obj[entry.path];
+                    entry.copy[entry.path] = entry.obj[entry.path];
                 }
                 else {
-                    copy[entry.path] = obj[entry.path];
+                    entry.copy[entry.path] = entry.obj[entry.path];
                 }
             }
             poll = next;

package/lib/elements/entities/bucket/model/bucket_model_field.builder.d.ts

@@ -2,7 +2,6 @@ import { $Module, $Space } from "../../../../schema";
 import { $BucketModelField, $BucketModelFieldType, $BucketModelFields } from './bucket_model.schema';
 import { NesoiDate } from "../../../../engine/data/date";
 import { BucketModelpathObjInfer, BucketModelpathDictInfer, BucketModelpathListInfer, BucketModelObjInfer, BucketQuerypathDictInfer, BucketQuerypathListInfer, BucketQuerypathObjInfer, BucketModelpathUnionInfer } from './bucket_model.infer';
-import { EnumFromName, EnumName } from '../../constants/constants.schema';
 import { NesoiDecimal } from "../../../../engine/data/decimal";
 import { NesoiDatetime } from "../../../../engine/data/datetime";
 import { NesoiFile } from "../../../../engine/data/file";
@@ -49,10 +48,10 @@ export declare class BucketModelFieldFactory<Space extends $Space, Module extend
     }, {
         '': NesoiDecimal;
     }>;
-    enum<Enums extends EnumName<Space>, Options extends (keyof Enums & string) | (readonly string[])>(options: Options): BucketModelFieldBuilder<Module, Options extends string ? keyof EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options], Options extends string ? keyof EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options], [false, false], {
-        '': Options extends string ? keyof EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options];
+    enum<Enums extends Module['constants']['enums'], Options extends (keyof Enums & string) | (readonly string[])>(options: Options): BucketModelFieldBuilder<Module, Options extends string ? keyof Module["constants"]["enums"][Options]["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options], Options extends string ? keyof Module["constants"]["enums"][Options]["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options], [false, false], {
+        '': Options extends string ? keyof Module["constants"]["enums"][Options]["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options];
     }, {
-        '': Options extends string ? keyof EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options];
+        '': Options extends string ? keyof Module["constants"]["enums"][Options]["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options];
     }>;
     get int(): BucketModelFieldBuilder<Module, number, number, [false, false], {
         '': number;

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

@@ -91,6 +91,8 @@ class NQL_RuleTree {
         let by = value['by'];
         if (by) {
             for (const key of by) {
+                if (Object.values(bucket.adapter.config.meta).includes(key))
+                    continue;
                 const fields = bucket_model_schema_1.$BucketModel.getField(bucket.schema.model, key);
                 if (!fields.length) {
                     throw new Error(`Field '${key}' not found on bucket '${bucket.schema.name}'`);
@@ -148,6 +150,10 @@ class NQL_RuleTree {
                 throw new Error(`Invalid term '${key}'`);
             }
             const [_, or, fieldpath, not, case_i, op] = term;
+            if (Object.values(bucket.adapter.config.meta).includes(fieldpath)) {
+                const _op = this.parseOp(bucket.schema.name, [{ type: 'datetime', name: fieldpath }], op);
+                return { type: 'fieldpath', or: !!or, fieldpath, not: !!not, case_i: !!case_i, op: _op };
+            }
             const fields = bucket_model_schema_1.$BucketModel.getField(bucket.schema.model, fieldpath);
             if (!fields.length) {
                 throw new Error(`Field '${fieldpath}' not found on bucket '${bucket.schema.name}'`);
@@ -242,7 +248,7 @@ class NQL_RuleTree {
         };
         for (const key in value) {
             if (key.startsWith('@') || key.startsWith('or @')) {
-                const refField = key.match(/(or )?@(\w+)\.(.*)/);
+                const refField = key.match(/(or )?@([\w:]+)\.(.*)/);
                 if (!refField) {
                     throw new Error(`Invalid bucket field '${key}'`);
                 }

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

@@ -15,7 +15,7 @@ export type NQL_Result<T = Obj> = {
  * @category NQL
  * */
 export declare abstract class NQLRunner {
-    abstract run(trx: AnyTrxNode, part: NQL_Part, params: Record<string, any>, pagination?: NQL_Pagination, view?: $BucketView): Promise<NQL_Result>;
+    abstract run(trx: AnyTrxNode, part: NQL_Part, params: Record<string, any>[], pagination?: NQL_Pagination, view?: $BucketView): Promise<NQL_Result>;
 }
 /**
  * @category NQL
@@ -24,7 +24,7 @@ export declare class NQL_Engine {
     private module;
     private runners;
     constructor(module: AnyModule);
-    run(trx: AnyTrxNode, query: NQL_CompiledQuery, pagination?: NQL_Pagination, params?: Record<string, any>, view?: $BucketView): Promise<NQL_Result>;
+    run(trx: AnyTrxNode, query: NQL_CompiledQuery, pagination?: NQL_Pagination, params?: Record<string, any>[], view?: $BucketView, runner?: NQLRunner): Promise<NQL_Result>;
     linkExternal(bucket: AnyBucket): void;
 }
 export {};

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

@@ -22,7 +22,9 @@ class NQL_Engine {
             }
         }
     }
-    async run(trx, query, pagination, params = {}, view) {
+    async run(trx, query, pagination, params = [{}], view, runner) {
+        if (!params.length)
+            params = [{}];
         let result = {
             data: []
         };
@@ -30,8 +32,8 @@ class NQL_Engine {
             const part_i = query.execOrder[i];
             const part = query.parts[part_i];
             // Run part
-            const runner = this.runners[part.union.meta.scope];
-            const out = await runner.run(trx, part, params, pagination, view);
+            const _runner = runner || this.runners[part.union.meta.scope];
+            const out = await _runner.run(trx, part, params, pagination, view);
             result = out;
             // Part failed, return
             // Failure here is only when a single value is expected,
@@ -43,7 +45,9 @@ class NQL_Engine {
                 }
             }
             // Fill part params
-            params[`%__${part_i}__%`] = part.many ? result.data : result.data[0];
+            for (const paramGroup of params) {
+                paramGroup[`%__${part_i}__%`] = part.many ? result.data : result.data[0];
+            }
         }
         return result;
     }