@zakodium/adonis-mongodb 0.19.0 → 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 -8
- package/lib/adonis-typings/database.d.ts +4 -6
- 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 +1 -2
- package/lib/commands/MongodbListMigrations.d.ts +0 -1
- package/lib/commands/MongodbMigrate.d.ts +0 -1
- package/lib/commands/MongodbMigrate.js +18 -8
- package/lib/commands/util/MigrationCommand.d.ts +0 -2
- package/lib/commands/util/MigrationCommand.js +18 -8
- package/lib/commands/util/transformMigrations.d.ts +1 -1
- package/lib/commands/util/transformMigrations.js +2 -2
- package/lib/providers/MongodbProvider.d.ts +1 -12
- package/lib/src/Auth/MongodbModelAuthProvider.d.ts +2 -7
- package/lib/src/Auth/MongodbModelAuthProvider.js +2 -3
- package/lib/src/Database/Connection.d.ts +3 -5
- package/lib/src/Database/Connection.js +1 -1
- package/lib/src/Database/ConnectionManager.d.ts +1 -3
- package/lib/src/Database/ConnectionManager.js +3 -1
- package/lib/src/Database/Database.d.ts +2 -4
- package/lib/src/Database/TransactionEventEmitter.d.ts +1 -2
- package/lib/src/Migration.d.ts +0 -1
- package/lib/src/Migration.js +20 -2
- package/lib/src/Model/Model.d.ts +3 -7
- package/lib/src/Model/Model.js +4 -2
- package/lib/src/Odm/decorators.d.ts +1 -4
- package/package.json +11 -11
- package/src/Auth/MongodbModelAuthProvider.ts +2 -2
- package/src/Database/Connection.ts +3 -3
- package/src/Database/ConnectionManager.ts +3 -1
- package/src/Database/Database.ts +2 -2
- package/src/Database/TransactionEventEmitter.ts +1 -1
- package/src/Migration.ts +33 -4
- package/src/Model/Model.ts +14 -12
- package/src/Model/proxyHandler.ts +1 -1
- package/src/Odm/decorators.ts +1 -1
package/README.md
CHANGED
|
@@ -1,12 +1,7 @@
|
|
|
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" />
|
|
6
1
|
declare module '@ioc:Adonis/Core/Application' {
|
|
7
|
-
import { DatabaseContract } from '@ioc:Zakodium/Mongodb/Database';
|
|
8
|
-
import Migration from '@ioc:Zakodium/Mongodb/Migration';
|
|
9
|
-
import * as Odm from '@ioc:Zakodium/Mongodb/Odm';
|
|
2
|
+
import type { DatabaseContract } from '@ioc:Zakodium/Mongodb/Database';
|
|
3
|
+
import type Migration from '@ioc:Zakodium/Mongodb/Migration';
|
|
4
|
+
import type * as Odm from '@ioc:Zakodium/Mongodb/Odm';
|
|
10
5
|
interface ContainerBindings {
|
|
11
6
|
'Zakodium/Mongodb/Database': DatabaseContract;
|
|
12
7
|
'Zakodium/Mongodb/Odm': typeof Odm;
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
/// <reference path="transaction.d.ts" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
1
|
declare module '@ioc:Zakodium/Mongodb/Database' {
|
|
4
|
-
import { EventEmitter } from 'node:events';
|
|
5
|
-
import {
|
|
6
|
-
import { TransactionEventEmitter } from '@ioc:Zakodium/Mongodb/Database/Transaction';
|
|
2
|
+
import type { EventEmitter } from 'node:events';
|
|
3
|
+
import type { ClientSession, Collection, Db, Document, MongoClient, MongoClientOptions, TransactionOptions } from 'mongodb';
|
|
4
|
+
import type { TransactionEventEmitter } from '@ioc:Zakodium/Mongodb/Database/Transaction';
|
|
7
5
|
/**
|
|
8
6
|
* Shape of the configuration in `config/mongodb.ts`.
|
|
9
7
|
*/
|
|
@@ -107,7 +105,7 @@ declare module '@ioc:Zakodium/Mongodb/Database' {
|
|
|
107
105
|
/**
|
|
108
106
|
* Initiate the connection.
|
|
109
107
|
*/
|
|
110
|
-
connect():
|
|
108
|
+
connect(): Promise<Db>;
|
|
111
109
|
/**
|
|
112
110
|
* Close the connection.
|
|
113
111
|
*/
|
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
declare module '@ioc:Zakodium/Mongodb/Migration' {
|
|
2
|
-
import {
|
|
2
|
+
import type { ClientSession, CreateIndexesOptions, Db, DropIndexesOptions, IndexSpecification } from 'mongodb';
|
|
3
3
|
export default abstract class Migration {
|
|
4
4
|
createCollections(collectionNames: string[]): void;
|
|
5
|
+
/**
|
|
6
|
+
* Drop a collection.
|
|
7
|
+
* This operation will be done last in the migration.
|
|
8
|
+
* It cannot be run in a transaction, so we recommend doing it in a separate migration file.
|
|
9
|
+
* @param collectionName
|
|
10
|
+
*/
|
|
11
|
+
dropCollection(collectionName: string): void;
|
|
5
12
|
createCollection(collectionName: string): void;
|
|
6
13
|
createIndex(collectionName: string, index: IndexSpecification, options?: Omit<CreateIndexesOptions, 'session'>): void;
|
|
7
14
|
dropIndex(collectionName: string, indexName: string, options?: Omit<DropIndexesOptions, 'session'>): void;
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
/// <reference types="@adonisjs/auth" />
|
|
2
|
-
/// <reference types="@adonisjs/hash/build/adonis-typings" />
|
|
3
1
|
declare module '@ioc:Zakodium/Mongodb/Odm' {
|
|
4
|
-
import {
|
|
5
|
-
import { UserProviderContract } from '@ioc:Adonis/Addons/Auth';
|
|
6
|
-
import { HashersList } from '@ioc:Adonis/Core/Hash';
|
|
2
|
+
import type { BulkWriteOptions, ClientSession, Collection, CountDocumentsOptions, DeleteOptions, Document, ExplainVerbosityLike, Filter, FindOptions, InsertOneOptions, SortDirection } from 'mongodb';
|
|
3
|
+
import type { UserProviderContract } from '@ioc:Adonis/Addons/Auth';
|
|
4
|
+
import type { HashersList } from '@ioc:Adonis/Core/Hash';
|
|
7
5
|
type DollarProperties<T> = Extract<keyof T, `$${string}`>;
|
|
8
6
|
type FunctionProperties<T> = {
|
|
9
7
|
[K in keyof T]: T[K] extends Function ? K : never;
|
|
@@ -251,9 +249,7 @@ declare module '@ioc:Zakodium/Mongodb/Odm' {
|
|
|
251
249
|
*/
|
|
252
250
|
[Symbol.asyncIterator](): AsyncIterableIterator<DocumentType>;
|
|
253
251
|
}
|
|
254
|
-
type Impossible<K extends keyof any> =
|
|
255
|
-
[P in K]: never;
|
|
256
|
-
};
|
|
252
|
+
type Impossible<K extends keyof any> = Record<K, never>;
|
|
257
253
|
type NoExtraProperties<T, U extends T = T> = U & Impossible<Exclude<keyof U, keyof T>>;
|
|
258
254
|
const BaseModel: MongodbModel<unknown>;
|
|
259
255
|
const BaseAutoIncrementModel: MongodbModel<number>;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
1
|
declare module '@ioc:Zakodium/Mongodb/Database/Transaction' {
|
|
3
2
|
import { EventEmitter } from 'node:events';
|
|
4
|
-
import { ClientSession, Db } from 'mongodb';
|
|
3
|
+
import type { ClientSession, Db } from 'mongodb';
|
|
5
4
|
interface TransactionEvents {
|
|
6
5
|
/**
|
|
7
6
|
* The transaction commits successfully.
|
|
@@ -21,13 +21,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
21
21
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
22
22
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
23
23
|
};
|
|
24
|
-
var __importStar = (this && this.__importStar) || function (
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
};
|
|
24
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
25
|
+
var ownKeys = function(o) {
|
|
26
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
27
|
+
var ar = [];
|
|
28
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
29
|
+
return ar;
|
|
30
|
+
};
|
|
31
|
+
return ownKeys(o);
|
|
32
|
+
};
|
|
33
|
+
return function (mod) {
|
|
34
|
+
if (mod && mod.__esModule) return mod;
|
|
35
|
+
var result = {};
|
|
36
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
37
|
+
__setModuleDefault(result, mod);
|
|
38
|
+
return result;
|
|
39
|
+
};
|
|
40
|
+
})();
|
|
31
41
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
32
42
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
33
43
|
};
|
|
@@ -158,4 +168,4 @@ __decorate([
|
|
|
158
168
|
__metadata("design:paramtypes", [Object]),
|
|
159
169
|
__metadata("design:returntype", Promise)
|
|
160
170
|
], MongodbMigrate.prototype, "run", null);
|
|
161
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
171
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9uZ29kYk1pZ3JhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9jb21tYW5kcy9Nb25nb2RiTWlncmF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGdFQUF5RDtBQUN6RCxxQ0FBbUM7QUFLbkMsNEVBR2lDO0FBY2pDLE1BQXFCLGNBQWUsU0FBUSwwQkFBZ0I7SUFDbkQsTUFBTSxDQUFDLFdBQVcsR0FBRyx1QkFBdUIsQ0FBQztJQUM3QyxNQUFNLENBQUMsV0FBVyxHQUFHLDRCQUE0QixDQUFDO0lBQ2xELE1BQU0sQ0FBQyxRQUFRLEdBQUc7UUFDdkIsT0FBTyxFQUFFLElBQUk7S0FDZCxDQUFDO0lBRU0sS0FBSyxDQUFDLGlCQUFpQixDQUFDLEVBQW9CO1FBQ2xELE1BQU0sVUFBVSxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNoRCxNQUFNLFVBQVUsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRS9ELE1BQU0saUJBQWlCLEdBQUcsTUFBTSxVQUFVLENBQUMsVUFBVSxDQUNuRCw4Q0FBMkIsQ0FDNUIsQ0FBQztRQUVGLE1BQU0sYUFBYSxHQUFHLE1BQU0sVUFBVSxDQUFDLFVBQVUsQ0FDL0MsMENBQXVCLENBQ3hCLENBQUM7UUFFRixNQUFNLElBQUksR0FBRyxNQUFNLGlCQUFpQixDQUFDLFNBQVMsQ0FDNUM7WUFDRSxHQUFHLEVBQUUsZ0JBQWdCO1NBQ3RCLEVBQ0Q7WUFDRSxJQUFJLEVBQUUsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFO1NBQ3hCLEVBQ0Q7WUFDRSxNQUFNLEVBQUUsSUFBSTtTQUNiLENBQ0YsQ0FBQztRQUVGLElBQUksSUFBSSxDQUFDLGFBQWEsS0FBSyxDQUFDLElBQUksSUFBSSxDQUFDLGFBQWEsS0FBSyxDQUFDLEVB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
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
/// <reference path="../../adonis-typings/database.d.ts" />
|
|
2
|
-
/// <reference path="../../adonis-typings/migration.d.ts" />
|
|
3
1
|
import { BaseCommand } from '@adonisjs/core/build/standalone';
|
|
4
2
|
import { Logger } from '@poppinss/cliui/build/src/Logger';
|
|
5
3
|
import type { ConnectionContract, DatabaseContract, MongodbConnectionConfig } from '@ioc:Zakodium/Mongodb/Database';
|
|
@@ -21,13 +21,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
21
21
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
22
22
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
23
23
|
};
|
|
24
|
-
var __importStar = (this && this.__importStar) || function (
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
};
|
|
24
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
25
|
+
var ownKeys = function(o) {
|
|
26
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
27
|
+
var ar = [];
|
|
28
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
29
|
+
return ar;
|
|
30
|
+
};
|
|
31
|
+
return ownKeys(o);
|
|
32
|
+
};
|
|
33
|
+
return function (mod) {
|
|
34
|
+
if (mod && mod.__esModule) return mod;
|
|
35
|
+
var result = {};
|
|
36
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
37
|
+
__setModuleDefault(result, mod);
|
|
38
|
+
return result;
|
|
39
|
+
};
|
|
40
|
+
})();
|
|
31
41
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
32
42
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
33
43
|
};
|
|
@@ -95,4 +105,4 @@ __decorate([
|
|
|
95
105
|
standalone_1.flags.string({ description: 'Database connection to use for the migration' }),
|
|
96
106
|
__metadata("design:type", String)
|
|
97
107
|
], MigrationCommand.prototype, "connection", void 0);
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWlncmF0aW9uQ29tbWFuZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2NvbW1hbmRzL3V0aWwvTWlncmF0aW9uQ29tbWFuZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwrQ0FBMkM7QUFDM0MsMERBQTZCO0FBRTdCLGdFQUFxRTtBQVVyRSxnRkFFK0I7QUFFL0IsTUFBTSxNQUFNLEdBQUcsb0JBQW9CLENBQUM7QUFFdkIsUUFBQSx1QkFBdUIsR0FBRyxrQkFBa0IsQ0FBQztBQUM3QyxRQUFBLDJCQUEyQixHQUFHLHVCQUF1QixDQUFDO0FBVW5FLE1BQThCLGdCQUFpQixTQUFRLHdCQUFXO0lBQ3pELE1BQU0sQ0FBQyxRQUFRLEdBQUc7UUFDdkIsT0FBTyxFQUFFLElBQUk7S0FDZCxDQUFDO0lBRUssTUFBTSxDQUFDLFdBQVcsR0FBRyxhQUFhLENBQUM7SUFDbkMsTUFBTSxDQUFDLFdBQVcsR0FBRyxhQUFhLENBQUM7SUFHbkMsVUFBVSxDQUFTO0lBRWhCLEtBQUssQ0FBQyxhQUFhLENBQzNCLEVBQW9CO1FBRXBCLElBQUksSUFBSSxDQUFDLFVBQVUsSUFBSSxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDO1lBQ3hELElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUNmLCtDQUErQyxJQUFJLENBQUMsVUFBVSxHQUFHLENBQ2xFLENBQUM7WUFDRixJQUFJLENBQUMsUUFBUSxHQUFHLENBQUMsQ0FBQztZQUNsQixNQUFNLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNwQixDQUFDO1FBQ0QsT0FBTyxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUN4QyxDQUFDO0lBRVMsS0FBSyxDQUFDLGFBQWEsQ0FDM0IsTUFBK0I7UUFFL0IsTUFBTSxPQUFPLEdBQ1gsTUFBTSxDQUFDLFVBQVUsSUFBSSxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sR0FBRyxDQUFDO1lBQy9DLENBQUMsQ0FBQyxNQUFNLENBQUMsVUFBVTtZQUNuQixDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUVmLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUN6QyxPQUFPO2FBQ0osR0FBRyxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxtQkFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQzthQUM1RCxHQUFHLENBQUMsS0FBSyxFQUFFLGNBQWMsRUFBRSxFQUFFO1lBQzVCLElBQUksQ0FBQztnQkFDSCxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUEsa0JBQU8sRUFBQyxjQUFjLENBQUMsQ0FBQztnQkFDNUMsT0FBTyxLQUFLO3FCQUNULE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO29CQUNmLE9BQU87b0JBQ0wsd0RBQXdEO29CQUN4RCxlQUFlLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FDMUQsQ0FBQztnQkFDSixDQUFDLENBQUM7cUJBQ0QsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxtQkFBSSxDQUFDLElBQUksQ0FBQyxjQUFjLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUNwRCxDQUFDO1lBQUMsTUFBTSxDQUFDO2dCQUNQLE9BQU8sRUFBRSxDQUFDO1lBQ1osQ0FBQztRQUNILENBQUMsQ0FBQyxDQUNMLENBQUM7UUFFRixPQUFPLElBQUEsNkJBQW1CLEVBQUMsaUJBQWlCLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzdELENBQUM7SUFFUyxLQUFLLENBQUMsZUFBZSxDQUM3QixJQUFZO1FBRVosTUFBTSxNQUFNLEdBQW9CLHlCQUFhLElBQUksdUNBQUMsQ0FBQztRQUNuRCxNQUFNLEVBQUUsT0FBTyxFQUFFLFNBQVMsRUFBRSxXQUFXLEVBQUUsR0FBRyxNQUFNLENBQUM7UUFDbkQsSUFBSSxDQUFDLFNBQVMsSUFBSSxPQUFPLFNBQVMsS0FBSyxVQUFVLEVBQUUsQ0FBQztZQUNsRCxNQUFNLElBQUksS0FBSyxDQUFDLGdCQUFnQixJQUFJLDhCQUE4QixDQUFDLENBQUM7UUFDdEUsQ0FBQztRQUNELE9BQU8sRUFBRSxTQUFTLEVBQUUsV0FBVyxFQUFFLENBQUM7SUFDcEMsQ0FBQzs7QUFoRUgsbUNBaUVDO0FBeERRO0lBRE4sa0JBQUssQ0FBQyxNQUFNLENBQUMsRUFBRSxXQUFXLEVBQUUsOENBQThDLEVBQUUsQ0FBQzs7b0RBQ3BEIn0=
|
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.default = transformMigrations;
|
|
6
7
|
const node_path_1 = __importDefault(require("node:path"));
|
|
7
8
|
const matchTimestamp = /^(?<timestamp>\d+)_.*$/;
|
|
8
9
|
function transformMigrations(rawMigrations, logger) {
|
|
@@ -40,5 +41,4 @@ function transformMigrations(rawMigrations, logger) {
|
|
|
40
41
|
}
|
|
41
42
|
return migrations;
|
|
42
43
|
}
|
|
43
|
-
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNmb3JtTWlncmF0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2NvbW1hbmRzL3V0aWwvdHJhbnNmb3JtTWlncmF0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDBEQUE2QjtBQUk3QixNQUFNLGNBQWMsR0FBRyx3QkFBd0IsQ0FBQztBQU9oRCxTQUF3QixtQkFBbUIsQ0FDekMsYUFBeUIsRUFDekIsTUFBZTtJQUVmLGdDQUFnQztJQUNoQyxNQUFNLFVBQVUsR0FBMkIsYUFBYTtTQUNyRCxJQUFJLEVBQUU7U0FDTixJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FDYixtQkFBSTtTQUNELFFBQVEsQ0FBQyxDQUFDLEVBQUUsbUJBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7U0FDNUIsYUFBYSxDQUFDLG1CQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxtQkFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQ3BEO1NBQ0EsR0FBRyxDQUFDLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ3ZCLElBQUksRUFBRSxtQkFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsbUJBQUksQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDL0QsSUFBSSxFQUFFLGFBQWE7S0FDcEIsQ0FBQyxDQUFDLENBQUM7SUFFTiw2QkFBNkI7SUFDN0IsSUFBSSxVQUFVLEdBQUcsS0FBSyxDQUFDO0lBQ3ZCLEtBQUssTUFBTSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxVQUFVLEVBQUUsQ0FBQztRQUN4QyxNQUFNLEtBQUssR0FBRyxjQUFjLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3hDLE1BQU0sU0FBUyxHQUFHLE1BQU0sQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ25ELElBQUksTUFBTSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsSUFBSSxTQUFTLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDL0MsVUFBVSxHQUFHLElBQUksQ0FBQztZQUNsQixJQUFJLE1BQU0sRUFBRSxDQUFDO2dCQUNYLE1BQU0sQ0FBQyxLQUFLLENBQ1YsMkJBQTJCLElBQUksb0NBQW9DLENBQ3BFLENBQUM7WUFDSixDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFDRCxJQUFJLFVBQVUsRUFBRSxDQUFDO1FBQ2YsTUFBTSxJQUFJLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO0lBQ3hELENBQUM7SUFFRCx3Q0FBd0M7SUFDeEMsTUFBTSxVQUFVLEdBQUcsSUFBSSxHQUFHLENBQ3hCLFVBQVUsQ0FBQyxNQUFNLENBQ2YsQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLEtBQUssRUFBRSxFQUFFLENBQ2xCLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssS0FBSyxDQUN4RSxDQUNGLENBQUM7SUFDRixJQUFJLFVBQVUsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDeEIsTUFBTSxJQUFJLEtBQUssQ0FDYix5Q0FBeUMsQ0FBQyxHQUFHLFVBQVUsQ0FBQzthQUNyRCxHQUFHLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUM7YUFDdkIsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQ2hCLENBQUM7SUFDSixDQUFDO0lBRUQsT0FBTyxVQUFVLENBQUM7QUFDcEIsQ0FBQztBQW5ERCxzQ0FtREMifQ==
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNmb3JtTWlncmF0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2NvbW1hbmRzL3V0aWwvdHJhbnNmb3JtTWlncmF0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQVdBLHNDQW1EQztBQTlERCwwREFBNkI7QUFJN0IsTUFBTSxjQUFjLEdBQUcsd0JBQXdCLENBQUM7QUFPaEQsU0FBd0IsbUJBQW1CLENBQ3pDLGFBQXlCLEVBQ3pCLE1BQWU7SUFFZixnQ0FBZ0M7SUFDaEMsTUFBTSxVQUFVLEdBQTJCLGFBQWE7U0FDckQsSUFBSSxFQUFFO1NBQ04sSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQ2IsbUJBQUk7U0FDRCxRQUFRLENBQUMsQ0FBQyxFQUFFLG1CQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQzVCLGFBQWEsQ0FBQyxtQkFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsbUJBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUNwRDtTQUNBLEdBQUcsQ0FBQyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUN2QixJQUFJLEVBQUUsbUJBQUksQ0FBQyxRQUFRLENBQUMsYUFBYSxFQUFFLG1CQUFJLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQy9ELElBQUksRUFBRSxhQUFhO0tBQ3BCLENBQUMsQ0FBQyxDQUFDO0lBRU4sNkJBQTZCO0lBQzdCLElBQUksVUFBVSxHQUFHLEtBQUssQ0FBQztJQUN2QixLQUFLLE1BQU0sRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksVUFBVSxFQUFFLENBQUM7UUFDeEMsTUFBTSxLQUFLLEdBQUcsY0FBYyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN4QyxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxTQUFTLENBQUMsQ0FBQztRQUNuRCxJQUFJLE1BQU0sQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLElBQUksU0FBUyxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQy9DLFVBQVUsR0FBRyxJQUFJLENBQUM7WUFDbEIsSUFBSSxNQUFNLEVBQUUsQ0FBQztnQkFDWCxNQUFNLENBQUMsS0FBSyxDQUNWLDJCQUEyQixJQUFJLG9DQUFvQyxDQUNwRSxDQUFDO1lBQ0osQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0lBQ0QsSUFBSSxVQUFVLEVBQUUsQ0FBQztRQUNmLE1BQU0sSUFBSSxLQUFLLENBQUMsb0NBQW9DLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsd0NBQXdDO0lBQ3hDLE1BQU0sVUFBVSxHQUFHLElBQUksR0FBRyxDQUN4QixVQUFVLENBQUMsTUFBTSxDQUNmLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUNsQixVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLEtBQUssQ0FDeEUsQ0FDRixDQUFDO0lBQ0YsSUFBSSxVQUFVLENBQUMsSUFBSSxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ3hCLE1BQU0sSUFBSSxLQUFLLENBQ2IseUNBQXlDLENBQUMsR0FBRyxVQUFVLENBQUM7YUFDckQsR0FBRyxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDO2FBQ3ZCLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUNoQixDQUFDO0lBQ0osQ0FBQztJQUVELE9BQU8sVUFBVSxDQUFDO0FBQ3BCLENBQUMifQ==
|
|
@@ -1,15 +1,4 @@
|
|
|
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" />
|
|
12
|
-
import { ApplicationContract } from '@ioc:Adonis/Core/Application';
|
|
1
|
+
import type { ApplicationContract } from '@ioc:Adonis/Core/Application';
|
|
13
2
|
export default class MongodbProvider {
|
|
14
3
|
protected app: ApplicationContract;
|
|
15
4
|
constructor(app: ApplicationContract);
|
|
@@ -1,10 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
/// <reference path="../../adonis-typings/odm.d.ts" />
|
|
4
|
-
/// <reference types="@adonisjs/auth" />
|
|
5
|
-
/// <reference types="@adonisjs/hash/build/adonis-typings" />
|
|
6
|
-
import { AuthManagerContract, ProviderUserContract, UserProviderContract } from '@ioc:Adonis/Addons/Auth';
|
|
7
|
-
import { HashDriverContract } from '@ioc:Adonis/Core/Hash';
|
|
1
|
+
import type { AuthManagerContract, ProviderUserContract, UserProviderContract } from '@ioc:Adonis/Addons/Auth';
|
|
2
|
+
import type { HashDriverContract } from '@ioc:Adonis/Core/Hash';
|
|
8
3
|
import type { MongodbDocument, MongodbModel, MongodbModelAuthProviderConfig } from '@ioc:Zakodium/Mongodb/Odm';
|
|
9
4
|
declare class MongodbModelAuthProviderUser implements ProviderUserContract<MongodbDocument<unknown>> {
|
|
10
5
|
user: any;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getMongodbModelAuthProvider =
|
|
3
|
+
exports.getMongodbModelAuthProvider = getMongodbModelAuthProvider;
|
|
4
4
|
const utils_1 = require("@poppinss/utils");
|
|
5
5
|
const mongodb_1 = require("mongodb");
|
|
6
6
|
class MongodbModelAuthProviderUser {
|
|
@@ -100,5 +100,4 @@ class MongodbModelAuthUserProvider {
|
|
|
100
100
|
function getMongodbModelAuthProvider(auth, _mapping, config) {
|
|
101
101
|
return new MongodbModelAuthUserProvider(auth, config);
|
|
102
102
|
}
|
|
103
|
-
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9uZ29kYk1vZGVsQXV0aFByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL0F1dGgvTW9uZ29kYk1vZGVsQXV0aFByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDJDQUE4QztBQUM5QyxxQ0FBbUM7QUFjbkMsTUFBTSw0QkFBNEI7SUFNdkI7SUFDQztJQUNBO0lBQ0E7SUFOVjtJQUNFLGdGQUFnRjtJQUNoRiw4REFBOEQ7SUFDdkQsSUFBUyxFQUNSLGFBQXFCLEVBQ3JCLGlCQUFtRCxFQUNuRCxJQUF3QjtRQUh6QixTQUFJLEdBQUosSUFBSSxDQUFLO1FBQ1Isa0JBQWEsR0FBYixhQUFhLENBQVE7UUFDckIsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUFrQztRQUNuRCxTQUFJLEdBQUosSUFBSSxDQUFvQjtJQUMvQixDQUFDO0lBRUcsS0FBSztRQUNWLElBQUksSUFBSSxDQUFDLElBQUksS0FBSyxJQUFJO1lBQUUsT0FBTyxJQUFJLENBQUM7UUFDcEMsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDNUMsSUFBSSxJQUFJLENBQUMsaUJBQWlCLEtBQUssVUFBVSxFQUFFLENBQUM7WUFDMUMsT0FBTyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDMUIsQ0FBQztRQUNELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVNLGNBQWMsQ0FBQyxhQUFxQjtRQUN6QyxJQUFJLElBQUksQ0FBQyxJQUFJLEtBQUssSUFBSSxFQUFFLENBQUM7WUFDdkIsTUFBTSxJQUFJLEtBQUssQ0FBQyw4Q0FBOEMsQ0FBQyxDQUFDO1FBQ2xFLENBQUM7UUFDRCxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUN4QixNQUFNLElBQUksS0FBSyxDQUNiLHlFQUF5RSxDQUMxRSxDQUFDO1FBQ0osQ0FBQztRQUVE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
|
|
103
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9uZ29kYk1vZGVsQXV0aFByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL0F1dGgvTW9uZ29kYk1vZGVsQXV0aFByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBc0pBLGtFQU1DO0FBNUpELDJDQUE4QztBQUM5QyxxQ0FBbUM7QUFjbkMsTUFBTSw0QkFBNEI7SUFNdkI7SUFDQztJQUNBO0lBQ0E7SUFOVjtJQUNFLGdGQUFnRjtJQUNoRiw4REFBOEQ7SUFDdkQsSUFBUyxFQUNSLGFBQXFCLEVBQ3JCLGlCQUFtRCxFQUNuRCxJQUF3QjtRQUh6QixTQUFJLEdBQUosSUFBSSxDQUFLO1FBQ1Isa0JBQWEsR0FBYixhQUFhLENBQVE7UUFDckIsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUFrQztRQUNuRCxTQUFJLEdBQUosSUFBSSxDQUFvQjtJQUMvQixDQUFDO0lBRUcsS0FBSztRQUNWLElBQUksSUFBSSxDQUFDLElBQUksS0FBSyxJQUFJO1lBQUUsT0FBTyxJQUFJLENBQUM7UUFDcEMsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDNUMsSUFBSSxJQUFJLENBQUMsaUJBQWlCLEtBQUssVUFBVSxFQUFFLENBQUM7WUFDMUMsT0FBTyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDMUIsQ0FBQztRQUNELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVNLGNBQWMsQ0FBQyxhQUFxQjtRQUN6QyxJQUFJLElBQUksQ0FBQyxJQUFJLEtBQUssSUFBSSxFQUFFLENBQUM7WUFDdkIsTUFBTSxJQUFJLEtBQUssQ0FBQyw4Q0FBOEMsQ0FBQyxDQUFDO1FBQ2xFLENBQUM7UUFDRCxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUN4QixNQUFNLElBQUksS0FBSyxDQUNiLHlFQUF5RSxDQUMxRSxDQUFDO1FB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
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
/// <reference path="../../adonis-typings/database.d.ts" />
|
|
2
|
-
/// <reference types="@adonisjs/logger/build/adonis-typings/logger" />
|
|
3
|
-
/// <reference types="node" />
|
|
4
1
|
import { EventEmitter } from 'node:events';
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
2
|
+
import type { Db, Collection, ClientSession, Document, TransactionOptions } from 'mongodb';
|
|
3
|
+
import { MongoClient } from 'mongodb';
|
|
4
|
+
import type { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
7
5
|
import type { MongodbConnectionConfig, ConnectionContract } from '@ioc:Zakodium/Mongodb/Database';
|
|
8
6
|
import { TransactionEventEmitter } from './TransactionEventEmitter';
|
|
9
7
|
export declare interface Connection {
|
|
@@ -107,4 +107,4 @@ class Connection extends node_events_1.EventEmitter {
|
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
exports.Connection = Connection;
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9EYXRhYmFzZS9Db25uZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUEyQztBQUUzQywyQ0FBNEM7QUFRNUMscUNBQXNDO0FBUXRDLHVFQUFvRTtBQUVwRSxJQUFLLGdCQUdKO0FBSEQsV0FBSyxnQkFBZ0I7SUFDbkIsMkNBQXVCLENBQUE7SUFDdkIsaURBQTZCLENBQUE7QUFDL0IsQ0FBQyxFQUhJLGdCQUFnQixLQUFoQixnQkFBZ0IsUUFHcEI7QUEwQkQsNEVBQTRFO0FBQzVFLE1BQWEsVUFBVyxTQUFRLDBCQUFZO0lBQzFCLE1BQU0sQ0FBYztJQUNwQixJQUFJLENBQVM7SUFDdEIsS0FBSyxDQUFVO0lBQ04sTUFBTSxDQUEwQjtJQUV4QyxNQUFNLENBQWlCO0lBQ3ZCLE1BQU0sQ0FBbUI7SUFDekIsY0FBYyxDQUFxQjtJQUUzQyxZQUNFLElBQVksRUFDWixNQUErQixFQUMvQixNQUFzQjtRQUV0QixLQUFLLEVBQUUsQ0FBQztRQUVSLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ2pCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3JCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3JCLElBQUksQ0FBQyxNQUFNLEdBQUcsZ0JBQWdCLENBQUMsWUFBWSxDQUFDO1FBQzVDLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxxQkFBVyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFO1lBQzdDLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhO1NBQzdCLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDO0lBQzdCLENBQUM7SUFFTyxLQUFLLENBQUMsU0FBUztRQUNyQixLQUFLLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNwQixJQUFJLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDO1lBQ3pCLE1BQU0sSUFBSSxpQkFBUyxDQUNqQixxQ0FBcUMsRUFDckMsR0FBRyxFQUNILHNCQUFzQixDQUN2QixDQUFDO1FBQ0osQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDLGNBQWMsQ0FBQztJQUM3QixDQUFDO0lBRU0sT0FBTztRQUNaLElBQUksSUFBSSxDQUFDLE1BQU0sS0FBSyxnQkFBZ0IsQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUMvQyxPQUFPLElBQUksQ0FBQyxjQUE2QixDQUFDO1FBQzVDLENBQUM7UUFDRCxJQUFJLENBQUMsTUFBTSxHQUFHLGdCQUFnQixDQUFDLFNBQVMsQ0FBQztRQUN6QyxJQUFJLENBQUMsY0FBYyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQUU7WUFDMUQsT0FBTyxNQUFNLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDekMsQ0FBQyxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ2xDLElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDO1lBQzNCLElBQUksQ0FBQyxNQUFNLEdBQUcsZ0JBQWdCLENBQUMsWUFBWSxDQUFDO1lBQzVDLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLGtDQUFrQyxJQUFJLENBQUMsSUFBSSxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFDekUsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ2xDLENBQUMsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDM0IsT0FBTyxJQUFJLENBQUMsY0FBYyxDQUFDO0lBQzdCLENBQUM7SUFFTSxLQUFLLENBQUMsVUFBVTtRQUNyQixJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssZ0JBQWdCLENBQUMsWUFBWSxFQUFFLENBQUM7WUFDbEQsT0FBTztRQUNULENBQUM7UUFDRCxJQUFJLENBQUMsY0FBYyxHQUFHLElBQUksQ0FBQztRQUMzQixJQUFJLENBQUMsTUFBTSxHQUFHLGdCQUFnQixDQUFDLFlBQVksQ0FBQztRQUM1QyxJQUFJLENBQUMsSUFBSSxDQUFDLGtCQUFrQixFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3BDLElBQUksQ0FBQztZQUNILE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUMxQixJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUNoQyxDQUFDO1FBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztZQUNmLElBQUksQ0FBQyxJQUFJLENBQUMsa0JBQWtCLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQzNDLE1BQU0sS0FBSyxDQUFDO1FBQ2QsQ0FBQztJQUNILENBQUM7SUFFTSxLQUFLLENBQUMsUUFBUTtRQUNuQixPQUFPLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUMxQixDQUFDO0lBRU0sS0FBSyxDQUFDLFVBQVUsQ0FDckIsY0FBc0I7UUFFdEIsTUFBTSxFQUFFLEdBQUcsTUFBTSxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDbEMsT0FBTyxFQUFFLENBQUMsVUFBVSxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7SUFFTSxLQUFLLENBQUMsV0FBVyxDQUN0QixPQUlxQixFQUNyQixPQUE0QjtRQUU1QixNQUFNLEVBQUUsR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUVsQyxJQUFJLE9BQXNCLENBQUM7UUFDM0IsTUFBTSxPQUFPLEdBQUcsSUFBSSxpREFBdUIsRUFBRSxDQUFDO1FBRTlDLE9BQU8sSUFBSSxDQUFDLE1BQU07YUFDZixXQUFXLENBQUMsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUN4QixRQUFRLENBQUMsZUFBZSxDQUFDLEtBQUssRUFBRSxRQUFRLEVBQUUsRUFBRTtZQUMxQyxPQUFPLEdBQUcsUUFBUSxDQUFDO1lBQ25CLE9BQU8sT0FBTyxDQUFDLE9BQU8sRUFBRSxFQUFFLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDdkMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUNaO2FBQ0EsSUFBSSxDQUNILENBQUMsTUFBTSxFQUFFLEVBQUU7WUFDVCxzRkFBc0Y7WUFDdEYscUZBQXFGO1lBQ3JGLGlFQUFpRTtZQUNqRSxzREFBc0Q7WUFDdEQsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUM7WUFDcEQsTUFBTSxTQUFTO1lBQ2IscUZBQXFGO1lBQ3JGLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsRUFBRSxPQUFPLENBQUMsS0FBSyxxQkFBcUIsQ0FBQztZQUV0RSxPQUFPLENBQUMsSUFBSSxDQUNWLFdBQVcsSUFBSSxTQUFTLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUM3QyxPQUFPLEVBQ1AsRUFBRSxDQUNILENBQUM7WUFFRixPQUFPLE1BQU0sQ0FBQztZQUNkLG9DQUFvQztZQUNwQyxpRkFBaUY7WUFDakYsc0ZBQXNGO1FBQ3hGLENBQUMsRUFDRCxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ1IsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsQ0FBQztZQUMxQyxNQUFNLEtBQUssQ0FBQztRQUNkLENBQUMsQ0FDRixDQUFDO0lBQ04sQ0FBQztDQUNGO0FBcElELGdDQW9JQyJ9
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
/// <reference types="@adonisjs/logger/build/adonis-typings/logger" />
|
|
3
|
-
import { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
1
|
+
import type { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
4
2
|
import type { ConnectionManagerContract, ConnectionNode, MongodbConnectionConfig } from '@ioc:Zakodium/Mongodb/Database';
|
|
5
3
|
export declare class ConnectionManager implements ConnectionManagerContract {
|
|
6
4
|
private logger;
|
|
@@ -55,6 +55,8 @@ class ConnectionManager {
|
|
|
55
55
|
}
|
|
56
56
|
connect(connectionName) {
|
|
57
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
|
|
58
60
|
connection.connection.connect();
|
|
59
61
|
}
|
|
60
62
|
get(connectionName) {
|
|
@@ -83,4 +85,4 @@ function validateConnectionName(connectionName) {
|
|
|
83
85
|
throw new TypeError('connectionName must be a non-empty string');
|
|
84
86
|
}
|
|
85
87
|
}
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29ubmVjdGlvbk1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvRGF0YWJhc2UvQ29ubmVjdGlvbk1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQTRDO0FBVTVDLDZDQUEwQztBQUUxQyxNQUFhLGlCQUFpQjtJQUdEO0lBRnBCLFdBQVcsR0FBNkMsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUV6RSxZQUEyQixNQUFzQjtRQUF0QixXQUFNLEdBQU4sTUFBTSxDQUFnQjtJQUFHLENBQUM7SUFFN0Msa0JBQWtCLENBQUMsY0FBc0I7UUFDL0Msc0JBQXNCLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDdkMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDeEQsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ2hCLE1BQU0sSUFBSSxpQkFBUyxDQUNqQiwrQ0FBK0MsY0FBYyxHQUFHLEVBQ2hFLEdBQUcsRUFDSCx5QkFBeUIsQ0FDMUIsQ0FBQztRQUNKLENBQUM7UUFDRCxPQUFPLFVBQVUsQ0FBQztJQUNwQixDQUFDO0lBRU8sYUFBYSxDQUFDLFVBQThCO1FBQ2xELE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3RCxJQUFJLGNBQWMsRUFBRSxDQUFDO1lBQ25CLGNBQWMsQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDO1FBQ2hDLENBQUM7SUFDSCxDQUFDO0lBRU8sV0FBVyxDQUFDLFVBQThCO1FBQ2hELE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3RCxJQUFJLGNBQWMsRUFBRSxDQUFDO1lBQ25CLGNBQWMsQ0FBQyxLQUFLLEdBQUcsUUFBUSxDQUFDO1FBQ2xD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
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
import { ClientSession, Db, TransactionOptions } from 'mongodb';
|
|
4
|
-
import { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
1
|
+
import type { ClientSession, Db, TransactionOptions } from 'mongodb';
|
|
2
|
+
import type { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
5
3
|
import type { ConnectionContract, ConnectionManagerContract, DatabaseContract, MongodbConfig } from '@ioc:Zakodium/Mongodb/Database';
|
|
6
4
|
export declare class Database implements DatabaseContract {
|
|
7
5
|
private config;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
1
|
import { EventEmitter } from 'node:events';
|
|
3
|
-
import { ClientSession, Db } from 'mongodb';
|
|
2
|
+
import type { ClientSession, Db } from 'mongodb';
|
|
4
3
|
export interface TransactionEvents {
|
|
5
4
|
commit: [session: ClientSession, db: Db];
|
|
6
5
|
abort: [session: ClientSession, db: Db, error?: Error];
|
package/lib/src/Migration.d.ts
CHANGED
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";
|
|
@@ -23,6 +25,12 @@ function createMigration(Database) {
|
|
|
23
25
|
this.createCollection(collectionName);
|
|
24
26
|
}
|
|
25
27
|
}
|
|
28
|
+
dropCollection(collectionName) {
|
|
29
|
+
this.$operations.push({
|
|
30
|
+
type: MigrationType.DropCollection,
|
|
31
|
+
collectionName,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
26
34
|
createCollection(collectionName) {
|
|
27
35
|
this.$operations.push({
|
|
28
36
|
type: MigrationType.CreateCollection,
|
|
@@ -57,6 +65,7 @@ function createMigration(Database) {
|
|
|
57
65
|
await this._dropIndexes(session);
|
|
58
66
|
await this._createIndexes(session);
|
|
59
67
|
await this._executeDeferred(session);
|
|
68
|
+
await this._dropCollections();
|
|
60
69
|
}
|
|
61
70
|
async _listCollections() {
|
|
62
71
|
if (this.$collectionList)
|
|
@@ -70,6 +79,13 @@ function createMigration(Database) {
|
|
|
70
79
|
this.$collectionList = list.map((element) => element.name);
|
|
71
80
|
return this.$collectionList;
|
|
72
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
|
+
}
|
|
73
89
|
async _createCollections(session) {
|
|
74
90
|
const db = await this.$connection.database();
|
|
75
91
|
for (const op of this.$operations.filter(isCreateCollection)) {
|
|
@@ -111,7 +127,9 @@ function createMigration(Database) {
|
|
|
111
127
|
}
|
|
112
128
|
return Migration;
|
|
113
129
|
}
|
|
114
|
-
|
|
130
|
+
function isDropCollection(op) {
|
|
131
|
+
return op.type === MigrationType.DropCollection;
|
|
132
|
+
}
|
|
115
133
|
function isCreateCollection(op) {
|
|
116
134
|
return op.type === MigrationType.CreateCollection;
|
|
117
135
|
}
|
|
@@ -124,4 +142,4 @@ function isDropIndex(op) {
|
|
|
124
142
|
function isCustom(op) {
|
|
125
143
|
return op.type === MigrationType.Custom;
|
|
126
144
|
}
|
|
127
|
-
//# 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,10 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
/// <reference path="../../adonis-typings/database.d.ts" />
|
|
5
|
-
import { BulkWriteOptions, ClientSession, Collection, CountDocumentsOptions, DeleteOptions, Document, ExplainVerbosityLike, Filter, FindOptions, InsertOneOptions, SortDirection } from 'mongodb';
|
|
6
|
-
import { DatabaseContract } from '@ioc:Zakodium/Mongodb/Database';
|
|
7
|
-
import { MongodbDocument, QueryContract, NoExtraProperties, ModelAttributes, ModelAdapterOptions, ModelDocumentOptions, FieldOptions, QuerySortObject, ForbiddenQueryOptions, ComputedOptions } from '@ioc:Zakodium/Mongodb/Odm';
|
|
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';
|
|
8
4
|
declare class Query<ModelType extends typeof BaseModel> implements QueryContract<InstanceType<ModelType>> {
|
|
9
5
|
private filter;
|
|
10
6
|
private options;
|
package/lib/src/Model/Model.js
CHANGED
|
@@ -128,7 +128,9 @@ class Query {
|
|
|
128
128
|
async explain(verbosity) {
|
|
129
129
|
const collection = await this.ModelConstructor.getCollection();
|
|
130
130
|
const driverOptions = this.getDriverOptions();
|
|
131
|
-
return collection
|
|
131
|
+
return collection
|
|
132
|
+
.find(this.filter, driverOptions)
|
|
133
|
+
.explain(verbosity);
|
|
132
134
|
}
|
|
133
135
|
async *[Symbol.asyncIterator]() {
|
|
134
136
|
const collection = await this.ModelConstructor.getCollection();
|
|
@@ -553,4 +555,4 @@ class BaseAutoIncrementModel extends BaseModel {
|
|
|
553
555
|
}
|
|
554
556
|
}
|
|
555
557
|
exports.BaseAutoIncrementModel = BaseAutoIncrementModel;
|
|
556
|
-
//# 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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"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
/// <reference path="../../adonis-typings/objectid.d.ts" />
|
|
3
|
-
/// <reference path="../../adonis-typings/odm.d.ts" />
|
|
4
|
-
import { ComputedDecorator, FieldDecorator } from '@ioc:Zakodium/Mongodb/Odm';
|
|
1
|
+
import type { ComputedDecorator, FieldDecorator } from '@ioc:Zakodium/Mongodb/Odm';
|
|
5
2
|
export declare const field: FieldDecorator;
|
|
6
3
|
/**
|
|
7
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,
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { EventEmitter } from 'node:events';
|
|
2
2
|
|
|
3
3
|
import { Exception } from '@poppinss/utils';
|
|
4
|
-
import {
|
|
5
|
-
MongoClient,
|
|
4
|
+
import type {
|
|
6
5
|
Db,
|
|
7
6
|
Collection,
|
|
8
7
|
ClientSession,
|
|
9
8
|
Document,
|
|
10
9
|
TransactionOptions,
|
|
11
10
|
} from 'mongodb';
|
|
11
|
+
import { MongoClient } from 'mongodb';
|
|
12
12
|
|
|
13
|
-
import { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
13
|
+
import type { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
14
14
|
import type {
|
|
15
15
|
MongodbConnectionConfig,
|
|
16
16
|
ConnectionContract,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Exception } from '@poppinss/utils';
|
|
2
2
|
|
|
3
|
-
import { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
3
|
+
import type { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
4
4
|
import type {
|
|
5
5
|
ConnectionContract,
|
|
6
6
|
ConnectionManagerContract,
|
|
@@ -78,6 +78,8 @@ export class ConnectionManager implements ConnectionManagerContract {
|
|
|
78
78
|
|
|
79
79
|
public connect(connectionName: string): void {
|
|
80
80
|
const connection = this.validateConnection(connectionName);
|
|
81
|
+
// Connection error is handled by the `error` event listener.
|
|
82
|
+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
81
83
|
connection.connection.connect();
|
|
82
84
|
}
|
|
83
85
|
|
package/src/Database/Database.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ClientSession, Db, TransactionOptions } from 'mongodb';
|
|
1
|
+
import type { ClientSession, Db, TransactionOptions } from 'mongodb';
|
|
2
2
|
|
|
3
|
-
import { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
3
|
+
import type { LoggerContract } from '@ioc:Adonis/Core/Logger';
|
|
4
4
|
import type {
|
|
5
5
|
ConnectionContract,
|
|
6
6
|
ConnectionManagerContract,
|
package/src/Migration.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { Logger } from '@poppinss/cliui/build/src/Logger';
|
|
2
|
-
import {
|
|
3
|
-
CreateIndexesOptions,
|
|
1
|
+
import type { Logger } from '@poppinss/cliui/build/src/Logger';
|
|
2
|
+
import type {
|
|
4
3
|
ClientSession,
|
|
4
|
+
CreateIndexesOptions,
|
|
5
5
|
Db,
|
|
6
|
-
IndexSpecification,
|
|
7
6
|
DropIndexesOptions,
|
|
7
|
+
IndexSpecification,
|
|
8
8
|
} from 'mongodb';
|
|
9
9
|
|
|
10
10
|
import type {
|
|
@@ -13,12 +13,18 @@ import type {
|
|
|
13
13
|
} from '@ioc:Zakodium/Mongodb/Database';
|
|
14
14
|
|
|
15
15
|
enum MigrationType {
|
|
16
|
+
DropCollection = 'DropCollection',
|
|
16
17
|
CreateCollection = 'CreateCollection',
|
|
17
18
|
DropIndex = 'DropIndex',
|
|
18
19
|
CreateIndex = 'CreateIndex',
|
|
19
20
|
Custom = 'Custom',
|
|
20
21
|
}
|
|
21
22
|
|
|
23
|
+
interface DropCollectionOperation {
|
|
24
|
+
type: MigrationType.DropCollection;
|
|
25
|
+
collectionName: string;
|
|
26
|
+
}
|
|
27
|
+
|
|
22
28
|
interface CreateCollectionOperation {
|
|
23
29
|
type: MigrationType.CreateCollection;
|
|
24
30
|
collectionName: string;
|
|
@@ -44,6 +50,7 @@ interface CustomOperation {
|
|
|
44
50
|
}
|
|
45
51
|
|
|
46
52
|
type MigrationOperation =
|
|
53
|
+
| DropCollectionOperation
|
|
47
54
|
| CreateCollectionOperation
|
|
48
55
|
| DropIndexOperation
|
|
49
56
|
| CreateIndexOperation
|
|
@@ -68,6 +75,13 @@ export default function createMigration(Database: DatabaseContract): any {
|
|
|
68
75
|
}
|
|
69
76
|
}
|
|
70
77
|
|
|
78
|
+
public dropCollection(collectionName: string): void {
|
|
79
|
+
this.$operations.push({
|
|
80
|
+
type: MigrationType.DropCollection,
|
|
81
|
+
collectionName,
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
|
|
71
85
|
public createCollection(collectionName: string): void {
|
|
72
86
|
this.$operations.push({
|
|
73
87
|
type: MigrationType.CreateCollection,
|
|
@@ -114,6 +128,7 @@ export default function createMigration(Database: DatabaseContract): any {
|
|
|
114
128
|
await this._dropIndexes(session);
|
|
115
129
|
await this._createIndexes(session);
|
|
116
130
|
await this._executeDeferred(session);
|
|
131
|
+
await this._dropCollections();
|
|
117
132
|
}
|
|
118
133
|
|
|
119
134
|
private async _listCollections() {
|
|
@@ -128,6 +143,14 @@ export default function createMigration(Database: DatabaseContract): any {
|
|
|
128
143
|
return this.$collectionList;
|
|
129
144
|
}
|
|
130
145
|
|
|
146
|
+
private async _dropCollections(): Promise<void> {
|
|
147
|
+
const db = await this.$connection.database();
|
|
148
|
+
for (const op of this.$operations.filter(isDropCollection)) {
|
|
149
|
+
this.$logger.info(`Dropping collection ${op.collectionName}`);
|
|
150
|
+
await db.dropCollection(op.collectionName);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
|
|
131
154
|
private async _createCollections(session: ClientSession): Promise<void> {
|
|
132
155
|
const db = await this.$connection.database();
|
|
133
156
|
for (const op of this.$operations.filter(isCreateCollection)) {
|
|
@@ -179,6 +202,12 @@ export default function createMigration(Database: DatabaseContract): any {
|
|
|
179
202
|
return Migration;
|
|
180
203
|
}
|
|
181
204
|
|
|
205
|
+
function isDropCollection(
|
|
206
|
+
op: MigrationOperation,
|
|
207
|
+
): op is DropCollectionOperation {
|
|
208
|
+
return op.type === MigrationType.DropCollection;
|
|
209
|
+
}
|
|
210
|
+
|
|
182
211
|
function isCreateCollection(
|
|
183
212
|
op: MigrationOperation,
|
|
184
213
|
): op is CreateCollectionOperation {
|
package/src/Model/Model.ts
CHANGED
|
@@ -2,7 +2,7 @@ import assert from 'node:assert';
|
|
|
2
2
|
|
|
3
3
|
import { defineStaticProperty, Exception } from '@poppinss/utils';
|
|
4
4
|
import { cloneDeep, isEqual, pickBy, snakeCase } from 'lodash';
|
|
5
|
-
import {
|
|
5
|
+
import type {
|
|
6
6
|
BulkWriteOptions,
|
|
7
7
|
ClientSession,
|
|
8
8
|
Collection,
|
|
@@ -19,18 +19,18 @@ import {
|
|
|
19
19
|
} from 'mongodb';
|
|
20
20
|
import pluralize from 'pluralize';
|
|
21
21
|
|
|
22
|
-
import { DatabaseContract } from '@ioc:Zakodium/Mongodb/Database';
|
|
23
|
-
import {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
ModelAttributes,
|
|
22
|
+
import type { DatabaseContract } from '@ioc:Zakodium/Mongodb/Database';
|
|
23
|
+
import type {
|
|
24
|
+
ComputedOptions,
|
|
25
|
+
FieldOptions,
|
|
26
|
+
ForbiddenQueryOptions,
|
|
28
27
|
ModelAdapterOptions,
|
|
28
|
+
ModelAttributes,
|
|
29
29
|
ModelDocumentOptions,
|
|
30
|
-
|
|
30
|
+
MongodbDocument,
|
|
31
|
+
NoExtraProperties,
|
|
32
|
+
QueryContract,
|
|
31
33
|
QuerySortObject,
|
|
32
|
-
ForbiddenQueryOptions,
|
|
33
|
-
ComputedOptions,
|
|
34
34
|
} from '@ioc:Zakodium/Mongodb/Odm';
|
|
35
35
|
|
|
36
36
|
import { proxyHandler } from './proxyHandler';
|
|
@@ -200,7 +200,9 @@ class Query<ModelType extends typeof BaseModel>
|
|
|
200
200
|
public async explain(verbosity?: ExplainVerbosityLike): Promise<Document> {
|
|
201
201
|
const collection = await this.ModelConstructor.getCollection();
|
|
202
202
|
const driverOptions = this.getDriverOptions();
|
|
203
|
-
return collection
|
|
203
|
+
return collection
|
|
204
|
+
.find(this.filter, driverOptions)
|
|
205
|
+
.explain(verbosity as ExplainVerbosityLike);
|
|
204
206
|
}
|
|
205
207
|
|
|
206
208
|
public async *[Symbol.asyncIterator](): AsyncIterableIterator<
|
|
@@ -771,7 +773,7 @@ export class BaseModel {
|
|
|
771
773
|
}
|
|
772
774
|
|
|
773
775
|
export class BaseAutoIncrementModel extends BaseModel {
|
|
774
|
-
public
|
|
776
|
+
declare public readonly _id: number;
|
|
775
777
|
|
|
776
778
|
public async save(
|
|
777
779
|
options?: ModelDocumentOptions<InsertOneOptions>,
|
package/src/Odm/decorators.ts
CHANGED