nesoi 3.2.1 → 3.2.3

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

@@ -4,9 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BucketView = void 0;
+const trx_node_1 = require("../../../../engine/transaction/trx_node");
 const promise_1 = __importDefault(require("../../../../engine/util/promise"));
 const error_1 = require("../../../../engine/data/error");
 const tree_1 = require("../../../../engine/data/tree");
+const dependency_1 = require("../../../../engine/dependency");
 class ViewValue {
     constructor() {
         this.value = undefined;
@@ -27,6 +29,7 @@ class BucketView {
             Object.assign(parsed, raw);
         }
         let layer = Object.values(this.schema.fields).map(field => ({
+            bucket: this.bucket,
             field,
             data: [{
                     raw,
@@ -54,6 +57,7 @@ class BucketView {
             parseds.push(parsed);
         }
         let layer = Object.values(this.schema.fields).map(field => ({
+            bucket: this.bucket,
             field,
             data: raws.map((raw, i) => ({
                 raw,
@@ -89,7 +93,7 @@ class BucketView {
         for (const node of layer) {
             if (node.field.scope !== 'graph')
                 continue;
-            await this.parseGraphProp(trx, node);
+            next.push(...await this.parseGraphProp(trx, node));
         }
         // Drive props
         for (const node of layer) {
@@ -109,6 +113,7 @@ class BucketView {
                 }
             }
             next.push(...Object.values(node.field.children).map(field => ({
+                bucket: node.bucket,
                 field,
                 data: node.data
             })));
@@ -118,6 +123,7 @@ class BucketView {
             if (!node.field.chain)
                 continue;
             next.push({
+                bucket: node.bucket,
                 field: node.field.chain,
                 data: node.data.map(d => ({
                     index: d.index,
@@ -144,6 +150,7 @@ class BucketView {
             if (key === '__raw')
                 continue;
             next.push({
+                bucket: node.bucket,
                 field: node.field.children[key],
                 data: nextData
             });
@@ -249,7 +256,7 @@ class BucketView {
     async parseComputedProp(trx, node) {
         const meta = node.field.meta.computed;
         for (const entry of node.data) {
-            entry.target[node.field.name] = await promise_1.default.solve(meta.fn({ trx, raw: entry.raw, bucket: this.bucket.schema }));
+            entry.target[node.field.name] = await promise_1.default.solve(meta.fn({ trx, raw: entry.raw, bucket: node.bucket.schema }));
         }
     }
     /**
@@ -257,23 +264,69 @@ class BucketView {
      */
     async parseGraphProp(trx, node) {
         const meta = node.field.meta.graph;
-        for (const entry of node.data) {
-            let link;
-            if (!meta.view) {
-                link = this.bucket.graph.readLink(trx, entry.raw, meta.link, { silent: true });
+        const links = await node.bucket.graph.readManyLinks(trx, node.data.map(entry => entry.raw), meta.link, { silent: true });
+        for (let i = 0; i < links.length; i++) {
+            if (meta.view) {
+                const link = node.bucket.schema.graph.links[meta.link];
+                node.data[i].target[node.field.name] = link.many ? [] : {};
             }
             else {
-                link = this.bucket.graph.viewLink(trx, entry.raw, meta.link, meta.view, { silent: true });
+                node.data[i].target[node.field.name] = links[i];
             }
-            entry.target[node.field.name] = await promise_1.default.solve(link);
         }
+        let next = [];
+        if (meta.view) {
+            const schema = node.bucket.schema;
+            const otherBucketDep = schema.graph.links[meta.link].bucket;
+            const module = trx_node_1.TrxNode.getModule(trx);
+            const otherBucket = dependency_1.$Dependency.resolve(module.schema, otherBucketDep);
+            const view = otherBucket.views[meta.view];
+            const { __raw, ...v } = view.fields;
+            const link = node.bucket.schema.graph.links[meta.link];
+            let nextData;
+            if (link.many) {
+                const _links = links;
+                for (let i = 0; i < _links.length; i++) {
+                    const target = node.data[i].target[node.field.name];
+                    for (let j = 0; j < _links[i].length; j++) {
+                        target.push(__raw ? { ..._links[i][j] } : {});
+                        target[j].$v = meta.view;
+                    }
+                }
+                nextData = _links.map((ll, i) => ll.map((l, j) => ({ value: l, target: node.data[i].target[node.field.name][j] }))).flat(1);
+            }
+            else {
+                const _links = links;
+                for (let i = 0; i < _links.length; i++) {
+                    const target = node.data[i].target[node.field.name];
+                    if (__raw) {
+                        Object.assign(target, _links[i]);
+                    }
+                    target.$v = meta.view;
+                }
+                nextData = _links.map((l, i) => ({
+                    value: l, target: node.data[i].target[node.field.name]
+                }));
+            }
+            next = Object.values(v).map(field => ({
+                bucket: module.buckets[otherBucketDep.refName],
+                field,
+                data: nextData.map($ => ({
+                    raw: $.value,
+                    value: $.value,
+                    index: [],
+                    target: $.target
+                }))
+            }));
+        }
+        return next;
     }
     /**
      * [drive]
      */
     async parseDriveProp(trx, node) {
-        if (!this.bucket.drive) {
-            throw error_1.NesoiError.Bucket.Drive.NoAdapter({ bucket: this.bucket.schema.alias });
+        if (!node.bucket.drive) {
+            throw error_1.NesoiError.Bucket.Drive.NoAdapter({ bucket: node.bucket.schema.alias });
         }
         const meta = node.field.meta.drive;
         for (const entry of node.data) {
@@ -281,12 +334,12 @@ class BucketView {
             if (Array.isArray(value)) {
                 const public_urls = [];
                 for (const obj of value) {
-                    public_urls.push(await this.bucket.drive.public(obj));
+                    public_urls.push(await node.bucket.drive.public(obj));
                 }
                 entry.target[node.field.name] = public_urls;
             }
             else {
-                entry.target[node.field.name] = await this.bucket.drive.public(value);
+                entry.target[node.field.name] = await node.bucket.drive.public(value);
             }
         }
     }

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

@@ -54,10 +54,8 @@ type CompatibleMessageKey<Data, Subs extends string> = {
 }[keyof Data];
 type ParseMessageEnumpath<Message extends $Message, Path extends string, Subs extends string> = Path extends `${infer X}.#` ? `${X}.{${CompatibleMessageKey<Message['#parsed'], Subs> & string}}` : Path;
 export type MessageEnumpath<Module extends $Module, Message extends $Message, Modules extends Record<string, $Module>> = MergeUnion<{
-    [M in keyof Modules]: {
-        [K in keyof Modules[M]['constants']['#enumpath'] as M extends Module['name'] ? ParseMessageEnumpath<Message, K & string, Modules[M]['constants']['#enumpath'][K]['_subs']> : `${M & string}::${ParseMessageEnumpath<Message, K & string, Modules[M]['constants']['#enumpath'][K]['_subs']>}`]: Modules[M]['constants']['#enumpath'][K]['_enum'];
-    };
-}[keyof Modules]>;
+    [K in keyof Module['constants']['#enumpath'] as ParseMessageEnumpath<Message, K & string, Module['constants']['#enumpath'][K]['_subs']>]: Module['constants']['#enumpath'][K]['_enum'];
+}>;
 export type EnumName<Space extends $Space> = MergeUnion<{
     [M in keyof Space['modules']]: {
         [K in keyof Space['modules'][M]['constants']['enums'] as `${M & string}::${K & string}`]: Space['modules'][M]['constants']['enums'][K];

package/lib/engine/apps/inline.app.js

@@ -127,6 +127,7 @@ class InlineApp extends app_1.App {
                 messages: Object.values(module.schema.externals.messages),
                 jobs: Object.values(module.schema.externals.jobs),
                 machines: Object.values(module.schema.externals.machines),
+                enums: Object.values(module.schema.externals.enums)
             });
             const buckets = module.schema.externals.buckets;
             Object.values(buckets).forEach(bucket => {

package/lib/engine/module.d.ts

@@ -133,8 +133,7 @@ export declare class Module<S extends $Space, $ extends $Module> {
     }): this;
     /**
      * Include references for external elements on the module.
-     * This allows a module to use elements from other modules directly,
-     * on single-threaded `Apps`.
+     * This allows a module to use elements from other modules directly.
      * This implementation also includes transitive dependencies.
      *
      * @param daemon A `Daemon` instance
@@ -146,6 +145,7 @@ export declare class Module<S extends $Space, $ extends $Module> {
         jobs?: $Dependency[];
         messages?: $Dependency[];
         machines?: $Dependency[];
+        enums?: $Dependency[];
     }): this;
     /**
      * Include references for external elements on the module.

package/lib/engine/module.js

@@ -171,8 +171,7 @@ class Module {
     }
     /**
      * Include references for external elements on the module.
-     * This allows a module to use elements from other modules directly,
-     * on single-threaded `Apps`.
+     * This allows a module to use elements from other modules directly.
      * This implementation also includes transitive dependencies.
      *
      * @param daemon A `Daemon` instance
@@ -222,6 +221,14 @@ class Module {
                 jobs: schema.jobs
             });
         });
+        dependencies.enums?.forEach(dep => {
+            const enumModule = modules[dep.module];
+            const _enum = enumModule.schema.constants.enums[dep.name];
+            if (!_enum) {
+                throw new Error(`Internal Error: unable to find enum '${dep.refName}' during injection to module '${this.name}'`);
+            }
+            this.schema.constants.enums[`${dep.refName}`] = _enum;
+        });
         return this;
     }
     /**

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

@@ -64,6 +64,11 @@ export declare class BucketTrxNode<M extends $Module, $ extends $Bucket> {
      * or `undefined` if the graph link doesn't resolve.
      */
     readLink<LinkName extends keyof $['graph']['links'], Link extends $['graph']['links'][LinkName], Obj extends Link['#bucket']['#data']>(id: $['#data']['id'], link: LinkName): Promise<Link['#many'] extends true ? Obj[] : (Obj | undefined)>;
+    /**
+     * Returns one or more objects referenced by the graph link,
+     * or `undefined` if the graph link doesn't resolve.
+     */
+    readManyLinks<LinkName extends keyof $['graph']['links'], Link extends $['graph']['links'][LinkName], Obj extends Link['#bucket']['#data']>(ids: $['#data']['id'][], link: LinkName): Promise<Link['#many'] extends true ? Obj[] : (Obj | undefined)>;
     /**
      * Returns one or more objects referenced by the graph link built with a view,
      * or `undefined` if the graph link doesn't resolve.

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

@@ -133,6 +133,16 @@ class BucketTrxNode {
             no_tenancy: !this.enableTenancy
         }));
     }
+    /**
+     * Returns one or more objects referenced by the graph link,
+     * or `undefined` if the graph link doesn't resolve.
+     */
+    async readManyLinks(ids, link) {
+        return this.wrap('readLinks', { ids, link }, trx => this.bucket.readManyLinks(trx, ids, link, {
+            silent: true,
+            no_tenancy: !this.enableTenancy
+        }));
+    }
     /**
      * Returns one or more objects referenced by the graph link built with a view,
      * or `undefined` if the graph link doesn't resolve.

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

@@ -14,8 +14,10 @@ export declare class BucketQueryTrxNode<M extends $Module, B extends $Bucket, V
     private query;
     private enableTenancy;
     private view?;
+    private _params?;
     constructor(trx: TrxNode<any, M, any>, bucket: Bucket<M, B>, query: NQL_AnyQuery, enableTenancy: boolean, view?: V | undefined);
     merge($: NQL_Query<M, B>): void;
+    params(value: Record<string, any>): this;
     first(): Promise<Obj | undefined>;
     firstOrFail(): Promise<Obj>;
     all(): Promise<Obj[]>;

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

@@ -14,6 +14,7 @@ class BucketQueryTrxNode {
         this.query = query;
         this.enableTenancy = enableTenancy;
         this.view = view;
+        this._params = [];
     }
     merge($) {
         const and = $['#and'];
@@ -24,6 +25,10 @@ class BucketQueryTrxNode {
         this.query['#and*'] = and; // TODO: make this a little better
         this.query['#or*'] = or; // TODO: make this a little better
     }
+    params(value) {
+        this._params = [value];
+        return this;
+    }
     async first() {
         await trx_node_1.TrxNode.open(this.trx, 'queryFirst', { schema: this.query, view: this.view });
         let results;
@@ -31,7 +36,8 @@ class BucketQueryTrxNode {
             results = await this.bucket.query(this.trx, this.query, {
                 perPage: 1
             }, this.view, {
-                no_tenancy: !this.enableTenancy
+                no_tenancy: !this.enableTenancy,
+                params: this._params
             });
         }
         catch (e) {
@@ -47,7 +53,8 @@ class BucketQueryTrxNode {
         let results;
         try {
             results = await this.bucket.query(this.trx, this.query, undefined, this.view, {
-                no_tenancy: !this.enableTenancy
+                no_tenancy: !this.enableTenancy,
+                params: this._params
             });
         }
         catch (e) {
@@ -64,7 +71,9 @@ class BucketQueryTrxNode {
         await trx_node_1.TrxNode.open(this.trx, 'queryAll', { schema: this.query, view: this.view });
         let results;
         try {
-            results = await this.bucket.query(this.trx, this.query, undefined, this.view);
+            results = await this.bucket.query(this.trx, this.query, undefined, this.view, {
+                params: this._params
+            });
         }
         catch (e) {
             throw await trx_node_1.TrxNode.error(this.trx, e); // Bucket unexpected error
@@ -81,7 +90,9 @@ class BucketQueryTrxNode {
         await trx_node_1.TrxNode.open(this.trx, 'queryPage', { schema: this.query, pagination, view: this.view });
         let result;
         try {
-            result = await this.bucket.query(this.trx, this.query, pagination, this.view);
+            result = await this.bucket.query(this.trx, this.query, pagination, this.view, {
+                params: this._params
+            });
         }
         catch (e) {
             throw await trx_node_1.TrxNode.error(this.trx, e); // Bucket unexpected error

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

@@ -10,7 +10,6 @@ import { $Message } from "../../elements/entities/message/message.schema";
 import { MachineTrxNode } from './nodes/machine.trx_node';
 import { AnyUsers, AuthnRequest } from '../auth/authn';
 import { Enum } from "../../elements/entities/constants/constants";
-import { KeysOfUnion } from '../util/type';
 import { TopicTrxNode } from './nodes/topic.trx_node';
 type TrxNodeBlock = 'bucket' | 'message' | 'job' | 'resource' | 'machine' | 'queue' | 'topic' | 'controller';
 export type TrxNodeStatus = {
@@ -52,7 +51,7 @@ export declare class TrxNode<Space extends $Space, M extends $Module, Authn exte
     static error(node: AnyTrxNode, error: any): Promise<any>;
     message<Raw extends M['#input']['#raw'], Msg extends $Message = M['messages'][Raw['$'] & keyof M['messages']]>(raw: Raw): Promise<M['#input']['#parsed']>;
     value<K extends keyof M['constants']['values']>(key: K): M["constants"]["values"][K]["value"];
-    enum<EnumName extends KeysOfUnion<Space['modules'][keyof Space['modules']]['constants']['enums']>>(name: EnumName): Enum<M['constants']['enums'][EnumName]>;
+    enum<EnumName extends keyof M['constants']['enums']>(name: EnumName): Enum<M['constants']['enums'][EnumName]>;
     bucket<Name extends keyof M['buckets'], Bucket extends M['buckets'][Name]>(name: Name): BucketTrxNode<M, Bucket>;
     job<Name extends keyof M['jobs'], Job extends M['jobs'][Name]>(name: Name): JobTrxNode<M, Job>;
     static jobWithCustomCtx<M extends $Module, JobName extends keyof M['jobs'], Job extends M['jobs'][JobName]>(node: AnyTrxNode, name: string, ctx?: Record<string, any>): JobTrxNode<M, Job>;

package/lib/engine/util/log.d.ts

@@ -1,7 +1,7 @@
 import { $BlockType } from "../../elements/blocks/block.schema";
 declare const LogLevel: readonly ["off", "error", "warn", "info", "debug", "trace"];
 export type LogLevel = typeof LogLevel[number];
-export type LogScope = $BlockType | 'compiler' | 'trx' | 'daemon' | 'app' | 'module' | 'layer' | 'message' | 'bucket' | 'job' | 'resource' | 'controller' | 'queue' | 'topic' | 'constants' | 'externals' | 'inc.server' | 'inc.client';
+export type LogScope = $BlockType | 'compiler' | 'trx' | 'daemon' | 'app' | 'module' | 'layer' | 'message' | 'bucket' | 'job' | 'resource' | 'controller' | 'queue' | 'topic' | 'constants' | 'externals' | 'nql' | 'inc.server' | 'inc.client';
 export declare function scopeTag(scope: LogScope, scope_id: string): string;
 export declare function anyScopeTag(scopeWithId: string): string;
 export declare class Log {

package/lib/engine/util/log.js

@@ -25,6 +25,7 @@ function scopeTag(scope, scope_id) {
         machine: 'lightblue',
         queue: 'lightblue',
         topic: 'lightblue',
+        nql: 'lightpurple',
         'inc.server': 'lightgreen',
         'inc.client': 'lightcyan',
     }[scope] || 'lightgray';

package/package.json

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

package/tools/joaquin/bucket.d.ts

@@ -1,9 +1,29 @@
-import { AnyBucketBuilder } from "../../src/elements/entities/bucket/bucket.builder";
+import { AnyBucketBuilder, BucketBuilder } from "../../src/elements/entities/bucket/bucket.builder";
 import { NesoiError } from "../../src/engine/data/error";
 import { AnyBuilder } from "../../src/engine/module";
-export declare function expectBucket(def: (builder: AnyBucketBuilder) => any, inject?: AnyBuilder[]): {
+export declare function givenBucket<Def>(name: string, def: (builder: AnyBucketBuilder) => any): {
+    builder: BucketBuilder<import("../../src/elements").$Space, import("../../src/elements").$Module, Omit<import("../../src/elements").$Bucket, "views"> & {
+        views: {};
+    }>;
+    data: Record<string, any>;
+    withData(mock: Record<string, any>): {
+        builder: BucketBuilder<import("../../src/elements").$Space, import("../../src/elements").$Module, Omit<import("../../src/elements").$Bucket, "views"> & {
+            views: {};
+        }>;
+        data: Record<string, any>;
+        withData(mock: Record<string, any>): /*elided*/ any;
+    };
+};
+export declare function expectBucket(def: (builder: AnyBucketBuilder) => any, inject?: (AnyBuilder | {
+    builder: AnyBucketBuilder;
+    data: Record<string, any>;
+})[]): {
     toBuildOne(raw: Record<string, any>, view: string): {
-        as(parsed: Record<string, any>): Promise<void>;
+        as(parsed: Record<string, any> | Record<string, any>[]): Promise<void>;
+        butFail(error: (...args: any[]) => NesoiError.BaseError): Promise<void>;
+    };
+    toBuildMany(raws: Record<string, any>[], view: string): {
+        as(parsed: Record<string, any> | Record<string, any>[]): Promise<void>;
         butFail(error: (...args: any[]) => NesoiError.BaseError): Promise<void>;
     };
 };

package/tools/joaquin/bucket.js

@@ -1,43 +1,71 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.givenBucket = givenBucket;
 exports.expectBucket = expectBucket;
 const bucket_builder_1 = require("../../src/elements/entities/bucket/bucket.builder");
 const inline_app_1 = require("../../src/engine/apps/inline.app");
+const elements_1 = require("../../src/elements");
+function givenBucket(name, def) {
+    const builder = new bucket_builder_1.BucketBuilder('test', name);
+    const data = {};
+    def(builder);
+    return {
+        builder,
+        data,
+        withData(mock) {
+            Object.assign(data, mock);
+            return this;
+        }
+    };
+}
 function expectBucket(def, inject = []) {
     const builder = new bucket_builder_1.BucketBuilder('test', 'test');
     def(builder);
-    const app = new inline_app_1.InlineApp('test', [...inject, builder]);
+    const injectBuilders = inject.map(i => 'builder' in i ? i.builder : i);
+    const app = new inline_app_1.InlineApp('test', [...injectBuilders, builder]);
+    // Configure buckets
+    const bucketConfig = {};
+    for (const i of inject) {
+        if (!('data' in i))
+            continue;
+        bucketConfig[i.builder.name] = {
+            adapter: (schema) => new elements_1.MemoryBucketAdapter(schema, i.data)
+        };
+    }
+    app.config.module('test', {
+        buckets: bucketConfig
+    });
     let promise;
     const step1 = {
         toBuildOne(raw, view) {
-            promise = Promise.all([raw].map(raw => app.daemon().then(daemon => daemon.trx('test').run(trx => trx.bucket('test').buildOne(raw, view)))));
+            promise = () => app.daemon().then(daemon => daemon.trx('test').run(trx => trx.bucket('test').buildOne(raw, view)));
+            return step2;
+        },
+        toBuildMany(raws, view) {
+            promise = () => app.daemon().then(daemon => daemon.trx('test').run(trx => trx.bucket('test').buildMany(raws, view)));
             return step2;
         }
     };
     const step2 = {
         async as(parsed) {
-            const status = await promise;
-            status.forEach(st => {
-                if (st.state === 'error') {
-                    console.log(st.summary());
-                    console.error(st.error?.data);
-                    console.error(st.error?.data?.unionErrors);
-                    console.error(st.error?.stack);
-                }
-                expect(st.state).toEqual('ok');
-                expect(st.output)
-                    .toEqual(parsed);
-            });
+            const status = await promise();
+            if (status.state === 'error') {
+                console.log(status.summary());
+                console.error(status.error?.data);
+                console.error(status.error?.data?.unionErrors);
+                console.error(status.error?.stack);
+            }
+            expect(status.state).toEqual('ok');
+            expect(status.output)
+                .toEqual(parsed);
         },
         async butFail(error) {
             const errorObj = error({});
             try {
-                const status = await promise;
-                status.forEach(st => {
-                    expect(st.state).toEqual('error');
-                    expect(st.error?.name)
-                        .toEqual(errorObj.name);
-                });
+                const status = await promise();
+                expect(status.state).toEqual('error');
+                expect(status.error?.name)
+                    .toEqual(errorObj.name);
             }
             catch (e) {
                 expect(e.toString())

package/tools/joaquin/job.js

@@ -13,18 +13,18 @@ function expectJob(def) {
     const step1 = {
         onRaw(_raw) {
             raw = _raw;
-            promise = app.daemon().then(daemon => daemon.trx('test').run(trx => trx.job('test').run(_raw)));
+            promise = () => app.daemon().then(daemon => daemon.trx('test').run(trx => trx.job('test').run(_raw)));
             return step2;
         },
         onMessage(_msg) {
             msg = _msg;
-            promise = app.daemon().then(daemon => daemon.trx('test').run(trx => trx.job('test').forward(_msg)));
+            promise = () => app.daemon().then(daemon => daemon.trx('test').run(trx => trx.job('test').forward(_msg)));
             return step2;
         }
     };
     const step2 = {
         async toResolve(value) {
-            const status = await promise;
+            const status = await promise();
             expect(status.state).toEqual('ok');
             expect(status.output)
                 .toEqual(value({ raw, msg }));
@@ -32,7 +32,7 @@ function expectJob(def) {
         async toReject(error) {
             const errorObj = error({ raw, msg })({});
             try {
-                const status = await promise;
+                const status = await promise();
                 expect(status.state).toEqual('error');
                 expect(status.error?.name)
                     .toEqual(errorObj.name);