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/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/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');
@@ -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) {

promise.js

@@ -1,8 +1,15 @@
 'use strict';
 
-const core = require('./index.js');
+const SqlString = require('sqlstring');
 const EventEmitter = require('events').EventEmitter;
 const parserCache = require('./lib/parsers/parser_cache.js');
+const PoolConnection = require('./lib/pool_connection.js');
+const Pool = require('./lib/pool.js');
+const PoolCluster = require('./lib/pool_cluster.js');
+const createConnection = require('./lib/create_connection.js');
+const Connection = require('./lib/connection.js');
+const createPool = require('./lib/create_pool.js');
+const createPoolCluster = require('./lib/create_pool_cluster.js');
 
 function makeDoneCb(resolve, reject, localErr) {
   return function (err, rows, fields) {
@@ -248,8 +255,8 @@
   }
 }
 
-function createConnection(opts) {
-  const coreConnection = core.createConnection(opts);
+function createConnectionPromise(opts) {
+  const coreConnection = createConnection(opts);
   const createConnectionErr = new Error();
   const thePromise = opts.Promise || Promise;
   if (!thePromise) {
@@ -286,12 +293,12 @@
     const func = functionsToWrap[i];
 
     if (
-      typeof core.Connection.prototype[func] === 'function' &&
+      typeof Connection.prototype[func] === 'function' &&
       PromiseConnection.prototype[func] === undefined
     ) {
       PromiseConnection.prototype[func] = (function factory(funcName) {
         return function () {
-          return core.Connection.prototype[funcName].apply(
+          return Connection.prototype[funcName].apply(
             this.connection,
             arguments
           );
@@ -319,7 +326,7 @@
   }
 
   destroy() {
-    return core.PoolConnection.prototype.destroy.apply(
+    return PoolConnection.prototype.destroy.apply(
       this.connection,
       arguments
     );
@@ -407,8 +414,8 @@
   }
 }
 
-function createPool(opts) {
-  const corePool = core.createPool(opts);
+function createPromisePool(opts) {
+  const corePool = createPool(opts);
   const thePromise = opts.Promise || Promise;
   if (!thePromise) {
     throw new Error(
@@ -426,12 +433,12 @@
     const func = functionsToWrap[i];
 
     if (
-      typeof core.Pool.prototype[func] === 'function' &&
+      typeof Pool.prototype[func] === 'function' &&
       PromisePool.prototype[func] === undefined
     ) {
       PromisePool.prototype[func] = (function factory(funcName) {
         return function () {
-          return core.Pool.prototype[funcName].apply(this.pool, arguments);
+          return Pool.prototype[funcName].apply(this.pool, arguments);
         };
       })(func);
     }
@@ -527,12 +534,12 @@
     const func = functionsToWrap[i];
 
     if (
-      typeof core.PoolCluster.prototype[func] === 'function' &&
+      typeof PoolCluster.prototype[func] === 'function' &&
       PromisePoolCluster.prototype[func] === undefined
     ) {
       PromisePoolCluster.prototype[func] = (function factory(funcName) {
         return function () {
-          return core.PoolCluster.prototype[funcName].apply(this.poolCluster, arguments);
+          return PoolCluster.prototype[funcName].apply(this.poolCluster, arguments);
         };
       })(func);
     }
@@ -541,8 +548,8 @@
   'add'
 ]);
 
-function createPoolCluster(opts) {
-  const corePoolCluster = core.createPoolCluster(opts);
+function createPromisePoolCluster(opts) {
+  const corePoolCluster = createPoolCluster(opts);
   const thePromise = (opts && opts.Promise) || Promise;
   if (!thePromise) {
     throw new Error(
@@ -554,13 +561,13 @@
   return new PromisePoolCluster(corePoolCluster, thePromise);
 }
 
-exports.createConnection = createConnection;
-exports.createPool = createPool;
-exports.createPoolCluster = createPoolCluster;
-exports.escape = core.escape;
-exports.escapeId = core.escapeId;
-exports.format = core.format;
-exports.raw = core.raw;
+exports.createConnection = createConnectionPromise;
+exports.createPool = createPromisePool;
+exports.createPoolCluster = createPromisePoolCluster;
+exports.escape = SqlString.escape;
+exports.escapeId = SqlString.escapeId;
+exports.format = SqlString.format;
+exports.raw = SqlString.raw;
 exports.PromisePool = PromisePool;
 exports.PromiseConnection = PromiseConnection;
 exports.PromisePoolConnection = PromisePoolConnection;