@thisisagile/easy 10.5.20 → 10.5.25

package/dist/types/Json.d.ts

@@ -12,6 +12,7 @@ export declare const json: {
     delete: (subject: unknown, key: string) => Json;
     set: (subject: unknown, key?: string, value?: unknown) => Json;
     omit: (subject: unknown, ...keys: string[]) => Json;
+    defaults: <T extends Json = Json>(options?: Partial<T>, defaults?: Partial<T>) => T;
 };
 export declare const toJson: (...subjects: unknown[]) => Json;
 export declare const asJson: (j?: unknown, alt?: Get<Json>) => Json;

package/dist/types/Json.js

@@ -15,6 +15,7 @@ exports.json = {
     },
     set: (subject, key = '', value) => (0, Is_1.isEmpty)(key) ? subject : (0, Is_1.isDefined)(value) ? { ...subject, ...{ [key]: value } } : exports.json.delete(subject, key),
     omit: (subject, ...keys) => keys.reduce((js, k) => exports.json.delete(js, k), exports.json.parse(subject)),
+    defaults: (options = {}, defaults = {}) => exports.json.merge(defaults, options)
 };
 exports.toJson = exports.json.merge;
 const asJson = (j, alt = {}) => ((0, exports.isJson)(j) ? j.toJSON() : (0, Is_1.isObject)(j) ? j : (0, Get_1.ofGet)(alt, j));

package/dist/types/Json.js.map

