From 623e8c91fa61d37244045b917730b54d94cbe0b2 Mon Sep 17 00:00:00 2001
From: wellwelwel <46850407+wellwelwel@users.noreply.github.com>
Date: Tue, 12 Nov 2024 17:11:56 -0300
Subject: [PATCH] chore: better organize new files

---
 lib/{base_connection.js => base/connection.js}         | 10 +++++-----
 lib/{base_pool.js => base/pool.js}                     |  4 ++--
 .../pool_connection.js}                                |  2 +-
 lib/connection.js                                      |  4 ++--
 lib/pool.js                                            |  4 ++--
 lib/pool_connection.js                                 |  4 ++--
 lib/{promise_connection.js => promise/connection.js}   |  4 ++--
 lib/{ => promise}/inherit_events.js                    |  0
 lib/{ => promise}/make_done_cb.js                      |  0
 lib/{promise_pool.js => promise/pool.js}               |  4 ++--
 .../pool_connection.js}                                |  4 ++--
 .../prepared_statement_info.js}                        |  0
 promise.js                                             | 10 +++++-----
 13 files changed, 25 insertions(+), 25 deletions(-)
 rename lib/{base_connection.js => base/connection.js} (99%)
 rename lib/{base_pool.js => base/pool.js} (98%)
 rename lib/{base_pool_connection.js => base/pool_connection.js} (96%)
 rename lib/{promise_connection.js => promise/connection.js} (97%)
 rename lib/{ => promise}/inherit_events.js (100%)
 rename lib/{ => promise}/make_done_cb.js (100%)
 rename lib/{promise_pool.js => promise/pool.js} (96%)
 rename lib/{promise_pool_connection.js => promise/pool_connection.js} (71%)
 rename lib/{promise_prepared_statement_info.js => promise/prepared_statement_info.js} (100%)

diff --git a/lib/base_connection.js b/lib/base/connection.js
similarity index 99%
rename from lib/base_connection.js
rename to lib/base/connection.js
index bb50135813..d00ce8c1f6 100644
--- a/lib/base_connection.js
+++ b/lib/base/connection.js
@@ -23,11 +23,11 @@ const Readable = require('stream').Readable;
 const Queue = require('denque');
 const SqlString = require('sqlstring');
 const { createLRU } = require('lru.min');
-const PacketParser = require('./packet_parser.js');
-const Packets = require('./packets/index.js');
-const Commands = require('./commands/index.js');
-const ConnectionConfig = require('./connection_config.js');
-const CharsetToEncoding = require('./constants/charset_encodings.js');
+const PacketParser = require('../packet_parser.js');
+const Packets = require('../packets/index.js');
+const Commands = require('../commands/index.js');
+const ConnectionConfig = require('../connection_config.js');
+const CharsetToEncoding = require('../constants/charset_encodings.js');
 
 let _connectionId = 0;
 
diff --git a/lib/base_pool.js b/lib/base/pool.js
similarity index 98%
rename from lib/base_pool.js
rename to lib/base/pool.js
index bcd6e7b1f3..47981f1943 100644
--- a/lib/base_pool.js
+++ b/lib/base/pool.js
@@ -3,9 +3,9 @@
 const process = require('process');
 const SqlString = require('sqlstring');
 const EventEmitter = require('events').EventEmitter;
-const PoolConnection = require('./pool_connection.js');
+const PoolConnection = require('../pool_connection.js');
 const Queue = require('denque');
