nesoi 3.2.9 → 3.3.1

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

@@ -56,7 +56,7 @@ class Bucket {
     getQueryMeta() {
         return {
             ...this.adapter.getQueryMeta(),
-            bucket: this.schema
+            schema: this.schema
         };
     }
     /* CRUD */
@@ -354,12 +354,12 @@ class Bucket {
                 _obj['#composition'] ?? (_obj['#composition'] = {});
                 (_a = _obj['#composition'])[_b = link.name] ?? (_a[_b] = []);
                 for (const linkObjItem of linkObj) {
-                    const child = await trx.bucket(link.bucket.refName).create(linkObjItem);
+                    const child = await trx.bucket(link.bucket.short).create(linkObjItem);
                     _obj['#composition'][link.name].push(child);
                 }
             }
             else {
-                const child = await trx.bucket(link.bucket.refName).create(linkObj);
+                const child = await trx.bucket(link.bucket.short).create(linkObj);
                 _obj['#composition'] ?? (_obj['#composition'] = {});
                 _obj['#composition'][link.name] = child;
             }
@@ -472,11 +472,11 @@ class Bucket {
                     throw error_1.NesoiError.Bucket.CompositionValueShouldBeArray({ method: 'replace', bucket: this.schema.name, link: link.name });
                 }
                 for (const linkObjItem of linkObj) {
-                    await trx.bucket(link.bucket.refName)[mode](linkObjItem);
+                    await trx.bucket(link.bucket.short)[mode](linkObjItem);
                 }
             }
             else {
-                await trx.bucket(link.bucket.refName)[mode](linkObj);
+                await trx.bucket(link.bucket.short)[mode](linkObj);
             }
         }
         return _obj;
@@ -525,12 +525,12 @@ class Bucket {
                 _obj['#composition'] ?? (_obj['#composition'] = {});
                 (_a = _obj['#composition'])[_b = link.name] ?? (_a[_b] = []);
                 for (const linkObjItem of linkObj) {
-                    const child = await trx.bucket(link.bucket.refName).put(linkObjItem);
+                    const child = await trx.bucket(link.bucket.short).put(linkObjItem);
                     _obj['#composition'][link.name].push(child);
                 }
             }
             else {
-                const child = await trx.bucket(link.bucket.refName).put(linkObj);
+                const child = await trx.bucket(link.bucket.short).put(linkObj);
                 _obj['#composition'] ?? (_obj['#composition'] = {});
                 _obj['#composition'][link.name] = child;
             }
@@ -608,10 +608,10 @@ class Bucket {
             if (!linked)
                 continue;
             if (link.many) {
-                await trx.bucket(link.bucket.refName).unsafe.deleteMany(linked.map((l) => l.id));
+                await trx.bucket(link.bucket.short).unsafe.deleteMany(linked.map((l) => l.id));
             }
             else {
-                await trx.bucket(link.bucket.refName).delete(linked.id);
+                await trx.bucket(link.bucket.short).delete(linked.id);
             }
         }
         // Delete the object itself
@@ -659,10 +659,10 @@ class Bucket {
                 if (!linked)
                     continue;
                 if (link.many) {
-                    await trx.bucket(link.bucket.refName).unsafe.deleteMany(linked.map((l) => l.id));
+                    await trx.bucket(link.bucket.short).unsafe.deleteMany(linked.map((l) => l.id));
                 }
                 else {
-                    await trx.bucket(link.bucket.refName).unsafe.delete(linked.id);
+                    await trx.bucket(link.bucket.short).unsafe.delete(linked.id);
                 }
             }
         }
@@ -682,10 +682,10 @@ class Bucket {
                 if (!linked)
                     continue;
                 if (link.many) {
-                    await trx.bucket(link.bucket.refName).unsafe.deleteMany(linked.map((l) => l.id));
+                    await trx.bucket(link.bucket.short).unsafe.deleteMany(linked.map((l) => l.id));
                 }
                 else {
-                    await trx.bucket(link.bucket.refName).unsafe.delete(linked.id);
+                    await trx.bucket(link.bucket.short).unsafe.delete(linked.id);
                 }
             }
         }
