@thisisagile/easy-test 13.4.7 → 13.4.9

package/dist/mock/Fits.d.ts

@@ -1,7 +1,7 @@
 import { AsymmetricMatcher } from 'expect';
 import { Uri } from '../utils/Types';
 export declare class ObjectContainingText extends AsymmetricMatcher<string> {
-    asymmetricMatch(other: any): any;
+    asymmetricMatch(other: any): boolean;
     toString(): string;
 }
 export declare class ObjectContainingTextExact extends AsymmetricMatcher<string> {

package/dist/utils/Req.d.ts

@@ -1,11 +1,11 @@
 import { Id, Json, JsonValue, Text } from './Types';
 export declare class Req {
     readonly state: any;
+    readonly skip: number | undefined;
+    readonly take: number | undefined;
     constructor(state?: any);
     get id(): Id;
     get q(): JsonValue;
-    readonly skip: number | undefined;
-    readonly take: number | undefined;
     get path(): Json;
     get query(): Json;
     get body(): unknown;

package/dist/utils/Req.js

@@ -5,8 +5,8 @@ const Utils_1 = require("./Utils");
 class Req {
     constructor(state = {}) {
         this.state = state;
-        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.skip = (0, Utils_1.isDefined)(this.query?.skip) ? (0, Utils_1.asNumber)(this.query?.skip) : undefined;
+        this.take = (0, Utils_1.isDefined)(this.query?.take) ? (0, Utils_1.asNumber)(this.query?.take) : undefined;
         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":";;;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"}
+{"version":3,"file":"Req.js","sourceRoot":"","sources":["../../src/utils/Req.ts"],"names":[],"mappings":";;;AAAA,mCAA4C;AAG5C,MAAa,GAAG;IAIZ,YAAqB,QAAa,EAAE;QAAf,UAAK,GAAL,KAAK,CAAU;QAH3B,SAAI,GAAG,IAAA,iBAAS,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5E,SAAI,GAAG,IAAA,iBAAS,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAyBrF,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;IAtBjH,CAAC;IAED,IAAI,EAAE;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACzC,CAAC;IAED,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC;IAClC,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC;IACnC,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IAC3B,CAAC;CAGJ;AA5BD,kBA4BC"}

package/dist/utils/Utils.d.ts

@@ -1,11 +1,10 @@
-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 isDefined: <T = unknown>(o?: T | undefined) => boolean;
+export declare const isNumber: (o?: unknown) => o is number;
 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;
 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;
+export declare const asString: (a?: unknown) => string;
+export declare const asNumber: (num: unknown, alt?: number | (() => number)) => number;

package/dist/utils/Utils.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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) => !(0, easy_1.isNullish)(o);
+exports.asNumber = exports.asString = exports.asJson = exports.isObject = exports.isArray = exports.isAn = exports.isA = exports.isFunction = exports.isNumber = exports.isDefined = void 0;
+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 isNumber = (o) => (0, exports.isDefined)(o) && typeof o === 'number' && !Number.isNaN(o);
+exports.isNumber = isNumber;
 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]));
