@thisisagile/easy-mongo 8.6.2 → 8.10.1
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.
package/dist/MongoProvider.d.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Condition, Database, Field, Id, Json, JsonValue, List, LogicalCondition } from '@thisisagile/easy';
|
|
2
|
-
import { Collection as MongoCollection, FilterQuery, MongoClient } from 'mongodb';
|
|
2
|
+
import { Collection as MongoCollection, FilterQuery as MongoFilterQuery, MongoClient } from 'mongodb';
|
|
3
3
|
import { Collection } from './Collection';
|
|
4
4
|
export declare type FindOptions = {
|
|
5
5
|
limit?: number;
|
|
6
6
|
skip?: number;
|
|
7
7
|
};
|
|
8
|
+
export declare type FilterQuery<T> = MongoFilterQuery<T>;
|
|
8
9
|
export declare class MongoProvider {
|
|
9
10
|
readonly coll: Collection;
|
|
10
11
|
private client?;
|
|
@@ -12,6 +13,7 @@ export declare class MongoProvider {
|
|
|
12
13
|
cluster(): Promise<MongoClient>;
|
|
13
14
|
reconnect(client: MongoClient): Promise<MongoClient>;
|
|
14
15
|
static connect(db: Database): Promise<MongoClient>;
|
|
16
|
+
toMongoJson(query: Condition | LogicalCondition | FilterQuery<any>): Json;
|
|
15
17
|
find(query: Condition | LogicalCondition | FilterQuery<any>, options?: FindOptions): Promise<List<Json>>;
|
|
16
18
|
all(options?: FindOptions): Promise<List<Json>>;
|
|
17
19
|
byId(id: Id): Promise<Json>;
|
package/dist/MongoProvider.js
CHANGED
|
@@ -36,9 +36,12 @@ class MongoProvider {
|
|
|
36
36
|
auth: { user: (0, easy_1.asString)(db.options?.user), password: (0, easy_1.asString)(db.options?.password) },
|
|
37
37
|
}).connect());
|
|
38
38
|
}
|
|
39
|
+
toMongoJson(query) {
|
|
40
|
+
return (0, Utils_1.toMongoType)((0, easy_1.asJson)(query));
|
|
41
|
+
}
|
|
39
42
|
find(query, options = { limit: 250 }) {
|
|
40
43
|
return this.collection()
|
|
41
|
-
.then(c => c.find(
|
|
44
|
+
.then(c => c.find(this.toMongoJson(query), { ...options, limit: options.limit ?? 250 }))
|
|
42
45
|
.then(res => res.toArray())
|
|
43
46
|
.then(res => res.map(i => omitId(i)))
|
|
44
47
|
.then(res => (0, easy_1.toList)(res));
|
|
@@ -48,7 +51,7 @@ class MongoProvider {
|
|
|
48
51
|
}
|
|
49
52
|
byId(id) {
|
|
50
53
|
return this.collection()
|
|
51
|
-
.then(c => c.findOne({ id: (0, easy_1.asString)(id) }))
|
|
54
|
+
.then(c => c.findOne(this.toMongoJson({ id: (0, easy_1.asString)(id) })))
|
|
52
55
|
.then(i => omitId(i));
|
|
53
56
|
}
|
|
54
57
|
by(key, value, options) {
|
|
@@ -56,7 +59,7 @@ class MongoProvider {
|
|
|
56
59
|
}
|
|
57
60
|
group(qs) {
|
|
58
61
|
return this.collection()
|
|
59
|
-
.then(c => c.aggregate(qs.map(q =>
|
|
62
|
+
.then(c => c.aggregate(qs.map(q => this.toMongoJson(q))))
|
|
60
63
|
.then(res => res.toArray());
|
|
61
64
|
}
|
|
62
65
|
add(o) {
|
|
@@ -66,16 +69,16 @@ class MongoProvider {
|
|
|
66
69
|
}
|
|
67
70
|
update(item) {
|
|
68
71
|
return this.collection()
|
|
69
|
-
.then(c => c.updateOne({ id: item.id }, { $set: omitId(item) }))
|
|
72
|
+
.then(c => c.updateOne(this.toMongoJson({ id: item.id }), { $set: omitId(item) }))
|
|
70
73
|
.then(() => this.byId(item.id));
|
|
71
74
|
}
|
|
72
75
|
remove(id) {
|
|
73
76
|
return this.collection()
|
|
74
|
-
.then(c => c.deleteOne({ id }))
|
|
77
|
+
.then(c => c.deleteOne(this.toMongoJson({ id })))
|
|
75
78
|
.then(d => d.result.ok === 1);
|
|
76
79
|
}
|
|
77
80
|
count(query) {
|
|
78
|
-
return this.collection().then(c => c.countDocuments(
|
|
81
|
+
return this.collection().then(c => c.countDocuments(this.toMongoJson(query ?? {})));
|
|
79
82
|
}
|
|
80
83
|
createIndex(field, unique = true) {
|
|
81
84
|
return this.collection().then(c => c.createIndex(field, { unique, writeConcern: { w: 1 } }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MongoProvider.js","sourceRoot":"","sources":["../src/MongoProvider.ts"],"names":[],"mappings":";;;AAAA,4CAgB2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"MongoProvider.js","sourceRoot":"","sources":["../src/MongoProvider.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy-mongo",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.10.1",
|
|
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": "8.
|
|
34
|
+
"@thisisagile/easy-test": "8.10.1"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@thisisagile/easy": "8.
|
|
37
|
+
"@thisisagile/easy": "8.10.1",
|
|
38
38
|
"@types/mongodb": "^3.6.20",
|
|
39
39
|
"mongodb": "^3.7.3"
|
|
40
40
|
}
|
package/src/MongoProvider.ts
CHANGED
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
toList,
|
|
16
16
|
when,
|
|
17
17
|
} from '@thisisagile/easy';
|
|
18
|
-
import { Collection as MongoCollection, FilterQuery, MongoClient } from 'mongodb';
|
|
18
|
+
import { Collection as MongoCollection, FilterQuery as MongoFilterQuery, MongoClient } from 'mongodb';
|
|
19
19
|
import { Collection } from './Collection';
|
|
20
20
|
import { toMongoType } from './Utils';
|
|
21
21
|
|
|
@@ -29,6 +29,8 @@ export type FindOptions = {
|
|
|
29
29
|
skip?: number;
|
|
30
30
|
};
|
|
31
31
|
|
|
32
|
+
export type FilterQuery<T> = MongoFilterQuery<T>;
|
|
33
|
+
|
|
32
34
|
export class MongoProvider {
|
|
33
35
|
constructor(readonly coll: Collection, private client?: Promise<MongoClient>) {}
|
|
34
36
|
|
|
@@ -58,9 +60,13 @@ export class MongoProvider {
|
|
|
58
60
|
);
|
|
59
61
|
}
|
|
60
62
|
|
|
61
|
-
|
|
63
|
+
toMongoJson(query: Condition | LogicalCondition | FilterQuery<any>): Json {
|
|
64
|
+
return toMongoType(asJson(query));
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
find( query: Condition | LogicalCondition | FilterQuery<any>, options: FindOptions = { limit: 250 }): Promise<List<Json>> {
|
|
62
68
|
return this.collection()
|
|
63
|
-
.then(c => c.find(
|
|
69
|
+
.then(c => c.find(this.toMongoJson(query), { ...options, limit: options.limit ?? 250 }))
|
|
64
70
|
.then(res => res.toArray())
|
|
65
71
|
.then(res => res.map(i => omitId(i)))
|
|
66
72
|
.then(res => toList(res));
|
|
@@ -72,7 +78,7 @@ export class MongoProvider {
|
|
|
72
78
|
|
|
73
79
|
byId(id: Id): Promise<Json> {
|
|
74
80
|
return this.collection()
|
|
75
|
-
.then(c => c.findOne({ id: asString(id) }))
|
|
81
|
+
.then(c => c.findOne(this.toMongoJson({ id: asString(id) })))
|
|
76
82
|
.then(i => omitId(i));
|
|
77
83
|
}
|
|
78
84
|
|
|
@@ -82,7 +88,7 @@ export class MongoProvider {
|
|
|
82
88
|
|
|
83
89
|
group(qs: FilterQuery<any>[]): Promise<Json[]> {
|
|
84
90
|
return this.collection()
|
|
85
|
-
.then(c => c.aggregate(qs.map(q =>
|
|
91
|
+
.then(c => c.aggregate(qs.map(q => this.toMongoJson(q))))
|
|
86
92
|
.then(res => res.toArray());
|
|
87
93
|
}
|
|
88
94
|
|
|
@@ -96,18 +102,18 @@ export class MongoProvider {
|
|
|
96
102
|
|
|
97
103
|
update(item: Json): Promise<Json> {
|
|
98
104
|
return this.collection()
|
|
99
|
-
.then(c => c.updateOne({ id: item.id }, { $set: omitId(item) }))
|
|
105
|
+
.then(c => c.updateOne(this.toMongoJson({ id: item.id }), { $set: omitId(item) }))
|
|
100
106
|
.then(() => this.byId(item.id as Id));
|
|
101
107
|
}
|
|
102
108
|
|
|
103
109
|
remove(id: Id): Promise<boolean> {
|
|
104
110
|
return this.collection()
|
|
105
|
-
.then(c => c.deleteOne({ id }))
|
|
111
|
+
.then(c => c.deleteOne(this.toMongoJson({ id })))
|
|
106
112
|
.then(d => d.result.ok === 1);
|
|
107
113
|
}
|
|
108
114
|
|
|
109
115
|
count(query?: Condition | LogicalCondition | FilterQuery<any>): Promise<number> {
|
|
110
|
-
return this.collection().then(c => c.countDocuments(
|
|
116
|
+
return this.collection().then(c => c.countDocuments(this.toMongoJson(query ?? {})));
|
|
111
117
|
}
|
|
112
118
|
|
|
113
119
|
createIndex(field: string | any, unique = true): Promise<string> {
|