@zakodium/adonis-mongodb 0.18.1 → 0.20.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 +2 -2
- package/lib/adonis-typings/container.d.ts +3 -3
- package/lib/adonis-typings/database.d.ts +5 -5
- package/lib/adonis-typings/index.d.ts +0 -6
- package/lib/adonis-typings/migration.d.ts +8 -1
- package/lib/adonis-typings/odm.d.ts +4 -8
- package/lib/adonis-typings/transaction.d.ts +39 -0
- package/lib/adonis-typings/transaction.js +2 -0
- package/lib/commands/MongodbListMigrations.js +6 -6
- package/lib/commands/MongodbMakeMigration.js +8 -6
- package/lib/commands/MongodbMigrate.js +23 -13
- package/lib/commands/util/MigrationCommand.js +24 -13
- package/lib/commands/util/transformMigrations.d.ts +1 -1
- package/lib/commands/util/transformMigrations.js +2 -2
- package/lib/providers/MongodbProvider.d.ts +2 -2
- package/lib/providers/MongodbProvider.js +11 -1
- package/lib/src/Auth/MongodbModelAuthProvider.d.ts +2 -4
- package/lib/src/Auth/MongodbModelAuthProvider.js +12 -6
- package/lib/src/Database/Connection.d.ts +5 -5
- package/lib/src/Database/Connection.js +34 -9
- package/lib/src/Database/ConnectionManager.d.ts +1 -2
- package/lib/src/Database/ConnectionManager.js +5 -2
- package/lib/src/Database/Database.d.ts +2 -3
- package/lib/src/Database/Database.js +5 -1
- package/lib/src/Database/TransactionEventEmitter.d.ts +8 -0
- package/lib/src/Database/TransactionEventEmitter.js +8 -0
- package/lib/src/Migration.js +24 -3
- package/lib/src/Model/Model.d.ts +3 -3
- package/lib/src/Model/Model.js +35 -16
- package/lib/src/Model/proxyHandler.js +1 -1
- package/lib/src/Odm/decorators.d.ts +1 -1
- package/package.json +11 -11
- package/src/Auth/MongodbModelAuthProvider.ts +2 -2
- package/src/Database/Connection.ts +49 -13
- package/src/Database/ConnectionManager.ts +3 -1
- package/src/Database/Database.ts +2 -2
- package/src/Database/TransactionEventEmitter.ts +10 -0
- package/src/Migration.ts +33 -4
- package/src/Model/Model.ts +15 -17
- package/src/Model/proxyHandler.ts +1 -1
- package/src/Odm/decorators.ts +1 -1
|
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9EYXRhYmFzZS9Db25uZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUEyQztBQUUzQywyQ0FBNEM7QUFRNUMscUNBQXNDO0FBUXRDLHVFQUFvRTtBQUVwRSxJQUFLLGdCQUdKO0FBSEQsV0FBSyxnQkFBZ0I7SUFDbkIsMkNBQXVCLENBQUE7SUFDdkIsaURBQTZCLENBQUE7QUFDL0IsQ0FBQyxFQUhJLGdCQUFnQixLQUFoQixnQkFBZ0IsUUFHcEI7QUEwQkQsNEVBQTRFO0FBQzVFLE1BQWEsVUFBVyxTQUFRLDBCQUFZO0lBQzFCLE1BQU0sQ0FBYztJQUNwQixJQUFJLENBQVM7SUFDdEIsS0FBSyxDQUFVO0lBQ04sTUFBTSxDQUEwQjtJQUV4QyxNQUFNLENBQWlCO0lBQ3ZCLE1BQU0sQ0FBbUI7SUFDekIsY0FBYyxDQUFxQjtJQUUzQyxZQUNFLElBQVksRUFDWixNQUErQixFQUMvQixNQUFzQjtRQUV0QixLQUFLLEVBQUUsQ0FBQztRQUVSLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ2pCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3JCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3JCLElBQUksQ0FBQyxNQUFNLEdBQUcsZ0JBQWdCLENBQUMsWUFBWSxDQUFDO1FBQzVDLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxxQkFBVyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFO1lBQzdDLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhO1NBQzdCLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDO0lBQzdCLENBQUM7SUFFTyxLQUFLLENBQUMsU0FBUztRQUNyQixLQUFLLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNwQixJQUFJLENB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
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
import { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
1
|
+
import type { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
3
2
|
import type { ConnectionManagerContract, ConnectionNode, MongodbConnectionConfig } from '@ioc:Zakodium/Mongodb/Database';
|
|
4
3
|
export declare class ConnectionManager implements ConnectionManagerContract {
|
|
5
4
|
private logger;
|
|
@@ -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);
|
|
@@ -54,6 +55,8 @@ class ConnectionManager {
|
|
|
54
55
|
}
|
|
55
56
|
connect(connectionName) {
|
|
56
57
|
const connection = this.validateConnection(connectionName);
|
|
58
|
+
// Connection error is handled by the `error` event listener.
|
|
59
|
+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
57
60
|
connection.connection.connect();
|
|
58
61
|
}
|
|
59
62
|
get(connectionName) {
|
|
@@ -82,4 +85,4 @@ function validateConnectionName(connectionName) {
|
|
|
82
85
|
throw new TypeError('connectionName must be a non-empty string');
|
|
83
86
|
}
|
|
84
87
|
}
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29ubmVjdGlvbk1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvRGF0YWJhc2UvQ29ubmVjdGlvbk1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQTRDO0FBVTVDLDZDQUEwQztBQUUxQyxNQUFhLGlCQUFpQjtJQUdEO0lBRnBCLFdBQVcsR0FBNkMsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUV6RSxZQUEyQixNQUFzQjtRQUF0QixXQUFNLEdBQU4sTUFBTSxDQUFnQjtJQUFHLENBQUM7SUFFN0Msa0JBQWtCLENBQUMsY0FBc0I7UUFDL0Msc0JBQXNCLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDdkMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDeEQsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ2hCLE1BQU0sSUFBSSxpQkFBUyxDQUNqQiwrQ0FBK0MsY0FBYyxHQUFHLEVBQ2hFLEdBQUcsRUFDSCx5QkFBeUIsQ0FDMUIsQ0FBQztRQUNKLENBQUM7UUFDRCxPQUFPLFVBQVUsQ0FBQztJQUNwQixDQUFDO0lBRU8sYUFBYSxDQUFDLFVBQThCO1FBQ2xELE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3RCxJQUFJLGNBQWMsRUFBRSxDQUFDO1lBQ25CLGNBQWMsQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDO1FBQ2hDLENBQUM7SUFDSCxDQUFDO0lBRU8sV0FBVyxDQUFDLFVBQThCO1FBQ2hELE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3RCxJQUFJLGNBQWMsRUFBRSxDQUFDO1lBQ25CLGNBQWMsQ0FBQyxLQUFLLEdBQUcsUUFBUSxDQUFDO1FBQ2xD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
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
3
|
-
import { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
1
|
+
import type { ClientSession, Db, TransactionOptions } from 'mongodb';
|
|
2
|
+
import type { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
4
3
|
import type { ConnectionContract, ConnectionManagerContract, DatabaseContract, MongodbConfig } from '@ioc:Zakodium/Mongodb/Database';
|
|
5
4
|
export declare class Database implements DatabaseContract {
|
|
6
5
|
private config;
|
|
@@ -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,8 @@
|
|
|
1
|
+
import { EventEmitter } from 'node:events';
|
|
2
|
+
import type { ClientSession, Db } from 'mongodb';
|
|
3
|
+
export interface TransactionEvents {
|
|
4
|
+
commit: [session: ClientSession, db: Db];
|
|
5
|
+
abort: [session: ClientSession, db: Db, error?: Error];
|
|
6
|
+
}
|
|
7
|
+
export declare class TransactionEventEmitter extends EventEmitter<TransactionEvents> {
|
|
8
|
+
}
|
|
@@ -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.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = createMigration;
|
|
3
4
|
var MigrationType;
|
|
4
5
|
(function (MigrationType) {
|
|
6
|
+
MigrationType["DropCollection"] = "DropCollection";
|
|
5
7
|
MigrationType["CreateCollection"] = "CreateCollection";
|
|
6
8
|
MigrationType["DropIndex"] = "DropIndex";
|
|
7
9
|
MigrationType["CreateIndex"] = "CreateIndex";
|
|
@@ -10,8 +12,11 @@ var MigrationType;
|
|
|
10
12
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
11
13
|
function createMigration(Database) {
|
|
12
14
|
class Migration {
|
|
15
|
+
$operations = [];
|
|
16
|
+
$connection;
|
|
17
|
+
$logger;
|
|
18
|
+
$collectionList;
|
|
13
19
|
constructor(connection, logger) {
|
|
14
|
-
this.$operations = [];
|
|
15
20
|
this.$connection = Database.connection(connection);
|
|
16
21
|
this.$logger = logger;
|
|
17
22
|
}
|
|
@@ -20,6 +25,12 @@ function createMigration(Database) {
|
|
|
20
25
|
this.createCollection(collectionName);
|
|
21
26
|
}
|
|
22
27
|
}
|
|
28
|
+
dropCollection(collectionName) {
|
|
29
|
+
this.$operations.push({
|
|
30
|
+
type: MigrationType.DropCollection,
|
|
31
|
+
collectionName,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
23
34
|
createCollection(collectionName) {
|
|
24
35
|
this.$operations.push({
|
|
25
36
|
type: MigrationType.CreateCollection,
|
|
@@ -54,6 +65,7 @@ function createMigration(Database) {
|
|
|
54
65
|
await this._dropIndexes(session);
|
|
55
66
|
await this._createIndexes(session);
|
|
56
67
|
await this._executeDeferred(session);
|
|
68
|
+
await this._dropCollections();
|
|
57
69
|
}
|
|
58
70
|
async _listCollections() {
|
|
59
71
|
if (this.$collectionList)
|
|
@@ -67,6 +79,13 @@ function createMigration(Database) {
|
|
|
67
79
|
this.$collectionList = list.map((element) => element.name);
|
|
68
80
|
return this.$collectionList;
|
|
69
81
|
}
|
|
82
|
+
async _dropCollections() {
|
|
83
|
+
const db = await this.$connection.database();
|
|
84
|
+
for (const op of this.$operations.filter(isDropCollection)) {
|
|
85
|
+
this.$logger.info(`Dropping collection ${op.collectionName}`);
|
|
86
|
+
await db.dropCollection(op.collectionName);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
70
89
|
async _createCollections(session) {
|
|
71
90
|
const db = await this.$connection.database();
|
|
72
91
|
for (const op of this.$operations.filter(isCreateCollection)) {
|
|
@@ -108,7 +127,9 @@ function createMigration(Database) {
|
|
|
108
127
|
}
|
|
109
128
|
return Migration;
|
|
110
129
|
}
|
|
111
|
-
|
|
130
|
+
function isDropCollection(op) {
|
|
131
|
+
return op.type === MigrationType.DropCollection;
|
|
132
|
+
}
|
|
112
133
|
function isCreateCollection(op) {
|
|
113
134
|
return op.type === MigrationType.CreateCollection;
|
|
114
135
|
}
|
|
@@ -121,4 +142,4 @@ function isDropIndex(op) {
|
|
|
121
142
|
function isCustom(op) {
|
|
122
143
|
return op.type === MigrationType.Custom;
|
|
123
144
|
}
|
|
124
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
145
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWlncmF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL01pZ3JhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQTJEQSxrQ0ErSUM7QUE1TEQsSUFBSyxhQU1KO0FBTkQsV0FBSyxhQUFhO0lBQ2hCLGtEQUFpQyxDQUFBO0lBQ2pDLHNEQUFxQyxDQUFBO0lBQ3JDLHdDQUF1QixDQUFBO0lBQ3ZCLDRDQUEyQixDQUFBO0lBQzNCLGtDQUFpQixDQUFBO0FBQ25CLENBQUMsRUFOSSxhQUFhLEtBQWIsYUFBYSxRQU1qQjtBQXNDRCw4REFBOEQ7QUFDOUQsU0FBd0IsZUFBZSxDQUFDLFFBQTBCO0lBQ2hFLE1BQWUsU0FBUztRQUNkLFdBQVcsR0FBeUIsRUFBRSxDQUFDO1FBQ3ZDLFdBQVcsQ0FBcUI7UUFDaEMsT0FBTyxDQUFTO1FBQ2hCLGVBQWUsQ0FBVztRQUVsQyxZQUFtQixVQUE4QixFQUFFLE1BQWM7WUFDL0QsSUFBSSxDQUFDLFdBQVcsR0FBRyxRQUFRLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQ25ELElBQUksQ0FBQyxPQUFPLEdBQUcsTUFBTSxDQUFDO1FBQ3hCLENBQUM7UUFFTSxpQkFBaUIsQ0FBQyxlQUF5QjtZQUNoRCxLQUFLLE1BQU0sY0FBYyxJQUFJLGVBQWUsRUFBRSxDQUFDO2dCQUM3QyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsY0FBYyxDQUFDLENBQUM7WUFDeEMsQ0FBQztRQUNILENBQUM7UUFFTSxjQUFjLENBQUMsY0FBc0I7WUFDMUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUM7Z0JBQ3BCLElBQUksRUFBRSxhQUFhLENBQUMsY0FBYztnQkFDbEMsY0FBYzthQUNmLENBQUMsQ0FBQztRQUNMLENBQUM7UUFFTSxnQkFBZ0IsQ0FBQyxjQUFzQjtZQUM1QyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQztnQkFDcEIsSUFBSSxFQUFFLGFBQWEsQ0FBQyxnQkFBZ0I7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
|
package/lib/src/Model/Model.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { BulkWriteOptions, ClientSession, Collection, CountDocumentsOptions, DeleteOptions, Document, ExplainVerbosityLike, Filter, FindOptions, InsertOneOptions, SortDirection } from 'mongodb';
|
|
2
|
-
import { DatabaseContract } from '@ioc:Zakodium/Mongodb/Database';
|
|
3
|
-
import {
|
|
1
|
+
import type { BulkWriteOptions, ClientSession, Collection, CountDocumentsOptions, DeleteOptions, Document, ExplainVerbosityLike, Filter, FindOptions, InsertOneOptions, SortDirection } from 'mongodb';
|
|
2
|
+
import type { DatabaseContract } from '@ioc:Zakodium/Mongodb/Database';
|
|
3
|
+
import type { ComputedOptions, FieldOptions, ForbiddenQueryOptions, ModelAdapterOptions, ModelAttributes, ModelDocumentOptions, MongodbDocument, NoExtraProperties, QueryContract, QuerySortObject } from '@ioc:Zakodium/Mongodb/Odm';
|
|
4
4
|
declare class Query<ModelType extends typeof BaseModel> implements QueryContract<InstanceType<ModelType>> {
|
|
5
5
|
private filter;
|
|
6
6
|
private options;
|
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) {
|
|
@@ -125,7 +128,9 @@ class Query {
|
|
|
125
128
|
async explain(verbosity) {
|
|
126
129
|
const collection = await this.ModelConstructor.getCollection();
|
|
127
130
|
const driverOptions = this.getDriverOptions();
|
|
128
|
-
return collection
|
|
131
|
+
return collection
|
|
132
|
+
.find(this.filter, driverOptions)
|
|
133
|
+
.explain(verbosity);
|
|
129
134
|
}
|
|
130
135
|
async *[Symbol.asyncIterator]() {
|
|
131
136
|
const collection = await this.ModelConstructor.getCollection();
|
|
@@ -151,15 +156,28 @@ function ensureSort(options) {
|
|
|
151
156
|
_id: -1,
|
|
152
157
|
};
|
|
153
158
|
}
|
|
154
|
-
function hasOwn(object, key) {
|
|
155
|
-
return Object.prototype.hasOwnProperty.call(object, key);
|
|
156
|
-
}
|
|
157
159
|
class BaseModel {
|
|
160
|
+
static connection;
|
|
161
|
+
static collectionName;
|
|
162
|
+
static booted;
|
|
163
|
+
static $fieldsDefinitions;
|
|
164
|
+
/**
|
|
165
|
+
* A set of properties marked as computed. Computed properties are included in
|
|
166
|
+
* the `toJSON` result, else they behave the same way as any other instance
|
|
167
|
+
* property.
|
|
168
|
+
*/
|
|
169
|
+
static $computedDefinitions;
|
|
170
|
+
_id;
|
|
171
|
+
createdAt;
|
|
172
|
+
updatedAt;
|
|
173
|
+
$original;
|
|
174
|
+
$attributes;
|
|
175
|
+
$isPersisted = false;
|
|
176
|
+
$isLocal = true;
|
|
177
|
+
$isDeleted = false;
|
|
178
|
+
$collection = null;
|
|
179
|
+
$options;
|
|
158
180
|
constructor(dbObj, options, alreadyExists = false) {
|
|
159
|
-
this.$isPersisted = false;
|
|
160
|
-
this.$isLocal = true;
|
|
161
|
-
this.$isDeleted = false;
|
|
162
|
-
this.$collection = null;
|
|
163
181
|
if (dbObj) {
|
|
164
182
|
this.$original = alreadyExists ? (0, lodash_1.cloneDeep)(dbObj) : {};
|
|
165
183
|
this.$attributes = dbObj;
|
|
@@ -179,6 +197,7 @@ class BaseModel {
|
|
|
179
197
|
// eslint-disable-next-line no-constructor-return
|
|
180
198
|
return new Proxy(this, proxyHandler_1.proxyHandler);
|
|
181
199
|
}
|
|
200
|
+
static $database;
|
|
182
201
|
static $setDatabase(database) {
|
|
183
202
|
this.$database = database;
|
|
184
203
|
}
|
|
@@ -220,7 +239,7 @@ class BaseModel {
|
|
|
220
239
|
* Define the property when not defined on self. This makes sure that all
|
|
221
240
|
* subclasses boot on their own.
|
|
222
241
|
*/
|
|
223
|
-
if (!hasOwn(this, 'booted')) {
|
|
242
|
+
if (!Object.hasOwn(this, 'booted')) {
|
|
224
243
|
this.booted = false;
|
|
225
244
|
}
|
|
226
245
|
/**
|
|
@@ -536,4 +555,4 @@ class BaseAutoIncrementModel extends BaseModel {
|
|
|
536
555
|
}
|
|
537
556
|
}
|
|
538
557
|
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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"}
|
|
558
|
+
//# 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,4 +1,4 @@
|
|
|
1
|
-
import { ComputedDecorator, FieldDecorator } from '@ioc:Zakodium/Mongodb/Odm';
|
|
1
|
+
import type { ComputedDecorator, FieldDecorator } from '@ioc:Zakodium/Mongodb/Odm';
|
|
2
2
|
export declare const field: FieldDecorator;
|
|
3
3
|
/**
|
|
4
4
|
* Define computed property on a model. The decorator needs a
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zakodium/adonis-mongodb",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.20.0",
|
|
4
4
|
"description": "MongoDB provider for AdonisJs",
|
|
5
5
|
"main": "./lib/providers/MongodbProvider.js",
|
|
6
6
|
"types": "./lib/adonis-typings/index.d.ts",
|
|
@@ -65,22 +65,22 @@
|
|
|
65
65
|
"@adonisjs/core": "^5.9.0",
|
|
66
66
|
"@adonisjs/logger": "^4.1.5",
|
|
67
67
|
"@poppinss/cliui": "^3.0.5",
|
|
68
|
-
"@types/jest": "^29.5.
|
|
69
|
-
"@types/lodash": "^4.
|
|
68
|
+
"@types/jest": "^29.5.14",
|
|
69
|
+
"@types/lodash": "^4.17.13",
|
|
70
70
|
"@types/pluralize": "0.0.29",
|
|
71
|
-
"eslint": "^
|
|
72
|
-
"eslint-config-zakodium": "^
|
|
71
|
+
"eslint": "^9.16.0",
|
|
72
|
+
"eslint-config-zakodium": "^14.0.0",
|
|
73
73
|
"jest": "^29.7.0",
|
|
74
|
-
"prettier": "^3.
|
|
75
|
-
"rimraf": "^
|
|
76
|
-
"ts-jest": "^29.
|
|
77
|
-
"typescript": "^5.
|
|
74
|
+
"prettier": "^3.4.1",
|
|
75
|
+
"rimraf": "^6.0.1",
|
|
76
|
+
"ts-jest": "^29.2.5",
|
|
77
|
+
"typescript": "^5.7.2"
|
|
78
78
|
},
|
|
79
79
|
"dependencies": {
|
|
80
80
|
"@poppinss/utils": "^5.0.0",
|
|
81
|
-
"cli-table3": "^0.6.
|
|
81
|
+
"cli-table3": "^0.6.5",
|
|
82
82
|
"lodash": "^4.17.21",
|
|
83
|
-
"mongodb": "^6.
|
|
83
|
+
"mongodb": "^6.11.0",
|
|
84
84
|
"pluralize": "^8.0.0"
|
|
85
85
|
}
|
|
86
86
|
}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { esmResolver } from '@poppinss/utils';
|
|
2
2
|
import { ObjectId } from 'mongodb';
|
|
3
3
|
|
|
4
|
-
import {
|
|
4
|
+
import type {
|
|
5
5
|
AuthManagerContract,
|
|
6
6
|
ProviderUserContract,
|
|
7
7
|
UserProviderContract,
|
|
8
8
|
} from '@ioc:Adonis/Addons/Auth';
|
|
9
|
-
import { HashDriverContract } from '@ioc:Adonis/Core/Hash';
|
|
9
|
+
import type { HashDriverContract } from '@ioc:Adonis/Core/Hash';
|
|
10
10
|
import type {
|
|
11
11
|
MongodbDocument,
|
|
12
12
|
MongodbModel,
|