@thisisagile/easy-test 10.11.2 → 10.11.7

package/dist/utils/Req.d.ts

@@ -4,8 +4,8 @@ export declare class Req {
     constructor(state?: any);
     get id(): Id;
     get q(): JsonValue;
-    get skip(): number | undefined;
-    get take(): number | undefined;
+    readonly skip: number | undefined;
+    readonly take: number | undefined;
     get path(): Json;
     get query(): Json;
     get body(): unknown;

package/dist/utils/Req.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Req = void 0;
+const easy_1 = require("@thisisagile/easy");
 class Req {
     constructor(state = {}) {
         this.state = state;
+        this.skip = (0, easy_1.ifDefined)(this.query?.skip, (0, easy_1.asNumber)(this.query?.skip));
+        this.take = (0, easy_1.ifDefined)(this.query?.take, (0, easy_1.asNumber)(this.query?.take));
         this.get = (key) => this?.state[key.toString()] ?? this.path[key.toString()] ?? this.query[key.toString()];
     }
     get id() {
@@ -12,12 +15,6 @@ class Req {
     get q() {
         return this.state.q ?? this.query.q;
     }
-    get skip() {
-        return this.state?.query.skip;
-    }
-    get take() {
-        return this.state?.query.take;
-    }
     get path() {
         return this.state?.path ?? {};
     }

package/dist/utils/Req.js.map

@@ -1 +1 @@
-{"version":3,"file":"Req.js","sourceRoot":"","sources":["../../src/utils/Req.ts"],"names":[],"mappings":";;;AAEA,MAAa,GAAG;IACd,YAAqB,QAAa,EAAE;QAAf,UAAK,GAAL,KAAK,CAAU;QAgCpC,QAAG,GAAG,CAAC,GAAS,EAAO,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IA/BjH,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACvC,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC;IAChC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC;IAChC,CAAC;IAGD,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC;IACjC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACzB,CAAC;CAGF;AAlCD,kBAkCC"}
+{"version":3,"file":"Req.js","sourceRoot":"","sources":["../../src/utils/Req.ts"],"names":[],"mappings":";;;AACA,4CAAwD;AAExD,MAAa,GAAG;IACd,YAAqB,QAAa,EAAE;QAAf,UAAK,GAAL,KAAK,CAAU;QAU3B,SAAI,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAA,eAAQ,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/D,SAAI,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAA,eAAQ,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QAcxE,QAAG,GAAG,CAAC,GAAS,EAAO,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAzB1E,CAAC;IAExC,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACvC,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACtC,CAAC;IAKD,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC;IACjC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACzB,CAAC;CAGF;AA3BD,kBA2BC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy-test",
-  "version": "10.11.2",
+  "version": "10.11.7",
   "description": "Straightforward library for testing microservices built with @thisisagile/easy",
   "author": "Sander Hoogendoorn",
   "license": "MIT",

package/src/utils/Req.ts

@@ -1,8 +1,8 @@
 import { Id, Json, JsonValue, Text } from './Types';
+import { asNumber, ifDefined } from '@thisisagile/easy';
 
 export class Req {
-  constructor(readonly state: any = {}) {
-  }
+  constructor(readonly state: any = {}) {}
 
   get id(): Id {
     return this.state.id ?? this.path.id;
@@ -12,14 +12,8 @@ export class Req {
     return this.state.q ?? this.query.q;
   }
 
-  get skip(): number | undefined {
-    return this.state?.query.skip;
-  }
-
-  get take(): number | undefined {
-    return this.state?.query.take;
-  }
-
+  readonly skip = ifDefined(this.query?.skip, asNumber(this.query?.skip));
+  readonly take = ifDefined(this.query?.take, asNumber(this.query?.take));
 
   get path(): Json {
     return this.state?.path ?? {};