@@ -738,12 +738,12 @@ class Bucket {
         if (operation === 'create') {
             obj[this.adapter.config.meta.created_at] = datetime_1.NesoiDatetime.now();
             if (match) {
-                obj[this.adapter.config.meta.created_by] = match.user.id;
+                obj[this.adapter.config.meta.created_by] = match.provider + '.' + match.user.id;
             }
         }
         obj[this.adapter.config.meta.updated_at] = datetime_1.NesoiDatetime.now();
         if (match) {
-            obj[this.adapter.config.meta.updated_by] = match.user.id;
+            obj[this.adapter.config.meta.updated_by] = match.provider + '.' + match.user.id;
         }
     }
     // Tenancy
@@ -751,6 +751,8 @@ class Bucket {
         if (!this.schema.tenancy)
             return;
         const match = trx_node_1.TrxNode.getFirstUserMatch(trx, this.schema.tenancy);
+        if (!match)
+            return;
         return this.schema.tenancy[match.provider]?.(match.user);
     }
     // Encryption
@@ -758,7 +760,7 @@ class Bucket {
         for (const key in fields) {
             const field = fields[key];
             if (field.crypto) {
-                const key = trx.value(field.crypto.key);
+                const key = trx.value(field.crypto.value.short);
                 const val = tree_1.Tree.get(obj, field.path);
                 if (val !== undefined) {
                     const encrypted = await crypto_1.NesoiCrypto.encrypt(val, key);
@@ -774,7 +776,7 @@ class Bucket {
         for (const key in fields) {
             const field = fields[key];
             if (field.crypto) {
-                const key = trx.value(field.crypto.key);
+                const key = trx.value(field.crypto.value.short);
                 const val = tree_1.Tree.get(obj, field.path);
                 if (val !== undefined) {
                     const encrypted = await crypto_1.NesoiCrypto.decrypt(val, key);

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

@@ -2,7 +2,7 @@ import { $BucketGraph } from './graph/bucket_graph.schema';
 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 { Tag } from "../../../engine/dependency";
 import { $Module } from "../..";
 import { NQL_Query } from './query/nql.schema';
 export type $BucketTenancy<M extends $Module, B extends $Bucket> = {
@@ -20,7 +20,7 @@ export declare class $Bucket {
     graph: $BucketGraph;
     views: $BucketViews;
     tenancy?: $BucketTenancy<any, any> | undefined;
-    extended?: $Dependency | undefined;
+    extendsFrom?: Tag | undefined;
     $t: "bucket";
     '#data': NesoiObj;
     '#composition': Record<string, {
@@ -31,5 +31,5 @@ export declare class $Bucket {
     '#modelpath': {};
     '#querypath': {};
     '#defaults': Record<string, any>;
-    constructor(module: string, name: string, alias: string, model: $BucketModel, graph: $BucketGraph, views: $BucketViews, tenancy?: $BucketTenancy<any, any> | undefined, extended?: $Dependency | undefined);
+    constructor(module: string, name: string, alias: string, model: $BucketModel, graph: $BucketGraph, views: $BucketViews, tenancy?: $BucketTenancy<any, any> | undefined, extendsFrom?: Tag | undefined);
 }

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

@@ -6,7 +6,7 @@ exports.$Bucket = void 0;
  * @subcategory Entity
  * */
 class $Bucket {
-    constructor(module, name, alias, model, graph, views, tenancy, extended) {
+    constructor(module, name, alias, model, graph, views, tenancy, extendsFrom) {
         this.module = module;
         this.name = name;
         this.alias = alias;
@@ -14,7 +14,7 @@ class $Bucket {
         this.graph = graph;
         this.views = views;
         this.tenancy = tenancy;
-        this.extended = extended;
+        this.extendsFrom = extendsFrom;
         this.$t = 'bucket';
     }
 }

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

@@ -89,7 +89,13 @@ class BucketCache {
         else if (mode === 'all') {
             const { action, sync } = await this.syncAll(trx);
             log_1.Log.debug('bucket', this.bucket.schema.name, `CACHE query.all, ${action}`);
-            const entries = (await this.innerAdapter.query(trx, query, pagination, params, undefined, this.innerAdapter.nql)).data;
+            const meta = this.innerAdapter.getQueryMeta();
+            const entries = (await this.innerAdapter.query(trx, query, pagination, params, undefined, {
+                module: this.bucket.schema.module,
+                runners: {
+                    [meta.scope]: this.innerAdapter.nql
+                }
+            })).data;
             data = [];
             for (const e of entries) {
                 const { __update_epoch, __sync_epoch, ...obj } = e;
@@ -181,9 +187,15 @@ class BucketCache {
             return { action: 'none', sync: [] };
         }
         // 2. Read ids from the inner adapter
+        const meta = this.innerAdapter.getQueryMeta();
         const innerData = await this.innerAdapter.query(trx, {
             'id in': outerMetadata.data.map(obj => obj.id)
-        }, undefined, undefined, undefined, this.innerAdapter.nql);
+        }, undefined, undefined, undefined, {
+            module: this.bucket.schema.module,
+            runners: {
+                [meta.scope]: this.innerAdapter.nql
+            }
+        });
         // 3. Filter modified query results
         const outerEpoch = {};
         for (const i in outerMetadata.data) {

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

@@ -18,7 +18,7 @@ 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']['refName'], 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: LinkName, options?: {
         silent?: boolean;
         no_tenancy?: boolean;
     }): Promise<Obj | Obj[] | undefined>;
@@ -29,7 +29,7 @@ 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']['refName'], 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: LinkName, options?: {
         silent?: boolean;
         no_tenancy?: boolean;
     }): Promise<Obj[] | Obj[][]>;
@@ -40,7 +40,7 @@ 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']['refName'], 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: LinkName, view: V, options?: {
         silent?: boolean;
         no_tenancy?: boolean;
     }): Promise<Obj | Obj[] | undefined>;

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

@@ -6,6 +6,8 @@ const log_1 = require("../../../../engine/util/log");
 const error_1 = require("../../../../engine/data/error");
 const memory_bucket_adapter_1 = require("../adapters/memory.bucket_adapter");
 const bucket_cache_1 = require("../cache/bucket_cache");
+const daemon_1 = require("../../../../engine/daemon");
+const dependency_1 = require("../../../../engine/dependency");
 /**
  * @category Elements
  * @subcategory Entity
@@ -31,14 +33,29 @@ class BucketGraph {
             ? undefined
             : this.bucket.getTenancyQuery(trx);
         // Query
-        const otherBucket = trx_node_1.TrxNode.getModule(trx).buckets[schema.bucket.refName];
-        const adapter = otherBucket.cache || otherBucket.adapter;
-        const links = await adapter.query(trx, {
+        const module = trx_node_1.TrxNode.getModule(trx);
+        const query = {
             ...schema.query,
             '#and __tenancy__': tenancy
-        }, {
+        };
+        const params = [{ ...obj }];
+        const page = {
             perPage: schema.many ? undefined : 1,
-        }, [{ ...obj }]);
+        };
+        // External
+        let links;
+        if (schema.bucket.module !== module.name) {
+            links = await trx.bucket(schema.bucket.short)
+                .query(query)
+                .params(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);
+        }
         // Empty response
         if (!schema.many && !schema.optional && !links.data.length) {
             // silent = undefined
@@ -75,23 +92,41 @@ class BucketGraph {
             ? undefined
             : this.bucket.getTenancyQuery(trx);
         // Query
-        const otherBucket = trx_node_1.TrxNode.getModule(trx).buckets[schema.bucket.refName];
-        // let tempData: Record<string, any> = {};
+        const module = trx_node_1.TrxNode.getModule(trx);
+        const query = {
+            ...schema.query,
+            '#and __tenancy__': tenancy
+        };
+        const params = objs.map(obj => ({ ...obj }));
         let tempAdapter;
-        if (otherBucket.adapter instanceof memory_bucket_adapter_1.MemoryBucketAdapter) {
-            tempAdapter = otherBucket.cache || otherBucket.adapter;
-        }
-        else {
-            const adapter = otherBucket.cache || otherBucket.adapter;
-            const allLinks = await adapter.query(trx, {
-                ...schema.query,
-                '#and __tenancy__': tenancy
-            }, undefined, objs.map(obj => ({ ...obj })));
+        // External
+        if (schema.bucket.module !== module.name) {
+            const allLinks = await trx.bucket(schema.bucket.short)
+                .query(query)
+                .params(params)
+                .all();
             const tempData = {};
-            for (const obj of allLinks.data)
+            for (const obj of allLinks)
                 tempData[obj.id] = obj;
+            const otherBucket = await daemon_1.Daemon.getBucketMetadata(module.daemon, schema.bucket);
             tempAdapter = new memory_bucket_adapter_1.MemoryBucketAdapter(otherBucket.schema, tempData);
         }
+        // Internal
+        else {
+            const otherBucket = dependency_1.Tag.element(schema.bucket, trx);
+            if (otherBucket.adapter instanceof memory_bucket_adapter_1.MemoryBucketAdapter) {
+                tempAdapter = otherBucket.cache || otherBucket.adapter;
+            }
+            else {
+                const adapter = otherBucket.cache || otherBucket.adapter;
+                const allLinks = await adapter.query(trx, query, undefined, params);
+                const tempData = {};
+                for (const obj of allLinks.data)
+                    tempData[obj.id] = obj;
+                tempAdapter = new memory_bucket_adapter_1.MemoryBucketAdapter(otherBucket.schema, tempData);
+            }
+        }
+        // Query
         const links = [];
         for (const obj of objs) {
             const result = tempAdapter instanceof bucket_cache_1.BucketCache
@@ -100,7 +135,18 @@ class BucketGraph {
                 }, [{ ...obj }], undefined)
                 : await tempAdapter.query(trx, schema.query, {
                     perPage: schema.many ? undefined : 1,
-                }, [{ ...obj }], undefined, tempAdapter.nql);
+                }, [{ ...obj }], undefined, {
+                    module: schema.bucket.module,
+                    runners: {
+                        [tempAdapter.getQueryMeta().scope]: tempAdapter.nql
+                    },
+                    metadata: {
+                        ...tempAdapter.getQueryMeta(),
+                        schema: tempAdapter.schema,
+                        tag: schema.bucket,
+                        meta: tempAdapter.config.meta
+                    }
+                });
             if (schema.many) {
                 links.push(result.data);
             }
@@ -121,19 +167,28 @@ class BucketGraph {
     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));
+        const module = trx_node_1.TrxNode.getModule(trx);
+        // External
+        if (schema.bucket.module !== module.name) {
+            if (Array.isArray(links)) {
+                return trx.bucket(schema.bucket.short).buildMany(links, view);
+            }
+            else {
+                return await trx.bucket(schema.bucket.short).buildOne(links, view);
             }
-            return output;
         }
+        // Internal
         else {
-            return await otherBucket.buildOne(trx, links, view);
+            const otherBucket = dependency_1.Tag.element(schema.bucket, trx);
+            if (Array.isArray(links)) {
+                return await otherBucket.buildMany(trx, links, view);
+            }
+            else {
+                return await otherBucket.buildOne(trx, links, view);
+            }
         }
     }
     /**
@@ -151,12 +206,29 @@ class BucketGraph {
             ? undefined
             : this.bucket.getTenancyQuery(trx);
         // Query
-        const links = await this.bucket.adapter.query(trx, {
+        const module = trx_node_1.TrxNode.getModule(trx);
+        const query = {
             ...schema.query,
-            '#and __tenancy__': tenancy
-        }, {
+            '#and__tenancy__': tenancy
+        };
+        const params = [{ ...obj }];
+        const page = {
             perPage: 1,
-        }, [{ ...obj }]);
+        };
+        // External
+        let links;
+        if (schema.bucket.module !== module.name) {
+            links = await trx.bucket(schema.bucket.short)
+                .query(query)
+                .params(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);
+        }
         return !!links.data.length;
     }
 }

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

@@ -1,4 +1,4 @@
-import { $Dependency } from "../../../../engine/dependency";
+import { Tag } from "../../../../engine/dependency";
 import { $Bucket } from '../bucket.schema';
 import { NQL_AnyQuery } from '../query/nql.schema';
 /**
@@ -8,7 +8,7 @@ import { NQL_AnyQuery } from '../query/nql.schema';
 export declare class $BucketGraphLink {
     name: string;
     alias: string;
-    bucket: $Dependency;
+    bucket: Tag;
     rel: 'aggregation' | 'composition';
     many: boolean;
     optional: boolean;
@@ -17,7 +17,7 @@ export declare class $BucketGraphLink {
     $t: string;
     '#bucket': $Bucket;
     '#many': boolean;
-    constructor(name: string, alias: string, bucket: $Dependency, rel: 'aggregation' | 'composition', many: boolean, optional: boolean, keyOwner: 'self' | 'other' | 'pivot', query: NQL_AnyQuery);
+    constructor(name: string, alias: string, bucket: Tag, 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_link.builder.d.ts

@@ -1,7 +1,7 @@
 import { $Module } from "../../../../schema";
 import { $BucketGraphLink } from './bucket_graph.schema';
 import { BucketBuilderNode } from '../bucket.builder';
-import { $Dependency } from "../../../../engine/dependency";
+import { Dependency } from "../../../../engine/dependency";
 import { $Bucket } from '../bucket.schema';
 import { NQL_AnyQuery, NQL_Query } from '../query/nql.schema';
 /**
@@ -30,7 +30,7 @@ export declare class BucketGraphLinkBuilder<Module extends $Module, SelfBucket e
     private alias?;
     '#other': OtherBucket;
     private _optional;
-    constructor(bucket: $Dependency, rel: 'aggregation' | 'composition', query: NQL_AnyQuery, 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;

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

@@ -25,10 +25,12 @@ class BucketGraphLinkFactory {
         return self;
     }
     one(bucket, query) {
-        return new BucketGraphLinkBuilder(new dependency_1.$Dependency(this.module, 'bucket', bucket, true), this.type, query, false, this.alias);
+        const tag = dependency_1.Tag.fromNameOrShort(this.module, 'bucket', bucket);
+        return new BucketGraphLinkBuilder(new dependency_1.Dependency(this.module, tag, { compile: true, runtime: true }), this.type, query, false, this.alias);
     }
     many(bucket, query) {
-        return new BucketGraphLinkBuilder(new dependency_1.$Dependency(this.module, 'bucket', bucket, true), this.type, query, true, this.alias);
+        const tag = dependency_1.Tag.fromNameOrShort(this.module, 'bucket', bucket);
+        return new BucketGraphLinkBuilder(new dependency_1.Dependency(this.module, tag, { compile: true, runtime: true }), this.type, query, true, this.alias);
     }
 }
 exports.BucketGraphLinkFactory = BucketGraphLinkFactory;
@@ -57,7 +59,7 @@ 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, this.inferKeyOwner(builder.query), builder.query);
+        return new bucket_graph_schema_1.$BucketGraphLink(name, builder.alias || name, builder.bucket.tag, builder.rel, builder.many, builder._optional, this.inferKeyOwner(builder.query), builder.query);
     }
     static inferKeyOwner(query) {
         const keyOwner = 'self';

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

@@ -1,6 +1,7 @@
 import { $Module, $Space } from "../../../../schema";
 import { $BucketModel } from './bucket_model.schema';
 import { BucketModelFieldBuilder, BucketModelFieldBuilders, BucketModelFieldFactory } from './bucket_model_field.builder';
+import { ModuleTree } from "../../../../engine/tree";
 /**
  * @category Builders
  * @subcategory Entity
@@ -10,7 +11,7 @@ export declare class BucketModelBuilder<Module extends $Module> {
     constructor(module: string);
     private builders;
     fields(builders: BucketModelFieldBuilders<Module>): this;
-    static build(builder: BucketModelBuilder<any>): $BucketModel;
+    static build(builder: BucketModelBuilder<any>, tree: ModuleTree): $BucketModel;
 }
 export type BucketModelDef<Space extends $Space, Module extends $Module> = ($: BucketModelFieldFactory<Space, Module>) => {
     id: BucketModelFieldBuilder<Module, any, any, any, any, any>;

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

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

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

@@ -8,7 +8,6 @@ const message_template_schema_1 = require("../../message/template/message_templa
 const bucket_graph_schema_1 = require("../graph/bucket_graph.schema");
 const bucket_view_field_builder_1 = require("../view/bucket_view_field.builder");
 const message_schema_1 = require("../../message/message.schema");
-const dependency_1 = require("../../../../engine/dependency");
 /**
  * @category Elements
  * @subcategory Entity
@@ -28,7 +27,8 @@ function convertToView(model, name, fields = model.fields, path, depth = 0) {
         }
         return viewFields;
     };
-    return new bucket_view_schema_1.$BucketView(name, convertFields(fields));
+    const v = new bucket_view_schema_1.$BucketView(name, convertFields(fields));
+    return v;
 }
 /**
  * @category Elements
@@ -37,10 +37,7 @@ function convertToView(model, name, fields = model.fields, path, depth = 0) {
 function convertToMessage(module, model, name, alias, include = [], exclude = [], optional = []) {
     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 ? {
-                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
+            enum: field.meta?.enum
         }, field.children ? convertFields(field.children, include, exclude, optional) : undefined);
     };
     const convertFields = (fields, include = [], exclude = [], optional = [], root = '') => {

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

@@ -0,0 +1,13 @@
+import { $Module, $Bucket } from "../../..";
+import { BucketAdapterConfig } from '../adapters/bucket_adapter';
+/**
+ * @category Elements
+ * @subcategory Entity
+ * */
+export declare class BucketModel<M extends $Module, $ extends $Bucket> {
+    private config?;
+    private alias;
+    private schema;
+    constructor(bucket: $Bucket, config?: BucketAdapterConfig | undefined);
+    copy<T extends Record<string, any>>(obj: T): T;
+}

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

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BucketModel = void 0;
+const error_1 = require("../../../../engine/data/error");
+/**
+ * @category Elements
+ * @subcategory Entity
+ * */
+class BucketModel {
+    constructor(bucket, config) {
+        this.config = config;
+        this.alias = bucket.alias;
+        this.schema = bucket.model;
+    }
+    copy(obj) {
+        const meta = this.config?.meta || {
+            created_at: 'created_at',
+            created_by: 'created_by',
+            updated_at: 'updated_at',
+            updated_by: 'updated_by',
+        };
+        const copy = {};
+        let poll = Object.entries(this.schema.fields).map(([path, field]) => ({ path, obj, copy, field }));
+        while (poll.length) {
+            const next = [];
+            for (const entry of poll) {
+                const val = entry.obj[entry.path];
+                if (val === undefined) {
+                    continue;
+                }
+                if (val === null) {
+                    entry.copy[entry.path] = null;
+                    continue;
+                }
+                if (entry.field.type === 'list') {
+                    if (!Array.isArray(val))
+                        continue;
+                    entry.copy[entry.path] = [];
+                    next.push(...val.map((_, i) => ({
+                        path: i.toString(),
+                        obj: val,
+                        copy: entry.copy[entry.path],
+                        field: entry.field.children['#']
+                    })));
+                }
+                else if (entry.field.type === 'dict') {
+                    if (typeof val !== 'object' || Array.isArray(val))
+                        continue;
+                    entry.copy[entry.path] = {};
+                    next.push(...Object.keys(val).map((path) => ({
+                        path,
+                        obj: val,
+                        copy: entry.copy[entry.path],
+                        field: entry.field.children['#']
+                    })));
+                }
+                else if (entry.field.type === 'obj') {
+                    if (typeof val !== 'object' || Array.isArray(val))
+                        continue;
+                    entry.copy[entry.path] = {};
+                    next.push(...Object.keys(entry.field.children).map(path => ({
+                        path: path,
+                        obj: val,
+                        copy: entry.copy[entry.path],
+                        field: entry.field.children[path]
+                    })));
+                }
+                else if (entry.field.type === 'union') {
+                    // TODO: ??????????   
+                    entry.copy[entry.path] = entry.obj[entry.path];
+                }
+                else if (entry.field.type === 'enum') {
+                    const v = entry.obj[entry.path];
+                    const options = entry.field.meta.enum.options;
+                    if (!(v in options)) {
+                        throw error_1.NesoiError.Bucket.Model.InvalidEnum({ bucket: this.alias, value: v, options: Object.keys(options) });
+                    }
+                    entry.copy[entry.path] = entry.obj[entry.path];
+                }
+                else {
+                    entry.copy[entry.path] = entry.obj[entry.path];
+                }
+            }
+            poll = next;
+        }
+        copy[meta.created_at] = obj[meta.created_at];
+        copy[meta.created_by] = obj[meta.created_by];
+        copy[meta.updated_at] = obj[meta.updated_at];
+        copy[meta.updated_by] = obj[meta.updated_by];
+        return copy;
+    }
+}
+exports.BucketModel = BucketModel;