@thisisagile/easy 8.39.11 → 8.40.2

package/dist/data/Condition.d.ts

@@ -15,4 +15,10 @@ export declare class LogicalCondition {
     constructor(operator: string, conditions: Condition[]);
     toJSON(): Json;
 }
+export declare class SortCondition extends Condition {
+    readonly key: string;
+    readonly value: number;
+    constructor(key: string, value: number);
+    toJSON(): Json;
+}
 export declare const toCondition: (field: string, operator: string, value: unknown, conv?: Convert) => Condition;

package/dist/data/Condition.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toCondition = exports.LogicalCondition = exports.Condition = void 0;
+exports.toCondition = exports.SortCondition = exports.LogicalCondition = exports.Condition = void 0;
 const types_1 = require("../types");
 const utils_1 = require("../utils");
 class Condition {
@@ -26,6 +26,17 @@ class LogicalCondition {
     }
 }
 exports.LogicalCondition = LogicalCondition;
+class SortCondition extends Condition {
+    constructor(key, value) {
+        super(key, '', value);
+        this.key = key;
+        this.value = value;
+    }
+    toJSON() {
+        return { [this.key]: this.value };
+    }
+}
+exports.SortCondition = SortCondition;
 const toCondition = (field, operator, value, conv = utils_1.convert.default) => new Condition(field, operator, conv.from(value));
 exports.toCondition = toCondition;
 //# sourceMappingURL=Condition.js.map

package/dist/data/Condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"Condition.js","sourceRoot":"","sources":["../../src/data/Condition.ts"],"names":[],"mappings":";;;AAAA,oCAAiD;AACjD,oCAA4C;AAE5C,MAAa,SAAS;IACpB,YAAqB,GAAW,EAAW,QAAgB,EAAW,KAAc;QAA/D,QAAG,GAAH,GAAG,CAAQ;QAAW,aAAQ,GAAR,QAAQ,CAAQ;QAAW,UAAK,GAAL,KAAK,CAAS;QAEpF,QAAG,GAAG,CAAC,GAAG,MAAmB,EAAoB,EAAE,CAAC,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;QACnG,OAAE,GAAG,CAAC,GAAG,MAAmB,EAAoB,EAAE,CAAC,IAAI,gBAAgB,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;IAHV,CAAC;IAKxF,MAAM;QACJ,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,YAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;IAC3E,CAAC;CACF;AATD,8BASC;AAED,MAAa,gBAAgB;IAC3B,YAAqB,QAAgB,EAAW,UAAuB;QAAlD,aAAQ,GAAR,QAAQ,CAAQ;QAAW,eAAU,GAAV,UAAU,CAAa;IAAG,CAAC;IAE3E,MAAM;QACJ,OAAO,EAAE,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;IACzE,CAAC;CACF;AAND,4CAMC;AAEM,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,QAAgB,EAAE,KAAc,EAAE,OAAgB,eAAO,CAAC,OAAO,EAAa,EAAE,CACzH,IAAI,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAc,CAAC,CAAC;AADnD,QAAA,WAAW,eACwC"}
+{"version":3,"file":"Condition.js","sourceRoot":"","sources":["../../src/data/Condition.ts"],"names":[],"mappings":";;;AAAA,oCAAiD;AACjD,oCAA4C;AAE5C,MAAa,SAAS;IACpB,YAAqB,GAAW,EAAW,QAAgB,EAAW,KAAc;QAA/D,QAAG,GAAH,GAAG,CAAQ;QAAW,aAAQ,GAAR,QAAQ,CAAQ;QAAW,UAAK,GAAL,KAAK,CAAS;QAEpF,QAAG,GAAG,CAAC,GAAG,MAAmB,EAAoB,EAAE,CAAC,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;QACnG,OAAE,GAAG,CAAC,GAAG,MAAmB,EAAoB,EAAE,CAAC,IAAI,gBAAgB,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;IAHV,CAAC;IAKxF,MAAM;QACJ,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,YAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;IAC3E,CAAC;CACF;AATD,8BASC;AAED,MAAa,gBAAgB;IAC3B,YAAqB,QAAgB,EAAW,UAAuB;QAAlD,aAAQ,GAAR,QAAQ,CAAQ;QAAW,eAAU,GAAV,UAAU,CAAa;IAAG,CAAC;IAE3E,MAAM;QACJ,OAAO,EAAE,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;IACzE,CAAC;CACF;AAND,4CAMC;AAED,MAAa,aAAc,SAAQ,SAAS;IAC1C,YAAqB,GAAW,EAAW,KAAa;QACtD,KAAK,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QADH,QAAG,GAAH,GAAG,CAAQ;QAAW,UAAK,GAAL,KAAK,CAAQ;IAExD,CAAC;IAED,MAAM;QACJ,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;IACpC,CAAC;CACF;AARD,sCAQC;AAEM,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,QAAgB,EAAE,KAAc,EAAE,OAAgB,eAAO,CAAC,OAAO,EAAa,EAAE,CACzH,IAAI,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAc,CAAC,CAAC;AADnD,QAAA,WAAW,eACwC"}

