feat!: remove datatype validation code COMPASS-4550 (#341)

Author: addaleax

lib/connection-collection.js

@@ -5,7 +5,7 @@ const { each } = require('lodash');
 const raf = require('raf');
 
 /**
- * The name of a remote electon application that
+ * The name of a remote electron application that
  * uses `connection-model` as a dependency.
  */
 let appName;

lib/data-types.js

@@ -16,7 +16,6 @@ const AmpersandModel = require('ampersand-model');
 const AmpersandCollection = require('ampersand-rest-collection');
 const { ReadPreference } = require('mongodb');
 const { parseConnectionString } = require('mongodb/lib/core');
-const dataTypes = require('./data-types');
 const localPortGenerator = require('./local-port-generator');
 
 /**
@@ -81,7 +80,7 @@ assign(props, {
   ns: { type: 'string', default: undefined },
   isSrvRecord: { type: 'boolean', default: false },
   hostname: { type: 'string', default: 'localhost' },
-  port: { type: 'port', default: 27017 },
+  port: { type: 'number', default: 27017 },
   hosts: {
     type: 'array',
     default: () => [{ host: 'localhost', port: 27017 }]
@@ -371,11 +370,11 @@ assign(props, {
   /**
    * The SSH port of the remote host.
    */
-  sshTunnelPort: { type: 'port', default: 22 },
+  sshTunnelPort: { type: 'number', default: 22 },
   /**
    * Bind the localhost endpoint of the SSH Tunnel to this port.
    */
-  sshTunnelBindToLocalPort: { type: 'port', default: undefined },
+  sshTunnelBindToLocalPort: { type: 'number', default: undefined },
   /**
    * The optional SSH username for the remote host.
    */
@@ -770,7 +769,6 @@ Connection = AmpersandModel.extend({
   props,
   derived,
   session,
-  dataTypes,
   initialize(attrs) {
     if (attrs) {
       if (typeof attrs === 'string') {

lib/model.js

@@ -954,12 +954,12 @@ describe('Connection model builder', () => {
         expect(error.message).to.equal('The \'Password\' field is required when using \'Username/Password\' or \'SCRAM-SHA-256\' for authentication.');
       });
 
-      it('should generate the local port when using a ssh tunne and bind to local port does not exist', () => {
+      it('should generate the local port when using a ssh tunnel and bind to local port does not exist', () => {
         const c = new Connection();
 
         c.sshTunnel = 'USER_PASSWORD';
         c.sshTunnelHostname = '123.45.67.89';
-        c.sshTunnelPort = '22';
+        c.sshTunnelPort = 22;
         c.sshTunnelUsername = 'user';
         c.sshTunnelPassword = 'pass';
 

test/build-uri.test.js

@@ -89,7 +89,7 @@ describe('connection model connector', () => {
       it('should close ssh tunnel if the connection fails', (done) => {
         const model = new MockConnection({
           hostname: 'localhost',
-          port: '27020',
+          port: 27020,
           sshTunnel: 'USER_PASSWORD',
           sshTunnelHostname: 'my.ssh-server.com',
           sshTunnelPassword: 'password',

test/connect.test.js

@@ -35,41 +35,6 @@ describe('sshTunnel', function () {
 
       assert.equal(c.sshTunnelPort, 22);
     });
-
-    it('should cast an empty string to the default', () => {
-      const c = new Connection({ sshTunnelPort: '' });
-
-      assert.equal(c.sshTunnelPort, 22);
-    });
-
-    it('should cast an empty string to the default when updating', () => {
-      const c = new Connection({});
-
-      c.set({ sshTunnelPort: '' });
-      assert.equal(c.sshTunnelPort, 22);
-    });
-
-    it('should not allow negative numbers', () => {
-      assert.throws(
-        () => {
-          /* eslint no-new:0 */
-          new Connection({ sshTunnelPort: -22 });
-        },
-        TypeError,
-        /must be positive/
-      );
-    });
-
-    it('should not allow values above the max port number value', () => {
-      assert.throws(
-        () => {
-          /* eslint no-new:0 */
-          new Connection({ sshTunnelPort: 27017 * 10000 });
-        },
-        TypeError,
-        /must be below/
-      );
-    });
   });
 
   describe('NONE', () => {