refactor(types): modernize all types, remove cyclic references

Author: mbroadst

dist/bson.js

@@ -2,25 +2,27 @@
 
 /**
  * A class representation of the BSON Code type.
- *
- * @class
- * @param {(string|function)} code a string or function.
- * @param {Object} [scope] an optional scope for the function.
- * @return {Code}
  */
-function Code(code, scope) {
-  if (!(this instanceof Code)) return new Code(code, scope);
-  this._bsontype = 'Code';
-  this.code = code;
-  this.scope = scope;
-}
+class Code {
+  /**
+   * Create a Code type
+   *
+   * @param {(string|function)} code a string or function.
+   * @param {Object} [scope] an optional scope for the function.
+   * @return {Code}
+   */
+  constructor(code, scope) {
+    this._bsontype = 'Code';
+    this.code = code;
+    this.scope = scope;
+  }
 
-/**
- * @ignore
- */
-Code.prototype.toJSON = function() {
-  return { scope: this.scope, code: this.code };
-};
+  /**
+   * @ignore
+   */
+  toJSON() {
+    return { scope: this.scope, code: this.code };
+  }
+}
 
 module.exports = Code;
-module.exports.Code = Code;

lib/binary.js

@@ -1,44 +1,47 @@
 'use strict';
 /**
  * A class representation of the BSON DBRef type.
- *
- * @class
- * @param {string} collection the collection name.
- * @param {ObjectID} oid the reference ObjectID.
- * @param {string} [db] optional db name, if omitted the reference is local to the current db.
- * @return {DBRef}
  */
-function DBRef(collection, oid, db, fields) {
-  if (!(this instanceof DBRef)) return new DBRef(collection, oid, db, fields);
+class DBRef {
+  /**
+   * Create a DBRef type
+   *
+   * @param {string} collection the collection name.
+   * @param {ObjectID} oid the reference ObjectID.
+   * @param {string} [db] optional db name, if omitted the reference is local to the current db.
+   * @return {DBRef}
+   */
+  constructor(collection, oid, db, fields) {
+    // check if namespace has been provided
+    const parts = collection.split('.');
+    if (parts.length === 2) {
+      db = parts.shift();
+      collection = parts.shift();
+    }
 
-  // check if namespace has been provided
-  var parts = collection.split('.');
-  if (parts.length === 2) {
-    db = parts.shift();
-    collection = parts.shift();
+    this._bsontype = 'DBRef';
+    this.collection = collection;
+    this.oid = oid;
+    this.db = db;
+    this.fields = fields || {};
   }
 
-  this._bsontype = 'DBRef';
-  this.collection = collection;
-  this.oid = oid;
-  this.db = db;
-  this.fields = fields || {};
-}
-
-/**
- * @ignore
- * @api private
- */
-DBRef.prototype.toJSON = function() {
-  var o = {
-    $ref: this.collection,
-    $id: this.oid
-  };
+  /**
+   * @ignore
+   * @api private
+   */
+  toJSON() {
+    const o = Object.assign(
+      {
+        $ref: this.collection,
+        $id: this.oid
+      },
+      this.fields
+    );
 
-  if (this.db != null) o.$db = this.db;
-  o = Object.assign(o, this.fields);
-  return o;
-};
+    if (this.db != null) o.$db = this.db;
+    return o;
+  }
+}
 
 module.exports = DBRef;
-module.exports.DBRef = DBRef;