@thisisagile/easy 13.6.10 → 13.6.12

package/dist/types/PageList.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.asPageList = exports.toPageList = exports.isPageList = exports.toShortFilter = exports.toFilter = void 0;
+exports.asPageList = exports.toPageList = exports.isPageList = exports.PageList = exports.toShortFilter = exports.toFilter = void 0;
 const List_1 = require("./List");
 const Constructor_1 = require("./Constructor");
 const IsA_1 = require("./IsA");
+const Is_1 = require("./Is");
+const Case_1 = require("./Case");
 const toFilter = (field, value) => (0, exports.toShortFilter)(field, field, value);
 exports.toFilter = toFilter;
 const toShortFilter = (field, shortField, value) => ({
@@ -12,16 +14,111 @@ const toShortFilter = (field, shortField, value) => ({
     values: [{ value }],
 });
 exports.toShortFilter = toShortFilter;
+class PageList extends List_1.List {
+    constructor() {
+        super(...arguments);
+        this._take = 250;
+        this._skip = 0;
+    }
+    setPageOptions(options) {
+        this._take = options?.take ?? 250;
+        this._skip = options?.skip ?? 0;
+        this._total = options?.total;
+        this._sorts = options?.sorts;
+        this._filters = options?.filters;
+        return this;
+    }
+    get take() {
+        return this._take;
+    }
+    get skip() {
+        return this._skip;
+    }
+    get total() {
+        return this._total;
+    }
+    get sorts() {
+        return this._sorts;
+    }
+    get filters() {
+        return this._filters;
+    }
+    asc(p) {
+        return (0, exports.toPageList)(super.asc(p), this);
+    }
+    desc(p) {
+        return (0, exports.toPageList)(super.desc(p), this);
+    }
+    diff(others) {
+        return (0, exports.toPageList)(super.diff(others), this);
+    }
+    diffByKey(others, key) {
+        return (0, exports.toPageList)(super.diffByKey(others, key), this);
+    }
+    intersect(others) {
+        return (0, exports.toPageList)(super.intersect(others), this);
+    }
+    intersectByKey(others, key) {
+        return (0, exports.toPageList)(super.intersectByKey(others, key), this);
+    }
+    map(f, params) {
+        const items = super.map(f, params);
+        return (0, exports.toPageList)(items, this);
+    }
+    flatMap(f, params) {
+        return (0, exports.toPageList)(super.flatMap(f, params), this);
+    }
+    mapDefined(f, params) {
+        return (0, exports.toPageList)(super.mapDefined(f, params), this);
+    }
+    mapAsync(f) {
+        return super.mapAsync(f).then(r => (0, exports.toPageList)(r, this));
+    }
+    distinct() {
+        return (0, exports.toPageList)(super.distinct(), this);
+    }
+    distinctByKey(key) {
+        return (0, exports.toPageList)(super.distinctByKey(key), this);
+    }
+    filter(p, params) {
+        return (0, exports.toPageList)(super.filter(p, params), this);
+    }
+    concat(...items) {
+        return (0, exports.toPageList)(super.concat(...items), this);
+    }
+    reverse() {
+        return (0, exports.toPageList)(super.reverse(), this);
+    }
+    splice(start, deleteCount, ...items) {
+        return (0, exports.toPageList)(super.splice(start, deleteCount, ...items), this);
+    }
+    remove(item) {
+        return (0, exports.toPageList)(super.remove(item), this);
+    }
+    replace(key, item) {
+        return (0, exports.toPageList)(super.replace(key, item), this);
+    }
+    switch(item) {
+        return (0, exports.toPageList)(super.switch(item), this);
+    }
+    defined() {
+        return (0, exports.toPageList)(super.defined(), this);
+    }
+    orElse(...alt) {
+        return (0, exports.toPageList)(super.orElse(...alt), this);
+    }
+    slice(start, end) {
+        return (0, exports.toPageList)(super.slice(start, end), this);
+    }
+}
+exports.PageList = PageList;
 const isPageList = (l) => (0, List_1.isList)(l) && (0, IsA_1.isA)(l, 'total');
 exports.isPageList = isPageList;
-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;
-});
+const toPageList = (items = [], options) => (0, Case_1.choose)(items)
+    .case(i => i.length === 1 && (0, Is_1.isNumber)(i[0]), i => new PageList().add(...i))
+    .else(i => new PageList(...i))
+    .setPageOptions(options);
 exports.toPageList = toPageList;
