Move QueryType to query-params

jest.config.js

@@ -4,10 +4,6 @@ const { pathsToModuleNameMapper } = require('ts-jest')
 const { compilerOptions } = require('./tsconfig')
 
 pathsToModuleNameMapper(compilerOptions.paths, { prefix: '<rootDir>' })
-const moduleNameMapper = pathsToModuleNameMapper(compilerOptions.paths, {
-    prefix: '<rootDir>/',
-})
-console.log(moduleNameMapper)
 
 module.exports = {
     preset: 'ts-jest',

src/client.ts

@@ -1,6 +1,6 @@
-import { Connection, QueryType } from './connections'
+import { Connection } from './connections'
 import { Query, constructRawQuery } from './query'
-import { QueryParams } from './query-params'
+import { QueryParams, QueryType } from './query-params'
 
 interface QueryBuilder {
     action: 'select' | 'insert' | 'update' | 'delete'

src/connections/cloudflare.ts

@@ -1,5 +1,6 @@
+import { QueryType } from 'src/query-params'
 import { Query, constructRawQuery } from '../query'
-import { Connection, QueryType } from './index'
+import { Connection } from './index'
 
 export class CloudflareD1Connection implements Connection {
     // The Cloudflare API key with D1 access

src/connections/index.ts

@@ -1,19 +1,8 @@
+import { QueryType } from 'src/query-params'
 import { Query } from '../query'
 
-/**
- * Database queries are constructed either by named or positional parameters.
- * Named parameters are used to identify the parameter by name in the query
- * and are replaced by the value of the parameter. Positional parameters are
- * used to identify the parameter by position in the query and are replaced
- * by the value of the parameter.
- */
-export enum QueryType {
-    named = 'named',
-    positional = 'positional',
-}
-
 export interface Connection {
-    queryType?: QueryType
+    queryType: QueryType
 
     connect: (details: Record<string, any>) => Promise<any>
     disconnect: () => Promise<any>

src/connections/outerbase.ts

@@ -1,12 +1,13 @@
+import { QueryType } from 'src/query-params'
 import { Query, constructRawQuery } from '../query'
-import { QueryParamsNamed } from '../query-params'
-import { Connection, QueryType } from './index'
+import { Connection } from './index'
 export const API_URL = 'https://app.outerbase.com'
 
 export class OuterbaseConnection implements Connection {
     // The API key used for Outerbase authentication
     api_key: string | undefined
 
+    // Default query type to named for Outerbase
     queryType = QueryType.named
 
     /**

src/query-params.ts

@@ -1,3 +1,15 @@
+/**
+ * Database queries are constructed either by named or positional parameters.
+ * Named parameters are used to identify the parameter by name in the query
+ * and are replaced by the value of the parameter. Positional parameters are
+ * used to identify the parameter by position in the query and are replaced
+ * by the value of the parameter.
+ */
+export enum QueryType {
+    named = 'named',
+    positional = 'positional',
+}
+
 export type QueryParamsNamed = Record<string, any>
 export type QueryParamsPositional = any[]
 export type QueryParams = QueryParamsNamed | QueryParamsPositional

tests/connections/cloudflare.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from '@jest/globals'
 
 import { CloudflareD1Connection } from 'src/connections/cloudflare'
-import { QueryType } from 'src/index'
+import { QueryType } from 'src/query-params'
 
 describe('CloudflareD1Connection', () => {
     describe('Query Type', () => {

tests/connections/outerbase.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from '@jest/globals'
 
 import { OuterbaseConnection } from 'src/connections/outerbase'
-import { QueryType } from 'src/index'
+import { QueryType } from 'src/query-params'
 
 describe('OuterbaseConnection', () => {
     describe('Query Type', () => {