nesoi 3.2.2 → 3.2.4

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

@@ -2,7 +2,6 @@ import { $Module, $Space } from "../../../../schema";
 import { $BucketModelField, $BucketModelFieldType, $BucketModelFields } from './bucket_model.schema';
 import { NesoiDate } from "../../../../engine/data/date";
 import { BucketModelpathObjInfer, BucketModelpathDictInfer, BucketModelpathListInfer, BucketModelObjInfer, BucketQuerypathDictInfer, BucketQuerypathListInfer, BucketQuerypathObjInfer, BucketModelpathUnionInfer } from './bucket_model.infer';
-import { EnumFromName, EnumName } from '../../constants/constants.schema';
 import { NesoiDecimal } from "../../../../engine/data/decimal";
 import { NesoiDatetime } from "../../../../engine/data/datetime";
 import { NesoiFile } from "../../../../engine/data/file";
@@ -49,10 +48,10 @@ export declare class BucketModelFieldFactory<Space extends $Space, Module extend
     }, {
         '': NesoiDecimal;
     }>;
-    enum<Enums extends EnumName<Space>, Options extends (keyof Enums & string) | (readonly string[])>(options: Options): BucketModelFieldBuilder<Module, Options extends string ? keyof EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options], Options extends string ? keyof EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options], [false, false], {
-        '': Options extends string ? keyof EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options];
+    enum<Enums extends Module['constants']['enums'], Options extends (keyof Enums & string) | (readonly string[])>(options: Options): BucketModelFieldBuilder<Module, Options extends string ? keyof Module["constants"]["enums"][Options]["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options], Options extends string ? keyof Module["constants"]["enums"][Options]["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options], [false, false], {
+        '': Options extends string ? keyof Module["constants"]["enums"][Options]["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options];
     }, {
-        '': Options extends string ? keyof EnumFromName<Space, Options>["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options];
+        '': Options extends string ? keyof Module["constants"]["enums"][Options]["#data"] : Options extends (infer X)[] | readonly (infer X)[] ? X : Options[keyof Options];
     }>;
     get int(): BucketModelFieldBuilder<Module, number, number, [false, false], {
         '': number;

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

@@ -91,6 +91,8 @@ class NQL_RuleTree {
         let by = value['by'];
         if (by) {
             for (const key of by) {
+                if (Object.values(bucket.adapter.config.meta).includes(key))
+                    continue;
                 const fields = bucket_model_schema_1.$BucketModel.getField(bucket.schema.model, key);
                 if (!fields.length) {
                     throw new Error(`Field '${key}' not found on bucket '${bucket.schema.name}'`);
@@ -148,6 +150,10 @@ class NQL_RuleTree {
                 throw new Error(`Invalid term '${key}'`);
             }
             const [_, or, fieldpath, not, case_i, op] = term;
+            if (Object.values(bucket.adapter.config.meta).includes(fieldpath)) {
+                const _op = this.parseOp(bucket.schema.name, [{ type: 'datetime', name: fieldpath }], op);
+                return { type: 'fieldpath', or: !!or, fieldpath, not: !!not, case_i: !!case_i, op: _op };
+            }
             const fields = bucket_model_schema_1.$BucketModel.getField(bucket.schema.model, fieldpath);
             if (!fields.length) {
                 throw new Error(`Field '${fieldpath}' not found on bucket '${bucket.schema.name}'`);
@@ -242,7 +248,7 @@ class NQL_RuleTree {
         };
         for (const key in value) {
             if (key.startsWith('@') || key.startsWith('or @')) {
-                const refField = key.match(/(or )?@(\w+)\.(.*)/);
+                const refField = key.match(/(or )?@([\w:]+)\.(.*)/);
                 if (!refField) {
                     throw new Error(`Invalid bucket field '${key}'`);
                 }

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_query.trx_node.d.ts

@@ -17,7 +17,7 @@ export declare class BucketQueryTrxNode<M extends $Module, B extends $Bucket, V
     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;
+    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

@@ -26,7 +26,7 @@ class BucketQueryTrxNode {
         this.query['#or*'] = or; // TODO: make this a little better
     }
     params(value) {
-        this._params = [value];
+        this._params = value ? [value] : [];
         return this;
     }
     async first() {

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/package.json

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