-const asPageList = (c, items = (0, exports.toPageList)()) => (0, exports.toPageList)(items.map(i => (0, Constructor_1.ofConstruct)(c, i)), items);
+const asPageList = (c, items = (0, exports.toPageList)()) => items.map(i => (0, Constructor_1.ofConstruct)(c, i));
 exports.asPageList = asPageList;
 //# sourceMappingURL=PageList.js.map

package/dist/types/PageList.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"PageList.js","sourceRoot":"","sources":["../../src/types/PageList.ts"],"names":[],"mappings":"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"}

package/dist/utils/If.js

@@ -6,7 +6,7 @@ const ifTrue = (o, f, alt) => ((0, types_1.isTrue)(o) ? (0, types_1.ofConstruct)
 exports.ifTrue = ifTrue;
 const ifFalse = (o, f, alt) => (!(0, types_1.isTrue)(o) ? (0, types_1.ofConstruct)(f, o) : (0, types_1.ofConstruct)(alt, o));
 exports.ifFalse = ifFalse;
-const ifDefined = (o, f, alt) => ((0, types_1.isDefined)(o) ? (0, types_1.ofConstruct)(f, o) : (0, types_1.ofConstruct)(alt));
+const ifDefined = (o, f, alt) => (0, types_1.isDefined)(o) ? (0, types_1.ofConstruct)(f, o) : (0, types_1.ofConstruct)(alt);
 exports.ifDefined = ifDefined;
 const ifNotEmpty = (o, f = o => o, alt) => (0, types_1.isNotEmpty)(o) ? (0, types_1.ofConstruct)(f, o) : (0, types_1.ofConstruct)(alt, o);
 exports.ifNotEmpty = ifNotEmpty;

package/dist/utils/If.js.map

@@ -1 +1 @@
-{"version":3,"file":"If.js","sourceRoot":"","sources":["../../src/utils/If.ts"],"names":[],"mappings":";;;AAAA,oCAAyF;AAElF,MAAM,MAAM,GAAG,CAAI,CAAU,EAAE,CAAe,EAAE,GAAkB,EAAe,EAAE,CAAC,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;AAApI,QAAA,MAAM,UAA8H;AAC1I,MAAM,OAAO,GAAG,CAAI,CAAU,EAAE,CAAe,EAAE,GAAkB,EAAe,EAAE,CAAC,CAAC,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;AAAtI,QAAA,OAAO,WAA+H;AAC5I,MAAM,SAAS,GAAG,CAAoB,CAAe,EAAE,CAAkC,EAAE,GAAoB,EAAiB,EAAE,CAAC,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,GAAG,CAAC,CAAC,CAAC;AAAnL,QAAA,SAAS,aAA0K;AACzL,MAAM,UAAU,GAAG,CAAI,CAAU,EAAE,IAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAkB,EAAe,EAAE,CAAC,IAAA,kBAAU,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAAnJ,QAAA,UAAU,cAAyI"}
+{"version":3,"file":"If.js","sourceRoot":"","sources":["../../src/utils/If.ts"],"names":[],"mappings":";;;AAAA,oCAA2F;AAEpF,MAAM,MAAM,GAAG,CAAI,CAAU,EAAE,CAAe,EAAE,GAAkB,EAAe,EAAE,CAAC,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;AAApI,QAAA,MAAM,UAA8H;AAC1I,MAAM,OAAO,GAAG,CAAI,CAAU,EAAE,CAAe,EAAE,GAAkB,EAAe,EAAE,CAAC,CAAC,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;AAAtI,QAAA,OAAO,WAA+H;AAC5I,MAAM,SAAS,GAAG,CAAoB,CAAe,EAAE,CAAkC,EAAE,GAAoB,EAAiB,EAAE,CACvI,IAAA,iBAAS,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,GAAG,CAAC,CAAC;AADzC,QAAA,SAAS,aACgC;AAC/C,MAAM,UAAU,GAAG,CAAI,CAAU,EAAE,IAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAkB,EAAe,EAAE,CACrG,IAAA,kBAAU,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAD7C,QAAA,UAAU,cACmC"}

package/dist/utils/View.d.ts

@@ -17,7 +17,10 @@ export declare class View<V = Json> {
     readonly viewers: Viewer[];
     constructor(views?: Views<V>, startsFrom?: 'scratch' | 'source', viewers?: Viewer[]);
     get fromSource(): View<V>;
-    from: <T = unknown>(source: T) => T extends PageList<infer V_1> ? PageList<V_1> : T extends List<infer V_2> ? List<V_2> : T extends (infer V_3)[] ? V_3[] : V;
+    from<T = unknown>(source: PageList<T>): PageList<V>;
+    from<T = unknown>(source: List<T>): List<V>;
+    from<T = unknown>(source: T[]): V[];
+    from<T = unknown>(source: T): V;
     same: (one?: unknown, another?: unknown) => boolean;
     private reduce;
 }

package/dist/utils/View.js

@@ -17,7 +17,7 @@ const toViewer = (key, value) => (0, types_1.choose)(value)
     .type(types_1.isFunction, f => toViewer(key, { in: { key, f } }))
     .type(isInOnly, io => toViewer(key, { in: { key, f: io.in } }))
     .type(isColAndFunction, io => toViewer(key, { in: { key, f: (a) => toFunc(a, io.col, io.in)(a) } }))
-    .type(isColAndView, io => toViewer(key, { in: { key, f: (a) => toFunc(a, io.col, io.in.from)(a) } }))
+    .type(isColAndView, io => toViewer(key, { in: { key, f: (a) => io.in.from((0, Traverse_1.traverse)(a, io.col)) } }))
     .else(v => v);
 const toViewers = (views) => (0, types_1.meta)(views)
     .entries()
@@ -27,17 +27,19 @@ class View {
         this.views = views;
         this.startsFrom = startsFrom;
         this.viewers = viewers;
-        this.from = (source) => (0, types_1.isArray)(source)
-            ? (0, types_1.isPageList)(source)
-                ? (0, types_1.toPageList)(source.map(s => this.reduce((0, types_1.asJson)(s))), source)
-                : source.map(s => this.reduce((0, types_1.asJson)(s)))
-            : this.reduce((0, types_1.asJson)(source));
         this.same = (one, another) => (0, types_1.isEqual)(this.from(one), this.from(another));
         this.reduce = (i) => this.viewers.reduce((a, v) => types_1.json.set(a, v.in.key, v.in.f(i, v.in.key)), this.startsFrom === 'scratch' ? {} : i);
     }
     get fromSource() {
         return new View(this.views, 'source', this.viewers);
     }
+    from(source) {
+        if ((0, types_1.isPageList)(source))
+            return (0, types_1.toPageList)(source.map(s => this.reduce((0, types_1.asJson)(s))), source);
+        if ((0, types_1.isArray)(source))
+            return source.map(s => this.reduce((0, types_1.asJson)(s)));
+        return this.reduce((0, types_1.asJson)(source));
+    }
 }
 exports.View = View;
 const skip = () => undefined;

