@thisisagile/easy 10.7.3 → 10.9.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/http/RequestOptions.d.ts +1 -0
- package/dist/http/RequestOptions.js +3 -1
- package/dist/http/RequestOptions.js.map +1 -1
- package/dist/services/Api.js +1 -1
- package/dist/services/Api.js.map +1 -1
- package/dist/services/RouteGateway.d.ts +4 -4
- package/dist/services/RouteGateway.js +5 -5
- package/dist/services/RouteGateway.js.map +1 -1
- package/dist/types/Json.js +2 -1
- package/dist/types/Json.js.map +1 -1
- package/package.json +2 -2
- package/src/http/RequestOptions.ts +2 -0
- package/src/services/Api.ts +2 -2
- package/src/services/RouteGateway.ts +10 -8
- package/src/types/Json.ts +2 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Enum, PageOptions, Text } from '../types';
|
|
2
2
|
import { ContentType } from './ContentType';
|
|
3
|
+
export declare const toPageOptions: (options?: RequestOptions | PageOptions | undefined) => PageOptions | undefined;
|
|
3
4
|
export declare class RequestOptions extends Enum {
|
|
4
5
|
readonly type: ContentType;
|
|
5
6
|
readonly headers: {
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RequestOptions = void 0;
|
|
3
|
+
exports.RequestOptions = exports.toPageOptions = void 0;
|
|
4
4
|
const types_1 = require("../types");
|
|
5
5
|
const HttpHeader_1 = require("./HttpHeader");
|
|
6
6
|
const ContentType_1 = require("./ContentType");
|
|
7
|
+
const toPageOptions = (options) => options instanceof RequestOptions ? options.pageOptions : options;
|
|
8
|
+
exports.toPageOptions = toPageOptions;
|
|
7
9
|
class RequestOptions extends types_1.Enum {
|
|
8
10
|
constructor(type = ContentType_1.ContentType.Json, headers = {}, pageOptions) {
|
|
9
11
|
super(type.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestOptions.js","sourceRoot":"","sources":["../../src/http/RequestOptions.ts"],"names":[],"mappings":";;;AAAA,oCAA4E;AAC5E,6CAA0C;AAC1C,+CAA4C;
|
|
1
|
+
{"version":3,"file":"RequestOptions.js","sourceRoot":"","sources":["../../src/http/RequestOptions.ts"],"names":[],"mappings":";;;AAAA,oCAA4E;AAC5E,6CAA0C;AAC1C,+CAA4C;AAErC,MAAM,aAAa,GAAG,CAAC,OAAsC,EAA2B,EAAE,CAAC,OAAO,YAAY,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;AAAvJ,QAAA,aAAa,iBAA0I;AAEpK,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/services/Api.js
CHANGED
|
@@ -20,7 +20,7 @@ class Api {
|
|
|
20
20
|
}
|
|
21
21
|
get(uri, options, transform, transformError = (r) => r) {
|
|
22
22
|
return this.provider.execute({
|
|
23
|
-
uri: (
|
|
23
|
+
uri: uri.skip((0, http_1.toPageOptions)(options)?.skip).take((0, http_1.toPageOptions)(options)?.take),
|
|
24
24
|
verb: http_1.HttpVerb.Get,
|
|
25
25
|
transform,
|
|
26
26
|
transformError,
|
package/dist/services/Api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../src/services/Api.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../src/services/Api.ts"],"names":[],"mappings":";;;AACA,kCAA6F;AAC7F,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,GAAG,CAAC,IAAI,CAAC,IAAA,oBAAa,EAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,IAAA,oBAAa,EAAC,OAAO,CAAC,EAAE,IAAI,CAAC;YAC9E,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,16 +1,16 @@
|
|
|
1
1
|
import { Api } from './Api';
|
|
2
|
-
import { Func, Gateway, Id, Json, JsonValue, PageList, Uri } from '../types';
|
|
2
|
+
import { Func, Gateway, Id, Json, JsonValue, PageList, PageOptions, Uri } from '../types';
|
|
3
3
|
import { RequestOptions } from '../http';
|
|
4
4
|
export declare class RouteGateway extends Gateway {
|
|
5
5
|
readonly route: Func<Uri>;
|
|
6
6
|
readonly routeId: Func<Uri>;
|
|
7
7
|
readonly api: Api;
|
|
8
8
|
constructor(route: Func<Uri>, routeId: Func<Uri>, api?: Api);
|
|
9
|
-
get(uri: Uri, options?: RequestOptions): Promise<PageList<Json>>;
|
|
9
|
+
get(uri: Uri, options?: RequestOptions | PageOptions): Promise<PageList<Json>>;
|
|
10
10
|
getOne(uri: Uri, options?: RequestOptions): Promise<Json | undefined>;
|
|
11
|
-
all(): Promise<PageList<Json>>;
|
|
11
|
+
all(options?: PageOptions): Promise<PageList<Json>>;
|
|
12
12
|
byId(id: Id): Promise<Json | undefined>;
|
|
13
|
-
search(q: JsonValue): Promise<PageList<Json>>;
|
|
13
|
+
search(q: JsonValue, options?: PageOptions): Promise<PageList<Json>>;
|
|
14
14
|
exists(id: Id): Promise<boolean>;
|
|
15
15
|
add(item: Json): Promise<Json>;
|
|
16
16
|
update(item: Json): Promise<Json>;
|
|
@@ -12,19 +12,19 @@ class RouteGateway extends types_1.Gateway {
|
|
|
12
12
|
this.api = api;
|
|
13
13
|
}
|
|
14
14
|
get(uri, options) {
|
|
15
|
-
return this.api.get(uri, options).then(r => (0, types_1.toPageList)(r.body.data?.items, { total: r.body.data?.totalItems }));
|
|
15
|
+
return this.api.get(uri, options).then(r => (0, types_1.toPageList)(r.body.data?.items, (0, http_1.toPageOptions)(options) && { total: r.body.data?.totalItems }));
|
|
16
16
|
}
|
|
17
17
|
getOne(uri, options) {
|
|
18
18
|
return this.get(uri, options).then(r => r.first());
|
|
19
19
|
}
|
|
20
|
-
all() {
|
|
21
|
-
return this.get(this.route());
|
|
20
|
+
all(options) {
|
|
21
|
+
return this.get(this.route(), options);
|
|
22
22
|
}
|
|
23
23
|
byId(id) {
|
|
24
24
|
return this.getOne(this.routeId().id(id));
|
|
25
25
|
}
|
|
26
|
-
search(q) {
|
|
27
|
-
return this.get(this.route().query(q));
|
|
26
|
+
search(q, options) {
|
|
27
|
+
return this.get(this.route().query(q), options);
|
|
28
28
|
}
|
|
29
29
|
exists(id) {
|
|
30
30
|
return this.get(this.routeId().id(id))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouteGateway.js","sourceRoot":"","sources":["../../src/services/RouteGateway.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"RouteGateway.js","sourceRoot":"","sources":["../../src/services/RouteGateway.ts"],"names":[],"mappings":"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"}
|
package/dist/types/Json.js
CHANGED
|
@@ -4,13 +4,14 @@ exports.any = exports.asJson = exports.toJson = exports.json = exports.isJson =
|
|
|
4
4
|
const IsA_1 = require("./IsA");
|
|
5
5
|
const Is_1 = require("./Is");
|
|
6
6
|
const Get_1 = require("./Get");
|
|
7
|
+
const utils_1 = require("../utils");
|
|
7
8
|
const isJson = (subject) => (0, IsA_1.isA)(subject, 'toJSON');
|
|
8
9
|
exports.isJson = isJson;
|
|
9
10
|
exports.json = {
|
|
10
11
|
parse: (subject) => JSON.parse(JSON.stringify(subject ?? {})),
|
|
11
12
|
merge: (...subjects) => exports.json.parse(subjects.map(s => (0, exports.asJson)(s, s => exports.json.parse(s))).reduce((js, j) => ({ ...js, ...j }), {})),
|
|
12
13
|
delete: (subject, key) => {
|
|
13
|
-
delete subject[key];
|
|
14
|
+
(0, utils_1.ifDefined)(subject, () => delete subject[key]);
|
|
14
15
|
return subject;
|
|
15
16
|
},
|
|
16
17
|
set: (subject, key = '', value) => (0, Is_1.isEmpty)(key) ? subject : (0, Is_1.isDefined)(value) ? { ...subject, ...{ [key]: value } } : exports.json.delete(subject, key),
|
package/dist/types/Json.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Json.js","sourceRoot":"","sources":["../../src/types/Json.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,6BAAoD;AACpD,+BAAmC;
|
|
1
|
+
{"version":3,"file":"Json.js","sourceRoot":"","sources":["../../src/types/Json.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.9.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": "10.
|
|
34
|
+
"@thisisagile/easy-test": "10.9.0",
|
|
35
35
|
"@types/form-urlencoded": "^4.4.0",
|
|
36
36
|
"@types/jsonwebtoken": "^8.5.8",
|
|
37
37
|
"@types/validator": "^13.7.2"
|
|
@@ -2,6 +2,8 @@ import { ctx, Enum, isNotEmpty, PageOptions, Text, toUuid } from '../types';
|
|
|
2
2
|
import { HttpHeader } from './HttpHeader';
|
|
3
3
|
import { ContentType } from './ContentType';
|
|
4
4
|
|
|
5
|
+
export const toPageOptions = (options?: RequestOptions | PageOptions): PageOptions | undefined => options instanceof RequestOptions ? options.pageOptions : options;
|
|
6
|
+
|
|
5
7
|
export class RequestOptions extends Enum {
|
|
6
8
|
static get Form(): RequestOptions {
|
|
7
9
|
return new RequestOptions(ContentType.Form);
|
package/src/services/Api.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PageOptions, Uri } from '../types';
|
|
2
|
-
import { HttpVerb, RequestOptions, RequestProvider, Response } from '../http';
|
|
2
|
+
import { HttpVerb, RequestOptions, RequestProvider, Response, toPageOptions } from '../http';
|
|
3
3
|
import { AxiosProvider } from './AxiosProvider';
|
|
4
4
|
|
|
5
5
|
export class Api {
|
|
@@ -8,7 +8,7 @@ export class Api {
|
|
|
8
8
|
|
|
9
9
|
get(uri: Uri, options?: RequestOptions | PageOptions, transform?: (r: any) => any, transformError = (r: any) => r): Promise<Response> {
|
|
10
10
|
return this.provider.execute({
|
|
11
|
-
uri:
|
|
11
|
+
uri: uri.skip(toPageOptions(options)?.skip).take(toPageOptions(options)?.take),
|
|
12
12
|
verb: HttpVerb.Get,
|
|
13
13
|
transform,
|
|
14
14
|
transformError,
|
|
@@ -1,30 +1,32 @@
|
|
|
1
1
|
import { Api } from './Api';
|
|
2
|
-
import { Func, Gateway, Id, Json, JsonValue, PageList, toPageList, Uri } from '../types';
|
|
3
|
-
import { HttpStatus, RequestOptions } from '../http';
|
|
2
|
+
import { Func, Gateway, Id, Json, JsonValue, PageList, PageOptions, toPageList, Uri } from '../types';
|
|
3
|
+
import { HttpStatus, RequestOptions, toPageOptions } from '../http';
|
|
4
4
|
|
|
5
5
|
export class RouteGateway extends Gateway {
|
|
6
6
|
constructor(readonly route: Func<Uri>, readonly routeId: Func<Uri>, readonly api: Api = new Api()) {
|
|
7
7
|
super();
|
|
8
8
|
}
|
|
9
9
|
|
|
10
|
-
get(uri: Uri, options?: RequestOptions): Promise<PageList<Json>> {
|
|
11
|
-
return this.api.get(uri, options).then(r => toPageList<Json>(r.body.data?.items,
|
|
10
|
+
get(uri: Uri, options?: RequestOptions | PageOptions): Promise<PageList<Json>> {
|
|
11
|
+
return this.api.get(uri, options).then(r => toPageList<Json>(r.body.data?.items,
|
|
12
|
+
toPageOptions(options) && { total: r.body.data?.totalItems },
|
|
13
|
+
));
|
|
12
14
|
}
|
|
13
15
|
|
|
14
16
|
getOne(uri: Uri, options?: RequestOptions): Promise<Json | undefined> {
|
|
15
17
|
return this.get(uri, options).then(r => r.first());
|
|
16
18
|
}
|
|
17
19
|
|
|
18
|
-
all(): Promise<PageList<Json>> {
|
|
19
|
-
return this.get(this.route());
|
|
20
|
+
all(options?: PageOptions): Promise<PageList<Json>> {
|
|
21
|
+
return this.get(this.route(), options);
|
|
20
22
|
}
|
|
21
23
|
|
|
22
24
|
byId(id: Id): Promise<Json | undefined> {
|
|
23
25
|
return this.getOne(this.routeId().id(id));
|
|
24
26
|
}
|
|
25
27
|
|
|
26
|
-
search(q: JsonValue): Promise<PageList<Json>> {
|
|
27
|
-
return this.get(this.route().query(q));
|
|
28
|
+
search(q: JsonValue, options?: PageOptions): Promise<PageList<Json>> {
|
|
29
|
+
return this.get(this.route().query(q), options);
|
|
28
30
|
}
|
|
29
31
|
|
|
30
32
|
exists(id: Id): Promise<boolean> {
|
package/src/types/Json.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { isA } from './IsA';
|
|
2
2
|
import { isDefined, isEmpty, isObject } from './Is';
|
|
3
3
|
import { Get, ofGet } from './Get';
|
|
4
|
+
import { ifDefined } from '../utils';
|
|
4
5
|
|
|
5
6
|
export type JsonValue = string | number | boolean | null | Json | JsonValue[];
|
|
6
7
|
export type Json = { [key: string]: JsonValue };
|
|
@@ -11,7 +12,7 @@ export const json = {
|
|
|
11
12
|
parse: <T extends Json = Json>(subject: unknown): T => JSON.parse(JSON.stringify(subject ?? {})),
|
|
12
13
|
merge: (...subjects: unknown[]): Json => json.parse(subjects.map(s => asJson(s, s => json.parse(s))).reduce((js, j) => ({ ...js, ...j }), {})),
|
|
13
14
|
delete: <T extends Json = Json>(subject: T, key: string): T => {
|
|
14
|
-
delete (subject as any)[key]
|
|
15
|
+
ifDefined(subject, () => delete (subject as any)[key])
|
|
15
16
|
return subject;
|
|
16
17
|
},
|
|
17
18
|
set: <T extends Json = Json>(subject: T, key = '', value?: unknown): T =>
|