Use browser compatible Uint8Array

Author: ayrton

__tests__/index.test.ts

@@ -1,5 +1,5 @@
 import SqlString from 'sqlstring'
-import { cast, connect, format, hex, DatabaseError, type Cast } from '../dist/index'
+import { cast, connect, format, DatabaseError, type Cast } from '../dist/index'
 import { fetch, MockAgent, setGlobalDispatcher } from 'undici'
 import packageJSON from '../package.json'
 
@@ -610,12 +610,6 @@ describe('format', () => {
   })
 })
 
-describe('hex', () => {
-  test('exports hex function', () => {
-    expect(hex('\0')).toEqual('0x00')
-  })
-})
-
 describe('cast', () => {
   test('casts int to number', () => {
     expect(cast({ name: 'test', type: 'INT8' }, '12')).toEqual(12)

__tests__/text.test.ts

@@ -1,4 +1,4 @@
-import { decode, hex } from '../src/text'
+import { decode } from '../src/text'
 
 describe('text', () => {
   describe('decode', () => {
@@ -22,14 +22,4 @@ describe('text', () => {
       expect(decode('\xF0\x9F\xA4\x94')).toEqual('🤔')
     })
   })
-
-  describe('hex', () => {
-    test('encodes binary as hex', () => {
-      expect(hex('\0\0')).toEqual('0x0000')
-    })
-
-    test('encodes ascii as hex', () => {
-      expect(hex('aa')).toEqual('0x6161')
-    })
-  })
 })

src/index.ts

@@ -1,7 +1,6 @@
 import { format } from './sanitization.js'
 export { format } from './sanitization.js'
-export { hex } from './text.js'
-import { decode } from './text.js'
+import { decode, uint8array } from './text.js'
 import { Version } from './version.js'
 
 type Row<T extends ExecuteAs = 'object'> = T extends 'array' ? any[] : T extends 'object' ? Record<string, any> : never
@@ -410,7 +409,7 @@ export function cast(field: Field, value: string | null): any {
       return value
     case 'BLOB':
     case 'VARBINARY':
-      return new Buffer(value, "binary");
+      return uint8array(value)
     case 'JSON':
       return JSON.parse(decode(value))
     default:

src/sanitization.ts

@@ -1,3 +1,5 @@
+import { uint8ArrayToHex } from './text.js'
+
 type Stringable = { toString: () => string }
 type Value = null | undefined | number | boolean | string | Array<Value> | Date | Stringable
 
@@ -47,8 +49,8 @@ function sanitize(value: Value): string {
     return quote(value.toISOString().slice(0, -1))
   }
 
-  if (value instanceof Buffer) {
-    return `0x${value.toString('hex')}`
+  if (value instanceof Uint8Array) {
+    return uint8ArrayToHex(value)
   }
 
   return quote(value.toString())

src/text.ts

@@ -1,11 +1,15 @@
 const decoder = new TextDecoder('utf-8')
 
 export function decode(text: string | null | undefined): string {
-  return text ? decoder.decode(Uint8Array.from(bytes(text))) : ''
+  return text ? decoder.decode(uint8array(text)) : ''
 }
 
-export function hex(text: string): string {
-  const digits = bytes(text).map((b) => b.toString(16).padStart(2, '0'))
+export function uint8array(text: string): Uint8Array {
+  return Uint8Array.from(bytes(text))
+}
+
+export function uint8ArrayToHex(uint8: Uint8Array): string {
+  const digits = Array.from(uint8).map((i) => i.toString(16).padStart(2, '0'))
   return `0x${digits.join('')}`
 }