@mountainpass/waycharter 2.0.0 → 2.0.1
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/CHANGELOG.md +6 -0
- package/README.md +1 -1
- package/dist/collections/build-first-link.d.ts +2 -1
- package/dist/collections/build-first-link.js +15 -19
- package/dist/collections/build-first-link.js.map +1 -1
- package/dist/collections/build-next-link.d.ts +2 -1
- package/dist/collections/build-next-link.js +4 -2
- package/dist/collections/build-next-link.js.map +1 -1
- package/dist/collections/build-previous-link.d.ts +3 -1
- package/dist/collections/build-previous-link.js +12 -2
- package/dist/collections/build-previous-link.js.map +1 -1
- package/dist/handler.d.ts +1 -1
- package/dist/util/check-page.d.ts +1 -1
- package/dist/util/check-page.js +2 -15
- package/dist/util/check-page.js.map +1 -1
- package/dist/waycharter.d.ts +3 -1
- package/dist/waycharter.js +7 -5
- package/dist/waycharter.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## <small>2.0.1 (2022-08-03)</small>
|
|
2
|
+
|
|
3
|
+
* feat(collections): added support for non-numberic paging ([7ecead9](https://github.com/mountain-pass/waycharter/commit/7ecead9))
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
|
|
1
7
|
## 2.0.0 (2022-06-23)
|
|
2
8
|
|
|
3
9
|
* build(lint): fixing linting issues ([0053c11](https://github.com/mountain-pass/waycharter/commit/0053c11))
|
package/README.md
CHANGED
|
@@ -13,7 +13,7 @@ This library is compatible with Node.js 10.x, 12.x and 14.x
|
|
|
13
13
|
|
|
14
14
|
<!-- [](https://www.codacy.com/gh/mountain-pass/waycharter/dashboard?utm_source=github.com&utm_medium=referral&utm_content=mountain-pass/waycharter&utm_campaign=Badge_Grade) [](https://www.codacy.com/gh/mountain-pass/waycharter/dashboard?utm_source=github.com&utm_medium=referral&utm_content=mountain-pass/waycharter&utm_campaign=Badge_Coverage) -->
|
|
15
15
|
|
|
16
|
-
[](https://snyk.io/test/github/mountain-pass/waycharter) [](https://snyk.io/test/github/mountain-pass/waycharter) [](https://snyk.io/test/npm/@mountainpass/waycharter/2.0.1)
|
|
17
17
|
|
|
18
18
|
|
|
19
19
|
[](https://conventionalcommits.org) [](https://github.com/prettier/prettier)
|
|
@@ -3,10 +3,11 @@ import { Query } from 'express-serve-static-core';
|
|
|
3
3
|
* @param hasMore
|
|
4
4
|
* @param pageInt
|
|
5
5
|
* @param page
|
|
6
|
+
* @param firstPage
|
|
6
7
|
* @param collectionPath
|
|
7
8
|
* @param otherParameters
|
|
8
9
|
*/
|
|
9
|
-
export declare function buildFirstLink(
|
|
10
|
+
export declare function buildFirstLink(collectionPath: string, otherParameters: Query): {
|
|
10
11
|
rel: string;
|
|
11
12
|
uri: string;
|
|
12
13
|
}[];
|
|
@@ -16,28 +16,24 @@ exports.buildFirstLink = void 0;
|
|
|
16
16
|
* @param hasMore
|
|
17
17
|
* @param pageInt
|
|
18
18
|
* @param page
|
|
19
|
+
* @param firstPage
|
|
19
20
|
* @param collectionPath
|
|
20
21
|
* @param otherParameters
|
|
21
22
|
*/
|
|
22
|
-
function buildFirstLink(
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
];
|
|
37
|
-
}
|
|
38
|
-
else {
|
|
39
|
-
return [];
|
|
40
|
-
}
|
|
23
|
+
function buildFirstLink(collectionPath, otherParameters) {
|
|
24
|
+
return Object.keys(otherParameters).length > 0
|
|
25
|
+
? [
|
|
26
|
+
{
|
|
27
|
+
rel: 'first',
|
|
28
|
+
uri: "".concat(collectionPath, "?").concat(new URLSearchParams(__assign({}, otherParameters)).toString())
|
|
29
|
+
}
|
|
30
|
+
]
|
|
31
|
+
: [
|
|
32
|
+
{
|
|
33
|
+
rel: 'first',
|
|
34
|
+
uri: collectionPath
|
|
35
|
+
}
|
|
36
|
+
];
|
|
41
37
|
}
|
|
42
38
|
exports.buildFirstLink = buildFirstLink;
|
|
43
39
|
//# sourceMappingURL=build-first-link.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-first-link.js","sourceRoot":"","sources":["../../src/collections/build-first-link.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA
|
|
1
|
+
{"version":3,"file":"build-first-link.js","sourceRoot":"","sources":["../../src/collections/build-first-link.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA;;;;;;;GAOG;AACH,SAAgB,cAAc,CAC5B,cAAsB,EACtB,eAAsB;IAEtB,OAAO,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,GAAG,CAAC;QAC5C,CAAC,CAAC;YACA;gBACE,GAAG,EAAE,OAAO;gBACZ,GAAG,EAAE,UAAG,cAAc,cAAI,IAAI,eAAe,cACxC,eAAyC,EAC5C,CAAC,QAAQ,EAAE,CAAE;aAChB;SACF;QACD,CAAC,CAAC;YACA;gBACE,GAAG,EAAE,OAAO;gBACZ,GAAG,EAAE,cAAc;aACpB;SACF,CAAA;AACL,CAAC;AAnBD,wCAmBC"}
|
|
@@ -2,10 +2,11 @@ import { Query } from 'express-serve-static-core';
|
|
|
2
2
|
/**
|
|
3
3
|
* @param hasMore
|
|
4
4
|
* @param page
|
|
5
|
+
* @param nextPage
|
|
5
6
|
* @param collectionPath
|
|
6
7
|
* @param otherParameters
|
|
7
8
|
*/
|
|
8
|
-
export declare function buildNextLink(hasMore: boolean, page: number, collectionPath: string, otherParameters: Query): {
|
|
9
|
+
export declare function buildNextLink(hasMore: boolean, page: number | string, nextPage: string | undefined, collectionPath: string, otherParameters: Query): {
|
|
9
10
|
rel: string;
|
|
10
11
|
uri: string;
|
|
11
12
|
}[];
|
|
@@ -15,15 +15,17 @@ exports.buildNextLink = void 0;
|
|
|
15
15
|
/**
|
|
16
16
|
* @param hasMore
|
|
17
17
|
* @param page
|
|
18
|
+
* @param nextPage
|
|
18
19
|
* @param collectionPath
|
|
19
20
|
* @param otherParameters
|
|
20
21
|
*/
|
|
21
|
-
function buildNextLink(hasMore, page, collectionPath, otherParameters) {
|
|
22
|
+
function buildNextLink(hasMore, page, nextPage, collectionPath, otherParameters) {
|
|
23
|
+
var nextPageNumber = (nextPage !== null && nextPage !== void 0 ? nextPage : typeof page === 'number') ? (page + 1).toFixed() : undefined;
|
|
22
24
|
return hasMore
|
|
23
25
|
? [
|
|
24
26
|
{
|
|
25
27
|
rel: 'next',
|
|
26
|
-
uri: "".concat(collectionPath, "?").concat(new URLSearchParams(__assign({ page:
|
|
28
|
+
uri: "".concat(collectionPath, "?").concat(new URLSearchParams(__assign({ page: nextPageNumber }, otherParameters)).toString())
|
|
27
29
|
}
|
|
28
30
|
]
|
|
29
31
|
: [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-next-link.js","sourceRoot":"","sources":["../../src/collections/build-next-link.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA
|
|
1
|
+
{"version":3,"file":"build-next-link.js","sourceRoot":"","sources":["../../src/collections/build-next-link.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA;;;;;;GAMG;AACH,SAAgB,aAAa,CAC3B,OAAgB,EAChB,IAAqB,EACrB,QAA4B,EAC5B,cAAsB,EACtB,eAAsB;IAEtB,IAAM,cAAc,GAAG,CAAA,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,OAAO,IAAI,KAAK,QAAQ,EAAC,CAAC,CAAC,CAAE,IAAe,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;IAC1G,OAAO,OAAO;QACZ,CAAC,CAAC;YACA;gBACE,GAAG,EAAE,MAAM;gBACX,GAAG,EAAE,UAAG,cAAc,cAAI,IAAI,eAAe,YAC3C,IAAI,EAAE,cAAc,IACjB,eAAe,EAClB,CAAC,QAAQ,EAAE,CAAE;aAChB;SACF;QACD,CAAC,CAAC,EAAE,CAAA;AACR,CAAC;AAnBD,sCAmBC"}
|
|
@@ -2,10 +2,12 @@ import { Query } from 'express-serve-static-core';
|
|
|
2
2
|
/**
|
|
3
3
|
* @param pageInt
|
|
4
4
|
* @param page
|
|
5
|
+
* @param prevPage
|
|
6
|
+
* @param previousPage
|
|
5
7
|
* @param collectionPath
|
|
6
8
|
* @param otherParameters
|
|
7
9
|
*/
|
|
8
|
-
export declare function buildPreviousLink(page: number, collectionPath: string, otherParameters: Query): {
|
|
10
|
+
export declare function buildPreviousLink(page: number | string, previousPage: string | undefined, collectionPath: string, otherParameters: Query): {
|
|
9
11
|
rel: string;
|
|
10
12
|
uri: string;
|
|
11
13
|
}[];
|
|
@@ -15,10 +15,12 @@ exports.buildPreviousLink = void 0;
|
|
|
15
15
|
/**
|
|
16
16
|
* @param pageInt
|
|
17
17
|
* @param page
|
|
18
|
+
* @param prevPage
|
|
19
|
+
* @param previousPage
|
|
18
20
|
* @param collectionPath
|
|
19
21
|
* @param otherParameters
|
|
20
22
|
*/
|
|
21
|
-
function buildPreviousLink(page, collectionPath, otherParameters) {
|
|
23
|
+
function buildPreviousLink(page, previousPage, collectionPath, otherParameters) {
|
|
22
24
|
if (page === 1) {
|
|
23
25
|
return Object.keys(otherParameters).length > 0
|
|
24
26
|
? [
|
|
@@ -34,7 +36,7 @@ function buildPreviousLink(page, collectionPath, otherParameters) {
|
|
|
34
36
|
}
|
|
35
37
|
];
|
|
36
38
|
}
|
|
37
|
-
else if (page > 1) {
|
|
39
|
+
else if (typeof page === 'number' && page > 1) {
|
|
38
40
|
return [
|
|
39
41
|
{
|
|
40
42
|
rel: 'prev',
|
|
@@ -42,6 +44,14 @@ function buildPreviousLink(page, collectionPath, otherParameters) {
|
|
|
42
44
|
}
|
|
43
45
|
];
|
|
44
46
|
}
|
|
47
|
+
else if (previousPage !== undefined) {
|
|
48
|
+
return [
|
|
49
|
+
{
|
|
50
|
+
rel: 'prev',
|
|
51
|
+
uri: "".concat(collectionPath, "?").concat(new URLSearchParams(__assign({ page: previousPage }, otherParameters)).toString())
|
|
52
|
+
}
|
|
53
|
+
];
|
|
54
|
+
}
|
|
45
55
|
else {
|
|
46
56
|
return [];
|
|
47
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-previous-link.js","sourceRoot":"","sources":["../../src/collections/build-previous-link.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA
|
|
1
|
+
{"version":3,"file":"build-previous-link.js","sourceRoot":"","sources":["../../src/collections/build-previous-link.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA;;;;;;;GAOG;AACH,SAAgB,iBAAiB,CAC/B,IAAqB,EACrB,YAAgC,EAChC,cAAsB,EACtB,eAAsB;IAEtB,IAAI,IAAI,KAAK,CAAC,EAAE;QACd,OAAO,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,GAAG,CAAC;YAC5C,CAAC,CAAC;gBACA;oBACE,GAAG,EAAE,MAAM;oBACX,GAAG,EAAE,UAAG,cAAc,cAAI,IAAI,eAAe,cACxC,eAAyC,EAC5C,CAAC,QAAQ,EAAE,CAAE;iBAChB;aACF;YACD,CAAC,CAAC;gBACA;oBACE,GAAG,EAAE,MAAM;oBACX,GAAG,EAAE,cAAc;iBACpB;aACF,CAAA;KACJ;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,GAAG,CAAC,EAAE;QAC/C,OAAO;YACL;gBACE,GAAG,EAAE,MAAM;gBACX,GAAG,EAAE,UAAG,cAAc,cAAI,IAAI,eAAe,YAC3C,IAAI,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,IACvB,eAAe,EAClB,CAAC,QAAQ,EAAE,CAAE;aAChB;SACF,CAAA;KACF;SAAM,IAAI,YAAY,KAAK,SAAS,EAAE;QACrC,OAAO;YACL;gBACE,GAAG,EAAE,MAAM;gBACX,GAAG,EAAE,UAAG,cAAc,cAAI,IAAI,eAAe,YAC3C,IAAI,EAAE,YAAY,IACf,eAAe,EAClB,CAAC,QAAQ,EAAE,CAAE;aAChB;SACF,CAAA;KACF;SAAM;QACL,OAAO,EAAE,CAAA;KACV;AACH,CAAC;AA7CD,8CA6CC"}
|
package/dist/handler.d.ts
CHANGED
|
@@ -12,7 +12,7 @@ export declare type HandlerParameters<ResponseBody> = {
|
|
|
12
12
|
};
|
|
13
13
|
export declare type Handler<ResponseBody> = (parameters: HandlerParameters<ResponseBody>) => Promise<void> | void;
|
|
14
14
|
export declare type CollectionHandlerParameters<ResponseBody> = HandlerParameters<ResponseBody> & {
|
|
15
|
-
page: number;
|
|
15
|
+
page: number | string;
|
|
16
16
|
};
|
|
17
17
|
export declare type CollectionHandler<ResponseBody> = (parameters: CollectionHandlerParameters<ResponseBody>) => Promise<void> | void;
|
|
18
18
|
export declare type ActionHandlerParameters<ResponseBody> = Omit<HandlerParameters<ResponseBody>, 'requestHeaders'> & {
|
|
@@ -5,7 +5,7 @@ import { EmptyHandlerResponse, HandlerResponse } from '../waycharter';
|
|
|
5
5
|
* @param expandedPath
|
|
6
6
|
*/
|
|
7
7
|
export declare function checkPage(page: string | import('qs').ParsedQs | string[] | import('qs').ParsedQs[], expandedPath: string): {
|
|
8
|
-
|
|
8
|
+
page: number | string;
|
|
9
9
|
} | {
|
|
10
10
|
pageValidationError: HandlerResponse<ProblemDocument>;
|
|
11
11
|
} | {
|
package/dist/util/check-page.js
CHANGED
|
@@ -36,20 +36,7 @@ function checkPage(page, expandedPath) {
|
|
|
36
36
|
// page should be >= 0
|
|
37
37
|
var pageInt = Number.parseInt(page || '0');
|
|
38
38
|
if (Number.isNaN(pageInt)) {
|
|
39
|
-
return {
|
|
40
|
-
pageValidationError: {
|
|
41
|
-
status: 400,
|
|
42
|
-
body: new problem_document_1.ProblemDocument({
|
|
43
|
-
type: 'https://waycharter.io/bad-page',
|
|
44
|
-
title: "Bad Page",
|
|
45
|
-
detail: "We don't understand what page '".concat(page, "' is that you are trying to retrieve"),
|
|
46
|
-
page: page
|
|
47
|
-
}),
|
|
48
|
-
headers: {
|
|
49
|
-
'content-type': 'application/problem+json'
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
};
|
|
39
|
+
return { page: page };
|
|
53
40
|
}
|
|
54
41
|
if (pageInt < 0) {
|
|
55
42
|
return {
|
|
@@ -68,7 +55,7 @@ function checkPage(page, expandedPath) {
|
|
|
68
55
|
};
|
|
69
56
|
}
|
|
70
57
|
return {
|
|
71
|
-
|
|
58
|
+
page: pageInt
|
|
72
59
|
};
|
|
73
60
|
}
|
|
74
61
|
exports.checkPage = checkPage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-page.js","sourceRoot":"","sources":["../../src/util/check-page.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAGhE;;;GAGG;AACH,SAAgB,SAAS,CACvB,IAAyE,EACzE,YAAoB;IAEpB,IAAI,IAAI,KAAK,GAAG,EAAE;QAChB,OAAO;YACL,QAAQ,EAAE;gBACR,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE;oBACP,QAAQ,EAAE,YAAY;iBACvB;aACF;SACF,CAAA;KACF;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACvB,OAAO;YACL,mBAAmB,EAAE;gBACnB,MAAM,EAAE,GAAG;gBACX,IAAI,EAAE,IAAI,kCAAe,CAAC;oBACxB,IAAI,EAAE,gCAAgC;oBACtC,KAAK,EAAE,UAAU;oBACjB,MAAM,EAAE,yCAAkC,IAAI,yCAAsC;oBACpF,IAAI,MAAA;iBACL,CAAC;gBACF,OAAO,EAAE;oBACP,cAAc,EAAE,0BAA0B;iBAC3C;aACF;SACF,CAAA;KACF;IACD,sBAAsB;IACtB,IAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAE,IAAe,IAAI,GAAG,CAAC,CAAA;IAExD,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACzB,OAAO
|
|
1
|
+
{"version":3,"file":"check-page.js","sourceRoot":"","sources":["../../src/util/check-page.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAGhE;;;GAGG;AACH,SAAgB,SAAS,CACvB,IAAyE,EACzE,YAAoB;IAEpB,IAAI,IAAI,KAAK,GAAG,EAAE;QAChB,OAAO;YACL,QAAQ,EAAE;gBACR,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE;oBACP,QAAQ,EAAE,YAAY;iBACvB;aACF;SACF,CAAA;KACF;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACvB,OAAO;YACL,mBAAmB,EAAE;gBACnB,MAAM,EAAE,GAAG;gBACX,IAAI,EAAE,IAAI,kCAAe,CAAC;oBACxB,IAAI,EAAE,gCAAgC;oBACtC,KAAK,EAAE,UAAU;oBACjB,MAAM,EAAE,yCAAkC,IAAI,yCAAsC;oBACpF,IAAI,MAAA;iBACL,CAAC;gBACF,OAAO,EAAE;oBACP,cAAc,EAAE,0BAA0B;iBAC3C;aACF;SACF,CAAA;KACF;IACD,sBAAsB;IACtB,IAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAE,IAAe,IAAI,GAAG,CAAC,CAAA;IAExD,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACzB,OAAO,EAAE,IAAI,EAAE,IAAc,EAAE,CAAA;KAChC;IACD,IAAI,OAAO,GAAG,CAAC,EAAE;QACf,OAAO;YACL,mBAAmB,EAAE;gBACnB,MAAM,EAAE,GAAG;gBACX,IAAI,EAAE,IAAI,kCAAe,CAAC;oBACxB,IAAI,EAAE,gCAAgC;oBACtC,KAAK,EAAE,UAAU;oBACjB,MAAM,EAAE,4CAAqC,IAAI,qCAAkC;oBACnF,IAAI,MAAA;iBACL,CAAC;gBACF,OAAO,EAAE;oBACP,cAAc,EAAE,0BAA0B;iBAC3C;aACF;SACF,CAAA;KACF;IACD,OAAO;QACL,IAAI,EAAE,OAAO;KACd,CAAA;AACH,CAAC;AAxDD,8BAwDC"}
|
package/dist/waycharter.d.ts
CHANGED
|
@@ -16,6 +16,8 @@ export declare type HandlerResponse<ResponseBody> = EmptyHandlerResponse & {
|
|
|
16
16
|
export declare type CollectionHandlerResponse<ResponseBody> = HandlerResponse<ResponseBody> & {
|
|
17
17
|
collectionPointer: string;
|
|
18
18
|
hasMore?: boolean;
|
|
19
|
+
prevPage?: string;
|
|
20
|
+
nextPage?: string;
|
|
19
21
|
};
|
|
20
22
|
declare type ChartItem<ResponseBody> = (arguments_: HandlerResponse<ResponseBody>) => void;
|
|
21
23
|
declare type ChartError = (arguments_: HandlerResponse<ProblemDocument>) => void;
|
|
@@ -57,7 +59,7 @@ export declare class EndPoint<ResponseBody, ActionResponseBody> {
|
|
|
57
59
|
links: Array<Link>;
|
|
58
60
|
static createStatic<ResponseBody, ActionResponseBody = void>({ router, path, headerParameters, actions, ...handlerResponse }: Omit<EndPointParameters<ResponseBody, ActionResponseBody> & HandlerResponse<ResponseBody>, 'handler'>): EndPoint<ResponseBody, ActionResponseBody>;
|
|
59
61
|
static createCollection<ResponseBody, CanonicalItemResponseBody = void, ActionResponseBody = void, CanonicalItemActionResponseBody = void>({ router, path, headerParameters, filters, handler, actions, links, itemActions, itemEndpoint }: CollectionEndPointParameters<ResponseBody, ActionResponseBody, CanonicalItemResponseBody, CanonicalItemActionResponseBody>): EndPoint<ResponseBody, ActionResponseBody>;
|
|
60
|
-
static createStaticCollection<ResponseBody, CanonicalItemResponseBody = void, ActionResponseBody = void, CanonicalItemActionResponseBody = void>({ router, path, headerParameters, filters, actions, itemActions, itemEndpoint, ...collectionHandlerResponse }: Omit<CollectionEndPointParameters<ResponseBody, ActionResponseBody, CanonicalItemResponseBody, CanonicalItemActionResponseBody>, 'handler'> & Omit<CollectionHandlerResponse<ResponseBody>, 'hasMore'>): EndPoint<ResponseBody, ActionResponseBody>;
|
|
62
|
+
static createStaticCollection<ResponseBody, CanonicalItemResponseBody = void, ActionResponseBody = void, CanonicalItemActionResponseBody = void>({ router, path, headerParameters, filters, actions, itemActions, itemEndpoint, ...collectionHandlerResponse }: Omit<CollectionEndPointParameters<ResponseBody, ActionResponseBody, CanonicalItemResponseBody, CanonicalItemActionResponseBody>, 'handler'> & Omit<CollectionHandlerResponse<ResponseBody>, 'hasMore' | 'prevPage' | 'nextPage'>): EndPoint<ResponseBody, ActionResponseBody>;
|
|
61
63
|
static create<ResponseBody, ActionResponseBody = void>({ router, path, headerParameters, handler, actions, links }: EndPointParameters<ResponseBody, ActionResponseBody>): EndPoint<ResponseBody, ActionResponseBody>;
|
|
62
64
|
private constructor();
|
|
63
65
|
private addDefaultHandler;
|
package/dist/waycharter.js
CHANGED
|
@@ -303,12 +303,12 @@ var EndPoint = /** @class */ (function () {
|
|
|
303
303
|
filteredQueryParameters_1 = (0, filter_parameters_1.filterParameters)(filters, request.query);
|
|
304
304
|
response.chartCollection = function (resource) { return __awaiter(_this, void 0, void 0, function () {
|
|
305
305
|
return __generator(this, function (_a) {
|
|
306
|
-
sendCollectionHandlerResponse(resource, request.url, response, pageCheckResult.
|
|
306
|
+
sendCollectionHandlerResponse(resource, request.url, response, pageCheckResult.page, expandedPath, filteredQueryParameters_1, itemActions, itemEndpoint);
|
|
307
307
|
return [2 /*return*/];
|
|
308
308
|
});
|
|
309
309
|
}); };
|
|
310
310
|
handler({
|
|
311
|
-
page: pageCheckResult.
|
|
311
|
+
page: pageCheckResult.page,
|
|
312
312
|
pathParameters: request.params,
|
|
313
313
|
queryParameters: filteredQueryParameters_1,
|
|
314
314
|
requestHeaders: requestHeaders,
|
|
@@ -480,15 +480,17 @@ exports.EndPoint = EndPoint;
|
|
|
480
480
|
* @param requestUrl
|
|
481
481
|
* @param response
|
|
482
482
|
* @param pageInt
|
|
483
|
+
* @param pageCheckResult
|
|
484
|
+
* @param page
|
|
483
485
|
* @param expandedPath
|
|
484
486
|
* @param filteredParameters
|
|
485
487
|
* @param itemActions
|
|
486
488
|
* @param itemEndpoint
|
|
487
489
|
* @param staticLinks
|
|
488
490
|
*/
|
|
489
|
-
function sendCollectionHandlerResponse(resource, requestUrl, response,
|
|
490
|
-
var body = resource.body, collectionPointer = resource.collectionPointer, hasMore = resource.hasMore, links = resource.links, other = __rest(resource, ["body", "collectionPointer", "hasMore", "links"]);
|
|
491
|
+
function sendCollectionHandlerResponse(resource, requestUrl, response, page, expandedPath, filteredParameters, itemActions, itemEndpoint) {
|
|
492
|
+
var body = resource.body, collectionPointer = resource.collectionPointer, hasMore = resource.hasMore, prevPage = resource.prevPage, nextPage = resource.nextPage, links = resource.links, other = __rest(resource, ["body", "collectionPointer", "hasMore", "prevPage", "nextPage", "links"]);
|
|
491
493
|
var _a = (0, built_item_links_1.builtItemLinks)(collectionPointer, itemEndpoint, requestUrl, itemActions), itemLinks = _a.itemLinks, canonicalLinks = _a.canonicalLinks;
|
|
492
|
-
response.chart(__assign({ body: body, links: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(itemLinks), false), __read(canonicalLinks), false), __read((0, build_next_link_1.buildNextLink)(hasMore,
|
|
494
|
+
response.chart(__assign({ body: body, links: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(itemLinks), false), __read(canonicalLinks), false), __read((0, build_next_link_1.buildNextLink)(hasMore, page, nextPage, expandedPath, filteredParameters)), false), __read((0, build_previous_link_1.buildPreviousLink)(page, prevPage, expandedPath, filteredParameters)), false), __read((0, build_first_link_1.buildFirstLink)(expandedPath, filteredParameters)), false), __read(links || []), false) }, other));
|
|
493
495
|
}
|
|
494
496
|
//# sourceMappingURL=waycharter.js.map
|
package/dist/waycharter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waycharter.js","sourceRoot":"","sources":["../src/waycharter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uDAAuC;AACvC,wEAAmE;AAEnE,mEAA+D;AAC/D,yEAAqE;AACrE,iEAA6D;AAC7D,mEAA+D;AAC/D,8DAA0D;AAC1D,uCAAoC;AAGpC,wDAAqD;AACrD,gDAA6C;AAC7C,0EAAsE;AACtE,kEAA6D;AAC7D,8DAGiC;AACjC,wCAAsC;
|
|
1
|
+
{"version":3,"file":"waycharter.js","sourceRoot":"","sources":["../src/waycharter.ts"],"names":[],"mappings":"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"}
|