@breautek/storm 4.6.2 → 5.0.0

package/docs/interfaces/IErrorResponse.md

@@ -20,7 +20,7 @@
 
 #### Defined in
 
-[src/StormError.ts:37](https://github.com/breautek/storm/blob/4b2254f/src/StormError.ts#L37)
+[src/StormError.ts:37](https://github.com/breautek/storm/blob/3748147/src/StormError.ts#L37)
 
 ___
 
@@ -30,7 +30,7 @@ ___
 
 #### Defined in
 
-[src/StormError.ts:38](https://github.com/breautek/storm/blob/4b2254f/src/StormError.ts#L38)
+[src/StormError.ts:38](https://github.com/breautek/storm/blob/3748147/src/StormError.ts#L38)
 
 ___
 
@@ -40,7 +40,7 @@ ___
 
 #### Defined in
 
-[src/StormError.ts:36](https://github.com/breautek/storm/blob/4b2254f/src/StormError.ts#L36)
+[src/StormError.ts:36](https://github.com/breautek/storm/blob/3748147/src/StormError.ts#L36)
 
 ___
 
@@ -50,7 +50,7 @@ ___
 
 #### Defined in
 
-[src/StormError.ts:35](https://github.com/breautek/storm/blob/4b2254f/src/StormError.ts#L35)
+[src/StormError.ts:35](https://github.com/breautek/storm/blob/3748147/src/StormError.ts#L35)
 
 ___
 
@@ -60,4 +60,4 @@ ___
 
 #### Defined in
 
-[src/StormError.ts:34](https://github.com/breautek/storm/blob/4b2254f/src/StormError.ts#L34)
+[src/StormError.ts:34](https://github.com/breautek/storm/blob/3748147/src/StormError.ts#L34)

package/docs/interfaces/IFormData.md

@@ -17,7 +17,7 @@
 
 #### Defined in
 
-[src/IFormData.ts:20](https://github.com/breautek/storm/blob/4b2254f/src/IFormData.ts#L20)
+[src/IFormData.ts:20](https://github.com/breautek/storm/blob/3748147/src/IFormData.ts#L20)
 
 ___
 
@@ -27,4 +27,4 @@ ___
 
 #### Defined in
 
-[src/IFormData.ts:21](https://github.com/breautek/storm/blob/4b2254f/src/IFormData.ts#L21)
+[src/IFormData.ts:21](https://github.com/breautek/storm/blob/3748147/src/IFormData.ts#L21)

package/docs/interfaces/IHandler.md

@@ -28,4 +28,4 @@
 
 #### Defined in
 
-[src/IHandler.ts:21](https://github.com/breautek/storm/blob/4b2254f/src/IHandler.ts#L21)
+[src/IHandler.ts:21](https://github.com/breautek/storm/blob/3748147/src/IHandler.ts#L21)

package/docs/interfaces/IInsertQueryResult.md

@@ -18,7 +18,7 @@
 
 #### Defined in
 
-[src/IInsertQueryResult.ts:19](https://github.com/breautek/storm/blob/4b2254f/src/IInsertQueryResult.ts#L19)
+[src/IInsertQueryResult.ts:19](https://github.com/breautek/storm/blob/3748147/src/IInsertQueryResult.ts#L19)
 
 ___
 
@@ -28,7 +28,7 @@ ___
 
 #### Defined in
 
-[src/IInsertQueryResult.ts:20](https://github.com/breautek/storm/blob/4b2254f/src/IInsertQueryResult.ts#L20)
+[src/IInsertQueryResult.ts:20](https://github.com/breautek/storm/blob/3748147/src/IInsertQueryResult.ts#L20)
 
 ___
 
@@ -38,4 +38,4 @@ ___
 
 #### Defined in
 
-[src/IInsertQueryResult.ts:18](https://github.com/breautek/storm/blob/4b2254f/src/IInsertQueryResult.ts#L18)
+[src/IInsertQueryResult.ts:18](https://github.com/breautek/storm/blob/3748147/src/IInsertQueryResult.ts#L18)

package/docs/interfaces/IJWTVerifyOptions.md

@@ -16,4 +16,4 @@
 
 #### Defined in
 
-[src/IJWTVerifyOptions.ts:18](https://github.com/breautek/storm/blob/4b2254f/src/IJWTVerifyOptions.ts#L18)
+[src/IJWTVerifyOptions.ts:18](https://github.com/breautek/storm/blob/3748147/src/IJWTVerifyOptions.ts#L18)

package/docs/interfaces/IQueryable.md

@@ -0,0 +1,119 @@
+[@breautek/storm](../README.md) / IQueryable
+
+# Interface: IQueryable<T\>
+
+## Type parameters
+
+| Name |
+| :------ |
+| `T` |
+
+## Implemented by
+
+- [`Query`](../classes/Query.md)
+- [`Transaction`](../classes/Transaction.md)
+
+## Table of contents
+
+### Methods
+
+- [execute](IQueryable.md#execute)
+- [getParametersForQuery](IQueryable.md#getparametersforquery)
+- [getQuery](IQueryable.md#getquery)
+- [onPostProcess](IQueryable.md#onpostprocess)
+- [onPreQuery](IQueryable.md#onprequery)
+
+## Methods
+
+### execute
+
+▸ **execute**(`connection`): `Promise`<`T`\>
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `connection` | [`IDatabaseConnection`](IDatabaseConnection.md) |
+
+#### Returns
+
+`Promise`<`T`\>
+
+#### Defined in
+
+[src/IQueryable.ts:22](https://github.com/breautek/storm/blob/3748147/src/IQueryable.ts#L22)
+
+___
+
+### getParametersForQuery
+
+▸ **getParametersForQuery**(): `Record`<`string`, `any`\>
+
+#### Returns
+
+`Record`<`string`, `any`\>
+
+#### Defined in
+
+[src/IQueryable.ts:23](https://github.com/breautek/storm/blob/3748147/src/IQueryable.ts#L23)
+
+___
+
+### getQuery
+
+▸ **getQuery**(`connection`): `string`
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `connection` | [`IDatabaseConnection`](IDatabaseConnection.md) |
+
+#### Returns
+
+`string`
+
+#### Defined in
+
+[src/IQueryable.ts:21](https://github.com/breautek/storm/blob/3748147/src/IQueryable.ts#L21)
+
+___
+
+### onPostProcess
+
+▸ **onPostProcess**(`connection`, `results`): `Promise`<`T`\>
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `connection` | [`IDatabaseConnection`](IDatabaseConnection.md) |
+| `results` | `any` |
+
+#### Returns
+
+`Promise`<`T`\>
+
+#### Defined in
+
+[src/IQueryable.ts:24](https://github.com/breautek/storm/blob/3748147/src/IQueryable.ts#L24)
+
+___
+
+### onPreQuery
+
+▸ **onPreQuery**(`connection`): `Promise`<`void`\>
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `connection` | [`IDatabaseConnection`](IDatabaseConnection.md) |
+
+#### Returns
+
+`Promise`<`void`\>
+
+#### Defined in
+
+[src/IQueryable.ts:20](https://github.com/breautek/storm/blob/3748147/src/IQueryable.ts#L20)

package/docs/interfaces/IRequestResponse.md

@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[src/IRequestResponse.ts:21](https://github.com/breautek/storm/blob/4b2254f/src/IRequestResponse.ts#L21)
+[src/IRequestResponse.ts:21](https://github.com/breautek/storm/blob/3748147/src/IRequestResponse.ts#L21)
 
 ___
 
@@ -34,4 +34,4 @@ ___
 
 #### Defined in
 
-[src/IRequestResponse.ts:22](https://github.com/breautek/storm/blob/4b2254f/src/IRequestResponse.ts#L22)
+[src/IRequestResponse.ts:22](https://github.com/breautek/storm/blob/3748147/src/IRequestResponse.ts#L22)

package/docs/interfaces/ISetSessionVariableQueryInput.md

@@ -17,7 +17,7 @@
 
 #### Defined in
 
-[src/SetSessionVariableQuery.ts:7](https://github.com/breautek/storm/blob/4b2254f/src/SetSessionVariableQuery.ts#L7)
+[src/SetSessionVariableQuery.ts:7](https://github.com/breautek/storm/blob/3748147/src/SetSessionVariableQuery.ts#L7)
 
 ___
 
@@ -27,4 +27,4 @@ ___
 
 #### Defined in
 
-[src/SetSessionVariableQuery.ts:8](https://github.com/breautek/storm/blob/4b2254f/src/SetSessionVariableQuery.ts#L8)
+[src/SetSessionVariableQuery.ts:8](https://github.com/breautek/storm/blob/3748147/src/SetSessionVariableQuery.ts#L8)

package/docs/interfaces/ITemporaryTableQueryInput.md

@@ -17,7 +17,7 @@
 
 #### Defined in
 
-[src/TemporaryTableQuery.ts:22](https://github.com/breautek/storm/blob/4b2254f/src/TemporaryTableQuery.ts#L22)
+[src/TemporaryTableQuery.ts:22](https://github.com/breautek/storm/blob/3748147/src/TemporaryTableQuery.ts#L22)
 
 ___
 
@@ -27,4 +27,4 @@ ___
 
 #### Defined in
 
-[src/TemporaryTableQuery.ts:21](https://github.com/breautek/storm/blob/4b2254f/src/TemporaryTableQuery.ts#L21)
+[src/TemporaryTableQuery.ts:21](https://github.com/breautek/storm/blob/3748147/src/TemporaryTableQuery.ts#L21)

package/docs/interfaces/IUpdateQueryResult.md

@@ -17,7 +17,7 @@
 
 #### Defined in
 
-[src/IUpdateQueryResult.ts:18](https://github.com/breautek/storm/blob/4b2254f/src/IUpdateQueryResult.ts#L18)
+[src/IUpdateQueryResult.ts:18](https://github.com/breautek/storm/blob/3748147/src/IUpdateQueryResult.ts#L18)
 
 ___
 
@@ -27,4 +27,4 @@ ___
 
 #### Defined in
 
-[src/IUpdateQueryResult.ts:19](https://github.com/breautek/storm/blob/4b2254f/src/IUpdateQueryResult.ts#L19)
+[src/IUpdateQueryResult.ts:19](https://github.com/breautek/storm/blob/3748147/src/IUpdateQueryResult.ts#L19)

package/docs/interfaces/formidable.Part.md

@@ -107,13 +107,13 @@ Stream.addListener
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:354
+node_modules/@types/node/events.d.ts:354
 
 ___
 
 ### emit
 
-▸ **emit**(`eventName`, ...`args`): `boolean`
+▸ **emit**(`eventName`, `...args`): `boolean`
 
 Synchronously calls each of the listeners registered for the event named`eventName`, in the order they were registered, passing the supplied arguments
 to each.
@@ -174,7 +174,7 @@ Stream.emit
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:610
+node_modules/@types/node/events.d.ts:610
 
 ___
 
@@ -212,7 +212,7 @@ Stream.eventNames
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:669
+node_modules/@types/node/events.d.ts:669
 
 ___
 
@@ -237,7 +237,7 @@ Stream.getMaxListeners
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:526
+node_modules/@types/node/events.d.ts:526
 
 ___
 
@@ -267,7 +267,7 @@ Stream.listenerCount
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:616
+node_modules/@types/node/events.d.ts:616
 
 ___
 
@@ -305,7 +305,7 @@ Stream.listeners
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:539
+node_modules/@types/node/events.d.ts:539
 
 ___
 
@@ -336,7 +336,7 @@ Stream.off
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:499
+node_modules/@types/node/events.d.ts:499
 
 ___
 
@@ -391,7 +391,7 @@ Stream.on
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:385
+node_modules/@types/node/events.d.ts:385
 
 ___
 
@@ -444,7 +444,7 @@ Stream.once
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:414
+node_modules/@types/node/events.d.ts:414
 
 ___
 
@@ -476,7 +476,7 @@ Stream.pipe
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/stream.d.ts:26
+node_modules/@types/node/stream.d.ts:26
 
 ___
 
@@ -518,7 +518,7 @@ Stream.prependListener
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:634
+node_modules/@types/node/events.d.ts:634
 
 ___
 
@@ -558,7 +558,7 @@ Stream.prependOnceListener
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:650
+node_modules/@types/node/events.d.ts:650
 
 ___
 
@@ -613,7 +613,7 @@ Stream.rawListeners
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:569
+node_modules/@types/node/events.d.ts:569
 
 ___
 
@@ -649,7 +649,7 @@ Stream.removeAllListeners
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:510
+node_modules/@types/node/events.d.ts:510
 
 ___
 
@@ -755,7 +755,7 @@ Stream.removeListener
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:494
+node_modules/@types/node/events.d.ts:494
 
 ___
 
@@ -790,4 +790,4 @@ Stream.setMaxListeners
 
 #### Defined in
 
-node_modules/@types/node/ts4.8/events.d.ts:520
+node_modules/@types/node/events.d.ts:520

package/jest.config.js

@@ -13,10 +13,11 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 */
+
 module.exports = {
   preset: 'ts-jest',
   verbose: true,
-  collectCoverage: true,
+  collectCoverage: process.argv.length === 2,
   testMatch: ['**/spec/**/*.spec.ts'],
   coverageThreshold: {
     global: {
@@ -31,9 +32,12 @@ module.exports = {
     '/spec/'
   ],
   testRunner: "jest-jasmine2",
-  globals: {
-    'ts-jest': {
-      tsconfig: 'tsconfig-tests.json'
-    }
+  transform: {
+    '\\.ts$': [
+      'ts-jest',
+      {
+        tsconfig: 'tsconfig-tests.json'
+      }
+    ]
   }
 };

package/lib/DatabaseConnection.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Readable } from 'stream';
 import { IDatabaseConnection } from './IDatabaseConnection';
-import { Query } from './Query';
+import { IQueryable } from './IQueryable';
 import { IsolationLevel } from './IsolationLevel';
 export declare const LINGER_WARNING: number;
 export declare const DEFAULT_QUERY_TIMEOUT: number;
@@ -57,7 +57,7 @@ export declare abstract class DatabaseConnection<TAPI> implements IDatabaseConne
      * @async
      * @returns Promise<TQueryResult>
      */
-    query<TQueryResult = any>(query: Query): Promise<TQueryResult>;
+    query<TQueryResult = any>(query: IQueryable<TQueryResult>): Promise<TQueryResult>;
     /**
      *
      * @param query The database query
@@ -65,7 +65,7 @@ export declare abstract class DatabaseConnection<TAPI> implements IDatabaseConne
      * @param streamOptions Stream options
      * @returns Readable
      */
-    stream(query: Query, streamOptions?: any): Readable;
+    stream(query: IQueryable<any>, streamOptions?: any): Readable;
     /**
      * Closes the connection. May error if connection has an active transaction.
      * if `forceClose` boolean is true, it will force close the connection, regardless

package/lib/DatabaseConnection.js.map

@@ -1 +1 @@
-{"version":3,"file":"DatabaseConnection.js","sourceRoot":"","sources":["../src/DatabaseConnection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DatabaseConnection.js","sourceRoot":"","sources":["../src/DatabaseConnection.ts"],"names":[],"mappings":"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"}

package/lib/Handler.d.ts

@@ -17,7 +17,7 @@ import { ReadStream } from 'fs';
  * - Buffers will be passed through
  * - Any other object will be passed through JSON.stringify
  */
-export declare type IHandlerResponse = ResponseData | ReadableStream | ReadStream | any | void;
+export type IHandlerResponse = ResponseData | ReadableStream | ReadStream | any | void;
 /**
  * Like IHandlerResponse, an IHandlerError can be any arbitrary type of object,
  * however it's recommended that the type be of a StormError.
@@ -25,7 +25,7 @@ export declare type IHandlerResponse = ResponseData | ReadableStream | ReadStrea
  * If the type is not a StormError, the error will be wrapped in an InternalError object.
  * This is to avoid accidental leakage of privilege data (e.g. snippets of database queries with sensitive information)
  */
-export declare type IHandlerError = StormError | Error | any;
+export type IHandlerError = StormError | Error | any;
 export declare class Handler<TApplication extends Application = Application, TGetRequest = any, TGetResponse = IHandlerResponse, TPostRequest = any, TPostResponse = IHandlerResponse, TPutRequest = any, TPutResponse = IHandlerResponse, TDeleteRequest = any, TDeleteResponse = IHandlerResponse> {
     private $app;
     private $middlewares;
@@ -37,7 +37,6 @@ export declare class Handler<TApplication extends Application = Application, TGe
     protected _onMiddlewareReject(request: Request, response: Response, error: StormError): void;
     private $handleResponse;
     private $handleResponseError;
-    attach(app: Application): void;
     get(request: Request<TGetRequest>, response: Response<TGetResponse>): Promise<void>;
     put(request: Request<TPutRequest>, response: Response<TPutResponse>): Promise<void>;
     post(request: Request<TPostRequest>, response: Response<TPostResponse>): Promise<void>;

package/lib/Handler.js

@@ -85,8 +85,6 @@ class Handler {
     $handleResponseError(response, error) {
         response.error(error);
     }
-    attach(app) {
-    }
     async get(request, response) {
         this.getApplication().getLogger().info(TAG, `${request.getForwardedIP()} (${request.getIP()}) - ${request.getMethod()} ${request.getURL()} - UA(${request.getHeader('user-agent')})`);
         try {

package/lib/Handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"Handler.js","sourceRoot":"","sources":["../src/Handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;EAcE;;;AAGF,yCAAuC;AAIvC,6CAAwC;AAExC,mDAAgD;AAKhD,+DAA4D;AAC5D,6CAA0C;AAC1C,mCAAmC;AAEnC,MAAM,GAAG,GAAW,SAAS,CAAC;AAwB9B,MAAa,OAAO;IAehB,YAAY,GAAiB;QACzB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAChD,CAAC;IAEM,cAAc;QACjB,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAES,gBAAgB;QACtB,OAAO,EAAE,CAAC;IACd,CAAC;IAEM,cAAc,CAAC,OAAgB;QAClC,IAAI,MAAM,GAAY,IAAA,sBAAW,GAAE,CAAC,SAAS,EAAE,CAAC;QAChD,IAAI,UAAU,GAAW,MAAM,CAAC,qBAAqB,CAAC;QACtD,OAAO,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACzC,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,OAAgB,EAAE,QAAkB;QAClE,IAAI,MAAM,GAAqB;YAC3B,OAAO;YACP,QAAQ;SACX,CAAC;QAEF,IAAI,MAAM,GAAW,IAAA,sBAAW,GAAE,CAAC,SAAS,EAAE,CAAC;QAE/C,IAAI;YACA,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACvD,IAAI,UAAU,GAAe,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBAClD,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,wBAAwB,CAAC,EAAE,CAAC,CAAC;gBAC9C,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;aACtE;SACJ;QACD,OAAO,EAAE,EAAE;YACP,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACtB,IAAI,KAAK,GAAe,IAAI,CAAC;YAC7B,IAAI,CAAC,CAAC,EAAE,YAAY,uBAAU,CAAC,EAAE;gBAC7B,KAAK,GAAG,IAAI,6BAAa,CAAC,EAAE,CAAC,CAAC;aACjC;iBACI;gBACD,KAAK,GAAG,EAAE,CAAC;aACd;YACD,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;YACnD,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAChC;QAED,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,GAAG;gBACL,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,IAAI;aACjB,CAAC;SACL;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACjB,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;SAC5B;QAED,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YAClB,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC;SAC9B;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAES,mBAAmB,CAAC,OAAgB,EAAE,QAAkB,EAAE,KAAiB,IAAS,CAAC;IAEvF,eAAe,CAAY,QAA6B,EAAE,IAAS;QACvE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAEO,oBAAoB,CAAY,QAA6B,EAAE,KAAU;QAC7E,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IAEM,MAAM,CAAC,GAAgB;IAE9B,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,OAA6B,EAAE,QAAgC;QAC5E,IAAI,CAAC,cAAc,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,KAAK,OAAO,CAAC,KAAK,EAAE,OAAO,OAAO,CAAC,SAAS,EAAE,IAAI,OAAO,CAAC,MAAM,EAAE,SAAS,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAEtL,IAAI;YACA,IAAI,MAAM,GAAgD,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC5G,IAAI,GAAG,GAAQ,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SACvC;QACD,OAAO,EAAE,EAAE;YACP,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC3C;IACL,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,OAA6B,EAAE,QAAgC;QAC5E,IAAI,CAAC,cAAc,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,KAAK,OAAO,CAAC,KAAK,EAAE,OAAO,OAAO,CAAC,SAAS,EAAE,IAAI,OAAO,CAAC,MAAM,EAAE,SAAS,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAEtL,IAAI;YACA,IAAI,MAAM,GAAgD,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC5G,IAAI,GAAG,GAAQ,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SACvC;QACD,OAAO,EAAE,EAAE;YACP,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC3C;IACL,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAA8B,EAAE,QAAiC;QAC/E,IAAI,CAAC,cAAc,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,KAAK,OAAO,CAAC,KAAK,EAAE,OAAO,OAAO,CAAC,SAAS,EAAE,IAAI,OAAO,CAAC,MAAM,EAAE,SAAS,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAEtL,IAAI;YACA,IAAI,MAAM,GAAkD,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC9G,IAAI,GAAG,GAAQ,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAChD,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SACvC;QACD,OAAO,EAAE,EAAE;YACP,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC3C;IACL,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,OAAgC,EAAE,QAAmC;QACrF,IAAI,CAAC,cAAc,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,KAAK,OAAO,CAAC,KAAK,EAAE,OAAO,OAAO,CAAC,SAAS,EAAE,IAAI,OAAO,CAAC,MAAM,EAAE,SAAS,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAEtL,IAAI;YACA,IAAI,MAAM,GAAsD,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAClH,IAAI,GAAG,GAAQ,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAClD,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SACvC;QACD,OAAO,EAAE,EAAE;YACP,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC3C;IACL,CAAC;IAES,KAAK,CAAC,IAAI,CAAC,OAA6B;QAC9C,MAAM,IAAI,yCAAmB,CAAC,uBAAU,CAAC,GAAG,CAAC,CAAC;IAClD,CAAC;IAES,KAAK,CAAC,KAAK,CAAC,OAA8B;QAChD,MAAM,IAAI,yCAAmB,CAAC,uBAAU,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC;IAES,KAAK,CAAC,IAAI,CAAC,OAA6B;QAC9C,MAAM,IAAI,yCAAmB,CAAC,uBAAU,CAAC,GAAG,CAAC,CAAC;IAClD,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,OAAgC;QACpD,MAAM,IAAI,yCAAmB,CAAC,uBAAU,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC;CACJ;AAjKD,0BAiKC"}
+{"version":3,"file":"Handler.js","sourceRoot":"","sources":["../src/Handler.ts"],"names":[],"mappings":"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"}

package/lib/IDatabaseConnection.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Readable } from 'stream';
+import { IQueryable } from './IQueryable';
 import { IsolationLevel } from './IsolationLevel';
-import { Query } from './Query';
 export interface IDatabaseConnection {
     setInstantiationStack(stack: string): void;
     getInstantiationStack(): string;
@@ -9,8 +9,8 @@ export interface IDatabaseConnection {
     isReadOnly(): boolean;
     setTimeout(timeout: number): void;
     getTimeout(): number;
-    query(query: string | Query, params?: any): Promise<any>;
-    stream(query: string | Query, params?: any, streamOptions?: any): Readable;
+    query(query: IQueryable<any>, params?: any): Promise<any>;
+    stream(query: IQueryable<any>, params?: any, streamOptions?: any): Readable;
     close(forceClose?: boolean): Promise<void>;
     isClosed(): boolean;
     startTransaction(level?: IsolationLevel): Promise<void>;

package/lib/IDeleteQueryResult.d.ts

@@ -1,2 +1,2 @@
 import { IUpdateQueryResult } from './IUpdateQueryResult';
-export declare type IDeleteQueryResult = IUpdateQueryResult;
+export type IDeleteQueryResult = IUpdateQueryResult;

package/lib/IQueryable.d.ts

@@ -0,0 +1,8 @@
+import { IDatabaseConnection } from './IDatabaseConnection';
+export interface IQueryable<T> {
+    onPreQuery(connection: IDatabaseConnection): Promise<void>;
+    getQuery(connection: IDatabaseConnection): string;
+    execute(connection: IDatabaseConnection): Promise<T>;
+    getParametersForQuery(): Record<string, any>;
+    onPostProcess(connection: IDatabaseConnection, results: any): Promise<T>;
+}

package/lib/IQueryable.js

@@ -0,0 +1,18 @@
+"use strict";
+/*
+   Copyright 2017-2023 Norman Breau
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=IQueryable.js.map

package/lib/IQueryable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IQueryable.js","sourceRoot":"","sources":["../src/IQueryable.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;EAcE"}

package/lib/MySQLConnection.js

@@ -29,9 +29,17 @@ const SetIsolationLevelQuery_1 = require("./private/SetIsolationLevelQuery");
 const DEFAULT_HIGH_WATERMARK = 512; // in number of result objects
 const TAG = 'MySQLConnection';
 const SQL_FORMATTING_OPTIONS = {
-    language: 'mysql',
-    indent: '    ',
-    uppercase: true
+    tabWidth: 4,
+    keywordCase: 'upper',
+    useTabs: false,
+    indentStyle: 'standard',
+    logicalOperatorNewline: 'after',
+    commaPosition: 'before',
+    linesBetweenQueries: 1,
+    denseOperators: false,
+    newlineBeforeSemicolon: false,
+    tabulateAlias: true,
+    expressionWidth: 4
 };
 let startTransactionQuery = new StartTransactionQuery_1.StartTransactionQuery();
 let commitQuery = new CommitQuery_1.CommitQuery();
@@ -75,7 +83,10 @@ class MySQLConnection extends DatabaseConnection_1.DatabaseConnection {
                             // SQLFormatter doesn't understand all MySQL syntaxes, so this is to prevent
                             // potentially valid queries from becoming errors simply because we couldn't
                             // log them.
-                            sql = SQLFormatter.format(queryObject.sql, SQL_FORMATTING_OPTIONS);
+                            sql = SQLFormatter.formatDialect(queryObject.sql, {
+                                ...SQL_FORMATTING_OPTIONS,
+                                dialect: SQLFormatter.mysql
+                            });
                         }
                         catch (ex) {
                             logger.warn(TAG, 'Unable to format query...');