@thisisagile/easy-mongo 7.34.30 → 7.36.0
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 +3 -1
- package/dist/MongoProvider.js +17 -5
- package/dist/MongoProvider.js.map +1 -1
- package/package.json +5 -5
- package/src/MongoProvider.ts +20 -5
package/dist/MongoProvider.d.ts
CHANGED
|
@@ -9,7 +9,9 @@ export declare class MongoProvider {
|
|
|
9
9
|
readonly coll: Collection;
|
|
10
10
|
private client?;
|
|
11
11
|
constructor(coll: Collection, client?: Promise<MongoClient> | undefined);
|
|
12
|
-
|
|
12
|
+
cluster(): Promise<MongoClient>;
|
|
13
|
+
reconnect(client: MongoClient): Promise<MongoClient>;
|
|
14
|
+
static connect(db: Database): Promise<MongoClient>;
|
|
13
15
|
find(query: Condition | LogicalCondition | FilterQuery<any>, options?: FindOptions): Promise<List<Json>>;
|
|
14
16
|
all(options?: FindOptions): Promise<List<Json>>;
|
|
15
17
|
byId(id: Id): Promise<Json>;
|
package/dist/MongoProvider.js
CHANGED
|
@@ -14,7 +14,19 @@ class MongoProvider {
|
|
|
14
14
|
this.coll = coll;
|
|
15
15
|
this.client = client;
|
|
16
16
|
}
|
|
17
|
-
|
|
17
|
+
cluster() {
|
|
18
|
+
return Promise.resolve()
|
|
19
|
+
.then(() => this.client ?? (this.client = MongoProvider.connect(this.coll.db)))
|
|
20
|
+
.catch(e => {
|
|
21
|
+
this.client = undefined;
|
|
22
|
+
return (0, easy_1.reject)(e);
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
reconnect(client) {
|
|
26
|
+
this.client = client.isConnected() ? Promise.resolve(client) : undefined;
|
|
27
|
+
return this.cluster();
|
|
28
|
+
}
|
|
29
|
+
static connect(db) {
|
|
18
30
|
return (0, easy_1.when)(db.options?.cluster)
|
|
19
31
|
.not.isDefined.reject(new easy_1.Exception('Missing cluster in database options.'))
|
|
20
32
|
.then(u => new mongodb_1.MongoClient(u, {
|
|
@@ -62,21 +74,21 @@ class MongoProvider {
|
|
|
62
74
|
.then(d => d.result.ok === 1);
|
|
63
75
|
}
|
|
64
76
|
count(query) {
|
|
65
|
-
return this.collection().then(c => c.countDocuments(query));
|
|
77
|
+
return this.collection().then(c => c.countDocuments((0, Utils_1.toMongoType)((0, easy_1.asJson)(query))));
|
|
66
78
|
}
|
|
67
79
|
createIndex(field, unique = true) {
|
|
68
80
|
return this.collection().then(c => c.createIndex(field, { unique, writeConcern: { w: 1 } }));
|
|
69
81
|
}
|
|
70
82
|
createPartialIndex(field, filter, unique = true) {
|
|
71
|
-
return this.collection().then(c => c.createIndex(field, { partialFilterExpression: (0, easy_1.asJson)(filter), unique, writeConcern: { w: 1 } }));
|
|
83
|
+
return this.collection().then(c => c.createIndex(field, { partialFilterExpression: (0, Utils_1.toMongoType)((0, easy_1.asJson)(filter)), unique, writeConcern: { w: 1 } }));
|
|
72
84
|
}
|
|
73
85
|
createTextIndexes(...fields) {
|
|
74
86
|
const indexes = fields.reduce((i, f) => ({ ...i, [f.property]: 'text' }), {});
|
|
75
87
|
return this.collection().then(c => c.createIndex(indexes));
|
|
76
88
|
}
|
|
77
89
|
collection() {
|
|
78
|
-
return
|
|
79
|
-
.then(
|
|
90
|
+
return this.cluster()
|
|
91
|
+
.then(c => this.reconnect(c))
|
|
80
92
|
.then(c => c.db(this.coll.db.name))
|
|
81
93
|
.then(db => db.collection((0, easy_1.asString)(this.coll)));
|
|
82
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MongoProvider.js","sourceRoot":"","sources":["../src/MongoProvider.ts"],"names":[],"mappings":";;;AAAA,
|
|
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": "7.
|
|
3
|
+
"version": "7.36.0",
|
|
4
4
|
"description": "Add support for MongoDB",
|
|
5
5
|
"author": "Sander Hoogendoorn",
|
|
6
6
|
"license": "MIT",
|
|
@@ -31,11 +31,11 @@
|
|
|
31
31
|
"access": "public"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@thisisagile/easy-test": "7.
|
|
34
|
+
"@thisisagile/easy-test": "7.36.0"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@thisisagile/easy": "7.
|
|
38
|
-
"@types/mongodb": "^3.6.
|
|
39
|
-
"mongodb": "^3.
|
|
37
|
+
"@thisisagile/easy": "7.36.0",
|
|
38
|
+
"@types/mongodb": "^3.6.20",
|
|
39
|
+
"mongodb": "^3.7.3"
|
|
40
40
|
}
|
|
41
41
|
}
|
package/src/MongoProvider.ts
CHANGED
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
JsonValue,
|
|
12
12
|
List,
|
|
13
13
|
LogicalCondition,
|
|
14
|
+
reject,
|
|
14
15
|
toList,
|
|
15
16
|
when,
|
|
16
17
|
} from '@thisisagile/easy';
|
|
@@ -31,7 +32,21 @@ export type FindOptions = {
|
|
|
31
32
|
export class MongoProvider {
|
|
32
33
|
constructor(readonly coll: Collection, private client?: Promise<MongoClient>) {}
|
|
33
34
|
|
|
34
|
-
|
|
35
|
+
cluster(): Promise<MongoClient> {
|
|
36
|
+
return Promise.resolve()
|
|
37
|
+
.then(() => this.client ?? (this.client = MongoProvider.connect(this.coll.db)))
|
|
38
|
+
.catch(e => {
|
|
39
|
+
this.client = undefined;
|
|
40
|
+
return reject(e);
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
reconnect(client: MongoClient): Promise<MongoClient> {
|
|
45
|
+
this.client = client.isConnected() ? Promise.resolve(client) : undefined;
|
|
46
|
+
return this.cluster();
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
static connect(db: Database): Promise<MongoClient> {
|
|
35
50
|
return when(db.options?.cluster)
|
|
36
51
|
.not.isDefined.reject(new Exception('Missing cluster in database options.'))
|
|
37
52
|
.then(u =>
|
|
@@ -90,7 +105,7 @@ export class MongoProvider {
|
|
|
90
105
|
}
|
|
91
106
|
|
|
92
107
|
count(query?: Condition | LogicalCondition | FilterQuery<any>): Promise<number> {
|
|
93
|
-
return this.collection().then(c => c.countDocuments(query));
|
|
108
|
+
return this.collection().then(c => c.countDocuments(toMongoType(asJson(query))));
|
|
94
109
|
}
|
|
95
110
|
|
|
96
111
|
createIndex(field: string | any, unique = true): Promise<string> {
|
|
@@ -98,7 +113,7 @@ export class MongoProvider {
|
|
|
98
113
|
}
|
|
99
114
|
|
|
100
115
|
createPartialIndex(field: string | any, filter: Condition | LogicalCondition | FilterQuery<any>, unique = true): Promise<string> {
|
|
101
|
-
return this.collection().then(c => c.createIndex(field, { partialFilterExpression: asJson(filter), unique, writeConcern: { w: 1 } }));
|
|
116
|
+
return this.collection().then(c => c.createIndex(field, { partialFilterExpression: toMongoType(asJson(filter)), unique, writeConcern: { w: 1 } }));
|
|
102
117
|
}
|
|
103
118
|
|
|
104
119
|
createTextIndexes(...fields: Field[]): Promise<string> {
|
|
@@ -107,8 +122,8 @@ export class MongoProvider {
|
|
|
107
122
|
}
|
|
108
123
|
|
|
109
124
|
collection(): Promise<MongoCollection> {
|
|
110
|
-
return
|
|
111
|
-
.then(
|
|
125
|
+
return this.cluster()
|
|
126
|
+
.then(c => this.reconnect(c))
|
|
112
127
|
.then(c => c.db(this.coll.db.name))
|
|
113
128
|
.then(db => db.collection(asString(this.coll)));
|
|
114
129
|
}
|