-const BaseConnection = require('./base_connection.js');
+const BaseConnection = require('./connection.js');
 
 function spliceConnection(queue, connection) {
   const len = queue.length;
diff --git a/lib/base_pool_connection.js b/lib/base/pool_connection.js
similarity index 96%
rename from lib/base_pool_connection.js
rename to lib/base/pool_connection.js
index 97b345efd7..74511ce587 100644
--- a/lib/base_pool_connection.js
+++ b/lib/base/pool_connection.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const BaseConnection = require('./base_connection.js');
+const BaseConnection = require('./connection.js');
 
 class BasePoolConnection extends BaseConnection {
   constructor(pool, options) {
diff --git a/lib/connection.js b/lib/connection.js
index fb93a3274a..b21cff85c4 100644
--- a/lib/connection.js
+++ b/lib/connection.js
@@ -1,10 +1,10 @@
 'use strict';
 
-const BaseConnection = require('./base_connection.js');
+const BaseConnection = require('./base/connection.js');
 
 class Connection extends BaseConnection {
   promise(promiseImpl) {
-    const PromiseConnection = require('./promise_connection.js');
+    const PromiseConnection = require('./promise/connection.js');
     return new PromiseConnection(this, promiseImpl);
   }
 }
diff --git a/lib/pool.js b/lib/pool.js
index 05a619e81b..b0f1e2bdc5 100644
--- a/lib/pool.js
+++ b/lib/pool.js
@@ -1,10 +1,10 @@
 'use strict';
 
-const BasePool = require('./base_pool.js');
+const BasePool = require('./base/pool.js');
 
 class Pool extends BasePool {
   promise(promiseImpl) {
-    const PromisePool = require('./promise_pool.js');
+    const PromisePool = require('./promise/pool.js');
     return new PromisePool(this, promiseImpl);
   }
 }
diff --git a/lib/pool_connection.js b/lib/pool_connection.js
index d7639da9a6..5cc94dc187 100644
--- a/lib/pool_connection.js
+++ b/lib/pool_connection.js
@@ -1,10 +1,10 @@
 'use strict';
 
-const BasePoolConnection = require('./base_pool_connection.js');
+const BasePoolConnection = require('./base/pool_connection.js');
 
 class PoolConnection extends BasePoolConnection {
   promise(promiseImpl) {
-    const PromisePoolConnection = require('./promise_pool_connection.js');
+    const PromisePoolConnection = require('./promise/pool_connection.js');
     return new PromisePoolConnection(this, promiseImpl);
   }
 }
diff --git a/lib/promise_connection.js b/lib/promise/connection.js
similarity index 97%
rename from lib/promise_connection.js
rename to lib/promise/connection.js
index f1dccc08bc..7cb0628e6e 100644
--- a/lib/promise_connection.js
+++ b/lib/promise/connection.js
@@ -1,10 +1,10 @@
 'use strict';
 
 const EventEmitter = require('events').EventEmitter;
-const PromisePreparedStatementInfo = require('./promise_prepared_statement_info.js');
+const PromisePreparedStatementInfo = require('./prepared_statement_info.js');
 const makeDoneCb = require('./make_done_cb.js');
 const inheritEvents = require('./inherit_events.js');
-const BaseConnection = require('./base_connection.js');
+const BaseConnection = require('../base/connection.js');
 
 class PromiseConnection extends EventEmitter {
   constructor(connection, promiseImpl) {
diff --git a/lib/inherit_events.js b/lib/promise/inherit_events.js
similarity index 100%
rename from lib/inherit_events.js
rename to lib/promise/inherit_events.js
diff --git a/lib/make_done_cb.js b/lib/promise/make_done_cb.js
similarity index 100%
rename from lib/make_done_cb.js
rename to lib/promise/make_done_cb.js
diff --git a/lib/promise_pool.js b/lib/promise/pool.js
similarity index 96%
rename from lib/promise_pool.js
rename to lib/promise/pool.js
index e75df4b97e..672caf03a9 100644
--- a/lib/promise_pool.js
+++ b/lib/promise/pool.js
@@ -2,9 +2,9 @@
 
 const EventEmitter = require('events').EventEmitter;
 const makeDoneCb = require('./make_done_cb.js');
-const PromisePoolConnection = require('./promise_pool_connection.js');
+const PromisePoolConnection = require('./pool_connection.js');
 const inheritEvents = require('./inherit_events.js');
-const BasePool = require('./base_pool.js');
+const BasePool = require('../base/pool.js');
 
 class PromisePool extends EventEmitter {
   constructor(pool, thePromise) {
diff --git a/lib/promise_pool_connection.js b/lib/promise/pool_connection.js
similarity index 71%
rename from lib/promise_pool_connection.js
rename to lib/promise/pool_connection.js
index 4fafc498dc..1da0113c06 100644
--- a/lib/promise_pool_connection.js
+++ b/lib/promise/pool_connection.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const PromiseConnection = require('./promise_connection.js');
-const BasePoolConnection = require('./base_pool_connection.js');
+const PromiseConnection = require('./connection.js');
+const BasePoolConnection = require('../base/pool_connection.js');
 
 class PromisePoolConnection extends PromiseConnection {
   constructor(connection, promiseImpl) {
diff --git a/lib/promise_prepared_statement_info.js b/lib/promise/prepared_statement_info.js
similarity index 100%
rename from lib/promise_prepared_statement_info.js
rename to lib/promise/prepared_statement_info.js
diff --git a/promise.js b/promise.js
index 0e51f31cd3..a0216f5660 100644
--- a/promise.js
+++ b/promise.js
@@ -7,11 +7,11 @@ const PoolCluster = require('./lib/pool_cluster.js');
 const createConnection = require('./lib/create_connection.js');
 const createPool = require('./lib/create_pool.js');
 const createPoolCluster = require('./lib/create_pool_cluster.js');
-const PromiseConnection = require('./lib/promise_connection.js');
-const PromisePool = require('./lib/promise_pool.js');
-const makeDoneCb = require('./lib/make_done_cb.js');
-const PromisePoolConnection = require('./lib/promise_pool_connection.js');
-const inheritEvents = require('./lib/inherit_events.js');
+const PromiseConnection = require('./lib/promise/connection.js');
+const PromisePool = require('./lib/promise/pool.js');
+const makeDoneCb = require('./lib/promise/make_done_cb.js');
+const PromisePoolConnection = require('./lib/promise/pool_connection.js');
+const inheritEvents = require('./lib/promise/inherit_events.js');
 
 function createConnectionPromise(opts) {
   const coreConnection = createConnection(opts);