@thisisagile/easy 10.11.5 → 10.11.6

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.
@@ -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
- readonly skip: number;
10
- readonly take: number;
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: {
@@ -2,13 +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;
10
- this.skip = (0, types_1.asNumber)(this.query?.skip);
11
- this.take = (0, types_1.asNumber)(this.query?.take);
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));
12
13
  this.get = (key) => this.path[key.toString()] ?? this.query[key.toString()];
13
14
  }
14
15
  get id() {
@@ -1 +1 @@
1
- {"version":3,"file":"Req.js","sourceRoot":"","sources":["../../src/resources/Req.ts"],"names":[],"mappings":";;;AAAA,oCAA4E;AAE5E,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,gBAAQ,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAClC,SAAI,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAE3C,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"}
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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@thisisagile/easy",
3
- "version": "10.11.5",
3
+ "version": "10.11.6",
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.5",
34
+ "@thisisagile/easy-test": "10.11.6",
35
35
  "@types/form-urlencoded": "^4.4.0",
36
36
  "@types/jsonwebtoken": "^8.5.8",
37
37
  "@types/validator": "^13.7.2"
@@ -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,8 +12,8 @@ export class Req implements Omit<PageOptions, 'sort'> {
11
12
  return this.get('q');
12
13
  }
13
14
 
14
- readonly skip = asNumber(this.query?.skip);
15
- readonly take = asNumber(this.query?.take);
15
+ readonly skip = ifDefined(this.query?.skip, asNumber(this.query?.skip));
16
+ readonly take = ifDefined(this.query?.take, asNumber(this.query?.take));
16
17
 
17
18
  get = (key: Text): any => this.path[key.toString()] ?? this.query[key.toString()];
18
19
  }