refactor: resolve eslint no-use-before-define

Author: wellwelwel

promise.d.ts

@@ -12,19 +12,25 @@ import {
 import { EventEmitter } from 'events';
 export * from './index';
 
-export interface Connection extends EventEmitter {
-  config: ConnectionOptions;
-  threadId: number;
-
-  connect(): Promise<void>;
-  ping(): Promise<void>;
-
-  beginTransaction(): Promise<void>;
-  commit(): Promise<void>;
-  rollback(): Promise<void>;
-
-  changeUser(options: ConnectionOptions): Promise<void>;
+export interface PreparedStatementInfo {
+  close(): Promise<void>;
+  execute(
+    parameters: any[]
+  ): Promise<
+    [
+      (
+        | RowDataPacket[][]
+        | RowDataPacket[]
+        | OkPacket
+        | OkPacket[]
+        | ResultSetHeader
+      ),
+      FieldPacket[]
+    ]
+  >;
+}
 
+export interface Connection extends EventEmitter {
   query<
     T extends
       | RowDataPacket[][]
@@ -111,7 +117,24 @@ export interface Connection extends EventEmitter {
     values: any | any[] | { [param: string]: any }
   ): Promise<[T, FieldPacket[]]>;
 
+  config: ConnectionOptions;
+
+  threadId: number;
+
+  connect(): Promise<void>;
+
+  ping(): Promise<void>;
+
+  beginTransaction(): Promise<void>;
+
+  commit(): Promise<void>;
+
+  rollback(): Promise<void>;
+
+  changeUser(options: ConnectionOptions): Promise<void>;
+
   prepare(options: string | QueryOptions): Promise<PreparedStatementInfo>;
+
   unprepare(sql: string | QueryOptions): void;
 
   end(options?: any): Promise<void>;
@@ -224,15 +247,19 @@ export interface Pool extends EventEmitter, Connection {
 
   getConnection(): Promise<PoolConnection>;
   releaseConnection(connection: PoolConnection): void;
+
   on(event: 'connection', listener: (connection: PoolConnection) => any): this;
   on(event: 'acquire', listener: (connection: PoolConnection) => any): this;
   on(event: 'release', listener: (connection: PoolConnection) => any): this;
   on(event: 'enqueue', listener: () => any): this;
+
   end(): Promise<void>;
 
   escape(value: any): string;
+
   escapeId(value: string): string;
   escapeId(values: string[]): string;
+
   format(sql: string, values?: any | any[] | { [param: string]: any }): string;
 
   pool: CorePool;
@@ -242,23 +269,6 @@ export function createConnection(connectionUri: string): Promise<Connection>;
 export function createConnection(
   config: ConnectionOptions
 ): Promise<Connection>;
+
 export function createPool(connectionUri: string): Pool;
 export function createPool(config: PoolOptions): Pool;
-
-export interface PreparedStatementInfo {
-  close(): Promise<void>;
-  execute(
-    parameters: any[]
-  ): Promise<
-    [
-      (
-        | RowDataPacket[][]
-        | RowDataPacket[]
-        | OkPacket
-        | OkPacket[]
-        | ResultSetHeader
-      ),
-      FieldPacket[]
-    ]
-  >;
-}

typings/mysql/index.d.ts

@@ -1,47 +1,20 @@
 import * as crypto from 'crypto';
-
-import BaseConnection = require('./lib/Connection');
+import * as BasePool from './lib/Pool';
+import * as BaseConnection from './lib/Connection';
+import {
+  PoolCluster as BasePoolCluster,
+  PoolClusterOptions,
+} from './lib/PoolCluster';
 import { ConnectionOptions, SslOptions } from './lib/Connection';
 import BasePoolConnection = require('./lib/PoolConnection');
-import BasePool = require('./lib/Pool');
 import { PoolOptions } from './lib/Pool';
-import BasePoolCluster = require('./lib/PoolCluster');
-import { PoolClusterOptions } from './lib/PoolCluster';
 import BaseQuery = require('./lib/protocol/sequences/Query');
 import BasePrepare = require('./lib/protocol/sequences/Prepare');
 import { QueryOptions, QueryError } from './lib/protocol/sequences/Query';
 import { PrepareStatementInfo } from './lib/protocol/sequences/Prepare';
 import Server = require('./lib/Server');
 import { Connection as PromiseConnection } from '../../promise';
 
-export function createConnection(connectionUri: string): Connection;
-export function createConnection(
-  config: BaseConnection.ConnectionOptions
-): Connection;
-export function createPool(config: BasePool.PoolOptions): BasePool;
-export function createPoolCluster(
-  config?: BasePoolCluster.PoolClusterOptions
-): PoolCluster;
-export function escape(value: any): string;
-export function escapeId(value: any): string;
-export function format(sql: string): string;
-export function format(
-  sql: string,
-  values: any[],
-  stringifyObjects?: boolean,
-  timeZone?: string
-): string;
-export function format(
-  sql: string,
-  values: any,
-  stringifyObjects?: boolean,
-  timeZone?: string
-): string;
-export function raw(sql: string): {
-  toSqlString: () => string;
-};
-export function createServer(handler: (conn: BaseConnection) => any): Server;
-
 export {
   ConnectionOptions,
   SslOptions,
@@ -51,14 +24,15 @@ export {
   QueryError,
   PrepareStatementInfo,
 };
+
 export * from './lib/protocol/packets/index';
 
 // Expose class interfaces
-export interface Connection extends BaseConnection {
+export interface Connection extends BaseConnection.Connection {
   promise(promiseImpl?: PromiseConstructor): PromiseConnection;
 }
+export interface Pool extends BasePool.Pool {}
 export interface PoolConnection extends BasePoolConnection {}
-export interface Pool extends BasePool {}
 export interface PoolCluster extends BasePoolCluster {}
 export interface Query extends BaseQuery {}
 export interface Prepare extends BasePrepare {}
@@ -96,3 +70,39 @@ export const authPlugins: {
     joinServerPublicKey?: (data: Buffer) => void;
   }>;
 };
+
+export function createConnection(connectionUri: string): Connection;
+export function createConnection(
+  config: BaseConnection.ConnectionOptions
+): Connection;
+
+export function createPool(config: BasePool.PoolOptions): BasePool.Pool;
+
+export function createPoolCluster(config?: PoolClusterOptions): PoolCluster;
+
+export function escape(value: any): string;
+
+export function escapeId(value: any): string;
+
+export function format(sql: string): string;
+export function format(
+  sql: string,
+  values: any[],
+  stringifyObjects?: boolean,
+  timeZone?: string
+): string;
+
+export function format(
+  sql: string,
+  values: any,
+  stringifyObjects?: boolean,
+  timeZone?: string
+): string;
+
+export function raw(sql: string): {
+  toSqlString: () => string;
+};
+
+export function createServer(
+  handler: (conn: BaseConnection.Connection) => any
+): Server;