@thisisagile/easy 11.8.7 → 12.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/data/Condition.d.ts +1 -0
- package/dist/data/Condition.js +3 -1
- package/dist/data/Condition.js.map +1 -1
- package/dist/data/Field.d.ts +3 -2
- package/dist/data/Field.js +3 -1
- package/dist/data/Field.js.map +1 -1
- package/dist/types/Array.d.ts +2 -1
- package/dist/types/Array.js.map +1 -1
- package/dist/utils/Property.d.ts +1 -0
- package/dist/utils/Property.js +3 -0
- package/dist/utils/Property.js.map +1 -1
- package/package.json +2 -2
- package/src/data/Condition.ts +3 -1
- package/src/data/Field.ts +5 -3
- package/src/types/Array.ts +2 -1
- package/src/utils/Property.ts +4 -0
package/dist/data/Condition.d.ts
CHANGED
|
@@ -22,3 +22,4 @@ export declare class SortCondition extends Condition implements Sort {
|
|
|
22
22
|
toJSON(): Json;
|
|
23
23
|
}
|
|
24
24
|
export declare const toCondition: (field: string, operator: string, value: unknown, conv?: Convert) => Condition;
|
|
25
|
+
export declare const isSortCondition: (s?: unknown) => s is SortCondition;
|
package/dist/data/Condition.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.toCondition = exports.SortCondition = exports.LogicalCondition = exports.Condition = void 0;
|
|
3
|
+
exports.isSortCondition = exports.toCondition = exports.SortCondition = exports.LogicalCondition = exports.Condition = void 0;
|
|
4
4
|
const types_1 = require("../types");
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
6
|
class Condition {
|
|
@@ -39,4 +39,6 @@ class SortCondition extends Condition {
|
|
|
39
39
|
exports.SortCondition = SortCondition;
|
|
40
40
|
const toCondition = (field, operator, value, conv = utils_1.convert.default) => new Condition(field, operator, conv.from(value));
|
|
41
41
|
exports.toCondition = toCondition;
|
|
42
|
+
const isSortCondition = (s) => (0, types_1.isDefined)(s) && s instanceof SortCondition;
|
|
43
|
+
exports.isSortCondition = isSortCondition;
|
|
42
44
|
//# sourceMappingURL=Condition.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Condition.js","sourceRoot":"","sources":["../../src/data/Condition.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"Condition.js","sourceRoot":"","sources":["../../src/data/Condition.ts"],"names":[],"mappings":";;;AAAA,oCAAkE;AAClE,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;AAEzD,MAAM,eAAe,GAAG,CAAC,CAAW,EAAsB,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,CAAC,YAAY,aAAa,CAAC;AAAlG,QAAA,eAAe,mBAAmF"}
|
package/dist/data/Field.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Property } from
|
|
2
|
-
import { Condition, SortCondition } from
|
|
1
|
+
import { Property } from "../utils";
|
|
2
|
+
import { Condition, SortCondition } from "./Condition";
|
|
3
3
|
export declare class Field extends Property {
|
|
4
4
|
is: (value: unknown) => Condition;
|
|
5
5
|
isNot: (value: unknown) => Condition;
|
|
@@ -14,3 +14,4 @@ export declare class Field extends Property {
|
|
|
14
14
|
desc: () => SortCondition;
|
|
15
15
|
protected condition: (operator: string, value: unknown) => Condition;
|
|
16
16
|
}
|
|
17
|
+
export declare const isField: (f?: unknown) => f is Field;
|
package/dist/data/Field.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Field = void 0;
|
|
3
|
+
exports.isField = exports.Field = void 0;
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
5
|
const Condition_1 = require("./Condition");
|
|
6
6
|
const types_1 = require("../types");
|
|
@@ -22,4 +22,6 @@ class Field extends utils_1.Property {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
exports.Field = Field;
|
|
25
|
+
const isField = (f) => (0, types_1.isDefined)(f) && f instanceof Field;
|
|
26
|
+
exports.isField = isField;
|
|
25
27
|
//# sourceMappingURL=Field.js.map
|
package/dist/data/Field.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Field.js","sourceRoot":"","sources":["../../src/data/Field.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,2CAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"Field.js","sourceRoot":"","sources":["../../src/data/Field.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,2CAAoE;AACpE,oCAA8C;AAE9C,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,CAAC;QAEhE,SAAI,GAAG,GAAkB,EAAE,CAAC,IAAI,yBAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAEtD,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;AAEM,MAAM,OAAO,GAAG,CAAC,CAAW,EAAc,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC;AAA1E,QAAA,OAAO,WAAmE"}
|
package/dist/types/Array.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Json } from './Json';
|
|
2
|
-
export declare type
|
|
2
|
+
export declare type OneOrMore<T> = T | Array<T>;
|
|
3
|
+
export declare type ArrayLike<T> = OneOrMore<T>[];
|
|
3
4
|
export declare const toArray: <T>(...items: ArrayLike<T>) => T[];
|
|
4
5
|
export declare const toObject: <T>(key: keyof T, ...items: ArrayLike<T>) => Json;
|
|
5
6
|
export declare const array: {
|
package/dist/types/Array.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Array.js","sourceRoot":"","sources":["../../src/types/Array.ts"],"names":[],"mappings":";;;AAAA,6BAA0C;
|
|
1
|
+
{"version":3,"file":"Array.js","sourceRoot":"","sources":["../../src/types/Array.ts"],"names":[],"mappings":";;;AAAA,6BAA0C;AAMnC,MAAM,OAAO,GAAG,CAAI,GAAG,KAAmB,EAAO,EAAE,CACxD,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAE,KAAa,CAAC,CAAC,CAAC,IAAA,YAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,cAAS,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAD9F,QAAA,OAAO,WACuF;AAEpG,MAAM,QAAQ,GAAG,CAAI,GAAY,EAAE,GAAG,KAAmB,EAAQ,EAAE,CACxE,IAAA,eAAO,EAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,CAAC,EAAE,EAAE;IACrC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACd,OAAO,CAAC,CAAC;AACX,CAAC,EAAE,EAAE,CAAC,CAAC;AAJI,QAAA,QAAQ,YAIZ;AAEI,QAAA,KAAK,GAAG;IACnB,KAAK,EAAE,CAAC,QAAe,EAAE,EAAE,SAAgB,EAAE,EAAE,QAAQ,GAAG,IAAI,EAAE,SAAS,GAAG,IAAI,EAAS,EAAE,CACzF,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,GAAG,CAAC;QACJ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,cAAS,EAAC,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,IAAA,cAAS,EAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC;KACvG,CAAC,CAAC;CACN,CAAC"}
|
package/dist/utils/Property.d.ts
CHANGED
package/dist/utils/Property.js
CHANGED
|
@@ -11,6 +11,9 @@ class Property {
|
|
|
11
11
|
this.out = (source = {}, key = '') => this.options?.convert?.from(source[key]);
|
|
12
12
|
this.options = { ...options, convert: options?.convert ?? Convert_1.convert.default };
|
|
13
13
|
}
|
|
14
|
+
toString() {
|
|
15
|
+
return this.property;
|
|
16
|
+
}
|
|
14
17
|
}
|
|
15
18
|
exports.Property = Property;
|
|
16
19
|
//# sourceMappingURL=Property.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Property.js","sourceRoot":"","sources":["../../src/utils/Property.ts"],"names":[],"mappings":";;;AAAA,uCAA6C;AAC7C,oCAAuD;AASvD,MAAa,QAAQ;IACnB,YAAqB,QAAgB,EAAW,OAAyB;QAApD,aAAQ,GAAR,QAAQ,CAAQ;QAAW,YAAO,GAAP,OAAO,CAAkB;QAIzE,OAAE,GAAG,CAAC,SAAe,EAAE,EAAa,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAA,aAAK,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QACrH,QAAG,GAAG,CAAC,SAAe,EAAE,EAAE,GAAG,GAAG,EAAE,EAAa,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAJzF,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,iBAAO,CAAC,OAAO,EAAE,CAAC;IAC9E,CAAC;
|
|
1
|
+
{"version":3,"file":"Property.js","sourceRoot":"","sources":["../../src/utils/Property.ts"],"names":[],"mappings":";;;AAAA,uCAA6C;AAC7C,oCAAuD;AASvD,MAAa,QAAQ;IACnB,YAAqB,QAAgB,EAAW,OAAyB;QAApD,aAAQ,GAAR,QAAQ,CAAQ;QAAW,YAAO,GAAP,OAAO,CAAkB;QAIzE,OAAE,GAAG,CAAC,SAAe,EAAE,EAAa,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAA,aAAK,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QACrH,QAAG,GAAG,CAAC,SAAe,EAAE,EAAE,GAAG,GAAG,EAAE,EAAa,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAJzF,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,iBAAO,CAAC,OAAO,EAAE,CAAC;IAC9E,CAAC;IAKD,QAAQ;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AAXD,4BAWC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "12.0.0",
|
|
4
4
|
"description": "Straightforward library for building domain-driven microservice architectures",
|
|
5
5
|
"author": "Sander Hoogendoorn",
|
|
6
6
|
"license": "MIT",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"access": "public"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@thisisagile/easy-test": "
|
|
34
|
+
"@thisisagile/easy-test": "12.0.0",
|
|
35
35
|
"@types/form-urlencoded": "^4.4.0",
|
|
36
36
|
"@types/jsonwebtoken": "^8.5.8",
|
|
37
37
|
"@types/luxon": "3.0.0",
|
package/src/data/Condition.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { json, Json, JsonValue, Sort } from '../types';
|
|
1
|
+
import { isDefined, json, Json, JsonValue, Sort } from '../types';
|
|
2
2
|
import { convert, Convert } from '../utils';
|
|
3
3
|
|
|
4
4
|
export class Condition {
|
|
@@ -32,3 +32,5 @@ export class SortCondition extends Condition implements Sort {
|
|
|
32
32
|
|
|
33
33
|
export const toCondition = (field: string, operator: string, value: unknown, conv: Convert = convert.default): Condition =>
|
|
34
34
|
new Condition(field, operator, conv.from(value) as JsonValue);
|
|
35
|
+
|
|
36
|
+
export const isSortCondition = (s?: unknown): s is SortCondition => isDefined(s) && s instanceof SortCondition;
|
package/src/data/Field.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Property } from
|
|
2
|
-
import { Condition, SortCondition, toCondition } from
|
|
3
|
-
import { toArray } from
|
|
1
|
+
import { Property } from "../utils";
|
|
2
|
+
import { Condition, SortCondition, toCondition } from "./Condition";
|
|
3
|
+
import { isDefined, toArray } from "../types";
|
|
4
4
|
|
|
5
5
|
export class Field extends Property {
|
|
6
6
|
is = (value: unknown): Condition => this.condition('eq', value);
|
|
@@ -27,3 +27,5 @@ export class Field extends Property {
|
|
|
27
27
|
|
|
28
28
|
protected condition = (operator: string, value: unknown): Condition => toCondition(this.property, operator, value, this.options?.convert);
|
|
29
29
|
}
|
|
30
|
+
|
|
31
|
+
export const isField = (f?: unknown): f is Field => isDefined(f) && f instanceof Field;
|
package/src/types/Array.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { isArray, isDefined } from './Is';
|
|
2
2
|
import { Json } from './Json';
|
|
3
3
|
|
|
4
|
-
export type
|
|
4
|
+
export type OneOrMore<T> = T | Array<T>;
|
|
5
|
+
export type ArrayLike<T> = OneOrMore<T>[];
|
|
5
6
|
|
|
6
7
|
export const toArray = <T>(...items: ArrayLike<T>): T[] =>
|
|
7
8
|
items.length > 1 ? (items as T[]) : isArray(items[0]) ? items[0] : isDefined(items[0]) ? [items[0]] : [];
|
package/src/utils/Property.ts
CHANGED
|
@@ -15,4 +15,8 @@ export class Property<T = unknown> implements Mapping {
|
|
|
15
15
|
|
|
16
16
|
in = (source: Json = {}): JsonValue => this.options?.convert?.to(source[this.property] ?? ofGet(this.options?.dflt));
|
|
17
17
|
out = (source: Json = {}, key = ''): JsonValue => this.options?.convert?.from(source[key]);
|
|
18
|
+
|
|
19
|
+
toString() {
|
|
20
|
+
return this.property;
|
|
21
|
+
}
|
|
18
22
|
}
|