@thisisagile/easy 14.1.5 → 14.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/PageList.d.ts +6 -8
- package/dist/types/PageList.js +9 -15
- package/dist/types/PageList.js.map +1 -1
- package/package.json +2 -2
- package/src/types/PageList.ts +15 -20
package/dist/types/PageList.d.ts
CHANGED
|
@@ -23,20 +23,18 @@ export type PageOptions = {
|
|
|
23
23
|
sorts?: PlainSort;
|
|
24
24
|
filters?: Filter[];
|
|
25
25
|
};
|
|
26
|
+
export type PageListOptions = Exclude<PageOptions, 'sort'> & {
|
|
27
|
+
total?: number;
|
|
28
|
+
};
|
|
26
29
|
export declare class PageList<T> extends List<T> {
|
|
27
|
-
private
|
|
28
|
-
private
|
|
29
|
-
private _total?;
|
|
30
|
-
private _sorts?;
|
|
31
|
-
private _filters?;
|
|
32
|
-
setPageOptions(options?: PageOptions & {
|
|
33
|
-
total?: number;
|
|
34
|
-
}): this;
|
|
30
|
+
private _options?;
|
|
31
|
+
private setPageOptions;
|
|
35
32
|
get take(): number;
|
|
36
33
|
get skip(): number;
|
|
37
34
|
get total(): Optional<number>;
|
|
38
35
|
get sorts(): Optional<PlainSort>;
|
|
39
36
|
get filters(): Optional<Filter[]>;
|
|
37
|
+
get options(): Optional<PageListOptions>;
|
|
40
38
|
asc(p: GetProperty<T, any>): PageList<T>;
|
|
41
39
|
desc(p: GetProperty<T, any>): PageList<T>;
|
|
42
40
|
diff(others: ArrayLike<T>): PageList<T>;
|
package/dist/types/PageList.js
CHANGED
|
@@ -15,33 +15,27 @@ const toShortFilter = (field, shortField, value) => ({
|
|
|
15
15
|
});
|
|
16
16
|
exports.toShortFilter = toShortFilter;
|
|
17
17
|
class PageList extends List_1.List {
|
|
18
|
-
constructor() {
|
|
19
|
-
super(...arguments);
|
|
20
|
-
this._take = 250;
|
|
21
|
-
this._skip = 0;
|
|
22
|
-
}
|
|
23
18
|
setPageOptions(options) {
|
|
24
|
-
this.
|
|
25
|
-
this._skip = options?.skip ?? 0;
|
|
26
|
-
this._total = options?.total;
|
|
27
|
-
this._sorts = options?.sorts;
|
|
28
|
-
this._filters = options?.filters;
|
|
19
|
+
this._options = options;
|
|
29
20
|
return this;
|
|
30
21
|
}
|
|
31
22
|
get take() {
|
|
32
|
-
return this.
|
|
23
|
+
return this._options?.take ?? 250;
|
|
33
24
|
}
|
|
34
25
|
get skip() {
|
|
35
|
-
return this.
|
|
26
|
+
return this._options?.skip ?? 0;
|
|
36
27
|
}
|
|
37
28
|
get total() {
|
|
38
|
-
return this.
|
|
29
|
+
return this._options?.total;
|
|
39
30
|
}
|
|
40
31
|
get sorts() {
|
|
41
|
-
return this.
|
|
32
|
+
return this._options?.sorts;
|
|
42
33
|
}
|
|
43
34
|
get filters() {
|
|
44
|
-
return this.
|
|
35
|
+
return this._options?.filters;
|
|
36
|
+
}
|
|
37
|
+
get options() {
|
|
38
|
+
return this._options;
|
|
45
39
|
}
|
|
46
40
|
asc(p) {
|
|
47
41
|
return (0, exports.toPageList)(super.asc(p), this);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PageList.js","sourceRoot":"","sources":["../../src/types/PageList.ts"],"names":[],"mappings":";;;AAAA,iCAAsC;AACtC,+CAAuD;AACvD,+BAA4B;AAK5B,6BAAgC;AAChC,iCAAgC;AAKzB,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,KAAU,EAAU,EAAE,CAAC,IAAA,qBAAa,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAArF,QAAA,QAAQ,YAA6E;AAC3F,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,UAAkB,EAAE,KAAU,EAAU,EAAE,CAAC,CAAC;IACvF,KAAK;IACL,UAAU;IACV,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;CACpB,CAAC,CAAC;AAJU,QAAA,aAAa,iBAIvB;
|
|
1
|
+
{"version":3,"file":"PageList.js","sourceRoot":"","sources":["../../src/types/PageList.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy",
|
|
3
|
-
"version": "14.1.
|
|
3
|
+
"version": "14.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": "14.1.
|
|
34
|
+
"@thisisagile/easy-test": "14.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/PageList.ts
CHANGED
|
@@ -19,41 +19,36 @@ export const toShortFilter = (field: string, shortField: string, value: any): Fi
|
|
|
19
19
|
});
|
|
20
20
|
|
|
21
21
|
export type PageOptions = { take?: number; skip?: number; sort?: Sort[]; sorts?: PlainSort; filters?: Filter[] };
|
|
22
|
+
export type PageListOptions = Exclude<PageOptions, 'sort'> & { total?: number };
|
|
22
23
|
|
|
23
24
|
export class PageList<T> extends List<T> {
|
|
24
|
-
private
|
|
25
|
-
|
|
26
|
-
private
|
|
27
|
-
|
|
28
|
-
private _filters?: Filter[];
|
|
29
|
-
|
|
30
|
-
setPageOptions(options?: PageOptions & { total?: number }): this {
|
|
31
|
-
this._take = options?.take ?? 250;
|
|
32
|
-
this._skip = options?.skip ?? 0;
|
|
33
|
-
this._total = options?.total;
|
|
34
|
-
this._sorts = options?.sorts;
|
|
35
|
-
this._filters = options?.filters;
|
|
25
|
+
private _options?: PageListOptions;
|
|
26
|
+
|
|
27
|
+
private setPageOptions(options?: PageListOptions): this {
|
|
28
|
+
this._options = options;
|
|
36
29
|
return this;
|
|
37
30
|
}
|
|
38
|
-
|
|
39
31
|
get take(): number {
|
|
40
|
-
return this.
|
|
32
|
+
return this._options?.take ?? 250;
|
|
41
33
|
}
|
|
42
34
|
|
|
43
35
|
get skip(): number {
|
|
44
|
-
return this.
|
|
36
|
+
return this._options?.skip ?? 0;
|
|
45
37
|
}
|
|
46
38
|
|
|
47
39
|
get total(): Optional<number> {
|
|
48
|
-
return this.
|
|
40
|
+
return this._options?.total
|
|
49
41
|
}
|
|
50
42
|
|
|
51
43
|
get sorts(): Optional<PlainSort> {
|
|
52
|
-
return this.
|
|
44
|
+
return this._options?.sorts
|
|
53
45
|
}
|
|
54
46
|
|
|
55
47
|
get filters(): Optional<Filter[]> {
|
|
56
|
-
return this.
|
|
48
|
+
return this._options?.filters
|
|
49
|
+
}
|
|
50
|
+
get options(): Optional<PageListOptions> {
|
|
51
|
+
return this._options;
|
|
57
52
|
}
|
|
58
53
|
|
|
59
54
|
asc(p: GetProperty<T, any>): PageList<T> {
|
|
@@ -153,12 +148,12 @@ export class PageList<T> extends List<T> {
|
|
|
153
148
|
export const isPageList = <T>(l?: unknown): l is PageList<T> => isList<T>(l) && isA(l, 'total');
|
|
154
149
|
|
|
155
150
|
export const toPageList = <T>(items: T[] = [], options?: Omit<PageOptions, 'sort'> & { total?: number }): PageList<T> =>
|
|
156
|
-
choose(items)
|
|
151
|
+
(choose(items)
|
|
157
152
|
.case(
|
|
158
153
|
i => i.length === 1 && isNumber(i[0]),
|
|
159
154
|
i => new PageList<T>().add(...i)
|
|
160
155
|
)
|
|
161
|
-
.else(i => new PageList<T>(...i))
|
|
156
|
+
.else(i => new PageList<T>(...i)) as any)
|
|
162
157
|
.setPageOptions(options);
|
|
163
158
|
|
|
164
159
|
/* @deprecated No longer needed as the PageList is now a class that extends from List, use the map function */
|