@thisisagile/easy 15.8.7 → 15.8.8

package/dist/resources/Req.d.ts

@@ -1,13 +1,13 @@
-import { Id, Json, JsonValue, OneOrMore, PageOptions, Text } from '../types';
+import { Id, Json, JsonValue, OneOrMore, Optional, PageOptions, Text } from '../types';
 export declare class Req implements Omit<PageOptions, 'sort'> {
     readonly path: Json;
     readonly query: Json;
     readonly body: unknown;
     readonly headers: Record<string, OneOrMore<string>>;
+    readonly skip: Optional<number>;
+    readonly take: Optional<number>;
     constructor(path: Json, query: Json, body: unknown, headers: Record<string, OneOrMore<string>>);
     get id(): Id;
-    get skip(): number | undefined;
-    get take(): number | undefined;
     get q(): JsonValue;
     get: (key: Text) => any;
 }

package/dist/resources/Req.js

@@ -30,16 +30,14 @@ class Req {
     this.query = query;
     this.body = body;
     this.headers = headers;
+    this.skip = (0, import_utils.ifDefined)(query.skip, (s) => (0, import_types.asNumber)(s));
+    this.take = (0, import_utils.ifDefined)(query.take, (t) => (0, import_types.asNumber)(t));
   }
+  skip;
+  take;
   get id() {
     return this.get("id");
   }
-  get skip() {
-    return (0, import_utils.ifDefined)(this.query?.skip, (0, import_types.asNumber)(this.query?.skip));
-  }
-  get take() {
-    return (0, import_utils.ifDefined)(this.query?.take, (0, import_types.asNumber)(this.query?.take));
-  }
   get q() {
     return this.get("q");
   }