@@ -19,9 +18,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);
+const asNumber = (num, alt) => {
+    const n = parseInt((0, exports.asString)(num));
+    return (0, exports.isNumber)(n) ? n : (0, exports.isFunction)(alt) ? alt() : (0, exports.isNumber)(alt) ? 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":";;;AAAA,4CAAmG;AAE5F,MAAM,SAAS,GAAG,CAAC,CAAW,EAAW,EAAE,CAAC,CAAC,IAAA,gBAAS,EAAC,CAAC,CAAC,CAAC;AAApD,QAAA,SAAS,aAA2C;AAC1D,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"}
+{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../src/utils/Utils.ts"],"names":[],"mappings":";;;AAAO,MAAM,SAAS,GAAG,CAAc,CAAK,EAAW,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,CAAC;AAA3E,QAAA,SAAS,aAAkE;AAEjF,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAe,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAAnG,QAAA,QAAQ,YAA2F;AACzG,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,EAAU,EAAE,CAAE,CAAS,EAAE,QAAQ,EAAE,CAAC;AAA3D,QAAA,QAAQ,YAAmD;AAEjE,MAAM,QAAQ,GAAG,CAAC,GAAY,EAAE,GAA6B,EAAU,EAAE;IAC5E,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAA,gBAAQ,EAAC,GAAG,CAAC,CAAC,CAAC;IAClC,OAAO,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,kBAAU,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AACjF,CAAC,CAAA;AAHY,QAAA,QAAQ,YAGpB"}

package/package.json

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

package/src/utils/Req.ts

@@ -1,31 +1,32 @@
-import { asNumber, ifDefined } from './Utils';
-import { Id, Json, JsonValue, Text } from './Types';
+import {asNumber, isDefined} from './Utils';
+import {Id, Json, JsonValue, Text} from './Types';
 
 export class Req {
-  constructor(readonly state: any = {}) {}
+    readonly skip = isDefined(this.query?.skip) ? asNumber(this.query?.skip) : undefined;
+    readonly take = isDefined(this.query?.take) ? asNumber(this.query?.take) : undefined;
 
-  get id(): Id {
-    return this.state.id ?? this.path.id;
-  }
+    constructor(readonly state: any = {}) {
+    }
 
-  get q(): JsonValue {
-    return this.state.q ?? this.query.q;
-  }
+    get id(): Id {
+        return this.state.id ?? this.path.id;
+    }
 
-  readonly skip = ifDefined(this.query?.skip, asNumber(this.query?.skip));
-  readonly take = ifDefined(this.query?.take, asNumber(this.query?.take));
+    get q(): JsonValue {
+        return this.state.q ?? this.query.q;
+    }
 
-  get path(): Json {
-    return this.state?.path ?? {};
-  }
+    get path(): Json {
+        return this.state?.path ?? {};
+    }
 
-  get query(): Json {
-    return this.state?.query ?? {};
-  }
+    get query(): Json {
+        return this.state?.query ?? {};
+    }
 
-  get body(): unknown {
-    return this.state.body;
-  }
+    get body(): unknown {
+        return this.state.body;
+    }
 
-  get = (key: Text): any => this?.state[key.toString()] ?? this.path[key.toString()] ?? this.query[key.toString()];
+    get = (key: Text): any => this?.state[key.toString()] ?? this.path[key.toString()] ?? this.query[key.toString()];
 }

package/src/utils/Utils.ts

@@ -1,8 +1,6 @@
-import { Construct, Get, isNullish, isNumber, ofConstruct, ofGet, tryTo } from '@thisisagile/easy';
-
-export const isDefined = (o?: unknown): boolean => !isNullish(o);
-export const ifDefined = <T>(o: unknown, f: Construct<T>, alt?: Construct<T>): T | undefined => (isDefined(o) ? ofConstruct(f, o) : ofConstruct(alt, o));
+export const isDefined = <T = unknown>(o?: T): boolean => o !== undefined && o !== null;
 
+export const isNumber = (o?: unknown): o is number => isDefined(o) && typeof o === 'number' && !Number.isNaN(o);
 export const isFunction = (o?: unknown): o is (...params: unknown[]) => unknown => isDefined(o) && typeof o === 'function';
 
 export const isA = <T>(t?: unknown, ...properties: (keyof T)[]): t is T => isDefined(t) && properties.every(p => isDefined((t as T)[p]));
@@ -12,10 +10,9 @@ export const isArray = <T = any>(o?: unknown): o is Array<T> => isDefined(o) &&
 export const isObject = (o?: unknown): o is Record<string, unknown> => o != null && (typeof o === 'object' || typeof o === 'function') && !isArray(o);
 
 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 asString = (a?: unknown): string => (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);
+export const asNumber = (num: unknown, alt?: number | (() => number)): number => {
+    const n = parseInt(asString(num));
+    return isNumber(n) ? n : isFunction(alt) ? alt() : isNumber(alt) ? alt : NaN;
+}