@thisisagile/easy 12.19.15 → 12.21.0

package/dist/sql/TableGateway.d.ts

@@ -1,14 +1,18 @@
-import { Gateway, Id, Json, List } from '../types';
+import { Gateway, Id, Json, List, PageOptions } from '../types';
 import { QueryProvider } from '../data';
 import { Table } from './Table';
-export declare class TableGateway<T extends Table> extends Gateway {
+export declare type TableOptions = PageOptions & {
+    provider?: QueryProvider;
+};
+export declare class TableGateway<T extends Table> extends Gateway<PageOptions> {
     readonly table: T;
     readonly provider: QueryProvider;
     constructor(table: T, provider?: QueryProvider);
-    all(): Promise<List<Json>>;
-    byId(id: Id): Promise<Json | undefined>;
-    exists(id: Id): Promise<boolean>;
-    add(item: Json): Promise<Json>;
-    remove(id: Id): Promise<boolean>;
-    update(item: Json): Promise<Json>;
+    protected provide: ({ provider }?: TableOptions) => QueryProvider;
+    all(options?: TableOptions): Promise<List<Json>>;
+    byId(id: Id, options?: TableOptions): Promise<Json | undefined>;
+    exists(id: Id, options?: TableOptions): Promise<boolean>;
+    add(item: Json, options?: TableOptions): Promise<Json>;
+    remove(id: Id, options?: TableOptions): Promise<boolean>;
+    update(item: Json, options?: TableOptions): Promise<Json>;
 }

package/dist/sql/TableGateway.js

@@ -9,30 +9,35 @@ class TableGateway extends types_1.Gateway {
         super();
         this.table = table;
         this.provider = provider;
+        this.provide = ({ provider } = {}) => provider ?? this.provider;
     }
-    all() {
-        return this.provider.query(this.table.select()).then(js => js.map(j => this.table.in(j)));
+    all(options) {
+        return this.provide(options)
+            .query(this.table.select())
+            .then(js => js.map(j => this.table.in(j)));
     }
-    byId(id) {
-        return this.provider
+    byId(id, options) {
+        return this.provide(options)
             .query(this.table.select().where(this.table.id.is(id)))
             .then(js => js.first())
             .then(j => (0, utils_1.ifDefined)(j, this.table.in(j)));
     }
-    exists(id) {
+    exists(id, options) {
         return this.byId(id).then(j => (0, types_1.isDefined)(j));
     }
-    add(item) {
-        return this.provider
+    add(item, options) {
+        return this.provide(options)
             .query(this.table.insert(item))
             .then(js => (0, validation_1.when)(js.first()).not.isDefined.reject(`Could not add items with id ${item.id}`))
             .then(j => this.table.in(j));
     }
-    remove(id) {
-        return this.provider.command(this.table.delete().where(this.table.id.is(id))).then(() => true);
+    remove(id, options) {
+        return this.provide(options)
+            .command(this.table.delete().where(this.table.id.is(id)))
+            .then(() => true);
     }
-    update(item) {
-        return this.provider
+    update(item, options) {
+        return this.provide(options)
             .query(this.table.update(item).where(this.table.id.is(item.id)))
             .then(js => (0, validation_1.when)(js.first()).not.isDefined.reject(`Could not update item with id ${item.id}`))
             .then(j => this.table.in(j));

package/dist/sql/TableGateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableGateway.js","sourceRoot":"","sources":["../../src/sql/TableGateway.ts"],"names":[],"mappings":";;;AAAA,oCAA8D;AAE9D,8CAAqC;AACrC,oCAAqC;AAGrC,MAAa,YAA8B,SAAQ,eAAO;IACxD,YAAqB,KAAQ,EAAW,WAAW,KAAK,CAAC,EAAE,CAAC,OAAO,EAAiB;QAClF,KAAK,EAAE,CAAC;QADW,UAAK,GAAL,KAAK,CAAG;QAAW,aAAQ,GAAR,QAAQ,CAAoC;IAEpF,CAAC;IAED,GAAG;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5F,CAAC;IAED,IAAI,CAAC,EAAM;QACT,OAAO,IAAI,CAAC,QAAQ;aACjB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;aACtD,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;aACtB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,CAAC,EAAM;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,OAAO,IAAI,CAAC,QAAQ;aACjB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAC9B,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,iBAAI,EAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,+BAA+B,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;aAC3F,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,EAAM;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACjG,CAAC;IAED,MAAM,CAAC,IAAU;QACf,OAAO,IAAI,CAAC,QAAQ;aACjB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;aAC/D,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,iBAAI,EAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,iCAAiC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;aAC7F,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;CACF;AArCD,oCAqCC"}
+{"version":3,"file":"TableGateway.js","sourceRoot":"","sources":["../../src/sql/TableGateway.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/sql/TableGateway.ts

@@ -1,42 +1,50 @@
-import { Gateway, Id, isDefined, Json, List } from '../types';
+import { Gateway, Id, isDefined, Json, List, PageOptions } from '../types';
 import { QueryProvider } from '../data';
 import { when } from '../validation';
 import { ifDefined } from '../utils';
 import { Table } from './Table';
 
-export class TableGateway<T extends Table> extends Gateway {
+export type TableOptions = PageOptions & { provider?: QueryProvider };
+
+export class TableGateway<T extends Table> extends Gateway<PageOptions> {
   constructor(readonly table: T, readonly provider = table.db.provide<QueryProvider>()) {
     super();
   }
 
-  all(): Promise<List<Json>> {
-    return this.provider.query(this.table.select()).then(js => js.map(j => this.table.in(j)));
+  protected provide = ({ provider }: TableOptions = {}): QueryProvider => provider ?? this.provider;
+
+  all(options?: TableOptions): Promise<List<Json>> {
+    return this.provide(options)
+      .query(this.table.select())
+      .then(js => js.map(j => this.table.in(j)));
   }
 
-  byId(id: Id): Promise<Json | undefined> {
-    return this.provider
+  byId(id: Id, options?: TableOptions): Promise<Json | undefined> {
+    return this.provide(options)
       .query(this.table.select().where(this.table.id.is(id)))
       .then(js => js.first())
       .then(j => ifDefined(j, this.table.in(j)));
   }
 
-  exists(id: Id): Promise<boolean> {
+  exists(id: Id, options?: TableOptions): Promise<boolean> {
     return this.byId(id).then(j => isDefined(j));
   }
 
-  add(item: Json): Promise<Json> {
-    return this.provider
+  add(item: Json, options?: TableOptions): Promise<Json> {
+    return this.provide(options)
       .query(this.table.insert(item))
       .then(js => when(js.first()).not.isDefined.reject(`Could not add items with id ${item.id}`))
       .then(j => this.table.in(j));
   }
 
-  remove(id: Id): Promise<boolean> {
-    return this.provider.command(this.table.delete().where(this.table.id.is(id))).then(() => true);
+  remove(id: Id, options?: TableOptions): Promise<boolean> {
+    return this.provide(options)
+      .command(this.table.delete().where(this.table.id.is(id)))
+      .then(() => true);
   }
 
-  update(item: Json): Promise<Json> {
-    return this.provider
+  update(item: Json, options?: TableOptions): Promise<Json> {
+    return this.provide(options)
       .query(this.table.update(item).where(this.table.id.is(item.id)))
       .then(js => when(js.first()).not.isDefined.reject(`Could not update item with id ${item.id}`))
       .then(j => this.table.in(j));