package/dist/resources/Req.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/resources/Req.ts"],"sourcesContent":["import { asNumber, Id, Json, JsonValue, OneOrMore, PageOptions, Text } from '../types';\nimport { ifDefined } from '../utils';\n\nexport class Req implements Omit<PageOptions, 'sort'> {\n  constructor(readonly path: Json = {}, readonly query: Json = {}, readonly body: unknown, readonly headers: Record<string, OneOrMore<string>>) {}\n\n  get id(): Id {\n    return this.get('id');\n  }\n\n  get skip(): number | undefined {\n    return ifDefined(this.query?.skip, asNumber(this.query?.skip));\n  }\n\n  get take(): number | undefined {\n    return ifDefined(this.query?.take, asNumber(this.query?.take));\n  }\n\n  get q(): JsonValue {\n    return this.get('q');\n  }\n\n  get = (key: Text): any => this.path[key.toString()] ?? this.query[key.toString()];\n}\n\nexport const toReq = (req: { params?: { id?: unknown }; query?: { q?: unknown }; body?: unknown; headers?: unknown }): Req =>\n  new Req(req.params as Json, req.query as Json, req.body as Json, req.headers as Record<string, OneOrMore<string>>);\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA4E;AAC5E,mBAA0B;AAEnB,MAAM,IAAyC;AAAA,EACpD,YAAqB,OAAa,CAAC,GAAY,QAAc,CAAC,GAAY,MAAwB,SAA4C;AAAzH;AAA0B;AAA2B;AAAwB;AAAA,EAA6C;AAAA,EAE/I,IAAI,KAAS;AACX,WAAO,KAAK,IAAI,IAAI;AAAA,EACtB;AAAA,EAEA,IAAI,OAA2B;AAC7B,eAAO,wBAAU,KAAK,OAAO,UAAM,uBAAS,KAAK,OAAO,IAAI,CAAC;AAAA,EAC/D;AAAA,EAEA,IAAI,OAA2B;AAC7B,eAAO,wBAAU,KAAK,OAAO,UAAM,uBAAS,KAAK,OAAO,IAAI,CAAC;AAAA,EAC/D;AAAA,EAEA,IAAI,IAAe;AACjB,WAAO,KAAK,IAAI,GAAG;AAAA,EACrB;AAAA,EAEA,MAAM,CAAC,QAAmB,KAAK,KAAK,IAAI,SAAS,CAAC,KAAK,KAAK,MAAM,IAAI,SAAS,CAAC;AAClF;AAEO,MAAM,QAAQ,CAAC,QACpB,IAAI,IAAI,IAAI,QAAgB,IAAI,OAAe,IAAI,MAAc,IAAI,OAA4C;","names":[]}
+{"version":3,"sources":["../../src/resources/Req.ts"],"sourcesContent":["import { asNumber, Id, Json, JsonValue, OneOrMore, Optional, PageOptions, Text } from '../types';\nimport { ifDefined } from '../utils';\n\nexport class Req implements Omit<PageOptions, 'sort'> {\n  readonly skip: Optional<number>;\n  readonly take: Optional<number>;\n  constructor(readonly path: Json = {}, readonly query: Json = {}, readonly body: unknown, readonly headers: Record<string, OneOrMore<string>>) {\n    this.skip = ifDefined(query.skip, s => asNumber(s));\n    this.take = ifDefined(query.take, t => asNumber(t));\n  }\n\n  get id(): Id {\n    return this.get('id');\n  }\n\n  get q(): JsonValue {\n    return this.get('q');\n  }\n\n  get = (key: Text): any => this.path[key.toString()] ?? this.query[key.toString()];\n}\n\nexport const toReq = (req: { params?: { id?: unknown }; query?: { q?: unknown }; body?: unknown; headers?: unknown }): Req =>\n  new Req(req.params as Json, req.query as Json, req.body as Json, req.headers as Record<string, OneOrMore<string>>);\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAsF;AACtF,mBAA0B;AAEnB,MAAM,IAAyC;AAAA,EAGpD,YAAqB,OAAa,CAAC,GAAY,QAAc,CAAC,GAAY,MAAwB,SAA4C;AAAzH;AAA0B;AAA2B;AAAwB;AAChG,SAAK,WAAO,wBAAU,MAAM,MAAM,WAAK,uBAAS,CAAC,CAAC;AAClD,SAAK,WAAO,wBAAU,MAAM,MAAM,WAAK,uBAAS,CAAC,CAAC;AAAA,EACpD;AAAA,EALS;AAAA,EACA;AAAA,EAMT,IAAI,KAAS;AACX,WAAO,KAAK,IAAI,IAAI;AAAA,EACtB;AAAA,EAEA,IAAI,IAAe;AACjB,WAAO,KAAK,IAAI,GAAG;AAAA,EACrB;AAAA,EAEA,MAAM,CAAC,QAAmB,KAAK,KAAK,IAAI,SAAS,CAAC,KAAK,KAAK,MAAM,IAAI,SAAS,CAAC;AAClF;AAEO,MAAM,QAAQ,CAAC,QACpB,IAAI,IAAI,IAAI,QAAgB,IAAI,OAAe,IAAI,MAAc,IAAI,OAA4C;","names":[]}

package/dist/resources/Req.mjs

@@ -7,16 +7,14 @@ class Req {
     this.query = query;
     this.body = body;
     this.headers = headers;
+    this.skip = ifDefined(query.skip, (s) => asNumber(s));
+    this.take = ifDefined(query.take, (t) => asNumber(t));
   }
+  skip;
+  take;
   get id() {
     return this.get("id");
   }
-  get skip() {
-    return ifDefined(this.query?.skip, asNumber(this.query?.skip));
-  }
-  get take() {
-    return ifDefined(this.query?.take, asNumber(this.query?.take));
-  }
   get q() {
     return this.get("q");
   }

package/dist/resources/Req.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/resources/Req.ts"],"sourcesContent":["import { asNumber, Id, Json, JsonValue, OneOrMore, PageOptions, Text } from '../types';\nimport { ifDefined } from '../utils';\n\nexport class Req implements Omit<PageOptions, 'sort'> {\n  constructor(readonly path: Json = {}, readonly query: Json = {}, readonly body: unknown, readonly headers: Record<string, OneOrMore<string>>) {}\n\n  get id(): Id {\n    return this.get('id');\n  }\n\n  get skip(): number | undefined {\n    return ifDefined(this.query?.skip, asNumber(this.query?.skip));\n  }\n\n  get take(): number | undefined {\n    return ifDefined(this.query?.take, asNumber(this.query?.take));\n  }\n\n  get q(): JsonValue {\n    return this.get('q');\n  }\n\n  get = (key: Text): any => this.path[key.toString()] ?? this.query[key.toString()];\n}\n\nexport const toReq = (req: { params?: { id?: unknown }; query?: { q?: unknown }; body?: unknown; headers?: unknown }): Req =>\n  new Req(req.params as Json, req.query as Json, req.body as Json, req.headers as Record<string, OneOrMore<string>>);\n"],"mappings":";AAAA,SAAS,gBAAmE;AAC5E,SAAS,iBAAiB;AAEnB,MAAM,IAAyC;AAAA,EACpD,YAAqB,OAAa,CAAC,GAAY,QAAc,CAAC,GAAY,MAAwB,SAA4C;AAAzH;AAA0B;AAA2B;AAAwB;AAAA,EAA6C;AAAA,EAE/I,IAAI,KAAS;AACX,WAAO,KAAK,IAAI,IAAI;AAAA,EACtB;AAAA,EAEA,IAAI,OAA2B;AAC7B,WAAO,UAAU,KAAK,OAAO,MAAM,SAAS,KAAK,OAAO,IAAI,CAAC;AAAA,EAC/D;AAAA,EAEA,IAAI,OAA2B;AAC7B,WAAO,UAAU,KAAK,OAAO,MAAM,SAAS,KAAK,OAAO,IAAI,CAAC;AAAA,EAC/D;AAAA,EAEA,IAAI,IAAe;AACjB,WAAO,KAAK,IAAI,GAAG;AAAA,EACrB;AAAA,EAEA,MAAM,CAAC,QAAmB,KAAK,KAAK,IAAI,SAAS,CAAC,KAAK,KAAK,MAAM,IAAI,SAAS,CAAC;AAClF;AAEO,MAAM,QAAQ,CAAC,QACpB,IAAI,IAAI,IAAI,QAAgB,IAAI,OAAe,IAAI,MAAc,IAAI,OAA4C;","names":[]}
+{"version":3,"sources":["../../src/resources/Req.ts"],"sourcesContent":["import { asNumber, Id, Json, JsonValue, OneOrMore, Optional, PageOptions, Text } from '../types';\nimport { ifDefined } from '../utils';\n\nexport class Req implements Omit<PageOptions, 'sort'> {\n  readonly skip: Optional<number>;\n  readonly take: Optional<number>;\n  constructor(readonly path: Json = {}, readonly query: Json = {}, readonly body: unknown, readonly headers: Record<string, OneOrMore<string>>) {\n    this.skip = ifDefined(query.skip, s => asNumber(s));\n    this.take = ifDefined(query.take, t => asNumber(t));\n  }\n\n  get id(): Id {\n    return this.get('id');\n  }\n\n  get q(): JsonValue {\n    return this.get('q');\n  }\n\n  get = (key: Text): any => this.path[key.toString()] ?? this.query[key.toString()];\n}\n\nexport const toReq = (req: { params?: { id?: unknown }; query?: { q?: unknown }; body?: unknown; headers?: unknown }): Req =>\n  new Req(req.params as Json, req.query as Json, req.body as Json, req.headers as Record<string, OneOrMore<string>>);\n"],"mappings":";AAAA,SAAS,gBAA6E;AACtF,SAAS,iBAAiB;AAEnB,MAAM,IAAyC;AAAA,EAGpD,YAAqB,OAAa,CAAC,GAAY,QAAc,CAAC,GAAY,MAAwB,SAA4C;AAAzH;AAA0B;AAA2B;AAAwB;AAChG,SAAK,OAAO,UAAU,MAAM,MAAM,OAAK,SAAS,CAAC,CAAC;AAClD,SAAK,OAAO,UAAU,MAAM,MAAM,OAAK,SAAS,CAAC,CAAC;AAAA,EACpD;AAAA,EALS;AAAA,EACA;AAAA,EAMT,IAAI,KAAS;AACX,WAAO,KAAK,IAAI,IAAI;AAAA,EACtB;AAAA,EAEA,IAAI,IAAe;AACjB,WAAO,KAAK,IAAI,GAAG;AAAA,EACrB;AAAA,EAEA,MAAM,CAAC,QAAmB,KAAK,KAAK,IAAI,SAAS,CAAC,KAAK,KAAK,MAAM,IAAI,SAAS,CAAC;AAClF;AAEO,MAAM,QAAQ,CAAC,QACpB,IAAI,IAAI,IAAI,QAAgB,IAAI,OAAe,IAAI,MAAc,IAAI,OAA4C;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "15.8.7",
+  "version": "15.8.8",
   "description": "Straightforward library for building domain-driven microservice architectures",
   "author": "Sander Hoogendoorn",
   "license": "MIT",
@@ -33,7 +33,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@thisisagile/easy-test": "15.8.7",
+    "@thisisagile/easy-test": "15.8.8",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^9.0.2",
     "@types/luxon": "3.2.0",

package/src/resources/Req.ts

@@ -1,21 +1,18 @@
-import { asNumber, Id, Json, JsonValue, OneOrMore, PageOptions, Text } from '../types';
+import { asNumber, Id, Json, JsonValue, OneOrMore, Optional, PageOptions, Text } from '../types';
 import { ifDefined } from '../utils';
 
 export class Req implements Omit<PageOptions, 'sort'> {
-  constructor(readonly path: Json = {}, readonly query: Json = {}, readonly body: unknown, readonly headers: Record<string, OneOrMore<string>>) {}
+  readonly skip: Optional<number>;
+  readonly take: Optional<number>;
+  constructor(readonly path: Json = {}, readonly query: Json = {}, readonly body: unknown, readonly headers: Record<string, OneOrMore<string>>) {
+    this.skip = ifDefined(query.skip, s => asNumber(s));
+    this.take = ifDefined(query.take, t => asNumber(t));
+  }
 
   get id(): Id {
     return this.get('id');
   }
 
-  get skip(): number | undefined {
-    return ifDefined(this.query?.skip, asNumber(this.query?.skip));
-  }
-
-  get take(): number | undefined {
-    return ifDefined(this.query?.take, asNumber(this.query?.take));
-  }
-
   get q(): JsonValue {
     return this.get('q');
   }