@orion-js/mongodb 3.0.37 → 3.0.42

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/createIndexes.test.js

@@ -1,11 +1,35 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const helpers_1 = require("@orion-js/helpers");
-const _1 = __importDefault(require("."));
+const _1 = __importStar(require("."));
 describe('Test indexes', () => {
+    it('Should store all create indexes promises in the array', async () => {
+        const collection = (0, _1.default)({
+            name: (0, helpers_1.generateId)(),
+            indexes: [{ keys: { a: 1 }, options: { unique: true } }]
+        });
+        expect(_1.createIndexesPromises[0]).toBe(collection.createIndexesPromise);
+        expect(_1.createIndexesPromises.length).toBe(1);
+    });
     it('Should create collection indexes correctly', async () => {
         const collection = (0, _1.default)({
             name: (0, helpers_1.generateId)(),

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

@@ -0,0 +1 @@
+export {};

package/lib/createCollection/createIndexesPromise.test.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const helpers_1 = require("@orion-js/helpers");
+const _1 = __importDefault(require("."));
+const Tests = (0, _1.default)({
+    name: (0, helpers_1.generateId)(),
+    indexes: [{ keys: { a: 1 }, options: { unique: true } }]
+});
+describe('createIndexesPromise', () => {
+    it('should correctly handle the promise for tests', async () => {
+        const userId = await Tests.insertOne({
+            name: 'Nico'
+        });
+        const user = await 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/getMethods/update.test.js

@@ -247,3 +247,41 @@ it('Should allow custom clean function on a blackbox field', async () => {
     const item = await Tests.findOne(itemId);
     expect(item).toEqual({ _id: itemId, info: { hello: 'world' } });
 });
+it('Should be able to use custom clean for models on update', async () => {
+    const modelFile = (0, models_1.createModel)({
+        name: 'File',
+        schema: {
+            name: { type: String },
+            lastName: { type: String, optional: true }
+        },
+        async clean(value) {
+            if (!value)
+                return null;
+            expect(typeof value.name).toBe('string');
+            return {
+                ...value,
+                name: value.name.toUpperCase(),
+                lastName: '1'
+            };
+        }
+    });
+    const model = (0, models_1.createModel)({
+        name: 'Item',
+        schema: {
+            file: { type: modelFile }
+        }
+    });
+    const Tests = (0, __1.default)({ name: (0, helpers_1.generateId)(), model });
+    const docId = await Tests.insertOne({
+        file: { name: '1' }
+    });
+    await Tests.updateOne(docId, {
+        $set: {
+            file: { name: 'Hello' }
+        }
+    });
+    const result = await Tests.findOne(docId);
+    expect(result.file.name).toBe('HELLO');
+    expect(result.file.lastName).toBe('1');
+    expect.assertions(4);
+});

package/lib/createCollection/index.d.ts

@@ -1,3 +1,4 @@
 import { CreateCollection } from '../types';
+export declare const createIndexesPromises: any[];
 declare const createCollection: CreateCollection;
 export default createCollection;

package/lib/createCollection/index.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createIndexesPromises = void 0;
 const initItem_1 = __importDefault(require("./initItem"));
 const getMethods_1 = require("./getMethods");
 const dataLoader_1 = require("./getMethods/dataLoader");
@@ -10,6 +11,7 @@ const generateId_1 = __importDefault(require("./generateId"));
 const createIndexes_1 = require("./createIndexes");
 const lodash_1 = require("lodash");
 const __1 = require("..");
+exports.createIndexesPromises = [];
 const createCollection = (options) => {
     const connectionName = options.connectionName || 'main';
     const orionConnection = (0, __1.getMongoConnection)({ name: connectionName });
@@ -63,7 +65,9 @@ const createCollection = (options) => {
     collection.loadById = (0, dataLoader_1.loadById)(collection);
     collection.loadOne = (0, dataLoader_1.loadOne)(collection);
     collection.loadMany = (0, dataLoader_1.loadMany)(collection);
-    collection.createIndexesPromise = (0, createIndexes_1.loadIndexes)(collection);
+    const createIndexPromise = (0, createIndexes_1.loadIndexes)(collection);
+    exports.createIndexesPromises.push(createIndexPromise);
+    collection.createIndexesPromise = createIndexPromise;
     return collection;
 };
 exports.default = createCollection;

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import createCollection from './createCollection';
-export { createCollection };
+import createCollection, { createIndexesPromises } from './createCollection';
+export { createCollection, createIndexesPromises };
 export * from './connect';
 export * from './types';

package/lib/index.js

@@ -6,15 +6,25 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCollection = void 0;
-const createCollection_1 = __importDefault(require("./createCollection"));
+exports.createIndexesPromises = exports.createCollection = void 0;
+const createCollection_1 = __importStar(require("./createCollection"));
 exports.createCollection = createCollection_1.default;
+Object.defineProperty(exports, "createIndexesPromises", { enumerable: true, get: function () { return createCollection_1.createIndexesPromises; } });
 __exportStar(require("./connect"), exports);
 __exportStar(require("./types"), exports);

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/mongodb",
-  "version": "3.0.37",
+  "version": "3.0.42",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -18,10 +18,10 @@
   },
   "dependencies": {
     "@orion-js/helpers": "^3.0.36",
-    "@orion-js/models": "^3.0.37",
+    "@orion-js/models": "^3.0.38",
     "@orion-js/resolvers": "^3.0.37",
     "@orion-js/schema": "^3.0.37",
-    "@orion-js/typed-model": "^3.0.37",
+    "@orion-js/typed-model": "^3.0.38",
     "dataloader": "2.0.0",
     "dot-object": "2.1.4",
     "mongodb": "4.1.4"
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "741691d7603f3d42e6e3e8fa9dc0f9de51a29424"
+  "gitHead": "ef0e7a088474c899e13146be867dc574032ac588"
 }