@thisisagile/easy-test 12.5.20 → 12.5.23

package/dist/utils/Req.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Req = void 0;
-const easy_1 = require("@thisisagile/easy");
+const Utils_1 = require("./Utils");
 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.skip = (0, Utils_1.ifDefined)(this.query?.skip, (0, Utils_1.asNumber)(this.query?.skip));
+        this.take = (0, Utils_1.ifDefined)(this.query?.take, (0, Utils_1.asNumber)(this.query?.take));
         this.get = (key) => this?.state[key.toString()] ?? this.path[key.toString()] ?? this.query[key.toString()];
     }
     get id() {

package/dist/utils/Req.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"Req.js","sourceRoot":"","sources":["../../src/utils/Req.ts"],"names":[],"mappings":";;;AAAA,mCAA8C;AAG9C,MAAa,GAAG;IACd,YAAqB,QAAa,EAAE;QAAf,UAAK,GAAL,KAAK,CAAU;QAU3B,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;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/dist/utils/Utils.d.ts

@@ -1,4 +1,6 @@
+import { Construct, Get } from '@thisisagile/easy';
 export declare const isDefined: (o?: unknown) => boolean;
+export declare const ifDefined: <T>(o: unknown, f: Construct<T>, alt?: Construct<T> | undefined) => T | undefined;
 export declare const isFunction: (o?: unknown) => o is (...params: unknown[]) => unknown;
 export declare const isA: <T>(t?: unknown, ...properties: (keyof T)[]) => t is T;
 export declare const isAn: <T>(t?: unknown, ...properties: (keyof T)[]) => t is T;
@@ -6,3 +8,4 @@ export declare const isArray: <T = any>(o?: unknown) => o is T[];
 export declare const isObject: (o?: unknown) => o is Record<string, unknown>;
 export declare const asJson: (a?: unknown) => any;
 export declare const asString: (a?: unknown) => any;
+export declare const asNumber: (n: unknown, alt?: Get<number>) => number;

package/dist/utils/Utils.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.asString = exports.asJson = exports.isObject = exports.isArray = exports.isAn = exports.isA = exports.isFunction = exports.isDefined = void 0;
+exports.asNumber = exports.asString = exports.asJson = exports.isObject = exports.isArray = exports.isAn = exports.isA = exports.isFunction = exports.ifDefined = exports.isDefined = void 0;
+const easy_1 = require("@thisisagile/easy");
 const isDefined = (o) => o !== undefined && o !== null;
 exports.isDefined = isDefined;
+const ifDefined = (o, f, alt) => ((0, exports.isDefined)(o) ? (0, easy_1.ofConstruct)(f, o) : (0, easy_1.ofConstruct)(alt, o));
+exports.ifDefined = ifDefined;
 const isFunction = (o) => (0, exports.isDefined)(o) && typeof o === 'function';
 exports.isFunction = isFunction;
 const isA = (t, ...properties) => (0, exports.isDefined)(t) && properties.every(p => (0, exports.isDefined)(t[p]));
@@ -16,4 +19,9 @@ const asJson = (a) => (a?.toJSON ? a.toJSON() : (0, exports.isObject)(a) ? a : u
 exports.asJson = asJson;
 const asString = (a) => a?.toString();
 exports.asString = asString;
+const asNumber = (n, alt) => (0, easy_1.tryTo)(() => (0, exports.asString)(n))
+    .map(s => parseInt(s))
+    .filter(n => (0, easy_1.isNumber)(n))
+    .or((0, easy_1.ofGet)(alt) ?? NaN);
+exports.asNumber = asNumber;
 //# sourceMappingURL=Utils.js.map

package/dist/utils/Utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../src/utils/Utils.ts"],"names":[],"mappings":";;;AAAO,MAAM,SAAS,GAAG,CAAC,CAAW,EAAW,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,CAAC;AAApE,QAAA,SAAS,aAA2D;AAE1E,MAAM,UAAU,GAAG,CAAC,CAAW,EAA0C,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,UAAU,CAAC;AAA9G,QAAA,UAAU,cAAoG;AAEpH,MAAM,GAAG,GAAG,CAAI,CAAW,EAAE,GAAG,UAAuB,EAAU,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAS,EAAE,CAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAA5H,QAAA,GAAG,OAAyH;AAC5H,QAAA,IAAI,GAAG,WAAG,CAAC;AAEjB,MAAM,OAAO,GAAG,CAAU,CAAW,EAAiB,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC;AAAtF,QAAA,OAAO,WAA+E;AAC5F,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAgC,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,UAAU,CAAC,IAAI,CAAC,IAAA,eAAO,EAAC,CAAC,CAAC,CAAC;AAAzI,QAAA,QAAQ,YAAiI;AAE/I,MAAM,MAAM,GAAG,CAAC,CAAW,EAAO,EAAE,CAAC,CAAE,CAAS,EAAE,MAAM,CAAC,CAAC,CAAE,CAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAAxG,QAAA,MAAM,UAAkG;AAC9G,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAO,EAAE,CAAE,CAAS,EAAE,QAAQ,EAAE,CAAC;AAAxD,QAAA,QAAQ,YAAgD"}
+{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../src/utils/Utils.ts"],"names":[],"mappings":";;;AAAA,4CAAwF;AAEjF,MAAM,SAAS,GAAG,CAAC,CAAW,EAAW,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,CAAC;AAApE,QAAA,SAAS,aAA2D;AAC1E,MAAM,SAAS,GAAG,CAAI,CAAU,EAAE,CAAe,EAAE,GAAkB,EAAiB,EAAE,CAAC,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,kBAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,kBAAW,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;AAA5I,QAAA,SAAS,aAAmI;AAElJ,MAAM,UAAU,GAAG,CAAC,CAAW,EAA0C,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,UAAU,CAAC;AAA9G,QAAA,UAAU,cAAoG;AAEpH,MAAM,GAAG,GAAG,CAAI,CAAW,EAAE,GAAG,UAAuB,EAAU,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAS,EAAE,CAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAA5H,QAAA,GAAG,OAAyH;AAC5H,QAAA,IAAI,GAAG,WAAG,CAAC;AAEjB,MAAM,OAAO,GAAG,CAAU,CAAW,EAAiB,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC;AAAtF,QAAA,OAAO,WAA+E;AAC5F,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAgC,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,UAAU,CAAC,IAAI,CAAC,IAAA,eAAO,EAAC,CAAC,CAAC,CAAC;AAAzI,QAAA,QAAQ,YAAiI;AAE/I,MAAM,MAAM,GAAG,CAAC,CAAW,EAAO,EAAE,CAAC,CAAE,CAAS,EAAE,MAAM,CAAC,CAAC,CAAE,CAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAAxG,QAAA,MAAM,UAAkG;AAC9G,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAO,EAAE,CAAE,CAAS,EAAE,QAAQ,EAAE,CAAC;AAAxD,QAAA,QAAQ,YAAgD;AAE9D,MAAM,QAAQ,GAAG,CAAC,CAAU,EAAE,GAAiB,EAAU,EAAE,CAChE,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC;KACrB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;KACrB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,eAAQ,EAAC,CAAC,CAAC,CAAC;KACxB,EAAE,CAAC,IAAA,YAAK,EAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;AAJd,QAAA,QAAQ,YAIM"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy-test",
-  "version": "12.5.20",
+  "version": "12.5.23",
   "description": "Straightforward library for testing microservices built with @thisisagile/easy",
   "author": "Sander Hoogendoorn",
   "license": "MIT",
@@ -43,6 +43,6 @@
     "jest": "^29.0.3",
     "jest-junit": "^14.0.1",
     "jest-sonar-reporter": "^2.0.0",
-    "ts-jest": "^29.0.2"
+    "ts-jest": "^29.0.3"
   }
 }

package/src/utils/Req.ts

@@ -1,5 +1,5 @@
+import { asNumber, ifDefined } from './Utils';
 import { Id, Json, JsonValue, Text } from './Types';
-import { asNumber, ifDefined } from '@thisisagile/easy';
 
 export class Req {
   constructor(readonly state: any = {}) {}

package/src/utils/Utils.ts

@@ -1,4 +1,7 @@
+import { Construct, Get, isNumber, ofConstruct, ofGet, tryTo } from '@thisisagile/easy';
+
 export const isDefined = (o?: unknown): boolean => o !== undefined && o !== null;
+export const ifDefined = <T>(o: unknown, f: Construct<T>, alt?: Construct<T>): T | undefined => (isDefined(o) ? ofConstruct(f, o) : ofConstruct(alt, o));
 
 export const isFunction = (o?: unknown): o is (...params: unknown[]) => unknown => isDefined(o) && typeof o === 'function';
 
@@ -10,3 +13,9 @@ export const isObject = (o?: unknown): o is Record<string, unknown> => o != null
 
 export const asJson = (a?: unknown): any => ((a as any)?.toJSON ? (a as any).toJSON() : isObject(a) ? a : undefined);
 export const asString = (a?: unknown): any => (a as any)?.toString();
+
+export const asNumber = (n: unknown, alt?: Get<number>): number =>
+  tryTo(() => asString(n))
+    .map(s => parseInt(s))
+    .filter(n => isNumber(n))
+    .or(ofGet(alt) ?? NaN);