merge errors into types to prevent cyclical import. Update error quer…

…y context type
dynajoe · Jun 12, 2023 · e2db031 · e2db031
1 parent 8168593
commit e2db031
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 30 deletions.
diff --git a/src/errors.ts b/src/errors.ts
diff --git a/src/index.ts b/src/index.ts
@@ -4,9 +4,18 @@ import { TinyPg } from './tiny'
 
 export { TinyPg, FormattableDbCall } from './tiny'
 
-export { Result, TinyPgOptions, QueryBeginContext, QueryCompleteContext, SqlParseResult, SqlFile, TinyPgParams, TinyCallContext } from './types'
-
-export { TinyPgError, TinyPgErrorTransformer } from './errors'
+export {
+   Result,
+   TinyPgOptions,
+   QueryBeginContext,
+   QueryCompleteContext,
+   SqlParseResult,
+   SqlFile,
+   TinyPgParams,
+   TinyCallContext,
+   TinyPgError,
+   TinyPgErrorTransformer,
+} from './types'
 
 export { parseFiles } from './parser'
 

diff --git a/src/tiny.ts b/src/tiny.ts
@@ -5,7 +5,6 @@ import * as P from './parser'
 import * as Util from './util'
 import * as Uuid from 'uuid'
 import { EventEmitter } from 'events'
-import * as E from './errors'
 import { parseSql } from 'tinypg-parser'
 import { createHash } from 'crypto'
 import { format } from '@scaleleap/pg-format'
@@ -24,7 +23,7 @@ export class TinyPg {
    public sql_db_calls: { [key: string]: DbCall }
 
    private hooks: T.TinyHooks[]
-   private error_transformer: E.TinyPgErrorTransformer
+   private error_transformer: T.TinyPgErrorTransformer
    private sql_files: T.SqlFile[]
    private options: T.TinyPgOptions
    private transaction_id?: string
@@ -468,13 +467,10 @@ export class TinyPg {
       }
 
       try {
-         const data = await Promise.race([
-            connection_failed_promise.then(() => null),
-            query_promise()
-         ])
+         const data = await Promise.race([connection_failed_promise.then(() => null), query_promise()])
 
          if (_.isNil(data)) {
-            throw new E.TinyPgError("connection aborted")
+            throw new T.TinyPgError('connection aborted')
          }
 
          emitQueryComplete(createCompleteContext(null, data))
@@ -486,7 +482,7 @@ export class TinyPg {
 
          emitQueryComplete(complete_context)
 
-         const tiny_error = new E.TinyPgError(`${e.message}`, tiny_stack, complete_context)
+         const tiny_error = new T.TinyPgError(`${e.message}`, tiny_stack, complete_context)
 
          throw this.error_transformer(tiny_error)
       } finally {

diff --git a/src/types.ts b/src/types.ts
@@ -1,5 +1,4 @@
 import { EventEmitter } from 'events'
-import { TinyPgErrorTransformer } from './errors'
 import { TlsOptions } from 'tls'
 
 export type HookCollection = { [P in keyof Required<TinyHooks>]: TinyHooks[P][] }
@@ -142,3 +141,22 @@ export interface TinyPgEvents extends EventEmitter {
 
    emit(event: 'query' | 'submit' | 'result', ...args: any[]): boolean
 }
+
+export type TinyPgErrorTransformer = (error: TinyPgError) => any
+
+export class TinyPgError extends Error {
+   name: string
+   message: string
+   queryContext: QuerySubmitContext | QueryBeginContext | QueryCompleteContext | undefined
+
+   constructor(message: string, stack?: string, query_context?: QuerySubmitContext | QueryBeginContext | QueryCompleteContext) {
+      super(message)
+
+      Object.setPrototypeOf(this, new.target.prototype)
+
+      this.stack = stack
+      this.name = this.constructor.name
+      this.message = message
+      this.queryContext = query_context
+   }
+}