fix

tidbcloud · Oct 23, 2024 · 2458534 · 2458534
1 parent 6c2bee2
commit 2458534
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/integration-test/basic.test.ts b/integration-test/basic.test.ts
@@ -8,7 +8,9 @@ const table = 'employee'
 
 const EmployeeTable = `CREATE TABLE ${database}.${table} (emp_no INT,first_name VARCHAR(255),last_name VARCHAR(255))`
 
-function assertType<T>(value: T): void {}
+function assertType<T>(value: T): void {
+  console.log(`Value is of type ${typeof value}`)
+}
 
 beforeAll(async () => {
   dotenv.config()
@@ -25,7 +27,7 @@ describe('basic', () => {
     const con = connect({ url: databaseURL, database: database, fetch, debug: true })
     const results = await con.execute(`SHOW TABLES`)
 
-    assertType<Row[]>(results)
+    assertType<Row>(results)
 
     expect(JSON.stringify(results)).toContain(`${table}`)
   })

diff --git a/integration-test/type.test.ts b/integration-test/type.test.ts
@@ -1,4 +1,4 @@
-import { connect, Row, FullResult } from '../dist/index'
+import { connect } from '../dist/index'
 import { fetch } from 'undici'
 import * as dotenv from 'dotenv'
 import { uint8ArrayToHex } from '../src/format'

diff --git a/src/index.ts b/src/index.ts
@@ -35,23 +35,27 @@ interface QueryExecuteResponse {
 
 const defaultExecuteOptions: ExecuteOptions = {}
 
-export class Tx<T extends Config = {}> {
+export class Tx<T extends Config> {
   private conn: Connection<T>
 
   constructor(conn: Connection<T>) {
     this.conn = conn
   }
 
-  async execute<E extends ExecuteOptions = {}>(
+  async execute<E extends ExecuteOptions>(
     query: string,
     args: ExecuteArgs = null,
     options: E = defaultExecuteOptions as E,
     txOptions: TxOptions = {}
   ): Promise<
-  E extends { fullResult: boolean }
-    ? (E['fullResult'] extends true ? FullResult : Row[])
-    : (T['fullResult'] extends true ? FullResult : Row[])
-> {
+    E extends { fullResult: boolean }
+      ? E['fullResult'] extends true
+        ? FullResult
+        : Row[]
+      : T['fullResult'] extends true
+      ? FullResult
+      : Row[]
+  > {
     return this.conn.execute(query, args, options, txOptions)
   }
 
@@ -64,7 +68,7 @@ export class Tx<T extends Config = {}> {
   }
 }
 
-export class Connection<T extends Config = {}> {
+export class Connection<T extends Config> {
   private config: T
   private session: Session
 
@@ -97,22 +101,26 @@ export class Connection<T extends Config = {}> {
     return this.config
   }
 
-  async begin(txOptions: TxOptions = {}) {
+  async begin(txOptions: TxOptions) {
     const conn = new Connection<T>(this.config)
     const tx = new Tx<T>(conn)
     await tx.execute<T>('BEGIN', undefined, undefined, txOptions)
     return tx
   }
 
-  async execute<E extends ExecuteOptions = {}>(
+  async execute<E extends ExecuteOptions>(
     query: string,
     args: ExecuteArgs = null,
     options: E = defaultExecuteOptions as E,
     txOptions: TxOptions = {}
   ): Promise<
-  E extends { fullResult: boolean }
-    ? (E['fullResult'] extends true ? FullResult : Row[])
-    : (T['fullResult'] extends true ? FullResult : Row[])
+    E extends { fullResult: boolean }
+      ? E['fullResult'] extends true
+        ? FullResult
+        : Row[]
+      : T['fullResult'] extends true
+      ? FullResult
+      : Row[]
   > {
     const sql = args ? format(query, args) : query
     const body = JSON.stringify({ query: sql })