@storyous/mongodb 1.10.3 → 1.10.5

package/lib/migrations/templateJSCompatible.d.ts

@@ -0,0 +1 @@
+declare const Migration: any, getCollection: any;

package/lib/migrations/templateJSCompatible.js

@@ -0,0 +1,8 @@
+// eslint-disable-next-line strict
+'use strict';
+const { Migration, getCollection } = require('@storyous/mongodb');
+module.exports = new Migration('[ADD DESCRIPTION HERE]', async () => {
+    // add logic here
+    await getCollection('exampleCollection');
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVtcGxhdGVKU0NvbXBhdGlibGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0ZW1wbGF0ZUpTQ29tcGF0aWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxrQ0FBa0M7QUFDbEMsWUFBWSxDQUFDO0FBRWIsTUFBTSxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsR0FBRyxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0FBQztBQUVsRSxNQUFNLENBQUMsT0FBTyxHQUFHLElBQUksU0FBUyxDQUFDLHdCQUF3QixFQUFFLEtBQUssSUFBSSxFQUFFO0lBQ2hFLGlCQUFpQjtJQUNqQixNQUFNLGFBQWEsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0FBQzdDLENBQUMsQ0FBQyxDQUFDIn0=

package/lib/migrations/templateJSCompatible.ts

@@ -0,0 +1,9 @@
+// eslint-disable-next-line strict
+'use strict';
+
+const { Migration, getCollection } = require('@storyous/mongodb');
+
+module.exports = new Migration('[ADD DESCRIPTION HERE]', async () => {
+    // add logic here
+    await getCollection('exampleCollection');
+});

package/lib/migrations/templateJs.js

@@ -0,0 +1,9 @@
+// eslint-disable-next-line strict
+'use strict';
+
+const { Migration, getCollection } = require('@storyous/mongodb');
+
+module.exports = new Migration('[ADD DESCRIPTION HERE]', async () => {
+    // add logic here
+    await getCollection('exampleCollection');
+});

package/lib/mongoClient.js

@@ -2,10 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
 const mongodb_1 = require("mongodb");
+const LEGACY_MONGO_CLIENT_OPTIONS = [
+    'promiseLibrary',
+    'useUnifiedTopology',
+    'useNewUrlParser',
+    'useSsl',
+    'sslValidate',
+    'bufferMaxEntries',
+];
+const sanitizeMongoClientOptions = (mongoOptions) => (0, lodash_1.omit)(mongoOptions ?? {}, LEGACY_MONGO_CLIENT_OPTIONS);
 const mongoClient = {
     _client: null,
     init(mongodbUrl, mongoOptions) {
-        this._client = new mongodb_1.MongoClient(mongodbUrl, (0, lodash_1.defaultsDeep)(mongoOptions));
+        this._client = new mongodb_1.MongoClient(mongodbUrl, (0, lodash_1.defaultsDeep)(sanitizeMongoClientOptions(mongoOptions)));
     },
     getClient() {
         if (this._client) {
@@ -15,4 +24,4 @@ const mongoClient = {
     },
 };
 exports.default = mongoClient;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9uZ29DbGllbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJtb25nb0NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLG1DQUFzQztBQUN0QyxxQ0FBb0U7QUFJcEUsTUFBTSxXQUFXLEdBQUc7SUFDaEIsT0FBTyxFQUFxQixJQUFJO0lBRWhDLElBQUksQ0FBRSxVQUFrQixFQUFFLFlBQWlDO1FBQ3ZELElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxxQkFBVyxDQUMxQixVQUFVLEVBQ1YsSUFBQSxxQkFBWSxFQUFDLFlBQVksQ0FBQyxDQUM3QixDQUFDO0lBQ04sQ0FBQztJQUVELFNBQVM7UUFDTCxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNmLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUN4QixDQUFDO1FBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDO0lBQy9ELENBQUM7Q0FDSixDQUFDO0FBRUYsa0JBQWUsV0FBVyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9uZ29DbGllbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJtb25nb0NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLG1DQUE0QztBQUM1QyxxQ0FBb0U7QUFJcEUsTUFBTSwyQkFBMkIsR0FBRztJQUNoQyxnQkFBZ0I7SUFDaEIsb0JBQW9CO0lBQ3BCLGlCQUFpQjtJQUNqQixRQUFRO0lBQ1IsYUFBYTtJQUNiLGtCQUFrQjtDQUNyQixDQUFDO0FBRUYsTUFBTSwwQkFBMEIsR0FBRyxDQUFDLFlBQWlDLEVBQXNCLEVBQUUsQ0FDekYsSUFBQSxhQUFJLEVBQUMsWUFBWSxJQUFJLEVBQUUsRUFBRSwyQkFBMkIsQ0FDdkQsQ0FBQztBQUVGLE1BQU0sV0FBVyxHQUFHO0lBQ2hCLE9BQU8sRUFBcUIsSUFBSTtJQUVoQyxJQUFJLENBQUUsVUFBa0IsRUFBRSxZQUFpQztRQUN2RCxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUkscUJBQVcsQ0FDMUIsVUFBVSxFQUNWLElBQUEscUJBQVksRUFBQywwQkFBMEIsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUN6RCxDQUFDO0lBQ04sQ0FBQztJQUVELFNBQVM7UUFDTCxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNmLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUN4QixDQUFDO1FBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDO0lBQy9ELENBQUM7Q0FDSixDQUFDO0FBRUYsa0JBQWUsV0FBVyxDQUFDIn0=

package/lib/mongoClient.ts

@@ -1,15 +1,28 @@
-import { defaultsDeep } from 'lodash';
+import { defaultsDeep, omit } from 'lodash';
 import { MongoClient, MongoClientOptions, ObjectId } from 'mongodb';
 
 export type Key = string | number | ObjectId;
 
+const LEGACY_MONGO_CLIENT_OPTIONS = [
+    'promiseLibrary',
+    'useUnifiedTopology',
+    'useNewUrlParser',
+    'useSsl',
+    'sslValidate',
+    'bufferMaxEntries',
+];
+
+const sanitizeMongoClientOptions = (mongoOptions?: MongoClientOptions): MongoClientOptions => (
+    omit(mongoOptions ?? {}, LEGACY_MONGO_CLIENT_OPTIONS) as MongoClientOptions
+);
+
 const mongoClient = {
     _client: <MongoClient|null> null,
 
     init (mongodbUrl: string, mongoOptions?: MongoClientOptions) {
         this._client = new MongoClient(
             mongodbUrl,
-            defaultsDeep(mongoOptions),
+            defaultsDeep(sanitizeMongoClientOptions(mongoOptions)),
         );
     },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storyous/mongodb",
-  "version": "1.10.3",
+  "version": "1.10.5",
   "description": "",
   "homepage": "https://github.com/Storyous/mono-utils#readme",
   "license": "ISC",
@@ -40,11 +40,10 @@
     "winston": "^3.7.2"
   },
   "devDependencies": {
-    "@types/sinon": "^10.0.11",
-    "mongodb": "^6.8.0"
+    "@types/sinon": "^10.0.11"
   },
   "peerDependencies": {
-    "mongodb": "^6.8.0"
+    "mongodb": "^6.8.0 || ^7.0.0"
   },
-  "gitHead": "494e1f474bc4f93872879fae7d9d8e874977aa46"
+  "gitHead": "f0efe45d38d8433d0ccc8e428fc2b2cea2ec6eb6"
 }

package/lib/migrations/templateJsCompatible.d.ts

@@ -1,4 +0,0 @@
-/**  template for older systems like IS runs on js modules.
- * Transpiled file is compatible and can be used in migrate:create script */
-declare const getCollection: any;
-declare const Migration: any;

package/lib/migrations/templateJsCompatible.js

@@ -1,10 +0,0 @@
-"use strict";
-/**  template for older systems like IS runs on js modules.
- * Transpiled file is compatible and can be used in migrate:create script */
-const getCollection = require('../getCollection');
-const Migration = require('./Migration');
-module.exports = new Migration('[ADD DESCRIPTION HERE]', async () => {
-    // add logic here
-    await getCollection('exampleCollection');
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVtcGxhdGVKc0NvbXBhdGlibGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0ZW1wbGF0ZUpzQ29tcGF0aWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7NEVBQzRFO0FBQzVFLE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0FBQ2xELE1BQU0sU0FBUyxHQUFHLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQztBQUV6QyxNQUFNLENBQUMsT0FBTyxHQUFHLElBQUksU0FBUyxDQUFDLHdCQUF3QixFQUFFLEtBQUssSUFBSSxFQUFFO0lBQ2hFLGlCQUFpQjtJQUNqQixNQUFNLGFBQWEsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0FBQzdDLENBQUMsQ0FBQyxDQUFDIn0=