nesoi 3.3.6 → 3.3.8

package/lib/bundler/distributed/stages/6_dump_cli_stage.js

@@ -20,7 +20,6 @@
 //         Log.info('compiler', 'monolyth', 'Dumping cli.js file to build/bin folder...')
 //         const { dirs } = this.monolyth;
 //         let str = '';
-//         str += 'require("nesoi/tools/dotenv");\n';
 //         str += 'const app = require(\'../app\').default\n';
 //         str += 'const { Log } = require(\'nesoi/lib/engine/util/log\');\n';
 //         str += 'Log.level = \'debug\';\n'

package/lib/bundler/monolyth/stages/6_dump_cli_stage.js

@@ -53,7 +53,6 @@ class DumpCLIStage {
         log_1.Log.info('compiler', 'monolyth', 'Dumping cli.js file to build/bin folder...');
         const { dirs } = this.bundler;
         let str = '';
-        str += 'require("nesoi/tools/dotenv");\n';
         str += 'const app = require(\'../app\').default\n';
         str += 'const { Log } = require(\'nesoi/lib/engine/util/log\');\n';
         str += 'Log.level = \'debug\';\n';

package/lib/elements/blocks/resource/resource.builder.js

@@ -42,8 +42,7 @@ class ResourceBuilder extends block_builder_1.BlockBuilder {
             id: $.string_or_number.optional,
             perPage: $.int.default(10),
             page: $.int.default(0),
-            orderBy: $.string.optional,
-            orderDesc: $.boolean.default(false)
+            sort: $.list($.literal(/.@(asc|desc)/)).optional
         }))
             .prepare(resource_job_1.ResourceJob.prepareMsgData);
         this._inlineNodes.push(new dependency_1.BuilderNode({

package/lib/elements/blocks/resource/resource.js

@@ -4,6 +4,8 @@ exports.Resource = void 0;
 const block_1 = require("../block");
 const trx_node_1 = require("../../../engine/transaction/trx_node");
 const error_1 = require("../../../engine/data/error");
+const dependency_1 = require("../../../engine/dependency");
+const daemon_1 = require("../../../engine/daemon");
 /**
  * @category Elements
  * @subcategory Block
@@ -76,12 +78,20 @@ class Resource extends block_1.Block {
     /* Implementations */
     static view($) {
         const scope = $.job.scope;
+        // TODO: sort
         return $.msg.id
             ? $.trx.bucket(scope.bucket).viewOneOrFail($.msg.id, $.msg.view)
             : $.trx.bucket(scope.bucket).viewAll($.msg.view);
     }
     static query($) {
         const scope = $.job.scope;
+        // Default sorting
+        if (!('#sort' in $.msg.query) || !$.msg.query['#sort']?.length) {
+            const module = trx_node_1.TrxNode.getModule($.trx);
+            const tag = dependency_1.Tag.fromNameOrShort(scope.module, 'bucket', scope.bucket);
+            const { meta } = daemon_1.Daemon.getBucketMetadata(module.daemon, tag);
+            $.msg.query['#sort'] = `${meta.updated_at}@desc`;
+        }
         return $.trx.bucket(scope.bucket)
             .viewQuery($.msg.query, $.msg.view).page({
             page: $.msg.page,

package/lib/elements/entities/bucket/adapters/bucket_adapter.d.ts

@@ -136,8 +136,12 @@ export declare abstract class BucketAdapter<Obj extends NesoiObj> {
     };
     /**
      * Return the results of a query
+     * - `pagination`: Limits the number of results.
+     *  - `perPage`: If 0, returns no results (useful with config.metadataOnly). If -1, returns all results.
+     * - `params`: Objects to be used when filling param values. The query returns objects matching *any* of the param objects.
+     * - `param_templates`: Path parameter replacements to be used when filling param_with_$ values. The query returns objects matching *any* of the param objects.
      */
-    query<MetadataOnly extends boolean>(trx: AnyTrxNode, query: NQL_AnyQuery, pagination?: NQL_Pagination, params?: Record<string, any>[], path_params?: Record<string, string>[], config?: {
+    query<MetadataOnly extends boolean>(trx: AnyTrxNode, query: NQL_AnyQuery, pagination?: NQL_Pagination, params?: Record<string, any>[], param_templates?: Record<string, string>[], config?: {
         view?: string;
         metadataOnly?: MetadataOnly;
     }, custom?: {

package/lib/elements/entities/bucket/adapters/bucket_adapter.js

@@ -24,8 +24,12 @@ class BucketAdapter {
     /* Generic Implementation */
     /**
      * Return the results of a query
+     * - `pagination`: Limits the number of results.
+     *  - `perPage`: If 0, returns no results (useful with config.metadataOnly). If -1, returns all results.
+     * - `params`: Objects to be used when filling param values. The query returns objects matching *any* of the param objects.
+     * - `param_templates`: Path parameter replacements to be used when filling param_with_$ values. The query returns objects matching *any* of the param objects.
      */
-    async query(trx, query, pagination, params, path_params, config, 
+    async query(trx, query, pagination, params, param_templates, config, 
     // When running a temporary local memory adapter,
     // these are required
     custom) {
@@ -33,7 +37,7 @@ class BucketAdapter {
         const moduleName = custom?.module || module.name;
         const compiled = await nql_compiler_1.NQL_Compiler.build(module.daemon, moduleName, this.schema.name, query, custom?.metadata);
         const view = config?.view ? this.schema.views[config.view] : undefined;
-        const result = await module.nql.run(trx, compiled, pagination, params, path_params, view, custom?.runners);
+        const result = await module.nql.run(trx, compiled, pagination, params, param_templates, view, custom?.runners);
         if (config?.metadataOnly) {
             result.data = result.data.map(obj => ({
                 id: obj.id,

package/lib/elements/entities/bucket/adapters/memory.nql.d.ts

@@ -10,7 +10,7 @@ export declare class MemoryNQLRunner extends NQLRunner {
     protected adapter?: AnyMemoryBucketAdapter;
     constructor();
     bind(adapter: AnyMemoryBucketAdapter): void;
-    run(trx: AnyTrxNode, part: NQL_Part, params: Obj[], path_params: Obj[], pagination?: NQL_Pagination): Promise<{
+    run(trx: AnyTrxNode, part: NQL_Part, params: Obj[], param_templates: Record<string, string>[], pagination?: NQL_Pagination): Promise<{
         data: any[];
         totalItems: number | undefined;
         page: number | undefined;

package/lib/elements/entities/bucket/adapters/memory.nql.js

@@ -13,7 +13,7 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
     bind(adapter) {
         this.adapter = adapter;
     }
-    async run(trx, part, params, path_params, pagination) {
+    async run(trx, part, params, param_templates, pagination) {
         if (!this.adapter) {
             throw new Error('No adapter bound to NQL Runner');
         }
@@ -25,33 +25,33 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
         }
         // Non-empty query
         else {
-            response = await this.filter(part, data, params, path_params);
+            response = await this.filter(part, data, params, param_templates);
         }
         let output = Object.values(response);
-        if (part.union.order) {
-            const by = part.union.order.by.length
-                ? part.union.order.by
-                : [this.adapter.config.meta.updated_at];
+        if (part.union.sort?.length) {
+            const sort = part.union.sort;
             output.sort((a, b) => {
-                for (let i = 0; i < by.length; i++) {
-                    const key = by[i];
-                    if (typeof a[key] == 'number') {
-                        if (typeof b[key] !== 'number')
-                            throw new Error(`Cannot compare number and ${typeof b[key]}`);
-                        let d = a[key] - b[key];
+                for (let i = 0; i < sort.length; i++) {
+                    const s = sort[i];
+                    const a_val = tree_1.Tree.get(a, s.key);
+                    const b_val = tree_1.Tree.get(b, s.key);
+                    if (typeof a_val == 'number') {
+                        if (typeof b_val !== 'number')
+                            throw new Error(`Cannot compare number and ${typeof b_val}`);
+                        let d = a_val - b_val;
                         if (d !== 0) {
-                            if (part.union.order.dir[i] === 'desc') {
+                            if (s.dir === 'desc') {
                                 d *= -1;
                             }
                             return d;
                         }
                     }
-                    else if (typeof a[key] == 'string') {
-                        if (typeof b[key] !== 'string')
-                            throw new Error(`Cannot compare string and ${typeof b[key]}`);
-                        let d = a[key].localeCompare(b[key]);
+                    else if (typeof a_val == 'string') {
+                        if (typeof b_val !== 'string')
+                            throw new Error(`Cannot compare string and ${typeof b_val}`);
+                        let d = a_val.localeCompare(b_val);
                         if (d !== 0) {
-                            if (part.union.order.dir[i] === 'desc') {
+                            if (s.dir === 'desc') {
                                 d *= -1;
                             }
                             return d;
@@ -67,8 +67,8 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
                 totalItems = output.length;
             }
             if (pagination.page !== undefined || pagination.perPage !== undefined) {
-                const a = ((pagination.page || 1) - 1) * (pagination.perPage || 10);
-                const b = a + (pagination.perPage || 10);
+                const a = ((pagination.page || 1) - 1) * (pagination.perPage ?? 10);
+                const b = a + (pagination.perPage ?? 10);
                 output = output.slice(a, b);
             }
         }
@@ -84,16 +84,16 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
      * testing objects unnecessarily. Returns a dict of results by id.
      * @returns A dict of results by id
      */
-    filter(part, objs, params, path_params) {
+    filter(part, objs, params, param_templates) {
         // Accumulate results from n intersections,
         // avoiding a re-check of already matched objects.
-        const _union = (union, objs, params, path_params) => {
+        const _union = (union, objs, params, param_templates) => {
             const out = {};
             const remaining = { ...objs };
             for (const inter of union.inters) {
                 if (Object.keys(remaining).length === 0)
                     break;
-                const interOut = _inter(inter, remaining, params, path_params);
+                const interOut = _inter(inter, remaining, params, param_templates);
                 Object.assign(out, interOut);
                 for (const k in interOut) {
                     delete remaining[k];
@@ -103,7 +103,7 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
         };
         // Sieves results from n unions or rules,
         // avoiding a re-check of already filtered-out objects.
-        const _inter = (inter, objs, params, path_params) => {
+        const _inter = (inter, objs, params, param_templates) => {
             let out = {};
             const remaining = { ...objs };
             for (const rule of inter.rules) {
@@ -111,11 +111,11 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
                     break;
                 // <Union>
                 if ('inters' in rule) {
-                    out = _union(rule, remaining, params, path_params);
+                    out = _union(rule, remaining, params, param_templates);
                 }
                 // <Rule>
                 else {
-                    out = _rule(rule, remaining, params, path_params);
+                    out = _rule(rule, remaining, params, param_templates);
                 }
                 for (const k in remaining) {
                     if (!(k in out)) {
@@ -125,24 +125,24 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
             }
             return out;
         };
-        const _rule = (rule, objs, params, path_params) => {
+        const _rule = (rule, objs, params, param_templates) => {
             const out = {};
             for (const id in objs) {
                 const obj = objs[id];
                 let match = false;
                 const combos = [];
                 for (const param of params) {
-                    if (path_params.length) {
-                        for (const path_param of path_params) {
-                            combos.push({ params: param, path_params: path_param });
+                    if (param_templates.length) {
+                        for (const template of param_templates) {
+                            combos.push({ params: param, param_template: template });
                         }
                     }
                     else {
-                        combos.push({ params: param, path_params: {} });
+                        combos.push({ params: param, param_template: {} });
                     }
                 }
                 for (const combo of combos) {
-                    match = _obj(rule, obj, combo.params, combo.path_params);
+                    match = _obj(rule, obj, combo.params, combo.param_template);
                     if (match)
                         break;
                 }
@@ -160,7 +160,7 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
             }
             return out;
         };
-        const _obj = (rule, obj, params, path_params) => {
+        const _obj = (rule, obj, params, param_template) => {
             const fieldValue = tree_1.Tree.get(obj, rule.fieldpath);
             // Value is undefined, only 'present' rule applies
             if (fieldValue === undefined) {
@@ -172,7 +172,7 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
             // Fieldpath is a spread, apply rule to each item
             if (rule.fieldpath.includes('.#')) {
                 for (const item of fieldValue) {
-                    if (_obj(rule, item, params, path_params))
+                    if (_obj(rule, item, params, param_template))
                         return true;
                 }
                 return false;
@@ -180,7 +180,7 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
             let queryValue;
             // Value is a subquery, run union
             if ('subquery' in rule.value) {
-                const subOut = _union(rule.value.subquery.union, objs, [params], Object.keys(path_params).length ? [path_params] : []);
+                const subOut = _union(rule.value.subquery.union, objs, [params], Object.keys(param_template).length ? [param_template] : []);
                 const subList = Object.values(subOut);
                 // Subquery operator is for a list, filter
                 if (rule.op === 'in' || rule.op === 'contains_any') {
@@ -193,16 +193,16 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
             }
             else if ('param' in rule.value) {
                 if (Array.isArray(rule.value.param)) {
-                    queryValue = rule.value.param.map(p => params[p]);
+                    queryValue = rule.value.param.map(p => tree_1.Tree.get(params, p));
                 }
                 else {
-                    queryValue = params[rule.value.param];
+                    queryValue = tree_1.Tree.get(params, rule.value.param);
                 }
             }
-            else if ('path_param' in rule.value) {
-                let path = rule.value.path_param;
-                for (const key in path_params) {
-                    path = path.replace(new RegExp(key, 'g'), path_params[key]);
+            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]);
                 }
                 queryValue = tree_1.Tree.get(params, path);
             }
@@ -296,7 +296,7 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
             }
             return false;
         };
-        return _union(part.union, objs, params, path_params);
+        return _union(part.union, objs, params, param_templates);
     }
 }
 exports.MemoryNQLRunner = MemoryNQLRunner;

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

@@ -206,7 +206,7 @@ export declare class Bucket<M extends $Module, $ extends $Bucket> {
     query<V extends ViewName<$>, Obj extends ViewObj<$, V>>(trx: AnyTrxNode, query: NQL_AnyQuery, pagination?: NQL_Pagination, view?: V, options?: {
         no_tenancy?: boolean;
         params?: Record<string, any>[];
-        path_params?: Record<string, any>[];
+        param_templates?: Record<string, any>[];
     }): Promise<NQL_Result<Obj>>;
     /**
      * Add `created_by`, `created_at`, `updated_by` and `updated_at` fields to object

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

@@ -712,9 +712,14 @@ class Bucket {
             ...query,
             '#and __tenancy__': tenancy
         };
+        // Pagination
+        if (pagination) {
+            if (pagination.perPage && pagination.perPage < 0)
+                pagination.perPage = undefined;
+        }
         // Query
         const adapter = this.cache || this.adapter;
-        const result = await adapter.query(trx, query, pagination, options?.params, options?.path_params);
+        const result = await adapter.query(trx, query, pagination, options?.params, options?.param_templates);
         if (!result.data.length)
             return result;
         // Encryption

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

@@ -52,7 +52,7 @@ export declare class BucketGraph<M extends $Module, $ extends $Bucket> {
     }, view: V, options?: {
         silent?: boolean;
         no_tenancy?: boolean;
-        path_params?: Record<string, any>;
+        param_templates?: Record<string, any>;
     }): Promise<Obj | Obj[] | undefined>;
     /**
      * Return true if the link resolves to at least one object

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

@@ -43,7 +43,7 @@ class BucketGraph {
         };
         // Params
         const params = [{ ...obj }];
-        const path_params = link.index.length
+        const param_templates = link.index.length
             ? Object.fromEntries(link.index
                 .map((s, i) => [`$${i}`, s]))
             : undefined;
@@ -53,14 +53,14 @@ class BucketGraph {
             links = await trx.bucket(schema.bucket.short)
                 .query(query)
                 .params(params)
-                .path_params(path_params)
+                .param_templates(param_templates)
                 .page(page);
         }
         // Internal
         else {
             const otherBucket = dependency_1.Tag.element(schema.bucket, trx);
             const adapter = otherBucket.cache || otherBucket.adapter;
-            links = await adapter.query(trx, query, page, params, path_params ? [path_params] : undefined);
+            links = await adapter.query(trx, query, page, params, param_templates ? [param_templates] : undefined);
         }
         // Empty response
         if (!schema.many && !schema.optional && !links.data.length) {
@@ -97,14 +97,14 @@ class BucketGraph {
         const tenancy = (options?.no_tenancy)
             ? undefined
             : this.bucket.getTenancyQuery(trx);
-        // Query
+        // 1st Query
         const module = trx_node_1.TrxNode.getModule(trx);
         const query = {
             ...schema.query,
             '#and __tenancy__': tenancy
         };
         const params = objs.map(obj => ({ ...obj }));
-        const path_params = link.indexes.length
+        const param_templates = link.indexes.length
             ? link.indexes.map(index => Object.fromEntries(index
                 .map((s, i) => [`$${i}`, s]))) : undefined;
         let tempAdapter;
@@ -113,7 +113,7 @@ class BucketGraph {
             const allLinks = await trx.bucket(schema.bucket.short)
                 .query(query)
                 .params(params)
-                .path_params(path_params)
+                .param_templates(param_templates)
                 .all();
             const tempData = {};
             for (const obj of allLinks)
@@ -129,14 +129,14 @@ class BucketGraph {
             }
             else {
                 const adapter = otherBucket.cache || otherBucket.adapter;
-                const allLinks = await adapter.query(trx, query, undefined, params, path_params);
+                const allLinks = await adapter.query(trx, query, undefined, params, param_templates);
                 const tempData = {};
                 for (const obj of allLinks.data)
                     tempData[obj.id] = obj;
                 tempAdapter = new memory_bucket_adapter_1.MemoryBucketAdapter(otherBucket.schema, tempData);
             }
         }
-        // Query
+        // 2nd Query
         const links = [];
         for (const obj of objs) {
             const result = tempAdapter instanceof bucket_cache_1.BucketCache

package/lib/elements/entities/bucket/query/nql.schema.d.ts

@@ -11,10 +11,10 @@ export type NQL_QueryMeta = {
 export type NQL_Union = {
     meta: NQL_QueryMeta;
     inters: NQL_Intersection[];
-    order?: {
-        by: string[];
-        dir: ('asc' | 'desc')[];
-    };
+    sort?: {
+        key: string;
+        dir: ('asc' | 'desc');
+    }[];
     _debug_id?: number;
 };
 export type NQL_Intersection = {
@@ -33,7 +33,7 @@ export type NQL_Rule = {
     } | {
         param: string | string[];
     } | {
-        path_param: string;
+        param_with_$: string;
     } | {
         subquery: {
             bucket: $Bucket;
@@ -56,10 +56,7 @@ export type NQL_Node = NQL_Union | NQL_Intersection | NQL_Rule;
  * All operations
  */
 export type NQL_Operation = '==' | '>' | '<' | '>=' | '<=' | 'in' | 'contains' | 'contains_any' | 'present';
-export type NQL_Order<Querypath> = {
-    by?: (keyof Querypath)[];
-    dir?: ('asc' | 'desc')[];
-};
+export type NQL_Sort<Querypath> = `${keyof Querypath & string}@${'asc' | 'desc'}` | `${keyof Querypath & string}@${'asc' | 'desc'}`[];
 export type NQL_Pagination = {
     page?: number;
     perPage?: number;
@@ -136,7 +133,7 @@ type NQL_Terms<M extends $Module, $ extends $Bucket, Parameters = {}, Querypath
 }>> = Conditions[keyof Conditions] & {
     [K in `${'#and' | '#or'}${string}`]?: NQL_Terms<M, $, Parameters>;
 } & NQL_GraphLinks<M, $, Parameters> & {
-    '#order'?: NQL_Order<Querypath>;
+    '#sort'?: NQL_Sort<Querypath>;
 };
 /**
  * NQL Dynamic Query Type

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

@@ -16,7 +16,7 @@ export declare class NQL_RuleTree {
     constructor(daemon: AnyDaemon, module: string, bucketName: string, query: NQL_AnyQuery, customMetadata?: BucketMetadata | undefined, debug?: boolean);
     parse(): Promise<void>;
     private parseUnion;
-    private parseOrder;
+    private parseSort;
     private parseKey;
     private parseOp;
     private parseValue;

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

@@ -84,8 +84,8 @@ class NQL_RuleTree {
                 const subInter = await this.parseUnion(bucket, value, select);
                 union.inters.push({ meta: {}, rules: [subInter] });
             }
-            else if (parsedKey.type === 'order') {
-                union.order = await this.parseOrder(bucket, value);
+            else if (parsedKey.type === 'sort') {
+                union.sort = await this.parseSort(bucket, value);
             }
         }
         if (!union.inters[0]?.rules.length) {
@@ -93,12 +93,28 @@ class NQL_RuleTree {
         }
         return union;
     }
-    parseOrder(bucket, value) {
-        let by = value['by'];
-        if (by) {
-            for (const key of by) {
-                if (Object.values(bucket.meta).includes(key))
-                    continue;
+    parseSort(bucket, value) {
+        if (!Array.isArray(value))
+            value = [value];
+        if (value.some(v => typeof v !== 'string')) {
+            throw new Error('Invalid sort parameter. Should be a string or array of strings.');
+        }
+        const sort = [];
+        for (const v of value) {
+            let key, vdir;
+            if (v.endsWith('@asc')) {
+                key = v.split('@asc')[0];
+                vdir = 'asc';
+            }
+            else if (v.endsWith('@desc')) {
+                key = v.split('@desc')[0];
+                vdir = 'desc';
+            }
+            else {
+                throw new Error(`Invalid query sort direction '${key}', string must end with '@asc' or '@desc'`);
+            }
+            const is_metadata_field = Object.values(bucket.meta).includes(key);
+            if (!is_metadata_field) {
                 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}'`);
@@ -111,26 +127,16 @@ class NQL_RuleTree {
                     }
                 }
             }
+            sort.push({
+                key,
+                dir: vdir
+            });
         }
-        else {
-            by = [];
-        }
-        let dir = value['dir'];
-        if (dir) {
-            for (const key of dir) {
-                if (key !== 'asc' && key !== 'desc') {
-                    throw new Error(`Invalid query order direction '${key}', expected 'asc'|'desc'`);
-                }
-            }
-        }
-        else {
-            dir = [];
-        }
-        return { by, dir: dir };
+        return sort;
     }
     async parseKey(bucket, key) {
-        if (key === '#order') {
-            return { type: 'order' };
+        if (key === '#sort') {
+            return { type: 'sort' };
         }
         else if (key.startsWith('#and')) {
             return { type: 'and' };
@@ -235,7 +241,7 @@ class NQL_RuleTree {
                 }
                 // Path Parameter
                 else if ('$' in value) {
-                    return { path_param: value['$'] };
+                    return { param_with_$: value['$'] };
                 }
                 // Sub-Query
                 return { subquery: await this.parseSubQuery(value, parsedKey, meta, select) };
@@ -438,7 +444,7 @@ class NQL_RuleTree {
             str += Array(d).fill('  ').join('')
                 + (0, string_1.colored)(`└ ${node._debug_id || ''}[OR] `, 'lightpurple')
                 + (0, string_1.colored)(`${node.meta.scope || ''} ${node.meta.avgTime || '?'}ms `, 'black')
-                + (node.order ? ` order by ${node.order.by} ${node.order.dir}` : '')
+                + (node.sort ? ` sort by ${node.sort}` : '')
                 + '\n';
             node.inters.forEach(inter => {
                 str += this.describe(inter, d + 1);
@@ -463,7 +469,7 @@ class NQL_RuleTree {
                 + `@${node.meta.schema?.name}.${node.fieldpath}${node.not ? ' not' : ''} ${node.case_i ? '~' : ''}${node.op}`
                 + (('static' in node.value) ? ` ${node.value.static}`
                     : ('param' in node.value) ? ` ->${node.value.param}`
-                        : ('path_param' in node.value) ? ` ->>${node.value.path_param}`
+                        : ('param_with_$' in node.value) ? ` ->>${node.value.param_with_$}`
                             : ' ▼ ' + (0, string_1.colored)('(' + node.value.subquery.bucket.name + '.' + node.value.subquery.select + ')', 'brown'))
                 + '\n';
             if ('subquery' in node.value) {

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>[], path_params: Record<string, any>[], pagination?: NQL_Pagination, view?: $BucketView): Promise<NQL_Result>;
+    abstract run(trx: AnyTrxNode, part: NQL_Part, params: Record<string, any>[], param_templates: Record<string, string>[], 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>[], path_params?: Record<string, any>[], view?: $BucketView, customRunners?: Record<string, NQLRunner>): Promise<NQL_Result>;
+    run(trx: AnyTrxNode, query: NQL_CompiledQuery, pagination?: NQL_Pagination, params?: Record<string, any>[], param_templates?: Record<string, string>[], view?: $BucketView, customRunners?: Record<string, NQLRunner>): Promise<NQL_Result>;
     linkExternal(bucket: AnyBucket): void;
 }
 export {};

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

@@ -22,9 +22,11 @@ class NQL_Engine {
             }
         }
     }
-    async run(trx, query, pagination, params = [{}], path_params = [], view, customRunners) {
+    async run(trx, query, pagination, params = [{}], param_templates = [], view, customRunners) {
         if (!params.length)
             params = [{}];
+        if (!param_templates.length)
+            param_templates = [{}];
         let result = {
             data: []
         };
@@ -36,7 +38,7 @@ class NQL_Engine {
                 ? { ...this.runners, ...customRunners }
                 : this.runners;
             const _runner = runners[part.union.meta.scope];
-            const out = await _runner.run(trx, part, params, path_params, pagination, view);
+            const out = await _runner.run(trx, part, params, param_templates, pagination, view);
             result = out;
             // Part failed, return
             // Failure here is only when a single value is expected,