add weblite tests

Author: jacobprall

src/packages/test/client.test.ts

@@ -19,7 +19,7 @@ describe('SQLiteCloudClient test suite', () => {
 
   it('should be able to query the database', async () => {
     const { data, error } = await client.sql`SELECT * FROM ${DEFAULT_TABLE_NAME}`;
-
+    console.log(data, error)
     expect(data).toBeDefined()
     expect(error).toBeNull()
   })

src/packages/test/weblite.test.ts

@@ -0,0 +1,45 @@
+import { CHINOOK_DATABASE_URL } from "../../../test/shared";
+import { WebliteClient } from "../weblite/WebliteClient";
+
+const client = new WebliteClient(CHINOOK_DATABASE_URL)
+
+describe('WebliteClient test suite', () => {
+  const DATABASE_NAME = `${Date.now()}.sqlite`
+  
+  it('should be able to create a client', () => {
+    expect(client).toBeDefined()
+    expect(client).toBeInstanceOf(WebliteClient)
+  })
+
+  it('should be able to create a database', async () => {
+    const { data, error } = await client.createDatabase(DATABASE_NAME)
+    expect(data).toBeDefined()
+    expect(error).toBeNull()
+  })
+
+  it('should be able to list databases', async () => {
+    const { data, error } = await client.listDatabases()
+    expect(data).toBeDefined()
+    expect(data.length).toBeGreaterThan(0)
+    expect(error).toBeNull()
+  })
+
+  it('should be able to download and upload a database', async () => {
+    const { data, error } = await client.downloadDatabase(DATABASE_NAME)
+    expect(data).toBeDefined()
+    expect(error).toBeNull()
+    expect(data).toBeInstanceOf(ArrayBuffer)
+    const response = await client.uploadDatabase(DATABASE_NAME + '_upload', Buffer.from(data as ArrayBuffer))
+    expect(response.data).toBeTruthy()
+    expect(response.error).toBeNull()
+  })
+
+  it('should be able to delete a database', async () => {
+    const deleteResponse = await client.deleteDatabase(DATABASE_NAME)
+    const deleteCopyResponse = await client.deleteDatabase(DATABASE_NAME + '_upload')
+    expect(deleteResponse.data).toBeDefined()
+    expect(deleteResponse.error).toBeNull()
+    expect(deleteCopyResponse.data).toBeDefined()
+    expect(deleteCopyResponse.error).toBeNull()
+  })
+})

src/packages/weblite/WebliteClient.ts

@@ -31,6 +31,7 @@ export class WebliteClient {
     try {
       let _sql = ''
       if (Array.isArray(sql) && 'raw' in sql) { // check raw property?
+        _sql = this._defaultDatabase ? `USE DATABASE ${this._defaultDatabase}; ` : '';
         sql.forEach((string, i) => {
           // TemplateStringsArray splits the string before each variable
           // used in the template. Add the question mark
@@ -52,7 +53,7 @@ export class WebliteClient {
       if (!response.ok) {
         throw new SQLiteCloudError(`Failed to execute sql: ${response.statusText}`)
       }
-      return await response.json()
+      return { error: null, ...(await response.json()) }
     } catch (error) {
       return { data: null, error }
     }
@@ -61,12 +62,17 @@ export class WebliteClient {
   get defaultDatabase() {
     return this._defaultDatabase
   }
-
+  // Set default database for .sql() calls
   useDatabase(name: string) {
     this._defaultDatabase = name
     return this
   }
 
+
+  async createDatabase(filename: string) {
+    return await this.sql`CREATE DATABASE ${filename}`;
+  }
+
   async uploadDatabase(
     filename: string, 
     database: File | Buffer | Blob | string, 
@@ -88,6 +94,7 @@ export class WebliteClient {
       }
 
       const headers = {
+        'Content-Type': 'application/octet-stream',
         ...(opts.headers ?? {}),
         ...this.headers,
         ...DEFAULT_HEADERS,
@@ -100,7 +107,8 @@ export class WebliteClient {
         if (!response.ok) {
           throw new SQLiteCloudError(`Failed to upload database: ${response.statusText}`)
         }
-        return await response.json()
+
+        return { error: null, ...(await response.json()) }
       } catch (error) {
         return { data: null, error }
     }
@@ -116,8 +124,10 @@ export class WebliteClient {
       if (!response.ok) {
         throw new SQLiteCloudError(`Failed to download database: ${response.statusText}`)
       }
+
       const isNode = typeof window === 'undefined'
-      return isNode ? await response.arrayBuffer() : await response.blob()
+      const data = isNode ? await response.arrayBuffer() : await response.blob()
+      return { error: null, data }
     } catch (error) {
       return { data: null, error }
     }
@@ -137,7 +147,7 @@ export class WebliteClient {
       if (!response.ok) {
         throw new SQLiteCloudError(`Failed to delete database: ${response.statusText}`)
       }
-      return await response.json()
+      return { error: null, ...(await response.json()) }
     } catch (error) {
       return { data: null, error }
     }
@@ -150,19 +160,7 @@ export class WebliteClient {
       if (!response.ok) {
         throw new SQLiteCloudError(`Failed to list databases: ${response.statusText}`)
       }
-      return await response.json()
-    } catch (error) {
-      return { data: null, error }
-    }
-  }
-
-  async createDatabase(filename: string) {
-    try {
-      const response = await this.sql`CREATE DATABASE ${filename}`
-      if (!response.ok) {
-        throw new SQLiteCloudError(`Failed to create database: ${response.statusText}`)
-      }
-      return await response.json()
+      return { error: null, ...(await response.json()) }
     } catch (error) {
       return { data: null, error }
     }