added types and tests

Author: jmordica

.eslintrc

@@ -9,6 +9,13 @@
     "es6": true
   },
   "rules": {
+    "@typescript-eslint/typedef": [
+      "error",
+      {
+        "arrowParameter": true,
+        "variableDeclaration": true
+      }
+    ],
     "template-curly-spacing": ["error", "never"],
     "prefer-template": "error",
     "no-useless-call": "error",

index.d.ts

@@ -1,7 +1,7 @@
 import {
   Connection as PromiseConnection,
   Pool as PromisePool,
-  PoolConnection as PromisePoolConnection
+  PoolConnection as PromisePoolConnection,
 } from './promise';
 
 import * as mysql from './typings/mysql';
@@ -74,9 +74,16 @@ export interface Connection extends mysql.Connection {
   promise(promiseImpl?: PromiseConstructor): PromiseConnection;
   unprepare(sql: string): mysql.PrepareStatementInfo;
   prepare(sql: string, callback?: (err: mysql.QueryError | null, statement: mysql.PrepareStatementInfo) => any): mysql.Prepare;
+  serverHandshake(args: any): any;
+  writeOk(args?: mysql.OkPacketParams): void;
+  writeError(args?: mysql.ErrorPacketParams): void;
+  writeEof(warnings?: number, statusFlags?: number): void;
+  writeTextResult(rows?: Array<any>, columns?: Array<any>): void;
+  writePacket(packet: any): void;
+  sequenceId: number;
 }
 
-export interface PoolConnection extends mysql.PoolConnection, Connection {
+export interface PoolConnection extends Connection {
   promise(promiseImpl?: PromiseConstructor): PromisePoolConnection;
 }
 
@@ -153,6 +160,8 @@ export interface Pool extends mysql.Connection {
   promise(promiseImpl?: PromiseConstructor): PromisePool;
   unprepare(sql: string): mysql.PrepareStatementInfo;
   prepare(sql: string, callback?: (err: mysql.QueryError | null, statement: mysql.PrepareStatementInfo) => any): mysql.Prepare;
+
+  config: mysql.PoolOptions;
 }
 
 type authPlugins = (pluginMetadata: {

promise.d.ts

@@ -5,7 +5,8 @@ import {
   FieldPacket,
   QueryOptions,
   ConnectionOptions,
-  PoolOptions
+  PoolOptions,
+  Pool as CorePool
 } from './index';
 
 import { EventEmitter } from 'events';
@@ -131,6 +132,13 @@ export interface Pool extends EventEmitter {
   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;
 }
 
 export function createConnection(connectionUri: string): Promise<Connection>;
@@ -143,3 +151,7 @@ export interface PreparedStatementInfo {
   close(): Promise<void>;
   execute(parameters: any[]): Promise<[RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader, FieldPacket[]]>;
 }
+
+export interface PromisePoolConnection extends Connection {
+  destroy(): any;
+} 

tests.json

@@ -6,7 +6,9 @@
 		"listEmittedFiles": false
 	},
 	"files": [
-		"typings/test/server.ts"
+		"typings/test/server.ts",
+		"typings/test/connection.ts",
+		"typings/test/pool.ts"
 	],
 	"typeRoots": [
 		"./typings",

typings/mysql/index.d.ts

@@ -24,6 +24,7 @@ export function format(sql: string, values: any, stringifyObjects?: boolean, tim
 export function raw(sql: string): {
     toSqlString: () => string
 };
+export function createServer(handler: (conn: BaseConnection) => any): Server;
 
 export {
     ConnectionOptions,
@@ -42,6 +43,4 @@ 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 {}
-
-export function createServer(handler: (conn: BaseConnection) => any): Server;
+export interface Prepare extends BasePrepare {}

typings/mysql/lib/Connection.d.ts

@@ -271,6 +271,12 @@ declare class Connection extends EventEmitter {
     on(event: string, listener: Function): this;
 
     rollback(callback: (err: Query.QueryError | null) => void): void;
+
+    execute(sql: string, values: Array<any>, cb: (err: any, rows: Array<any>, fields: Array<any>) => any): any;
+
+    unprepare(sql: string): any;
+
+    serverHandshake(args: any): any;
 }
 
 export = Connection;

typings/mysql/lib/Pool.d.ts

@@ -61,7 +61,7 @@ declare class Pool extends EventEmitter {
     on(event: string, listener: Function): this;
     on(event: 'connection', listener: (connection: PoolConnection) => any): this;
 
-    promise(promiseImpl?: any): any
+    promise(promiseImpl?: any): any;
 }
 
 export = Pool;

typings/mysql/lib/protocol/packets/index.d.ts

@@ -4,11 +4,15 @@ import RowDataPacket = require('./RowDataPacket');
 import FieldPacket = require('./FieldPacket');
 import Field = require('./Field');
 import ResultSetHeader = require('./ResultSetHeader');
+import OkPacketParams = require('./params/OkPacketParams');
+import ErrorPacketParams = require('./params/ErrorPacketParams');
 
 export {
     OkPacket,
     RowDataPacket,
     FieldPacket,
     Field,
-    ResultSetHeader
+    ResultSetHeader,
+    OkPacketParams,
+    ErrorPacketParams
 };

typings/mysql/lib/protocol/packets/params/ErrorPacketParams.d.ts

@@ -0,0 +1,6 @@
+declare interface ErrorPacketParams {
+  message?: string;
+  code?: number | string;
+}
+
+export = ErrorPacketParams;

typings/mysql/lib/protocol/packets/params/OkPacketParams.d.ts

@@ -0,0 +1,9 @@
+declare interface OkPacketParams {
+  affectedRows?: number;
+  insertId?: number;
+  serverStatus?: number;
+  warningCount?: number;
+  message?: string;
+}
+
+export = OkPacketParams;