package/dist/data/Field.d.ts

@@ -1,5 +1,5 @@
 import { Property } from '../utils';
-import { Condition } from './Condition';
+import { Condition, SortCondition } from "./Condition";
 export declare class Field extends Property {
     is: (value: unknown) => Condition;
     isNot: (value: unknown) => Condition;
@@ -10,5 +10,7 @@ export declare class Field extends Property {
     greaterEqual: (value: unknown) => Condition;
     less: (value: unknown) => Condition;
     lessEqual: (value: unknown) => Condition;
+    asc: () => SortCondition;
+    desc: () => SortCondition;
     protected condition: (operator: string, value: unknown) => Condition;
 }

package/dist/data/Field.js

@@ -16,6 +16,8 @@ class Field extends utils_1.Property {
         this.greaterEqual = (value) => this.condition('gte', value);
         this.less = (value) => this.condition('lt', value);
         this.lessEqual = (value) => this.condition('lte', value);
+        this.asc = () => new Condition_1.SortCondition(this.property, -1);
+        this.desc = () => new Condition_1.SortCondition(this.property, 1);
         this.condition = (operator, value) => (0, Condition_1.toCondition)(this.property, operator, value, this.options?.convert);
     }
 }

package/dist/data/Field.js.map

@@ -1 +1 @@
-{"version":3,"file":"Field.js","sourceRoot":"","sources":["../../src/data/Field.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,2CAAqD;AACrD,oCAAmC;AAEnC,MAAa,KAAM,SAAQ,gBAAQ;IAAnC;;QACE,OAAE,GAAG,CAAC,KAAc,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEhE,UAAK,GAAG,CAAC,KAAc,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEnE,SAAI,GAAG,CAAC,GAAG,KAAgB,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAA,eAAO,EAAC,KAAK,CAAC,CAAC,CAAC;QAEhF,UAAK,GAAG,CAAC,GAAG,KAAgB,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAA,eAAO,EAAC,KAAK,CAAC,CAAC,CAAC;QAElF,WAAM,GAAG,CAAC,IAAa,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAEtE,YAAO,GAAG,CAAC,KAAc,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAErE,iBAAY,GAAG,CAAC,KAAc,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE3E,SAAI,GAAG,CAAC,KAAc,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAElE,cAAS,GAAG,CAAC,KAAc,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE9D,cAAS,GAAG,CAAC,QAAgB,EAAE,KAAc,EAAa,EAAE,CAAC,IAAA,uBAAW,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5I,CAAC;CAAA;AApBD,sBAoBC"}
+{"version":3,"file":"Field.js","sourceRoot":"","sources":["../../src/data/Field.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,2CAAoE;AACpE,oCAAmC;AAEnC,MAAa,KAAM,SAAQ,gBAAQ;IAAnC;;QACE,OAAE,GAAG,CAAC,KAAc,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEhE,UAAK,GAAG,CAAC,KAAc,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEnE,SAAI,GAAG,CAAC,GAAG,KAAgB,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAA,eAAO,EAAC,KAAK,CAAC,CAAC,CAAC;QAEhF,UAAK,GAAG,CAAC,GAAG,KAAgB,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAA,eAAO,EAAC,KAAK,CAAC,CAAC,CAAC;QAElF,WAAM,GAAG,CAAC,IAAa,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAEtE,YAAO,GAAG,CAAC,KAAc,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAErE,iBAAY,GAAG,CAAC,KAAc,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE3E,SAAI,GAAG,CAAC,KAAc,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAElE,cAAS,GAAG,CAAC,KAAc,EAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAExE,QAAG,GAAG,GAAkB,EAAE,CAAC,IAAI,yBAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAA;QAE/D,SAAI,GAAG,GAAkB,EAAE,CAAC,IAAI,yBAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;QAErD,cAAS,GAAG,CAAC,QAAgB,EAAE,KAAc,EAAa,EAAE,CAAC,IAAA,uBAAW,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5I,CAAC;CAAA;AAxBD,sBAwBC"}

package/dist/utils/View.d.ts

@@ -3,9 +3,16 @@ export declare type InOut = {
     in?: Func | View;
     col?: string;
 };
-export declare const isInOut: (v: unknown) => v is InOut;
 export declare const isColOnly: (v: unknown) => v is InOut;
 export declare const isInOnly: (v: unknown) => v is InOut;
+export declare const isInOutWithFunction: (v: unknown) => v is {
+    col: string;
+    in: Func;
+};
+export declare const isInOutWithView: (v: unknown) => v is {
+    col: string;
+    in: View;
+};
 export declare type Views = {
     [key: string]: string | Func | InOut;
 };

package/dist/utils/View.js

@@ -1,25 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.view = exports.View = exports.toViewers = exports.isInOnly = exports.isColOnly = exports.isInOut = void 0;
+exports.view = exports.View = exports.toViewers = exports.isInOutWithView = exports.isInOutWithFunction = exports.isInOnly = exports.isColOnly = void 0;
 const types_1 = require("../types");
 const Traverse_1 = require("./Traverse");
 const Case_1 = require("./Case");
-const isInOut = (v) => (0, types_1.isObject)(v) && (0, types_1.isDefined)(v.col) && ((0, types_1.isFunction)(v.in) || v.in instanceof View);
-exports.isInOut = isInOut;
 const isColOnly = (v) => (0, types_1.isObject)(v) && (0, types_1.isDefined)(v.col) && !(0, types_1.isDefined)(v.in);
 exports.isColOnly = isColOnly;
 const isInOnly = (v) => (0, types_1.isObject)(v) && !(0, types_1.isDefined)(v.col) && (0, types_1.isFunction)(v.in);
 exports.isInOnly = isInOnly;
-const toFunc = (a, key, io) => (0, Case_1.choose)(io)
-    .case(i => (0, types_1.isDefined)(i.col) && !(0, types_1.isDefined)(i.in), (i) => (a) => (0, Traverse_1.traverse)(a, i.col))
-    .else(() => undefined);
-const toViewer = (key, value) => (0, Case_1.choose)(value)
-    .type(types_1.isString, s => toViewer(key, (a) => (0, Traverse_1.traverse)(a, s)))
-    .type(exports.isColOnly, io => toViewer(key, io.col))
-    .type(types_1.isFunction, f => toViewer(key, { in: { key, f } }))
-    .type(exports.isInOnly, io => toViewer(key, { in: { key, f: io.in } }))
-    .type(exports.isInOut, io => toViewer(key, (a) => io?.in && (io.in instanceof View ? io.in.from((0, Traverse_1.traverse)(a, io.col)) : io.in((0, Traverse_1.traverse)(a, io.col)))))
-    .else(m => m);
+const isInOutWithFunction = (v) => (0, types_1.isObject)(v) && (0, types_1.isDefined)(v.col) && (0, types_1.isFunction)(v.in);
+exports.isInOutWithFunction = isInOutWithFunction;
+const isInOutWithView = (v) => (0, types_1.isObject)(v) && (0, types_1.isDefined)(v.col) && v.in instanceof View;
+exports.isInOutWithView = isInOutWithView;
+const toFunc = (a, col, f = a => a) => a => f((0, Traverse_1.traverse)(a, col));
+const toViewer = (key, value) => {
+    const k = key;
+    const v = value;
+    return (0, Case_1.choose)(value)
+        .type(types_1.isString, s => toViewer(key, (a) => toFunc(a, s)(a)))
+        .type(exports.isColOnly, io => toViewer(key, io.col))
+        .type(types_1.isFunction, f => toViewer(key, { in: { key, f } }))
+        .type(exports.isInOnly, io => toViewer(key, { in: { key, f: io.in } }))
+        .type(exports.isInOutWithFunction, io => toViewer(key, { in: { key, f: (a) => toFunc(a, io.col, io.in)(a) } }))
+        .type(exports.isInOutWithView, io => toViewer(key, { in: { key, f: (a) => toFunc(a, io.col, io.in.from)(a) } }))
+        .else(m => m);
+};
 const toViewers = (views) => (0, types_1.meta)(views)
     .entries()
     .map(([k, v]) => toViewer(k, v));

package/dist/utils/View.js.map

@@ -1 +1 @@
-{"version":3,"file":"View.js","sourceRoot":"","sources":["../../src/utils/View.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"View.js","sourceRoot":"","sources":["../../src/utils/View.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "8.39.11",
+  "version": "8.40.2",
   "description": "Straightforward library for building domain-driven microservice architectures",
   "author": "Sander Hoogendoorn",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@thisisagile/easy-test": "8.39.11",
+    "@thisisagile/easy-test": "8.40.2",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/validator": "^13.7.1"

package/src/data/Condition.ts

@@ -20,5 +20,15 @@ export class LogicalCondition {
   }
 }
 
+export class SortCondition extends Condition {
+  constructor(readonly key: string, readonly value: number) {
+    super(key, '', value);
+  }
+
+  toJSON(): Json {
+    return { [this.key]: this.value };
+  }
+}
+
 export const toCondition = (field: string, operator: string, value: unknown, conv: Convert = convert.default): Condition =>
   new Condition(field, operator, conv.from(value) as JsonValue);

package/src/data/Field.ts

@@ -1,5 +1,5 @@
 import { Property } from '../utils';
-import { Condition, toCondition } from './Condition';
+import { Condition, SortCondition, toCondition } from "./Condition";
 import { toArray } from '../types';
 
 export class Field extends Property {
@@ -21,5 +21,9 @@ export class Field extends Property {
 
   lessEqual = (value: unknown): Condition => this.condition('lte', value);
 
+  asc = (): SortCondition => new SortCondition(this.property, -1)
+
+  desc = (): SortCondition => new SortCondition(this.property, 1)
+
   protected condition = (operator: string, value: unknown): Condition => toCondition(this.property, operator, value, this.options?.convert);
 }

package/src/utils/View.ts

@@ -5,26 +5,28 @@ import { choose } from './Case';
 type Func<T = unknown> = (a: any) => T;
 
 export type InOut = { in?: Func | View, col?: string };
-export const isInOut = (v: unknown): v is InOut => isObject(v) && isDefined(v.col) && (isFunction(v.in) || v.in instanceof View);
 export const isColOnly = (v: unknown): v is InOut => isObject(v) && isDefined(v.col) && !isDefined(v.in);
 export const isInOnly = (v: unknown): v is InOut => isObject(v) && !isDefined(v.col) && isFunction(v.in);
+export const isInOutWithFunction = (v: unknown): v is { col: string, in: Func } => isObject(v) && isDefined(v.col) && isFunction(v.in);
+export const isInOutWithView = (v: unknown): v is { col: string, in: View } => isObject(v) && isDefined(v.col) && v.in instanceof View;
 
 export type Views = { [key: string]: string | Func | InOut };
 export type Viewer = { in?: { key: string, f?: Func } };
 
-const toFunc = (a: unknown, key: string, io: InOut): Func =>
-  choose<Func, InOut>(io)
-    .case(i => isDefined(i.col) && !isDefined(i.in), (i: InOut) => (a: any) => traverse(a, i.col))
-    .else(() => undefined);
+const toFunc = (a: any, col: string, f: Func = a => a): Func => a => f(traverse(a, col));
 
-const toViewer = (key: string, value: unknown): Viewer =>
-  choose<Viewer>(value)
-    .type(isString, s => toViewer(key, (a: any) => traverse(a, s)))
+const toViewer = (key: string, value: unknown): Viewer => {
+  const k = key;
+  const v = value;
+  return choose<Viewer>(value)
+    .type(isString, s => toViewer(key, (a: any) => toFunc(a, s)(a)))
     .type(isColOnly, io => toViewer(key, io.col))
     .type(isFunction, f => toViewer(key, { in: { key, f } }))
     .type(isInOnly, io => toViewer(key, { in: { key, f: io.in } }))
-    .type(isInOut, io => toViewer(key, (a: any) => io?.in && (io.in instanceof View ? io.in.from(traverse(a, io.col)) : io.in(traverse(a, io.col)))))
+    .type(isInOutWithFunction, io => toViewer(key, { in: { key, f: (a: any) => toFunc(a, io.col, io.in)(a) }}))
+    .type(isInOutWithView, io => toViewer(key, { in: { key, f: (a: any) => toFunc(a, io.col, io.in.from)(a) }}))
     .else(m => m as Viewer);
+};
 
 export const toViewers = (views: Views): Viewer[] =>
   meta(views)