@thisisagile/easy 12.19.0 → 12.19.2

package/dist/types/PageList.d.ts

@@ -1,9 +1,6 @@
 import { List } from './List';
 import { Construct } from './Constructor';
-export declare type Sort = {
-    key: string;
-    value: -1 | 1;
-};
+import { PlainSort, Sort } from './Sort';
 export declare type FilterValue = {
     label?: string;
     value: any;
@@ -20,6 +17,7 @@ export declare type PageOptions = {
     take?: number;
     skip?: number;
     sort?: Sort[];
+    sorts?: PlainSort;
     filters?: Filter[];
 };
 export declare type PageList<T> = List<T> & Omit<PageOptions, 'sort'> & {

package/dist/types/PageList.js

@@ -14,14 +14,13 @@ const toShortFilter = (field, shortField, value) => ({
 exports.toShortFilter = toShortFilter;
 const isPageList = (l) => (0, List_1.isList)(l) && (0, IsA_1.isA)(l, 'total');
 exports.isPageList = isPageList;
-const toPageList = (items, options) => {
-    const list = (0, List_1.toList)(...(items ?? []));
-    list.take = options?.take ?? 250;
-    list.skip = options?.skip ?? 0;
-    list.total = options?.total;
-    list.filters = options?.filters;
-    return list;
-};
+const toPageList = (items, options) => (0, Constructor_1.on)((0, List_1.toList)(...(items ?? [])), l => {
+    l.take = options?.take ?? 250;
+    l.skip = options?.skip ?? 0;
+    l.total = options?.total;
+    l.sorts = options?.sorts;
+    l.filters = options?.filters;
+});
 exports.toPageList = toPageList;
 const asPageList = (c, items = (0, exports.toPageList)()) => (0, exports.toPageList)(items.map(i => (0, Constructor_1.ofConstruct)(c, i)), items);
 exports.asPageList = asPageList;

package/dist/types/PageList.js.map

@@ -1 +1 @@
-{"version":3,"file":"PageList.js","sourceRoot":"","sources":["../../src/types/PageList.ts"],"names":[],"mappings":";;;AAAA,iCAA8C;AAC9C,+CAAuD;AACvD,+BAA4B;AAOrB,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,KAAU,EAAU,EAAE,CAAC,IAAA,qBAAa,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAArF,QAAA,QAAQ,YAA6E;AAC3F,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,UAAkB,EAAE,KAAU,EAAU,EAAE,CAAC,CAAC;IACvF,KAAK;IACL,UAAU;IACV,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;CACpB,CAAC,CAAC;AAJU,QAAA,aAAa,iBAIvB;AAKI,MAAM,UAAU,GAAG,CAAI,CAAO,EAAoB,EAAE,CAAC,IAAA,aAAM,EAAI,CAAC,CAAC,IAAI,IAAA,SAAG,EAAC,CAAC,EAAE,OAAO,CAAC,CAAC;AAA/E,QAAA,UAAU,cAAqE;AAErF,MAAM,UAAU,GAAG,CAAI,KAAW,EAAE,OAAwD,EAAe,EAAE;IAClH,MAAM,IAAI,GAAG,IAAA,aAAM,EAAI,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAgB,CAAC;IACxD,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,GAAG,CAAC;IACjC,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,CAAC;IAC/B,IAAI,CAAC,KAAK,GAAG,OAAO,EAAE,KAAK,CAAC;IAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;IAChC,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAPW,QAAA,UAAU,cAOrB;AAEK,MAAM,UAAU,GAAG,CAAO,CAAe,EAAE,QAAQ,IAAA,kBAAU,GAAK,EAAe,EAAE,CACxF,IAAA,kBAAU,EACR,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EACjC,KAAK,CACN,CAAC;AAJS,QAAA,UAAU,cAInB"}
+{"version":3,"file":"PageList.js","sourceRoot":"","sources":["../../src/types/PageList.ts"],"names":[],"mappings":";;;AAAA,iCAA8C;AAC9C,+CAA2D;AAC3D,+BAA4B;AAMrB,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,KAAU,EAAU,EAAE,CAAC,IAAA,qBAAa,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAArF,QAAA,QAAQ,YAA6E;AAC3F,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,UAAkB,EAAE,KAAU,EAAU,EAAE,CAAC,CAAC;IACvF,KAAK;IACL,UAAU;IACV,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;CACpB,CAAC,CAAC;AAJU,QAAA,aAAa,iBAIvB;AAKI,MAAM,UAAU,GAAG,CAAI,CAAO,EAAoB,EAAE,CAAC,IAAA,aAAM,EAAI,CAAC,CAAC,IAAI,IAAA,SAAG,EAAC,CAAC,EAAE,OAAO,CAAC,CAAC;AAA/E,QAAA,UAAU,cAAqE;AAErF,MAAM,UAAU,GAAG,CAAI,KAAW,EAAE,OAAwD,EAAe,EAAE,CAClH,IAAA,gBAAE,EAAC,IAAA,aAAM,EAAI,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAgB,EAAE,CAAC,CAAC,EAAE;IACjD,CAAC,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,GAAG,CAAC;IAC9B,CAAC,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,KAAK,GAAG,OAAO,EAAE,KAAK,CAAC;IACzB,CAAC,CAAC,KAAK,GAAG,OAAO,EAAE,KAAK,CAAC;IACzB,CAAC,CAAC,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;AAC/B,CAAC,CAAC,CAAC;AAPQ,QAAA,UAAU,cAOlB;AAEE,MAAM,UAAU,GAAG,CAAO,CAAe,EAAE,QAAQ,IAAA,kBAAU,GAAK,EAAe,EAAE,CACxF,IAAA,kBAAU,EACR,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EACjC,KAAK,CACN,CAAC;AAJS,QAAA,UAAU,cAInB"}

package/dist/types/Sort.d.ts

@@ -0,0 +1,8 @@
+export declare const asc = 1;
+export declare const desc = -1;
+export declare type SortDirection = typeof asc | typeof desc;
+export declare type Sort = {
+    key: string;
+    value: SortDirection;
+};
+export declare type PlainSort = Record<string, SortDirection>;

package/dist/types/Sort.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.desc = exports.asc = void 0;
+exports.asc = 1;
+exports.desc = -1;
+//# sourceMappingURL=Sort.js.map

package/dist/types/Sort.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Sort.js","sourceRoot":"","sources":["../../src/types/Sort.ts"],"names":[],"mappings":";;;AAAa,QAAA,GAAG,GAAG,CAAC,CAAC;AACR,QAAA,IAAI,GAAG,CAAC,CAAC,CAAC"}

package/dist/types/index.d.ts

@@ -24,14 +24,15 @@ export * from './Message';
 export * from './Meta';
 export * from './Nullish';
 export * from './Number';
+export * from './PageList';
 export * from './Primitive';
 export * from './Repository';
 export * from './Result';
 export * from './Results';
+export * from './Sort';
 export * from './Tag';
 export * from './Template';
 export * from './Text';
-export * from './PageList';
 export * from './Try';
 export * from './Types';
 export * from './Uri';
@@ -39,3 +40,8 @@ export * from './Uuid';
 export * from './Validatable';
 export * from './Value';
 export { isPrimitive } from './Primitive';
+export { PlainSort } from "./Sort";
+export { Sort } from "./Sort";
+export { SortDirection } from "./Sort";
+export { desc } from "./Sort";
+export { asc } from "./Sort";

package/dist/types/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPrimitive = void 0;
+exports.asc = exports.desc = exports.isPrimitive = void 0;
 __exportStar(require("./Array"), exports);
 __exportStar(require("./Builder"), exports);
 __exportStar(require("./Cache"), exports);
@@ -41,14 +41,15 @@ __exportStar(require("./Message"), exports);
 __exportStar(require("./Meta"), exports);
 __exportStar(require("./Nullish"), exports);
 __exportStar(require("./Number"), exports);
+__exportStar(require("./PageList"), exports);
 __exportStar(require("./Primitive"), exports);
 __exportStar(require("./Repository"), exports);
 __exportStar(require("./Result"), exports);
 __exportStar(require("./Results"), exports);
+__exportStar(require("./Sort"), exports);
 __exportStar(require("./Tag"), exports);
 __exportStar(require("./Template"), exports);
 __exportStar(require("./Text"), exports);
-__exportStar(require("./PageList"), exports);
 __exportStar(require("./Try"), exports);
 __exportStar(require("./Types"), exports);
 __exportStar(require("./Uri"), exports);
@@ -57,4 +58,8 @@ __exportStar(require("./Validatable"), exports);
 __exportStar(require("./Value"), exports);
 var Primitive_1 = require("./Primitive");
 Object.defineProperty(exports, "isPrimitive", { enumerable: true, get: function () { return Primitive_1.isPrimitive; } });
+var Sort_1 = require("./Sort");
+Object.defineProperty(exports, "desc", { enumerable: true, get: function () { return Sort_1.desc; } });
+var Sort_2 = require("./Sort");
+Object.defineProperty(exports, "asc", { enumerable: true, get: function () { return Sort_2.asc; } });
 //# sourceMappingURL=index.js.map

package/dist/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,0CAAwB;AACxB,6CAA2B;AAC3B,yCAAuB;AACvB,gDAA8B;AAC9B,4CAA0B;AAC1B,yCAAuB;AACvB,gDAA8B;AAC9B,8CAA4B;AAC5B,0CAAwB;AACxB,yCAAuB;AACvB,4CAA0B;AAC1B,wCAAsB;AACtB,uCAAqB;AACrB,6CAA2B;AAC3B,uCAAqB;AACrB,wCAAsB;AACtB,2CAAyB;AACzB,4CAA0B;AAC1B,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,yCAAuB;AACvB,4CAA0B;AAC1B,2CAAyB;AACzB,8CAA4B;AAC5B,+CAA6B;AAC7B,2CAAyB;AACzB,4CAA0B;AAC1B,wCAAsB;AACtB,6CAA2B;AAC3B,yCAAuB;AACvB,6CAA2B;AAC3B,wCAAsB;AACtB,0CAAwB;AACxB,wCAAsB;AACtB,yCAAuB;AACvB,gDAA8B;AAC9B,0CAAwB;AACxB,yCAA0C;AAAjC,wGAAA,WAAW,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,0CAAwB;AACxB,6CAA2B;AAC3B,yCAAuB;AACvB,gDAA8B;AAC9B,4CAA0B;AAC1B,yCAAuB;AACvB,gDAA8B;AAC9B,8CAA4B;AAC5B,0CAAwB;AACxB,yCAAuB;AACvB,4CAA0B;AAC1B,wCAAsB;AACtB,uCAAqB;AACrB,6CAA2B;AAC3B,uCAAqB;AACrB,wCAAsB;AACtB,2CAAyB;AACzB,4CAA0B;AAC1B,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,yCAAuB;AACvB,4CAA0B;AAC1B,2CAAyB;AACzB,6CAA2B;AAC3B,8CAA4B;AAC5B,+CAA6B;AAC7B,2CAAyB;AACzB,4CAA0B;AAC1B,yCAAuB;AACvB,wCAAsB;AACtB,6CAA2B;AAC3B,yCAAuB;AACvB,wCAAsB;AACtB,0CAAwB;AACxB,wCAAsB;AACtB,yCAAuB;AACvB,gDAA8B;AAC9B,0CAAwB;AACxB,yCAA0C;AAAjC,wGAAA,WAAW,OAAA;AAIpB,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,+BAA6B;AAApB,2FAAA,GAAG,OAAA"}

package/package.json

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

package/src/types/PageList.ts

@@ -1,8 +1,7 @@
 import { isList, List, toList } from './List';
-import { Construct, ofConstruct } from './Constructor';
+import { Construct, ofConstruct, on } from './Constructor';
 import { isA } from './IsA';
-
-export type Sort = { key: string; value: -1 | 1 };
+import { PlainSort, Sort } from './Sort';
 
 export type FilterValue = { label?: string; value: any };
 export type Filter = { label?: string; field: string; shortField?: string; values: FilterValue[] };
@@ -14,19 +13,19 @@ export const toShortFilter = (field: string, shortField: string, value: any): Fi
   values: [{ value }],
 });
 
-export type PageOptions = { take?: number; skip?: number; sort?: Sort[]; filters?: Filter[] };
+export type PageOptions = { take?: number; skip?: number; sort?: Sort[]; sorts?: PlainSort; filters?: Filter[] };
 export type PageList<T> = List<T> & Omit<PageOptions, 'sort'> & { total?: number };
 
 export const isPageList = <T>(l?: T[]): l is PageList<T> => isList<T>(l) && isA(l, 'total');
 
-export const toPageList = <T>(items?: T[], options?: Omit<PageOptions, 'sort'> & { total?: number }): PageList<T> => {
-  const list = toList<T>(...(items ?? [])) as PageList<T>;
-  list.take = options?.take ?? 250;
-  list.skip = options?.skip ?? 0;
-  list.total = options?.total;
-  list.filters = options?.filters;
-  return list;
-};
+export const toPageList = <T>(items?: T[], options?: Omit<PageOptions, 'sort'> & { total?: number }): PageList<T> =>
+  on(toList<T>(...(items ?? [])) as PageList<T>, l => {
+    l.take = options?.take ?? 250;
+    l.skip = options?.skip ?? 0;
+    l.total = options?.total;
+    l.sorts = options?.sorts;
+    l.filters = options?.filters;
+  });
 
 export const asPageList = <T, U>(c: Construct<T>, items = toPageList<U>()): PageList<T> =>
   toPageList<T>(

package/src/types/Sort.ts

@@ -0,0 +1,5 @@
+export const asc = 1;
+export const desc = -1;
+export type SortDirection = typeof asc | typeof desc;
+export type Sort = { key: string; value: SortDirection };
+export type PlainSort = Record<string, SortDirection>;

package/src/types/index.ts

@@ -24,14 +24,15 @@ export * from './Message';
 export * from './Meta';
 export * from './Nullish';
 export * from './Number';
+export * from './PageList';
 export * from './Primitive';
 export * from './Repository';
 export * from './Result';
 export * from './Results';
+export * from './Sort';
 export * from './Tag';
 export * from './Template';
 export * from './Text';
-export * from './PageList';
 export * from './Try';
 export * from './Types';
 export * from './Uri';
@@ -39,3 +40,8 @@ export * from './Uuid';
 export * from './Validatable';
 export * from './Value';
 export { isPrimitive } from './Primitive';
+export { PlainSort } from "./Sort";
+export { Sort } from "./Sort";
+export { SortDirection } from "./Sort";
+export { desc } from "./Sort";
+export { asc } from "./Sort";