@orion-js/mongodb 3.0.41 → 3.0.45

package/lib/connect/getMongoConnection.d.ts

@@ -1,4 +1,5 @@
 import { OrionMongoClient } from './connections';
+export declare const allConnectionPromises: any[];
 interface MongoConnectOptions {
     name: string;
     uri?: string;

package/lib/connect/getMongoConnection.js

@@ -3,17 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMongoConnection = void 0;
+exports.getMongoConnection = exports.allConnectionPromises = void 0;
 const mongodb_1 = require("mongodb");
 const connections_1 = require("./connections");
 const getDBName_1 = __importDefault(require("./getDBName"));
 const getMongoURLFromEnv_1 = require("./getMongoURLFromEnv");
+exports.allConnectionPromises = [];
 const getMongoConnection = ({ name, uri }) => {
     uri = uri || (0, getMongoURLFromEnv_1.getMongoURLFromEnv)(name);
     if (connections_1.connections[name])
         return connections_1.connections[name];
     const client = new mongodb_1.MongoClient(uri);
     const connectionPromise = client.connect();
+    exports.allConnectionPromises.push(connectionPromise);
     const dbName = (0, getDBName_1.default)(uri);
     const db = client.db(dbName);
     const mongoClient = {

package/lib/connect/index.d.ts

@@ -1,4 +1,4 @@
 import { connections } from './connections';
 import { OrionMongoClient } from './connections';
-import { getMongoConnection } from './getMongoConnection';
-export { OrionMongoClient, getMongoConnection, connections };
+import { allConnectionPromises, getMongoConnection } from './getMongoConnection';
+export { OrionMongoClient, getMongoConnection, connections, allConnectionPromises };

package/lib/connect/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.connections = exports.getMongoConnection = void 0;
+exports.allConnectionPromises = exports.connections = exports.getMongoConnection = void 0;
 const connections_1 = require("./connections");
 Object.defineProperty(exports, "connections", { enumerable: true, get: function () { return connections_1.connections; } });
 const getMongoConnection_1 = require("./getMongoConnection");
+Object.defineProperty(exports, "allConnectionPromises", { enumerable: true, get: function () { return getMongoConnection_1.allConnectionPromises; } });
 Object.defineProperty(exports, "getMongoConnection", { enumerable: true, get: function () { return getMongoConnection_1.getMongoConnection; } });

package/lib/createCollection/createIndexPromisesTest.d.ts

@@ -0,0 +1 @@
+export declare const MockTests: import("..").Collection<any>;

package/lib/createCollection/createIndexPromisesTest.js

@@ -0,0 +1,12 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MockTests = void 0;
+const helpers_1 = require("@orion-js/helpers");
+const _1 = __importDefault(require("."));
+exports.MockTests = (0, _1.default)({
+    name: (0, helpers_1.generateId)(),
+    indexes: [{ keys: { a: 1 }, options: { unique: true } }]
+});

package/lib/createCollection/createIndexes.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadIndexes = exports.checkIndexes = void 0;
+const mongodb_1 = require("mongodb");
 function matchingDefinition(defIndex, curIndex) {
     if (defIndex.options && defIndex.options.name === curIndex.name)
         return true;
@@ -49,6 +50,10 @@ async function loadIndexes(collection) {
                 console.info('Index updated correctly');
                 return result;
             }
+            else if (error instanceof mongodb_1.MongoExpiredSessionError) {
+                // this errors is thrown when we are on tests environment
+                // but it's not a problem never, index will be created on the next connection
+            }
             else {
                 console.error(`Error creating index for collection ${collection.name}: ${error.message}`);
                 console.error(error);

package/lib/createCollection/createIndexesPromise.test.d.ts

@@ -0,0 +1 @@
+export declare const Tests: import("..").Collection<any>;

package/lib/createCollection/createIndexesPromise.test.js

@@ -0,0 +1,32 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Tests = void 0;
+const helpers_1 = require("@orion-js/helpers");
+const _1 = __importDefault(require("."));
+const __1 = require("..");
+jest.mock('./createIndexPromisesTest');
+exports.Tests = (0, _1.default)({
+    name: (0, helpers_1.generateId)(),
+    indexes: [{ keys: { a: 1 }, options: { unique: true } }]
+});
+beforeEach(async () => {
+    await Promise.all(__1.allConnectionPromises);
+});
+describe('createIndexesPromise', () => {
+    it('should correctly handle the promise for tests', async () => {
+        const userId = await exports.Tests.insertOne({
+            name: 'Nico'
+        });
+        const user = await exports.Tests.findOne(userId);
+        expect(user.name).toBe('Nico');
+    });
+    it('should be able to close the index handlers on the global config', async () => {
+        (0, _1.default)({
+            name: (0, helpers_1.generateId)(),
+            indexes: [{ keys: { a: 1 }, options: { unique: true } }]
+        });
+    });
+});

package/lib/createCollection/index.js

@@ -65,9 +65,16 @@ const createCollection = (options) => {
     collection.loadById = (0, dataLoader_1.loadById)(collection);
     collection.loadOne = (0, dataLoader_1.loadOne)(collection);
     collection.loadMany = (0, dataLoader_1.loadMany)(collection);
-    const createIndexPromise = (0, createIndexes_1.loadIndexes)(collection);
-    exports.createIndexesPromises.push(createIndexPromise);
-    collection.createIndexesPromise = createIndexPromise;
+    const createIndexes = async () => {
+        const createIndexPromise = (0, createIndexes_1.loadIndexes)(collection);
+        exports.createIndexesPromises.push(createIndexPromise);
+        collection.createIndexesPromise = createIndexPromise;
+        return createIndexPromise;
+    };
+    collection.createIndexes = createIndexes;
+    if (!process.env.DONT_CREATE_INDEXES_AUTOMATICALLY) {
+        createIndexes();
+    }
     return collection;
 };
 exports.default = createCollection;

package/lib/tests/setup.js

@@ -9,6 +9,10 @@ beforeAll(async () => {
     await connection.connectionPromise;
 });
 afterAll(async () => {
+    /**
+     * We need to wait on indexes promises to be resolved to close all the handlers
+     */
+    await Promise.all(__1.createIndexesPromises);
     for (const connectionName in connections_1.connections) {
         const connection = connections_1.connections[connectionName];
         await connection.client.close();

package/lib/types/index.d.ts

@@ -116,6 +116,12 @@ export interface Collection<ModelClass = any> {
     loadOne: DataLoader.LoadOne<ModelClass>;
     loadMany: DataLoader.LoadMany<ModelClass>;
     loadById: DataLoader.LoadById<ModelClass>;
+    /**
+     * Use this function if you are using tests and you pass the
+     * env var DONT_CREATE_INDEXES_AUTOMATICALLY and you need to
+     * create the indexes for this collection
+     */
+    createIndexes: () => Promise<string[]>;
     createIndexesPromise: Promise<string[]>;
     connectionPromise: Promise<MongoDB.MongoClient>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/mongodb",
-  "version": "3.0.41",
+  "version": "3.0.45",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9b3b84b2e968a20ecf45d252201ad911f12c8aa0"
+  "gitHead": "76213e5017e576d6a30e6d8af3580814bac028b2"
 }