fix: consistent toLegacy

Author: nbbeeken

src/legacy_wrappers/admin.js

@@ -7,14 +7,6 @@ Object.defineProperty(module.exports, '__esModule', { value: true });
 
 module.exports.makeLegacyAdmin = function (baseClass) {
   class LegacyAdmin extends baseClass {
-    constructor(db) {
-      if (db instanceof baseClass || db instanceof LegacyAdmin) {
-        super(db.s.db);
-      } else {
-        super(db);
-      }
-    }
-
     addUser(username, password, options, callback) {
       callback =
         typeof callback === 'function'
@@ -136,7 +128,7 @@ module.exports.makeLegacyAdmin = function (baseClass) {
   Object.defineProperty(baseClass.prototype, toLegacy, {
     enumerable: false,
     value: function () {
-      return new LegacyAdmin(this);
+      return Object.setPrototypeOf(this, LegacyAdmin.prototype);
     }
   });
 

src/legacy_wrappers/bulk.js

@@ -1,20 +1,36 @@
 'use strict';
 
+const { maybeCallback } = require('../utils');
+
 module.exports = Object.create(null);
 Object.defineProperty(module.exports, '__esModule', { value: true });
 
 module.exports.makeLegacyOrderedBulkOperation = function (baseClass) {
   return class LegacyOrderedBulkOperation extends baseClass {
-    execute(callback) {
-
+    execute(options, callback) {
+      callback =
+        typeof callback === 'function'
+          ? callback
+          : typeof options === 'function'
+          ? options
+          : undefined;
+      options = typeof options !== 'function' ? options : undefined;
+      return maybeCallback(super.execute(options), callback);
     }
   };
 };
 
 module.exports.makeLegacyUnorderedBulkOperation = function (baseClass) {
   return class LegacyUnorderedBulkOperation extends baseClass {
-    execute(callback) {
-
+    execute(options, callback) {
+      callback =
+        typeof callback === 'function'
+          ? callback
+          : typeof options === 'function'
+          ? options
+          : undefined;
+      options = typeof options !== 'function' ? options : undefined;
+      return maybeCallback(super.execute(options), callback);
     }
   };
 };

src/legacy_wrappers/change_stream.js

@@ -7,14 +7,6 @@ Object.defineProperty(module.exports, '__esModule', { value: true });
 
 module.exports.makeLegacyChangeStream = function (baseClass) {
   class LegacyChangeStream extends baseClass {
-    constructor(parent, pipeline, options) {
-      if (parent instanceof baseClass || parent instanceof LegacyChangeStream) {
-        super(parent.parent, parent.pipeline, parent.options);
-      } else {
-        super(parent, pipeline, options);
-      }
-    }
-
     close(callback) {
       return maybeCallback(super.close(), callback);
     }
@@ -32,7 +24,7 @@ module.exports.makeLegacyChangeStream = function (baseClass) {
   Object.defineProperty(baseClass.prototype, toLegacy, {
     enumerable: false,
     value: function () {
-      return new LegacyChangeStream(this);
+      return Object.setPrototypeOf(this, LegacyChangeStream.prototype);
     }
   });
 

src/legacy_wrappers/collection.js

@@ -7,14 +7,6 @@ Object.defineProperty(module.exports, '__esModule', { value: true });
 
 module.exports.makeLegacyCollection = function (baseClass) {
   class LegacyCollection extends baseClass {
-    constructor(db, name, options) {
-      if (db instanceof baseClass || db instanceof LegacyCollection) {
-        super(db.s.db, db.s.namespace.collection, db.s.options);
-      } else {
-        super(db, name, options);
-      }
-    }
-
     // async APIs
     bulkWrite(operations, options, callback) {
       callback =
@@ -419,7 +411,7 @@ module.exports.makeLegacyCollection = function (baseClass) {
   Object.defineProperty(baseClass.prototype, toLegacy, {
     enumerable: false,
     value: function () {
-      return new LegacyCollection(this);
+      return Object.setPrototypeOf(this, LegacyCollection.prototype);
     }
   });
 

src/legacy_wrappers/cursors.js

@@ -116,15 +116,7 @@ module.exports.makeLegacyFindCursor = function (baseClass) {
 };
 
 module.exports.makeLegacyListCollectionsCursor = function (baseClass) {
-  class LegacyListCollectionsCursor extends baseClass {
-    constructor(db, filter, options) {
-      if (db instanceof baseClass) {
-        super(db.parent, db.filter, db.options);
-      } else {
-        super(db, filter, options);
-      }
-    }
-  }
+  class LegacyListCollectionsCursor extends baseClass {}
 
   for (const [name, method] of commonCursorFunctions) {
     Object.defineProperty(LegacyListCollectionsCursor.prototype, name, {
@@ -136,23 +128,15 @@ module.exports.makeLegacyListCollectionsCursor = function (baseClass) {
   Object.defineProperty(baseClass.prototype, toLegacy, {
     enumerable: false,
     value: function () {
-      return new LegacyListCollectionsCursor(this);
+      return Object.setPrototypeOf(this, LegacyListCollectionsCursor.prototype);
     }
   });
 
   return LegacyListCollectionsCursor;
 };
 
 module.exports.makeLegacyListIndexesCursor = function (baseClass) {
-  class LegacyListIndexesCursor extends baseClass {
-    constructor(collection, options) {
-      if (collection instanceof baseClass) {
-        super(collection.parent, collection.options);
-      } else {
-        super(collection, options);
-      }
-    }
-  }
+  class LegacyListIndexesCursor extends baseClass {}
 
   for (const [name, method] of commonCursorFunctions) {
     Object.defineProperty(LegacyListIndexesCursor.prototype, name, {
@@ -164,7 +148,7 @@ module.exports.makeLegacyListIndexesCursor = function (baseClass) {
   Object.defineProperty(baseClass.prototype, toLegacy, {
     enumerable: false,
     value: function () {
-      return new LegacyListIndexesCursor(this);
+      return Object.setPrototypeOf(this, LegacyListIndexesCursor.prototype);
     }
   });
 

src/legacy_wrappers/db.js

@@ -7,14 +7,6 @@ Object.defineProperty(module.exports, '__esModule', { value: true });
 
 module.exports.makeLegacyDb = function (baseClass) {
   class LegacyDb extends baseClass {
-    constructor(client, databaseName, options) {
-      if (client instanceof baseClass || client instanceof LegacyDb) {
-        super(client.s.client, client.databaseName, client.s.options);
-      } else {
-        super(client, databaseName, options);
-      }
-    }
-
     command(command, options, callback) {
       callback =
         typeof callback === 'function'
@@ -187,7 +179,7 @@ module.exports.makeLegacyDb = function (baseClass) {
   Object.defineProperty(baseClass.prototype, toLegacy, {
     enumerable: false,
     value: function () {
-      return new LegacyDb(this);
+      return Object.setPrototypeOf(this, LegacyDb.prototype);
     }
   });
 

src/legacy_wrappers/gridfs.js

@@ -7,14 +7,6 @@ Object.defineProperty(module.exports, '__esModule', { value: true });
 
 module.exports.makeLegacyGridFSBucket = function (baseClass) {
   class LegacyGridFSBucket extends baseClass {
-    constructor(db, options) {
-      if (db instanceof baseClass || db instanceof LegacyGridFSBucket) {
-        super(db.s.db, db.s.options);
-      } else {
-        super(db, options);
-      }
-    }
-
     delete(id, callback) {
       return maybeCallback(super.delete(id), callback);
     }
@@ -36,7 +28,7 @@ module.exports.makeLegacyGridFSBucket = function (baseClass) {
   Object.defineProperty(baseClass.prototype, toLegacy, {
     enumerable: false,
     value: function () {
-      return new LegacyGridFSBucket(this);
+      return Object.setPrototypeOf(this, LegacyGridFSBucket.prototype);
     }
   });
 

src/legacy_wrappers/session.js

@@ -1,23 +1,29 @@
 'use strict';
 
-const { toLegacy } = require('../utils');
+const { toLegacy, maybeCallback } = require('../utils');
 
 module.exports = Object.create(null);
 Object.defineProperty(module.exports, '__esModule', { value: true });
 
 module.exports.makeLegacyClientSession = function (baseClass) {
   class LegacyClientSession extends baseClass {
-    abortTransaction() {
-      throw new Error('not done yet');
+    abortTransaction(callback) {
+      return maybeCallback(super.abortTransaction(), callback);
     }
-    commitTransaction() {
-      throw new Error('not done yet');
-    }
-    endSession() {
-      throw new Error('not done yet');
+
+    commitTransaction(callback) {
+      return maybeCallback(super.commitTransaction(), callback);
     }
-    withTransaction() {
-      throw new Error('not done yet');
+
+    endSession(options, callback) {
+      callback =
+        typeof callback === 'function'
+          ? callback
+          : typeof options === 'function'
+          ? options
+          : undefined;
+      options = typeof options !== 'function' ? options : undefined;
+      return maybeCallback(super.endSession(options), callback);
     }
   }