nesoi 3.3.24 → 3.3.26

package/lib/elements/edge/controller/adapters/controller_adapter.js

@@ -22,9 +22,8 @@ class ControllerAdapter {
             const trx = this.daemon.trx(this.schema.module)
                 .origin('controller:' + this.schema.name + ':' + endpoint.name)
                 .auth(auth);
-            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
             if (endpoint.idempotent)
-                trx.idempotent;
+                trx.idempotent();
             return await trx.run(fn);
         }
         catch (e) {

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

@@ -66,7 +66,7 @@ class JSONBucketAdapter extends memory_bucket_adapter_1.MemoryBucketAdapter {
         const file = fs.readFileSync(this.file);
         const fileData = JSON.parse(file.toString());
         for (const id in fileData[this.refName]) {
-            this.data[id] = this.model.copy(fileData[this.refName][id], 'parse');
+            this.data[id] = this.model.copy(fileData[this.refName][id], 'load', () => true);
         }
     }
     dump() {
@@ -79,7 +79,7 @@ class JSONBucketAdapter extends memory_bucket_adapter_1.MemoryBucketAdapter {
         }
         data[this.refName] ??= {};
         for (const id in this.data) {
-            data[this.refName][id] = this.model.copy(this.data[id], 'dump');
+            data[this.refName][id] = this.model.copy(this.data[id], 'save', () => true);
         }
         fs.writeFileSync(this.file, JSON.stringify(data));
     }

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

@@ -41,18 +41,18 @@ class MemoryBucketAdapter extends bucket_adapter_1.BucketAdapter {
     }
     /* Read operations */
     index(trx) {
-        const objs = Object.values(this.data).map(obj => this.model.copy(obj));
+        const objs = Object.values(this.data).map(obj => this.model.copy(obj, 'load'));
         return Promise.resolve(objs);
     }
     get(trx, id) {
         if (!(id in this.data))
             return Promise.resolve(undefined);
-        const output = this.model.copy(this.data[id]);
+        const output = this.model.copy(this.data[id], 'load');
         return Promise.resolve(output);
     }
     /* Write Operations */
     async create(trx, obj) {
-        const input = this.model.copy(obj);
+        const input = this.model.copy(obj, 'save');
         if (!input.id) {
             const lastId = Object.values(this.data)
                 .map((_obj) => parseInt(_obj.id))
@@ -60,7 +60,7 @@ class MemoryBucketAdapter extends bucket_adapter_1.BucketAdapter {
             input.id = lastId + 1;
         }
         this.data[input.id] = input;
-        const output = this.model.copy(input);
+        const output = this.model.copy(input, 'load');
         return Promise.resolve(output);
     }
     async createMany(trx, objs) {
@@ -74,9 +74,9 @@ class MemoryBucketAdapter extends bucket_adapter_1.BucketAdapter {
         if (!obj.id || !this.data[obj.id]) {
             throw new Error(`Object with id ${obj.id} not found for replace`);
         }
-        const input = this.model.copy(obj);
+        const input = this.model.copy(obj, 'save');
         this.data[input.id] = input;
-        const output = this.model.copy(input);
+        const output = this.model.copy(input, 'load');
         return Promise.resolve(output);
     }
     async replaceMany(trx, objs) {
@@ -92,7 +92,7 @@ class MemoryBucketAdapter extends bucket_adapter_1.BucketAdapter {
             throw new Error(`Object with id ${obj.id} not found for patch`);
         }
         const data = this.data[obj.id];
-        const input = this.model.copy(obj);
+        const input = this.model.copy(obj, 'save');
         for (const key in input) {
             if (input[key] === null) {
                 delete data[key];
@@ -101,7 +101,7 @@ class MemoryBucketAdapter extends bucket_adapter_1.BucketAdapter {
                 data[key] = input[key];
             }
         }
-        const output = this.model.copy(data);
+        const output = this.model.copy(data, 'load');
         return Promise.resolve(output);
     }
     async patchMany(trx, objs) {
@@ -113,7 +113,7 @@ class MemoryBucketAdapter extends bucket_adapter_1.BucketAdapter {
         return Promise.resolve(out);
     }
     async put(trx, obj) {
-        const input = this.model.copy(obj);
+        const input = this.model.copy(obj, 'save');
         if (!input.id) {
             const lastId = Object.values(this.data)
                 .map((_obj) => parseInt(_obj.id))
@@ -121,7 +121,7 @@ class MemoryBucketAdapter extends bucket_adapter_1.BucketAdapter {
             input.id = lastId + 1;
         }
         this.data[input.id] = input;
-        const output = this.model.copy(input);
+        const output = this.model.copy(input, 'load');
         return Promise.resolve(output);
     }
     async putMany(trx, objs) {
@@ -131,12 +131,12 @@ class MemoryBucketAdapter extends bucket_adapter_1.BucketAdapter {
         let id = lastId + 1;
         const out = [];
         for (const obj of objs) {
-            const input = this.model.copy(obj);
+            const input = this.model.copy(obj, 'save');
             if (!input.id) {
                 input.id = id;
             }
             this.data[input.id] = input;
-            const output = this.model.copy(input);
+            const output = this.model.copy(input, 'load');
             out.push(output);
             id++;
         }

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

@@ -1,5 +1,13 @@
 import { $Module, $Bucket } from "../../..";
+import { $BucketModelField } from './bucket_model.schema';
 import { BucketAdapterConfig } from '../adapters/bucket_adapter';
+type BucketModelCopyCmd = {
+    field: $BucketModelField;
+    obj: Record<string, any>;
+    copy: Record<string, any>;
+    path: string;
+    depth: number;
+};
 /**
  * @category Elements
  * @subcategory Entity
@@ -9,5 +17,6 @@ export declare class BucketModel<M extends $Module, $ extends $Bucket> {
     private alias;
     private schema;
     constructor(bucket: $Bucket, config?: BucketAdapterConfig | undefined);
-    copy<T extends Record<string, any>>(obj: T, serial?: 'parse' | 'dump'): T;
+    copy<T extends Record<string, any>>(obj: T, op: 'save' | 'load', serialize?: (cmd?: BucketModelCopyCmd) => boolean): T;
 }
+export {};

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

@@ -4,6 +4,8 @@ exports.BucketModel = void 0;
 const error_1 = require("../../../../engine/data/error");
 const date_1 = require("../../../../engine/data/date");
 const datetime_1 = require("../../../../engine/data/datetime");
+const decimal_1 = require("../../../../engine/data/decimal");
+const duration_1 = require("../../../../engine/data/duration");
 /**
  * @category Elements
  * @subcategory Entity
@@ -17,7 +19,7 @@ class BucketModel {
         this.alias = bucket.alias;
         this.schema = bucket.model;
     }
-    copy(obj, serial) {
+    copy(obj, op, serialize) {
         const meta = this.config?.meta || {
             created_at: 'created_at',
             created_by: 'created_by',
@@ -25,7 +27,9 @@ class BucketModel {
             updated_by: 'updated_by',
         };
         const copy = {};
-        let poll = Object.entries(this.schema.fields).map(([path, field]) => ({ path, obj, copy, field }));
+        let poll = Object.entries(this.schema.fields).map(([path, field]) => ({
+            path, obj, copy, field, depth: 0
+        }));
         while (poll.length) {
             const next = [];
             for (const entry of poll) {
@@ -45,7 +49,8 @@ class BucketModel {
                         path: i.toString(),
                         obj: val,
                         copy: entry.copy[entry.path],
-                        field: entry.field.children['#']
+                        field: entry.field.children['#'],
+                        depth: entry.depth + 1
                     })));
                 }
                 else if (entry.field.type === 'dict') {
@@ -56,7 +61,8 @@ class BucketModel {
                         path,
                         obj: val,
                         copy: entry.copy[entry.path],
-                        field: entry.field.children['#']
+                        field: entry.field.children['#'],
+                        depth: entry.depth + 1
                     })));
                 }
                 else if (entry.field.type === 'obj') {
@@ -67,7 +73,8 @@ class BucketModel {
                         path: path,
                         obj: val,
                         copy: entry.copy[entry.path],
-                        field: entry.field.children[path]
+                        field: entry.field.children[path],
+                        depth: entry.depth + 1
                     })));
                 }
                 else if (entry.field.type === 'union') {
@@ -82,10 +89,10 @@ class BucketModel {
                     }
                     entry.copy[entry.path] = entry.obj[entry.path];
                 }
-                else if (serial) {
+                else if (entry.field.type === 'date') {
                     const v = entry.obj[entry.path];
-                    if (entry.field.type === 'date') {
-                        if (serial === 'parse') {
+                    if (serialize?.(entry)) {
+                        if (op === 'load') {
                             try {
                                 entry.copy[entry.path] = date_1.NesoiDate.fromISO(v);
                             }
@@ -93,7 +100,7 @@ class BucketModel {
                                 throw error_1.NesoiError.Bucket.Model.InvalidISODate({ bucket: this.alias, value: v });
                             }
                         }
-                        else if (serial === 'dump') {
+                        else if (op === 'save') {
                             try {
                                 entry.copy[entry.path] = v.toISO();
                             }
@@ -102,8 +109,14 @@ class BucketModel {
                             }
                         }
                     }
-                    else if (entry.field.type === 'datetime') {
-                        if (serial === 'parse') {
+                    else {
+                        entry.copy[entry.path] = entry.obj[entry.path];
+                    }
+                }
+                else if (entry.field.type === 'datetime') {
+                    const v = entry.obj[entry.path];
+                    if (serialize?.(entry)) {
+                        if (op === 'load') {
                             try {
                                 entry.copy[entry.path] = datetime_1.NesoiDatetime.fromISO(v);
                             }
@@ -111,7 +124,7 @@ class BucketModel {
                                 throw error_1.NesoiError.Bucket.Model.InvalidISODatetime({ bucket: this.alias, value: v });
                             }
                         }
-                        else if (serial === 'dump') {
+                        else if (op === 'save') {
                             try {
                                 entry.copy[entry.path] = v.toISO();
                             }
@@ -120,6 +133,31 @@ class BucketModel {
                             }
                         }
                     }
+                    else {
+                        entry.copy[entry.path] = entry.obj[entry.path];
+                    }
+                }
+                else if (entry.field.type === 'decimal') {
+                    const meta = entry.field.meta.decimal;
+                    const v = entry.obj[entry.path];
+                    if (serialize?.(entry)) {
+                        if (op === 'load')
+                            entry.copy[entry.path] = new decimal_1.NesoiDecimal(v, meta?.left, meta?.right);
+                        if (op === 'save')
+                            entry.copy[entry.path] = v.toString();
+                    }
+                    else {
+                        entry.copy[entry.path] = v;
+                    }
+                }
+                else if (entry.field.type === 'duration') {
+                    const v = entry.obj[entry.path];
+                    if (serialize?.(entry)) {
+                        if (op === 'load')
+                            entry.copy[entry.path] = duration_1.NesoiDuration.fromString(v);
+                        if (op === 'save')
+                            entry.copy[entry.path] = v.toString();
+                    }
                     else {
                         entry.copy[entry.path] = v;
                     }
@@ -132,13 +170,15 @@ class BucketModel {
         }
         copy[meta.created_by] = obj[meta.created_by];
         copy[meta.updated_by] = obj[meta.updated_by];
-        if (serial === 'parse') {
-            copy[meta.created_at] = obj[meta.created_at] ? datetime_1.NesoiDatetime.fromISO(obj[meta.created_at]) : undefined;
-            copy[meta.updated_at] = obj[meta.updated_at] ? datetime_1.NesoiDatetime.fromISO(obj[meta.updated_at]) : undefined;
-        }
-        else if (serial === 'dump') {
-            copy[meta.created_at] = obj[meta.created_at]?.toISO?.();
-            copy[meta.updated_at] = obj[meta.updated_at]?.toISO?.();
+        if (serialize?.()) {
+            if (op === 'load') {
+                copy[meta.created_at] = obj[meta.created_at] ? datetime_1.NesoiDatetime.fromISO(obj[meta.created_at]) : undefined;
+                copy[meta.updated_at] = obj[meta.updated_at] ? datetime_1.NesoiDatetime.fromISO(obj[meta.updated_at]) : undefined;
+            }
+            else if (op === 'save') {
+                copy[meta.created_at] = obj[meta.created_at]?.toISO?.();
+                copy[meta.updated_at] = obj[meta.updated_at]?.toISO?.();
+            }
         }
         else {
             copy[meta.created_at] = obj[meta.created_at];

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

@@ -10,8 +10,12 @@ export declare class BucketView<$ extends $BucketView> {
     private bucket;
     schema: $;
     constructor(bucket: Bucket<any, any>, schema: $);
-    parse<Obj extends NesoiObj>(trx: AnyTrxNode, raw: Obj): Promise<$['#data']>;
-    parseMany<Obj extends NesoiObj>(trx: AnyTrxNode, raws: Obj[]): Promise<$['#data']>;
+    parse<Obj extends NesoiObj>(trx: AnyTrxNode, raw: Obj, flags?: {
+        nesoi_serial: boolean;
+    }): Promise<$['#data']>;
+    parseMany<Obj extends NesoiObj>(trx: AnyTrxNode, raws: Obj[], flags?: {
+        nesoi_serial: boolean;
+    }): Promise<$['#data']>;
     private parseLayer;
     /**
      * [model]

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

@@ -25,7 +25,7 @@ class BucketView {
         this.bucket = bucket;
         this.schema = schema;
     }
-    async parse(trx, raw) {
+    async parse(trx, raw, flags) {
         const module = trx_node_1.TrxNode.getModule(trx);
         const tag = new dependency_1.Tag(this.bucket.module.name, 'bucket', this.bucket.schema.name);
         const meta = await daemon_1.Daemon.getBucketMetadata(module.daemon, tag);
@@ -44,7 +44,7 @@ class BucketView {
                 }]
         }));
         while (layer.length) {
-            layer = await this.parseLayer(trx, layer);
+            layer = await this.parseLayer(trx, layer, flags);
         }
         parsed['$v'] = this.schema.name;
         return {
@@ -52,7 +52,7 @@ class BucketView {
             ...parsed
         };
     }
-    async parseMany(trx, raws) {
+    async parseMany(trx, raws, flags) {
         const module = trx_node_1.TrxNode.getModule(trx);
         const tag = new dependency_1.Tag(this.bucket.module.name, 'bucket', this.bucket.schema.name);
         const meta = await daemon_1.Daemon.getBucketMetadata(module.daemon, tag);
@@ -75,7 +75,7 @@ class BucketView {
             }))
         }));
         while (layer.length) {
-            layer = await this.parseLayer(trx, layer);
+            layer = await this.parseLayer(trx, layer, flags);
         }
         for (let i = 0; i < raws.length; i++) {
             parseds[i].id = raws[i].id;
@@ -83,13 +83,13 @@ class BucketView {
         }
         return parseds;
     }
-    async parseLayer(trx, layer) {
+    async parseLayer(trx, layer, flags) {
         const next = [];
         // Model props
         for (const node of layer) {
             if (node.field.scope !== 'model')
                 continue;
-            next.push(...this.parseModelProp(node));
+            next.push(...this.parseModelProp(node, flags));
         }
         // Computed props
         for (const node of layer) {
@@ -147,10 +147,10 @@ class BucketView {
      * [model]
      * Read one property from
      */
-    parseModelProp(node) {
+    parseModelProp(node, flags) {
         const initAs = (!node.field.children) ? 'value' : 'obj';
         const rawChild = '__raw' in (node.field.children || {});
-        const nextData = this.doParseModelProp(node, initAs, rawChild);
+        const nextData = this.doParseModelProp(node, initAs, rawChild, flags);
         if (!node.field.children)
             return [];
         const next = [];
@@ -166,7 +166,7 @@ class BucketView {
         }
         return next;
     }
-    doParseModelProp(node, initAs, rawChild) {
+    doParseModelProp(node, initAs, rawChild, flags) {
         const modelpath = node.field.meta.model.path;
         const isValueModel = modelpath === '.';
         const name = node.field.name;

package/lib/engine/cli/cli.js

@@ -73,7 +73,7 @@ class CLI {
     }
     async run(cmd) {
         if (cmd) {
-            this.runCmd(cmd);
+            await this.runCmd(cmd);
             return;
         }
         console_1.default.header('CLI');

package/lib/engine/cli/script.d.ts

@@ -84,8 +84,8 @@ declare class ScriptValueBuilder<T = string> {
     constructor(name: string);
     d(description: string): this;
     get optional(): ScriptValueBuilder<T | undefined>;
-    get zero_or_more(): this;
-    get one_or_more(): this;
+    get zero_or_more(): ScriptValueBuilder<T[]>;
+    get one_or_more(): ScriptValueBuilder<T[]>;
     get boolean(): ScriptValueBuilder<boolean>;
     enum<E extends string>(options: E[] | Record<E, string>): ScriptValueBuilder<undefined extends T ? E | undefined : E>;
     private build;

package/lib/engine/daemon.d.ts

@@ -141,11 +141,7 @@ export declare class DaemonTrx<S extends $Space, M extends $Module, AuthUsers ex
      * This means its not stored, neither commited/rolled back.
      * This should generally be used for readonly transactions.
      */
-    get idempotent(): this;
-    /**
-     * Inherit authentication from another transaction node.
-     */
-    idempotent_inherit(trx: AnyTrxNode): this;
+    idempotent(value?: boolean): this;
     /**
      * Inherit authentication from another transaction node.
      */

package/lib/engine/daemon.js

@@ -199,15 +199,8 @@ class DaemonTrx {
      * This means its not stored, neither commited/rolled back.
      * This should generally be used for readonly transactions.
      */
-    get idempotent() {
-        this._idempotent = true;
-        return this;
-    }
-    /**
-     * Inherit authentication from another transaction node.
-     */
-    idempotent_inherit(trx) {
-        this._idempotent = trx.trx.idempotent;
+    idempotent(value = true) {
+        this._idempotent = value;
         return this;
     }
     /**

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

@@ -32,16 +32,16 @@ class ExternalTrxNode {
         let out;
         try {
             const dtrx = await this.daemon.trx(this.tag.module)
-                .origin('ext:' + root.id);
-            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            if (this.idempotent)
-                dtrx.idempotent;
-            else
-                dtrx.idempotent_inherit(trx);
-            const res = await dtrx
+                .origin('ext:' + root.id)
+                // This can be overriden by the TrxEngine if the root
+                // it not idempotent (which makes it not idempotent)
+                .idempotent(this.idempotent);
+            let idempotent = false;
+            const hold = await dtrx
                 .auth_inherit(trx)
                 .run_and_hold(async (extTrx) => {
                 try {
+                    idempotent = extTrx.trx.idempotent;
                     return await fn(extTrx, element(extTrx));
                 }
                 catch (e) {
@@ -51,12 +51,14 @@ class ExternalTrxNode {
                     trx_node_1.TrxNode.merge(trx, extTrx);
                 }
             }, root.id);
-            if (res.status.state === 'error') {
-                throw res.status.error;
+            if (hold.status.state === 'error') {
+                throw hold.status.error;
             }
-            out = res.status.output;
-            if (!trx.trx.idempotent) {
-                root.holdNode(res);
+            out = hold.status.output;
+            if (!idempotent) {
+                if (!(root.id in root.holds)) {
+                    root.holds[root.id] = hold;
+                }
             }
         }
         catch (e) {
@@ -75,12 +77,10 @@ class ExternalTrxNode {
         let out;
         try {
             const dtrx = await this.daemon.trx(this.tag.module)
-                .origin('ext:' + root.id);
-            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            if (this.idempotent)
-                dtrx.idempotent;
-            else
-                dtrx.idempotent_inherit(trx);
+                .origin('ext:' + root.id)
+                // This can be overriden by the TrxEngine if the root
+                // it not idempotent (which makes it not idempotent)
+                .idempotent(this.idempotent);
             const res = await dtrx
                 .auth_inherit(trx)
                 .run(async (extTrx) => {

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

@@ -45,7 +45,6 @@ export declare class Trx<S extends $Space, M extends $Module, AuthUsers extends
         users: AuthUsers;
     }, id?: string, root?: TrxNode<S, M, AuthUsers>, nodes?: Record<string, TrxNode<S, M, AuthUsers>>);
     addNode(node: TrxNode<S, M, AuthUsers>): void;
-    holdNode(node: TrxNodeHold<any>): void;
     status(): TrxStatus<any>;
     /**
      * Cache

package/lib/engine/transaction/trx.js

@@ -90,10 +90,6 @@ class Trx {
         const nodeId = node.id;
         this.nodes[nodeId] = node;
     }
-    holdNode(node) {
-        const nodeId = node.id;
-        this.holds[nodeId] = node;
-    }
     status() {
         const state = this.root.state;
         const output = this.root.output;