nesoi 3.3.4 → 3.3.6

package/lib/elements/blocks/job/internal/resource_job.builder.js

@@ -51,7 +51,9 @@ class ResourceJobBuilder extends block_builder_1.BlockBuilder {
     input(def) {
         this._msg.template($ => {
             const fields = def($);
-            for (const f in this.implicitFields || []) {
+            for (const f in this.implicitFields || {}) {
+                if (f in fields)
+                    continue;
                 const [type, arg, required] = this.implicitFields[f];
                 fields[f] = arg
                     ? $[type](arg)

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

@@ -170,7 +170,7 @@ class ResourceBuilder extends block_builder_1.BlockBuilder {
             const defaultTrigger = (0, bucket_model_convert_1.convertToMessage)(module.name, model, createDep.tag.name, `Create ${node.builder._alias || node.builder.name}`, [], [], ['id']);
             inlineJobsConfig[createDep.tag.name] = {
                 ResourceJob: {
-                    idType: null,
+                    idType: undefined,
                     output: { raw: modelName },
                     defaultTrigger
                 }

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

@@ -137,7 +137,7 @@ export declare abstract class BucketAdapter<Obj extends NesoiObj> {
     /**
      * Return the results of a query
      */
-    query<MetadataOnly extends boolean>(trx: AnyTrxNode, query: NQL_AnyQuery, pagination?: NQL_Pagination, params?: Record<string, any>[], config?: {
+    query<MetadataOnly extends boolean>(trx: AnyTrxNode, query: NQL_AnyQuery, pagination?: NQL_Pagination, params?: Record<string, any>[], path_params?: Record<string, string>[], config?: {
         view?: string;
         metadataOnly?: MetadataOnly;
     }, custom?: {

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

@@ -25,7 +25,7 @@ class BucketAdapter {
     /**
      * Return the results of a query
      */
-    async query(trx, query, pagination, params, config, 
+    async query(trx, query, pagination, params, path_params, config, 
     // When running a temporary local memory adapter,
     // these are required
     custom) {
@@ -33,7 +33,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, view, custom?.runners);
+        const result = await module.nql.run(trx, compiled, pagination, params, path_params, 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[], pagination?: NQL_Pagination): Promise<{
+    run(trx: AnyTrxNode, part: NQL_Part, params: Obj[], path_params: Obj[], 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, pagination) {
+    async run(trx, part, params, path_params, pagination) {
         if (!this.adapter) {
             throw new Error('No adapter bound to NQL Runner');
         }
@@ -25,7 +25,7 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
         }
         // Non-empty query
         else {
-            response = await this.filter(part, data, params);
+            response = await this.filter(part, data, params, path_params);
         }
         let output = Object.values(response);
         if (part.union.order) {
@@ -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) {
+    filter(part, objs, params, path_params) {
         // Accumulate results from n intersections,
         // avoiding a re-check of already matched objects.
-        const _union = (union, objs, params) => {
+        const _union = (union, objs, params, path_params) => {
             const out = {};
             const remaining = { ...objs };
             for (const inter of union.inters) {
                 if (Object.keys(remaining).length === 0)
                     break;
-                const interOut = _inter(inter, remaining, params);
+                const interOut = _inter(inter, remaining, params, path_params);
                 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) => {
+        const _inter = (inter, objs, params, path_params) => {
             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);
+                    out = _union(rule, remaining, params, path_params);
                 }
                 // <Rule>
                 else {
-                    out = _rule(rule, remaining, params);
+                    out = _rule(rule, remaining, params, path_params);
                 }
                 for (const k in remaining) {
                     if (!(k in out)) {
@@ -125,13 +125,24 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
             }
             return out;
         };
-        const _rule = (rule, objs, params) => {
+        const _rule = (rule, objs, params, path_params) => {
             const out = {};
             for (const id in objs) {
                 const obj = objs[id];
                 let match = false;
-                for (const paramGroup of params) {
-                    match = _obj(rule, obj, paramGroup);
+                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 });
+                        }
+                    }
+                    else {
+                        combos.push({ params: param, path_params: {} });
+                    }
+                }
+                for (const combo of combos) {
+                    match = _obj(rule, obj, combo.params, combo.path_params);
                     if (match)
                         break;
                 }
@@ -149,7 +160,7 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
             }
             return out;
         };
-        const _obj = (rule, obj, params) => {
+        const _obj = (rule, obj, params, path_params) => {
             const fieldValue = tree_1.Tree.get(obj, rule.fieldpath);
             // Value is undefined, only 'present' rule applies
             if (fieldValue === undefined) {
@@ -161,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))
+                    if (_obj(rule, item, params, path_params))
                         return true;
                 }
                 return false;
@@ -169,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]);
+                const subOut = _union(rule.value.subquery.union, objs, [params], Object.keys(path_params).length ? [path_params] : []);
                 const subList = Object.values(subOut);
                 // Subquery operator is for a list, filter
                 if (rule.op === 'in' || rule.op === 'contains_any') {
@@ -188,6 +199,13 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
                     queryValue = 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]);
+                }
+                queryValue = tree_1.Tree.get(params, path);
+            }
             else if ('static' in rule.value) {
                 queryValue = rule.value.static;
             }
@@ -278,7 +296,7 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
             }
             return false;
         };
-        return _union(part.union, objs, params);
+        return _union(part.union, objs, params, path_params);
     }
 }
 exports.MemoryNQLRunner = MemoryNQLRunner;

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

@@ -98,7 +98,7 @@ class BucketBuilder {
             Object.assign(views, ext.views);
         }
         for (const v in builder._views) {
-            views[v] = bucket_view_builder_1.BucketViewBuilder.build(builder._views[v], model, graph, views);
+            views[v] = bucket_view_builder_1.BucketViewBuilder.build(builder._views[v], model, graph, views, tree);
         }
         return views;
     }

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

@@ -95,6 +95,7 @@ export declare class Bucket<M extends $Module, $ extends $Bucket> {
     readLink<LinkName extends keyof $['graph']['links'], Link extends $['graph']['links'][LinkName], LinkBucket extends Link['#bucket'], V extends ViewName<LinkBucket>, Obj extends ViewObj<LinkBucket, V>>(trx: AnyTrxNode, id: $['#data']['id'], link: LinkName, options?: {
         silent?: boolean;
         no_tenancy?: boolean;
+        index?: string[];
     }): Promise<Link['#many'] extends true ? Obj[] : (Obj | undefined)>;
     /**
      * Read raw entities of a graph link for N objects
@@ -106,6 +107,7 @@ export declare class Bucket<M extends $Module, $ extends $Bucket> {
     readManyLinks<LinkName extends keyof $['graph']['links'], Link extends $['graph']['links'][LinkName], LinkBucket extends Link['#bucket'], V extends ViewName<LinkBucket>, Obj extends ViewObj<LinkBucket, V>>(trx: AnyTrxNode, ids: $['#data']['id'][], link: LinkName, options?: {
         silent?: boolean;
         no_tenancy?: boolean;
+        indexes?: string[][];
     }): Promise<Link['#many'] extends true ? Obj[] : (Obj | undefined)>;
     /**
      * Read the view of an entity of a graph link
@@ -117,6 +119,7 @@ export declare class Bucket<M extends $Module, $ extends $Bucket> {
     viewLink<LinkName extends keyof $['graph']['links'], Link extends $['graph']['links'][LinkName], LinkBucket extends Link['#bucket'], V extends ViewName<LinkBucket>, Obj extends ViewObj<LinkBucket, V>>(trx: AnyTrxNode, id: $['#data']['id'], link: LinkName, view: V, options?: {
         silent?: boolean;
         no_tenancy?: boolean;
+        index?: string[];
     }): Promise<Obj | Obj[] | undefined>;
     /**
      * Return true if the graph link refers to at least one object
@@ -203,6 +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>[];
     }): Promise<NQL_Result<Obj>>;
     /**
      * Add `created_by`, `created_at`, `updated_by` and `updated_at` fields to object

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

@@ -1,17 +1,17 @@
 import { $BucketViewField, $BucketViewFields } from './view/bucket_view.schema';
 import { BucketViewFieldBuilder, BucketViewFieldBuilders } from './view/bucket_view_field.builder';
-export type $BucketViewFieldsInfer<Builder extends BucketViewFieldBuilders> = Builder extends (...args: any[]) => $BucketViewFields ? ReturnType<Builder> : {
-    [K in keyof Builder]: Builder[K] extends BucketViewFieldBuilders ? ($BucketViewField & {
+export type $BucketViewFieldsInfer<Builder extends BucketViewFieldBuilders<any>> = Builder extends (...args: any[]) => $BucketViewFields ? ReturnType<Builder> : {
+    [K in keyof Builder]: Builder[K] extends BucketViewFieldBuilders<any> ? ($BucketViewField & {
         '#data': $BucketViewFieldsInfer<Builder[K]>;
-    }) : Builder[K] extends BucketViewFieldBuilder<any, any, any> ? $BucketViewField & {
-        '#data': Builder[K] extends BucketViewFieldBuilder<infer X, any> ? X : never;
+    }) : Builder[K] extends BucketViewFieldBuilder<any, any, any, any, any> ? $BucketViewField & {
+        '#data': Builder[K] extends BucketViewFieldBuilder<any, any, any, infer X, any> ? X : never;
     } : never;
 };
-export type $BucketViewDataInfer<Builder extends BucketViewFieldBuilders> = {
-    [K in keyof Builder]: Builder[K] extends BucketViewFieldBuilders ? $BucketViewDataInfer<Builder[K]> : Builder[K] extends BucketViewFieldBuilder<infer X, any> ? X : never;
+export type $BucketViewDataInfer<Builders extends BucketViewFieldBuilders<any>> = {
+    [K in keyof Builders]: Builders[K] extends BucketViewFieldBuilder<any, any, any, infer X, any> ? X : never;
 };
 export type $BucketViewFieldBuilderInfer<Data> = {
-    [K in keyof Data]: BucketViewFieldBuilder<Data[K], any>;
+    [K in keyof Data]: BucketViewFieldBuilder<any, any, any, Data[K], any>;
 };
 /**
  * [Fieldpaths]

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

@@ -84,7 +84,7 @@ class Bucket {
             const result = await adapter.query(trx, {
                 id,
                 '#and __tenancy__': tenancy
-            }, { perPage: 1 }, undefined, options?.query_view ? { view: options?.query_view } : undefined);
+            }, { perPage: 1 }, undefined, undefined, options?.query_view ? { view: options?.query_view } : undefined);
             raw = result.data[0];
         }
         // Without Tenancy
@@ -190,7 +190,7 @@ class Bucket {
             return undefined;
         }
         // Read link
-        const linkObj = await this.graph.readLink(trx, obj, link, options);
+        const linkObj = await this.graph.readLink(trx, obj, { name: link, index: options?.index || [] }, options);
         // Encryption
         if (linkObj) {
             if (this.schema.model.hasEncryptedField) {
@@ -227,7 +227,7 @@ class Bucket {
             return undefined;
         }
         // Read link
-        const linkObj = await this.graph.readManyLinks(trx, objs, link, options);
+        const linkObj = await this.graph.readManyLinks(trx, objs, { name: link, indexes: options?.indexes || [] }, options);
         // TODO
         // // Encryption
         // if (linkObj) {
@@ -261,7 +261,7 @@ class Bucket {
             return undefined;
         }
         // View link
-        const linkObj = await this.graph.viewLink(trx, obj, link, view, options);
+        const linkObj = await this.graph.viewLink(trx, obj, { name: link, index: options?.index || [] }, view, options);
         // Encryption
         if (linkObj && this.schema.model.hasEncryptedField) {
             if (Array.isArray(linkObj)) {
@@ -430,7 +430,7 @@ class Bucket {
                 const result = await adapter.query(trx, {
                     id: obj.id,
                     '#and __tenancy__': tenancy
-                }, { perPage: 1 }, undefined, {
+                }, { perPage: 1 }, undefined, undefined, {
                     metadataOnly: true
                 });
                 oldObj = result.data[0];
@@ -563,7 +563,7 @@ class Bucket {
             // Check if object exists
             result = await this.adapter.query(trx, {
                 id, '#and __tenancy__': tenancy
-            }, { perPage: 1 }, undefined, {
+            }, { perPage: 1 }, undefined, undefined, {
                 metadataOnly: true
             });
             if (!result.data.length && !options?.unsafe) {
@@ -598,7 +598,7 @@ class Bucket {
             const linked = result
                 // If safe, avoid reading the object again inside readLink.
                 // Instead, use graph's readLink which takes the object.
-                ? await this.graph.readLink(trx, result.data[0], link.name, {
+                ? await this.graph.readLink(trx, result.data[0], { name: link.name, index: [] }, {
                     silent: true
                 })
                 // If unsafe, read the link base by id.
@@ -643,7 +643,7 @@ class Bucket {
             result = await this.adapter.query(trx, {
                 'id in': ids,
                 '#and __tenancy__': tenancy
-            }, undefined, undefined, {
+            }, undefined, undefined, undefined, {
                 metadataOnly: true
             });
             ids = result.data.map(obj => obj.id);
@@ -714,7 +714,7 @@ class Bucket {
         };
         // Query
         const adapter = this.cache || this.adapter;
-        const result = await adapter.query(trx, query, pagination, options?.params);
+        const result = await adapter.query(trx, query, pagination, options?.params, options?.path_params);
         if (!result.data.length)
             return result;
         // Encryption

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

@@ -90,7 +90,7 @@ class BucketCache {
             const { action, sync } = await this.syncAll(trx);
             log_1.Log.debug('bucket', this.bucket.schema.name, `CACHE query.all, ${action}`);
             const meta = this.innerAdapter.getQueryMeta();
-            const entries = (await this.innerAdapter.query(trx, query, pagination, params, undefined, {
+            const entries = (await this.innerAdapter.query(trx, query, pagination, params, undefined, undefined, {
                 module: this.bucket.schema.module,
                 runners: {
                     [meta.scope]: this.innerAdapter.nql
@@ -180,7 +180,7 @@ class BucketCache {
     }
     async syncQuery(trx, query, pagination, params) {
         // 1. Query id and epoch from outer adapter
-        const outerMetadata = await this.outerAdapter.query(trx, query, pagination, params, {
+        const outerMetadata = await this.outerAdapter.query(trx, query, pagination, params, undefined, {
             metadataOnly: true
         });
         if (!outerMetadata.data.length) {
@@ -190,7 +190,7 @@ class BucketCache {
         const meta = this.innerAdapter.getQueryMeta();
         const innerData = await this.innerAdapter.query(trx, {
             'id in': outerMetadata.data.map(obj => obj.id)
-        }, undefined, undefined, undefined, {
+        }, undefined, undefined, undefined, undefined, {
             module: this.bucket.schema.module,
             runners: {
                 [meta.scope]: this.innerAdapter.nql

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

@@ -18,7 +18,10 @@ export declare class BucketGraph<M extends $Module, $ extends $Bucket> {
      *   - `silent`: If not found, returns undefined instead of raising an exception (default: `false`)
      *   - `no_tenancy`: Don't apply tenancy rules (default: `false`)
      */
-    readLink<LinkName extends keyof $['graph']['links'], LinkBucketName extends $['graph']['links'][LinkName]['bucket']['short'], LinkBucket extends M['buckets'][LinkBucketName], Obj = LinkBucket['#data']>(trx: AnyTrxNode, obj: $['#data'], link: LinkName, options?: {
+    readLink<LinkName extends keyof $['graph']['links'], LinkBucketName extends $['graph']['links'][LinkName]['bucket']['short'], LinkBucket extends M['buckets'][LinkBucketName], Obj = LinkBucket['#data']>(trx: AnyTrxNode, obj: $['#data'], link: {
+        name: LinkName;
+        index: string[];
+    }, options?: {
         silent?: boolean;
         no_tenancy?: boolean;
     }): Promise<Obj | Obj[] | undefined>;
@@ -29,7 +32,10 @@ export declare class BucketGraph<M extends $Module, $ extends $Bucket> {
      *   - `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']['short'], LinkBucket extends M['buckets'][LinkBucketName], Obj = LinkBucket['#data']>(trx: AnyTrxNode, objs: $['#data'][], link: LinkName, options?: {
+    readManyLinks<LinkName extends keyof $['graph']['links'], LinkBucketName extends $['graph']['links'][LinkName]['bucket']['short'], LinkBucket extends M['buckets'][LinkBucketName], Obj = LinkBucket['#data']>(trx: AnyTrxNode, objs: $['#data'][], link: {
+        name: LinkName;
+        indexes: string[][];
+    }, options?: {
         silent?: boolean;
         no_tenancy?: boolean;
     }): Promise<Obj[] | Obj[][]>;
@@ -40,9 +46,13 @@ export declare class BucketGraph<M extends $Module, $ extends $Bucket> {
      *   - `silent`: If not found, returns undefined instead of raising an exception (default: `false`)
      *   - `no_tenancy`: Don't apply tenancy rules (default: `false`)
      */
-    viewLink<LinkName extends keyof $['graph']['links'], LinkBucketName extends $['graph']['links'][LinkName]['bucket']['short'], LinkBucket extends M['buckets'][LinkBucketName], V extends ViewName<LinkBucket>, Obj extends ViewObj<LinkBucket, V>>(trx: AnyTrxNode, obj: $['#data'], link: LinkName, view: V, options?: {
+    viewLink<LinkName extends keyof $['graph']['links'], LinkBucketName extends $['graph']['links'][LinkName]['bucket']['short'], LinkBucket extends M['buckets'][LinkBucketName], V extends ViewName<LinkBucket>, Obj extends ViewObj<LinkBucket, V>>(trx: AnyTrxNode, obj: $['#data'], link: {
+        name: LinkName;
+        index: string[];
+    }, view: V, options?: {
         silent?: boolean;
         no_tenancy?: boolean;
+        path_params?: 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.infer.d.ts

@@ -5,7 +5,7 @@ type Replace<T extends string> = T extends `${infer L}$${infer R}` ? `${L}${stri
 export type $BucketGraphLinksInfer<Builders extends BucketGraphLinkBuilders> = {
     [K in keyof Builders as Replace<K & string>]: Overlay<$BucketGraphLink, {
         '#bucket': Builders[K]['#other'];
-        '#data': Builders[K]['#other']['#data'];
+        '#many': Builders[K]['#many'];
     }>;
 };
 export {};

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

@@ -26,8 +26,8 @@ class BucketGraph {
      *   - `no_tenancy`: Don't apply tenancy rules (default: `false`)
      */
     async readLink(trx, obj, link, options) {
-        log_1.Log.trace('bucket', this.bucketName, `Read link ${link}`);
-        const schema = this.schema.links[link];
+        log_1.Log.trace('bucket', this.bucketName, `Read link ${link.name}`);
+        const schema = this.schema.links[link.name];
         // Make tenancy query
         const tenancy = (options?.no_tenancy)
             ? undefined
@@ -38,23 +38,29 @@ class BucketGraph {
             ...schema.query,
             '#and __tenancy__': tenancy
         };
-        const params = [{ ...obj }];
         const page = {
             perPage: schema.many ? undefined : 1,
         };
+        // Params
+        const params = [{ ...obj }];
+        const path_params = link.index.length
+            ? Object.fromEntries(link.index
+                .map((s, i) => [`$${i}`, s]))
+            : undefined;
         // External
         let links;
         if (schema.bucket.module !== module.name) {
             links = await trx.bucket(schema.bucket.short)
                 .query(query)
                 .params(params)
+                .path_params(path_params)
                 .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);
+            links = await adapter.query(trx, query, page, params, path_params ? [path_params] : undefined);
         }
         // Empty response
         if (!schema.many && !schema.optional && !links.data.length) {
@@ -65,7 +71,7 @@ class BucketGraph {
             else {
                 throw error_1.NesoiError.Bucket.Graph.RequiredLinkNotFound({
                     bucket: this.bucketName,
-                    link: link,
+                    link: link.name,
                     id: obj.id
                 });
             }
@@ -85,8 +91,8 @@ class BucketGraph {
      *   - `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];
+        log_1.Log.trace('bucket', this.bucketName, `Read link ${link.name}`);
+        const schema = this.schema.links[link.name];
         // Make tenancy query
         const tenancy = (options?.no_tenancy)
             ? undefined
@@ -98,12 +104,16 @@ class BucketGraph {
             '#and __tenancy__': tenancy
         };
         const params = objs.map(obj => ({ ...obj }));
+        const path_params = link.indexes.length
+            ? link.indexes.map(index => Object.fromEntries(index
+                .map((s, i) => [`$${i}`, s]))) : undefined;
         let tempAdapter;
         // External
         if (schema.bucket.module !== module.name) {
             const allLinks = await trx.bucket(schema.bucket.short)
                 .query(query)
                 .params(params)
+                .path_params(path_params)
                 .all();
             const tempData = {};
             for (const obj of allLinks)
@@ -119,7 +129,7 @@ class BucketGraph {
             }
             else {
                 const adapter = otherBucket.cache || otherBucket.adapter;
-                const allLinks = await adapter.query(trx, query, undefined, params);
+                const allLinks = await adapter.query(trx, query, undefined, params, path_params);
                 const tempData = {};
                 for (const obj of allLinks.data)
                     tempData[obj.id] = obj;
@@ -135,7 +145,7 @@ class BucketGraph {
                 }, [{ ...obj }], undefined)
                 : await tempAdapter.query(trx, schema.query, {
                     perPage: schema.many ? undefined : 1,
-                }, [{ ...obj }], undefined, {
+                }, [{ ...obj }], undefined, undefined, {
                     module: schema.bucket.module,
                     runners: {
                         [tempAdapter.getQueryMeta().scope]: tempAdapter.nql
@@ -165,8 +175,8 @@ class BucketGraph {
      *   - `no_tenancy`: Don't apply tenancy rules (default: `false`)
      */
     async viewLink(trx, obj, link, view, options) {
-        log_1.Log.trace('bucket', this.bucketName, `Read link ${link}`);
-        const schema = this.schema.links[link];
+        log_1.Log.trace('bucket', this.bucketName, `Read link ${link.name}`);
+        const schema = this.schema.links[link.name];
         const links = await this.readLink(trx, obj, link, options);
         if (!links)
             return undefined;

package/lib/elements/entities/bucket/graph/bucket_graph_link.builder.d.ts

@@ -15,27 +15,28 @@ export declare class BucketGraphLinkFactory<Module extends $Module, SelfBucket e
     constructor(module: string);
     as(alias: string): this;
     get compose(): typeof this;
-    one<N extends keyof Module['buckets'], Bucket extends $Bucket = Module['buckets'][N]>(bucket: N, query: NQL_Query<Module, Bucket, Fieldpaths>): BucketGraphLinkBuilder<Module, SelfBucket, Module["buckets"][N]>;
-    many<N extends keyof Module['buckets'], Bucket extends $Bucket = Module['buckets'][N]>(bucket: N, query: NQL_Query<Module, Bucket, Fieldpaths>): BucketGraphLinkBuilder<Module, SelfBucket, Module["buckets"][N]>;
+    one<N extends keyof Module['buckets'], Bucket extends $Bucket = Module['buckets'][N]>(bucket: N, query: NQL_Query<Module, Bucket, Fieldpaths>): BucketGraphLinkBuilder<Module, SelfBucket, Module["buckets"][N], false>;
+    many<N extends keyof Module['buckets'], Bucket extends $Bucket = Module['buckets'][N]>(bucket: N, query: NQL_Query<Module, Bucket, Fieldpaths>): BucketGraphLinkBuilder<Module, SelfBucket, Module["buckets"][N], true>;
 }
 /**
  * @category Builders
  * @subcategory Entity
  * */
-export declare class BucketGraphLinkBuilder<Module extends $Module, SelfBucket extends $Bucket, OtherBucket extends $Bucket> {
+export declare class BucketGraphLinkBuilder<Module extends $Module, SelfBucket extends $Bucket, OtherBucket extends $Bucket, Many extends boolean> {
     private bucket;
     private rel;
     private query;
     private many;
     private alias?;
     '#other': OtherBucket;
+    '#many': Many;
     private _optional;
     constructor(bucket: Dependency, rel: 'aggregation' | 'composition', query: NQL_AnyQuery, many: boolean, alias?: string | undefined);
     as(alias: string): this;
     get optional(): this;
-    static build(node: BucketBuilderNode, builder: BucketGraphLinkBuilder<any, any, any>, name: string): $BucketGraphLink;
+    static build(node: BucketBuilderNode, builder: BucketGraphLinkBuilder<any, any, any, any>, name: string): $BucketGraphLink;
     static inferKeyOwner(query: NQL_AnyQuery): "self";
 }
 export type BucketGraphLinkBuilders = {
-    [x: string]: BucketGraphLinkBuilder<any, any, any>;
+    [x: string]: BucketGraphLinkBuilder<any, any, any, any>;
 };

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

@@ -18,7 +18,7 @@ function convertToView(model, name, fields = model.fields, path, depth = 0) {
         const viewFields = {};
         for (const f in fields) {
             const field = fields[f];
-            const $ = new bucket_view_field_builder_1.BucketViewFieldFactory(view);
+            const $ = new bucket_view_field_builder_1.BucketViewFieldFactory();
             const key = (path ? path + '.' : '')
                 + field.name;
             const builder = $.model(key);
@@ -38,9 +38,9 @@ function convertToMessage(module, model, name, alias, include = [], exclude = []
     const convertField = (field) => {
         return new message_template_schema_1.$MessageTemplateField(field.type, field.name, field.alias, field.path, field.path, optional.includes(field.path) ? false : field.required, undefined, false, [], {
             enum: field.meta?.enum
-        }, field.children ? convertFields(field.children, include, exclude, optional) : undefined);
+        }, field.children ? convertFields(field.children) : undefined);
     };
-    const convertFields = (fields, include = [], exclude = [], optional = [], root = '') => {
+    const convertFields = (fields) => {
         const msgFields = {};
         for (const f in fields) {
             const field = fields[f];
@@ -52,7 +52,7 @@ function convertToMessage(module, model, name, alias, include = [], exclude = []
         }
         return msgFields;
     };
-    const msgFields = convertFields(model.fields, include, exclude);
+    const msgFields = convertFields(model.fields);
     const template = new message_template_schema_1.$MessageTemplate(msgFields);
     return new message_schema_1.$Message(module, name, alias, template);
 }

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

@@ -32,6 +32,8 @@ export type NQL_Rule = {
         static: any | any[];
     } | {
         param: string | string[];
+    } | {
+        path_param: string;
     } | {
         subquery: {
             bucket: $Bucket;

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

@@ -233,6 +233,10 @@ class NQL_RuleTree {
                 if ('.' in value) {
                     return { param: value['.'] };
                 }
+                // Path Parameter
+                else if ('$' in value) {
+                    return { path_param: value['$'] };
+                }
                 // Sub-Query
                 return { subquery: await this.parseSubQuery(value, parsedKey, meta, select) };
             }
@@ -459,7 +463,8 @@ 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}`
-                        : ' ▼ ' + (0, string_1.colored)('(' + node.value.subquery.bucket.name + '.' + node.value.subquery.select + ')', 'brown'))
+                        : ('path_param' in node.value) ? ` ->>${node.value.path_param}`
+                            : ' ▼ ' + (0, string_1.colored)('(' + node.value.subquery.bucket.name + '.' + node.value.subquery.select + ')', 'brown'))
                 + '\n';
             if ('subquery' in node.value) {
                 str += this.describe(node.value['subquery'].union, d + 1);

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>[], path_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, customRunners?: Record<string, NQLRunner>): Promise<NQL_Result>;
+    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>;
     linkExternal(bucket: AnyBucket): void;
 }
 export {};