@mountainpass/waycharter 2.0.26 → 2.0.27

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/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
  <!-- [![Quality](https://img.shields.io/codacy/grade/940768d54f7545f7b42f89b26c23c751?logo=codacy)](https://www.codacy.com/gh/mountain-pass/waycharter/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=mountain-pass/waycharter&amp;utm_campaign=Badge_Grade) [![Coverage](https://img.shields.io/codacy/coverage/940768d54f7545f7b42f89b26c23c751?logo=codacy)](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
- [![source code vulnerabilities](https://img.shields.io/snyk/vulnerabilities/github/mountain-pass/waycharter?label=source%20code%20vulnerabilities&logo=snyk)](https://snyk.io/test/github/mountain-pass/waycharter) [![npm package vulnerabilities](https://img.shields.io/snyk/vulnerabilities/npm/@mountainpass/waycharter@2.0.26?label=npm%20package%20vulnerabilties&logo=snyk)](https://snyk.io/test/npm/@mountainpass/waycharter/2.0.26)
16
+ [![source code vulnerabilities](https://img.shields.io/snyk/vulnerabilities/github/mountain-pass/waycharter?label=source%20code%20vulnerabilities&logo=snyk)](https://snyk.io/test/github/mountain-pass/waycharter) [![npm package vulnerabilities](https://img.shields.io/snyk/vulnerabilities/npm/@mountainpass/waycharter@2.0.27?label=npm%20package%20vulnerabilties&logo=snyk)](https://snyk.io/test/npm/@mountainpass/waycharter/2.0.27)
17
17
 
18
18
 
19
19
  [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
@@ -57,6 +57,31 @@ var __rest = (this && this.__rest) || function (s, e) {
57
57
  }
58
58
  return t;
59
59
  };
60
+ var __read = (this && this.__read) || function (o, n) {
61
+ var m = typeof Symbol === "function" && o[Symbol.iterator];
62
+ if (!m) return o;
63
+ var i = m.call(o), r, ar = [], e;
64
+ try {
65
+ while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
66
+ }
67
+ catch (error) { e = { error: error }; }
68
+ finally {
69
+ try {
70
+ if (r && !r.done && (m = i["return"])) m.call(i);
71
+ }
72
+ finally { if (e) throw e.error; }
73
+ }
74
+ return ar;
75
+ };
76
+ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
77
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
78
+ if (ar || !(i in from)) {
79
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
80
+ ar[i] = from[i];
81
+ }
82
+ }
83
+ return to.concat(ar || Array.prototype.slice.call(from));
84
+ };
60
85
  var __importDefault = (this && this.__importDefault) || function (mod) {
61
86
  return (mod && mod.__esModule) ? mod : { "default": mod };
62
87
  };
@@ -126,7 +151,7 @@ var WayCharter = /** @class */ (function () {
126
151
  filters: filters,
127
152
  itemEndpoint: itemEndpoint,
128
153
  handler: function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
129
- var pageInt, result, hasMore, rest;
154
+ var pageInt, result, hasMore, loaderLinks, rest, previousLinks, queryString;
130
155
  var page = _b.page, queryParameters = _b.queryParameters, response = _b.response;
131
156
  return __generator(this, function (_c) {
132
157
  switch (_c.label) {
@@ -135,8 +160,16 @@ var WayCharter = /** @class */ (function () {
135
160
  return [4 /*yield*/, collectionLoader(__assign({ page: pageInt }, queryParameters))];
136
161
  case 1:
137
162
  result = _c.sent();
138
- hasMore = result.hasMore, rest = __rest(result, ["hasMore"]);
139
- response.chartCollection(__assign(__assign({}, rest), { collectionPointer: '/{index}', nextPage: hasMore ? String(pageInt + 1) : undefined, prevPage: pageInt > 1 ? String(pageInt - 1) : undefined }));
163
+ hasMore = result.hasMore, loaderLinks = result.links, rest = __rest(result, ["hasMore", "links"]);
164
+ previousLinks = [];
165
+ if (pageInt === 1) {
166
+ queryString = new URLSearchParams(queryParameters).toString();
167
+ previousLinks.push({
168
+ rel: 'prev',
169
+ uri: queryString ? "".concat(collectionPath, "?").concat(queryString) : collectionPath
170
+ });
171
+ }
172
+ response.chartCollection(__assign(__assign({}, rest), { links: __spreadArray(__spreadArray([], __read((loaderLinks || [])), false), __read(previousLinks), false), collectionPointer: '/{index}', nextPage: hasMore ? String(pageInt + 1) : undefined, prevPage: pageInt > 1 ? String(pageInt - 1) : undefined }));
140
173
  return [2 /*return*/];
141
174
  }
142
175
  });
@@ -1 +1 @@
1
- {"version":3,"file":"waycharter-convenience.js","sourceRoot":"","sources":["../src/waycharter-convenience.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"waycharter-convenience.js","sourceRoot":"","sources":["../src/waycharter-convenience.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA6B;AAC7B,2CAAwD;AAsCxD;IAGE;QACE,IAAI,CAAC,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAA;IAChC,CAAC;IAED,yCAAoB,GAApB,UAAwB,EAA+C;QAAvE,iBAaC;YAbyB,IAAI,UAAA,EAAE,MAAM,YAAA;QACpC,IAAM,QAAQ,GAAG,qBAAQ,CAAC,MAAM,CAAI;YAClC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,MAAA;YACJ,OAAO,EAAE,gEAAO,EAA6C;;oBAA3C,cAAc,oBAAA,EAAE,eAAe,qBAAA,EAAE,QAAQ,cAAA;;;gCAC1C,qBAAM,MAAM,uBAAM,cAAc,GAAK,eAAe,EAAG,EAAA;;4BAAhE,MAAM,GAAG,SAAuD;4BACtE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;;;;iBACvB;SACF,CAAC,CAAA;QACF,OAAO;YACL,YAAY,EAAE,QAAQ,CAAC,YAAY;YACnC,IAAI,EAAE,UAAC,UAAU,IAAK,OAAA,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAzB,CAAyB;SAChD,CAAA;IACH,CAAC;IAED,uCAAkB,GAAlB,UAA6C,EAMQ;QANrD,iBAwDC;YAvDC,QAAQ,cAAA,EACR,UAAU,gBAAA,EACV,cAAc,oBAAA,EACd,gBAAgB,sBAAA,EAChB,eAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA;QAEZ,IAAI,YAAkD,CAAA;QACtD,IAAI,QAAQ,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YACvD,YAAY,GAAG,qBAAQ,CAAC,MAAM,CAAW;gBACvC,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,IAAI,EAAE,UAAG,cAAc,SAAG,QAAQ,CAAE;gBACpC,OAAO,EAAE,gEAAO,EAA4B;;wBAA1B,cAAc,oBAAA,EAAE,QAAQ,cAAA;;;oCACzB,qBAAM,UAAU,CAAC,cAAc,CAAC,EAAA;;gCAAzC,MAAM,GAAG,SAAgC;gCAC/C,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;;;;qBACvB;aACF,CAAC,CAAA;QACJ,CAAC;QAED,IAAM,eAAe,GAAW,OAAO,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC;YAChD,GAAG,EAAE,CAAC,CAAC,GAAG;YACV,GAAG,EAAE,UAAG,cAAc,eAAK,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,MAAG;SACrD,CAAC,EAH+C,CAG/C,CAAC,CAAA;QAEH,IAAM,kBAAkB,GAAG,qBAAQ,CAAC,gBAAgB,CAA2B;YAC7E,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,cAAc;YACpB,OAAO,SAAA;YACP,YAAY,cAAA;YACZ,OAAO,EAAE,gEAAO,EAAmC;;oBAAjC,IAAI,UAAA,EAAE,eAAe,qBAAA,EAAE,QAAQ,cAAA;;;;4BACzC,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,GAAG,CAAC,CAAA;4BAC7B,qBAAM,gBAAgB,YAAG,IAAI,EAAE,OAAO,IAAK,eAAe,EAAG,EAAA;;4BAAtE,MAAM,GAAG,SAA6D;4BACpE,OAAO,GAAkC,MAAM,QAAxC,EAAS,WAAW,GAAc,MAAM,MAApB,EAAK,IAAI,UAAK,MAAM,EAAjD,oBAAwC,CAAF,CAAW;4BACjD,aAAa,GAAW,EAAE,CAAA;4BAChC,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;gCACZ,WAAW,GAAG,IAAI,eAAe,CAAC,eAAyC,CAAC,CAAC,QAAQ,EAAE,CAAA;gCAC7F,aAAa,CAAC,IAAI,CAAC;oCACjB,GAAG,EAAE,MAAM;oCACX,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,UAAG,cAAc,cAAI,WAAW,CAAE,CAAC,CAAC,CAAC,cAAc;iCACvE,CAAC,CAAA;4BACJ,CAAC;4BACD,QAAQ,CAAC,eAAe,uBACnB,IAAI,KACP,KAAK,yCAAM,CAAC,WAAW,IAAI,EAAE,CAAC,kBAAK,aAAa,WAChD,iBAAiB,EAAE,UAAU,EAC7B,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EACnD,QAAQ,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,IACvD,CAAA;;;;iBACH;SACF,CAAC,CAAA;QAEF,OAAO;YACL,eAAe,iBAAA;YACf,YAAY,EAAE,kBAAkB,CAAC,YAAY;YAC7C,IAAI,EAAE,UAAC,UAAU,IAAK,OAAA,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAnC,CAAmC;SAC1D,CAAA;IACH,CAAC;IAED,2CAAsB,GAAtB,UAA0B,EAA+D;YAA7D,IAAI,UAAA,EAAE,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,OAAO,aAAA;QACpD,IAAM,QAAQ,GAAG,qBAAQ,CAAC,YAAY,CAAI;YACxC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,MAAA;YACJ,IAAI,MAAA;YACJ,KAAK,OAAA;YACL,OAAO,SAAA;SACR,CAAC,CAAA;QACF,OAAO;YACL,YAAY,EAAE,QAAQ,CAAC,YAAY;YACnC,IAAI,EAAE,UAAC,UAAU,IAAK,OAAA,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAzB,CAAyB;SAChD,CAAA;IACH,CAAC;IACH,iBAAC;AAAD,CAAC,AA7FD,IA6FC;AA7FY,gCAAU"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mountainpass/waycharter",
3
- "version": "2.0.26",
3
+ "version": "2.0.27",
4
4
  "description": "Express middleware creating for HATEOAS level 3 RESTful/Hypermedia APIs",
5
5
  "repository": {
6
6
  "type": "git",