nesoi 3.1.0 → 3.1.2

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

@@ -62,12 +62,13 @@ class $BucketModel {
                     });
                     continue;
                 }
-                // If it's an object, walk it's children
+                // If it's an object and the path is '*', walk all of it's children
                 if (field.type === 'obj' && path === '*') {
                     next.push(...Object.values(field.children).map(field => ({
                         i: item.i + 1,
                         field
                     })));
+                    continue;
                 }
                 const child = field.children[path];
                 if (child) {
@@ -98,22 +99,141 @@ class $BucketModel {
         }
         return fields;
     }
-    static async forEachField(template, predicate) {
-        let poll = Object.values(template.fields).map(field => ({ field }));
+    static forEachField(model, predicate) {
+        let poll = Object.entries(model.fields).map(([path, field]) => ({ path, field }));
         while (poll.length) {
             const next = [];
             for (const obj of poll) {
-                await predicate(obj.field, obj.unionKey);
+                predicate(obj.field, obj.path);
                 if (obj.field.children) {
                     next.push(...Object.values(obj.field.children)
                         .map((field, i) => ({
                         field,
-                        unionKey: obj.field.type === 'union' ? i : undefined
+                        path: obj.path + '.' + (obj.field.type === 'union' ? i : field.name)
+                    })));
+                }
+            }
+            poll = next;
+        }
+    }
+    static copy(model, obj, meta = {
+        created_at: 'created_at',
+        created_by: 'created_by',
+        updated_at: 'updated_at',
+        updated_by: 'updated_by',
+    }) {
+        const copy = {};
+        let poll = Object.entries(model.fields).map(([path, field]) => ({ path, obj, copy, field }));
+        while (poll.length) {
+            const next = [];
+            for (const entry of poll) {
+                const val = obj[entry.path];
+                if (val === undefined) {
+                    continue;
+                }
+                if (val === null) {
+                    copy[entry.path] = null;
+                    continue;
+                }
+                if (entry.field.type === 'list') {
+                    if (!Array.isArray(val))
+                        continue;
+                    copy[entry.path] = [];
+                    next.push(...val.map((_, i) => ({
+                        path: i.toString(),
+                        obj: val,
+                        copy: copy[entry.path],
+                        field: entry.field.children['*']
+                    })));
+                }
+                else if (entry.field.type === 'dict') {
+                    if (typeof val !== 'object' || Array.isArray(val))
+                        continue;
+                    copy[entry.path] = {};
+                    next.push(...Object.keys(val).map((path) => ({
+                        path,
+                        obj: val,
+                        copy: copy[entry.path],
+                        field: entry.field.children['*']
+                    })));
+                }
+                else if (entry.field.type === 'obj') {
+                    if (typeof val !== 'object' || Array.isArray(val))
+                        continue;
+                    copy[entry.path] = {};
+                    next.push(...Object.keys(entry.field.children).map(path => ({
+                        path: path,
+                        obj: val,
+                        copy: copy[entry.path],
+                        field: entry.field.children[path]
                     })));
                 }
+                else if (entry.field.type === 'union') {
+                    // TODO: ??????????   
+                    copy[entry.path] = obj[entry.path];
+                }
+                else {
+                    copy[entry.path] = 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;
+    }
+    static getModelpaths(model) {
+        const modelpaths = {};
+        let poll = Object.entries(model.fields).map(([path, field]) => ({ path, field }));
+        while (poll.length) {
+            const next = [];
+            for (const obj of poll) {
+                if (obj.field.type === 'union') {
+                    modelpaths[obj.path] = [obj.field];
+                }
+                else {
+                    modelpaths[obj.path] = [obj.field];
+                    if (obj.field.children) {
+                        if (obj.field.type === 'dict') {
+                            modelpaths[obj.path + '{*}'] = [obj.field.children['#']];
+                        }
+                        else if (obj.field.type === 'list') {
+                            modelpaths[obj.path + '[*]'] = [obj.field.children['#']];
+                        }
+                        else if (obj.field.type === 'obj') {
+                            modelpaths[obj.path + '{*}'] = Object.values(obj.field.children);
+                        }
+                        for (const key in obj.field.children) {
+                            const child = obj.field.children[key];
+                            if (obj.field.type === 'dict') {
+                                modelpaths[obj.path + '{$${number}}'] = [child];
+                                next.push({
+                                    field: child,
+                                    path: obj.path + '{${string}}'
+                                });
+                            }
+                            else if (obj.field.type === 'list') {
+                                modelpaths[obj.path + '[$${number}]'] = [child];
+                                next.push({
+                                    field: child,
+                                    path: obj.path + '[${number}]'
+                                });
+                            }
+                            else {
+                                next.push({
+                                    field: child,
+                                    path: obj.path + '.' + child.name
+                                });
+                            }
+                        }
+                    }
+                }
             }
             poll = next;
         }
+        return modelpaths;
     }
 }
 exports.$BucketModel = $BucketModel;

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

@@ -1,7 +1,7 @@
 import { $Module, $Space } from "../../../../schema";
 import { $BucketModelField, $BucketModelFieldType, $BucketModelFields } from './bucket_model.schema';
 import { NesoiDate } from "../../../../engine/data/date";
-import { BucketModelpathObjInfer, BucketModelObjInfer, BucketQuerypathDictInfer, BucketQuerypathListInfer, BucketQuerypathObjInfer, BucketModelpathUnionInfer } from './bucket_model.infer';
+import { BucketModelpathObjInfer, BucketModelpathDictInfer, BucketModelpathListInfer, BucketModelObjInfer, BucketQuerypathDictInfer, BucketQuerypathListInfer, BucketQuerypathObjInfer, BucketModelpathUnionInfer } from './bucket_model.infer';
 import { EnumFromName, EnumName } from '../../constants/constants.schema';
 import { NesoiDecimal } from "../../../../engine/data/decimal";
 import { NesoiDatetime } from "../../../../engine/data/datetime";
@@ -49,10 +49,10 @@ export declare class BucketModelFieldFactory<Space extends $Space, Module extend
     }, {
         '': NesoiDecimal;
     }>;
-    enum<Enums extends EnumName<Space>, Options extends (keyof Enums & string) | (readonly string[])>(options: Options): BucketModelFieldBuilder<Module, Options extends string ? EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options], Options extends string ? EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options], [false, false], {
-        '': Options extends string ? EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options];
+    enum<Enums extends EnumName<Space>, Options extends (keyof Enums & string) | (readonly string[])>(options: Options): BucketModelFieldBuilder<Module, Options extends string ? keyof EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options], Options extends string ? keyof EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options], [false, false], {
+        '': Options extends string ? keyof EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options];
     }, {
-        '': Options extends string ? EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options];
+        '': Options extends string ? keyof EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options];
     }>;
     get int(): BucketModelFieldBuilder<Module, number, number, [false, false], {
         '': number;
@@ -83,7 +83,7 @@ export declare class BucketModelFieldFactory<Space extends $Space, Module extend
     obj<T extends BucketModelFieldBuilders<Module>>(fields?: T): BucketModelFieldBuilder<Module, BucketModelObjInfer<T>, BucketModelObjInfer<T>, [false, false], {
         '': BucketModelObjInfer<T>;
     } & {
-        '.*': BucketModelObjInfer<T>;
+        '.*': BucketModelObjInfer<T>[keyof { [K in keyof T as T[K]["#optional"][1] extends true ? never : `${K & string}`]: T[K]["#output"]; } | keyof { [K_1 in keyof T as T[K_1]["#optional"][1] extends true ? `${K_1 & string}` : never]?: T[K_1]["#output"] | undefined; }];
     } & BucketModelpathObjInfer<T>, {
         '': BucketModelObjInfer<T>;
     } & BucketQuerypathObjInfer<T>>;
@@ -94,7 +94,7 @@ export declare class BucketModelFieldFactory<Space extends $Space, Module extend
      */
     dict<T extends BucketModelFieldBuilder<Module, any, any, any, any>>(dictItem: T): BucketModelFieldBuilder<Module, Record<string, T["#input"]>, Record<string, T["#output"]>, [false, false], {
         '': Record<string, T["#output"]>;
-    } & { [J in keyof T["#modelpath"] as `.$${number}${J & string}` | `.${string}${J & string}`]: T["#modelpath"][J]; } & { [J_1 in keyof T["#modelpath"] as `.*${J_1 & string}`]: Record<string, T["#modelpath"][J_1]>; }, {
+    } & BucketModelpathDictInfer<T>, {
         '': Record<string, T["#output"]>;
     } & BucketQuerypathDictInfer<T>>;
     /**
@@ -103,7 +103,7 @@ export declare class BucketModelFieldFactory<Space extends $Space, Module extend
      */
     list<T extends BucketModelFieldBuilder<Module, any, any, any, any>>(listItem: T): BucketModelFieldBuilder<Module, T["#input"][], T["#output"][], [false, false], {
         '': T["#output"][];
-    } & { [J in keyof T["#modelpath"] as `.$${number}${J & string}` | `.${number}${J & string}`]: T["#modelpath"][J]; } & { [J_1 in keyof T["#modelpath"] as `.*${J_1 & string}`]: T["#modelpath"][J_1][]; }, {
+    } & BucketModelpathListInfer<T>, {
         '': T["#output"][];
     } & BucketQuerypathListInfer<T>>;
     union<Builders extends AnyBucketModelFieldBuilder[]>(...children: Builders): BucketModelFieldBuilder<Module, Builders[number]["#input"], Builders[number]["#output"], [false, false], BucketModelpathUnionInfer<Builders>, Builders[number]["#querypath"]>;

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

@@ -51,7 +51,7 @@ export type NQL_Node = NQL_Union | NQL_Intersection | NQL_Rule;
  */
 export type NQL_Operation = '==' | '>' | '<' | '>=' | '<=' | 'in' | 'contains' | 'contains_any' | 'present';
 export type NQL_Order<Querypath> = {
-    by?: keyof Querypath[];
+    by?: (keyof Querypath)[];
     dir?: ('asc' | 'desc')[];
 };
 export type NQL_Pagination = {

package/lib/elements/entities/message/template/message_template_parser.js

@@ -29,18 +29,21 @@ async function MessageTemplateFieldParser(trx, fields, raw) {
  */
 async function parseFieldValue(trx, field, path, raw, value, inject) {
     sanitize(field, path, value);
+    let output;
     if (isEmpty(value)) {
         if (field.required) {
             throw error_1.NesoiError.Message.FieldIsRequired({ alias: field.alias, path: path.join('.'), value });
         }
         else if (field.defaultValue !== undefined) {
-            return field.defaultValue;
+            output = field.defaultValue;
         }
         else {
-            return undefined;
+            output = undefined;
         }
     }
-    let output = await _attemptUnion(trx, field, path, raw, value, inject);
+    else {
+        output = await _attemptUnion(trx, field, path, raw, value, inject);
+    }
     output = await applyFieldRules(field, path, raw, output, inject);
     return output;
 }

package/lib/engine/space.js

@@ -301,7 +301,7 @@ class Space {
                 .filter(node => node.isDirectory());
             for (const dir of dirs) {
                 const modulePath = path.join(dirpath, dir.name);
-                if (fs.existsSync(path.join(modulePath, '.modules'))) {
+                if (fs.existsSync(path.join(modulePath, '.subset'))) {
                     perform(modulePath, [...subdir, dir.name]);
                 }
                 else {

package/lib/engine/transaction/nodes/bucket.trx_node.d.ts

@@ -127,6 +127,21 @@ export declare class BucketTrxNode<M extends $Module, $ extends $Bucket> {
      * **WARNING** Tenancy currently not implemented for put.
      */
     put(obj: PutObj<$>): Promise<$['#data']>;
+    /**
+     * Create, replace or delete all the objects passed as an argument.
+     * Does the same for compositions of this bucket, from the
+     * `#composition` field passed in the message.
+     *
+     * - If `#composition` is wrong, this will throw an exception.
+     * - This will **REPLACE** objects and it's compositions if they already exist,
+     *  so there might be unexpected data loss, use it carefully.
+     * - It will only delete an object from the bucket if it contains `id` and `__delete: true`.
+     *
+     * **WARNING** Tenancy currently not implemented for put.
+     */
+    sync(objs: (PutObj<$> & {
+        __delete: boolean;
+    })[]): Promise<$['#data']>;
     /**
      * Attempts to read an object by `id`, if found, deletes it.
      *

package/lib/engine/transaction/nodes/bucket.trx_node.js

@@ -236,6 +236,30 @@ class BucketTrxNode {
     async put(obj) {
         return this.wrap('put', { obj }, trx => this.bucket.put(trx, obj), () => undefined);
     }
+    /**
+     * Create, replace or delete all the objects passed as an argument.
+     * Does the same for compositions of this bucket, from the
+     * `#composition` field passed in the message.
+     *
+     * - If `#composition` is wrong, this will throw an exception.
+     * - This will **REPLACE** objects and it's compositions if they already exist,
+     *  so there might be unexpected data loss, use it carefully.
+     * - It will only delete an object from the bucket if it contains `id` and `__delete: true`.
+     *
+     * **WARNING** Tenancy currently not implemented for put.
+     */
+    async sync(objs) {
+        return this.wrap('put', { objs }, async (trx) => {
+            for (const obj of objs) {
+                if (obj.id && obj.__delete) {
+                    await this.bucket.delete(trx, obj.id);
+                }
+                else {
+                    await this.bucket.put(trx, obj);
+                }
+            }
+        }, () => undefined);
+    }
     /*
         Delete
     */

package/lib/engine/transaction/trx_engine.config.d.ts

@@ -1,13 +1,14 @@
 import { $Module, $Space } from "../../elements";
 import { BucketAdapter } from "../../elements/entities/bucket/adapters/bucket_adapter";
-import { AnyTrx, Trx } from './trx';
+import { Trx } from './trx';
 import { AnyUsers } from '../auth/authn';
 import { TrxNode, TrxNodeStatus } from './trx_node';
+import { TrxData } from './trx_engine';
 export type TrxEngineWrapFn<S extends $Space, M extends $Module> = (trx: TrxNode<S, M, any>) => Promise<TrxNodeStatus>;
 export type TrxEngineConfig<S extends $Space, M extends $Module, Authn extends AnyUsers, Services extends Record<string, any>> = {
     /**
      * Adapter used to store transactions of this module.
      */
-    adapter?: (schema: M) => BucketAdapter<AnyTrx>;
+    adapter?: (schema: M) => BucketAdapter<TrxData>;
     wrap?: <T extends Trx<S, M, Authn>>(trx: T, fn: TrxEngineWrapFn<S, M>, services: Services) => Promise<any>;
 };

package/lib/engine/transaction/trx_engine.d.ts

@@ -1,11 +1,18 @@
 import { $Module, $Space } from "../../schema";
 import { Module } from '../module';
-import { Trx } from './trx';
+import { AnyTrx, Trx } from './trx';
 import { TrxNode, TrxNodeStatus } from './trx_node';
 import { AnyAuthnProviders, AuthnRequest } from '../auth/authn';
 import { TrxEngineConfig } from './trx_engine.config';
 import { IService } from '../apps/service';
 export type TrxEngineOrigin = `app:${string}` | `plugin:${string}`;
+export type TrxData = {
+    id: AnyTrx['id'];
+    origin: AnyTrx['origin'];
+    module: string;
+    start: AnyTrx['start'];
+    end: AnyTrx['end'];
+};
 /**
  * @category Engine
  * @subcategory Transaction
@@ -16,6 +23,7 @@ export declare class TrxEngine<S extends $Space, M extends $Module, Authn extend
     private authnProviders?;
     private config?;
     private services;
+    private $TrxBucket;
     /**
      * Transaction used to read/write transactions on the adapter
      */

package/lib/engine/transaction/trx_engine.js

@@ -6,6 +6,9 @@ const trx_1 = require("./trx");
 const trx_node_1 = require("./trx_node");
 const error_1 = require("../data/error");
 const memory_bucket_adapter_1 = require("../../elements/entities/bucket/adapters/memory.bucket_adapter");
+const elements_1 = require("../../elements");
+const bucket_model_schema_1 = require("../../elements/entities/bucket/model/bucket_model.schema");
+const bucket_graph_schema_1 = require("../../elements/entities/bucket/graph/bucket_graph.schema");
 /**
  * @category Engine
  * @subcategory Transaction
@@ -17,28 +20,56 @@ class TrxEngine {
         this.authnProviders = authnProviders;
         this.config = config;
         this.services = services;
+        this.$TrxBucket = new elements_1.$Bucket(this.module.name, '__trx__', `Transaction of Module '${this.module.name}'`, new bucket_model_schema_1.$BucketModel({
+            id: new bucket_model_schema_1.$BucketModelField('id', 'id', 'string', 'ID', true),
+            origin: new bucket_model_schema_1.$BucketModelField('origin', 'origin', 'string', 'Origin', true),
+            module: new bucket_model_schema_1.$BucketModelField('module', 'module', 'string', 'Module', true),
+            start: new bucket_model_schema_1.$BucketModelField('start', 'start', 'datetime', 'Start', true),
+            end: new bucket_model_schema_1.$BucketModelField('end', 'end', 'datetime', 'Start', false),
+        }), new bucket_graph_schema_1.$BucketGraph(), {});
         this.innerTrx = new trx_1.Trx(this, this.module, `trx:${origin}`);
-        this.adapter = config?.adapter?.(module.schema) || new memory_bucket_adapter_1.MemoryBucketAdapter({}, {});
+        this.adapter = config?.adapter?.(module.schema) || new memory_bucket_adapter_1.MemoryBucketAdapter(this.$TrxBucket, {});
     }
     getModule() {
         return this.module;
     }
     async get(id) {
-        let trx = undefined;
+        let trx;
         if (!id) {
             trx = new trx_1.Trx(this, this.module, this.origin);
             log_1.Log.info('module', this.module.name, `Begin ${(0, log_1.scopeTag)('trx', trx.id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
-            return this.adapter.create(this.innerTrx.root, trx);
+            await this.adapter.create(this.innerTrx.root, {
+                id: trx.id,
+                origin: trx.origin,
+                start: trx.start,
+                end: trx.end,
+                module: this.module.name
+            });
+            return trx;
         }
         else {
-            trx = await this.adapter.get(this.innerTrx.root, id);
-            if (trx) {
-                log_1.Log.info('module', this.module.name, `Continue ${(0, log_1.scopeTag)('trx', trx.id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
+            const trxData = await this.adapter.get(this.innerTrx.root, id);
+            if (trxData) {
+                log_1.Log.info('module', this.module.name, `Continue ${(0, log_1.scopeTag)('trx', trxData.id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
+                // Objects read from adapters are not the proper JS class, so they don't
+                // carry methods. This must be used to recover the methods.
+                trx = Object.assign(new trx_1.Trx(this, this.module, this.origin), {
+                    id: trxData.id,
+                    origin: trxData.origin,
+                    start: trxData.start,
+                    end: trxData.end
+                });
             }
             else {
                 log_1.Log.info('module', this.module.name, `Chain ${(0, log_1.scopeTag)('trx', id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
                 trx = new trx_1.Trx(this, this.module, this.origin, undefined, id);
-                return this.adapter.create(this.innerTrx.root, trx);
+                await this.adapter.create(this.innerTrx.root, {
+                    id: trx.id,
+                    origin: this.origin,
+                    start: trx.start,
+                    end: trx.end,
+                    module: this.module.name
+                });
             }
         }
         return trx;
@@ -87,7 +118,13 @@ class TrxEngine {
         log_1.Log.info('module', this.module.name, `Commit ${(0, log_1.scopeTag)('trx', trx.id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
         await trx_node_1.TrxNode.ok(trx.root, output);
         trx_1.Trx.onFinish(trx);
-        await this.adapter.put(this.innerTrx.root, trx);
+        await this.adapter.put(this.innerTrx.root, {
+            id: trx.id,
+            origin: this.origin,
+            start: trx.start,
+            end: trx.end,
+            module: this.module.name
+        });
         return trx;
     }
     async rollback(trx, error) {
@@ -95,7 +132,13 @@ class TrxEngine {
         log_1.Log.warn('module', this.module.name, `Rollback ${(0, log_1.scopeTag)('trx', trx.id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
         await trx_node_1.TrxNode.error(trx.root, error);
         trx_1.Trx.onFinish(trx);
-        await this.adapter.put(this.innerTrx.root, trx);
+        await this.adapter.put(this.innerTrx.root, {
+            id: trx.id,
+            origin: this.origin,
+            start: trx.start,
+            end: trx.end,
+            module: this.module.name
+        });
         return trx;
     }
 }

package/lib/engine/util/deep.js

@@ -10,6 +10,8 @@ class Deep {
             for (const [obj, copy] of poll) {
                 if (Array.isArray(obj)) {
                     for (const item of obj) {
+                        if (typeof item === 'function')
+                            continue;
                         if (item === null) {
                             copy.push(null);
                         }
@@ -26,6 +28,8 @@ class Deep {
                 else {
                     for (const key in obj) {
                         const item = obj[key];
+                        if (typeof item === 'function')
+                            continue;
                         if (item === null) {
                             copy[key] = null;
                         }

package/lib/engine/util/parse.js

@@ -66,12 +66,12 @@ function parseEnum(raw, field, path, value, options, trx) {
             const enumPath = enumName.match(/(.*)\.\{(.*)\}$/);
             let _enum;
             if (enumPath) {
-                enumName += enumPath[1] + '.' + enumPath[2];
+                const v = tree_1.Tree.get(raw, enumPath[2]);
+                enumName = enumPath[1] + '.' + v;
                 try {
                     _enum = trx.enum(enumName);
                 }
                 catch {
-                    const v = tree_1.Tree.get(raw, enumPath[2]);
                     throw error_1.NesoiError.Message.InvalidEnumScope({ alias: field.alias, path: path.join('.'), value: v, fieldpath: enumPath[2] });
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nesoi",
-    "version": "3.1.0",
+    "version": "3.1.2",
     "description": "Declarative framework for data-driven applications",
     "repository": {
         "type": "git",