@thisisagile/easy 12.18.12 → 12.19.1

package/dist/types/PageList.d.ts

@@ -1,5 +1,7 @@
 import { List } from './List';
 import { Construct } from './Constructor';
+export declare const asc = 1;
+export declare const desc = -1;
 export declare type Sort = {
     key: string;
     value: -1 | 1;
@@ -11,9 +13,11 @@ export declare type FilterValue = {
 export declare type Filter = {
     label?: string;
     field: string;
+    shortField?: string;
     values: FilterValue[];
 };
 export declare const toFilter: (field: string, value: any) => Filter;
+export declare const toShortFilter: (field: string, shortField: string, value: any) => Filter;
 export declare type PageOptions = {
     take?: number;
     skip?: number;

package/dist/types/PageList.js

@@ -1,21 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.asPageList = exports.toPageList = exports.isPageList = exports.toFilter = void 0;
+exports.asPageList = exports.toPageList = exports.isPageList = exports.toShortFilter = exports.toFilter = exports.desc = exports.asc = void 0;
 const List_1 = require("./List");
 const Constructor_1 = require("./Constructor");
 const IsA_1 = require("./IsA");
-const toFilter = (field, value) => ({ field, values: [{ value }] });
+exports.asc = 1;
+exports.desc = -1;
+const toFilter = (field, value) => (0, exports.toShortFilter)(field, field, value);
 exports.toFilter = toFilter;
+const toShortFilter = (field, shortField, value) => ({
+    field,
+    shortField,
+    values: [{ 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.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,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;AAAnF,QAAA,QAAQ,YAA2E;AAKzF,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;AAEf,QAAA,GAAG,GAAG,CAAC,CAAC;AACR,QAAA,IAAI,GAAG,CAAC,CAAC,CAAC;AAMhB,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,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;AAC/B,CAAC,CAAC,CAAC;AANQ,QAAA,UAAU,cAMlB;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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "12.18.12",
+  "version": "12.19.1",
   "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.18.12",
+    "@thisisagile/easy-test": "12.19.1",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^8.5.9",
     "@types/luxon": "3.1.0",

package/src/types/PageList.ts

@@ -1,30 +1,36 @@
 import { isList, List, toList } from './List';
-import { Construct, ofConstruct } from './Constructor';
+import { Construct, ofConstruct, on } from './Constructor';
 import { isA } from './IsA';
 
+export const asc = 1;
+export const desc = -1;
 export type Sort = { key: string; value: -1 | 1 };
 
 export type FilterValue = { label?: string; value: any };
-export type Filter = { label?: string; field: string; values: FilterValue[] };
+export type Filter = { label?: string; field: string; shortField?: string; values: FilterValue[] };
 
-export const toFilter = (field: string, value: any): Filter => ({ field, values: [{ value }] });
+export const toFilter = (field: string, value: any): Filter => toShortFilter(field, field, value);
+export const toShortFilter = (field: string, shortField: string, value: any): Filter => ({
+  field,
+  shortField,
+  values: [{ value }],
+});
 
 export type PageOptions = { take?: number; skip?: number; sort?: Sort[]; 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.filters = options?.filters;
+  });
 
 export const asPageList = <T, U>(c: Construct<T>, items = toPageList<U>()): PageList<T> =>
   toPageList<T>(
     items.map(i => ofConstruct(c, i)),
-    items
+    items,
   );