package.json

@@ -8,8 +8,6 @@
     "@types/pg": "^8.10.1",
     "concat-stream": "^2.0.0",
     "es6-error": "^4.1.1",
-    "get-stack-trace": "^2.1.1",
-    "is-plain-object": "^5.0.0",
     "iso8601-duration": "^1.3.0",
     "p-defer": "^3.0.0",
     "pg": "^8.11.0",

src/binders/bindPool.ts

@@ -1,5 +1,5 @@
-import { transaction } from '../connectionMethods';
-import { createConnection } from '../factories';
+import { transaction } from '../connectionMethods/transaction';
+import { createConnection } from '../factories/createConnection';
 import { getPoolState } from '../state';
 import {
   type ClientConfiguration,

src/binders/bindPoolConnection.ts

@@ -1,18 +1,16 @@
-import {
-  any,
-  anyFirst,
-  copyFromBinary,
-  exists,
-  many,
-  manyFirst,
-  maybeOne,
-  maybeOneFirst,
-  one,
-  oneFirst,
-  query as queryMethod,
-  stream,
-  transaction,
-} from '../connectionMethods';
+import { any } from '../connectionMethods/any';
+import { anyFirst } from '../connectionMethods/anyFirst';
+import { copyFromBinary } from '../connectionMethods/copyFromBinary';
+import { exists } from '../connectionMethods/exists';
+import { many } from '../connectionMethods/many';
+import { manyFirst } from '../connectionMethods/manyFirst';
+import { maybeOne } from '../connectionMethods/maybeOne';
+import { maybeOneFirst } from '../connectionMethods/maybeOneFirst';
+import { one } from '../connectionMethods/one';
+import { oneFirst } from '../connectionMethods/oneFirst';
+import { query as queryMethod } from '../connectionMethods/query';
+import { stream } from '../connectionMethods/stream';
+import { transaction } from '../connectionMethods/transaction';
 import {
   type ClientConfiguration,
   type DatabasePoolConnection,

src/binders/bindTransactionConnection.ts

@@ -1,17 +1,15 @@
-import {
-  any,
-  anyFirst,
-  exists,
-  many,
-  manyFirst,
-  maybeOne,
-  maybeOneFirst,
-  nestedTransaction,
-  one,
-  oneFirst,
-  query as queryMethod,
-  stream,
-} from '../connectionMethods';
+import { any } from '../connectionMethods/any';
+import { anyFirst } from '../connectionMethods/anyFirst';
+import { exists } from '../connectionMethods/exists';
+import { many } from '../connectionMethods/many';
+import { manyFirst } from '../connectionMethods/manyFirst';
+import { maybeOne } from '../connectionMethods/maybeOne';
+import { maybeOneFirst } from '../connectionMethods/maybeOneFirst';
+import { nestedTransaction } from '../connectionMethods/nestedTransaction';
+import { one } from '../connectionMethods/one';
+import { oneFirst } from '../connectionMethods/oneFirst';
+import { query as queryMethod } from '../connectionMethods/query';
+import { stream } from '../connectionMethods/stream';
 import { getPoolClientState } from '../state';
 import {
   type ClientConfiguration,

src/connectionMethods/any.ts

@@ -1,5 +1,5 @@
 import { type InternalQueryMethod } from '../types';
-import { createQueryId } from '../utilities';
+import { createQueryId } from '../utilities/createQueryId';
 import { query } from './query';
 
 /**

src/connectionMethods/anyFirst.ts

@@ -1,6 +1,6 @@
 import { DataIntegrityError } from '../errors';
 import { type InternalQueryMethod } from '../types';
-import { createQueryId } from '../utilities';
+import { createQueryId } from '../utilities/createQueryId';
 import { any } from './any';
 
 export const anyFirst: InternalQueryMethod = async (

src/connectionMethods/copyFromBinary.ts

@@ -1,6 +1,6 @@
-import { executeQuery } from '../routines';
+import { executeQuery } from '../routines/executeQuery';
 import { type InternalCopyFromBinaryFunction } from '../types';
-import { encodeTupleList } from '../utilities';
+import { encodeTupleList } from '../utilities/encodeTupleList';
 import { Duplex } from 'node:stream';
 import { from } from 'pg-copy-streams';
 

src/connectionMethods/exists.ts

@@ -1,6 +1,6 @@
 import { DataIntegrityError } from '../errors';
 import { type InternalQueryMethod, type QuerySqlToken } from '../types';
-import { createQueryId } from '../utilities';
+import { createQueryId } from '../utilities/createQueryId';
 import { query } from './query';
 
 export const exists: InternalQueryMethod<Promise<boolean>> = async (

src/connectionMethods/many.ts

@@ -1,6 +1,6 @@
 import { NotFoundError } from '../errors';
 import { type InternalQueryMethod } from '../types';
-import { createQueryId } from '../utilities';
+import { createQueryId } from '../utilities/createQueryId';
 import { query } from './query';
 
 /**

src/connectionMethods/manyFirst.ts

@@ -1,6 +1,6 @@
 import { DataIntegrityError } from '../errors';
 import { type InternalQueryMethod } from '../types';
-import { createQueryId } from '../utilities';
+import { createQueryId } from '../utilities/createQueryId';
 import { many } from './many';
 
 export const manyFirst: InternalQueryMethod = async (

src/connectionMethods/maybeOne.ts

@@ -1,6 +1,6 @@
 import { DataIntegrityError } from '../errors';
 import { type InternalQueryMethod } from '../types';
-import { createQueryId } from '../utilities';
+import { createQueryId } from '../utilities/createQueryId';
 import { query } from './query';
 
 /**

src/connectionMethods/maybeOneFirst.ts

@@ -1,6 +1,6 @@
 import { DataIntegrityError } from '../errors';
 import { type InternalQueryMethod } from '../types';
-import { createQueryId } from '../utilities';
+import { createQueryId } from '../utilities/createQueryId';
 import { maybeOne } from './maybeOne';
 
 /**

src/connectionMethods/nestedTransaction.ts

@@ -1,8 +1,8 @@
-import { bindTransactionConnection } from '../binders';
+import { bindTransactionConnection } from '../binders/bindTransactionConnection';
 import { TRANSACTION_ROLLBACK_ERROR_PREFIX } from '../constants';
 import { getPoolClientState } from '../state';
 import { type InternalNestedTransactionFunction } from '../types';
-import { createUid } from '../utilities';
+import { createUid } from '../utilities/createUid';
 import { serializeError } from 'serialize-error';
 
 const execNestedTransaction: InternalNestedTransactionFunction = async (

src/connectionMethods/one.ts

@@ -1,6 +1,6 @@
 import { DataIntegrityError, NotFoundError } from '../errors';
 import { type InternalQueryMethod } from '../types';
-import { createQueryId } from '../utilities';
+import { createQueryId } from '../utilities/createQueryId';
 import { query } from './query';
 
 /**

src/connectionMethods/oneFirst.ts

@@ -1,6 +1,6 @@
 import { UnexpectedStateError } from '../errors';
 import { type InternalQueryMethod } from '../types';
-import { createQueryId } from '../utilities';
+import { createQueryId } from '../utilities/createQueryId';
 import { one } from './one';
 
 /**

src/connectionMethods/query.ts

@@ -1,4 +1,4 @@
-import { executeQuery } from '../routines';
+import { executeQuery } from '../routines/executeQuery';
 import {
   type Field,
   type InternalQueryMethod,

src/connectionMethods/stream.ts

@@ -1,5 +1,5 @@
 import { QueryStream } from '../QueryStream';
-import { executeQuery } from '../routines';
+import { executeQuery } from '../routines/executeQuery';
 import { type Interceptor, type InternalStreamFunction } from '../types';
 import { type Readable } from 'node:stream';
 import * as through from 'through2';