package/dist/utils/View.js.map

@@ -1 +1 @@
-{"version":3,"file":"View.js","sourceRoot":"","sources":["../../src/utils/View.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"View.js","sourceRoot":"","sources":["../../src/utils/View.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/data/InMemoryGateway.ts

@@ -1,20 +1,20 @@
-import { Exception, Gateway, Id, isDefined, Json, JsonValue, List, Optional, toList } from '../types';
+import { Exception, FetchOptions, Gateway, Id, isDefined, Json, JsonValue, Optional, PageList, toPageList } from '../types';
 import { when } from '../validation';
 
 export class InMemoryGateway extends Gateway {
-  constructor(private readonly data: Promise<List<Json>>) {
+  constructor(private readonly data: Promise<PageList<Json>>) {
     super();
   }
 
-  all(): Promise<List<Json>> {
-    return this.data.then(d => toList(d));
+  all(options?: FetchOptions): Promise<PageList<Json>> {
+    return this.data.then(d => toPageList(d, d));
   }
 
   byId(id: Id): Promise<Optional<Json>> {
     return this.data.then(d => d.byId(id)).then(d => (d ? { ...d } : undefined));
   }
 
-  by = (key: string, value: JsonValue): Promise<List<Json>> => {
+  by = (key: string, value: JsonValue): Promise<PageList<Json>> => {
     return this.data.then(d => d.filter(i => i[key] === value));
   };
 

package/src/domain/Repo.ts

@@ -1,20 +1,4 @@
-import {
-  asList,
-  asPageList,
-  Constructor,
-  Exception,
-  FetchOptions,
-  Gateway,
-  Id,
-  isValidatable,
-  Json,
-  JsonValue,
-  Key,
-  List,
-  PageList,
-  Repository,
-  toJson,
-} from '../types';
+import { asList, Constructor, Exception, FetchOptions, Gateway, Id, isValidatable, Json, JsonValue, Key, List, PageList, Repository, toJson } from '../types';
 import { when } from '../validation';
 import { reject, resolve } from '../utils';
 import { Struct } from './Struct';
@@ -29,7 +13,7 @@ export class Repo<T extends Struct, Options = FetchOptions> extends Repository<T
   create = (item: T | Json): T => (isValidatable(item) ? item : new this.ctor(item));
 
   all(options?: Options): Promise<PageList<T>> {
-    return this.gateway.all(options).then(js => asPageList(this.ctor, js));
+    return this.gateway.all(options).then(js => js.map(i => new this.ctor(i)));
   }
 
   byId(id: Id): Promise<T> {
@@ -44,19 +28,19 @@ export class Repo<T extends Struct, Options = FetchOptions> extends Repository<T
   }
 
   byKey(key: Key, options?: Options): Promise<PageList<T>> {
-    return this.gateway.by('key', key, options).then(js => asPageList(this.ctor, js));
+    return this.gateway.by('key', key, options).then(js => js.map(i => new this.ctor(i)));
   }
 
   by(key: keyof T, value: JsonValue, options?: Options): Promise<PageList<T>> {
-    return this.gateway.by(key.toString(), value, options).then(js => asPageList(this.ctor, js));
+    return this.gateway.by(key.toString(), value, options).then(js => js.map(i => new this.ctor(i)));
   }
 
   search(q: JsonValue, options?: Options): Promise<PageList<T>> {
-    return this.gateway.search(q, options).then(js => asPageList(this.ctor, js));
+    return this.gateway.search(q, options).then(js => js.map(i => new this.ctor(i)));
   }
 
   filter(options?: Options): Promise<PageList<T>> {
-    return this.gateway.filter(options).then(js => asPageList(this.ctor, js));
+    return this.gateway.filter(options).then(js => js.map(i => new this.ctor(i)));
   }
 
   exists(id: Id): Promise<boolean> {

package/src/domain/Typo.ts

@@ -1,4 +1,4 @@
-import { Exception, FetchOptions, Gateway, Id, Json, JsonValue, Key, List, PageList, Repository, toList, toPageList } from '../types';
+import { Exception, FetchOptions, Gateway, Id, Json, JsonValue, Key, List, PageList, Repository } from '../types';
 import { when } from '../validation';
 import { View } from '../utils';
 
@@ -10,7 +10,7 @@ export class Typo<T, Options = FetchOptions> extends Repository<T, Options> {
   create = (j: Json): T => this.view.from(j);
 
   all(options?: Options): Promise<PageList<T>> {
-    return this.gateway.all(options).then(js => toPageList(js.map(j => this.create(j))));
+    return this.gateway.all(options).then(js => js.map(this.create));
   }
 
   byId(id: Id): Promise<T> {
@@ -21,23 +21,23 @@ export class Typo<T, Options = FetchOptions> extends Repository<T, Options> {
   }
 
   byIds(...ids: Id[]): Promise<List<T>> {
-    return this.gateway.byIds(...ids).then(js => toList(js.map(j => this.create(j))));
+    return this.gateway.byIds(...ids).then(js => js.map(this.create));
   }
 
   byKey(key: Key, options?: Options): Promise<PageList<T>> {
-    return this.gateway.by('key', key, options).then(js => toPageList(js.map(j => this.create(j))));
+    return this.gateway.by('key', key, options).then(js => js.map(this.create));
   }
 
   by(key: keyof T, value: JsonValue, options?: Options): Promise<PageList<T>> {
-    return this.gateway.by(key.toString(), value, options).then(js => toPageList(js.map(j => this.create(j))));
+    return this.gateway.by(key.toString(), value, options).then(js => js.map(this.create));
   }
 
   search(q: JsonValue, options?: Options): Promise<PageList<T>> {
-    return this.gateway.search(q, options).then(js => toPageList(js.map(j => this.create(j))));
+    return this.gateway.search(q, options).then(js => js.map(this.create));
   }
 
   filter(options?: Options): Promise<PageList<T>> {
-    return this.gateway.filter(options).then(js => toPageList(js.map(j => this.create(j))));
+    return this.gateway.filter(options).then(js => js.map(j => this.create(j)));
   }
 
   exists(id: Id): Promise<boolean> {

package/src/process/Search.ts

@@ -1,4 +1,4 @@
-import { choose, FetchOptions, Id, JsonValue, Key, PageList, Repository, toList } from '../types';
+import { choose, FetchOptions, Id, JsonValue, Key, List, PageList, Repository, toPageList } from '../types';
 import { resolve } from '../utils';
 import { Req } from '../resources';
 
@@ -9,7 +9,7 @@ export class Search<T, Options = FetchOptions> {
 
   byId = (id: Id): Promise<T> => this.repo.byId(id);
 
-  byIds = (...ids: Id[]): Promise<PageList<T>> => this.repo.byIds(...ids);
+  byIds = (...ids: Id[]): Promise<List<T>> => this.repo.byIds(...ids);
 
   byKey = (key: Key, options?: Options): Promise<PageList<T>> => this.repo.byKey(key, options);
 
@@ -21,7 +21,7 @@ export class Search<T, Options = FetchOptions> {
         q => q,
         q => this.repo.search(q, options)
       )
-      .else(() => resolve(toList<T>()));
+      .else(() => resolve(toPageList<T>()));
 
   filter = (options?: Options): Promise<PageList<T>> => this.repo.filter(options);
 

package/src/services/MappedRouteGateway.ts

@@ -1,30 +1,30 @@
-import {Api} from './Api';
-import {Func, Json, List, Optional, Uri} from '../types';
-import {Mapper} from '../utils';
-import {RouteGateway} from './RouteGateway';
-import {RequestOptions} from '../http';
+import { Api } from './Api';
+import { Func, Json, Optional, PageList, Uri } from '../types';
+import { Mapper } from '../utils';
+import { RouteGateway } from './RouteGateway';
+import { RequestOptions } from '../http';
 
 export class MappedRouteGateway extends RouteGateway {
-    constructor(readonly route: Func<Uri>, readonly routeId: Func<Uri>, readonly map = new Mapper(), readonly api: Api = new Api()) {
-        super(route, routeId, api);
-    }
+  constructor(readonly route: Func<Uri>, readonly routeId: Func<Uri>, readonly map = new Mapper(), readonly api: Api = new Api()) {
+    super(route, routeId, api);
+  }
 
-    get(uri: Uri, options?: RequestOptions): Promise<List<Json>> {
-        return super.get(uri, options).then(is => is.map(i => this.map.in(i)));
-    }
+  get(uri: Uri, options?: RequestOptions): Promise<PageList<Json>> {
+    return super.get(uri, options).then(is => is.map(i => this.map.in(i)));
+  }
 
-    getOne(uri: Uri, options?: RequestOptions): Promise<Optional<Json>> {
-        return super
-            .get(uri, options)
-            .then(is => is.first())
-            .then(i => this.map.in(i));
-    }
+  getOne(uri: Uri, options?: RequestOptions): Promise<Optional<Json>> {
+    return super
+      .get(uri, options)
+      .then(is => is.first())
+      .then(i => this.map.in(i));
+  }
 
-    add(item: Json): Promise<Json> {
-        return super.add(this.map.out(item));
-    }
+  add(item: Json): Promise<Json> {
+    return super.add(this.map.out(item));
+  }
 
-    update(item: Json): Promise<Json> {
-        return super.update(this.map.out(item));
-    }
+  update(item: Json): Promise<Json> {
+    return super.update(this.map.out(item));
+  }
 }

package/src/services/RouteGateway.ts

@@ -1,48 +1,48 @@
-import {Api, RouteOptions} from './Api';
-import {Func, Id, Json, JsonValue, Optional, PageList, Uri} from '../types';
-import {HttpStatus} from '../http';
-import {ApiGateway} from './ApiGateway';
+import { Api, RouteOptions } from './Api';
+import { Func, Id, Json, JsonValue, Optional, PageList, Uri } from '../types';
+import { HttpStatus } from '../http';
+import { ApiGateway } from './ApiGateway';
 
 export class RouteGateway extends ApiGateway {
-    constructor(readonly route: Func<Uri>, readonly routeId: Func<Uri>, readonly api: Api = new Api()) {
-        super(api);
-    }
-
-    all(options?: RouteOptions): Promise<PageList<Json>> {
-        return this.get(this.route(), options);
-    }
-
-    byId(id: Id, options?: RouteOptions): Promise<Optional<Json>> {
-        return this.getOne(this.routeId().id(id));
-    }
-
-    search(q: JsonValue, options?: RouteOptions): Promise<PageList<Json>> {
-        return this.get(this.route().query(q), options);
-    }
-
-    exists(id: Id, options?: RouteOptions): Promise<boolean> {
-        return this.get(this.routeId().id(id))
-            .then(r => r.length === 1)
-            .catch(r => (HttpStatus.NotFound.equals(r.status) ? false : Promise.reject(r)));
-    }
-
-    add(item: Json, options?: RouteOptions): Promise<Json> {
-        return this.post(this.route(), item, options);
-    }
-
-    filter(options?: RouteOptions): Promise<PageList<Json>> {
-        return this.postSearch(this.route(), options);
-    }
-
-    update(item: Json, options?: RouteOptions): Promise<Json> {
-        return this.patch(this.routeId().id(item.id), item, options);
-    }
-
-    upsert(item: Json, options?: RouteOptions): Promise<Json> {
-        return this.put(this.routeId().id(item.id), item, options);
-    }
-
-    remove(id: Id, options?: RouteOptions): Promise<boolean> {
-        return this.delete(this.routeId().id(id), options);
-    }
+  constructor(readonly route: Func<Uri>, readonly routeId: Func<Uri>, readonly api: Api = new Api()) {
+    super(api);
+  }
+
+  all(options?: RouteOptions): Promise<PageList<Json>> {
+    return this.get(this.route(), options);
+  }
+
+  byId(id: Id, options?: RouteOptions): Promise<Optional<Json>> {
+    return this.getOne(this.routeId().id(id));
+  }
+
+  search(q: JsonValue, options?: RouteOptions): Promise<PageList<Json>> {
+    return this.get(this.route().query(q), options);
+  }
+
+  exists(id: Id, options?: RouteOptions): Promise<boolean> {
+    return this.get(this.routeId().id(id))
+      .then(r => r.length === 1)
+      .catch(r => (HttpStatus.NotFound.equals(r.status) ? false : Promise.reject(r)));
+  }
+
+  add(item: Json, options?: RouteOptions): Promise<Json> {
+    return this.post(this.route(), item, options);
+  }
+
+  filter(options?: RouteOptions): Promise<PageList<Json>> {
+    return this.postSearch(this.route(), options);
+  }
+
+  update(item: Json, options?: RouteOptions): Promise<Json> {
+    return this.patch(this.routeId().id(item.id), item, options);
+  }
+
+  upsert(item: Json, options?: RouteOptions): Promise<Json> {
+    return this.put(this.routeId().id(item.id), item, options);
+  }
+
+  remove(id: Id, options?: RouteOptions): Promise<boolean> {
+    return this.delete(this.routeId().id(id), options);
+  }
 }

package/src/services/ViewRouteGateway.ts

@@ -1,38 +1,38 @@
-import {Api} from './Api';
-import {Func, Json, List, Optional, Uri} from '../types';
-import {view} from '../utils';
-import {RouteGateway} from './RouteGateway';
-import {RequestOptions} from '../http';
+import { Api } from './Api';
+import { Func, Json, Optional, PageList, Uri } from '../types';
+import { view } from '../utils';
+import { RouteGateway } from './RouteGateway';
+import { RequestOptions } from '../http';
 
 export class ViewRouteGateway extends RouteGateway {
-    constructor(
-        readonly route: Func<Uri>,
-        readonly routeId: Func<Uri>,
-        readonly views = {
-            in: view({}).fromSource,
-            out: view({}).fromSource,
-        },
-        readonly api: Api = new Api()
-    ) {
-        super(route, routeId, api);
-    }
+  constructor(
+    readonly route: Func<Uri>,
+    readonly routeId: Func<Uri>,
+    readonly views = {
+      in: view({}).fromSource,
+      out: view({}).fromSource,
+    },
+    readonly api: Api = new Api()
+  ) {
+    super(route, routeId, api);
+  }
 
-    get(uri: Uri, options?: RequestOptions): Promise<List<Json>> {
-        return super.get(uri, options).then(is => is.map(i => this.views.in.from(i)));
-    }
+  get(uri: Uri, options?: RequestOptions): Promise<PageList<Json>> {
+    return super.get(uri, options).then(is => is.map(i => this.views.in.from(i)));
+  }
 
-    getOne(uri: Uri, options?: RequestOptions): Promise<Optional<Json>> {
-        return super
-            .get(uri, options)
-            .then(is => is.first())
-            .then(i => this.views.in.from(i));
-    }
+  getOne(uri: Uri, options?: RequestOptions): Promise<Optional<Json>> {
+    return super
+      .get(uri, options)
+      .then(is => is.first())
+      .then(i => this.views.in.from(i));
+  }
 
-    add(item: Json): Promise<Json> {
-        return super.add(this.views.out.from(item));
-    }
+  add(item: Json): Promise<Json> {
+    return super.add(this.views.out.from(item));
+  }
 
-    update(item: Json): Promise<Json> {
-        return super.update(this.views.out.from(item));
-    }
+  update(item: Json): Promise<Json> {
+    return super.update(this.views.out.from(item));
+  }
 }