refactored some stuff

Author: cdxOo

src/errors.js

@@ -1,7 +1,8 @@
 class RestoreError extends Error {};
 
 class CollectionsExist extends RestoreError {
-    constructor ({ collections } = {}) {
+    constructor (bag = {}) {
+        var { collections } = bag;
         super(
             `collections [ ${collections.join(',')} ] already exist;` +
             ` set onCollectionExists to "overwrite" to remove this error`

src/restore-buffer.js

@@ -10,20 +10,22 @@ module.exports = (options) => {
     return doRestoreBuffer(options);
 }
 
-var doRestoreBuffer = async ({
-    con,
-    uri,
-    database,
-    collection,
+var doRestoreBuffer = async (bag) => {
+    var {
+        con,
+        uri,
+        database,
+        collection,
 
-    from,
-    //chunked = false,
+        from,
+        //chunked = false,
+        
+        limit,
+        clean = true,
+        onCollectionExists = 'throw',
+        transformDocuments,
+    } = bag;
 
-    limit,
-    clean = true,
-    onCollectionExists = 'throw',
-    transformDocuments,
-}) => {
     var serverConnection = await maybeConnectServer({ con, uri });
 
     try {
@@ -54,13 +56,15 @@ var doRestoreBuffer = async ({
     }
 }
 
-var checkOptions = ({
-    con,
-    uri,
-    database,
-    collection,
-    from,
-}) => {
+var checkOptions = (bag) => {
+    var {
+        con,
+        uri,
+        database,
+        collection,
+        from,
+    } = bag;
+
     if (!con && !uri) {
         throw new Error('neither "con" nor "uri" option was given');
     }

src/restore-collection.js

@@ -14,18 +14,20 @@ module.exports = (options) => {
     return doRestoreCollection(options);
 }
 
-var doRestoreCollection = async ({
-    con,
-    uri,
-    database,
-    collection,
-    from,
-
-    limit,
-    clean = true,
-    onCollectionExists = 'throw',
-    transformDocuments,
-}) => {
+var doRestoreCollection = async (bag) => {
+    var {
+        con,
+        uri,
+        database,
+        collection,
+        from,
+
+        limit,
+        clean = true,
+        onCollectionExists = 'throw',
+        transformDocuments,
+    } = bag;
+
     // FIXME: this will blow up on large collections
     var buffer = fs.readFileSync(from);
 
@@ -44,14 +46,16 @@ var doRestoreCollection = async ({
 };
 
 
-var checkOptions = ({
-    con,
-    uri,
-    database,
-    collection,
-    from,
-    onCollectionExists,
-}) => {
+var checkOptions = (bag) => {
+    var {
+        con,
+        uri,
+        database,
+        collection,
+        from,
+        onCollectionExists,
+    } = bag;
+
     if (!con && !uri) {
         throw new Error('neither "con" nor "uri" option was given');
     }

src/restore-database.js

@@ -77,13 +77,15 @@ var doRestoreDatabase = async (bag) => {
     }
 }
 
-var checkOptions = ({
-    con,
-    uri,
-    database,
-    from,
-    onCollectionExists,
-}) => {
+var checkOptions = (bag) => {
+    var {
+        con,
+        uri,
+        database,
+        from,
+        onCollectionExists,
+    } = bag;
+
     if (!con && !uri) {
         throw new Error('neither "con" nor "uri" option was given');
     }

src/restore-dump.js

@@ -1,7 +1,7 @@
 'use strict';
-var fs = require('fs'),
-    fspath = require('path'),
-    restoreDatabase = require('./restore-database');
+var fs = require('fs');
+var fspath = require('path');
+var restoreDatabase = require('./restore-database');
 
 var { maybeConnectServer } = require('./utils');
 
@@ -61,12 +61,14 @@ var doRestoreDump = async (bag) => {
     }
 }
 
-var checkOptions = ({
-    con,
-    uri,
-    from,
-    onCollectionExists
-}) => {
+var checkOptions = (bag) => {
+    var {
+        con,
+        uri,
+        from,
+        onCollectionExists
+    } = bag;
+
     if (!con && !uri) {
         throw new Error('neither "con" nor "uri" option was given');
     }

src/utils/internal-restore-buffer.js

@@ -1,16 +1,18 @@
 'use strict';
 var BSON = require('bson');
 
-var internalRestoreBuffer = async ({
-    collectionHandle,
+var internalRestoreBuffer = async (bag) => {
+    var {
+        collectionHandle,
 
-    buffer,
-    limit,
-    // chunked = false
-    transformDocuments,
-}) => {
-    var index = 0,
-        documents = [];
+        buffer,
+        limit,
+        // chunked = false
+        transformDocuments,
+    } = bag;
+
+    var index = 0;
+    var documents = [];
     while (
         buffer.length > index
         && (!limit || limit > documents.length)

src/utils/maybe-connect-server.js

@@ -1,13 +1,15 @@
 'use strict';
 var MongoClient = require('mongodb').MongoClient;
 
-var maybeConnectServer = async ({ con, uri }) => {
+var maybeConnectServer = async (bag) => {
+    var { con, uri } = bag;
+
     var serverConnection;
     if (!con) {
-        serverConnection = (await MongoClient.connect(
+        serverConnection = await MongoClient.connect(
             uri,
             { useUnifiedTopology: true }
-        ));
+        );
     }
     else {
         serverConnection = con;

src/utils/try-create-collection.js

@@ -2,11 +2,7 @@
 var verifyCollectionsDontExist = require('./verify-collections-dont-exist');
 
 var tryCreateCollection = async (bag) => {
-    var {
-        dbHandle,
-        collection,
-        onCollectionExists
-    } = bag;
+    var { dbHandle, collection, onCollectionExists } = bag;
 
     var doesntExist = await verifyCollectionsDontExist({
         dbHandle,