@thisisagile/easy 15.1.3 → 15.1.6
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/types/Array.d.ts +1 -0
- package/dist/types/Array.js +7 -2
- package/dist/types/Array.js.map +1 -1
- package/dist/types/Uri.d.ts +2 -2
- package/dist/types/Uri.js +1 -1
- package/dist/types/Uri.js.map +1 -1
- package/package.json +2 -2
- package/src/types/Array.ts +10 -3
- package/src/types/Uri.ts +2 -2
package/dist/types/Array.d.ts
CHANGED
|
@@ -4,4 +4,5 @@ export declare const toArray: <T>(...items: ArrayLike<T>) => T[];
|
|
|
4
4
|
export declare const toObject: <T>(key: keyof T, ...items: ArrayLike<T>) => Record<string | number | symbol, T>;
|
|
5
5
|
export declare const array: {
|
|
6
6
|
merge: (first?: any[], second?: any[], firstKey?: string, secondKey?: string) => any[];
|
|
7
|
+
switch: <T>(items: T[] | undefined, item: T) => T[];
|
|
7
8
|
};
|
package/dist/types/Array.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.array = exports.toObject = exports.toArray = void 0;
|
|
4
4
|
const Is_1 = require("./Is");
|
|
5
|
+
const Constructor_1 = require("./Constructor");
|
|
5
6
|
const toArray = (...items) => items.length > 1 ? items : (0, Is_1.isArray)(items[0]) ? items[0] : (0, Is_1.isDefined)(items[0]) ? [items[0]] : [];
|
|
6
7
|
exports.toArray = toArray;
|
|
7
8
|
const toObject = (key, ...items) => (0, exports.toArray)(...items).reduce((o, i) => {
|
|
@@ -10,9 +11,13 @@ const toObject = (key, ...items) => (0, exports.toArray)(...items).reduce((o, i)
|
|
|
10
11
|
}, {});
|
|
11
12
|
exports.toObject = toObject;
|
|
12
13
|
exports.array = {
|
|
13
|
-
merge: (first = [], second = [], firstKey =
|
|
14
|
+
merge: (first = [], second = [], firstKey = "id", secondKey = "id") => first.map(f => ({
|
|
14
15
|
...f,
|
|
15
|
-
...second.find(s => (0, Is_1.isDefined)(s[secondKey]) && (0, Is_1.isDefined)(f[firstKey]) && s[secondKey] === f[firstKey])
|
|
16
|
+
...second.find(s => (0, Is_1.isDefined)(s[secondKey]) && (0, Is_1.isDefined)(f[firstKey]) && s[secondKey] === f[firstKey])
|
|
16
17
|
})),
|
|
18
|
+
switch: (items = [], item) => (0, Constructor_1.use)([...items], res => {
|
|
19
|
+
(0, Constructor_1.on)(res.indexOf(item), i => (i !== -1 ? res.splice(i, 1) : res.push(item)));
|
|
20
|
+
return res;
|
|
21
|
+
})
|
|
17
22
|
};
|
|
18
23
|
//# sourceMappingURL=Array.js.map
|
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;AAC1C,+CAAwC;AAKjC,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,EAAuC,EAAE,CACvG,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;IACL,MAAM,EAAE,CAAI,QAAa,EAAE,EAAE,IAAO,EAAO,EAAE,CAAC,IAAA,iBAAG,EAAC,CAAC,GAAG,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE;QAClE,IAAA,gBAAE,EAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3E,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;CACH,CAAC"}
|
package/dist/types/Uri.d.ts
CHANGED
|
@@ -27,7 +27,7 @@ export type Uri = {
|
|
|
27
27
|
id: (id?: unknown) => Uri;
|
|
28
28
|
ids: (ids: OneOrMore<unknown>) => Uri;
|
|
29
29
|
query: (q?: unknown) => Uri;
|
|
30
|
-
sort: (q?:
|
|
30
|
+
sort: (q?: any) => Uri;
|
|
31
31
|
skip: (n?: number) => Uri;
|
|
32
32
|
take: (n?: number) => Uri;
|
|
33
33
|
path: string;
|
|
@@ -61,7 +61,7 @@ export declare class EasyUri<Props = UriExpandProps> implements Uri {
|
|
|
61
61
|
id: (id?: unknown) => this;
|
|
62
62
|
ids: (ids: OneOrMore<unknown>) => this;
|
|
63
63
|
query: (q?: unknown) => this;
|
|
64
|
-
sort: (s?:
|
|
64
|
+
sort: (s?: any) => this;
|
|
65
65
|
skip: (index?: number) => this;
|
|
66
66
|
take: (items?: number) => this;
|
|
67
67
|
expand(props: Partial<Props>): this;
|
package/dist/types/Uri.js
CHANGED
|
@@ -43,7 +43,7 @@ class EasyUri {
|
|
|
43
43
|
this.id = (id) => this.set(EasyUri.id, id);
|
|
44
44
|
this.ids = (ids) => this.set(EasyUri.ids, (0, Array_1.toArray)(ids).join(','));
|
|
45
45
|
this.query = (q) => this.set(EasyUri.query, q);
|
|
46
|
-
this.sort = (s) => this.set(EasyUri.sort, s);
|
|
46
|
+
this.sort = (s) => this.set(EasyUri.sort, (0, Text_1.asString)(s));
|
|
47
47
|
this.skip = (index) => this.set(EasyUri.skip, index);
|
|
48
48
|
this.take = (items) => this.set(EasyUri.take, items);
|
|
49
49
|
}
|
package/dist/types/Uri.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Uri.js","sourceRoot":"","sources":["../../src/types/Uri.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Uri.js","sourceRoot":"","sources":["../../src/types/Uri.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy",
|
|
3
|
-
"version": "15.1.
|
|
3
|
+
"version": "15.1.6",
|
|
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": "15.1.
|
|
34
|
+
"@thisisagile/easy-test": "15.1.6",
|
|
35
35
|
"@types/form-urlencoded": "^4.4.0",
|
|
36
36
|
"@types/jsonwebtoken": "^8.5.9",
|
|
37
37
|
"@types/luxon": "3.2.0",
|
package/src/types/Array.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { isArray, isDefined } from
|
|
1
|
+
import { isArray, isDefined } from "./Is";
|
|
2
|
+
import { on, use } from "./Constructor";
|
|
2
3
|
|
|
3
4
|
export type OneOrMore<T> = T | Array<T>;
|
|
4
5
|
export type ArrayLike<T> = OneOrMore<T>[];
|
|
@@ -13,9 +14,15 @@ export const toObject = <T>(key: keyof T, ...items: ArrayLike<T>): Record<string
|
|
|
13
14
|
}, {});
|
|
14
15
|
|
|
15
16
|
export const array = {
|
|
16
|
-
merge: (first: any[] = [], second: any[] = [], firstKey =
|
|
17
|
+
merge: (first: any[] = [], second: any[] = [], firstKey = "id", secondKey = "id"): any[] =>
|
|
17
18
|
first.map(f => ({
|
|
18
19
|
...f,
|
|
19
|
-
...second.find(s => isDefined(s[secondKey]) && isDefined(f[firstKey]) && s[secondKey] === f[firstKey])
|
|
20
|
+
...second.find(s => isDefined(s[secondKey]) && isDefined(f[firstKey]) && s[secondKey] === f[firstKey])
|
|
20
21
|
})),
|
|
22
|
+
switch: <T>(items: T[] = [], item: T): T[] => use([...items], res => {
|
|
23
|
+
on(res.indexOf(item), i => (i !== -1 ? res.splice(i, 1) : res.push(item)));
|
|
24
|
+
return res;
|
|
25
|
+
})
|
|
21
26
|
};
|
|
27
|
+
|
|
28
|
+
// export const objectify = <T>(items: T[], f: (a: any, p: T) => void): any => items.reduce((acc: any, p: T) => on(acc, a => f(a, p)), {});
|
package/src/types/Uri.ts
CHANGED
|
@@ -46,7 +46,7 @@ export type Uri = {
|
|
|
46
46
|
id: (id?: unknown) => Uri;
|
|
47
47
|
ids: (ids: OneOrMore<unknown>) => Uri;
|
|
48
48
|
query: (q?: unknown) => Uri;
|
|
49
|
-
sort: (q?:
|
|
49
|
+
sort: (q?: any) => Uri;
|
|
50
50
|
skip: (n?: number) => Uri;
|
|
51
51
|
take: (n?: number) => Uri;
|
|
52
52
|
path: string;
|
|
@@ -111,7 +111,7 @@ export class EasyUri<Props = UriExpandProps> implements Uri {
|
|
|
111
111
|
id = (id?: unknown): this => this.set(EasyUri.id, id);
|
|
112
112
|
ids = (ids: OneOrMore<unknown>): this => this.set(EasyUri.ids, toArray(ids).join(','));
|
|
113
113
|
query = (q?: unknown): this => this.set(EasyUri.query, q);
|
|
114
|
-
sort = (s?:
|
|
114
|
+
sort = (s?: any): this => this.set(EasyUri.sort, asString(s));
|
|
115
115
|
|
|
116
116
|
skip = (index?: number): this => this.set(EasyUri.skip, index);
|
|
117
117
|
take = (items?: number): this => this.set(EasyUri.take, items);
|