nesoi 3.2.1 → 3.2.3

package/lib/compiler/elements/constants.element.js

@@ -38,7 +38,7 @@ class ConstantsElement extends element_1.Element {
             });
             enums[key] = {
                 '#data': data,
-                name: dump_helpers_1.DumpHelpers.dumpValueToType(key),
+                name: dump_helpers_1.DumpHelpers.dumpValueToType(val.name),
                 options: type
             };
         });

package/lib/compiler/error.d.ts

@@ -6,6 +6,7 @@ export declare class CompilerError extends Error {
     static UnmetModuleDependency(from: string, name: string): CompilerError;
     static UnmetDependency(from: string, name: string): CompilerError;
     static CircularDependency(): CompilerError;
+    static ExternalEnumNotFound(name: string): CompilerError;
 }
 export declare class HelperError extends Error {
     constructor(message: string);

package/lib/compiler/error.js

@@ -23,6 +23,9 @@ class CompilerError extends Error {
     static CircularDependency() {
         return new CompilerError('Circular dependency found while building.');
     }
+    static ExternalEnumNotFound(name) {
+        return new CompilerError(`External enum '${name}' not found`);
+    }
 }
 exports.CompilerError = CompilerError;
 class HelperError extends Error {

package/lib/compiler/stages/4_build_schemas_stage.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuildSchemasStage = void 0;
 const log_1 = require("../../engine/util/log");
+const error_1 = require("../error");
 /**
  * [Compiler Stage #4]
  * Build the node schemas, following the graph resolved on previous steps.
@@ -41,6 +42,19 @@ class BuildSchemasStage {
                 return;
             }
             await module.buildNode(node, this.compiler.tree);
+            // Inject external enums on the module schema
+            if (node.type === 'externals') {
+                const schema = node.schema;
+                for (const e in schema.enums) {
+                    const enumDep = schema.enums[e];
+                    const enumModule = this.compiler.modules[enumDep.module].module;
+                    const constants = enumModule.schema.constants;
+                    if (!constants.enums[enumDep.name]) {
+                        throw error_1.CompilerError.ExternalEnumNotFound(e);
+                    }
+                    module.schema.constants.enums[enumDep.refName] = constants.enums[enumDep.name];
+                }
+            }
         });
         const t = new Date().getTime();
         log_1.Log.debug('compiler', 'stage.build_schemas', `[t: ${(t - t0) / 1000} ms]`);

package/lib/compiler/treeshake.js

@@ -21,11 +21,13 @@ class Treeshake {
         const buckets = b.buckets;
         const messages = b.messages;
         const jobs = b.jobs;
+        const enums = b.enums;
         log_1.Log.trace('compiler', 'treeshake', `${'  '.repeat(depth)} └ Treeshaking node ${(0, log_1.scopeTag)($b, node.name)}`);
         node.dependencies = [
             ...Object.values(buckets),
             ...Object.values(messages),
-            ...Object.values(jobs)
+            ...Object.values(jobs),
+            ...Object.values(enums).map(dep => new dependency_1.$Dependency(node.module, 'constants', `${dep.module}::*`))
         ];
         node.dependencies = this.cleanNodeDependencies(node);
     }

package/lib/elements/blocks/job/internal/resource_job.js

@@ -30,7 +30,7 @@ class ResourceJob {
             obj = await scope.execMethod({ ...$, obj, bucket: scope.bucket });
         }
         if (scope.afterMethod) {
-            obj = await scope.afterMethod({ ...$, obj, bucket: scope.bucket });
+            await scope.afterMethod({ ...$, obj, bucket: scope.bucket });
         }
         return obj;
     }

package/lib/elements/blocks/resource/resource.builder.js

@@ -63,7 +63,7 @@ class ResourceBuilder extends block_builder_1.BlockBuilder {
         const jobBuilder = new resource_job_builder_1.ResourceJobBuilder(this.module, name, this._bucket.refName, 'query', alias, resource_1.Resource.query, this._authn)
             .input($ => ({
             view: $.enum(views).default(views[0]),
-            query: $.dict($.any).default({}),
+            query: $.dict($.any.optional).default({}),
             page: $.int.default(0),
             perPage: $.int.default(10)
         }))

package/lib/elements/blocks/resource/resource.js

@@ -120,6 +120,7 @@ class Resource extends block_1.Block {
                 if (type === 'query is empty') {
                     out = !(await trx.bucket(bucket.refName)
                         .query(arg)
+                        .params(obj)
                         .first());
                 }
                 else if (type === 'has no link') {

package/lib/elements/edge/externals/externals.builder.d.ts

@@ -20,11 +20,13 @@ export declare class ExternalsBuilder<Space extends $Space, ModuleName extends k
     private messages;
     private jobs;
     private machines;
+    private enums;
     constructor(module: string);
     bucket<M extends keyof Space['modules'], B extends ExternalBucketRefName<Space, ModuleName>>(ref: B): this;
     message<M extends Exclude<keyof Space['modules'], ModuleName>, B extends keyof Space['modules'][M]['messages']>(ref: `${M & string}::${B & string}`): this;
     job<M extends Exclude<keyof Space['modules'], ModuleName>, B extends keyof Space['modules'][M]['jobs']>(ref: `${M & string}::${B & string}`): this;
     machine<M extends Exclude<keyof Space['modules'], ModuleName>, B extends keyof Space['modules'][M]['machines']>(ref: `${M & string}::${B & string}`): this;
+    enum<M extends Exclude<keyof Space['modules'], ModuleName>, B extends keyof Space['modules'][M]['constants']['enums']>(ref: `${M & string}::${B & string}`): this;
     static merge(to: AnyExternalsBuilder, from: AnyExternalsBuilder): void;
     static build(node: ExternalsBuilderNode): $Externals;
 }

package/lib/elements/edge/externals/externals.builder.js

@@ -16,6 +16,7 @@ class ExternalsBuilder {
         this.messages = {};
         this.jobs = {};
         this.machines = {};
+        this.enums = {};
     }
     bucket(ref) {
         this.buckets[ref] = new dependency_1.$Dependency(this.module, 'bucket', ref);
@@ -33,13 +34,17 @@ class ExternalsBuilder {
         this.machines[ref] = new dependency_1.$Dependency(this.module, 'machine', ref);
         return this;
     }
+    enum(ref) {
+        this.enums[ref] = new dependency_1.$Dependency(this.module, 'enum', ref);
+        return this;
+    }
     static merge(to, from) {
         Object.assign(to.buckets, from.buckets);
         Object.assign(to.jobs, from.jobs);
     }
     // Build
     static build(node) {
-        node.schema = new externals_schema_1.$Externals(node.module, node.builder.buckets, node.builder.messages, node.builder.jobs, node.builder.machines);
+        node.schema = new externals_schema_1.$Externals(node.module, node.builder.buckets, node.builder.messages, node.builder.jobs, node.builder.machines, node.builder.enums);
         return node.schema;
     }
 }

package/lib/elements/edge/externals/externals.schema.d.ts

@@ -9,8 +9,9 @@ export declare class $Externals {
     messages: Record<string, $Dependency>;
     jobs: Record<string, $Dependency>;
     machines: Record<string, $Dependency>;
+    enums: Record<string, $Dependency>;
     $t: "externals";
     module: string;
-    constructor(name: string, buckets?: Record<string, $Dependency>, messages?: Record<string, $Dependency>, jobs?: Record<string, $Dependency>, machines?: Record<string, $Dependency>);
+    constructor(name: string, buckets?: Record<string, $Dependency>, messages?: Record<string, $Dependency>, jobs?: Record<string, $Dependency>, machines?: Record<string, $Dependency>, enums?: Record<string, $Dependency>);
     static merge(to: $Externals, from: $Externals): void;
 }

package/lib/elements/edge/externals/externals.schema.js

@@ -6,12 +6,13 @@ exports.$Externals = void 0;
  * @subcategory Edge
  */
 class $Externals {
-    constructor(name, buckets = {}, messages = {}, jobs = {}, machines = {}) {
+    constructor(name, buckets = {}, messages = {}, jobs = {}, machines = {}, enums = {}) {
         this.name = name;
         this.buckets = buckets;
         this.messages = messages;
         this.jobs = jobs;
         this.machines = machines;
+        this.enums = enums;
         this.$t = 'externals';
         this.module = this.name;
     }
@@ -20,6 +21,7 @@ class $Externals {
         Object.assign(to.messages, from.messages);
         Object.assign(to.jobs, from.jobs);
         Object.assign(to.machines, from.machines);
+        Object.assign(to.enums, from.enums);
     }
 }
 exports.$Externals = $Externals;

package/lib/elements/entities/bucket/adapters/bucket_adapter.d.ts

@@ -136,10 +136,10 @@ export declare abstract class BucketAdapter<Obj extends NesoiObj> {
     /**
      * Return the results of a query
      */
-    query<MetadataOnly extends boolean>(trx: AnyTrxNode, query: NQL_AnyQuery, pagination?: NQL_Pagination, params?: Record<string, any>, config?: {
+    query<MetadataOnly extends boolean>(trx: AnyTrxNode, query: NQL_AnyQuery, pagination?: NQL_Pagination, params?: Record<string, any>[], config?: {
         view?: string;
         metadataOnly?: MetadataOnly;
-    }): Promise<NQL_Result<MetadataOnly extends true ? {
+    }, runner?: NQLRunner): Promise<NQL_Result<MetadataOnly extends true ? {
         id: Obj['id'];
         [x: string]: any;
     } : Obj>>;

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

@@ -25,14 +25,14 @@ class BucketAdapter {
     /**
      * Return the results of a query
      */
-    async query(trx, query, pagination, params, config) {
+    async query(trx, query, pagination, params, config, runner) {
         const module = trx_node_1.TrxNode.getModule(trx);
         const refName = (module.name === this.schema.module
             ? '' : `${this.schema.module}::`)
             + this.schema.name;
         const compiled = await nql_compiler_1.NQL_Compiler.build(module, refName, query);
         const view = config?.view ? this.schema.views[config.view] : undefined;
-        const result = await module.nql.run(trx, compiled, pagination, params, view);
+        const result = await module.nql.run(trx, compiled, pagination, params, view, runner);
         if (config?.metadataOnly) {
             result.data = result.data.map(obj => ({
                 id: obj.id,

package/lib/elements/entities/bucket/adapters/memory.nql.d.ts

@@ -10,7 +10,7 @@ export declare class MemoryNQLRunner extends NQLRunner {
     protected adapter?: AnyMemoryBucketAdapter;
     constructor();
     bind(adapter: AnyMemoryBucketAdapter): void;
-    run(trx: AnyTrxNode, part: NQL_Part, params: Obj, pagination?: NQL_Pagination): Promise<{
+    run(trx: AnyTrxNode, part: NQL_Part, params: Obj[], pagination?: NQL_Pagination): Promise<{
         data: any[];
         totalItems: number | undefined;
         page: number | undefined;

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

@@ -21,7 +21,7 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
         let response;
         // Empty query, don't filter data
         if (part.union.inters.length === 0) {
-            response = data;
+            response = { ...data };
         }
         // Non-empty query
         else {
@@ -105,7 +105,7 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
             for (const rule of inter.rules) {
                 // <Union>
                 if ('inters' in rule) {
-                    if (!_union(rule, objs, objs))
+                    if (!_union(rule, objs, params))
                         return false;
                 }
                 // <Rule>
@@ -132,8 +132,12 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
                     continue;
                 }
                 const obj = objs[id];
-                let match = _obj(rule, obj, params);
-                // console.log(`    -> match: ${match}\n`)
+                let match = false;
+                for (const paramGroup of params) {
+                    match = _obj(rule, obj, paramGroup);
+                    if (match)
+                        break;
+                }
                 if (rule.not) {
                     match = !match;
                 }
@@ -174,7 +178,7 @@ class MemoryNQLRunner extends nql_engine_1.NQLRunner {
             let queryValue;
             // Value is a subquery, run union
             if ('subquery' in rule.value) {
-                const subOut = _union(rule.value.subquery.union, objs, params);
+                const subOut = _union(rule.value.subquery.union, objs, [params]);
                 const subList = Object.values(subOut);
                 // Subquery operator is for a list, filter
                 if (rule.op === 'in' || rule.op === 'contains_any') {

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

@@ -4,6 +4,7 @@ import { $Module, ViewName, ViewObj } from "../../../schema";
 import { $Bucket } from './bucket.schema';
 import { BucketAdapter } from './adapters/bucket_adapter';
 import { BucketConfig } from './bucket.config';
+import { AnyBucketCache } from './cache/bucket_cache';
 import { BucketGraph } from './graph/bucket_graph';
 import { NQL_AnyQuery, NQL_Pagination } from './query/nql.schema';
 import { CreateObj, PatchObj, PutObj } from './bucket.types';
@@ -32,7 +33,7 @@ export declare class Bucket<M extends $Module, $ extends $Bucket> {
     private config?;
     services: Record<string, IService>;
     adapter: BucketAdapter<$['#data']>;
-    private cache?;
+    cache?: AnyBucketCache;
     graph: BucketGraph<M, $>;
     private views;
     drive?: DriveAdapter;
@@ -85,7 +86,7 @@ export declare class Bucket<M extends $Module, $ extends $Bucket> {
         no_tenancy: boolean;
     }): Promise<Obj[]>;
     /**
-     * Read raw entity of a graph link
+     * Read raw entity of a graph link for 1 object
      *
      * - Options:
      *   - `silent`: If not found, return `undefined` instead of throwing an exception
@@ -95,6 +96,17 @@ export declare class Bucket<M extends $Module, $ extends $Bucket> {
         silent?: boolean;
         no_tenancy?: boolean;
     }): Promise<Link['#many'] extends true ? Obj[] : (Obj | undefined)>;
+    /**
+     * Read raw entities of a graph link for N objects
+     *
+     * - Options:
+     *   - `silent`: If not found, return `undefined` instead of throwing an exception
+     *   - `no_tenancy`: Don't apply tenancy rules.
+     */
+    readManyLinks<LinkName extends keyof $['graph']['links'], Link extends $['graph']['links'][LinkName], LinkBucket extends Link['#bucket'], V extends ViewName<LinkBucket>, Obj extends ViewObj<LinkBucket, V>>(trx: AnyTrxNode, ids: $['#data']['id'][], link: LinkName, options?: {
+        silent?: boolean;
+        no_tenancy?: boolean;
+    }): Promise<Link['#many'] extends true ? Obj[] : (Obj | undefined)>;
     /**
      * Read the view of an entity of a graph link
      *
@@ -190,7 +202,7 @@ export declare class Bucket<M extends $Module, $ extends $Bucket> {
      */
     query<V extends ViewName<$>, Obj extends ViewObj<$, V>>(trx: AnyTrxNode, query: NQL_AnyQuery, pagination?: NQL_Pagination, view?: V, options?: {
         no_tenancy?: boolean;
-        params?: Record<string, any>;
+        params?: Record<string, any>[];
     }): Promise<NQL_Result<Obj>>;
     /**
      * Add `created_by`, `created_at`, `updated_by` and `updated_at` fields to object

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

@@ -45,7 +45,7 @@ class Bucket {
         this.views = views;
         // Cache
         if (this.config?.cache) {
-            this.cache = new bucket_cache_1.BucketCache(this.schema.name, this.adapter, this.config.cache);
+            this.cache = new bucket_cache_1.BucketCache(this, this.config.cache);
         }
         // Drive
         if (this.config?.drive) {
@@ -79,8 +79,9 @@ class Bucket {
             : this.getTenancyQuery(trx);
         let raw;
         // With Tenancy
+        const adapter = this.cache || this.adapter;
         if (tenancy) {
-            const result = await this.adapter.query(trx, {
+            const result = await adapter.query(trx, {
                 id,
                 '#and': tenancy
             }, { perPage: 1 }, undefined, options?.query_view ? { view: options?.query_view } : undefined);
@@ -88,9 +89,7 @@ class Bucket {
         }
         // Without Tenancy
         else {
-            raw = this.cache
-                ? await this.cache.get(trx, id)
-                : await this.adapter.get(trx, id);
+            raw = await adapter.get(trx, id);
         }
         // Empty result
         if (!raw) {
@@ -119,15 +118,14 @@ class Bucket {
             : this.getTenancyQuery(trx);
         let raws;
         // With Tenancy
+        const adapter = this.cache || this.adapter;
         if (tenancy) {
-            const result = await this.adapter.query(trx, tenancy, undefined, options?.query_view ? { view: options?.query_view } : undefined);
+            const result = await adapter.query(trx, tenancy, undefined, options?.query_view ? [{ view: options?.query_view }] : undefined);
             raws = result.data;
         }
         // Without Tenancy
         else {
-            raws = this.cache
-                ? await this.cache.index(trx)
-                : await this.adapter.index(trx);
+            raws = await this.adapter.index(trx);
         }
         // Encryption
         if (this.schema.model.hasEncryptedField) {
@@ -169,7 +167,7 @@ class Bucket {
     }
     // Graph
     /**
-     * Read raw entity of a graph link
+     * Read raw entity of a graph link for 1 object
      *
      * - Options:
      *   - `silent`: If not found, return `undefined` instead of throwing an exception
@@ -201,6 +199,44 @@ class Bucket {
         }
         return linkObj;
     }
+    /**
+     * Read raw entities of a graph link for N objects
+     *
+     * - Options:
+     *   - `silent`: If not found, return `undefined` instead of throwing an exception
+     *   - `no_tenancy`: Don't apply tenancy rules.
+     */
+    async readManyLinks(trx, ids, link, options) {
+        log_1.Log.debug('bucket', this.schema.name, `Read Link, ids=${ids} l=${link}`);
+        // Validate IDs
+        for (const id of ids) {
+            if (typeof id !== 'string' && typeof id !== 'number') {
+                throw error_1.NesoiError.Bucket.InvalidId({ bucket: this.schema.alias, id });
+            }
+        }
+        // Read object
+        const objs = await this.query(trx, {
+            'id in': ids
+        }).then(res => res.data);
+        // Empty response
+        if (!objs.length) {
+            const schema = this.schema.graph.links[link];
+            if (schema.many) {
+                return [];
+            }
+            return undefined;
+        }
+        // Read link
+        const linkObj = await this.graph.readManyLinks(trx, objs, link, options);
+        // TODO
+        // // Encryption
+        // if (linkObj) {
+        //     if (this.schema.model.hasEncryptedField) {
+        //         await this.decrypt(trx, linkObj);
+        //     }
+        // }
+        return linkObj;
+    }
     /**
      * Read the view of an entity of a graph link
      *
@@ -388,9 +424,10 @@ class Bucket {
         // Read old object, if safe, to check if it exists
         let oldObj;
         if (!options?.unsafe) {
+            const adapter = this.cache || this.adapter;
             // With Tenancy
             if (tenancy) {
-                const result = await this.adapter.query(trx, {
+                const result = await adapter.query(trx, {
                     id: obj.id,
                     '#and': tenancy
                 }, { perPage: 1 }, undefined, {
@@ -400,9 +437,7 @@ class Bucket {
             }
             // Without Tenancy
             else {
-                oldObj = this.cache
-                    ? await this.cache.get(trx, obj['id'])
-                    : await this.adapter.get(trx, obj['id']);
+                oldObj = await adapter.get(trx, obj['id']);
             }
             // Empty response
             if (!oldObj) {
@@ -678,7 +713,8 @@ class Bucket {
             '#and': tenancy
         };
         // Query
-        const result = await this.adapter.query(trx, query, pagination, options?.params);
+        const adapter = this.cache || this.adapter;
+        const result = await adapter.query(trx, query, pagination, options?.params);
         if (!result.data.length)
             return result;
         // Encryption

package/lib/elements/entities/bucket/cache/bucket_cache.d.ts

@@ -1,10 +1,9 @@
 import { BucketConfig } from '../bucket.config';
 import { AnyTrxNode } from "../../../../engine/transaction/trx_node";
 import { NesoiObj } from "../../../../engine/data/obj";
-import { AnyBucketAdapter } from '../adapters/bucket_adapter';
-import { $BucketView } from '../view/bucket_view.schema';
 import { NQL_AnyQuery, NQL_Pagination } from '../query/nql.schema';
 import { NQL_Result } from '../query/nql_engine';
+import { AnyBucket } from '../bucket';
 export type BucketCacheSync<T> = {
     obj: T;
     updateEpoch: number;
@@ -14,28 +13,33 @@ export type BucketCacheSync<T> = {
  * @subcategory Entity
  * */
 export declare class BucketCacheEntry<Obj extends NesoiObj> {
+    __update_epoch: number;
+    __sync_epoch: number;
     id: Obj['id'];
-    obj: Obj;
-    updateEpoch: number;
-    syncEpoch: number;
-    constructor(id: Obj['id'], obj: Obj, updateEpoch: number, syncEpoch: number);
+    constructor(obj: Obj, __update_epoch: number, __sync_epoch: number);
 }
 /**
  * @category Elements
  * @subcategory Entity
  * */
 export declare class BucketCache<Obj extends NesoiObj> {
-    private bucketName;
-    private outerAdapter;
+    private bucket;
     private config;
     private lastUpdateEpoch?;
     private lastSyncEpoch?;
     private lastHash?;
     private innerAdapter;
-    constructor(bucketName: string, outerAdapter: AnyBucketAdapter, config: NonNullable<BucketConfig<any, any, any>['cache']>);
+    private outerAdapter;
+    constructor(bucket: AnyBucket, config: NonNullable<BucketConfig<any, any, any>['cache']>);
     get(trx: AnyTrxNode, id: NesoiObj['id']): Promise<any>;
     index(trx: AnyTrxNode): Promise<any[]>;
-    query(trx: AnyTrxNode, view: $BucketView, query: NQL_AnyQuery, pagination?: NQL_Pagination): Promise<NQL_Result<any> | Obj[]>;
+    query<MetadataOnly extends boolean>(trx: AnyTrxNode, query: NQL_AnyQuery, pagination?: NQL_Pagination, params?: Record<string, any>[], config?: {
+        view?: string;
+        metadataOnly?: MetadataOnly;
+    }): Promise<NQL_Result<MetadataOnly extends true ? {
+        id: Obj['id'];
+        [x: string]: any;
+    } : Obj>>;
     private syncOne;
     private syncOneAndPast;
     private syncAll;