@thisisagile/easy 10.6.0 → 10.7.2
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/domain/Repo.d.ts +5 -5
- package/dist/domain/Repo.js +8 -8
- package/dist/domain/Repo.js.map +1 -1
- package/dist/process/Search.d.ts +4 -4
- package/dist/process/Search.js +4 -4
- package/dist/process/Search.js.map +1 -1
- package/dist/types/PageList.d.ts +2 -2
- package/dist/types/Uri.d.ts +6 -0
- package/dist/types/Uri.js +4 -0
- package/dist/types/Uri.js.map +1 -1
- package/package.json +2 -2
- package/src/domain/Repo.ts +24 -10
- package/src/process/Search.ts +6 -5
- package/src/types/PageList.ts +2 -2
- package/src/types/Uri.ts +7 -0
package/dist/domain/Repo.d.ts
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import { Constructor, Gateway, Id, Json, JsonValue, Key, PageList } from '../types';
|
|
1
|
+
import { Constructor, Gateway, Id, Json, JsonValue, Key, PageList, PageOptions } from '../types';
|
|
2
2
|
import { Struct } from './Struct';
|
|
3
3
|
export declare class Repo<T extends Struct> {
|
|
4
4
|
protected ctor: Constructor<T>;
|
|
5
5
|
private readonly gateway;
|
|
6
6
|
constructor(ctor: Constructor<T>, gateway: Gateway);
|
|
7
7
|
create: (item: T | Json) => T;
|
|
8
|
-
all(): Promise<PageList<T>>;
|
|
8
|
+
all(options?: PageOptions): Promise<PageList<T>>;
|
|
9
9
|
byId(id: Id): Promise<T>;
|
|
10
10
|
byIds(...ids: Id[]): Promise<PageList<T>>;
|
|
11
|
-
byKey(key: Key): Promise<PageList<T>>;
|
|
12
|
-
by(key: keyof T, value: JsonValue): Promise<PageList<T>>;
|
|
13
|
-
search(q: JsonValue): Promise<PageList<T>>;
|
|
11
|
+
byKey(key: Key, options?: PageOptions): Promise<PageList<T>>;
|
|
12
|
+
by(key: keyof T, value: JsonValue, options?: PageOptions): Promise<PageList<T>>;
|
|
13
|
+
search(q: JsonValue, options?: PageOptions): Promise<PageList<T>>;
|
|
14
14
|
exists(id: Id): Promise<boolean>;
|
|
15
15
|
add(t: T | Json): Promise<T>;
|
|
16
16
|
update(id: Id, json: Json): Promise<T>;
|
package/dist/domain/Repo.js
CHANGED
|
@@ -10,8 +10,8 @@ class Repo {
|
|
|
10
10
|
this.gateway = gateway;
|
|
11
11
|
this.create = (item) => ((0, types_1.isValidatable)(item) ? item : new this.ctor(item));
|
|
12
12
|
}
|
|
13
|
-
all() {
|
|
14
|
-
return this.gateway.all().then(js => js.map(j => new this.ctor(j)));
|
|
13
|
+
all(options) {
|
|
14
|
+
return this.gateway.all(options).then(js => js.map(j => new this.ctor(j)));
|
|
15
15
|
}
|
|
16
16
|
byId(id) {
|
|
17
17
|
return this.gateway
|
|
@@ -22,14 +22,14 @@ class Repo {
|
|
|
22
22
|
byIds(...ids) {
|
|
23
23
|
return this.gateway.byIds(...ids).then(j => (0, types_1.asList)(this.ctor, j));
|
|
24
24
|
}
|
|
25
|
-
byKey(key) {
|
|
26
|
-
return this.gateway.by('key', key).then(js => js.map(j => new this.ctor(j)));
|
|
25
|
+
byKey(key, options) {
|
|
26
|
+
return this.gateway.by('key', key, options).then(js => js.map(j => new this.ctor(j)));
|
|
27
27
|
}
|
|
28
|
-
by(key, value) {
|
|
29
|
-
return this.gateway.by(key.toString(), value).then(js => js.map(j => new this.ctor(j)));
|
|
28
|
+
by(key, value, options) {
|
|
29
|
+
return this.gateway.by(key.toString(), value, options).then(js => js.map(j => new this.ctor(j)));
|
|
30
30
|
}
|
|
31
|
-
search(q) {
|
|
32
|
-
return this.gateway.search(q).then(js => js.map(j => new this.ctor(j)));
|
|
31
|
+
search(q, options) {
|
|
32
|
+
return this.gateway.search(q, options).then(js => js.map(j => new this.ctor(j)));
|
|
33
33
|
}
|
|
34
34
|
exists(id) {
|
|
35
35
|
return this.gateway.exists(id);
|
package/dist/domain/Repo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Repo.js","sourceRoot":"","sources":["../../src/domain/Repo.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"Repo.js","sourceRoot":"","sources":["../../src/domain/Repo.ts"],"names":[],"mappings":";;;AAAA,oCAakB;AAClB,8CAAqC;AACrC,oCAA2C;AAG3C,MAAa,IAAI;IACf,YAAsB,IAAoB,EAAmB,OAAgB;QAAvD,SAAI,GAAJ,IAAI,CAAgB;QAAmB,YAAO,GAAP,OAAO,CAAS;QAG7E,WAAM,GAAG,CAAC,IAAc,EAAK,EAAE,CAAC,CAAC,IAAA,qBAAa,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAFnF,CAAC;IAID,GAAG,CAAC,OAAqB;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,CAAC,EAAM;QACT,OAAO,IAAI,CAAC,OAAO;aAChB,IAAI,CAAC,EAAE,CAAC;aACR,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAI,EAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,iBAAS,CAAC,YAAY,CAAC,CAAC;aAC/D,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,GAAG,GAAS;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,cAAM,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,GAAQ,EAAE,OAAqB;QACnC,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxF,CAAC;IAED,EAAE,CAAC,GAAY,EAAE,KAAgB,EAAE,OAAqB;QACtD,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnG,CAAC;IAED,MAAM,CAAC,CAAY,EAAE,OAAqB;QACxC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,CAAC,EAAM;QACX,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,GAAG,CAAC,CAAW;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;aAC/B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAI,EAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;aACvC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;aAC3B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,CAAC,CAAC;aACtC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,EAAM,EAAE,IAAU;QACvB,OAAO,IAAI,CAAC,OAAO;aAChB,IAAI,CAAC,EAAE,CAAC;aACR,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAI,EAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,iBAAS,CAAC,YAAY,CAAC,CAAC;aAC/D,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAM,CAAC;aAC7C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;aACzB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAI,EAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;aACvC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;aAC3B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,CAAC,CAAC;aACzC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,EAAM;QACX,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,IAAO;QACZ,OAAO,IAAA,eAAO,EAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,QAAQ,CAAC,IAAO;QACd,OAAO,IAAA,eAAO,EAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,EAAM,EAAE,IAAU;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,iBAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3G,CAAC;CACF;AAxED,oBAwEC"}
|
package/dist/process/Search.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { Repo, Struct } from '../domain';
|
|
2
|
-
import { Id, JsonValue, Key, PageList } from '../types';
|
|
2
|
+
import { Id, JsonValue, Key, PageList, PageOptions } from '../types';
|
|
3
3
|
export declare class Search<T extends Struct> {
|
|
4
4
|
protected repo: Repo<T>;
|
|
5
5
|
constructor(repo: Repo<T>);
|
|
6
|
-
all: () => Promise<PageList<T>>;
|
|
6
|
+
all: (options?: PageOptions | undefined) => Promise<PageList<T>>;
|
|
7
7
|
byId: (id: Id) => Promise<T>;
|
|
8
8
|
byIds: (...ids: Id[]) => Promise<PageList<T>>;
|
|
9
|
-
byKey: (key: Key) => Promise<PageList<T>>;
|
|
10
|
-
search: (query: JsonValue) => Promise<PageList<T>>;
|
|
9
|
+
byKey: (key: Key, options?: PageOptions | undefined) => Promise<PageList<T>>;
|
|
10
|
+
search: (query: JsonValue, options?: PageOptions | undefined) => Promise<PageList<T>>;
|
|
11
11
|
exists: (id: Id) => Promise<boolean>;
|
|
12
12
|
}
|
package/dist/process/Search.js
CHANGED
|
@@ -6,12 +6,12 @@ const utils_1 = require("../utils");
|
|
|
6
6
|
class Search {
|
|
7
7
|
constructor(repo) {
|
|
8
8
|
this.repo = repo;
|
|
9
|
-
this.all = () => this.repo.all();
|
|
9
|
+
this.all = (options) => this.repo.all(options);
|
|
10
10
|
this.byId = (id) => this.repo.byId(id);
|
|
11
11
|
this.byIds = (...ids) => this.repo.byIds(...ids);
|
|
12
|
-
this.byKey = (key) => this.repo.byKey(key);
|
|
13
|
-
this.search = (query) => (0, types_1.choose)(query)
|
|
14
|
-
.case(types_1.isNotEmpty, q => this.repo.search(q))
|
|
12
|
+
this.byKey = (key, options) => this.repo.byKey(key, options);
|
|
13
|
+
this.search = (query, options) => (0, types_1.choose)(query)
|
|
14
|
+
.case(types_1.isNotEmpty, q => this.repo.search(q, options))
|
|
15
15
|
.else((0, utils_1.resolve)((0, types_1.toList)()));
|
|
16
16
|
this.exists = (id) => this.repo.exists(id);
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Search.js","sourceRoot":"","sources":["../../src/process/Search.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"Search.js","sourceRoot":"","sources":["../../src/process/Search.ts"],"names":[],"mappings":";;;AACA,oCAAiG;AACjG,oCAAmC;AAGnC,MAAa,MAAM;IACjB,YAAsB,IAAa;QAAb,SAAI,GAAJ,IAAI,CAAS;QAEnC,QAAG,GAAG,CAAC,OAAqB,EAAwB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE9E,SAAI,GAAG,CAAC,EAAM,EAAc,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAElD,UAAK,GAAG,CAAC,GAAG,GAAS,EAAwB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;QAExE,UAAK,GAAG,CAAC,GAAQ,EAAC,OAAqB,EAAwB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAEhG,WAAM,GAAG,CAAC,KAAgB,EAAE,OAAqB,EAAwB,EAAE,CACzE,IAAA,cAAM,EAAC,KAAK,CAAC;aACV,IAAI,CAAC,kBAAU,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;aACnD,IAAI,CAAC,IAAA,eAAO,EAAC,IAAA,cAAM,GAAK,CAAC,CAAC,CAAC;QAEhC,WAAM,GAAG,CAAC,EAAM,EAAoB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAftB,CAAC;CAgBxC;AAjBD,wBAiBC"}
|
package/dist/types/PageList.d.ts
CHANGED
|
@@ -6,9 +6,9 @@ export declare type Sort = {
|
|
|
6
6
|
export declare type PageOptions = {
|
|
7
7
|
take?: number;
|
|
8
8
|
skip?: number;
|
|
9
|
-
|
|
9
|
+
sort?: Sort[];
|
|
10
10
|
};
|
|
11
|
-
export declare type PageList<T> = List<T> & PageOptions & {
|
|
11
|
+
export declare type PageList<T> = List<T> & Omit<PageOptions, 'sort'> & {
|
|
12
12
|
total?: number;
|
|
13
13
|
};
|
|
14
14
|
export declare const toPageList: <T>(items?: T[] | undefined, options?: (PageOptions & {
|
package/dist/types/Uri.d.ts
CHANGED
|
@@ -19,6 +19,8 @@ declare type Prop = {
|
|
|
19
19
|
export declare type Uri = {
|
|
20
20
|
id: (id?: unknown) => Uri;
|
|
21
21
|
query: (q?: unknown) => Uri;
|
|
22
|
+
skip: (n?: number) => Uri;
|
|
23
|
+
take: (n?: number) => Uri;
|
|
22
24
|
path: string;
|
|
23
25
|
route: (resource: string) => string;
|
|
24
26
|
isInternal: boolean;
|
|
@@ -28,6 +30,8 @@ export declare class EasyUri implements Uri {
|
|
|
28
30
|
readonly segments: Segment[];
|
|
29
31
|
static readonly id: Segment;
|
|
30
32
|
static readonly query: Segment;
|
|
33
|
+
static readonly skip: Segment;
|
|
34
|
+
static readonly take: Segment;
|
|
31
35
|
readonly host: Segment;
|
|
32
36
|
readonly resource: Segment;
|
|
33
37
|
protected state: any;
|
|
@@ -41,5 +45,7 @@ export declare class EasyUri implements Uri {
|
|
|
41
45
|
toString(): string;
|
|
42
46
|
id: (id?: unknown) => this;
|
|
43
47
|
query: (q?: unknown) => this;
|
|
48
|
+
skip: (index?: number | undefined) => this;
|
|
49
|
+
take: (items?: number | undefined) => this;
|
|
44
50
|
}
|
|
45
51
|
export {};
|
package/dist/types/Uri.js
CHANGED
|
@@ -39,6 +39,8 @@ class EasyUri {
|
|
|
39
39
|
};
|
|
40
40
|
this.id = (id) => this.set(EasyUri.id, id);
|
|
41
41
|
this.query = (q) => this.set(EasyUri.query, q);
|
|
42
|
+
this.skip = (index) => this.set(EasyUri.skip, index);
|
|
43
|
+
this.take = (items) => this.set(EasyUri.take, items);
|
|
42
44
|
}
|
|
43
45
|
get path() {
|
|
44
46
|
return toRoute(exports.uri.segment(''), this.resource, ...this.segments);
|
|
@@ -63,4 +65,6 @@ class EasyUri {
|
|
|
63
65
|
exports.EasyUri = EasyUri;
|
|
64
66
|
EasyUri.id = exports.uri.path('id');
|
|
65
67
|
EasyUri.query = exports.uri.query('q');
|
|
68
|
+
EasyUri.skip = exports.uri.query('skip');
|
|
69
|
+
EasyUri.take = exports.uri.query('take');
|
|
66
70
|
//# sourceMappingURL=Uri.js.map
|
package/dist/types/Uri.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Uri.js","sourceRoot":"","sources":["../../src/types/Uri.ts"],"names":[],"mappings":";;;AAAA,6BAA6C;AAC7C,iCAAwC;AACxC,+CAAuC;AACvC,uCAAgC;AAChC,iCAAsC;AACtC,iCAA8B;AAC9B,+BAA8B;AAI9B,MAAM,SAAS,GAAG,CAAC,GAAY,EAAE,EAAE,OAAO,EAAE,KAAK,KAA+D,EAAE,EAAW,EAAE,CAAC,CAAC;IAC/H,GAAG;IACH,OAAO;IACP,KAAK;IACL,QAAQ,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE;CAC1B,CAAC,CAAC;AAEU,QAAA,GAAG,GAAG;IACjB,IAAI,EAAE,CAAC,GAAY,EAAW,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,aAAG,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,EAAE,CAAC;IAC5F,QAAQ,EAAE,CAAC,QAAa,EAAW,EAAE,CAAC,SAAS,CAAC,IAAA,oBAAM,EAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE,IAAA,oBAAM,EAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC;IAC9G,OAAO,EAAE,CAAC,GAAY,EAAW,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;IACpE,IAAI,EAAE,CAAC,GAAW,EAAW,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;IACtE,KAAK,EAAE,CAAC,GAAW,EAAW,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,KAAc,EAAU,EAAE,CAAC,CAAC,IAAA,cAAS,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;CACpI,CAAC;AAIF,MAAM,OAAO,GAAG,CAAC,GAAG,QAAmB,EAAU,EAAE,CACjD,IAAA,aAAM,EAAC,QAAQ,CAAC;KACb,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;KAC1B,IAAI,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Uri.js","sourceRoot":"","sources":["../../src/types/Uri.ts"],"names":[],"mappings":";;;AAAA,6BAA6C;AAC7C,iCAAwC;AACxC,+CAAuC;AACvC,uCAAgC;AAChC,iCAAsC;AACtC,iCAA8B;AAC9B,+BAA8B;AAI9B,MAAM,SAAS,GAAG,CAAC,GAAY,EAAE,EAAE,OAAO,EAAE,KAAK,KAA+D,EAAE,EAAW,EAAE,CAAC,CAAC;IAC/H,GAAG;IACH,OAAO;IACP,KAAK;IACL,QAAQ,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE;CAC1B,CAAC,CAAC;AAEU,QAAA,GAAG,GAAG;IACjB,IAAI,EAAE,CAAC,GAAY,EAAW,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,aAAG,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,EAAE,CAAC;IAC5F,QAAQ,EAAE,CAAC,QAAa,EAAW,EAAE,CAAC,SAAS,CAAC,IAAA,oBAAM,EAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE,IAAA,oBAAM,EAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC;IAC9G,OAAO,EAAE,CAAC,GAAY,EAAW,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;IACpE,IAAI,EAAE,CAAC,GAAW,EAAW,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;IACtE,KAAK,EAAE,CAAC,GAAW,EAAW,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,KAAc,EAAU,EAAE,CAAC,CAAC,IAAA,cAAS,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;CACpI,CAAC;AAIF,MAAM,OAAO,GAAG,CAAC,GAAG,QAAmB,EAAU,EAAE,CACjD,IAAA,aAAM,EAAC,QAAQ,CAAC;KACb,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;KAC1B,IAAI,CAAC,GAAG,CAAC,CAAC;AAaf,MAAa,OAAO;IAWlB,YAAqB,WAAsB,EAAE;QAAxB,aAAQ,GAAR,QAAQ,CAAgB;QALpC,SAAI,GAAG,WAAG,CAAC,IAAI,EAAE,CAAC;QAClB,aAAQ,GAAG,WAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE7B,UAAK,GAAQ,EAAE,CAAC;QAoB1B,UAAK,GAAG,CAAC,WAA+B,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAU,EAAE,CAAC,OAAO,CAAC,WAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,WAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEvJ,QAAG,GAAG,CAAC,OAAgB,EAAE,KAAe,EAAQ,EAAE;YAChD,IAAA,WAAK,EAAC,KAAK,CAAC;iBACT,EAAE,CAAC,OAAO,EAAE;iBACZ,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACzE,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAUF,OAAE,GAAG,CAAC,EAAY,EAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACtD,UAAK,GAAG,CAAC,CAAW,EAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAE1D,SAAI,GAAG,CAAC,KAAc,EAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC/D,SAAI,GAAG,CAAC,KAAc,EAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAvCf,CAAC;IAEjD,IAAI,IAAI;QACN,OAAO,OAAO,CAAC,WAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,aAAG,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC;IACxD,CAAC;IAED,IAAc,KAAK;QACjB,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,EAAQ,CAAC;IACzC,CAAC;IAWD,QAAQ;QACN,OAAO,IAAA,WAAK,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;aAC3B,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;aAC7C,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,CAAO,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAA,eAAQ,EAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAA,eAAQ,EAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;aACtH,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aACnI,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,IAAA,eAAU,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IACxF,CAAC;;AA5CH,0BAmDC;AAlDiB,UAAE,GAAG,WAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACpB,aAAK,GAAG,WAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACvB,YAAI,GAAG,WAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACzB,YAAI,GAAG,WAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy",
|
|
3
|
-
"version": "10.
|
|
3
|
+
"version": "10.7.2",
|
|
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": "10.
|
|
34
|
+
"@thisisagile/easy-test": "10.7.2",
|
|
35
35
|
"@types/form-urlencoded": "^4.4.0",
|
|
36
36
|
"@types/jsonwebtoken": "^8.5.8",
|
|
37
37
|
"@types/validator": "^13.7.2"
|
package/src/domain/Repo.ts
CHANGED
|
@@ -1,15 +1,29 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
asList,
|
|
3
|
+
Constructor,
|
|
4
|
+
Exception,
|
|
5
|
+
Gateway,
|
|
6
|
+
Id,
|
|
7
|
+
isValidatable,
|
|
8
|
+
Json,
|
|
9
|
+
JsonValue,
|
|
10
|
+
Key,
|
|
11
|
+
PageList,
|
|
12
|
+
PageOptions,
|
|
13
|
+
toJson,
|
|
14
|
+
} from '../types';
|
|
2
15
|
import { when } from '../validation';
|
|
3
16
|
import { reject, resolve } from '../utils';
|
|
4
17
|
import { Struct } from './Struct';
|
|
5
18
|
|
|
6
19
|
export class Repo<T extends Struct> {
|
|
7
|
-
constructor(protected ctor: Constructor<T>, private readonly gateway: Gateway) {
|
|
20
|
+
constructor(protected ctor: Constructor<T>, private readonly gateway: Gateway) {
|
|
21
|
+
}
|
|
8
22
|
|
|
9
23
|
create = (item: T | Json): T => (isValidatable(item) ? item : new this.ctor(item));
|
|
10
24
|
|
|
11
|
-
all(): Promise<PageList<T>> {
|
|
12
|
-
return this.gateway.all().then(js => js.map(j => new this.ctor(j)));
|
|
25
|
+
all(options?: PageOptions): Promise<PageList<T>> {
|
|
26
|
+
return this.gateway.all(options).then(js => js.map(j => new this.ctor(j)));
|
|
13
27
|
}
|
|
14
28
|
|
|
15
29
|
byId(id: Id): Promise<T> {
|
|
@@ -23,16 +37,16 @@ export class Repo<T extends Struct> {
|
|
|
23
37
|
return this.gateway.byIds(...ids).then(j => asList(this.ctor, j));
|
|
24
38
|
}
|
|
25
39
|
|
|
26
|
-
byKey(key: Key): Promise<PageList<T>> {
|
|
27
|
-
return this.gateway.by('key', key).then(js => js.map(j => new this.ctor(j)));
|
|
40
|
+
byKey(key: Key, options?: PageOptions): Promise<PageList<T>> {
|
|
41
|
+
return this.gateway.by('key', key, options).then(js => js.map(j => new this.ctor(j)));
|
|
28
42
|
}
|
|
29
43
|
|
|
30
|
-
by(key: keyof T, value: JsonValue): Promise<PageList<T>> {
|
|
31
|
-
return this.gateway.by(key.toString(), value).then(js => js.map(j => new this.ctor(j)));
|
|
44
|
+
by(key: keyof T, value: JsonValue, options?: PageOptions): Promise<PageList<T>> {
|
|
45
|
+
return this.gateway.by(key.toString(), value, options).then(js => js.map(j => new this.ctor(j)));
|
|
32
46
|
}
|
|
33
47
|
|
|
34
|
-
search(q: JsonValue): Promise<PageList<T>> {
|
|
35
|
-
return this.gateway.search(q).then(js => js.map(j => new this.ctor(j)));
|
|
48
|
+
search(q: JsonValue, options?: PageOptions): Promise<PageList<T>> {
|
|
49
|
+
return this.gateway.search(q, options).then(js => js.map(j => new this.ctor(j)));
|
|
36
50
|
}
|
|
37
51
|
|
|
38
52
|
exists(id: Id): Promise<boolean> {
|
package/src/process/Search.ts
CHANGED
|
@@ -1,21 +1,22 @@
|
|
|
1
1
|
import { Repo, Struct } from '../domain';
|
|
2
|
-
import { choose, Id, isNotEmpty, JsonValue, Key, toList, PageList } from '../types';
|
|
2
|
+
import { choose, Id, isNotEmpty, JsonValue, Key, toList, PageList, PageOptions } from '../types';
|
|
3
3
|
import { resolve } from '../utils';
|
|
4
4
|
|
|
5
|
+
|
|
5
6
|
export class Search<T extends Struct> {
|
|
6
7
|
constructor(protected repo: Repo<T>) {}
|
|
7
8
|
|
|
8
|
-
all = (): Promise<PageList<T>> => this.repo.all();
|
|
9
|
+
all = (options?: PageOptions): Promise<PageList<T>> => this.repo.all(options);
|
|
9
10
|
|
|
10
11
|
byId = (id: Id): Promise<T> => this.repo.byId(id);
|
|
11
12
|
|
|
12
13
|
byIds = (...ids: Id[]): Promise<PageList<T>> => this.repo.byIds(...ids);
|
|
13
14
|
|
|
14
|
-
byKey = (key: Key): Promise<PageList<T>> => this.repo.byKey(key);
|
|
15
|
+
byKey = (key: Key,options?: PageOptions): Promise<PageList<T>> => this.repo.byKey(key, options);
|
|
15
16
|
|
|
16
|
-
search = (query: JsonValue): Promise<PageList<T>> =>
|
|
17
|
+
search = (query: JsonValue, options?: PageOptions): Promise<PageList<T>> =>
|
|
17
18
|
choose(query)
|
|
18
|
-
.case(isNotEmpty, q => this.repo.search(q))
|
|
19
|
+
.case(isNotEmpty, q => this.repo.search(q, options))
|
|
19
20
|
.else(resolve(toList<T>()));
|
|
20
21
|
|
|
21
22
|
exists = (id: Id): Promise<boolean> => this.repo.exists(id);
|
package/src/types/PageList.ts
CHANGED
|
@@ -3,9 +3,9 @@ import { json } from './Json';
|
|
|
3
3
|
|
|
4
4
|
export type Sort = { key: string, value: -1 | 1 };
|
|
5
5
|
|
|
6
|
-
export type PageOptions = { take?: number, skip?: number,
|
|
6
|
+
export type PageOptions = { take?: number, skip?: number, sort?: Sort[] };
|
|
7
7
|
|
|
8
|
-
export type PageList<T> = List<T> & PageOptions & { total?: number };
|
|
8
|
+
export type PageList<T> = List<T> & Omit<PageOptions, 'sort'> & { total?: number };
|
|
9
9
|
|
|
10
10
|
export const toPageList = <T>( items?: T[], options?: PageOptions & { total?: number }): PageList<T> => {
|
|
11
11
|
const o = json.defaults(options, { take: 250, skip: 0 });
|
package/src/types/Uri.ts
CHANGED
|
@@ -33,6 +33,8 @@ const toRoute = (...segments: Segment[]): string =>
|
|
|
33
33
|
export type Uri = {
|
|
34
34
|
id: (id?: unknown) => Uri;
|
|
35
35
|
query: (q?: unknown) => Uri;
|
|
36
|
+
skip: (n?: number) => Uri;
|
|
37
|
+
take: (n?: number) => Uri;
|
|
36
38
|
path: string;
|
|
37
39
|
route: (resource: string) => string;
|
|
38
40
|
isInternal: boolean;
|
|
@@ -42,6 +44,8 @@ export type Uri = {
|
|
|
42
44
|
export class EasyUri implements Uri {
|
|
43
45
|
static readonly id = uri.path('id');
|
|
44
46
|
static readonly query = uri.query('q');
|
|
47
|
+
static readonly skip = uri.query('skip');
|
|
48
|
+
static readonly take = uri.query('take');
|
|
45
49
|
|
|
46
50
|
readonly host = uri.host();
|
|
47
51
|
readonly resource = uri.resource(this);
|
|
@@ -85,4 +89,7 @@ export class EasyUri implements Uri {
|
|
|
85
89
|
|
|
86
90
|
id = (id?: unknown): this => this.set(EasyUri.id, id);
|
|
87
91
|
query = (q?: unknown): this => this.set(EasyUri.query, q);
|
|
92
|
+
|
|
93
|
+
skip = (index?: number): this => this.set(EasyUri.skip, index);
|
|
94
|
+
take = (items?: number): this => this.set(EasyUri.take, items);
|
|
88
95
|
}
|