nesoi 3.3.5 → 3.3.7

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 param_templates = 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)
+                .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);
+            links = await adapter.query(trx, query, page, params, param_templates ? [param_templates] : 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,25 +91,29 @@ 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
             : 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 param_templates = 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)
+                .param_templates(param_templates)
                 .all();
             const tempData = {};
             for (const obj of allLinks)
@@ -119,14 +129,14 @@ 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, 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
@@ -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

@@ -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 = {
@@ -32,6 +32,8 @@ export type NQL_Rule = {
         static: any | any[];
     } | {
         param: string | string[];
+    } | {
+        param_with_$: string;
     } | {
         subquery: {
             bucket: $Bucket;
@@ -54,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;
@@ -134,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' };
@@ -233,6 +239,10 @@ class NQL_RuleTree {
                 if ('.' in value) {
                     return { param: value['.'] };
                 }
+                // Path Parameter
+                else if ('$' in value) {
+                    return { param_with_$: value['$'] };
+                }
                 // Sub-Query
                 return { subquery: await this.parseSubQuery(value, parsedKey, meta, select) };
             }
@@ -434,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);
@@ -459,7 +469,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'))
+                        : ('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) {
                 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>[], 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>[], 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 = [{}], 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, 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,

package/lib/elements/entities/bucket/view/bucket_view.builder.d.ts

@@ -4,6 +4,7 @@ import { $BucketGraph } from '../graph/bucket_graph.schema';
 import { BucketViewFieldBuilders, BucketViewFieldFactory } from './bucket_view_field.builder';
 import { $Bucket } from '../bucket.schema';
 import { $Module, $Space } from "../../..";
+import { ModuleTree } from "../../../../engine/tree";
 /**
  * @category Builders
  * @subcategory Entity
@@ -13,6 +14,6 @@ export declare class BucketViewBuilder<Space extends $Space, Module extends $Mod
     private _fields;
     constructor(name: string);
     fields($: BucketViewDef<Space, Module, Bucket>): this;
-    static build(builder: BucketViewBuilder<any, any, any>, model: $BucketModel, graph: $BucketGraph, views: $BucketViews): $BucketView;
+    static build(builder: BucketViewBuilder<any, any, any>, model: $BucketModel, graph: $BucketGraph, views: $BucketViews, tree: ModuleTree): $BucketView;
 }
-export type BucketViewDef<Space extends $Space, Module extends $Module, Bucket extends $Bucket> = ($: BucketViewFieldFactory<Space, Module, Bucket>) => BucketViewFieldBuilders;
+export type BucketViewDef<Space extends $Space, Module extends $Module, Bucket extends $Bucket> = ($: BucketViewFieldFactory<Space, Module, Bucket>) => BucketViewFieldBuilders<Bucket>;

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

@@ -13,13 +13,13 @@ class BucketViewBuilder {
         this._fields = {};
     }
     fields($) {
-        const fieldBuilder = new bucket_view_field_builder_1.BucketViewFieldFactory(this);
+        const fieldBuilder = new bucket_view_field_builder_1.BucketViewFieldFactory();
         this._fields = $(fieldBuilder);
         return this;
     }
     // Build
-    static build(builder, model, graph, views) {
-        const fields = bucket_view_field_builder_1.BucketViewFieldBuilder.buildFields(builder._fields, model, graph, views);
+    static build(builder, model, graph, views, tree) {
+        const fields = bucket_view_field_builder_1.BucketViewFieldBuilder.buildFields(builder._fields, model, graph, views, undefined, tree);
         const schema = new bucket_view_schema_1.$BucketView(builder.name, fields);
         schema.fields.id = new bucket_view_schema_1.$BucketViewField('id', 'model', 'id', { model: { path: 'id' } });
         return schema;

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

@@ -153,6 +153,7 @@ class BucketView {
         if (!node.field.children)
             return [];
         const next = [];
+        // subview
         for (const key in node.field.children) {
             if (key === '__raw')
                 continue;
@@ -258,6 +259,12 @@ class BucketView {
                 }
             }
         }
+        // Apply prop
+        for (const data of poll) {
+            if (node.field.prop) {
+                data.target[data.key] = data.target[data.key][node.field.prop];
+            }
+        }
         return poll.map(p => ({
             index: p.index,
             raw: p.raw,
@@ -271,7 +278,7 @@ class BucketView {
     async parseComputedProp(trx, node) {
         const meta = node.field.meta.computed;
         for (const entry of node.data) {
-            entry.target[node.field.name] = await promise_1.default.solve(meta.fn({ trx, raw: entry.raw, bucket: node.bucket.schema }));
+            entry.target[node.field.name] = await promise_1.default.solve(meta.fn({ trx, raw: entry.raw, value: entry.value, bucket: node.bucket.schema }));
         }
     }
     /**
@@ -279,29 +286,47 @@ class BucketView {
      */
     async parseGraphProp(trx, node) {
         const meta = node.field.meta.graph;
-        let links;
+        let linksObjs;
         const module = trx_node_1.TrxNode.getModule(trx);
+        // Step 1: Read many links from bucket
         // External
         if (node.bucket.tag.module !== module.name) {
-            links = await trx.bucket(node.bucket.tag.short).readManyLinks(node.data.map(entry => entry.raw.id), meta.link);
+            linksObjs = await trx.bucket(node.bucket.tag.short).readManyLinks(node.data.map(entry => entry.raw.id), meta.path, node.data.map(entry => entry.index.map(i => i.toString())));
         }
         // Internal
         else {
             const bucket = module.buckets[node.bucket.tag.name];
-            links = await bucket.graph.readManyLinks(trx, node.data.map(entry => entry.raw), meta.link, { silent: true });
+            linksObjs = await bucket.graph.readManyLinks(trx, node.data.map(entry => entry.raw), {
+                name: meta.link,
+                indexes: node.data.map(entry => entry.index.map(i => i.toString()))
+            }, { silent: true });
         }
-        for (let i = 0; i < links.length; i++) {
+        // Step 2: Initialize target values
+        const link = node.bucket.schema.graph.links[meta.link];
+        for (let i = 0; i < linksObjs.length; i++) {
             if (meta.view) {
-                const link = node.bucket.schema.graph.links[meta.link];
-                node.data[i].target[node.field.name] = link.many
-                    ? []
-                    : (links[i] ? {} : undefined);
+                if (link.many) {
+                    node.data[i].target[node.field.name] = [];
+                }
+                else {
+                    node.data[i].target[node.field.name] = linksObjs[i] ? {} : undefined;
+                }
+            }
+            else if (node.field.prop) {
+                if (link.many) {
+                    node.data[i].target[node.field.name] = linksObjs[i].map((link) => link[node.field.prop]);
+                }
+                else {
+                    node.data[i].target[node.field.name] = linksObjs[i]?.[node.field.prop];
+                }
             }
             else {
-                node.data[i].target[node.field.name] = links[i];
+                node.data[i].target[node.field.name] = linksObjs[i];
             }
         }
+        // Step 3: Build view
         let next = [];
+        let nextData = linksObjs;
         if (meta.view) {
             const schema = node.bucket.schema;
             const otherBucketDep = schema.graph.links[meta.link].bucket;
@@ -311,46 +336,112 @@ class BucketView {
             const view = otherBucket.schema.views[meta.view];
             const { __raw, ...v } = view.fields;
             const link = node.bucket.schema.graph.links[meta.link];
-            let nextData;
             if (link.many) {
-                const _links = links;
+                const _links = linksObjs;
                 for (let i = 0; i < _links.length; i++) {
                     const target = node.data[i].target[node.field.name];
                     for (let j = 0; j < _links[i].length; j++) {
-                        target.push(__raw ? { ..._links[i][j] } : {});
-                        target[j].$v = meta.view;
+                        if (node.field.prop) {
+                            target.push(_links[i][j][node.field.prop]);
+                        }
+                        else {
+                            target.push(__raw ? { ..._links[i][j] } : {});
+                            target[j].$v = meta.view;
+                        }
                     }
                 }
-                nextData = _links.map((ll, i) => ll.map((l, j) => ({ value: l, target: node.data[i].target[node.field.name][j] }))).flat(1);
+                if (!node.field.prop) {
+                    nextData = _links.map((ll, i) => ll.map((l, j) => ({ value: l, target: node.data[i].target[node.field.name][j] }))).flat(1);
+                }
+                else {
+                    nextData = [];
+                }
             }
             else {
-                const _links = links;
+                const _links = linksObjs;
                 nextData = [];
                 for (let i = 0; i < _links.length; i++) {
                     if (!_links[i])
                         continue;
-                    const target = node.data[i].target[node.field.name];
-                    if (__raw) {
-                        Object.assign(target, _links[i]);
+                    if (node.field.prop) {
+                        node.data[i].target[node.field.name] = _links[i][node.field.prop];
+                    }
+                    else {
+                        const target = node.data[i].target[node.field.name];
+                        if (__raw) {
+                            Object.assign(target, _links[i]);
+                        }
+                        target.$v = meta.view;
+                        nextData.push({
+                            value: _links[i], target: node.data[i].target[node.field.name]
+                        });
                     }
-                    target.$v = meta.view;
-                    nextData.push({
-                        value: _links[i], target: node.data[i].target[node.field.name]
-                    });
                 }
             }
-            // TODODO: support external bucket on transitive graph
+            // (still step 3) Add link bucket view fields to queue
             next = [];
-            for (const field of Object.values(v)) {
-                const bucket = await daemon_1.Daemon.getBucketMetadata(module.daemon, otherBucketDep);
+            const bucket = await daemon_1.Daemon.getBucketMetadata(module.daemon, otherBucketDep);
+            // Next data is empty if meta.prop is defined, since there's no need to go deeper
+            if (nextData.length) {
+                for (const field of Object.values(v)) {
+                    next.push({
+                        bucket,
+                        field,
+                        data: nextData.map($ => ({
+                            raw: $.value,
+                            value: $.value,
+                            index: [],
+                            target: $.target
+                        }))
+                    });
+                }
+            }
+        }
+        // Step 4: Add subview fields to queue
+        if (node.field.children) {
+            // Prepare subview data
+            const subview_data = [];
+            for (let i = 0; i < linksObjs.length; i++) {
+                const objs = linksObjs[i];
+                let target;
+                if (link.many) {
+                    target = [];
+                    for (const tobj of node.data[i].target[node.field.name]) {
+                        if ('__raw' in node.field.children) {
+                            target.push({ ...tobj });
+                        }
+                        else {
+                            target.push({ id: tobj.id });
+                        }
+                    }
+                    subview_data.push(...objs.map((obj, i) => ({
+                        obj: { ...obj },
+                        target: target[i]
+                    })));
+                }
+                else {
+                    target = { id: objs.id };
+                    if ('__raw' in node.field.children) {
+                        Object.assign(target, node.data[i].target[node.field.name]);
+                    }
+                    subview_data.push({ obj: { ...objs }, target });
+                }
+                node.data[i].target[node.field.name] = target;
+            }
+            const module = trx_node_1.TrxNode.getModule(trx);
+            const subview_bucket = daemon_1.Daemon.getBucketMetadata(module.daemon, link.bucket);
+            // Add subview data to queue
+            for (const key in node.field.children) {
+                if (key === '__raw')
+                    continue;
                 next.push({
-                    bucket,
-                    field,
-                    data: nextData.map($ => ({
-                        raw: $.value,
-                        value: $.value,
+                    bucket: subview_bucket,
+                    field: node.field.children[key],
+                    data: subview_data.map(data => ({
+                        raw: data.obj,
+                        value: data.obj,
                         index: [],
-                        target: $.target
+                        target: data.target
                     }))
                 });
             }