@thisisagile/easy-mongo 10.11.2 → 10.11.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  import { MongoProvider } from './MongoProvider';
2
- import { Condition, Gateway, Id, Json, JsonValue, LogicalCondition, PageList, PageOptions } from '@thisisagile/easy';
2
+ import { Condition, Gateway, Id, Json, JsonValue, List, LogicalCondition, PageList, PageOptions } from '@thisisagile/easy';
3
3
  import { Collection } from './Collection';
4
4
  export declare class MongoGateway implements Gateway {
5
5
  readonly collection: Collection;
@@ -8,7 +8,7 @@ export declare class MongoGateway implements Gateway {
8
8
  all(options?: PageOptions): Promise<PageList<Json>>;
9
9
  byId(id: Id): Promise<Json | undefined>;
10
10
  by(key: string, value: JsonValue, options?: PageOptions): Promise<PageList<Json>>;
11
- byIds(...ids: Id[]): Promise<PageList<Json>>;
11
+ byIds(...ids: Id[]): Promise<List<Json>>;
12
12
  find(q: JsonValue | Condition | LogicalCondition, options?: PageOptions): Promise<PageList<Json>>;
13
13
  search(q: JsonValue, options?: PageOptions): Promise<PageList<Json>>;
14
14
  exists(id: Id): Promise<boolean>;
@@ -8,19 +8,19 @@ class MongoGateway {
8
8
  this.provider = provider;
9
9
  }
10
10
  all(options) {
11
- return this.provider.all(options).then(pl => (0, easy_1.toPageList)(pl.map(j => this.collection.in(j)), pl));
11
+ return this.provider.all(options).then(js => (0, easy_1.asPageList)(j => this.collection.in(j), js));
12
12
  }
13
13
  byId(id) {
14
14
  return this.provider.byId(id).then(j => (0, easy_1.ifDefined)(j, this.collection.in(j)));
15
15
  }
16
16
  by(key, value, options) {
17
- return this.provider.by(key, value, options).then(pl => (0, easy_1.toPageList)(pl.map(j => this.collection.in(j)), pl));
17
+ return this.provider.by(key, value, options).then(js => (0, easy_1.asPageList)(j => this.collection.in(j), js));
18
18
  }
19
19
  byIds(...ids) {
20
20
  return this.find(this.collection.id.isIn(...ids));
21
21
  }
22
22
  find(q, options) {
23
- return this.provider.find((0, easy_1.asJson)(q), options).then(pl => (0, easy_1.toPageList)(pl.map(j => this.collection.in(j)), pl));
23
+ return this.provider.find((0, easy_1.asJson)(q), options).then(js => (0, easy_1.asPageList)(j => this.collection.in(j), js));
24
24
  }
25
25
  search(q, options) {
26
26
  return this.find(this.collection.google(q), options);
@@ -1 +1 @@
1
- {"version":3,"file":"MongoGateway.js","sourceRoot":"","sources":["../src/MongoGateway.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MongoGateway.js","sourceRoot":"","sources":["../src/MongoGateway.ts"],"names":[],"mappings":";;;AACA,4CAe2B;AAG3B,MAAa,YAAY;IACvB,YAAqB,UAAsB,EAAW,WAA0B,UAAU,CAAC,QAAQ;QAA9E,eAAU,GAAV,UAAU,CAAY;QAAW,aAAQ,GAAR,QAAQ,CAAqC;IACnG,CAAC;IAED,GAAG,CAAC,OAAqB;QACvB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,iBAAU,EAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CACtF,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,EAAM;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,gBAAS,EAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,EAAE,CAAC,GAAW,EAAE,KAAgB,EAAE,OAAqB;QACrD,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,iBAAU,EAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IACtG,CAAC;IAED,KAAK,CAAC,GAAG,GAAS;QAChB,OAAO,IAAI,CAAC,IAAI,CAAE,IAAI,CAAC,UAAU,CAAC,EAAY,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,IAAI,CAAC,CAA2C,EAAE,OAAqB;QACrE,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAA,aAAM,EAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,iBAAU,EAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAClG,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,CAAY,EAAE,OAAqB;QACxC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,CAAC,EAAM;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,gBAAS,EAAC,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACvF,CAAC;IAED,MAAM,CAAC,IAAU;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1F,CAAC;IAED,MAAM,CAAC,EAAM;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;CACF;AA7CD,oCA6CC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@thisisagile/easy-mongo",
3
- "version": "10.11.2",
3
+ "version": "10.11.5",
4
4
  "description": "Add support for MongoDB",
5
5
  "author": "Sander Hoogendoorn",
6
6
  "license": "MIT",
@@ -31,10 +31,10 @@
31
31
  "access": "public"
32
32
  },
33
33
  "devDependencies": {
34
- "@thisisagile/easy-test": "10.11.2"
34
+ "@thisisagile/easy-test": "10.11.5"
35
35
  },
36
36
  "dependencies": {
37
- "@thisisagile/easy": "10.11.2",
37
+ "@thisisagile/easy": "10.11.5",
38
38
  "mongodb": "^4.5.0"
39
39
  }
40
40
  }
@@ -1,6 +1,7 @@
1
1
  import { MongoProvider } from './MongoProvider';
2
2
  import {
3
3
  asJson,
4
+ asPageList,
4
5
  Condition,
5
6
  Field,
6
7
  Gateway,
@@ -9,10 +10,10 @@ import {
9
10
  isDefined,
10
11
  Json,
11
12
  JsonValue,
13
+ List,
12
14
  LogicalCondition,
13
15
  PageList,
14
16
  PageOptions,
15
- toPageList,
16
17
  } from '@thisisagile/easy';
17
18
  import { Collection } from './Collection';
18
19
 
@@ -21,7 +22,7 @@ export class MongoGateway implements Gateway {
21
22
  }
22
23
 
23
24
  all(options?: PageOptions): Promise<PageList<Json>> {
24
- return this.provider.all(options).then(pl => toPageList(pl.map(j => this.collection.in(j)), pl),
25
+ return this.provider.all(options).then(js => asPageList(j => this.collection.in(j), js),
25
26
  );
26
27
  }
27
28
 
@@ -30,20 +31,15 @@ export class MongoGateway implements Gateway {
30
31
  }
31
32
 
32
33
  by(key: string, value: JsonValue, options?: PageOptions): Promise<PageList<Json>> {
33
- return this.provider.by(key, value, options).then(pl =>
34
- toPageList(
35
- pl.map(j => this.collection.in(j)),
36
- pl,
37
- ),
38
- );
34
+ return this.provider.by(key, value, options).then(js => asPageList(j => this.collection.in(j), js));
39
35
  }
40
36
 
41
- byIds(...ids: Id[]): Promise<PageList<Json>> {
37
+ byIds(...ids: Id[]): Promise<List<Json>> {
42
38
  return this.find((this.collection.id as Field).isIn(...ids));
43
39
  }
44
40
 
45
41
  find(q: JsonValue | Condition | LogicalCondition, options?: PageOptions): Promise<PageList<Json>> {
46
- return this.provider.find(asJson(q), options).then(pl => toPageList(pl.map(j => this.collection.in(j)), pl),
42
+ return this.provider.find(asJson(q), options).then(js => asPageList(j => this.collection.in(j), js),
47
43
  );
48
44
  }
49
45