@thisisagile/easy 10.11.2 → 10.11.7
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 +2 -2
- package/dist/domain/Repo.js +4 -4
- package/dist/domain/Repo.js.map +1 -1
- package/dist/process/Search.d.ts +2 -0
- package/dist/process/Search.js +1 -0
- package/dist/process/Search.js.map +1 -1
- package/dist/resources/Req.d.ts +2 -2
- package/dist/resources/Req.js +3 -6
- package/dist/resources/Req.js.map +1 -1
- package/dist/types/Gateway.d.ts +2 -1
- package/dist/types/Gateway.js.map +1 -1
- package/dist/types/PageList.d.ts +2 -0
- package/dist/types/PageList.js +4 -1
- package/dist/types/PageList.js.map +1 -1
- package/package.json +2 -2
- package/src/domain/Repo.ts +7 -5
- package/src/process/Search.ts +3 -0
- package/src/resources/Req.ts +3 -7
- package/src/types/Gateway.ts +2 -1
- package/src/types/PageList.ts +3 -0
package/dist/domain/Repo.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Constructor, Gateway, Id, Json, JsonValue, Key, PageList, PageOptions } from '../types';
|
|
1
|
+
import { Constructor, Gateway, Id, Json, JsonValue, Key, List, 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>;
|
|
@@ -7,7 +7,7 @@ export declare class Repo<T extends Struct> {
|
|
|
7
7
|
create: (item: T | Json) => T;
|
|
8
8
|
all(options?: PageOptions): Promise<PageList<T>>;
|
|
9
9
|
byId(id: Id): Promise<T>;
|
|
10
|
-
byIds(...ids: Id[]): Promise<
|
|
10
|
+
byIds(...ids: Id[]): Promise<List<T>>;
|
|
11
11
|
byKey(key: Key, options?: PageOptions): Promise<PageList<T>>;
|
|
12
12
|
by(key: keyof T, value: JsonValue, options?: PageOptions): Promise<PageList<T>>;
|
|
13
13
|
search(q: JsonValue, options?: PageOptions): Promise<PageList<T>>;
|
package/dist/domain/Repo.js
CHANGED
|
@@ -11,7 +11,7 @@ class Repo {
|
|
|
11
11
|
this.create = (item) => ((0, types_1.isValidatable)(item) ? item : new this.ctor(item));
|
|
12
12
|
}
|
|
13
13
|
all(options) {
|
|
14
|
-
return this.gateway.all(options).then(js =>
|
|
14
|
+
return this.gateway.all(options).then(js => (0, types_1.asPageList)(this.ctor, js));
|
|
15
15
|
}
|
|
16
16
|
byId(id) {
|
|
17
17
|
return this.gateway
|
|
@@ -23,13 +23,13 @@ class Repo {
|
|
|
23
23
|
return this.gateway.byIds(...ids).then(j => (0, types_1.asList)(this.ctor, j));
|
|
24
24
|
}
|
|
25
25
|
byKey(key, options) {
|
|
26
|
-
return this.gateway.by('key', key, options).then(js =>
|
|
26
|
+
return this.gateway.by('key', key, options).then(js => (0, types_1.asPageList)(this.ctor, js));
|
|
27
27
|
}
|
|
28
28
|
by(key, value, options) {
|
|
29
|
-
return this.gateway.by(key.toString(), value, options).then(js =>
|
|
29
|
+
return this.gateway.by(key.toString(), value, options).then(js => (0, types_1.asPageList)(this.ctor, js));
|
|
30
30
|
}
|
|
31
31
|
search(q, options) {
|
|
32
|
-
return this.gateway.search(q, options).then(js =>
|
|
32
|
+
return this.gateway.search(q, options).then(js => (0, types_1.asPageList)(this.ctor, js));
|
|
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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"}
|
package/dist/process/Search.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Repo, Struct } from '../domain';
|
|
2
2
|
import { Id, JsonValue, Key, PageList, PageOptions } from '../types';
|
|
3
|
+
import { Req } from '../resources';
|
|
3
4
|
export declare class Search<T extends Struct> {
|
|
4
5
|
protected repo: Repo<T>;
|
|
5
6
|
constructor(repo: Repo<T>);
|
|
@@ -7,6 +8,7 @@ export declare class Search<T extends Struct> {
|
|
|
7
8
|
byId: (id: Id) => Promise<T>;
|
|
8
9
|
byIds: (...ids: Id[]) => Promise<PageList<T>>;
|
|
9
10
|
byKey: (key: Key, options?: PageOptions | undefined) => Promise<PageList<T>>;
|
|
11
|
+
query: ({ query, skip, take }: Req) => Promise<PageList<T>>;
|
|
10
12
|
search: (query: JsonValue, options?: PageOptions | undefined) => Promise<PageList<T>>;
|
|
11
13
|
exists: (id: Id) => Promise<boolean>;
|
|
12
14
|
}
|
package/dist/process/Search.js
CHANGED
|
@@ -10,6 +10,7 @@ class Search {
|
|
|
10
10
|
this.byId = (id) => this.repo.byId(id);
|
|
11
11
|
this.byIds = (...ids) => this.repo.byIds(...ids);
|
|
12
12
|
this.byKey = (key, options) => this.repo.byKey(key, options);
|
|
13
|
+
this.query = ({ query, skip, take }) => this.search(query, { skip, take });
|
|
13
14
|
this.search = (query, options) => (0, types_1.choose)(query)
|
|
14
15
|
.case(types_1.isNotEmpty, q => this.repo.search(q, options))
|
|
15
16
|
.else((0, utils_1.resolve)((0, types_1.toList)()));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Search.js","sourceRoot":"","sources":["../../src/process/Search.ts"],"names":[],"mappings":";;;AACA,oCAAiG;AACjG,oCAAmC;
|
|
1
|
+
{"version":3,"file":"Search.js","sourceRoot":"","sources":["../../src/process/Search.ts"],"names":[],"mappings":";;;AACA,oCAAiG;AACjG,oCAAmC;AAInC,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,UAAK,GAAG,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAM,EAAwB,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC;QAE7F,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;IAjBtB,CAAC;CAkBxC;AAnBD,wBAmBC"}
|
package/dist/resources/Req.d.ts
CHANGED
|
@@ -6,8 +6,8 @@ export declare class Req implements Omit<PageOptions, 'sort'> {
|
|
|
6
6
|
constructor(path: Json, query: Json, body: unknown);
|
|
7
7
|
get id(): Id;
|
|
8
8
|
get q(): JsonValue;
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
readonly skip: number | undefined;
|
|
10
|
+
readonly take: number | undefined;
|
|
11
11
|
get: (key: Text) => any;
|
|
12
12
|
}
|
|
13
13
|
export declare const toReq: (req: {
|
package/dist/resources/Req.js
CHANGED
|
@@ -2,11 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.toReq = exports.Req = void 0;
|
|
4
4
|
const types_1 = require("../types");
|
|
5
|
+
const utils_1 = require("../utils");
|
|
5
6
|
class Req {
|
|
6
7
|
constructor(path = {}, query = {}, body) {
|
|
7
8
|
this.path = path;
|
|
8
9
|
this.query = query;
|
|
9
10
|
this.body = body;
|
|
11
|
+
this.skip = (0, utils_1.ifDefined)(this.query?.skip, (0, types_1.asNumber)(this.query?.skip));
|
|
12
|
+
this.take = (0, utils_1.ifDefined)(this.query?.take, (0, types_1.asNumber)(this.query?.take));
|
|
10
13
|
this.get = (key) => this.path[key.toString()] ?? this.query[key.toString()];
|
|
11
14
|
}
|
|
12
15
|
get id() {
|
|
@@ -15,12 +18,6 @@ class Req {
|
|
|
15
18
|
get q() {
|
|
16
19
|
return this.get('q');
|
|
17
20
|
}
|
|
18
|
-
get skip() {
|
|
19
|
-
return (0, types_1.asNumber)(this.get('skip'));
|
|
20
|
-
}
|
|
21
|
-
get take() {
|
|
22
|
-
return (0, types_1.asNumber)(this.get('take'));
|
|
23
|
-
}
|
|
24
21
|
}
|
|
25
22
|
exports.Req = Req;
|
|
26
23
|
const toReq = (req) => new Req(req.params, req.query, req.body);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Req.js","sourceRoot":"","sources":["../../src/resources/Req.ts"],"names":[],"mappings":";;;AAAA,oCAA4E;
|
|
1
|
+
{"version":3,"file":"Req.js","sourceRoot":"","sources":["../../src/resources/Req.ts"],"names":[],"mappings":";;;AAAA,oCAA4E;AAC5E,oCAAqC;AAErC,MAAa,GAAG;IACd,YAAqB,OAAa,EAAE,EAAW,QAAc,EAAE,EAAW,IAAa;QAAlE,SAAI,GAAJ,IAAI,CAAW;QAAW,UAAK,GAAL,KAAK,CAAW;QAAW,SAAI,GAAJ,IAAI,CAAS;QAU9E,SAAI,GAAG,IAAA,iBAAS,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAA,gBAAQ,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/D,SAAI,GAAG,IAAA,iBAAS,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAA,gBAAQ,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QAExE,QAAG,GAAG,CAAC,GAAS,EAAO,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAbQ,CAAC;IAE3F,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;CAMF;AAfD,kBAeC;AAEM,MAAM,KAAK,GAAG,CAAC,GAA2E,EAAO,EAAE,CACxG,IAAI,GAAG,CAAC,GAAG,CAAC,MAAc,EAAE,GAAG,CAAC,KAAa,EAAE,GAAG,CAAC,IAAY,CAAC,CAAC;AADtD,QAAA,KAAK,SACiD"}
|
package/dist/types/Gateway.d.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { Json, JsonValue } from './Json';
|
|
2
2
|
import { Id } from './Id';
|
|
3
3
|
import { PageList, PageOptions } from './PageList';
|
|
4
|
+
import { List } from './List';
|
|
4
5
|
export declare abstract class Gateway {
|
|
5
6
|
all(options?: PageOptions): Promise<PageList<Json>>;
|
|
6
7
|
byId(id: Id): Promise<Json | undefined>;
|
|
7
8
|
by(_key: string, _value: JsonValue, _options?: PageOptions): Promise<PageList<Json>>;
|
|
8
|
-
byIds(..._ids: Id[]): Promise<
|
|
9
|
+
byIds(..._ids: Id[]): Promise<List<Json>>;
|
|
9
10
|
search(q: JsonValue, options?: PageOptions): Promise<PageList<Json>>;
|
|
10
11
|
exists(id: Id): Promise<boolean>;
|
|
11
12
|
add(item: Json): Promise<Json>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Gateway.js","sourceRoot":"","sources":["../../src/types/Gateway.ts"],"names":[],"mappings":";;;AAEA,2CAAwC;AACxC,oCAAkC;
|
|
1
|
+
{"version":3,"file":"Gateway.js","sourceRoot":"","sources":["../../src/types/Gateway.ts"],"names":[],"mappings":";;;AAEA,2CAAwC;AACxC,oCAAkC;AAIlC,MAAsB,OAAO;IAC3B,GAAG,CAAC,OAAqB;QACvB,OAAO,IAAA,cAAM,EAAC,qBAAS,CAAC,gBAAgB,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,CAAC,EAAM;QACT,OAAO,IAAA,cAAM,EAAC,qBAAS,CAAC,gBAAgB,CAAC,CAAC;IAC5C,CAAC;IAED,EAAE,CAAC,IAAY,EAAE,MAAiB,EAAE,QAAsB;QACxD,OAAO,IAAA,cAAM,EAAC,qBAAS,CAAC,gBAAgB,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,GAAG,IAAU;QACjB,OAAO,IAAA,cAAM,EAAC,qBAAS,CAAC,gBAAgB,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,CAAY,EAAE,OAAqB;QACxC,OAAO,IAAA,cAAM,EAAC,qBAAS,CAAC,gBAAgB,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,EAAM;QACX,OAAO,IAAA,cAAM,EAAC,qBAAS,CAAC,gBAAgB,CAAC,CAAC;IAC5C,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,OAAO,IAAA,cAAM,EAAC,qBAAS,CAAC,gBAAgB,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,IAAU;QACf,OAAO,IAAA,cAAM,EAAC,qBAAS,CAAC,gBAAgB,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,EAAM;QACX,OAAO,IAAA,cAAM,EAAC,qBAAS,CAAC,gBAAgB,CAAC,CAAC;IAC5C,CAAC;CACF;AApCD,0BAoCC"}
|
package/dist/types/PageList.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { List } from './List';
|
|
2
|
+
import { Construct } from './Constructor';
|
|
2
3
|
export declare type Sort = {
|
|
3
4
|
key: string;
|
|
4
5
|
value: -1 | 1;
|
|
@@ -14,3 +15,4 @@ export declare type PageList<T> = List<T> & Omit<PageOptions, 'sort'> & {
|
|
|
14
15
|
export declare const toPageList: <T>(items?: T[] | undefined, options?: (Omit<PageOptions, "sort"> & {
|
|
15
16
|
total?: number | undefined;
|
|
16
17
|
}) | undefined) => PageList<T>;
|
|
18
|
+
export declare const asPageList: <T, U>(c: Construct<T>, items?: PageList<U>) => PageList<T>;
|
package/dist/types/PageList.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.toPageList = void 0;
|
|
3
|
+
exports.asPageList = exports.toPageList = void 0;
|
|
4
4
|
const List_1 = require("./List");
|
|
5
|
+
const Constructor_1 = require("./Constructor");
|
|
5
6
|
const toPageList = (items, options) => {
|
|
6
7
|
const list = (0, List_1.toList)(...(items ?? []));
|
|
7
8
|
list.take = options?.take ?? 250;
|
|
@@ -10,4 +11,6 @@ const toPageList = (items, options) => {
|
|
|
10
11
|
return list;
|
|
11
12
|
};
|
|
12
13
|
exports.toPageList = toPageList;
|
|
14
|
+
const asPageList = (c, items = (0, exports.toPageList)()) => (0, exports.toPageList)(items.map(i => (0, Constructor_1.ofConstruct)(c, i)), items);
|
|
15
|
+
exports.asPageList = asPageList;
|
|
13
16
|
//# sourceMappingURL=PageList.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PageList.js","sourceRoot":"","sources":["../../src/types/PageList.ts"],"names":[],"mappings":";;;AAAA,iCAAsC;
|
|
1
|
+
{"version":3,"file":"PageList.js","sourceRoot":"","sources":["../../src/types/PageList.ts"],"names":[],"mappings":";;;AAAA,iCAAsC;AACtC,+CAAuD;AAQhD,MAAM,UAAU,GAAG,CAAI,KAAW,EAAE,OAAwD,EAAe,EAAE;IAClH,MAAM,IAAI,GAAG,IAAA,aAAM,EAAI,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAQ,CAAC;IAChD,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,GAAG,CAAC;IACjC,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,CAAC;IAC/B,IAAI,CAAC,KAAK,GAAG,OAAO,EAAE,KAAK,CAAC;IAC5B,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEK,MAAM,UAAU,GAAG,CAAO,CAAe,EAAE,QAAQ,IAAA,kBAAU,GAAK,EAAe,EAAE,CAAC,IAAA,kBAAU,EAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AAAtI,QAAA,UAAU,cAA4H"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy",
|
|
3
|
-
"version": "10.11.
|
|
3
|
+
"version": "10.11.7",
|
|
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.11.
|
|
34
|
+
"@thisisagile/easy-test": "10.11.7",
|
|
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,5 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
asList,
|
|
3
|
+
asPageList,
|
|
3
4
|
Constructor,
|
|
4
5
|
Exception,
|
|
5
6
|
Gateway,
|
|
@@ -8,6 +9,7 @@ import {
|
|
|
8
9
|
Json,
|
|
9
10
|
JsonValue,
|
|
10
11
|
Key,
|
|
12
|
+
List,
|
|
11
13
|
PageList,
|
|
12
14
|
PageOptions,
|
|
13
15
|
toJson,
|
|
@@ -23,7 +25,7 @@ export class Repo<T extends Struct> {
|
|
|
23
25
|
create = (item: T | Json): T => (isValidatable(item) ? item : new this.ctor(item));
|
|
24
26
|
|
|
25
27
|
all(options?: PageOptions): Promise<PageList<T>> {
|
|
26
|
-
return this.gateway.all(options).then(js =>
|
|
28
|
+
return this.gateway.all(options).then(js => asPageList(this.ctor, js));
|
|
27
29
|
}
|
|
28
30
|
|
|
29
31
|
byId(id: Id): Promise<T> {
|
|
@@ -33,20 +35,20 @@ export class Repo<T extends Struct> {
|
|
|
33
35
|
.then(j => new this.ctor(j));
|
|
34
36
|
}
|
|
35
37
|
|
|
36
|
-
byIds(...ids: Id[]): Promise<
|
|
38
|
+
byIds(...ids: Id[]): Promise<List<T>> {
|
|
37
39
|
return this.gateway.byIds(...ids).then(j => asList(this.ctor, j));
|
|
38
40
|
}
|
|
39
41
|
|
|
40
42
|
byKey(key: Key, options?: PageOptions): Promise<PageList<T>> {
|
|
41
|
-
return this.gateway.by('key', key, options).then(js =>
|
|
43
|
+
return this.gateway.by('key', key, options).then(js => asPageList(this.ctor, js));
|
|
42
44
|
}
|
|
43
45
|
|
|
44
46
|
by(key: keyof T, value: JsonValue, options?: PageOptions): Promise<PageList<T>> {
|
|
45
|
-
return this.gateway.by(key.toString(), value, options).then(js =>
|
|
47
|
+
return this.gateway.by(key.toString(), value, options).then(js => asPageList(this.ctor, js));
|
|
46
48
|
}
|
|
47
49
|
|
|
48
50
|
search(q: JsonValue, options?: PageOptions): Promise<PageList<T>> {
|
|
49
|
-
return this.gateway.search(q, options).then(js =>
|
|
51
|
+
return this.gateway.search(q, options).then(js => asPageList(this.ctor, js));
|
|
50
52
|
}
|
|
51
53
|
|
|
52
54
|
exists(id: Id): Promise<boolean> {
|
package/src/process/Search.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Repo, Struct } from '../domain';
|
|
2
2
|
import { choose, Id, isNotEmpty, JsonValue, Key, toList, PageList, PageOptions } from '../types';
|
|
3
3
|
import { resolve } from '../utils';
|
|
4
|
+
import { Req } from '../resources';
|
|
4
5
|
|
|
5
6
|
|
|
6
7
|
export class Search<T extends Struct> {
|
|
@@ -14,6 +15,8 @@ export class Search<T extends Struct> {
|
|
|
14
15
|
|
|
15
16
|
byKey = (key: Key,options?: PageOptions): Promise<PageList<T>> => this.repo.byKey(key, options);
|
|
16
17
|
|
|
18
|
+
query = ({query, skip, take}: Req): Promise<PageList<T>> => this.search(query, {skip, take});
|
|
19
|
+
|
|
17
20
|
search = (query: JsonValue, options?: PageOptions): Promise<PageList<T>> =>
|
|
18
21
|
choose(query)
|
|
19
22
|
.case(isNotEmpty, q => this.repo.search(q, options))
|
package/src/resources/Req.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { asNumber, Id, Json, JsonValue, PageOptions, Text } from '../types';
|
|
2
|
+
import { ifDefined } from '../utils';
|
|
2
3
|
|
|
3
4
|
export class Req implements Omit<PageOptions, 'sort'> {
|
|
4
5
|
constructor(readonly path: Json = {}, readonly query: Json = {}, readonly body: unknown) {}
|
|
@@ -11,13 +12,8 @@ export class Req implements Omit<PageOptions, 'sort'> {
|
|
|
11
12
|
return this.get('q');
|
|
12
13
|
}
|
|
13
14
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
get take(): number | undefined {
|
|
19
|
-
return asNumber(this.get('take'));
|
|
20
|
-
}
|
|
15
|
+
readonly skip = ifDefined(this.query?.skip, asNumber(this.query?.skip));
|
|
16
|
+
readonly take = ifDefined(this.query?.take, asNumber(this.query?.take));
|
|
21
17
|
|
|
22
18
|
get = (key: Text): any => this.path[key.toString()] ?? this.query[key.toString()];
|
|
23
19
|
}
|
package/src/types/Gateway.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { Id } from './Id';
|
|
|
3
3
|
import { Exception } from './Exception';
|
|
4
4
|
import { reject } from '../utils';
|
|
5
5
|
import { PageList, PageOptions } from './PageList';
|
|
6
|
+
import { List } from './List';
|
|
6
7
|
|
|
7
8
|
export abstract class Gateway {
|
|
8
9
|
all(options?: PageOptions): Promise<PageList<Json>> {
|
|
@@ -17,7 +18,7 @@ export abstract class Gateway {
|
|
|
17
18
|
return reject(Exception.IsNotImplemented);
|
|
18
19
|
}
|
|
19
20
|
|
|
20
|
-
byIds(..._ids: Id[]): Promise<
|
|
21
|
+
byIds(..._ids: Id[]): Promise<List<Json>> {
|
|
21
22
|
return reject(Exception.IsNotImplemented);
|
|
22
23
|
}
|
|
23
24
|
|
package/src/types/PageList.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { List, toList } from './List';
|
|
2
|
+
import { Construct, ofConstruct } from './Constructor';
|
|
2
3
|
|
|
3
4
|
export type Sort = { key: string; value: -1 | 1 };
|
|
4
5
|
|
|
@@ -13,3 +14,5 @@ export const toPageList = <T>(items?: T[], options?: Omit<PageOptions, 'sort'> &
|
|
|
13
14
|
list.total = options?.total;
|
|
14
15
|
return list;
|
|
15
16
|
};
|
|
17
|
+
|
|
18
|
+
export const asPageList = <T, U>(c: Construct<T>, items = toPageList<U>()): PageList<T> => toPageList<T>(items.map(i => ofConstruct(c, i)), items);
|