@@ -1 +1 @@
-{"version":3,"file":"Json.js","sourceRoot":"","sources":["../../src/types/Json.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,6BAAoD;AACpD,+BAAmC;AAK5B,MAAM,MAAM,GAAG,CAAC,OAAiB,EAAqC,EAAE,CAAC,IAAA,SAAG,EAAyB,OAAO,EAAE,QAAQ,CAAC,CAAC;AAAlH,QAAA,MAAM,UAA4G;AAElH,QAAA,IAAI,GAAG;IAClB,KAAK,EAAE,CAAC,OAAgB,EAAQ,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IAC5E,KAAK,EAAE,CAAC,GAAG,QAAmB,EAAQ,EAAE,CAAC,YAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,cAAM,EAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,YAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9I,MAAM,EAAE,CAAC,OAAgB,EAAE,GAAW,EAAQ,EAAE;QAC9C,OAAQ,OAAe,CAAC,GAAG,CAAC,CAAC;QAC7B,OAAO,OAAe,CAAC;IACzB,CAAC;IACD,GAAG,EAAE,CAAC,OAAgB,EAAE,GAAG,GAAG,EAAE,EAAE,KAAe,EAAQ,EAAE,CACzD,IAAA,YAAO,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,cAAS,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAI,OAAe,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,CAAC,YAAI,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC;IAC9H,IAAI,EAAE,CAAC,OAAgB,EAAE,GAAG,IAAc,EAAQ,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,YAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,YAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;CACrH,CAAC;AAEW,QAAA,MAAM,GAAG,YAAI,CAAC,KAAK,CAAC;AAE1B,MAAM,MAAM,GAAG,CAAC,CAAW,EAAE,MAAiB,EAAE,EAAQ,EAAE,CAAC,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAA,aAAQ,EAAC,CAAC,CAAC,CAAC,CAAC,CAAE,CAAU,CAAC,CAAC,CAAC,IAAA,WAAK,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;AAA1H,QAAA,MAAM,UAAoH;AAEvI,MAAM,GAAG;IACP,YAAqB,QAAiB,EAAE;QAAnB,UAAK,GAAL,KAAK,CAAc;QAExC,WAAM,GAAG,CAAC,GAAW,EAAO,EAAE,CAAC,IAAI,GAAG,CAAC,YAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACrE,QAAG,GAAG,CAAC,GAAW,EAAE,KAAe,EAAO,EAAE,CAAC,IAAI,GAAG,CAAC,YAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IAH5C,CAAC;CAI7C;AAEM,MAAM,GAAG,GAAG,CAAC,KAAc,EAAO,EAAE,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;AAA9C,QAAA,GAAG,OAA2C"}
+{"version":3,"file":"Json.js","sourceRoot":"","sources":["../../src/types/Json.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,6BAAoD;AACpD,+BAAmC;AAK5B,MAAM,MAAM,GAAG,CAAC,OAAiB,EAAqC,EAAE,CAAC,IAAA,SAAG,EAAyB,OAAO,EAAE,QAAQ,CAAC,CAAC;AAAlH,QAAA,MAAM,UAA4G;AAElH,QAAA,IAAI,GAAG;IAClB,KAAK,EAAE,CAAC,OAAgB,EAAQ,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IAC5E,KAAK,EAAE,CAAC,GAAG,QAAmB,EAAQ,EAAE,CAAC,YAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,cAAM,EAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,YAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9I,MAAM,EAAE,CAAC,OAAgB,EAAE,GAAW,EAAQ,EAAE;QAC9C,OAAQ,OAAe,CAAC,GAAG,CAAC,CAAC;QAC7B,OAAO,OAAe,CAAC;IACzB,CAAC;IACD,GAAG,EAAE,CAAC,OAAgB,EAAE,GAAG,GAAG,EAAE,EAAE,KAAe,EAAQ,EAAE,CACzD,IAAA,YAAO,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,cAAS,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAI,OAAe,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,CAAC,YAAI,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC;IAC9H,IAAI,EAAE,CAAC,OAAgB,EAAE,GAAG,IAAc,EAAQ,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,YAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,YAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACpH,QAAQ,EAAE,CAAwB,UAAsB,EAAE,EAAE,WAAuB,EAAE,EAAK,EAAE,CAAC,YAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAM;CAChI,CAAC;AAEW,QAAA,MAAM,GAAG,YAAI,CAAC,KAAK,CAAC;AAE1B,MAAM,MAAM,GAAG,CAAC,CAAW,EAAE,MAAiB,EAAE,EAAQ,EAAE,CAAC,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAA,aAAQ,EAAC,CAAC,CAAC,CAAC,CAAC,CAAE,CAAU,CAAC,CAAC,CAAC,IAAA,WAAK,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;AAA1H,QAAA,MAAM,UAAoH;AAEvI,MAAM,GAAG;IACP,YAAqB,QAAiB,EAAE;QAAnB,UAAK,GAAL,KAAK,CAAc;QAExC,WAAM,GAAG,CAAC,GAAW,EAAO,EAAE,CAAC,IAAI,GAAG,CAAC,YAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACrE,QAAG,GAAG,CAAC,GAAW,EAAE,KAAe,EAAO,EAAE,CAAC,IAAI,GAAG,CAAC,YAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IAH5C,CAAC;CAI7C;AAEM,MAAM,GAAG,GAAG,CAAC,KAAc,EAAO,EAAE,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;AAA9C,QAAA,GAAG,OAA2C"}

package/dist/types/PageList.d.ts

@@ -5,4 +5,4 @@ export declare type PageOptions = {
     total?: number;
 };
 export declare type PageList<T> = List<T> & PageOptions;
-export declare const toPageList: <T>(items?: T[] | undefined, options?: PageOptions) => PageList<T>;
+export declare const toPageList: <T>(items?: T[] | undefined, options?: PageOptions | undefined) => PageList<T>;

package/dist/types/PageList.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toPageList = void 0;
 const List_1 = require("./List");
-const toPageList = (items, options = { take: 250, skip: 0 }) => {
+const Json_1 = require("./Json");
+const toPageList = (items, options) => {
+    const o = Json_1.json.defaults(options, { take: 250, skip: 0 });
     const list = (0, List_1.toList)(...items ?? []);
-    list.take = options.take;
-    list.skip = options.skip;
-    list.total = options.total;
+    list.take = o.take;
+    list.skip = o.skip;
+    list.total = o.total;
     return list;
 };
 exports.toPageList = toPageList;

package/dist/types/PageList.js.map

@@ -1 +1 @@
-{"version":3,"file":"PageList.js","sourceRoot":"","sources":["../../src/types/PageList.ts"],"names":[],"mappings":";;;AAAA,iCAAsC;AAM/B,MAAM,UAAU,GAAG,CAAI,KAAW,EAAE,UAAuB,EAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAC,EAAe,EAAE;IACrG,MAAM,IAAI,GAAG,IAAA,aAAM,EAAI,GAAG,KAAK,IAAI,EAAE,CAAQ,CAAC;IAC9C,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IACzB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IACzB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC3B,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB"}
+{"version":3,"file":"PageList.js","sourceRoot":"","sources":["../../src/types/PageList.ts"],"names":[],"mappings":";;;AAAA,iCAAsC;AACtC,iCAA8B;AAMvB,MAAM,UAAU,GAAG,CAAI,KAAW,EAAE,OAAqB,EAAe,EAAE;IAC/E,MAAM,CAAC,GAAG,WAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAC,CAAC,CAAC;IACvD,MAAM,IAAI,GAAG,IAAA,aAAM,EAAI,GAAG,KAAK,IAAI,EAAE,CAAQ,CAAC;IAC9C,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;IACnB,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;IACnB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;IACrB,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAPW,QAAA,UAAU,cAOrB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "10.5.20",
+  "version": "10.5.25",
   "description": "Straightforward library for building domain-driven microservice architectures",
   "author": "Sander Hoogendoorn",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@thisisagile/easy-test": "10.5.20",
+    "@thisisagile/easy-test": "10.5.25",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/validator": "^13.7.2"

package/src/types/Json.ts

@@ -17,6 +17,7 @@ export const json = {
   set: (subject: unknown, key = '', value?: unknown): Json =>
     isEmpty(key) ? subject : isDefined(value) ? { ...(subject as any), ...{ [key]: value as Json } } : json.delete(subject, key),
   omit: (subject: unknown, ...keys: string[]): Json => keys.reduce((js, k) => json.delete(js, k), json.parse(subject)),
+  defaults: <T extends Json = Json>(options: Partial<T> = {}, defaults: Partial<T> = {}): T => json.merge(defaults, options) as T
 };
 
 export const toJson = json.merge;

package/src/types/PageList.ts

@@ -1,13 +1,15 @@
 import { List, toList } from './List';
+import { json } from './Json';
 
 export type PageOptions = { take?: number, skip?: number, total?: number };
 
 export type PageList<T> = List<T> & PageOptions;
 
-export const toPageList = <T>(items?: T[], options: PageOptions = {take: 250, skip: 0}): PageList<T> => {
+export const toPageList = <T>(items?: T[], options?: PageOptions): PageList<T> => {
+  const o = json.defaults(options, {take: 250, skip: 0});
   const list = toList<T>(...items ?? []) as any;
-  list.take = options.take;
-  list.skip = options.skip;
-  list.total = options.total;
+  list.take = o.take;
+  list.skip = o.skip;
+  list.total = o.total;
   return list;
 };