fix: circular dependencies

index.js

@@ -2,30 +2,24 @@
 
 const SqlString = require('sqlstring');
 
-const Connection = require('./lib/connection.js');
 const ConnectionConfig = require('./lib/connection_config.js');
-const parserCache = require('./lib/parsers/parser_cache');
+const parserCache = require('./lib/parsers/parser_cache.js');
 
-exports.createConnection = function(opts) {
-  return new Connection({ config: new ConnectionConfig(opts) });
-};
+const Connection = require('./lib/connection.js');
 
+exports.createConnection = require('./lib/create_connection.js');
 exports.connect = exports.createConnection;
-exports.Connection = Connection;
+exports.Connection = Connection
 exports.ConnectionConfig = ConnectionConfig;
 
 const Pool = require('./lib/pool.js');
 const PoolCluster = require('./lib/pool_cluster.js');
+const createPool = require('./lib/create_pool.js');
+const createPoolCluster = require('./lib/create_pool_cluster.js');
 
-exports.createPool = function(config) {
-  const PoolConfig = require('./lib/pool_config.js');
-  return new Pool({ config: new PoolConfig(config) });
-};
+exports.createPool = createPool
 
-exports.createPoolCluster = function(config) {
-  const PoolCluster = require('./lib/pool_cluster.js');
-  return new PoolCluster(config);
-};
+exports.createPoolCluster = createPoolCluster;
 
 exports.createQuery = Connection.createQuery;
 
@@ -42,7 +36,7 @@ exports.createServer = function(handler) {
   return s;
 };
 
-exports.PoolConnection = require('./lib/pool_connection');
+exports.PoolConnection = require('./lib/pool_connection.js');
 exports.authPlugins = require('./lib/auth_plugins');
 exports.escape = SqlString.escape;
 exports.escapeId = SqlString.escapeId;

lib/connection.js

@@ -156,7 +156,7 @@ class Connection extends EventEmitter {
   }
 
   promise(promiseImpl) {
-    const PromiseConnection = require('../promise').PromiseConnection;
+    const PromiseConnection = require('./promise_connection.js');
     return new PromiseConnection(this, promiseImpl);
   }
 

lib/create_connection.js

@@ -0,0 +1,10 @@
+'use strict';
+
+const Connection = require('./connection.js');
+const ConnectionConfig = require('./connection_config.js');
+
+function createConnection(opts) {
+  return new Connection({ config: new ConnectionConfig(opts) });
+}
+
+module.exports = createConnection;

lib/create_pool.js

@@ -0,0 +1,10 @@
+'use strict';
+
+const Pool = require('./pool.js');
+const PoolConfig = require('./pool_config.js');
+
+function createPool(config) {
+  return new Pool({ config: new PoolConfig(config) });
+}
+
+module.exports = createPool

lib/create_pool_cluster.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const PoolCluster = require('./pool_cluster.js');
+
+function createPoolCluster(config) {
+  return new PoolCluster(config);
+}
+
+module.exports = createPoolCluster;

lib/inherit_events.js

@@ -0,0 +1,27 @@
+'use strict';
+
+function inheritEvents(source, target, events) {
+  const listeners = {};
+  target
+    .on('newListener', eventName => {
+      if (events.indexOf(eventName) >= 0 && !target.listenerCount(eventName)) {
+        source.on(
+          eventName,
+          (listeners[eventName] = function () {
+            const args = [].slice.call(arguments);
+            args.unshift(eventName);
+
+            target.emit.apply(target, args);
+          })
+        );
+      }
+    })
+    .on('removeListener', eventName => {
+      if (events.indexOf(eventName) >= 0 && !target.listenerCount(eventName)) {
+        source.removeListener(eventName, listeners[eventName]);
+        delete listeners[eventName];
+      }
+    });
+}
+
+module.exports = inheritEvents

lib/make_done_cb.js

@@ -0,0 +1,19 @@
+'use strict';
+
+function makeDoneCb(resolve, reject, localErr) {
+  return function (err, rows, fields) {
+    if (err) {
+      localErr.message = err.message;
+      localErr.code = err.code;
+      localErr.errno = err.errno;
+      localErr.sql = err.sql;
+      localErr.sqlState = err.sqlState;
+      localErr.sqlMessage = err.sqlMessage;
+      reject(localErr);
+    } else {
+      resolve([rows, fields]);
+    }
+  };
+}
+
+module.exports = makeDoneCb

lib/pool.js

@@ -1,8 +1,7 @@
 'use strict';
 
 const process = require('process');
-const mysql = require('../index.js');
-
+const SqlString = require('sqlstring');
 const EventEmitter = require('events').EventEmitter;
 const PoolConnection = require('./pool_connection.js');
 const Queue = require('denque');
@@ -34,7 +33,7 @@ class Pool extends EventEmitter {
   }
 
   promise(promiseImpl) {
-    const PromisePool = require('../promise').PromisePool;
+    const PromisePool = require('./promise_pool.js');
     return new PromisePool(this, promiseImpl);
   }
 
@@ -214,7 +213,7 @@ class Pool extends EventEmitter {
   }
 
   format(sql, values) {
-    return mysql.format(
+    return SqlString.format(
       sql,
       values,
       this.config.connectionConfig.stringifyObjects,
@@ -223,15 +222,15 @@ class Pool extends EventEmitter {
   }
 
   escape(value) {
-    return mysql.escape(
+    return SqlString.escape(
       value,
       this.config.connectionConfig.stringifyObjects,
       this.config.connectionConfig.timezone
     );
   }
 
   escapeId(value) {
-    return mysql.escapeId(value, false);
+    return SqlString.escapeId(value, false);
   }
 }
 

lib/pool_connection.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Connection = require('../index.js').Connection;
+const Connection = require('./connection.js');
 
 class PoolConnection extends Connection {
   constructor(pool, options) {
@@ -30,7 +30,7 @@
   }
 
   promise(promiseImpl) {
-    const PromisePoolConnection = require('../promise').PromisePoolConnection;
+    const PromisePoolConnection = require('./promise_pool_connection.js');
     return new PromisePoolConnection(this, promiseImpl);
   }