@zakodium/adonis-mongodb 0.10.4 → 0.13.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/README.md +1 -1
- package/lib/adonis-typings/migration.d.ts +3 -2
- package/lib/adonis-typings/odm.d.ts +68 -2
- package/lib/commands/MongodbListMigrations.js +2 -2
- package/lib/commands/MongodbMakeMigration.js +2 -2
- package/lib/commands/MongodbMigrate.js +2 -2
- package/lib/commands/util/MigrationCommand.js +6 -6
- package/lib/commands/util/transformMigrations.js +3 -3
- package/lib/providers/MongodbProvider.js +2 -2
- package/lib/src/Auth/MongodbModelAuthProvider.d.ts +2 -2
- package/lib/src/Auth/MongodbModelAuthProvider.js +3 -4
- package/lib/src/Migration.js +35 -9
- package/lib/src/Model/Model.d.ts +17 -7
- package/lib/src/Model/Model.js +135 -61
- package/lib/src/Model/proxyHandler.d.ts +1 -4
- package/lib/src/Model/proxyHandler.js +6 -3
- package/package.json +15 -15
- package/src/Auth/MongodbModelAuthProvider.ts +3 -4
- package/src/Migration.ts +54 -10
- package/src/Model/Model.ts +177 -65
- package/src/Model/proxyHandler.ts +10 -5
package/lib/src/Model/Model.js
CHANGED
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.BaseAutoIncrementModel = exports.BaseModel = void 0;
|
|
7
|
+
const assert_1 = __importDefault(require("assert"));
|
|
7
8
|
const utils_1 = require("@poppinss/utils");
|
|
8
9
|
const lodash_1 = require("lodash");
|
|
9
10
|
const pluralize_1 = __importDefault(require("pluralize"));
|
|
@@ -16,25 +17,72 @@ function mergeDriverOptions(options) {
|
|
|
16
17
|
session: options.client,
|
|
17
18
|
};
|
|
18
19
|
}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}
|
|
20
|
+
const forbiddenQueryOptions = [
|
|
21
|
+
'sort',
|
|
22
|
+
'skip',
|
|
23
|
+
'limit',
|
|
24
|
+
'explain',
|
|
25
|
+
];
|
|
26
26
|
class Query {
|
|
27
27
|
constructor(filter, options, modelConstructor) {
|
|
28
28
|
this.filter = filter;
|
|
29
29
|
this.options = options;
|
|
30
30
|
this.modelConstructor = modelConstructor;
|
|
31
|
+
this.localCustomSort = false;
|
|
32
|
+
this.localOptions = {
|
|
33
|
+
sort: {
|
|
34
|
+
_id: 'descending',
|
|
35
|
+
},
|
|
36
|
+
};
|
|
37
|
+
if (options?.driverOptions) {
|
|
38
|
+
for (const key of forbiddenQueryOptions) {
|
|
39
|
+
if (key in options.driverOptions) {
|
|
40
|
+
throw new TypeError(`${key} is not allowed in query's driverOptions`);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
getDriverOptions() {
|
|
46
|
+
return { ...mergeDriverOptions(this.options), ...this.localOptions };
|
|
47
|
+
}
|
|
48
|
+
sort(sort) {
|
|
49
|
+
if (!this.localCustomSort) {
|
|
50
|
+
this.localCustomSort = true;
|
|
51
|
+
this.localOptions.sort = sort;
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
Object.assign(this.localOptions.sort, sort);
|
|
55
|
+
}
|
|
56
|
+
return this;
|
|
57
|
+
}
|
|
58
|
+
sortBy(field, direction = 'ascending') {
|
|
59
|
+
return this.sort({ [field]: direction });
|
|
60
|
+
}
|
|
61
|
+
skip(skip) {
|
|
62
|
+
if (!Number.isInteger(skip)) {
|
|
63
|
+
throw new TypeError(`skip must be an integer`);
|
|
64
|
+
}
|
|
65
|
+
if (skip < 0) {
|
|
66
|
+
throw new TypeError(`skip must be at least zero`);
|
|
67
|
+
}
|
|
68
|
+
this.localOptions.skip = skip;
|
|
69
|
+
return this;
|
|
70
|
+
}
|
|
71
|
+
limit(limit) {
|
|
72
|
+
if (!Number.isInteger(limit)) {
|
|
73
|
+
throw new TypeError(`limit must be an integer`);
|
|
74
|
+
}
|
|
75
|
+
if (limit < 1) {
|
|
76
|
+
throw new TypeError(`limit must be at least one`);
|
|
77
|
+
}
|
|
78
|
+
this.localOptions.limit = limit;
|
|
79
|
+
return this;
|
|
31
80
|
}
|
|
32
81
|
async first() {
|
|
33
82
|
const collection = await this.modelConstructor.getCollection();
|
|
34
|
-
const driverOptions =
|
|
35
|
-
ensureSort(driverOptions);
|
|
83
|
+
const driverOptions = this.getDriverOptions();
|
|
36
84
|
const result = await collection.findOne(this.filter, driverOptions);
|
|
37
|
-
if (result ===
|
|
85
|
+
if (result === null) {
|
|
38
86
|
return null;
|
|
39
87
|
}
|
|
40
88
|
const instance = new this.modelConstructor(result, {
|
|
@@ -53,9 +101,10 @@ class Query {
|
|
|
53
101
|
}
|
|
54
102
|
async all() {
|
|
55
103
|
const collection = await this.modelConstructor.getCollection();
|
|
56
|
-
const driverOptions =
|
|
57
|
-
|
|
58
|
-
|
|
104
|
+
const driverOptions = this.getDriverOptions();
|
|
105
|
+
const result = await collection
|
|
106
|
+
.find(this.filter, driverOptions)
|
|
107
|
+
.toArray();
|
|
59
108
|
return result.map((value) => new this.modelConstructor(value, {
|
|
60
109
|
// @ts-expect-error Unavoidable error.
|
|
61
110
|
collection,
|
|
@@ -64,18 +113,24 @@ class Query {
|
|
|
64
113
|
}
|
|
65
114
|
async count() {
|
|
66
115
|
const collection = await this.modelConstructor.getCollection();
|
|
67
|
-
const driverOptions =
|
|
116
|
+
const driverOptions = this.getDriverOptions();
|
|
68
117
|
return collection.countDocuments(this.filter, driverOptions);
|
|
69
118
|
}
|
|
70
119
|
async distinct(key) {
|
|
71
120
|
const collection = await this.modelConstructor.getCollection();
|
|
72
|
-
const driverOptions =
|
|
121
|
+
const driverOptions = this.getDriverOptions();
|
|
73
122
|
return collection.distinct(key, this.filter, driverOptions);
|
|
74
123
|
}
|
|
124
|
+
async explain(verbosity) {
|
|
125
|
+
const collection = await this.modelConstructor.getCollection();
|
|
126
|
+
const driverOptions = this.getDriverOptions();
|
|
127
|
+
return collection
|
|
128
|
+
.find(this.filter, driverOptions)
|
|
129
|
+
.explain(verbosity);
|
|
130
|
+
}
|
|
75
131
|
async *[Symbol.asyncIterator]() {
|
|
76
132
|
const collection = await this.modelConstructor.getCollection();
|
|
77
|
-
const driverOptions =
|
|
78
|
-
ensureSort(driverOptions);
|
|
133
|
+
const driverOptions = this.getDriverOptions();
|
|
79
134
|
for await (const value of collection.find(this.filter, driverOptions)) {
|
|
80
135
|
if (value === null)
|
|
81
136
|
continue;
|
|
@@ -88,28 +143,40 @@ class Query {
|
|
|
88
143
|
}
|
|
89
144
|
}
|
|
90
145
|
function computeCollectionName(constructorName) {
|
|
91
|
-
return lodash_1.snakeCase(pluralize_1.default(constructorName));
|
|
146
|
+
return (0, lodash_1.snakeCase)((0, pluralize_1.default)(constructorName));
|
|
147
|
+
}
|
|
148
|
+
function ensureSort(options) {
|
|
149
|
+
if (!options || options.sort)
|
|
150
|
+
return;
|
|
151
|
+
options.sort = {
|
|
152
|
+
_id: -1,
|
|
153
|
+
};
|
|
92
154
|
}
|
|
93
155
|
function hasOwn(object, key) {
|
|
94
156
|
return Object.prototype.hasOwnProperty.call(object, key);
|
|
95
157
|
}
|
|
96
158
|
class BaseModel {
|
|
97
159
|
constructor(dbObj, options, alreadyExists = false) {
|
|
160
|
+
this.$isPersisted = false;
|
|
161
|
+
this.$isLocal = true;
|
|
162
|
+
this.$isDeleted = false;
|
|
98
163
|
this.$collection = null;
|
|
99
164
|
if (dbObj) {
|
|
100
|
-
this.$
|
|
101
|
-
this.$
|
|
165
|
+
this.$original = alreadyExists === true ? (0, lodash_1.cloneDeep)(dbObj) : {};
|
|
166
|
+
this.$attributes = dbObj;
|
|
102
167
|
}
|
|
103
168
|
else {
|
|
104
|
-
this.$
|
|
105
|
-
this.$
|
|
169
|
+
this.$original = {};
|
|
170
|
+
this.$attributes = {};
|
|
106
171
|
}
|
|
107
172
|
if (options !== undefined) {
|
|
108
173
|
this.$options = options;
|
|
109
174
|
this.$collection = options.collection;
|
|
110
175
|
}
|
|
111
|
-
|
|
112
|
-
|
|
176
|
+
if (alreadyExists) {
|
|
177
|
+
this.$isPersisted = true;
|
|
178
|
+
this.$isLocal = false;
|
|
179
|
+
}
|
|
113
180
|
// eslint-disable-next-line no-constructor-return
|
|
114
181
|
return new Proxy(this, proxyHandler_1.proxyHandler);
|
|
115
182
|
}
|
|
@@ -141,12 +208,12 @@ class BaseModel {
|
|
|
141
208
|
return;
|
|
142
209
|
}
|
|
143
210
|
this.booted = true;
|
|
144
|
-
utils_1.defineStaticProperty(this, BaseModel, {
|
|
211
|
+
(0, utils_1.defineStaticProperty)(this, BaseModel, {
|
|
145
212
|
propertyName: 'collectionName',
|
|
146
213
|
defaultValue: computeCollectionName(this.name),
|
|
147
214
|
strategy: 'define',
|
|
148
215
|
});
|
|
149
|
-
utils_1.defineStaticProperty(this, BaseModel, {
|
|
216
|
+
(0, utils_1.defineStaticProperty)(this, BaseModel, {
|
|
150
217
|
propertyName: '$fieldsDefinitions',
|
|
151
218
|
defaultValue: new Map(),
|
|
152
219
|
strategy: 'inherit',
|
|
@@ -186,7 +253,7 @@ class BaseModel {
|
|
|
186
253
|
const driverOptions = mergeDriverOptions(options);
|
|
187
254
|
const filter = { _id: id };
|
|
188
255
|
const result = await collection.findOne(filter, driverOptions);
|
|
189
|
-
if (result ===
|
|
256
|
+
if (result === null)
|
|
190
257
|
return null;
|
|
191
258
|
const instance = new this(result,
|
|
192
259
|
// @ts-expect-error Unavoidable error.
|
|
@@ -205,7 +272,7 @@ class BaseModel {
|
|
|
205
272
|
const driverOptions = mergeDriverOptions(options);
|
|
206
273
|
const filter = { [key]: value };
|
|
207
274
|
const result = await collection.findOne(filter, driverOptions);
|
|
208
|
-
if (result ===
|
|
275
|
+
if (result === null)
|
|
209
276
|
return null;
|
|
210
277
|
const instance = new this(result,
|
|
211
278
|
// @ts-expect-error Unavoidable error.
|
|
@@ -249,24 +316,30 @@ class BaseModel {
|
|
|
249
316
|
return new Query(filter, options, this);
|
|
250
317
|
}
|
|
251
318
|
static async getCollection(connection = this.connection) {
|
|
252
|
-
|
|
253
|
-
throw new Error('Model should only be accessed from IoC container');
|
|
254
|
-
}
|
|
319
|
+
(0, assert_1.default)(this.$database, 'Model should only be accessed from IoC container');
|
|
255
320
|
const connectionInstance = this.$database.connection(connection);
|
|
256
321
|
return connectionInstance.collection(this.collectionName);
|
|
257
322
|
}
|
|
258
323
|
[Symbol.for('nodejs.util.inspect.custom')]() {
|
|
259
324
|
return {
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
325
|
+
Model: this.constructor.name,
|
|
326
|
+
$original: this.$original,
|
|
327
|
+
$attributes: this.$attributes,
|
|
328
|
+
$isPersisted: this.$isPersisted,
|
|
329
|
+
$isNew: this.$isNew,
|
|
330
|
+
$isLocal: this.$isLocal,
|
|
331
|
+
$isDeleted: this.$isDeleted,
|
|
332
|
+
$dirty: this.$dirty,
|
|
333
|
+
$isDirty: this.$isDirty,
|
|
264
334
|
};
|
|
265
335
|
}
|
|
336
|
+
get $isNew() {
|
|
337
|
+
return !this.$isPersisted;
|
|
338
|
+
}
|
|
266
339
|
get $dirty() {
|
|
267
|
-
return lodash_1.pickBy(this.$
|
|
268
|
-
return (this.$
|
|
269
|
-
!lodash_1.isEqual(this.$
|
|
340
|
+
return (0, lodash_1.pickBy)(this.$attributes, (value, key) => {
|
|
341
|
+
return (this.$original[key] === undefined ||
|
|
342
|
+
!(0, lodash_1.isEqual)(this.$original[key], value));
|
|
270
343
|
});
|
|
271
344
|
}
|
|
272
345
|
$ensureNotDeleted() {
|
|
@@ -286,7 +359,7 @@ class BaseModel {
|
|
|
286
359
|
$prepareToSet() {
|
|
287
360
|
const dirty = this.$dirty;
|
|
288
361
|
const dirtyEntries = Object.entries(dirty);
|
|
289
|
-
if (dirtyEntries.length === 0) {
|
|
362
|
+
if (dirtyEntries.length === 0 && this.$isPersisted) {
|
|
290
363
|
return null;
|
|
291
364
|
}
|
|
292
365
|
// We cheat a little bit with the assertion. This is necessary because the
|
|
@@ -294,11 +367,11 @@ class BaseModel {
|
|
|
294
367
|
// which shouldn't reset the createdAt field.
|
|
295
368
|
const toSet = {};
|
|
296
369
|
const now = new Date();
|
|
297
|
-
if (this.$
|
|
298
|
-
this.$
|
|
370
|
+
if (this.$attributes.createdAt === undefined) {
|
|
371
|
+
this.$attributes.createdAt = now;
|
|
299
372
|
toSet.createdAt = now;
|
|
300
373
|
}
|
|
301
|
-
this.$
|
|
374
|
+
this.$attributes.updatedAt = now;
|
|
302
375
|
toSet.updatedAt = now;
|
|
303
376
|
for (const [dirtyKey, dirtyValue] of dirtyEntries) {
|
|
304
377
|
toSet[dirtyKey] = dirtyValue;
|
|
@@ -306,13 +379,13 @@ class BaseModel {
|
|
|
306
379
|
return toSet;
|
|
307
380
|
}
|
|
308
381
|
get id() {
|
|
309
|
-
return this.$
|
|
382
|
+
return this.$attributes._id;
|
|
310
383
|
}
|
|
311
384
|
get $isDirty() {
|
|
312
385
|
return Object.keys(this.$dirty).length > 0;
|
|
313
386
|
}
|
|
314
387
|
toJSON() {
|
|
315
|
-
return this.$
|
|
388
|
+
return this.$attributes;
|
|
316
389
|
}
|
|
317
390
|
async save(options) {
|
|
318
391
|
this.$ensureNotDeleted();
|
|
@@ -324,15 +397,15 @@ class BaseModel {
|
|
|
324
397
|
...options?.driverOptions,
|
|
325
398
|
session: this.$options?.session,
|
|
326
399
|
};
|
|
327
|
-
if (this.$
|
|
400
|
+
if (!this.$isPersisted) {
|
|
328
401
|
const result = await collection.insertOne(toSet, driverOptions);
|
|
329
|
-
this.$
|
|
402
|
+
this.$attributes._id = result.insertedId;
|
|
403
|
+
this.$isPersisted = true;
|
|
330
404
|
}
|
|
331
405
|
else {
|
|
332
|
-
await collection.updateOne({ _id: this.$
|
|
406
|
+
await collection.updateOne({ _id: this.$attributes._id }, { $set: toSet }, driverOptions);
|
|
333
407
|
}
|
|
334
|
-
this.$
|
|
335
|
-
this.$alreadySaved = true;
|
|
408
|
+
this.$original = (0, lodash_1.cloneDeep)(this.$attributes);
|
|
336
409
|
return true;
|
|
337
410
|
}
|
|
338
411
|
async delete(options) {
|
|
@@ -343,24 +416,24 @@ class BaseModel {
|
|
|
343
416
|
session: this.$options?.session,
|
|
344
417
|
};
|
|
345
418
|
const result = await collection.deleteOne({
|
|
346
|
-
_id: this.$
|
|
419
|
+
_id: this.$attributes._id,
|
|
347
420
|
}, driverOptions);
|
|
348
421
|
this.$isDeleted = true;
|
|
349
422
|
return result.deletedCount === 1;
|
|
350
423
|
}
|
|
351
424
|
merge(values) {
|
|
352
425
|
Object.entries(values).forEach(([key, value]) => {
|
|
353
|
-
this.$
|
|
426
|
+
this.$attributes[key] = value;
|
|
354
427
|
});
|
|
355
428
|
return this;
|
|
356
429
|
}
|
|
357
430
|
fill(values) {
|
|
358
|
-
const createdAt = this.$
|
|
359
|
-
this.$
|
|
431
|
+
const createdAt = this.$attributes.createdAt;
|
|
432
|
+
this.$attributes = {
|
|
360
433
|
_id: this.id,
|
|
361
434
|
};
|
|
362
435
|
if (createdAt)
|
|
363
|
-
this.$
|
|
436
|
+
this.$attributes.createdAt = createdAt;
|
|
364
437
|
return this.merge(values);
|
|
365
438
|
}
|
|
366
439
|
}
|
|
@@ -379,18 +452,19 @@ class BaseAutoIncrementModel extends BaseModel {
|
|
|
379
452
|
if (this._id === undefined) {
|
|
380
453
|
const connection = BaseAutoIncrementModel.$database.connection();
|
|
381
454
|
const counterCollection = await connection.collection('__adonis_mongodb_counters');
|
|
382
|
-
const doc = await counterCollection.findOneAndUpdate({ _id:
|
|
383
|
-
|
|
384
|
-
toSet._id =
|
|
455
|
+
const doc = await counterCollection.findOneAndUpdate({ _id: this.constructor.collectionName }, { $inc: { count: 1 } }, { ...driverOptions, upsert: true, returnDocument: 'after' });
|
|
456
|
+
(0, assert_1.default)(doc.value, 'upsert should always create a document');
|
|
457
|
+
toSet._id = doc.value.count;
|
|
385
458
|
await collection.insertOne(toSet, driverOptions);
|
|
386
|
-
this.$
|
|
459
|
+
this.$attributes._id = doc.value.count;
|
|
460
|
+
this.$isPersisted = true;
|
|
387
461
|
}
|
|
388
462
|
else {
|
|
389
|
-
await collection.updateOne({ _id: this.$
|
|
463
|
+
await collection.updateOne({ _id: this.$attributes._id }, { $set: toSet }, driverOptions);
|
|
390
464
|
}
|
|
391
|
-
this.$
|
|
465
|
+
this.$original = (0, lodash_1.cloneDeep)(this.$attributes);
|
|
392
466
|
return true;
|
|
393
467
|
}
|
|
394
468
|
}
|
|
395
469
|
exports.BaseAutoIncrementModel = BaseAutoIncrementModel;
|
|
396
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Model.js","sourceRoot":"","sources":["../../../src/Model/Model.ts"],"names":[],"mappings":"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"}
|
|
470
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Model.js","sourceRoot":"","sources":["../../../src/Model/Model.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,13 +7,16 @@ exports.proxyHandler = {
|
|
|
7
7
|
if (typeof target[prop] !== 'undefined') {
|
|
8
8
|
return Reflect.get(target, prop);
|
|
9
9
|
}
|
|
10
|
-
return Reflect.get(target.$
|
|
10
|
+
return Reflect.get(target.$attributes, prop);
|
|
11
11
|
},
|
|
12
12
|
set(target, prop, value) {
|
|
13
13
|
if (typeof target[prop] !== 'undefined') {
|
|
14
14
|
return Reflect.set(target, prop, value);
|
|
15
15
|
}
|
|
16
|
-
return Reflect.set(target.$
|
|
16
|
+
return Reflect.set(target.$attributes, prop, value);
|
|
17
|
+
},
|
|
18
|
+
ownKeys() {
|
|
19
|
+
throw new Error('Getting model keys is disallowed. If you want to use object spread on the current data, do { ...model.$attributes }');
|
|
17
20
|
},
|
|
18
21
|
};
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJveHlIYW5kbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL01vZGVsL3Byb3h5SGFuZGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsdURBQXVEOzs7QUFFMUMsUUFBQSxZQUFZLEdBQXNCO0lBQzdDLEdBQUcsQ0FBQyxNQUFXLEVBQUUsSUFBcUI7UUFDcEMsSUFBSSxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxXQUFXLEVBQUU7WUFDdkMsT0FBTyxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztTQUNsQztRQUNELE9BQU8sT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQy9DLENBQUM7SUFDRCxHQUFHLENBQUMsTUFBVyxFQUFFLElBQXFCLEVBQUUsS0FBVTtRQUNoRCxJQUFJLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLFdBQVcsRUFBRTtZQUN2QyxPQUFPLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztTQUN6QztRQUNELE9BQU8sT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN0RCxDQUFDO0lBQ0QsT0FBTztRQUNMLE1BQU0sSUFBSSxLQUFLLENBQ2IscUhBQXFILENBQ3RILENBQUM7SUFDSixDQUFDO0NBQ0YsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zakodium/adonis-mongodb",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.13.0",
|
|
4
4
|
"description": "MongoDB provider for AdonisJs",
|
|
5
5
|
"main": "./lib/providers/MongodbProvider.js",
|
|
6
6
|
"types": "./lib/adonis-typings/index.d.ts",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
},
|
|
28
28
|
"env": {
|
|
29
29
|
"MONGODB_CONNECTION": "mongodb",
|
|
30
|
-
"MONGODB_URL": "mongodb://localhost:27017",
|
|
30
|
+
"MONGODB_URL": "mongodb://localhost:27017?directConnection=true",
|
|
31
31
|
"MONGODB_DATABASE": "test"
|
|
32
32
|
},
|
|
33
33
|
"instructionsMd": "./instructions.md",
|
|
@@ -61,26 +61,26 @@
|
|
|
61
61
|
},
|
|
62
62
|
"homepage": "https://github.com/zakodium/adonis-mongodb#readme",
|
|
63
63
|
"devDependencies": {
|
|
64
|
-
"@adonisjs/auth": "^8.0.
|
|
65
|
-
"@adonisjs/core": "^5.1
|
|
66
|
-
"@adonisjs/logger": "^4.
|
|
64
|
+
"@adonisjs/auth": "^8.0.10",
|
|
65
|
+
"@adonisjs/core": "^5.4.1",
|
|
66
|
+
"@adonisjs/logger": "^4.1.1",
|
|
67
67
|
"@poppinss/cliui": "^2.2.5",
|
|
68
|
-
"@types/jest": "^
|
|
69
|
-
"@types/lodash": "^4.14.
|
|
68
|
+
"@types/jest": "^27.0.3",
|
|
69
|
+
"@types/lodash": "^4.14.177",
|
|
70
70
|
"@types/pluralize": "0.0.29",
|
|
71
|
-
"@zakodium/eslint-config": "^
|
|
72
|
-
"eslint": "^
|
|
73
|
-
"jest": "^27.
|
|
74
|
-
"prettier": "^2.
|
|
71
|
+
"@zakodium/eslint-config": "^5.1.0",
|
|
72
|
+
"eslint": "^8.3.0",
|
|
73
|
+
"jest": "^27.3.1",
|
|
74
|
+
"prettier": "^2.4.1",
|
|
75
75
|
"rimraf": "^3.0.2",
|
|
76
|
-
"ts-jest": "^27.0.
|
|
77
|
-
"typescript": "^4.
|
|
76
|
+
"ts-jest": "^27.0.7",
|
|
77
|
+
"typescript": "^4.5.2"
|
|
78
78
|
},
|
|
79
79
|
"dependencies": {
|
|
80
|
-
"@poppinss/utils": "^3.1
|
|
80
|
+
"@poppinss/utils": "^3.3.1",
|
|
81
81
|
"cli-table3": "^0.6.0",
|
|
82
82
|
"lodash": "^4.17.21",
|
|
83
|
-
"mongodb": "^4.
|
|
83
|
+
"mongodb": "^4.2.0",
|
|
84
84
|
"pluralize": "^8.0.0"
|
|
85
85
|
}
|
|
86
86
|
}
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
ProviderUserContract,
|
|
7
7
|
UserProviderContract,
|
|
8
8
|
} from '@ioc:Adonis/Addons/Auth';
|
|
9
|
-
import {
|
|
9
|
+
import { HashDriverContract } from '@ioc:Adonis/Core/Hash';
|
|
10
10
|
import type {
|
|
11
11
|
MongodbDocument,
|
|
12
12
|
MongodbModel,
|
|
@@ -22,7 +22,7 @@ class MongodbModelAuthProviderUser
|
|
|
22
22
|
public user: any,
|
|
23
23
|
private identifierKey: string,
|
|
24
24
|
private identifierKeyType: 'objectid' | 'string' | 'number',
|
|
25
|
-
private hash:
|
|
25
|
+
private hash: HashDriverContract,
|
|
26
26
|
) {}
|
|
27
27
|
|
|
28
28
|
public getId(): string | number | null {
|
|
@@ -61,7 +61,7 @@ class MongodbModelAuthUserProvider
|
|
|
61
61
|
private uids = ['email'];
|
|
62
62
|
private identifierKey = '_id';
|
|
63
63
|
private identifierKeyType: 'objectid' | 'string' | 'number' = 'objectid';
|
|
64
|
-
private hash:
|
|
64
|
+
private hash: HashDriverContract;
|
|
65
65
|
|
|
66
66
|
public constructor(
|
|
67
67
|
private auth: AuthManagerContract,
|
|
@@ -84,7 +84,6 @@ class MongodbModelAuthUserProvider
|
|
|
84
84
|
|
|
85
85
|
const Hash =
|
|
86
86
|
this.auth.application.container.resolveBinding('Adonis/Core/Hash');
|
|
87
|
-
// @ts-expect-error For some reason, BcryptDriver is not compatible with HashDriver.
|
|
88
87
|
this.hash = config.hashDriver ? Hash.use(config.hashDriver) : Hash;
|
|
89
88
|
}
|
|
90
89
|
|