nesoi 3.0.0 → 3.0.6

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

@@ -3,6 +3,11 @@ import { $BucketViews } from './view/bucket_view.schema';
 import { $BucketModel } from './model/bucket_model.schema';
 import { NesoiObj } from "../../../engine/data/obj";
 import { $Dependency } from "../../../engine/dependency";
+import { $Module } from "../..";
+import { NQL_Query } from './query/nql.schema';
+export type $BucketTenancy<M extends $Module, B extends $Bucket> = {
+    [K in keyof M['#authn']]?: (user: M['#authn'][K]) => NQL_Query<M, B>;
+};
 export declare class $Bucket {
     module: string;
     name: string;
@@ -10,6 +15,7 @@ export declare class $Bucket {
     model: $BucketModel;
     graph: $BucketGraph;
     views: $BucketViews;
+    tenancy?: $BucketTenancy<any, any> | undefined;
     extended?: $Dependency | undefined;
     $t: "bucket";
     '#data': NesoiObj;
@@ -20,5 +26,5 @@ export declare class $Bucket {
     }>;
     '#fieldpath': {};
     '#defaults': Record<string, any>;
-    constructor(module: string, name: string, alias: string, model: $BucketModel, graph: $BucketGraph, views: $BucketViews, extended?: $Dependency | undefined);
+    constructor(module: string, name: string, alias: string, model: $BucketModel, graph: $BucketGraph, views: $BucketViews, tenancy?: $BucketTenancy<any, any> | undefined, extended?: $Dependency | undefined);
 }

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

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.$Bucket = void 0;
 class $Bucket {
-    constructor(module, name, alias, model, graph, views, extended) {
+    constructor(module, name, alias, model, graph, views, tenancy, extended) {
         this.module = module;
         this.name = name;
         this.alias = alias;
         this.model = model;
         this.graph = graph;
         this.views = views;
+        this.tenancy = tenancy;
         this.extended = extended;
         this.$t = 'bucket';
     }

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

@@ -1,7 +1,7 @@
-import { NewOrOldObj } from "../../../engine/data/obj";
+import { ObjWithOptionalId } from "../../../engine/data/obj";
 import { $Bucket } from './bucket.schema';
 import { DeepPartialNullable } from "../../../engine/util/deep";
-export type PutObj<$ extends $Bucket> = NewOrOldObj<$['#data']> & (keyof $['#composition'] extends never ? {} : {
+export type PutObj<$ extends $Bucket> = ObjWithOptionalId<$['#data']> & (keyof $['#composition'] extends never ? {} : {
     '#composition': {
         [K in keyof $['#composition']]: $['#composition'][K]['many'] extends true ? (PutObj<$['#composition'][K]['bucket']> | ($['#composition'][K]['optional'] extends true ? undefined : never))[] : PutObj<$['#composition'][K]['bucket']> | ($['#composition'][K]['optional'] extends true ? undefined : never);
     };
@@ -13,11 +13,6 @@ export type CreateObj<$ extends $Bucket> = Omit<$['#data'], 'id' | keyof $['#def
         [K in keyof $['#composition']]: $['#composition'][K]['many'] extends true ? (PutObj<$['#composition'][K]['bucket']> | ($['#composition'][K]['optional'] extends true ? undefined : never))[] : PutObj<$['#composition'][K]['bucket']> | ($['#composition'][K]['optional'] extends true ? undefined : never);
     };
 });
-export type ReplaceObj<$ extends $Bucket> = $['#data'] & (string extends keyof $['#composition'] ? {} : keyof $['#composition'] extends never ? {} : {
-    '#composition': {
-        [K in keyof $['#composition']]: $['#composition'][K]['many'] extends true ? ReplaceObj<$['#composition'][K]['bucket']>[] : ReplaceObj<$['#composition'][K]['bucket']>;
-    };
-});
 export type PatchObj<$ extends $Bucket> = DeepPartialNullable<$['#data']> & {
     id: $['#data']['id'];
 } & (string extends keyof $['#composition'] ? {} : keyof $['#composition'] extends never ? {} : {

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

@@ -4,6 +4,7 @@ import { NesoiObj } from "../../../../engine/data/obj";
 import { AnyBucketAdapter } from '../adapters/bucket_adapter';
 import { $BucketView } from '../view/bucket_view.schema';
 import { NQL_AnyQuery, NQL_Pagination } from '../query/nql.schema';
+import { NQL_Result } from '../query/nql_engine';
 export type BucketCacheSync<T> = {
     obj: T;
     updateEpoch: number;
@@ -23,10 +24,13 @@ export declare class BucketCache<Obj extends NesoiObj> {
     private lastSyncEpoch?;
     private lastHash?;
     private innerAdapter;
-    constructor(bucketName: string, outerAdapter: AnyBucketAdapter, config: NonNullable<BucketConfig<any, any>['cache']>);
+    constructor(bucketName: string, outerAdapter: AnyBucketAdapter, config: NonNullable<BucketConfig<any, any, any>['cache']>);
     get(trx: AnyTrxNode, id: NesoiObj['id']): Promise<any>;
     index(trx: AnyTrxNode): Promise<any[]>;
-    query(trx: AnyTrxNode, view: $BucketView, query: NQL_AnyQuery, pagination?: NQL_Pagination): Promise<any[]>;
+    query(trx: AnyTrxNode, view: $BucketView, query: NQL_AnyQuery, pagination?: NQL_Pagination): Promise<NQL_Result<any[] | {
+        [x: string]: any;
+        id: any;
+    }[]> | Obj[]>;
     private syncOne;
     private syncOneAndPast;
     private syncAll;

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

@@ -69,7 +69,7 @@ class BucketCache {
             const obj = await this.outerAdapter.get(trx, id);
             if (obj) {
                 const entry = new BucketCacheEntry(obj.id, obj, this.outerAdapter.getUpdateEpoch(obj), this.lastSyncEpoch);
-                await this.innerAdapter.put(trx, entry);
+                await this.innerAdapter.create(trx, entry);
                 return { action: 'update', sync: entry };
             }
             return { action: 'keep' };
@@ -93,7 +93,7 @@ class BucketCache {
         if (!localObj) {
             const obj = await this.outerAdapter.get(trx, id);
             if (obj) {
-                await this.innerAdapter.put(trx, obj);
+                await this.innerAdapter.create(trx, obj);
                 return { action: 'update', sync: {
                         obj,
                         updateEpoch: this.outerAdapter.getUpdateEpoch(obj)
@@ -132,26 +132,26 @@ class BucketCache {
     }
     async syncQuery(trx, view, query, pagination) {
         // 1. Query id and epoch from outer adapter
-        const outerMetadata = await this.outerAdapter.query(trx, query, pagination, {
+        const outerMetadata = await this.outerAdapter.query(trx, query, pagination, undefined, {
             metadataOnly: true
         });
-        if (!outerMetadata.length) {
+        if (!outerMetadata.data.length) {
             return { action: 'keep', sync: [] };
         }
         // 2. Read ids from the inner adapter
         const innerData = await this.innerAdapter.query(trx, {
-            'id in': outerMetadata.map(obj => obj.id)
+            'id in': outerMetadata.data.map(obj => obj.id)
         });
         // 3. Filter modified query results
         const outerEpoch = {};
-        for (const i in outerMetadata) {
-            const obj = outerMetadata[i];
+        for (const i in outerMetadata.data) {
+            const obj = outerMetadata.data[i];
             outerEpoch[obj.id] = this.outerAdapter.getUpdateEpoch(obj);
         }
         const queryResults = {};
         const modifiedIds = [];
-        for (const i in innerData) {
-            const obj = innerData[i];
+        for (const i in innerData.data) {
+            const obj = innerData.data[i];
             const epoch = outerEpoch[obj.id];
             if (!epoch || epoch > obj.updateEpoch) {
                 modifiedIds.push(obj.id);
@@ -162,14 +162,14 @@ class BucketCache {
         }
         // 4. Nothing changed, return current data
         if (!modifiedIds.length) {
-            return { action: 'keep', sync: innerData };
+            return { action: 'keep', sync: innerData.data };
         }
         // 5. Query modified objects to outer adapter and merge them on results
         const outerData = await this.outerAdapter.query(trx, {
             'id in': modifiedIds
         });
-        for (const i in outerData) {
-            const obj = outerData[i];
+        for (const i in outerData.data) {
+            const obj = outerData.data[i];
             const updateEpoch = this.outerAdapter.getUpdateEpoch(obj);
             queryResults[obj.id] = {
                 obj,

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

@@ -7,10 +7,37 @@ export declare class BucketGraph<M extends $Module, $ extends $Bucket> {
     private bucketName;
     private schema;
     constructor(bucket: Bucket<M, $>);
-    readLinkOrFail<LinkName extends keyof $['graph']['links'], LinkBucketName extends $['graph']['links'][LinkName]['bucket']['refName'], LinkBucket extends M['buckets'][LinkBucketName], V extends ViewName<LinkBucket>, Obj extends ViewObj<LinkBucket, V>>(trx: AnyTrxNode, link: LinkName, obj: $['#data'], view?: V, index?: (string | number)[]): Promise<Obj | Obj[]>;
-    readLink<LinkName extends keyof $['graph']['links'], LinkBucketName extends $['graph']['links'][LinkName]['bucket']['refName'], LinkBucket extends M['buckets'][LinkBucketName], V extends ViewName<LinkBucket>, Obj extends ViewObj<LinkBucket, V>>(trx: AnyTrxNode, link: LinkName, obj: $['#data'], view?: V, index?: (string | number)[]): Promise<Obj | Obj[] | undefined>;
-    private readOneLink;
-    private readManyLink;
-    hasLink<LinkName extends keyof $['graph']['links']>(trx: AnyTrxNode, link: LinkName, obj: $['#data']): Promise<boolean>;
+    /**
+     * Read the data from a link
+     *
+     * - Options
+     *   - `silent`: If not found, returns undefined instead of raising an exception (default: `false`)
+     *   - `no_tenancy`: Don't apply tenancy rules (default: `false`)
+     */
+    readLink<LinkName extends keyof $['graph']['links'], LinkBucketName extends $['graph']['links'][LinkName]['bucket']['refName'], LinkBucket extends M['buckets'][LinkBucketName], Obj = LinkBucket['#data']>(trx: AnyTrxNode, obj: $['#data'], link: LinkName, options?: {
+        silent?: boolean;
+        no_tenancy?: boolean;
+    }): Promise<Obj | Obj[] | undefined>;
+    /**
+     * Read the data from a link and build it with a given view
+     *
+     * - Options
+     *   - `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']['refName'], LinkBucket extends M['buckets'][LinkBucketName], V extends ViewName<LinkBucket>, Obj extends ViewObj<LinkBucket, V>>(trx: AnyTrxNode, obj: $['#data'], link: LinkName, view: V, options?: {
+        silent?: boolean;
+        no_tenancy?: boolean;
+    }): Promise<Obj | Obj[] | undefined>;
+    /**
+     * Return true if the link resolves to at least one object
+     *
+     * - Options
+     *   - `silent`: If not found, returns undefined instead of raising an exception
+     *   - `no_tenancy`: Don't apply tenancy rules
+     */
+    hasLink<LinkName extends keyof $['graph']['links']>(trx: AnyTrxNode, link: LinkName, obj: $['#data'], options?: {
+        no_tenancy?: boolean;
+    }): Promise<boolean>;
 }
 export type AnyBucket = Bucket<any, any>;

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BucketGraph = void 0;
+const trx_node_1 = require("../../../../engine/transaction/trx_node");
 const log_1 = require("../../../../engine/util/log");
-const tree_1 = require("../../../../engine/data/tree");
 const error_1 = require("../../../../engine/data/error");
 class BucketGraph {
     constructor(bucket) {
@@ -10,127 +10,96 @@ class BucketGraph {
         this.bucketName = bucket.schema.name;
         this.schema = bucket.schema.graph;
     }
-    // Graph
-    async readLinkOrFail(trx, link, obj, view = 'default', index = []) {
-        const res = await this.readLink(trx, link, obj, view, index);
-        if (!res) {
-            const linkSchema = this.schema.links[link];
-            // TODO: get bucket alias instead of name (for error message)
-            throw error_1.NesoiError.Bucket.ObjNotFound({ bucket: linkSchema.bucket.name, id: obj.id });
-        }
-        return res;
-    }
-    async readLink(trx, link, obj, view = 'default', index = []) {
+    /**
+     * Read the data from a link
+     *
+     * - Options
+     *   - `silent`: If not found, returns undefined instead of raising an exception (default: `false`)
+     *   - `no_tenancy`: Don't apply tenancy rules (default: `false`)
+     */
+    async 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}`, schema);
-        const selfValue = tree_1.Tree.get(obj, schema.selfKey, index);
-        if (!selfValue) {
-            return undefined;
-        }
-        // Validate value type
-        if (schema.many) {
-            if (schema.keyOwner === 'self') {
-                if (!Array.isArray(selfValue)) {
-                    throw error_1.NesoiError.Bucket.Graph.LinkManyRefOnSelfWithoutArrayValue(schema.name);
-                }
-            }
+        // Make tenancy query
+        const tenancy = (options?.no_tenancy)
+            ? undefined
+            : this.bucket.getTenancyQuery(trx);
+        // Query
+        const otherBucket = trx_node_1.TrxNode.getModule(trx).buckets[schema.bucket.refName];
+        const links = await otherBucket.adapter.query(trx, {
+            ...schema.query,
+            '#and': tenancy
+        }, {
+            perPage: schema.many ? undefined : 1,
+        }, obj);
+        // Empty response
+        if (!schema.many && !schema.optional && !links.data.length) {
+            // silent = undefined
+            if (options?.silent)
+                return;
+            // non-silent = exception
             else {
-                if (Array.isArray(selfValue)) {
-                    throw error_1.NesoiError.Bucket.Graph.LinkManyRefOffSelfWithArrayValue(schema.name);
-                }
-            }
-        }
-        else {
-            if (Array.isArray(selfValue)) {
-                throw error_1.NesoiError.Bucket.Graph.LinkOneWithArrayValue(schema.name);
+                throw error_1.NesoiError.Bucket.Graph.RequiredLinkNotFound({
+                    bucket: this.bucketName,
+                    link: link,
+                    id: obj.id
+                });
             }
         }
-        // 
-        const links = schema.many
-            ? await this.readManyLink(trx, schema, selfValue, view)
-            : await this.readOneLink(trx, schema, selfValue, view);
-        if (!schema.many && !schema.optional && !links) {
-            throw error_1.NesoiError.Bucket.Graph.RequiredLinkNotFound(schema.name, selfValue);
-        }
-        return links;
-    }
-    async readOneLink(trx, link, selfValue, view) {
-        const linkBucket = trx.bucket(link.bucket.refName);
-        if (link.keyOwner === 'self' || link.keyOwner === 'other') {
-            const q = linkBucket.query({
-                [link.otherKey]: selfValue
-            }, view);
-            if (link.query) {
-                q.merge(link.query);
-            }
-            return q.first();
+        if (schema.many) {
+            return links.data;
         }
-        else if (link.keyOwner === 'pivot') {
-            const pivotBucket = trx.bucket(link.pivotBucket);
-            const pivotSelfKey = this.bucket.schema.name + '_id';
-            const pivotOtherKey = link.bucket + '_id';
-            const pivotObj = await linkBucket.query({
-                [pivotSelfKey]: selfValue
-            }, view).first();
-            const pivotValue = pivotObj[pivotOtherKey];
-            if (pivotValue === undefined || pivotValue === null) {
-                throw error_1.NesoiError.Bucket.Graph.PivotValueIsUndefined(link.name);
-            }
-            const q = linkBucket.query({
-                [link.otherKey]: pivotValue
-            }, view);
-            if (link.query) {
-                q.merge(link.query);
-            }
-            return q.first();
+        else {
+            return links.data[0];
         }
     }
-    async readManyLink(trx, link, selfValue, view) {
-        const linkBucket = trx.bucket(link.bucket.refName);
-        if (link.keyOwner === 'self') {
-            const q = linkBucket.query({
-                [link.otherKey]: selfValue
-            }, view);
-            if (link.query) {
-                q.merge(link.query);
-            }
-            return q.all();
-        }
-        else if (link.keyOwner === 'other') {
-            const q = linkBucket.query({
-                [link.otherKey]: selfValue
-            }, view);
-            if (link.query) {
-                q.merge(link.query);
+    /**
+     * Read the data from a link and build it with a given view
+     *
+     * - Options
+     *   - `silent`: If not found, returns undefined instead of raising an exception (default: `false`)
+     *   - `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];
+        const otherBucket = trx_node_1.TrxNode.getModule(trx).buckets[schema.bucket.refName];
+        const links = await this.readLink(trx, obj, link, options);
+        if (!links)
+            return undefined;
+        if (Array.isArray(links)) {
+            const output = [];
+            for (const link of links) {
+                output.push(await otherBucket.buildOne(trx, link, view));
             }
-            return q.all();
+            return output;
         }
-        else if (link.keyOwner === 'pivot') {
-            const pivotBucket = trx.bucket(link.pivotBucket);
-            const pivotSelfKey = this.bucket.schema.name + '_id';
-            const pivotOtherKey = link.bucket + '_id';
-            const q = pivotBucket.query({
-                [pivotSelfKey]: selfValue
-            }, view);
-            if (link.query) {
-                q.merge(link.query);
-            }
-            const pivotObjs = await q.all();
-            const pivotValues = pivotObjs.map(obj => obj[pivotOtherKey]);
-            if (!pivotValues.length) {
-                return [];
-            }
-            return linkBucket.query({
-                [`${link.otherKey} in`]: pivotValues
-            }, view);
+        else {
+            return await otherBucket.buildOne(trx, links, view);
         }
     }
-    async hasLink(trx, link, obj) {
-        const links = await this.readLink(trx, link, obj);
-        if (Array.isArray(links)) {
-            return !!links.length;
-        }
-        return !!links;
+    /**
+     * Return true if the link resolves to at least one object
+     *
+     * - Options
+     *   - `silent`: If not found, returns undefined instead of raising an exception
+     *   - `no_tenancy`: Don't apply tenancy rules
+     */
+    async hasLink(trx, link, obj, options) {
+        log_1.Log.trace('bucket', this.bucketName, `Has link ${link}`);
+        const schema = this.schema.links[link];
+        // Make tenancy query
+        const tenancy = (options?.no_tenancy)
+            ? undefined
+            : this.bucket.getTenancyQuery(trx);
+        // Query
+        const links = await this.bucket.adapter.query(trx, {
+            ...schema.query,
+            '#and': tenancy
+        }, {
+            perPage: 1,
+        }, obj);
+        return !!links.data.length;
     }
 }
 exports.BucketGraph = BucketGraph;

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

@@ -1,6 +1,6 @@
 import { $Dependency } from "../../../../engine/dependency";
 import { $Bucket } from '../bucket.schema';
-import { AnyQuery } from '../query/nql.schema';
+import { NQL_AnyQuery } from '../query/nql.schema';
 export declare class $BucketGraphLink {
     name: string;
     alias: string;
@@ -9,14 +9,11 @@ export declare class $BucketGraphLink {
     many: boolean;
     optional: boolean;
     keyOwner: 'self' | 'other' | 'pivot';
-    selfKey: string;
-    otherKey: string;
-    pivotBucket?: string | undefined;
-    query?: AnyQuery<any, any> | undefined;
+    query: NQL_AnyQuery;
     $t: string;
     '#bucket': $Bucket;
     '#many': boolean;
-    constructor(name: string, alias: string, bucket: $Dependency, rel: 'aggregation' | 'composition', many: boolean, optional: boolean, keyOwner: 'self' | 'other' | 'pivot', selfKey: string, otherKey: string, pivotBucket?: string | undefined, query?: AnyQuery<any, any> | undefined);
+    constructor(name: string, alias: string, bucket: $Dependency, rel: 'aggregation' | 'composition', many: boolean, optional: boolean, keyOwner: 'self' | 'other' | 'pivot', query: NQL_AnyQuery);
 }
 export type $BucketGraphLinks = {
     [x: string]: $BucketGraphLink;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.$BucketGraph = exports.$BucketGraphLink = void 0;
 class $BucketGraphLink {
-    constructor(name, alias, bucket, rel, many, optional, keyOwner, selfKey, otherKey, pivotBucket, query) {
+    constructor(name, alias, bucket, rel, many, optional, keyOwner, query) {
         this.name = name;
         this.alias = alias;
         this.bucket = bucket;
@@ -10,9 +10,6 @@ class $BucketGraphLink {
         this.many = many;
         this.optional = optional;
         this.keyOwner = keyOwner;
-        this.selfKey = selfKey;
-        this.otherKey = otherKey;
-        this.pivotBucket = pivotBucket;
         this.query = query;
         this.$t = 'bucket.graph.link';
     }

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

@@ -3,7 +3,7 @@ import { $BucketGraphLink } from './bucket_graph.schema';
 import { BucketBuilderNode } from '../bucket.builder';
 import { $Dependency } from "../../../../engine/dependency";
 import { $Bucket } from '../bucket.schema';
-import { NQL_Query } from '../query/nql.schema';
+import { NQL_AnyQuery, NQL_Query } from '../query/nql.schema';
 export declare class BucketGraphLinkFactory<Module extends $Module, SelfBucket extends $Bucket, Fieldpaths = NoInfer<SelfBucket['#fieldpath']>> {
     private module;
     private alias?;
@@ -20,16 +20,12 @@ export declare class BucketGraphLinkBuilder<Module extends $Module, SelfBucket e
     private query;
     private many;
     private alias?;
-    private keyOwner;
-    private pivotBucket?;
-    private selfKey?;
-    private otherKey?;
-    private _query?;
     private _optional;
-    constructor(bucket: $Dependency, rel: 'aggregation' | 'composition', query: NQL_Query<any, any>, many: boolean, alias?: string | undefined);
+    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 inferKeyOwner(query: NQL_AnyQuery): "self";
 }
 export type BucketGraphLinkBuilders = {
     [x: string]: BucketGraphLinkBuilder<any, any, any>;

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

@@ -38,7 +38,6 @@ class BucketGraphLinkBuilder {
         this.query = query;
         this.many = many;
         this.alias = alias;
-        this.keyOwner = 'self';
         this._optional = false;
     }
     as(alias) {
@@ -50,7 +49,12 @@ class BucketGraphLinkBuilder {
         return this;
     }
     static build(node, builder, name) {
-        return new bucket_graph_schema_1.$BucketGraphLink(name, builder.alias || name, builder.bucket, builder.rel, builder.many, builder._optional, builder.keyOwner, builder.selfKey || 'id', builder.otherKey || 'id', builder.pivotBucket, builder._query);
+        return new bucket_graph_schema_1.$BucketGraphLink(name, builder.alias || name, builder.bucket, builder.rel, builder.many, builder._optional, this.inferKeyOwner(builder.query), builder.query);
+    }
+    static inferKeyOwner(query) {
+        const keyOwner = 'self';
+        // TODO
+        return keyOwner;
     }
 }
 exports.BucketGraphLinkBuilder = BucketGraphLinkBuilder;

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

@@ -18,7 +18,7 @@ class BucketModelBuilder {
     // Build
     static build(builder) {
         const fields = bucket_model_field_builder_1.BucketModelFieldBuilder.buildChildren(builder.module, builder.builders);
-        return new bucket_model_schema_1.$BucketModel(fields.schema, fields.defaults);
+        return new bucket_model_schema_1.$BucketModel(fields.schema, fields.defaults, fields.hasFileField, fields.hasEncryptedField);
     }
 }
 exports.BucketModelBuilder = BucketModelBuilder;

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

@@ -37,9 +37,9 @@ function convertToMessage(module, model, name, alias, include = [], exclude = []
                 continue;
             }
             msgFields[f] = new message_template_schema_1.$MessageTemplateField(field.type, field.name, field.alias, path, field.array, field.required, undefined, false, [], {
-                enum: field._enum ? {
-                    options: field._enum.options,
-                    dep: field._enum.dep ? new dependency_1.$Dependency(module, 'constants', `${field._enum.dep.module}::${field._enum.dep.name}`) : undefined
+                enum: field.meta?.enum ? {
+                    options: field.meta.enum.options,
+                    dep: field.meta.enum.dep ? new dependency_1.$Dependency(module, 'constants', `${field.meta.enum.dep.module}::${field.meta.enum.dep.name}`) : undefined
                 } : undefined
             }, field.children ? convertFields(field.children, include, exclude) : undefined);
         }

package/lib/elements/entities/bucket/model/bucket_model.schema.d.ts

@@ -1,23 +1,49 @@
 import { $Dependency } from "../../../../engine/dependency";
 export type $BucketModelFieldType = 'boolean' | 'date' | 'datetime' | 'decimal' | 'enum' | 'file' | 'float' | 'int' | 'string' | 'obj' | 'unknown' | 'dict';
+export type $BucketModelFieldCrypto = {
+    algorithm: string;
+    key: string;
+};
 export declare class $BucketModelField {
     name: string;
+    path: string;
     type: $BucketModelFieldType;
     alias: string;
     array: boolean;
     required: boolean;
-    _enum?: {
-        options: string | string[];
-        dep?: $Dependency;
+    meta?: {
+        enum?: {
+            options: string | string[];
+            dep?: $Dependency;
+        };
+        decimal?: {
+            left?: number;
+            right?: number;
+        };
+        file?: {
+            extnames?: string[];
+            maxsize?: number;
+        };
     } | undefined;
     defaultValue?: any | undefined;
     children?: $BucketModelFields | undefined;
     or?: $BucketModelField | undefined;
+    crypto?: $BucketModelFieldCrypto | undefined;
     $t: string;
-    constructor(name: string, type: $BucketModelFieldType, alias: string, array: boolean, required: boolean, _enum?: {
-        options: string | string[];
-        dep?: $Dependency;
-    } | undefined, defaultValue?: any | undefined, children?: $BucketModelFields | undefined, or?: $BucketModelField | undefined);
+    constructor(name: string, path: string, type: $BucketModelFieldType, alias: string, array: boolean, required: boolean, meta?: {
+        enum?: {
+            options: string | string[];
+            dep?: $Dependency;
+        };
+        decimal?: {
+            left?: number;
+            right?: number;
+        };
+        file?: {
+            extnames?: string[];
+            maxsize?: number;
+        };
+    } | undefined, defaultValue?: any | undefined, children?: $BucketModelFields | undefined, or?: $BucketModelField | undefined, crypto?: $BucketModelFieldCrypto | undefined);
 }
 export type $BucketModelFields = {
     [x: string]: $BucketModelField;
@@ -27,9 +53,12 @@ export declare class $BucketModel {
         id: $BucketModelField;
     };
     defaults: Record<string, any>;
+    hasFileField: boolean;
+    hasEncryptedField: boolean;
     $t: string;
     constructor(fields: $BucketModelFields & {
         id: $BucketModelField;
-    }, defaults?: Record<string, any>);
+    }, defaults?: Record<string, any>, hasFileField?: boolean, hasEncryptedField?: boolean);
     static get(model: $BucketModel, fieldpath: string): $BucketModelField | undefined;
+    static fieldsOfType(model: $BucketModel, type: $BucketModelFieldType): $BucketModelField[];
 }