@thisisagile/easy 10.6.1 → 10.7.3
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/http/RequestOptions.d.ts +4 -2
- package/dist/http/RequestOptions.js +6 -1
- package/dist/http/RequestOptions.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/services/Api.d.ts +2 -2
- package/dist/services/Api.js +17 -2
- package/dist/services/Api.js.map +1 -1
- package/dist/services/AxiosProvider.d.ts +2 -2
- package/dist/services/AxiosProvider.js +3 -3
- package/dist/services/AxiosProvider.js.map +1 -1
- 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/http/RequestOptions.ts +7 -2
- package/src/process/Search.ts +6 -5
- package/src/services/Api.ts +23 -8
- package/src/services/AxiosProvider.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":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { Enum, Text } from '../types';
|
|
1
|
+
import { Enum, PageOptions, Text } from '../types';
|
|
2
2
|
import { ContentType } from './ContentType';
|
|
3
3
|
export declare class RequestOptions extends Enum {
|
|
4
4
|
readonly type: ContentType;
|
|
5
5
|
readonly headers: {
|
|
6
6
|
[key: string]: any;
|
|
7
7
|
};
|
|
8
|
+
pageOptions?: PageOptions | undefined;
|
|
8
9
|
static get Form(): RequestOptions;
|
|
9
10
|
static get Json(): RequestOptions;
|
|
10
11
|
static get Stream(): RequestOptions;
|
|
@@ -12,7 +13,8 @@ export declare class RequestOptions extends Enum {
|
|
|
12
13
|
static get Xml(): RequestOptions;
|
|
13
14
|
constructor(type?: ContentType, headers?: {
|
|
14
15
|
[key: string]: any;
|
|
15
|
-
});
|
|
16
|
+
}, pageOptions?: PageOptions | undefined);
|
|
17
|
+
page: (options: PageOptions) => this;
|
|
16
18
|
authorization: (auth: string) => this;
|
|
17
19
|
apiKey: (apiKey: string) => this;
|
|
18
20
|
accept: (type: ContentType) => this;
|
|
@@ -5,10 +5,15 @@ const types_1 = require("../types");
|
|
|
5
5
|
const HttpHeader_1 = require("./HttpHeader");
|
|
6
6
|
const ContentType_1 = require("./ContentType");
|
|
7
7
|
class RequestOptions extends types_1.Enum {
|
|
8
|
-
constructor(type = ContentType_1.ContentType.Json, headers = {}) {
|
|
8
|
+
constructor(type = ContentType_1.ContentType.Json, headers = {}, pageOptions) {
|
|
9
9
|
super(type.name);
|
|
10
10
|
this.type = type;
|
|
11
11
|
this.headers = headers;
|
|
12
|
+
this.pageOptions = pageOptions;
|
|
13
|
+
this.page = (options) => {
|
|
14
|
+
this.pageOptions = options;
|
|
15
|
+
return this;
|
|
16
|
+
};
|
|
12
17
|
this.authorization = (auth) => {
|
|
13
18
|
this.headers.Authorization = auth;
|
|
14
19
|
return this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestOptions.js","sourceRoot":"","sources":["../../src/http/RequestOptions.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"RequestOptions.js","sourceRoot":"","sources":["../../src/http/RequestOptions.ts"],"names":[],"mappings":";;;AAAA,oCAA4E;AAC5E,6CAA0C;AAC1C,+CAA4C;AAE5C,MAAa,cAAe,SAAQ,YAAI;IAqBtC,YAAqB,OAAoB,yBAAW,CAAC,IAAI,EAAW,UAAkC,EAAE,EAAS,WAAyB;QACxI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QADE,SAAI,GAAJ,IAAI,CAAgC;QAAW,YAAO,GAAP,OAAO,CAA6B;QAAS,gBAAW,GAAX,WAAW,CAAc;QAM1I,SAAI,GAAG,CAAC,OAAoB,EAAQ,EAAE;YACpC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;YAC3B,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,kBAAa,GAAG,CAAC,IAAY,EAAQ,EAAE;YACrC,IAAI,CAAC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;YAClC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,WAAM,GAAG,CAAC,MAAc,EAAQ,EAAE;YAChC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,WAAM,GAAG,CAAC,IAAiB,EAAQ,EAAE;YACnC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,WAAM,GAAG,CAAC,GAAS,EAAQ,EAAE;YAC3B,OAAO,IAAA,kBAAU,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACtE,CAAC,CAAC;QAEF,UAAK,GAAG,CAAC,QAAc,EAAE,QAAc,EAAQ,EAAE;YAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,IAAI,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACpF,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,SAAS,EAAE,CAAC,CAAC;QAClD,CAAC,CAAC;QA/BA,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,OAAO,CAAC,uBAAU,CAAC,WAAW,CAAC,GAAG,WAAG,CAAC,OAAO,CAAC,aAAa,IAAI,IAAA,cAAM,GAAE,CAAC;IAC/E,CAAC;IAxBD,MAAM,KAAK,IAAI;QACb,OAAO,IAAI,cAAc,CAAC,yBAAW,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,KAAK,IAAI;QACb,OAAO,IAAI,cAAc,CAAC,yBAAW,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,KAAK,MAAM;QACf,OAAO,IAAI,cAAc,CAAC,yBAAW,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,KAAK,IAAI;QACb,OAAO,IAAI,cAAc,CAAC,yBAAW,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,KAAK,GAAG;QACZ,OAAO,IAAI,cAAc,CAAC,yBAAW,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC;CAoCF;AAvDD,wCAuDC"}
|
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/services/Api.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Uri } from '../types';
|
|
1
|
+
import { PageOptions, Uri } from '../types';
|
|
2
2
|
import { RequestOptions, RequestProvider, Response } from '../http';
|
|
3
3
|
export declare class Api {
|
|
4
4
|
readonly provider: RequestProvider;
|
|
5
5
|
constructor(provider?: RequestProvider);
|
|
6
|
-
get
|
|
6
|
+
get(uri: Uri, options?: RequestOptions | PageOptions, transform?: (r: any) => any, transformError?: (r: any) => any): Promise<Response>;
|
|
7
7
|
post: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
|
|
8
8
|
put: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
|
|
9
9
|
patch: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
|
package/dist/services/Api.js
CHANGED
|
@@ -6,12 +6,27 @@ const AxiosProvider_1 = require("./AxiosProvider");
|
|
|
6
6
|
class Api {
|
|
7
7
|
constructor(provider = new AxiosProvider_1.AxiosProvider()) {
|
|
8
8
|
this.provider = provider;
|
|
9
|
-
this.get = (uri, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) => this.provider.execute({ uri, verb: http_1.HttpVerb.Get, transform, transformError, options });
|
|
10
9
|
this.post = (uri, body, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) => this.provider.execute({ uri, verb: http_1.HttpVerb.Post, body, transform, transformError, options });
|
|
11
10
|
this.put = (uri, body, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) => this.provider.execute({ uri, verb: http_1.HttpVerb.Put, body, transform, transformError, options });
|
|
12
|
-
this.patch = (uri, body, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) => this.provider.execute({
|
|
11
|
+
this.patch = (uri, body, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) => this.provider.execute({
|
|
12
|
+
uri,
|
|
13
|
+
verb: http_1.HttpVerb.Patch,
|
|
14
|
+
body,
|
|
15
|
+
transform,
|
|
16
|
+
transformError,
|
|
17
|
+
options,
|
|
18
|
+
});
|
|
13
19
|
this.delete = (uri, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) => this.provider.execute({ uri, verb: http_1.HttpVerb.Delete, transform, transformError, options });
|
|
14
20
|
}
|
|
21
|
+
get(uri, options, transform, transformError = (r) => r) {
|
|
22
|
+
return this.provider.execute({
|
|
23
|
+
uri: (options instanceof http_1.RequestOptions) ? uri.skip(options.pageOptions?.skip).take(options.pageOptions?.take) : uri.skip(options?.skip).take(options?.take),
|
|
24
|
+
verb: http_1.HttpVerb.Get,
|
|
25
|
+
transform,
|
|
26
|
+
transformError,
|
|
27
|
+
options: (options instanceof http_1.RequestOptions) ? options : http_1.RequestOptions.Json,
|
|
28
|
+
});
|
|
29
|
+
}
|
|
15
30
|
}
|
|
16
31
|
exports.Api = Api;
|
|
17
32
|
exports.api = new Api();
|
package/dist/services/Api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../src/services/Api.ts"],"names":[],"mappings":";;;AACA,kCAA8E;AAC9E,mDAAgD;AAEhD,MAAa,GAAG;IACd,YAAqB,WAA4B,IAAI,6BAAa,EAAE;QAA/C,aAAQ,GAAR,QAAQ,CAAuC;
|
|
1
|
+
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../src/services/Api.ts"],"names":[],"mappings":";;;AACA,kCAA8E;AAC9E,mDAAgD;AAEhD,MAAa,GAAG;IACd,YAAqB,WAA4B,IAAI,6BAAa,EAAE;QAA/C,aAAQ,GAAR,QAAQ,CAAuC;QAapE,SAAI,GAAG,CACL,GAAQ,EACR,IAAc,EACd,UAA0B,qBAAc,CAAC,IAAI,EAC7C,SAA2B,EAC3B,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EACX,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,eAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC;QAEtH,QAAG,GAAG,CACJ,GAAQ,EACR,IAAc,EACd,UAA0B,qBAAc,CAAC,IAAI,EAC7C,SAA2B,EAC3B,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EACX,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,eAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC;QAErH,UAAK,GAAG,CACN,GAAQ,EACR,IAAc,EACd,UAA0B,qBAAc,CAAC,IAAI,EAC7C,SAA2B,EAC3B,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EACX,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC5C,GAAG;YACH,IAAI,EAAE,eAAQ,CAAC,KAAK;YACpB,IAAI;YACJ,SAAS;YACT,cAAc;YACd,OAAO;SACR,CAAC,CAAC;QAEH,WAAM,GAAG,CAAC,GAAQ,EAAE,UAA0B,qBAAc,CAAC,IAAI,EAAE,SAA2B,EAAE,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAqB,EAAE,CACnJ,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,eAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC;IA5C5F,CAAC;IAED,GAAG,CAAC,GAAQ,EAAE,OAAsC,EAAE,SAA2B,EAAE,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QAC/G,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC3B,GAAG,EAAE,CAAC,OAAO,YAAY,qBAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC;YAC5J,IAAI,EAAE,eAAQ,CAAC,GAAG;YAClB,SAAS;YACT,cAAc;YACd,OAAO,EAAE,CAAC,OAAO,YAAY,qBAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAc,CAAC,IAAI;SAC7E,CAAC,CAAC;IACL,CAAC;CAmCF;AA/CD,kBA+CC;AAEY,QAAA,GAAG,GAAQ,IAAI,GAAG,EAAE,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AxiosInstance } from 'axios';
|
|
2
2
|
import { Request, RequestProvider, Response } from '../http';
|
|
3
3
|
export declare class AxiosProvider implements RequestProvider {
|
|
4
|
-
readonly
|
|
5
|
-
constructor(
|
|
4
|
+
readonly ai: AxiosInstance;
|
|
5
|
+
constructor(ai?: AxiosInstance);
|
|
6
6
|
execute: ({ uri, verb, body, transform, transformError, options }: Request) => Promise<Response>;
|
|
7
7
|
}
|
|
@@ -14,9 +14,9 @@ const asResponse = (uri, verb, error) => (0, types_1.choose)(error)
|
|
|
14
14
|
.type(isRequest, r => (0, http_1.toResponse)(r.request.status, (0, types_1.toResult)(r.request.message, uri.path, uri)))
|
|
15
15
|
.else(e => (0, http_1.toResponse)(http_1.HttpStatus.InternalServerError, (0, types_1.toResult)(e.message, uri.path, uri)));
|
|
16
16
|
class AxiosProvider {
|
|
17
|
-
constructor(
|
|
18
|
-
this.
|
|
19
|
-
this.execute = ({ uri, verb, body, transform = (r) => r, transformError = (r) => r, options = http_1.RequestOptions.Json }) => this.
|
|
17
|
+
constructor(ai = axios_1.default) {
|
|
18
|
+
this.ai = ai;
|
|
19
|
+
this.execute = ({ uri, verb, body, transform = (r) => r, transformError = (r) => r, options = http_1.RequestOptions.Json }) => this.ai
|
|
20
20
|
.request({
|
|
21
21
|
url: uri.toString(),
|
|
22
22
|
method: verb.toString(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AxiosProvider.js","sourceRoot":"","sources":["../../src/services/AxiosProvider.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAgF;AAChF,kCAA6H;AAC7H,oCAA0E;AAE1E,MAAM,UAAU,GAAG,CAAC,CAAU,EAAoC,EAAE,CAAC,IAAA,iBAAS,EAAE,CAAS,EAAE,QAAQ,CAAC,CAAC;AACrG,MAAM,SAAS,GAAG,CAAC,CAAU,EAAyB,EAAE,CAAC,IAAA,iBAAS,EAAE,CAAS,EAAE,OAAO,CAAC,CAAC;AAExF,MAAM,UAAU,GAAG,CAAC,GAAQ,EAAE,IAAc,EAAE,KAAiB,EAAY,EAAE,CAC3E,IAAA,cAAM,EAAC,KAAK,CAAC;KACV,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CACpB,IAAA,iBAAU,EAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAA,mBAAY,EAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACpJ;KACA,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAU,EAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,IAAA,gBAAQ,EAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;KAC9F,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAU,EAAC,iBAAU,CAAC,mBAAmB,EAAE,IAAA,gBAAQ,EAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;AAE/F,MAAa,aAAa;IACxB,YAAqB,
|
|
1
|
+
{"version":3,"file":"AxiosProvider.js","sourceRoot":"","sources":["../../src/services/AxiosProvider.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAgF;AAChF,kCAA6H;AAC7H,oCAA0E;AAE1E,MAAM,UAAU,GAAG,CAAC,CAAU,EAAoC,EAAE,CAAC,IAAA,iBAAS,EAAE,CAAS,EAAE,QAAQ,CAAC,CAAC;AACrG,MAAM,SAAS,GAAG,CAAC,CAAU,EAAyB,EAAE,CAAC,IAAA,iBAAS,EAAE,CAAS,EAAE,OAAO,CAAC,CAAC;AAExF,MAAM,UAAU,GAAG,CAAC,GAAQ,EAAE,IAAc,EAAE,KAAiB,EAAY,EAAE,CAC3E,IAAA,cAAM,EAAC,KAAK,CAAC;KACV,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CACpB,IAAA,iBAAU,EAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAA,mBAAY,EAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACpJ;KACA,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAU,EAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,IAAA,gBAAQ,EAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;KAC9F,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAU,EAAC,iBAAU,CAAC,mBAAmB,EAAE,IAAA,gBAAQ,EAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;AAE/F,MAAa,aAAa;IACxB,YAAqB,KAAoB,eAAK;QAAzB,OAAE,GAAF,EAAE,CAAuB;QAE9C,YAAO,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAE,cAAc,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,GAAG,qBAAc,CAAC,IAAI,EAAW,EAAqB,EAAE,CACtJ,IAAI,CAAC,EAAE;aACJ,OAAO,CAAC;YACP,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;YACnB,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAY;YACjC,OAAO,EAAE,GAAG,CAAC,UAAU,IAAI,IAAA,eAAO,EAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO;YAC7H,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;SAChC,CAAC;aACD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAU,EAAC,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;aAC7D,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAXzB,CAAC;CAYnD;AAbD,sCAaC"}
|
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":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy",
|
|
3
|
-
"version": "10.
|
|
3
|
+
"version": "10.7.3",
|
|
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.3",
|
|
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> {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ctx, Enum, isNotEmpty, Text, toUuid } from '../types';
|
|
1
|
+
import { ctx, Enum, isNotEmpty, PageOptions, Text, toUuid } from '../types';
|
|
2
2
|
import { HttpHeader } from './HttpHeader';
|
|
3
3
|
import { ContentType } from './ContentType';
|
|
4
4
|
|
|
@@ -23,12 +23,17 @@ export class RequestOptions extends Enum {
|
|
|
23
23
|
return new RequestOptions(ContentType.Xml);
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
-
constructor(readonly type: ContentType = ContentType.Json, readonly headers: { [key: string]: any } = {}) {
|
|
26
|
+
constructor(readonly type: ContentType = ContentType.Json, readonly headers: { [key: string]: any } = {}, public pageOptions?: PageOptions) {
|
|
27
27
|
super(type.name);
|
|
28
28
|
this.headers['Content-Type'] = type.id;
|
|
29
29
|
this.headers[HttpHeader.Correlation] = ctx.request.correlationId ?? toUuid();
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
+
page = (options: PageOptions): this => {
|
|
33
|
+
this.pageOptions = options;
|
|
34
|
+
return this;
|
|
35
|
+
};
|
|
36
|
+
|
|
32
37
|
authorization = (auth: string): this => {
|
|
33
38
|
this.headers.Authorization = auth;
|
|
34
39
|
return this;
|
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/services/Api.ts
CHANGED
|
@@ -1,19 +1,27 @@
|
|
|
1
|
-
import { Uri } from '../types';
|
|
1
|
+
import { PageOptions, Uri } from '../types';
|
|
2
2
|
import { HttpVerb, RequestOptions, RequestProvider, Response } from '../http';
|
|
3
3
|
import { AxiosProvider } from './AxiosProvider';
|
|
4
4
|
|
|
5
5
|
export class Api {
|
|
6
|
-
constructor(readonly provider: RequestProvider = new AxiosProvider()) {
|
|
6
|
+
constructor(readonly provider: RequestProvider = new AxiosProvider()) {
|
|
7
|
+
}
|
|
7
8
|
|
|
8
|
-
get
|
|
9
|
-
this.provider.execute({
|
|
9
|
+
get(uri: Uri, options?: RequestOptions | PageOptions, transform?: (r: any) => any, transformError = (r: any) => r): Promise<Response> {
|
|
10
|
+
return this.provider.execute({
|
|
11
|
+
uri: (options instanceof RequestOptions) ? uri.skip(options.pageOptions?.skip).take(options.pageOptions?.take) : uri.skip(options?.skip).take(options?.take),
|
|
12
|
+
verb: HttpVerb.Get,
|
|
13
|
+
transform,
|
|
14
|
+
transformError,
|
|
15
|
+
options: (options instanceof RequestOptions) ? options : RequestOptions.Json,
|
|
16
|
+
});
|
|
17
|
+
}
|
|
10
18
|
|
|
11
19
|
post = (
|
|
12
20
|
uri: Uri,
|
|
13
21
|
body?: unknown,
|
|
14
22
|
options: RequestOptions = RequestOptions.Json,
|
|
15
23
|
transform?: (r: any) => any,
|
|
16
|
-
transformError = (r: any) => r
|
|
24
|
+
transformError = (r: any) => r,
|
|
17
25
|
): Promise<Response> => this.provider.execute({ uri, verb: HttpVerb.Post, body, transform, transformError, options });
|
|
18
26
|
|
|
19
27
|
put = (
|
|
@@ -21,7 +29,7 @@ export class Api {
|
|
|
21
29
|
body?: unknown,
|
|
22
30
|
options: RequestOptions = RequestOptions.Json,
|
|
23
31
|
transform?: (r: any) => any,
|
|
24
|
-
transformError = (r: any) => r
|
|
32
|
+
transformError = (r: any) => r,
|
|
25
33
|
): Promise<Response> => this.provider.execute({ uri, verb: HttpVerb.Put, body, transform, transformError, options });
|
|
26
34
|
|
|
27
35
|
patch = (
|
|
@@ -29,8 +37,15 @@ export class Api {
|
|
|
29
37
|
body?: unknown,
|
|
30
38
|
options: RequestOptions = RequestOptions.Json,
|
|
31
39
|
transform?: (r: any) => any,
|
|
32
|
-
transformError = (r: any) => r
|
|
33
|
-
): Promise<Response> => this.provider.execute({
|
|
40
|
+
transformError = (r: any) => r,
|
|
41
|
+
): Promise<Response> => this.provider.execute({
|
|
42
|
+
uri,
|
|
43
|
+
verb: HttpVerb.Patch,
|
|
44
|
+
body,
|
|
45
|
+
transform,
|
|
46
|
+
transformError,
|
|
47
|
+
options,
|
|
48
|
+
});
|
|
34
49
|
|
|
35
50
|
delete = (uri: Uri, options: RequestOptions = RequestOptions.Json, transform?: (b: any) => any, transformError = (r: any) => r): Promise<Response> =>
|
|
36
51
|
this.provider.execute({ uri, verb: HttpVerb.Delete, transform, transformError, options });
|
|
@@ -14,10 +14,10 @@ const asResponse = (uri: Uri, verb: HttpVerb, error: AxiosError): Response =>
|
|
|
14
14
|
.else(e => toResponse(HttpStatus.InternalServerError, toResult(e.message, uri.path, uri)));
|
|
15
15
|
|
|
16
16
|
export class AxiosProvider implements RequestProvider {
|
|
17
|
-
constructor(readonly
|
|
17
|
+
constructor(readonly ai: AxiosInstance = axios) {}
|
|
18
18
|
|
|
19
19
|
execute = ({ uri, verb, body, transform = (r: any) => r, transformError = (r: any) => r, options = RequestOptions.Json }: Request): Promise<Response> =>
|
|
20
|
-
this.
|
|
20
|
+
this.ai
|
|
21
21
|
.request({
|
|
22
22
|
url: uri.toString(),
|
|
23
23
|
method: verb.toString() as Method,
|
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
|
}
|