nesoi 3.3.19 → 3.3.21

package/lib/engine/data/tree.js

@@ -4,7 +4,6 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tree = void 0;
-const error_1 = require("./error");
 /**
  * @category Engine
  * @subcategory Data
@@ -20,112 +19,25 @@ class Tree {
      *
      * @deprecated Fieldpath was consolidated into Modelpath and Querypath.
      */
-    static get(obj, fieldpath, index = '*') {
-        index = (!Array.isArray(index)) ? index : [...index];
+    static get(obj, fieldpath) {
+        if (!fieldpath.includes('.'))
+            return obj[fieldpath];
         const paths = fieldpath.split('.');
-        const pathIndexCount = paths.filter(p => p === '#').length;
-        if (Array.isArray(index) && pathIndexCount > index.length) {
-            throw error_1.NesoiError.Bucket.Fieldpath.InvalidIndexLength({ fieldpath, index });
-        }
         let ref = obj;
         for (let i = 0; i < paths.length; i++) {
             const path = paths[i];
-            if (path === '#') {
-                // 0 index, read the first item from the list
-                if (index === 0) {
-                    // This is a TypeAsObj, stay on the node
-                    if (typeof ref === 'object' && '__array' in ref) {
-                        // 
-                    }
-                    else {
-                        if (typeof ref !== 'object') {
-                            return undefined;
-                        }
-                        if (Array.isArray(ref)) {
-                            ref = ref[0];
-                        }
-                        else {
-                            ref = ref[Object.keys(ref)[0]];
-                        }
-                    }
-                }
-                // Null index, return a list of all items
-                else if (index === '*') {
-                    if (typeof ref !== 'object') {
-                        return undefined;
-                    }
-                    if (!Array.isArray(ref)) {
-                        ref = Object.values(ref);
-                    }
-                    const childPath = paths.slice(i + 1);
-                    if (childPath.length === 0) {
-                        return ref;
-                    }
-                    const out = [];
-                    ref.forEach((v) => {
-                        const deep = this.get(v, childPath.join('.'), '*');
-                        if (deep !== undefined)
-                            out.push(deep);
-                    });
-                    return out.flat(1);
-                }
-                // List of indices, advance on it
-                else {
-                    const idx = index.shift();
-                    if (idx === undefined) {
-                        return undefined;
-                    }
-                    ref = ref[idx];
-                }
-            }
-            else {
-                ref = ref?.[path];
-            }
+            ref = ref?.[path];
             if (ref === undefined) {
-                return ref;
+                return undefined;
             }
         }
         // When reading from a TypeAsObj,
         // advance on unions
         if (!ref && '__or' in obj) {
-            return this.get(obj.__or, fieldpath, index);
+            return this.get(obj.__or, fieldpath);
         }
         return ref;
     }
-    static getModelpath(obj, modelpath, index) {
-        const paths = modelpath.split('.');
-        let poll = [obj];
-        while (poll.length) {
-            const next = [];
-            for (const item of poll) {
-                const path = paths[item.i];
-                // '*'
-                if (path === '*') {
-                    if (typeof item !== 'object') {
-                        throw new Error(`Can't read *, item is not object (${item})`);
-                    }
-                    next.push(...Object.values(item));
-                }
-                else {
-                    const idx_str = path.match(/^\$(\d+)/)?.[1];
-                    let _path = path;
-                    // $0, $1..
-                    if (idx_str !== undefined) {
-                        const idx = parseInt(idx_str);
-                        if (idx >= index.length) {
-                            throw new Error(`Can't read $${idx}, too few indexes (${index.length})`);
-                        }
-                        _path = index[idx];
-                    }
-                    const n = typeof item === 'object' ? item[_path] : undefined;
-                    if (n)
-                        next.push(n);
-                }
-            }
-            poll = next;
-        }
-        return poll;
-    }
     static set(obj, fieldpath, replacer, __index = []) {
         const paths = fieldpath.split('.');
         class Ptr {

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

@@ -20,7 +20,7 @@ export declare class BucketTrxNode<M extends $Module, $ extends $Bucket> {
     private bucket?;
     constructor(trx: TrxNode<any, M, any>, tag: Tag);
     get no_tenancy(): this;
-    wrap(action: string, input: Record<string, any>, fn: (trx: AnyTrxNode, element: Bucket<M, $>) => Promise<any>, fmtTrxOut?: (out: any) => any): Promise<any>;
+    wrap(action: string, input: Record<string, any>, fn: (trx: AnyTrxNode, element: Bucket<M, $>) => Promise<any>, fmtTrxOut?: (out: any) => any, idempotent?: boolean): Promise<any>;
     /**
      * Returns one object by `id`, without pre-formatting,
      * or `undefined` if the object was not found.

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

@@ -39,7 +39,7 @@ class BucketTrxNode {
     /*
         Wrap
     */
-    async wrap(action, input, fn, fmtTrxOut) {
+    async wrap(action, input, fn, fmtTrxOut, idempotent = false) {
         const wrapped = async (parentTrx, bucket) => {
             const trx = trx_node_1.TrxNode.makeChildNode(parentTrx, bucket.schema.module, 'bucket', bucket.schema.name);
             trx_node_1.TrxNode.open(trx, action, input);
@@ -54,8 +54,8 @@ class BucketTrxNode {
             return out;
         };
         if (this.external) {
-            const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag);
-            return ext.run(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
+            const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag, idempotent);
+            return ext.run_and_hold(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
         }
         else {
             return wrapped(this.trx, this.bucket);
@@ -72,7 +72,7 @@ class BucketTrxNode {
         return this.wrap('readOne', { id }, (trx, bucket) => bucket.readOne(trx, id, {
             silent: true,
             no_tenancy: !this.enableTenancy
-        }));
+        }), undefined, true);
     }
     /**
      * Returns one object by `id` formated with the specified view,
@@ -84,7 +84,7 @@ class BucketTrxNode {
         return this.wrap('viewOne', { id }, (trx, bucket) => bucket.viewOne(trx, id, view, {
             silent: true,
             no_tenancy: !this.enableTenancy
-        }));
+        }), undefined, true);
     }
     /**
      * Returns one object by `id`, without pre-formatting,
@@ -93,7 +93,7 @@ class BucketTrxNode {
     async readOneOrFail(id) {
         return this.wrap('readOneOrFail', { id }, (trx, bucket) => bucket.readOne(trx, id, {
             no_tenancy: !this.enableTenancy
-        }));
+        }), undefined, true);
     }
     /**
      * Returns one object by `id`, without pre-formatting,
@@ -104,7 +104,7 @@ class BucketTrxNode {
     async viewOneOrFail(id, view = 'default') {
         return this.wrap('viewOneOrFail', { id }, (trx, bucket) => bucket.viewOne(trx, id, view, {
             no_tenancy: !this.enableTenancy
-        }));
+        }), undefined, true);
     }
     /*
         Read/View All
@@ -115,7 +115,7 @@ class BucketTrxNode {
     async readAll() {
         return this.wrap('readAll', {}, (trx, bucket) => bucket.readAll(trx, {
             no_tenancy: !this.enableTenancy
-        }), objs => ({ length: objs.length }));
+        }), objs => ({ length: objs.length }), true);
     }
     /**
      * Returns a list of all objects formated with the specified view.
@@ -125,7 +125,7 @@ class BucketTrxNode {
     async viewAll(view = 'default') {
         return this.wrap('viewAll', {}, (trx, bucket) => bucket.viewAll(trx, view, {
             no_tenancy: !this.enableTenancy
-        }), objs => ({ length: objs.length }));
+        }), objs => ({ length: objs.length }), true);
     }
     /*
         Query
@@ -154,7 +154,7 @@ class BucketTrxNode {
             silent: true,
             no_tenancy: !this.enableTenancy,
             index
-        }));
+        }), undefined, true);
     }
     /**
      * Returns one or more objects referenced by the graph link,
@@ -165,7 +165,7 @@ class BucketTrxNode {
             silent: true,
             no_tenancy: !this.enableTenancy,
             indexes
-        }));
+        }), undefined, true);
     }
     /**
      * Returns one or more objects referenced by the graph link built with a view,
@@ -175,7 +175,7 @@ class BucketTrxNode {
         return this.wrap('viewLink', { id, link, view }, (trx, bucket) => bucket.viewLink(trx, id, link, view, {
             silent: true,
             no_tenancy: !this.enableTenancy
-        }));
+        }), undefined, true);
     }
     /**
      * Returns one or more objects referenced by the graph link,
@@ -184,7 +184,7 @@ class BucketTrxNode {
     async readLinkOrFail(id, link) {
         return this.wrap('readLinkOrFail', { id, link }, (trx, bucket) => bucket.readLink(trx, id, link, {
             no_tenancy: !this.enableTenancy
-        }));
+        }), undefined, true);
     }
     /**
      * Returns one or more objects referenced by the graph link built with a view,
@@ -193,7 +193,7 @@ class BucketTrxNode {
     async viewLinkOrFail(id, link, view = 'default') {
         return this.wrap('viewLinkOrFail', { id, link, view }, (trx, bucket) => bucket.viewLink(trx, id, link, view, {
             no_tenancy: !this.enableTenancy
-        }));
+        }), undefined, true);
     }
     /**
      * Returns `true` if the graph link resolves to at least 1 object.
@@ -201,7 +201,7 @@ class BucketTrxNode {
     async hasLink(id, link) {
         return this.wrap('hasLink', { id, link }, (trx, bucket) => bucket.hasLink(trx, id, link, {
             no_tenancy: !this.enableTenancy
-        }));
+        }), undefined, true);
     }
     /*
         Create

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

@@ -70,8 +70,8 @@ class BucketQueryTrxNode {
             return out;
         };
         if (this.external) {
-            const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag);
-            return ext.run(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
+            const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag, true);
+            return ext.run_and_hold(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
         }
         else {
             return wrapped(this.trx, this.bucket);

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

@@ -9,7 +9,9 @@ import { Tag } from "../../dependency";
 export declare class ExternalTrxNode<M extends $Module, $ extends $Topic> {
     private trx;
     private tag;
+    private idempotent;
     private daemon;
-    constructor(trx: TrxNode<any, M, any>, tag: Tag);
+    constructor(trx: TrxNode<any, M, any>, tag: Tag, idempotent?: boolean);
+    run_and_hold(element: (trx: AnyTrxNode) => any, fn: (trx: AnyTrxNode, element: any) => Promise<any>): Promise<any>;
     run(element: (trx: AnyTrxNode) => any, fn: (trx: AnyTrxNode, element: any) => Promise<any>): Promise<any>;
 }

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

@@ -10,17 +10,19 @@ const error_1 = require("../../data/error");
 class ExternalTrxNode {
     trx;
     tag;
+    idempotent;
     daemon;
-    constructor(trx, tag) {
+    constructor(trx, tag, idempotent = false) {
         this.trx = trx;
         this.tag = tag;
+        this.idempotent = idempotent;
         const _module = trx_node_1.TrxNode.getModule(trx);
         if (!_module.daemon) {
             throw error_1.NesoiError.Trx.DaemonNotFound(_module.name);
         }
         this.daemon = _module.daemon;
     }
-    async run(element, fn) {
+    async run_and_hold(element, fn) {
         const root = this.trx.trx;
         const module = trx_node_1.TrxNode.getModule(this.trx);
         const trx = trx_node_1.TrxNode.makeChildNode(this.trx, module.name, 'externals', this.tag.full);
@@ -29,7 +31,14 @@ class ExternalTrxNode {
         });
         let out;
         try {
-            const res = await this.daemon.trx(this.tag.module)
+            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
                 .auth_inherit(trx)
                 .run_and_hold(async (extTrx) => {
                 try {
@@ -46,7 +55,48 @@ class ExternalTrxNode {
                 throw res.status.error;
             }
             out = res.status.output;
-            root.holdNode(res);
+            if (!trx.trx.idempotent) {
+                root.holdNode(res);
+            }
+        }
+        catch (e) {
+            throw trx_node_1.TrxNode.error(trx, e);
+        }
+        trx_node_1.TrxNode.ok(trx, out);
+        return out;
+    }
+    async run(element, fn) {
+        const root = this.trx.trx;
+        const module = trx_node_1.TrxNode.getModule(this.trx);
+        const trx = trx_node_1.TrxNode.makeChildNode(this.trx, module.name, 'externals', this.tag.full);
+        trx_node_1.TrxNode.open(trx, '~', {
+            tag: this.tag
+        });
+        let out;
+        try {
+            const dtrx = await this.daemon.trx(this.tag.module);
+            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+            if (this.idempotent)
+                dtrx.idempotent;
+            else
+                dtrx.idempotent_inherit(trx);
+            const res = await dtrx
+                .auth_inherit(trx)
+                .run(async (extTrx) => {
+                try {
+                    return await fn(extTrx, element(extTrx));
+                }
+                catch (e) {
+                    throw trx_node_1.TrxNode.error(extTrx, e);
+                }
+                finally {
+                    trx_node_1.TrxNode.merge(trx, extTrx);
+                }
+            }, root.id);
+            if (res.state === 'error') {
+                throw res.error;
+            }
+            out = res.output;
         }
         catch (e) {
             throw trx_node_1.TrxNode.error(trx, e);

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

@@ -46,8 +46,9 @@ class JobTrxNode {
             return out;
         };
         if (this.external) {
-            const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag);
-            return ext.run(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
+            const root = this.trx.trx;
+            const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag, root.idempotent);
+            return ext.run_and_hold(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
         }
         else {
             return wrapped(this.trx, this.job);

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

@@ -45,7 +45,7 @@ class MachineTrxNode {
         };
         if (this.external) {
             const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag);
-            return ext.run(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
+            return ext.run_and_hold(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
         }
         else {
             return wrapped(this.trx, this.machine);

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

@@ -45,7 +45,7 @@ class QueueTrxNode {
         };
         if (this.external) {
             const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag);
-            return ext.run(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
+            return ext.run_and_hold(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
         }
         else {
             return wrapped(this.trx, this.queue);

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

@@ -45,7 +45,7 @@ class ResourceTrxNode {
         };
         if (this.external) {
             const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag);
-            return ext.run(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
+            return ext.run_and_hold(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
         }
         else {
             return wrapped(this.trx, this.resource);

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

@@ -45,7 +45,7 @@ class TopicTrxNode {
         };
         if (this.external) {
             const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag);
-            return ext.run(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
+            return ext.run_and_hold(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
         }
         else {
             return wrapped(this.trx, this.resource);

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

@@ -7,6 +7,7 @@ import { NesoiDatetime } from '../data/datetime';
 import { NesoiError } from '../data/error';
 import { AnyBucketCache } from "../../elements/entities/bucket/cache/bucket_cache";
 import { AnyBucket } from "../../elements/entities/bucket/bucket";
+import { NQLRunner } from "../../elements/entities/bucket/query/nql_engine";
 type TrxOrigin = TrxEngineOrigin | `trx:${string}`;
 type TrxState = 'open' | 'hold' | 'ok' | 'error';
 /**
@@ -34,6 +35,7 @@ export declare class Trx<S extends $Space, M extends $Module, AuthUsers extends
     private module;
     id: string;
     private origin;
+    idempotent: boolean;
     root: TrxNode<S, M, AuthUsers>;
     nodes: Record<string, TrxNode<S, M, AuthUsers>>;
     holds: Record<string, TrxNodeHold<any>>;
@@ -42,7 +44,7 @@ export declare class Trx<S extends $Space, M extends $Module, AuthUsers extends
     ctx: Record<string, any>;
     cache_config: Record<string, 'eager'>;
     cache: Record<string, AnyBucketCache>;
-    constructor(engine: AnyTrxEngine, module: Module<S, M>, origin: TrxOrigin, auth?: {
+    constructor(engine: AnyTrxEngine, module: Module<S, M>, origin: TrxOrigin, idempotent?: boolean, auth?: {
         tokens: AuthRequest<any>;
         users: AuthUsers;
     }, id?: string, root?: TrxNode<S, M, AuthUsers>, nodes?: Record<string, TrxNode<S, M, AuthUsers>>);
@@ -56,6 +58,10 @@ export declare class Trx<S extends $Space, M extends $Module, AuthUsers extends
      * These are configured through the TrxNode.cache method.
      */
     static getCache(node: AnyTrxNode, bucket: AnyBucket): Promise<AnyBucketCache | undefined>;
+    static getCacheCustomBuckets(node: AnyTrxNode): Record<string, {
+        scope: string;
+        nql: NQLRunner;
+    }>;
     /**
      * Context Manipulation
      *

package/lib/engine/transaction/trx.js

@@ -70,6 +70,7 @@ class Trx {
     module;
     id;
     origin;
+    idempotent;
     root;
     nodes;
     holds = {};
@@ -78,11 +79,12 @@ class Trx {
     ctx = {};
     cache_config = {};
     cache = {};
-    constructor(engine, module, origin, auth, id, root, nodes) {
+    constructor(engine, module, origin, idempotent, auth, id, root, nodes) {
         this.engine = engine;
         this.module = module;
         this.id = id || (Math.random() + 1).toString(36).substring(7);
         this.origin = origin;
+        this.idempotent = idempotent ?? false;
         this.root = root || new trx_node_1.TrxNode('root', this, undefined, module, auth, false, id);
         this.nodes = nodes || {};
     }
@@ -129,6 +131,18 @@ class Trx {
         }
         return cache;
     }
+    static getCacheCustomBuckets(node) {
+        const trx = node.trx;
+        const buckets = {};
+        for (const tag in trx.cache) {
+            const adapter = trx.cache[tag].innerAdapter;
+            buckets[tag] = {
+                scope: `__cache_${tag}`,
+                nql: adapter.nql
+            };
+        }
+        return buckets;
+    }
     /**
      * Context Manipulation
      *

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

@@ -10,5 +10,10 @@ export type TrxEngineConfig<S extends $Space, M extends $Module, AuthUsers exten
      * Adapter used to store transactions of this module.
      */
     adapter?: (schema: M) => BucketAdapter<TrxData>;
-    wrap?: <T extends Trx<S, M, AuthUsers>>(trx: T, fn: TrxEngineWrapFn<S, M>, services: Services) => Promise<any>;
+    wrap?: {
+        begin: <T extends Trx<S, M, AuthUsers>>(trx: T, services: Services) => Promise<void>;
+        continue: <T extends Trx<S, M, AuthUsers>>(trx: T, services: Services) => Promise<void>;
+        commit: <T extends Trx<S, M, AuthUsers>>(trx: T, services: Services) => Promise<void>;
+        rollback: <T extends Trx<S, M, AuthUsers>>(trx: T, services: Services) => Promise<void>;
+    }[];
 };

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

@@ -20,8 +20,8 @@ export type TrxData = {
 export type HeldTrxNode<Output> = {
     id: string;
     status: TrxStatus<Output>;
-    commit: () => Promise<AnyTrx>;
-    rollback: (error: string) => Promise<AnyTrx>;
+    commit: () => Promise<any>;
+    rollback: (error: string) => Promise<any>;
 };
 export type BucketMetadata = ReturnType<AnyBucket['getQueryMeta']> & {
     tag: Tag;
@@ -45,9 +45,9 @@ export declare class TrxEngine<S extends $Space, M extends $Module, AuthUsers ex
     private adapter;
     constructor(origin: TrxEngineOrigin, module: Module<S, M>, authnProviders?: AuthUsers | undefined, config?: TrxEngineConfig<S, M, any, any> | undefined, services?: Record<string, IService>);
     getModule(): Module<S, M>;
-    get(id?: string): Promise<Trx<S, M, any>>;
-    trx(fn: (trx: TrxNode<S, M, any>) => Promise<TrxNodeStatus>, id?: string, tokens?: AuthRequest<keyof AuthUsers>, users?: Partial<AuthUsers>): Promise<TrxStatus<any>>;
-    trx_hold(fn: (trx: TrxNode<S, M, any>) => Promise<any>, id?: string, authn?: AuthRequest<keyof AuthUsers>, users?: Partial<AuthUsers>): Promise<HeldTrxNode<any>>;
+    get(id?: string, origin?: string, idempotent?: boolean): Promise<Trx<S, M, any>>;
+    trx(fn: (trx: TrxNode<S, M, any>) => Promise<TrxNodeStatus>, id?: string, tokens?: AuthRequest<keyof AuthUsers>, users?: Partial<AuthUsers>, origin?: string, idempotent?: boolean): Promise<TrxStatus<any>>;
+    trx_hold(fn: (trx: TrxNode<S, M, any>) => Promise<any>, id?: string, authn?: AuthRequest<keyof AuthUsers>, users?: Partial<AuthUsers>, origin?: string, idempotent?: boolean): Promise<HeldTrxNode<any>>;
     getBucketMetadata(tag: Tag): BucketMetadata;
     getBucketDrive(tag: Tag): DriveAdapter | undefined;
     authenticate(node: TrxNode<S, M, any>, tokens?: AuthRequest<keyof AuthUsers>, users?: AnyUsers, force?: boolean): Promise<void>;