@zakodium/adonis-mongodb 0.18.0 → 0.19.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/lib/adonis-typings/container.d.ts +5 -0
- package/lib/adonis-typings/database.d.ts +3 -1
- package/lib/adonis-typings/decorators.d.ts +1 -0
- package/lib/adonis-typings/transaction.d.ts +40 -0
- package/lib/adonis-typings/transaction.js +2 -0
- package/lib/commands/MongodbListMigrations.d.ts +1 -0
- package/lib/commands/MongodbListMigrations.js +6 -6
- package/lib/commands/MongodbMakeMigration.js +8 -6
- package/lib/commands/MongodbMigrate.d.ts +1 -0
- package/lib/commands/MongodbMigrate.js +6 -6
- package/lib/commands/util/MigrationCommand.d.ts +2 -0
- package/lib/commands/util/MigrationCommand.js +7 -6
- package/lib/commands/util/transformMigrations.js +1 -1
- package/lib/providers/MongodbProvider.d.ts +11 -0
- package/lib/providers/MongodbProvider.js +12 -1
- package/lib/src/Auth/MongodbModelAuthProvider.d.ts +3 -0
- package/lib/src/Auth/MongodbModelAuthProvider.js +11 -4
- package/lib/src/Database/Connection.d.ts +3 -1
- package/lib/src/Database/Connection.js +34 -9
- package/lib/src/Database/ConnectionManager.d.ts +1 -0
- package/lib/src/Database/ConnectionManager.js +3 -2
- package/lib/src/Database/Database.d.ts +1 -0
- package/lib/src/Database/Database.js +5 -1
- package/lib/src/Database/TransactionEventEmitter.d.ts +9 -0
- package/lib/src/Database/TransactionEventEmitter.js +8 -0
- package/lib/src/Migration.d.ts +1 -0
- package/lib/src/Migration.js +5 -2
- package/lib/src/Model/Model.d.ts +4 -0
- package/lib/src/Model/Model.js +32 -15
- package/lib/src/Model/proxyHandler.js +1 -1
- package/lib/src/Odm/decorators.d.ts +3 -0
- package/package.json +1 -1
- package/src/Database/Connection.ts +46 -10
- package/src/Database/TransactionEventEmitter.ts +10 -0
- package/src/Model/Model.ts +2 -6
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
/// <reference path="database.d.ts" />
|
|
2
|
+
/// <reference path="decorators.d.ts" />
|
|
3
|
+
/// <reference path="objectid.d.ts" />
|
|
4
|
+
/// <reference path="odm.d.ts" />
|
|
5
|
+
/// <reference path="migration.d.ts" />
|
|
1
6
|
declare module '@ioc:Adonis/Core/Application' {
|
|
2
7
|
import { DatabaseContract } from '@ioc:Zakodium/Mongodb/Database';
|
|
3
8
|
import Migration from '@ioc:Zakodium/Mongodb/Migration';
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
/// <reference path="transaction.d.ts" />
|
|
1
2
|
/// <reference types="node" />
|
|
2
3
|
declare module '@ioc:Zakodium/Mongodb/Database' {
|
|
3
4
|
import { EventEmitter } from 'node:events';
|
|
4
5
|
import { TransactionOptions, MongoClientOptions, Collection, Db, ClientSession, MongoClient, Document } from 'mongodb';
|
|
6
|
+
import { TransactionEventEmitter } from '@ioc:Zakodium/Mongodb/Database/Transaction';
|
|
5
7
|
/**
|
|
6
8
|
* Shape of the configuration in `config/mongodb.ts`.
|
|
7
9
|
*/
|
|
@@ -117,7 +119,7 @@ declare module '@ioc:Zakodium/Mongodb/Database' {
|
|
|
117
119
|
on(event: 'disconnect:error', callback: (error: Error, connection: ConnectionContract) => void): this;
|
|
118
120
|
database(): Promise<Db>;
|
|
119
121
|
collection<TSchema extends Document>(collectionName: string): Promise<Collection<TSchema>>;
|
|
120
|
-
transaction<TResult>(handler: (client: ClientSession, db: Db) => Promise<TResult>, options?: TransactionOptions): Promise<TResult>;
|
|
122
|
+
transaction<TResult>(handler: (client: ClientSession, db: Db, tx: TransactionEventEmitter) => Promise<TResult>, options?: TransactionOptions): Promise<TResult>;
|
|
121
123
|
}
|
|
122
124
|
const Database: DatabaseContract;
|
|
123
125
|
export default Database;
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
declare module '@ioc:Zakodium/Mongodb/Database/Transaction' {
|
|
3
|
+
import { EventEmitter } from 'node:events';
|
|
4
|
+
import { ClientSession, Db } from 'mongodb';
|
|
5
|
+
interface TransactionEvents {
|
|
6
|
+
/**
|
|
7
|
+
* The transaction commits successfully.
|
|
8
|
+
*
|
|
9
|
+
* @example
|
|
10
|
+
* Consider you have a collection of items storing metadata of file is filesystem.
|
|
11
|
+
* Consider when you delete an item from this collection, you must delete associated file.
|
|
12
|
+
*
|
|
13
|
+
* ```ts
|
|
14
|
+
* const item = await connection.transaction((session, db, tx) => {
|
|
15
|
+
* const item = await db.collection('test').findOneAndDelete({ _id }, { session });
|
|
16
|
+
*
|
|
17
|
+
* tx.on('commit', () => {
|
|
18
|
+
* Drive.delete(deletedItem.file.path);
|
|
19
|
+
* });
|
|
20
|
+
*
|
|
21
|
+
* // some other logic that could fail
|
|
22
|
+
* // or await session.abortTransaction()
|
|
23
|
+
* // commit will not emit in this case
|
|
24
|
+
*
|
|
25
|
+
* return item;
|
|
26
|
+
* })
|
|
27
|
+
* ```
|
|
28
|
+
*/
|
|
29
|
+
commit: [session: ClientSession, db: Db];
|
|
30
|
+
/**
|
|
31
|
+
* The transaction aborted (optional error).
|
|
32
|
+
* Two cases of abortion are possible:
|
|
33
|
+
* - if from `session.abortTransaction()`, no error
|
|
34
|
+
* - if from a throw, error is set
|
|
35
|
+
*/
|
|
36
|
+
abort: [session: ClientSession, db: Db, error?: Error];
|
|
37
|
+
}
|
|
38
|
+
class TransactionEventEmitter extends EventEmitter<TransactionEvents> {
|
|
39
|
+
}
|
|
40
|
+
}
|
|
@@ -16,6 +16,11 @@ const standalone_1 = require("@adonisjs/core/build/standalone");
|
|
|
16
16
|
const cli_table3_1 = __importDefault(require("cli-table3"));
|
|
17
17
|
const MigrationCommand_1 = __importDefault(require("./util/MigrationCommand"));
|
|
18
18
|
class MongodbListMigrations extends MigrationCommand_1.default {
|
|
19
|
+
static commandName = 'mongodb:migration:status';
|
|
20
|
+
static description = 'Show pending migrations';
|
|
21
|
+
static settings = {
|
|
22
|
+
loadApp: true,
|
|
23
|
+
};
|
|
19
24
|
async run(db) {
|
|
20
25
|
try {
|
|
21
26
|
const connection = await this.getConnection(db);
|
|
@@ -50,11 +55,6 @@ class MongodbListMigrations extends MigrationCommand_1.default {
|
|
|
50
55
|
}
|
|
51
56
|
}
|
|
52
57
|
}
|
|
53
|
-
MongodbListMigrations.commandName = 'mongodb:migration:status';
|
|
54
|
-
MongodbListMigrations.description = 'Show pending migrations';
|
|
55
|
-
MongodbListMigrations.settings = {
|
|
56
|
-
loadApp: true,
|
|
57
|
-
};
|
|
58
58
|
exports.default = MongodbListMigrations;
|
|
59
59
|
__decorate([
|
|
60
60
|
(0, standalone_1.inject)(['Zakodium/Mongodb/Database']),
|
|
@@ -62,4 +62,4 @@ __decorate([
|
|
|
62
62
|
__metadata("design:paramtypes", [Object]),
|
|
63
63
|
__metadata("design:returntype", Promise)
|
|
64
64
|
], MongodbListMigrations.prototype, "run", null);
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9uZ29kYkxpc3RNaWdyYXRpb25zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vY29tbWFuZHMvTW9uZ29kYkxpc3RNaWdyYXRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7O0FBQUEsZ0VBQXlEO0FBQ3pELDREQUFrQztBQUlsQywrRUFBdUQ7QUFFdkQsTUFBcUIscUJBQXNCLFNBQVEsMEJBQWdCO0lBQzFELE1BQU0sQ0FBQyxXQUFXLEdBQUcsMEJBQTBCLENBQUM7SUFDaEQsTUFBTSxDQUFDLFdBQVcsR0FBRyx5QkFBeUIsQ0FBQztJQUMvQyxNQUFNLENBQUMsUUFBUSxHQUFHO1FBQ3ZCLE9BQU8sRUFBRSxJQUFJO0tBQ2QsQ0FBQztJQUdXLEFBQU4sS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFvQjtRQUNuQyxJQUFJLENBQUM7WUFDSCxNQUFNLFVBQVUsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDaEQsTUFBTSxRQUFRLEdBQUcsTUFBTSxVQUFVLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDN0MsTUFBTSxJQUFJLEdBQUcsUUFBUSxDQUFDLFVBQVUsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1lBQ3JELE1BQU0sVUFBVSxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7WUFFL0QsTUFBTSxrQkFBa0IsR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7WUFFekQsTUFBTSxLQUFLLEdBQUcsSUFBSSxvQkFBUSxDQUFDO2dCQUN6QixJQUFJLEVBQUUsQ0FBQyxNQUFNLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxTQUFTLENBQUM7YUFDN0MsQ0FBQyxDQUFDO1lBRUgsTUFBTSxPQUFPLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUMvQixVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUN6RCxDQUFDO1lBRUY7O2VBRUc7WUFDSCxLQUFLLE1BQU0sQ0FBQyxHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsSUFBSSxVQUFVLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQztnQkFDekQsTUFBTSxRQUFRLEdBQUcsa0JBQWtCLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsSUFBSSxLQUFLLElBQUksQ0FBQyxDQUFDO2dCQUVyRSxNQUFNLEVBQUUsV0FBVyxFQUFFLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUNyQyxLQUFLLENBQUMsSUFBSSxDQUFDO29CQUNULElBQUk7b0JBQ0osUUFBUTt3QkFDTixDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDO3dCQUNoQyxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDO29CQUNqQyxRQUFRLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUk7b0JBQ2hDLFdBQVcsSUFBSSxFQUFFO2lCQUNsQixDQUFDLENBQUM7WUFDTCxDQUFDO1lBRUQsc0NBQXNDO1lBQ3RDLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDaEMsQ0FBQztnQkFBUyxDQUFDO1lBQ1QsTUFBTSxFQUFFLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQzlCLENBQUM7SUFDSCxDQUFDOztBQS9DSCx3Q0FnREM7QUF4Q2M7SUFEWixJQUFBLG1CQUFNLEVBQUMsQ0FBQywyQkFBMkIsQ0FBQyxDQUFDOzs7O2dEQXdDckMifQ==
|
|
@@ -15,6 +15,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
const node_path_1 = __importDefault(require("node:path"));
|
|
16
16
|
const standalone_1 = require("@adonisjs/core/build/standalone");
|
|
17
17
|
class MongodbMakeMigration extends standalone_1.BaseCommand {
|
|
18
|
+
static commandName = 'mongodb:make:migration';
|
|
19
|
+
static description = 'Make a new migration file';
|
|
20
|
+
static settings = {
|
|
21
|
+
loadApp: true,
|
|
22
|
+
};
|
|
23
|
+
name;
|
|
24
|
+
connection;
|
|
18
25
|
async run() {
|
|
19
26
|
if (this.name.includes('/')) {
|
|
20
27
|
this.logger.error('name argument should not contain any slash');
|
|
@@ -34,11 +41,6 @@ class MongodbMakeMigration extends standalone_1.BaseCommand {
|
|
|
34
41
|
await this.generator.run();
|
|
35
42
|
}
|
|
36
43
|
}
|
|
37
|
-
MongodbMakeMigration.commandName = 'mongodb:make:migration';
|
|
38
|
-
MongodbMakeMigration.description = 'Make a new migration file';
|
|
39
|
-
MongodbMakeMigration.settings = {
|
|
40
|
-
loadApp: true,
|
|
41
|
-
};
|
|
42
44
|
exports.default = MongodbMakeMigration;
|
|
43
45
|
__decorate([
|
|
44
46
|
standalone_1.args.string({ description: 'Name of the migration file' }),
|
|
@@ -48,4 +50,4 @@ __decorate([
|
|
|
48
50
|
standalone_1.flags.string({ description: 'Database connection to use for the migration' }),
|
|
49
51
|
__metadata("design:type", String)
|
|
50
52
|
], MongodbMakeMigration.prototype, "connection", void 0);
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9uZ29kYk1ha2VNaWdyYXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9jb21tYW5kcy9Nb25nb2RiTWFrZU1pZ3JhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7OztBQUFBLDBEQUE2QjtBQUU3QixnRUFBMkU7QUFFM0UsTUFBcUIsb0JBQXFCLFNBQVEsd0JBQVc7SUFDcEQsTUFBTSxDQUFDLFdBQVcsR0FBRyx3QkFBd0IsQ0FBQztJQUM5QyxNQUFNLENBQUMsV0FBVyxHQUFHLDJCQUEyQixDQUFDO0lBQ2pELE1BQU0sQ0FBQyxRQUFRLEdBQUc7UUFDdkIsT0FBTyxFQUFFLElBQUk7S0FDZCxDQUFDO0lBR0ssSUFBSSxDQUFTO0lBR2IsVUFBVSxDQUFTO0lBRW5CLEtBQUssQ0FBQyxHQUFHO1FBQ2QsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQzVCLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLDRDQUE0QyxDQUFDLENBQUM7WUFDaEUsT0FBTyxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUM7WUFDckIsT0FBTztRQUNULENBQUM7UUFFRCxNQUFNLE1BQU0sR0FBRyxvQkFBb0IsQ0FBQztRQUVwQyxNQUFNLElBQUksR0FBRyxtQkFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsK0JBQStCLENBQUMsQ0FBQztRQUVuRSxJQUFJLENBQUMsU0FBUzthQUNYLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLENBQUM7YUFDeEUsSUFBSSxDQUFDLElBQUksQ0FBQzthQUNWLGNBQWMsQ0FBQyxNQUFNLENBQUM7YUFDdEIsT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDO2FBQ2pDLEtBQUssQ0FBQztZQUNMLFNBQVMsRUFBRSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQ3hELENBQUMsQ0FDRixXQUFXO1NBQ2IsQ0FBQyxDQUFDO1FBQ0wsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQzdCLENBQUM7O0FBbkNILHVDQW9DQztBQTVCUTtJQUROLGlCQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsV0FBVyxFQUFFLDRCQUE0QixFQUFFLENBQUM7O2tEQUN2QztBQUdiO0lBRE4sa0JBQUssQ0FBQyxNQUFNLENBQUMsRUFBRSxXQUFXLEVBQUUsOENBQThDLEVBQUUsQ0FBQzs7d0RBQ3BEIn0=
|
|
@@ -36,6 +36,11 @@ const standalone_1 = require("@adonisjs/core/build/standalone");
|
|
|
36
36
|
const mongodb_1 = require("mongodb");
|
|
37
37
|
const MigrationCommand_1 = __importStar(require("./util/MigrationCommand"));
|
|
38
38
|
class MongodbMigrate extends MigrationCommand_1.default {
|
|
39
|
+
static commandName = 'mongodb:migration:run';
|
|
40
|
+
static description = 'Execute pending migrations';
|
|
41
|
+
static settings = {
|
|
42
|
+
loadApp: true,
|
|
43
|
+
};
|
|
39
44
|
async _executeMigration(db) {
|
|
40
45
|
const connection = await this.getConnection(db);
|
|
41
46
|
const migrations = await this.getMigrations(connection.config);
|
|
@@ -146,11 +151,6 @@ class MongodbMigrate extends MigrationCommand_1.default {
|
|
|
146
151
|
}
|
|
147
152
|
}
|
|
148
153
|
}
|
|
149
|
-
MongodbMigrate.commandName = 'mongodb:migration:run';
|
|
150
|
-
MongodbMigrate.description = 'Execute pending migrations';
|
|
151
|
-
MongodbMigrate.settings = {
|
|
152
|
-
loadApp: true,
|
|
153
|
-
};
|
|
154
154
|
exports.default = MongodbMigrate;
|
|
155
155
|
__decorate([
|
|
156
156
|
(0, standalone_1.inject)(['Zakodium/Mongodb/Database']),
|
|
@@ -158,4 +158,4 @@ __decorate([
|
|
|
158
158
|
__metadata("design:paramtypes", [Object]),
|
|
159
159
|
__metadata("design:returntype", Promise)
|
|
160
160
|
], MongodbMigrate.prototype, "run", null);
|
|
161
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
161
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9uZ29kYk1pZ3JhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9jb21tYW5kcy9Nb25nb2RiTWlncmF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsZ0VBQXlEO0FBQ3pELHFDQUFtQztBQUtuQyw0RUFHaUM7QUFjakMsTUFBcUIsY0FBZSxTQUFRLDBCQUFnQjtJQUNuRCxNQUFNLENBQUMsV0FBVyxHQUFHLHVCQUF1QixDQUFDO0lBQzdDLE1BQU0sQ0FBQyxXQUFXLEdBQUcsNEJBQTRCLENBQUM7SUFDbEQsTUFBTSxDQUFDLFFBQVEsR0FBRztRQUN2QixPQUFPLEVBQUUsSUFBSTtLQUNkLENBQUM7SUFFTSxLQUFLLENBQUMsaUJBQWlCLENBQUMsRUFBb0I7UUFDbEQsTUFBTSxVQUFVLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ2hELE1BQU0sVUFBVSxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFL0QsTUFBTSxpQkFBaUIsR0FBRyxNQUFNLFVBQVUsQ0FBQyxVQUFVLENBQ25ELDhDQUEyQixDQUM1QixDQUFDO1FBRUYsTUFBTSxhQUFhLEdBQUcsTUFBTSxVQUFVLENBQUMsVUFBVSxDQUMvQywwQ0FBdUIsQ0FDeEIsQ0FBQztRQUVGLE1BQU0sSUFBSSxHQUFHLE1BQU0saUJBQWlCLENBQUMsU0FBUyxDQUM1QztZQUNFLEdBQUcsRUFBRSxnQkFBZ0I7U0FDdEIsRUFDRDtZQUNFLElBQUksRUFBRSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUU7U0FDeEIsRUFDRDtZQUNFLE1BQU0sRUFBRSxJQUFJO1NBQ2IsQ0FDRixDQUFDO1FBRUYsSUFBSSxJQUFJLENBQUMsYUFBYSxLQUFLLENBQUMsSUFBSSxJQUFJLENBQUMsYUFBYSxLQUFLLENBQUMsRUFBRSxDQUFDO1lB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
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
/// <reference path="../../adonis-typings/database.d.ts" />
|
|
2
|
+
/// <reference path="../../adonis-typings/migration.d.ts" />
|
|
1
3
|
import { BaseCommand } from '@adonisjs/core/build/standalone';
|
|
2
4
|
import { Logger } from '@poppinss/cliui/build/src/Logger';
|
|
3
5
|
import type { ConnectionContract, DatabaseContract, MongodbConnectionConfig } from '@ioc:Zakodium/Mongodb/Database';
|
|
@@ -44,6 +44,12 @@ const folder = 'mongodb/migrations';
|
|
|
44
44
|
exports.migrationCollectionName = '__adonis_mongodb';
|
|
45
45
|
exports.migrationLockCollectionName = '__adonis_mongodb_lock';
|
|
46
46
|
class MigrationCommand extends standalone_1.BaseCommand {
|
|
47
|
+
static settings = {
|
|
48
|
+
loadApp: true,
|
|
49
|
+
};
|
|
50
|
+
static commandName = 'commandName';
|
|
51
|
+
static description = 'description';
|
|
52
|
+
connection;
|
|
47
53
|
async getConnection(db) {
|
|
48
54
|
if (this.connection && !db.manager.has(this.connection)) {
|
|
49
55
|
this.logger.error(`No MongoDB connection registered with name "${this.connection}"`);
|
|
@@ -84,14 +90,9 @@ class MigrationCommand extends standalone_1.BaseCommand {
|
|
|
84
90
|
return { Migration, description };
|
|
85
91
|
}
|
|
86
92
|
}
|
|
87
|
-
MigrationCommand.settings = {
|
|
88
|
-
loadApp: true,
|
|
89
|
-
};
|
|
90
|
-
MigrationCommand.commandName = 'commandName';
|
|
91
|
-
MigrationCommand.description = 'description';
|
|
92
93
|
exports.default = MigrationCommand;
|
|
93
94
|
__decorate([
|
|
94
95
|
standalone_1.flags.string({ description: 'Database connection to use for the migration' }),
|
|
95
96
|
__metadata("design:type", String)
|
|
96
97
|
], MigrationCommand.prototype, "connection", void 0);
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWlncmF0aW9uQ29tbWFuZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2NvbW1hbmRzL3V0aWwvTWlncmF0aW9uQ29tbWFuZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLCtDQUEyQztBQUMzQywwREFBNkI7QUFFN0IsZ0VBQXFFO0FBVXJFLGdGQUUrQjtBQUUvQixNQUFNLE1BQU0sR0FBRyxvQkFBb0IsQ0FBQztBQUV2QixRQUFBLHVCQUF1QixHQUFHLGtCQUFrQixDQUFDO0FBQzdDLFFBQUEsMkJBQTJCLEdBQUcsdUJBQXVCLENBQUM7QUFVbkUsTUFBOEIsZ0JBQWlCLFNBQVEsd0JBQVc7SUFDekQsTUFBTSxDQUFDLFFBQVEsR0FBRztRQUN2QixPQUFPLEVBQUUsSUFBSTtLQUNkLENBQUM7SUFFSyxNQUFNLENBQUMsV0FBVyxHQUFHLGFBQWEsQ0FBQztJQUNuQyxNQUFNLENBQUMsV0FBVyxHQUFHLGFBQWEsQ0FBQztJQUduQyxVQUFVLENBQVM7SUFFaEIsS0FBSyxDQUFDLGFBQWEsQ0FDM0IsRUFBb0I7UUFFcEIsSUFBSSxJQUFJLENBQUMsVUFBVSxJQUFJLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7WUFDeEQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQ2YsK0NBQStDLElBQUksQ0FBQyxVQUFVLEdBQUcsQ0FDbEUsQ0FBQztZQUNGLElBQUksQ0FBQyxRQUFRLEdBQUcsQ0FBQyxDQUFDO1lBQ2xCLE1BQU0sSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ3BCLENBQUM7UUFDRCxPQUFPLEVBQUUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQ3hDLENBQUM7SUFFUyxLQUFLLENBQUMsYUFBYSxDQUMzQixNQUErQjtRQUUvQixNQUFNLE9BQU8sR0FDWCxNQUFNLENBQUMsVUFBVSxJQUFJLE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxHQUFHLENBQUM7WUFDL0MsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxVQUFVO1lBQ25CLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRWYsTUFBTSxpQkFBaUIsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQ3pDLE9BQU87YUFDSixHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLG1CQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUFDO2FBQzVELEdBQUcsQ0FBQyxLQUFLLEVBQUUsY0FBYyxFQUFFLEVBQUU7WUFDNUIsSUFBSSxDQUFDO2dCQUNILE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBQSxrQkFBTyxFQUFDLGNBQWMsQ0FBQyxDQUFDO2dCQUM1QyxPQUFPLEtBQUs7cUJBQ1QsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7b0JBQ2YsT0FBTztvQkFDTCx3REFBd0Q7b0JBQ3hELGVBQWUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUMxRCxDQUFDO2dCQUNKLENBQUMsQ0FBQztxQkFDRCxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLG1CQUFJLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDO1lBQ3BELENBQUM7WUFBQyxNQUFNLENBQUM7Z0JBQ1AsT0FBTyxFQUFFLENBQUM7WUFDWixDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQ0wsQ0FBQztRQUVGLE9BQU8sSUFBQSw2QkFBbUIsRUFBQyxpQkFBaUIsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDN0QsQ0FBQztJQUVTLEtBQUssQ0FBQyxlQUFlLENBQzdCLElBQVk7UUFFWixNQUFNLE1BQU0sR0FBb0IseUJBQWEsSUFBSSx1Q0FBQyxDQUFDO1FBQ25ELE1BQU0sRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxHQUFHLE1BQU0sQ0FBQztRQUNuRCxJQUFJLENBQUMsU0FBUyxJQUFJLE9BQU8sU0FBUyxLQUFLLFVBQVUsRUFBRSxDQUFDO1lBQ2xELE1BQU0sSUFBSSxLQUFLLENBQUMsZ0JBQWdCLElBQUksOEJBQThCLENBQUMsQ0FBQztRQUN0RSxDQUFDO1FBQ0QsT0FBTyxFQUFFLFNBQVMsRUFBRSxXQUFXLEVBQUUsQ0FBQztJQUNwQyxDQUFDOztBQWhFSCxtQ0FpRUM7QUF4RFE7SUFETixrQkFBSyxDQUFDLE1BQU0sQ0FBQyxFQUFFLFdBQVcsRUFBRSw4Q0FBOEMsRUFBRSxDQUFDOztvREFDcEQifQ==
|
|
@@ -41,4 +41,4 @@ function transformMigrations(rawMigrations, logger) {
|
|
|
41
41
|
return migrations;
|
|
42
42
|
}
|
|
43
43
|
exports.default = transformMigrations;
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNmb3JtTWlncmF0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2NvbW1hbmRzL3V0aWwvdHJhbnNmb3JtTWlncmF0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDBEQUE2QjtBQUk3QixNQUFNLGNBQWMsR0FBRyx3QkFBd0IsQ0FBQztBQU9oRCxTQUF3QixtQkFBbUIsQ0FDekMsYUFBeUIsRUFDekIsTUFBZTtJQUVmLGdDQUFnQztJQUNoQyxNQUFNLFVBQVUsR0FBMkIsYUFBYTtTQUNyRCxJQUFJLEVBQUU7U0FDTixJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FDYixtQkFBSTtTQUNELFFBQVEsQ0FBQyxDQUFDLEVBQUUsbUJBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7U0FDNUIsYUFBYSxDQUFDLG1CQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxtQkFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQ3BEO1NBQ0EsR0FBRyxDQUFDLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ3ZCLElBQUksRUFBRSxtQkFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsbUJBQUksQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDL0QsSUFBSSxFQUFFLGFBQWE7S0FDcEIsQ0FBQyxDQUFDLENBQUM7SUFFTiw2QkFBNkI7SUFDN0IsSUFBSSxVQUFVLEdBQUcsS0FBSyxDQUFDO0lBQ3ZCLEtBQUssTUFBTSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxVQUFVLEVBQUUsQ0FBQztRQUN4QyxNQUFNLEtBQUssR0FBRyxjQUFjLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3hDLE1BQU0sU0FBUyxHQUFHLE1BQU0sQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ25ELElBQUksTUFBTSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsSUFBSSxTQUFTLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDL0MsVUFBVSxHQUFHLElBQUksQ0FBQztZQUNsQixJQUFJLE1BQU0sRUFBRSxDQUFDO2dCQUNYLE1BQU0sQ0FBQyxLQUFLLENBQ1YsMkJBQTJCLElBQUksb0NBQW9DLENBQ3BFLENBQUM7WUFDSixDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFDRCxJQUFJLFVBQVUsRUFBRSxDQUFDO1FBQ2YsTUFBTSxJQUFJLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO0lBQ3hELENBQUM7SUFFRCx3Q0FBd0M7SUFDeEMsTUFBTSxVQUFVLEdBQUcsSUFBSSxHQUFHLENBQ3hCLFVBQVUsQ0FBQyxNQUFNLENBQ2YsQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLEtBQUssRUFBRSxFQUFFLENBQ2xCLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssS0FBSyxDQUN4RSxDQUNGLENBQUM7SUFDRixJQUFJLFVBQVUsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDeEIsTUFBTSxJQUFJLEtBQUssQ0FDYix5Q0FBeUMsQ0FBQyxHQUFHLFVBQVUsQ0FBQzthQUNyRCxHQUFHLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUM7YUFDdkIsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQ2hCLENBQUM7SUFDSixDQUFDO0lBRUQsT0FBTyxVQUFVLENBQUM7QUFDcEIsQ0FBQztBQW5ERCxzQ0FtREMifQ==
|
|
@@ -1,10 +1,21 @@
|
|
|
1
|
+
/// <reference path="../adonis-typings/container.d.ts" />
|
|
1
2
|
/// <reference types="@adonisjs/application/build/adonis-typings/application" />
|
|
3
|
+
/// <reference types="@adonisjs/application/build/adonis-typings/application" />
|
|
4
|
+
/// <reference types="@adonisjs/drive/build/adonis-typings/container" />
|
|
5
|
+
/// <reference types="@adonisjs/http-server/build/adonis-typings/container" />
|
|
6
|
+
/// <reference types="@adonisjs/auth/build/adonis-typings/container" />
|
|
7
|
+
/// <reference types="@adonisjs/core/build/adonis-typings/container" />
|
|
8
|
+
/// <reference types="@adonisjs/events/build/adonis-typings/container" />
|
|
9
|
+
/// <reference types="@adonisjs/hash/build/adonis-typings/container" />
|
|
10
|
+
/// <reference types="@adonisjs/encryption/build/adonis-typings/container" />
|
|
11
|
+
/// <reference types="@adonisjs/validator/build/adonis-typings/container" />
|
|
2
12
|
import { ApplicationContract } from '@ioc:Adonis/Core/Application';
|
|
3
13
|
export default class MongodbProvider {
|
|
4
14
|
protected app: ApplicationContract;
|
|
5
15
|
constructor(app: ApplicationContract);
|
|
6
16
|
private registerOdm;
|
|
7
17
|
private registerDatabase;
|
|
18
|
+
private registerTransactionEvent;
|
|
8
19
|
private registerMigration;
|
|
9
20
|
register(): void;
|
|
10
21
|
boot(): void;
|
|
@@ -6,10 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const mongodb_1 = require("mongodb");
|
|
7
7
|
const MongodbModelAuthProvider_1 = require("../src/Auth/MongodbModelAuthProvider");
|
|
8
8
|
const Database_1 = require("../src/Database/Database");
|
|
9
|
+
const TransactionEventEmitter_1 = require("../src/Database/TransactionEventEmitter");
|
|
9
10
|
const Migration_1 = __importDefault(require("../src/Migration"));
|
|
10
11
|
const Model_1 = require("../src/Model/Model");
|
|
11
12
|
const decorators_1 = require("../src/Odm/decorators");
|
|
12
13
|
class MongodbProvider {
|
|
14
|
+
app;
|
|
13
15
|
constructor(app) {
|
|
14
16
|
this.app = app;
|
|
15
17
|
}
|
|
@@ -22,6 +24,7 @@ class MongodbProvider {
|
|
|
22
24
|
BaseModel: Model_1.BaseModel,
|
|
23
25
|
BaseAutoIncrementModel: Model_1.BaseAutoIncrementModel,
|
|
24
26
|
field: decorators_1.field,
|
|
27
|
+
computed: decorators_1.computed,
|
|
25
28
|
};
|
|
26
29
|
});
|
|
27
30
|
}
|
|
@@ -31,6 +34,13 @@ class MongodbProvider {
|
|
|
31
34
|
return new Database_1.Database(config.get('mongodb', {}), logger);
|
|
32
35
|
});
|
|
33
36
|
}
|
|
37
|
+
registerTransactionEvent() {
|
|
38
|
+
this.app.container.singleton('Zakodium/Mongodb/Database/Transaction', () => {
|
|
39
|
+
return {
|
|
40
|
+
TransactionEventEmitter: TransactionEventEmitter_1.TransactionEventEmitter,
|
|
41
|
+
};
|
|
42
|
+
});
|
|
43
|
+
}
|
|
34
44
|
registerMigration() {
|
|
35
45
|
this.app.container.singleton('Zakodium/Mongodb/Migration', () => {
|
|
36
46
|
return (0, Migration_1.default)(this.app.container.resolveBinding('Zakodium/Mongodb/Database'));
|
|
@@ -38,6 +48,7 @@ class MongodbProvider {
|
|
|
38
48
|
}
|
|
39
49
|
register() {
|
|
40
50
|
this.registerOdm();
|
|
51
|
+
this.registerTransactionEvent();
|
|
41
52
|
this.registerDatabase();
|
|
42
53
|
this.registerMigration();
|
|
43
54
|
}
|
|
@@ -53,4 +64,4 @@ class MongodbProvider {
|
|
|
53
64
|
}
|
|
54
65
|
}
|
|
55
66
|
exports.default = MongodbProvider;
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9uZ29kYlByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vcHJvdmlkZXJzL01vbmdvZGJQcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHFDQUFtQztBQVFuQyxtRkFBbUY7QUFDbkYsdURBQW9EO0FBQ3BELHFGQUFrRjtBQUNsRixpRUFBK0M7QUFDL0MsOENBQXVFO0FBQ3ZFLHNEQUF3RDtBQUV4RCxNQUFxQixlQUFlO0lBQ0w7SUFBN0IsWUFBNkIsR0FBd0I7UUFBeEIsUUFBRyxHQUFILEdBQUcsQ0FBcUI7SUFBRyxDQUFDO0lBRWpELFdBQVc7UUFDakIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLHNCQUFzQixFQUFFLEdBQUcsRUFBRTtZQUN4RCxpQkFBUyxDQUFDLFlBQVksQ0FDcEIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLDJCQUEyQixDQUFDLENBQy9ELENBQUM7WUFDRiw4QkFBc0IsQ0FBQyxZQUFZLENBQ2pDLElBQUksQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQywyQkFBMkIsQ0FBQyxDQUMvRCxDQUFDO1lBRUYsT0FBTztnQkFDTCxRQUFRLEVBQVIsa0JBQVE7Z0JBQ1IsU0FBUyxFQUFFLGlCQUE0QztnQkFDdkQsc0JBQXNCLEVBQ3BCLDhCQUFzRTtnQkFDeEUsS0FBSyxFQUFMLGtCQUFLO2dCQUNMLFFBQVEsRUFBUixxQkFBUTthQUNULENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFTyxnQkFBZ0I7UUFDdEIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLDJCQUEyQixFQUFFLEdBQUcsRUFBRTtZQUM3RCxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUM7WUFDcEMsT0FBTyxJQUFJLG1CQUFRLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDekQsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRU8sd0JBQXdCO1FBQzlCLElBQUksQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FDMUIsdUNBQXVDLEVBQ3ZDLEdBQUcsRUFBRTtZQUNILE9BQU87Z0JBQ0wsdUJBQXVCLEVBQXZCLGlEQUF1QjthQUN4QixDQUFDO1FBQ0osQ0FBQyxDQUNGLENBQUM7SUFDSixDQUFDO0lBRU8saUJBQWlCO1FBQ3ZCLElBQUksQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyw0QkFBNEIsRUFBRSxHQUFHLEVBQUU7WUFDOUQsT0FBTyxJQUFBLG1CQUFlLEVBQ3BCLElBQUksQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQywyQkFBMkIsQ0FBQyxDQUMvRCxDQUFDO1FBQ0osQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRU0sUUFBUTtRQUNiLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNuQixJQUFJLENBQUMsd0JBQXdCLEVBQUUsQ0FBQztRQUNoQyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztRQUN4QixJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBRU0sSUFBSTtRQUNULElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLG9CQUFvQixDQUFDLEVBQUUsQ0FBQztZQUN4RCxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxjQUFjLENBQUMsb0JBQW9CLENBQUMsQ0FBQztZQUNyRSxJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVUsRUFBRSxlQUFlLEVBQUUsc0RBQTJCLENBQUMsQ0FBQztRQUN4RSxDQUFDO0lBQ0gsQ0FBQztJQUVNLEtBQUssQ0FBQyxRQUFRO1FBQ25CLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FDaEQsMkJBQTJCLENBQzVCLENBQUM7UUFDRixPQUFPLFFBQVEsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDckMsQ0FBQztDQUNGO0FBckVELGtDQXFFQyJ9
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
/// <reference path="../../adonis-typings/decorators.d.ts" />
|
|
2
|
+
/// <reference path="../../adonis-typings/objectid.d.ts" />
|
|
3
|
+
/// <reference path="../../adonis-typings/odm.d.ts" />
|
|
1
4
|
/// <reference types="@adonisjs/auth" />
|
|
2
5
|
/// <reference types="@adonisjs/hash/build/adonis-typings" />
|
|
3
6
|
import { AuthManagerContract, ProviderUserContract, UserProviderContract } from '@ioc:Adonis/Addons/Auth';
|
|
@@ -4,6 +4,10 @@ exports.getMongodbModelAuthProvider = void 0;
|
|
|
4
4
|
const utils_1 = require("@poppinss/utils");
|
|
5
5
|
const mongodb_1 = require("mongodb");
|
|
6
6
|
class MongodbModelAuthProviderUser {
|
|
7
|
+
user;
|
|
8
|
+
identifierKey;
|
|
9
|
+
identifierKeyType;
|
|
10
|
+
hash;
|
|
7
11
|
constructor(
|
|
8
12
|
// `this.user` can be any Model, so we use `any` to avoid indexing issues later.
|
|
9
13
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -39,12 +43,15 @@ class MongodbModelAuthProviderUser {
|
|
|
39
43
|
}
|
|
40
44
|
}
|
|
41
45
|
class MongodbModelAuthUserProvider {
|
|
46
|
+
auth;
|
|
47
|
+
config;
|
|
48
|
+
uids = ['email'];
|
|
49
|
+
identifierKey = '_id';
|
|
50
|
+
identifierKeyType = 'objectid';
|
|
51
|
+
hash;
|
|
42
52
|
constructor(auth, config) {
|
|
43
53
|
this.auth = auth;
|
|
44
54
|
this.config = config;
|
|
45
|
-
this.uids = ['email'];
|
|
46
|
-
this.identifierKey = '_id';
|
|
47
|
-
this.identifierKeyType = 'objectid';
|
|
48
55
|
if (config.uids) {
|
|
49
56
|
if (config.uids.length === 0) {
|
|
50
57
|
throw new Error('config.uids must have at least one element');
|
|
@@ -94,4 +101,4 @@ function getMongodbModelAuthProvider(auth, _mapping, config) {
|
|
|
94
101
|
return new MongodbModelAuthUserProvider(auth, config);
|
|
95
102
|
}
|
|
96
103
|
exports.getMongodbModelAuthProvider = getMongodbModelAuthProvider;
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
104
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9uZ29kYk1vZGVsQXV0aFByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL0F1dGgvTW9uZ29kYk1vZGVsQXV0aFByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDJDQUE4QztBQUM5QyxxQ0FBbUM7QUFjbkMsTUFBTSw0QkFBNEI7SUFNdkI7SUFDQztJQUNBO0lBQ0E7SUFOVjtJQUNFLGdGQUFnRjtJQUNoRiw4REFBOEQ7SUFDdkQsSUFBUyxFQUNSLGFBQXFCLEVBQ3JCLGlCQUFtRCxFQUNuRCxJQUF3QjtRQUh6QixTQUFJLEdBQUosSUFBSSxDQUFLO1FBQ1Isa0JBQWEsR0FBYixhQUFhLENBQVE7UUFDckIsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUFrQztRQUNuRCxTQUFJLEdBQUosSUFBSSxDQUFvQjtJQUMvQixDQUFDO0lBRUcsS0FBSztRQUNWLElBQUksSUFBSSxDQUFDLElBQUksS0FBSyxJQUFJO1lBQUUsT0FBTyxJQUFJLENBQUM7UUFDcEMsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDNUMsSUFBSSxJQUFJLENBQUMsaUJBQWlCLEtBQUssVUFBVSxFQUFFLENBQUM7WUFDMUMsT0FBTyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDMUIsQ0FBQztRQUNELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVNLGNBQWMsQ0FBQyxhQUFxQjtRQUN6QyxJQUFJLElBQUksQ0FBQyxJQUFJLEtBQUssSUFBSSxFQUFFLENBQUM7WUFDdkIsTUFBTSxJQUFJLEtBQUssQ0FBQyw4Q0FBOEMsQ0FBQyxDQUFDO1FBQ2xFLENBQUM7UUFDRCxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUN4QixNQUFNLElBQUksS0FBSyxDQUNiLHlFQUF5RSxDQUMxRSxDQUFDO1FBQ0osQ0FBQztRQUVE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
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
/// <reference path="../../adonis-typings/database.d.ts" />
|
|
1
2
|
/// <reference types="@adonisjs/logger/build/adonis-typings/logger" />
|
|
2
3
|
/// <reference types="node" />
|
|
3
4
|
import { EventEmitter } from 'node:events';
|
|
4
5
|
import { MongoClient, Db, Collection, ClientSession, Document, TransactionOptions } from 'mongodb';
|
|
5
6
|
import { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
6
7
|
import type { MongodbConnectionConfig, ConnectionContract } from '@ioc:Zakodium/Mongodb/Database';
|
|
8
|
+
import { TransactionEventEmitter } from './TransactionEventEmitter';
|
|
7
9
|
export declare interface Connection {
|
|
8
10
|
on(event: 'connect', callback: (connection: ConnectionContract) => void): this;
|
|
9
11
|
on(event: 'error', callback: (error: Error, connection: ConnectionContract) => void): this;
|
|
@@ -25,5 +27,5 @@ export declare class Connection extends EventEmitter implements ConnectionContra
|
|
|
25
27
|
disconnect(): Promise<void>;
|
|
26
28
|
database(): Promise<Db>;
|
|
27
29
|
collection<TSchema extends Document>(collectionName: string): Promise<Collection<TSchema>>;
|
|
28
|
-
transaction<TResult>(handler: (session: ClientSession, db: Db) => Promise<TResult>, options?: TransactionOptions): Promise<TResult>;
|
|
30
|
+
transaction<TResult>(handler: (session: ClientSession, db: Db, transactionEventEmitter: TransactionEventEmitter) => Promise<TResult>, options?: TransactionOptions): Promise<TResult>;
|
|
29
31
|
}
|
|
@@ -4,13 +4,21 @@ exports.Connection = void 0;
|
|
|
4
4
|
const node_events_1 = require("node:events");
|
|
5
5
|
const utils_1 = require("@poppinss/utils");
|
|
6
6
|
const mongodb_1 = require("mongodb");
|
|
7
|
+
const TransactionEventEmitter_1 = require("./TransactionEventEmitter");
|
|
7
8
|
var ConnectionStatus;
|
|
8
9
|
(function (ConnectionStatus) {
|
|
9
10
|
ConnectionStatus["CONNECTED"] = "CONNECTED";
|
|
10
11
|
ConnectionStatus["DISCONNECTED"] = "DISCONNECTED";
|
|
11
12
|
})(ConnectionStatus || (ConnectionStatus = {}));
|
|
12
|
-
// eslint-disable-next-line
|
|
13
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
|
|
13
14
|
class Connection extends node_events_1.EventEmitter {
|
|
15
|
+
client;
|
|
16
|
+
name;
|
|
17
|
+
ready;
|
|
18
|
+
config;
|
|
19
|
+
logger;
|
|
20
|
+
status;
|
|
21
|
+
connectPromise;
|
|
14
22
|
constructor(name, config, logger) {
|
|
15
23
|
super();
|
|
16
24
|
this.name = name;
|
|
@@ -71,15 +79,32 @@ class Connection extends node_events_1.EventEmitter {
|
|
|
71
79
|
}
|
|
72
80
|
async transaction(handler, options) {
|
|
73
81
|
const db = await this._ensureDb();
|
|
74
|
-
let
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
82
|
+
let session;
|
|
83
|
+
const emitter = new TransactionEventEmitter_1.TransactionEventEmitter();
|
|
84
|
+
return this.client
|
|
85
|
+
.withSession((_session) => _session.withTransaction(async (_session) => {
|
|
86
|
+
session = _session;
|
|
87
|
+
return handler(session, db, emitter);
|
|
88
|
+
}, options))
|
|
89
|
+
.then((result) => {
|
|
90
|
+
// https://github.com/mongodb/node-mongodb-native/blob/v6.7.0/src/transactions.ts#L147
|
|
91
|
+
// https://github.com/mongodb/node-mongodb-native/blob/v6.7.0/src/transactions.ts#L54
|
|
92
|
+
// session.transaction.isCommitted is not a sufficient indicator,
|
|
93
|
+
// because it's true if transaction commits or aborts.
|
|
94
|
+
const isCommitted = session.transaction.isCommitted;
|
|
95
|
+
const isAborted =
|
|
96
|
+
// https://github.com/mongodb/node-mongodb-native/blob/v6.7.0/src/transactions.ts#L11
|
|
97
|
+
Reflect.get(session.transaction, 'state') === 'TRANSACTION_ABORTED';
|
|
98
|
+
emitter.emit(isCommitted && isAborted ? 'abort' : 'commit', session, db);
|
|
99
|
+
return result;
|
|
100
|
+
// If an error occurs in this scope,
|
|
101
|
+
// it will not be caught by this then's error handler, but by the caller's catch.
|
|
102
|
+
// This is what we want, as an error in this scope should not trigger the abort event.
|
|
103
|
+
}, (error) => {
|
|
104
|
+
emitter.emit('abort', session, db, error);
|
|
105
|
+
throw error;
|
|
79
106
|
});
|
|
80
|
-
// @ts-expect-error The `await` ensures `result` has a value.
|
|
81
|
-
return result;
|
|
82
107
|
}
|
|
83
108
|
}
|
|
84
109
|
exports.Connection = Connection;
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9EYXRhYmFzZS9Db25uZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUEyQztBQUUzQywyQ0FBNEM7QUFDNUMscUNBT2lCO0FBUWpCLHVFQUFvRTtBQUVwRSxJQUFLLGdCQUdKO0FBSEQsV0FBSyxnQkFBZ0I7SUFDbkIsMkNBQXVCLENBQUE7SUFDdkIsaURBQTZCLENBQUE7QUFDL0IsQ0FBQyxFQUhJLGdCQUFnQixLQUFoQixnQkFBZ0IsUUFHcEI7QUEwQkQsNEVBQTRFO0FBQzVFLE1BQWEsVUFBVyxTQUFRLDBCQUFZO0lBQzFCLE1BQU0sQ0FBYztJQUNwQixJQUFJLENBQVM7SUFDdEIsS0FBSyxDQUFVO0lBQ04sTUFBTSxDQUEwQjtJQUV4QyxNQUFNLENBQWlCO0lBQ3ZCLE1BQU0sQ0FBbUI7SUFDekIsY0FBYyxDQUFxQjtJQUUzQyxZQUNFLElBQVksRUFDWixNQUErQixFQUMvQixNQUFzQjtRQUV0QixLQUFLLEVBQUUsQ0FBQztRQUVSLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ2pCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3JCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3JCLElBQUksQ0FBQyxNQUFNLEdBQUcsZ0JBQWdCLENBQUMsWUFBWSxDQUFDO1FBQzVDLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxxQkFBVyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFO1lBQzdDLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhO1NBQzdCLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDO0lBQzdCLENBQUM7SUFFTyxLQUFLLENBQUMsU0FBUztRQUNyQixLQUFLLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNwQixJQUFJLENB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
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/// <reference path="../../adonis-typings/database.d.ts" />
|
|
1
2
|
/// <reference types="@adonisjs/logger/build/adonis-typings/logger" />
|
|
2
3
|
import { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
3
4
|
import type { ConnectionManagerContract, ConnectionNode, MongodbConnectionConfig } from '@ioc:Zakodium/Mongodb/Database';
|
|
@@ -4,9 +4,10 @@ exports.ConnectionManager = void 0;
|
|
|
4
4
|
const utils_1 = require("@poppinss/utils");
|
|
5
5
|
const Connection_1 = require("./Connection");
|
|
6
6
|
class ConnectionManager {
|
|
7
|
+
logger;
|
|
8
|
+
connections = new Map();
|
|
7
9
|
constructor(logger) {
|
|
8
10
|
this.logger = logger;
|
|
9
|
-
this.connections = new Map();
|
|
10
11
|
}
|
|
11
12
|
validateConnection(connectionName) {
|
|
12
13
|
validateConnectionName(connectionName);
|
|
@@ -82,4 +83,4 @@ function validateConnectionName(connectionName) {
|
|
|
82
83
|
throw new TypeError('connectionName must be a non-empty string');
|
|
83
84
|
}
|
|
84
85
|
}
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29ubmVjdGlvbk1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvRGF0YWJhc2UvQ29ubmVjdGlvbk1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQTRDO0FBVTVDLDZDQUEwQztBQUUxQyxNQUFhLGlCQUFpQjtJQUdEO0lBRnBCLFdBQVcsR0FBNkMsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUV6RSxZQUEyQixNQUFzQjtRQUF0QixXQUFNLEdBQU4sTUFBTSxDQUFnQjtJQUFHLENBQUM7SUFFN0Msa0JBQWtCLENBQUMsY0FBc0I7UUFDL0Msc0JBQXNCLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDdkMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDeEQsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ2hCLE1BQU0sSUFBSSxpQkFBUyxDQUNqQiwrQ0FBK0MsY0FBYyxHQUFHLEVBQ2hFLEdBQUcsRUFDSCx5QkFBeUIsQ0FDMUIsQ0FBQztRQUNKLENBQUM7UUFDRCxPQUFPLFVBQVUsQ0FBQztJQUNwQixDQUFDO0lBRU8sYUFBYSxDQUFDLFVBQThCO1FBQ2xELE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3RCxJQUFJLGNBQWMsRUFBRSxDQUFDO1lBQ25CLGNBQWMsQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDO1FBQ2hDLENBQUM7SUFDSCxDQUFDO0lBRU8sV0FBVyxDQUFDLFVBQThCO1FBQ2hELE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3RCxJQUFJLGNBQWMsRUFBRSxDQUFDO1lBQ25CLGNBQWMsQ0FBQyxLQUFLLEdBQUcsUUFBUSxDQUFDO1FBQ2xD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
|
|
@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Database = void 0;
|
|
4
4
|
const ConnectionManager_1 = require("./ConnectionManager");
|
|
5
5
|
class Database {
|
|
6
|
+
config;
|
|
7
|
+
logger;
|
|
8
|
+
manager;
|
|
9
|
+
primaryConnectionName;
|
|
6
10
|
constructor(config, logger) {
|
|
7
11
|
this.config = config;
|
|
8
12
|
this.logger = logger;
|
|
@@ -34,4 +38,4 @@ class Database {
|
|
|
34
38
|
}
|
|
35
39
|
}
|
|
36
40
|
exports.Database = Database;
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGF0YWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvRGF0YWJhc2UvRGF0YWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBVUEsMkRBQXdEO0FBRXhELE1BQWEsUUFBUTtJQUtUO0lBQ0E7SUFMTSxPQUFPLENBQTRCO0lBQ25DLHFCQUFxQixDQUFTO0lBRTlDLFlBQ1UsTUFBcUIsRUFDckIsTUFBc0I7UUFEdEIsV0FBTSxHQUFOLE1BQU0sQ0FBZTtRQUNyQixXQUFNLEdBQU4sTUFBTSxDQUFnQjtRQUU5QixJQUFJLE9BQU8sTUFBTSxDQUFDLFVBQVUsS0FBSyxRQUFRLEVBQUUsQ0FBQztZQUMxQyxNQUFNLElBQUksU0FBUyxDQUFDLG9DQUFvQyxDQUFDLENBQUM7UUFDNUQsQ0FBQztRQUNELElBQUksT0FBTyxNQUFNLENBQUMsV0FBVyxLQUFLLFFBQVEsSUFBSSxNQUFNLENBQUMsV0FBVyxLQUFLLElBQUksRUFBRSxDQUFDO1lBQzFFLE1BQU0sSUFBSSxTQUFTLENBQUMsc0NBQXNDLENBQUMsQ0FBQztRQUM5RCxDQUFDO1FBRUQsSUFBSSxDQUFDLHFCQUFxQixHQUFHLE1BQU0sQ0FBQyxVQUFVLENBQUM7UUFDL0MsSUFBSSxPQUFPLE1BQU0sQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLHFCQUFxQixDQUFDLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDdkUsTUFBTSxJQUFJLFNBQVMsQ0FDakIsMkVBQTJFLElBQUksQ0FBQyxxQkFBcUIsR0FBRyxDQUN6RyxDQUFDO1FBQ0osQ0FBQztRQUVELElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxxQ0FBaUIsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDbEQsSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUVPLG1CQUFtQjtRQUN6QixNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQztRQUN2QyxLQUFLLE1BQU0sQ0FBQyxjQUFjLEVBQUUsZ0JBQWdCLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7WUFDeEUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFFLGdCQUFnQixDQUFDLENBQUM7UUFDckQsQ0FBQztJQUNILENBQUM7SUFFTSxVQUFVLENBQ2YsY0FBYyxHQUFHLElBQUksQ0FBQyxxQkFBcUI7UUFFM0MsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQyxVQUFVLENBQUM7SUFDckQsQ0FBQztJQUVNLFdBQVcsQ0FDaEIsT0FBNEQsRUFDNUQsT0FBNEI7UUFFNUIsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ2pDLE9BQU8sTUFBTSxDQUFDLFdBQVcsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDOUMsQ0FBQztDQUNGO0FBOUNELDRCQThDQyJ9
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import { EventEmitter } from 'node:events';
|
|
3
|
+
import { ClientSession, Db } from 'mongodb';
|
|
4
|
+
export interface TransactionEvents {
|
|
5
|
+
commit: [session: ClientSession, db: Db];
|
|
6
|
+
abort: [session: ClientSession, db: Db, error?: Error];
|
|
7
|
+
}
|
|
8
|
+
export declare class TransactionEventEmitter extends EventEmitter<TransactionEvents> {
|
|
9
|
+
}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TransactionEventEmitter = void 0;
|
|
4
|
+
const node_events_1 = require("node:events");
|
|
5
|
+
class TransactionEventEmitter extends node_events_1.EventEmitter {
|
|
6
|
+
}
|
|
7
|
+
exports.TransactionEventEmitter = TransactionEventEmitter;
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVHJhbnNhY3Rpb25FdmVudEVtaXR0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvRGF0YWJhc2UvVHJhbnNhY3Rpb25FdmVudEVtaXR0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkNBQTJDO0FBUzNDLE1BQWEsdUJBQXdCLFNBQVEsMEJBQStCO0NBQUc7QUFBL0UsMERBQStFIn0=
|
package/lib/src/Migration.d.ts
CHANGED
package/lib/src/Migration.js
CHANGED
|
@@ -10,8 +10,11 @@ var MigrationType;
|
|
|
10
10
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
11
11
|
function createMigration(Database) {
|
|
12
12
|
class Migration {
|
|
13
|
+
$operations = [];
|
|
14
|
+
$connection;
|
|
15
|
+
$logger;
|
|
16
|
+
$collectionList;
|
|
13
17
|
constructor(connection, logger) {
|
|
14
|
-
this.$operations = [];
|
|
15
18
|
this.$connection = Database.connection(connection);
|
|
16
19
|
this.$logger = logger;
|
|
17
20
|
}
|
|
@@ -121,4 +124,4 @@ function isDropIndex(op) {
|
|
|
121
124
|
function isCustom(op) {
|
|
122
125
|
return op.type === MigrationType.Custom;
|
|
123
126
|
}
|
|
124
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
127
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWlncmF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL01pZ3JhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQWNBLElBQUssYUFLSjtBQUxELFdBQUssYUFBYTtJQUNoQixzREFBcUMsQ0FBQTtJQUNyQyx3Q0FBdUIsQ0FBQTtJQUN2Qiw0Q0FBMkIsQ0FBQTtJQUMzQixrQ0FBaUIsQ0FBQTtBQUNuQixDQUFDLEVBTEksYUFBYSxLQUFiLGFBQWEsUUFLakI7QUFnQ0QsOERBQThEO0FBQzlELFNBQXdCLGVBQWUsQ0FBQyxRQUEwQjtJQUNoRSxNQUFlLFNBQVM7UUFDZCxXQUFXLEdBQXlCLEVBQUUsQ0FBQztRQUN2QyxXQUFXLENBQXFCO1FBQ2hDLE9BQU8sQ0FBUztRQUNoQixlQUFlLENBQVc7UUFFbEMsWUFBbUIsVUFBOEIsRUFBRSxNQUFjO1lBQy9ELElBQUksQ0FBQyxXQUFXLEdBQUcsUUFBUSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUNuRCxJQUFJLENBQUMsT0FBTyxHQUFHLE1BQU0sQ0FBQztRQUN4QixDQUFDO1FBRU0saUJBQWlCLENBQUMsZUFBeUI7WUFDaEQsS0FBSyxNQUFNLGNBQWMsSUFBSSxlQUFlLEVBQUUsQ0FBQztnQkFDN0MsSUFBSSxDQUFDLGdCQUFnQixDQUFDLGNBQWMsQ0FBQyxDQUFDO1lBQ3hDLENBQUM7UUFDSCxDQUFDO1FBRU0sZ0JBQWdCLENBQUMsY0FBc0I7WUFDNUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUM7Z0JBQ3BCLElBQUksRUFBRSxhQUFhLENBQUMsZ0JBQWdCO2dCQUNwQyxjQUFjO2FBQ2YsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztRQUVNLFNBQVMsQ0FDZCxjQUFzQixFQUN0QixTQUFpQixFQUNqQixPQUE0QjtZQUU1QixJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQztnQkFDcEIsSUFBSSxFQUFFLGFBQWEsQ0FBQyxTQUFTO2dCQUM3Qixj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
|
package/lib/src/Model/Model.d.ts
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
/// <reference path="../../adonis-typings/decorators.d.ts" />
|
|
2
|
+
/// <reference path="../../adonis-typings/objectid.d.ts" />
|
|
3
|
+
/// <reference path="../../adonis-typings/odm.d.ts" />
|
|
4
|
+
/// <reference path="../../adonis-typings/database.d.ts" />
|
|
1
5
|
import { BulkWriteOptions, ClientSession, Collection, CountDocumentsOptions, DeleteOptions, Document, ExplainVerbosityLike, Filter, FindOptions, InsertOneOptions, SortDirection } from 'mongodb';
|
|
2
6
|
import { DatabaseContract } from '@ioc:Zakodium/Mongodb/Database';
|
|
3
7
|
import { MongodbDocument, QueryContract, NoExtraProperties, ModelAttributes, ModelAdapterOptions, ModelDocumentOptions, FieldOptions, QuerySortObject, ForbiddenQueryOptions, ComputedOptions } from '@ioc:Zakodium/Mongodb/Odm';
|
package/lib/src/Model/Model.js
CHANGED
|
@@ -24,6 +24,15 @@ const forbiddenQueryOptions = [
|
|
|
24
24
|
'explain',
|
|
25
25
|
];
|
|
26
26
|
class Query {
|
|
27
|
+
filter;
|
|
28
|
+
options;
|
|
29
|
+
ModelConstructor;
|
|
30
|
+
localCustomSort = false;
|
|
31
|
+
localOptions = {
|
|
32
|
+
sort: {
|
|
33
|
+
_id: 'descending',
|
|
34
|
+
},
|
|
35
|
+
};
|
|
27
36
|
getDriverOptions() {
|
|
28
37
|
return { ...mergeDriverOptions(this.options), ...this.localOptions };
|
|
29
38
|
}
|
|
@@ -33,12 +42,6 @@ class Query {
|
|
|
33
42
|
this.filter = filter;
|
|
34
43
|
this.options = options;
|
|
35
44
|
this.ModelConstructor = ModelConstructor;
|
|
36
|
-
this.localCustomSort = false;
|
|
37
|
-
this.localOptions = {
|
|
38
|
-
sort: {
|
|
39
|
-
_id: 'descending',
|
|
40
|
-
},
|
|
41
|
-
};
|
|
42
45
|
if (options?.driverOptions) {
|
|
43
46
|
for (const key of forbiddenQueryOptions) {
|
|
44
47
|
if (key in options.driverOptions) {
|
|
@@ -151,15 +154,28 @@ function ensureSort(options) {
|
|
|
151
154
|
_id: -1,
|
|
152
155
|
};
|
|
153
156
|
}
|
|
154
|
-
function hasOwn(object, key) {
|
|
155
|
-
return Object.prototype.hasOwnProperty.call(object, key);
|
|
156
|
-
}
|
|
157
157
|
class BaseModel {
|
|
158
|
+
static connection;
|
|
159
|
+
static collectionName;
|
|
160
|
+
static booted;
|
|
161
|
+
static $fieldsDefinitions;
|
|
162
|
+
/**
|
|
163
|
+
* A set of properties marked as computed. Computed properties are included in
|
|
164
|
+
* the `toJSON` result, else they behave the same way as any other instance
|
|
165
|
+
* property.
|
|
166
|
+
*/
|
|
167
|
+
static $computedDefinitions;
|
|
168
|
+
_id;
|
|
169
|
+
createdAt;
|
|
170
|
+
updatedAt;
|
|
171
|
+
$original;
|
|
172
|
+
$attributes;
|
|
173
|
+
$isPersisted = false;
|
|
174
|
+
$isLocal = true;
|
|
175
|
+
$isDeleted = false;
|
|
176
|
+
$collection = null;
|
|
177
|
+
$options;
|
|
158
178
|
constructor(dbObj, options, alreadyExists = false) {
|
|
159
|
-
this.$isPersisted = false;
|
|
160
|
-
this.$isLocal = true;
|
|
161
|
-
this.$isDeleted = false;
|
|
162
|
-
this.$collection = null;
|
|
163
179
|
if (dbObj) {
|
|
164
180
|
this.$original = alreadyExists ? (0, lodash_1.cloneDeep)(dbObj) : {};
|
|
165
181
|
this.$attributes = dbObj;
|
|
@@ -179,6 +195,7 @@ class BaseModel {
|
|
|
179
195
|
// eslint-disable-next-line no-constructor-return
|
|
180
196
|
return new Proxy(this, proxyHandler_1.proxyHandler);
|
|
181
197
|
}
|
|
198
|
+
static $database;
|
|
182
199
|
static $setDatabase(database) {
|
|
183
200
|
this.$database = database;
|
|
184
201
|
}
|
|
@@ -220,7 +237,7 @@ class BaseModel {
|
|
|
220
237
|
* Define the property when not defined on self. This makes sure that all
|
|
221
238
|
* subclasses boot on their own.
|
|
222
239
|
*/
|
|
223
|
-
if (!hasOwn(this, 'booted')) {
|
|
240
|
+
if (!Object.hasOwn(this, 'booted')) {
|
|
224
241
|
this.booted = false;
|
|
225
242
|
}
|
|
226
243
|
/**
|
|
@@ -536,4 +553,4 @@ class BaseAutoIncrementModel extends BaseModel {
|
|
|
536
553
|
}
|
|
537
554
|
}
|
|
538
555
|
exports.BaseAutoIncrementModel = BaseAutoIncrementModel;
|
|
539
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Model.js","sourceRoot":"","sources":["../../../src/Model/Model.ts"],"names":[],"mappings":"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"}
|
|
556
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Model.js","sourceRoot":"","sources":["../../../src/Model/Model.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,4 +22,4 @@ exports.proxyHandler = {
|
|
|
22
22
|
throw new Error('Getting model keys is disallowed. If you want to use object spread on the current data, do { ...model.$attributes }');
|
|
23
23
|
},
|
|
24
24
|
};
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJveHlIYW5kbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL01vZGVsL3Byb3h5SGFuZGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFHYSxRQUFBLFlBQVksR0FBc0I7SUFDN0MsR0FBRyxDQUFDLE1BQVcsRUFBRSxJQUFxQixFQUFFLFFBQWE7UUFDbkQsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFdBQStCLENBQUM7UUFDckQsSUFBSSxLQUFLLENBQUMsWUFBWSxDQUFDLElBQWMsQ0FBQyxFQUFFLENBQUM7WUFDdkMsT0FBTyxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDN0MsQ0FBQztRQUVELElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQy9CLE9BQU8sT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQzdDLENBQUM7UUFFRCxPQUFPLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDekQsQ0FBQztJQUNELEdBQUcsQ0FBQyxNQUFXLEVBQUUsSUFBcUIsRUFBRSxLQUFVO1FBQ2hELElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQy9CLE9BQU8sT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQzFDLENBQUM7UUFDRCxPQUFPLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUNELE9BQU87UUFDTCxNQUFNLElBQUksS0FBSyxDQUNiLHFIQUFxSCxDQUN0SCxDQUFDO0lBQ0osQ0FBQztDQUNGLENBQUMifQ==
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
/// <reference path="../../adonis-typings/decorators.d.ts" />
|
|
2
|
+
/// <reference path="../../adonis-typings/objectid.d.ts" />
|
|
3
|
+
/// <reference path="../../adonis-typings/odm.d.ts" />
|
|
1
4
|
import { ComputedDecorator, FieldDecorator } from '@ioc:Zakodium/Mongodb/Odm';
|
|
2
5
|
export declare const field: FieldDecorator;
|
|
3
6
|
/**
|
package/package.json
CHANGED
|
@@ -16,6 +16,8 @@ import type {
|
|
|
16
16
|
ConnectionContract,
|
|
17
17
|
} from '@ioc:Zakodium/Mongodb/Database';
|
|
18
18
|
|
|
19
|
+
import { TransactionEventEmitter } from './TransactionEventEmitter';
|
|
20
|
+
|
|
19
21
|
enum ConnectionStatus {
|
|
20
22
|
CONNECTED = 'CONNECTED',
|
|
21
23
|
DISCONNECTED = 'DISCONNECTED',
|
|
@@ -45,7 +47,7 @@ export declare interface Connection {
|
|
|
45
47
|
): this;
|
|
46
48
|
}
|
|
47
49
|
|
|
48
|
-
// eslint-disable-next-line
|
|
50
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
|
|
49
51
|
export class Connection extends EventEmitter implements ConnectionContract {
|
|
50
52
|
public readonly client: MongoClient;
|
|
51
53
|
public readonly name: string;
|
|
@@ -131,17 +133,51 @@ export class Connection extends EventEmitter implements ConnectionContract {
|
|
|
131
133
|
}
|
|
132
134
|
|
|
133
135
|
public async transaction<TResult>(
|
|
134
|
-
handler: (
|
|
136
|
+
handler: (
|
|
137
|
+
session: ClientSession,
|
|
138
|
+
db: Db,
|
|
139
|
+
transactionEventEmitter: TransactionEventEmitter,
|
|
140
|
+
) => Promise<TResult>,
|
|
135
141
|
options?: TransactionOptions,
|
|
136
142
|
): Promise<TResult> {
|
|
137
143
|
const db = await this._ensureDb();
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
144
|
+
|
|
145
|
+
let session: ClientSession;
|
|
146
|
+
const emitter = new TransactionEventEmitter();
|
|
147
|
+
|
|
148
|
+
return this.client
|
|
149
|
+
.withSession((_session) =>
|
|
150
|
+
_session.withTransaction(async (_session) => {
|
|
151
|
+
session = _session;
|
|
152
|
+
return handler(session, db, emitter);
|
|
153
|
+
}, options),
|
|
154
|
+
)
|
|
155
|
+
.then(
|
|
156
|
+
(result) => {
|
|
157
|
+
// https://github.com/mongodb/node-mongodb-native/blob/v6.7.0/src/transactions.ts#L147
|
|
158
|
+
// https://github.com/mongodb/node-mongodb-native/blob/v6.7.0/src/transactions.ts#L54
|
|
159
|
+
// session.transaction.isCommitted is not a sufficient indicator,
|
|
160
|
+
// because it's true if transaction commits or aborts.
|
|
161
|
+
const isCommitted = session.transaction.isCommitted;
|
|
162
|
+
const isAborted =
|
|
163
|
+
// https://github.com/mongodb/node-mongodb-native/blob/v6.7.0/src/transactions.ts#L11
|
|
164
|
+
Reflect.get(session.transaction, 'state') === 'TRANSACTION_ABORTED';
|
|
165
|
+
|
|
166
|
+
emitter.emit(
|
|
167
|
+
isCommitted && isAborted ? 'abort' : 'commit',
|
|
168
|
+
session,
|
|
169
|
+
db,
|
|
170
|
+
);
|
|
171
|
+
|
|
172
|
+
return result;
|
|
173
|
+
// If an error occurs in this scope,
|
|
174
|
+
// it will not be caught by this then's error handler, but by the caller's catch.
|
|
175
|
+
// This is what we want, as an error in this scope should not trigger the abort event.
|
|
176
|
+
},
|
|
177
|
+
(error) => {
|
|
178
|
+
emitter.emit('abort', session, db, error);
|
|
179
|
+
throw error;
|
|
180
|
+
},
|
|
181
|
+
);
|
|
146
182
|
}
|
|
147
183
|
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { EventEmitter } from 'node:events';
|
|
2
|
+
|
|
3
|
+
import { ClientSession, Db } from 'mongodb';
|
|
4
|
+
|
|
5
|
+
export interface TransactionEvents {
|
|
6
|
+
commit: [session: ClientSession, db: Db];
|
|
7
|
+
abort: [session: ClientSession, db: Db, error?: Error];
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export class TransactionEventEmitter extends EventEmitter<TransactionEvents> {}
|
package/src/Model/Model.ts
CHANGED
|
@@ -239,10 +239,6 @@ function ensureSort(options?: FindOptions): void {
|
|
|
239
239
|
};
|
|
240
240
|
}
|
|
241
241
|
|
|
242
|
-
function hasOwn(object: unknown, key: string): boolean {
|
|
243
|
-
return Object.prototype.hasOwnProperty.call(object, key);
|
|
244
|
-
}
|
|
245
|
-
|
|
246
242
|
interface DataToSet {
|
|
247
243
|
[key: string]: unknown;
|
|
248
244
|
createdAt: Date;
|
|
@@ -358,7 +354,7 @@ export class BaseModel {
|
|
|
358
354
|
* Define the property when not defined on self. This makes sure that all
|
|
359
355
|
* subclasses boot on their own.
|
|
360
356
|
*/
|
|
361
|
-
if (!hasOwn(this, 'booted')) {
|
|
357
|
+
if (!Object.hasOwn(this, 'booted')) {
|
|
362
358
|
this.booted = false;
|
|
363
359
|
}
|
|
364
360
|
|
|
@@ -775,7 +771,7 @@ export class BaseModel {
|
|
|
775
771
|
}
|
|
776
772
|
|
|
777
773
|
export class BaseAutoIncrementModel extends BaseModel {
|
|
778
|
-
public readonly _id: number;
|
|
774
|
+
public declare readonly _id: number;
|
|
779
775
|
|
|
780
776
|
public async save(
|
|
781
777
|
options?: ModelDocumentOptions<InsertOneOptions>,
|