reorg into packages dir

jacobprall · jacobprall · commit f28bab695055 · 2024-12-24T13:53:47.000-08:00
diff --git a/README_Refactor.md b/README_Refactor.md
@@ -1,9 +1,24 @@
-Refactor Summary
+Refactor 12.23.24
 - Added SQLiteCloudClient class and createClient function
 - Extracted PubSub from Database to SQLiteCloudClient
-- Added fetch and fetchWithAuth
-- Added Weblite endpoint methods for upload, download, delete, and listDatabases
+- Added fetch, customFetch support and fetchWithAuth
+- Added Weblite methods for upload, download, delete, and listDatabases
 - Refactored PubSub to be more intuitive and easier to use
 - Added FileClient class and methods for file upload and download
+- Added SQLiteCloudVectorClient class and methods for upsert and query
 
-TODO: Polish code, add error handling, Write tests
+Refactor 12.24.14
+Scope of work:
+- refactor new code to improve code smells and readability
+  - Recap progress.
+  - write tests for each new class
+  - Idenitfy protential issues
+  - Plan refactor with psuedo code
+  - Implement refactor
+  - Test refactor
+
+TODO:
+- add error handling and logging
+- add tests
+- add comments
+- add documentation
diff --git a/demo.ts b/demo.ts
@@ -48,7 +48,7 @@ pubSub.notifyChannel('messages', 'my message')
  * In the refactor, Database still exists and works as before.
  */
 
-import { createClient } from './src/refactor/SQLiteCloudClient'
+import { createClient } from './src/SQLiteCloudClient'
 
 const client = createClient('connection-string/chinook.db')
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sqlitecloud/drivers",
-  "version": "1.0.357",
+  "version": "1.0.358",
   "description": "SQLiteCloud drivers for Typescript/Javascript in edge, web and node clients",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
diff --git a/src/SQLiteCloudClient.ts b/src/SQLiteCloudClient.ts
@@ -1,18 +1,16 @@
-import { Database } from '../drivers/database'
-import { Fetch, fetchWithAuth } from './fetch'
-import { SQLiteCloudPubSubClient } from './SQLiteCloudPubSubClient'
-import { SQLiteCloudWebliteClient } from './SQLiteCloudWebliteClient'
-import { SQLiteCloudFileClient } from './SQLiteCloudFileClient'
-import { SQLiteCloudCommand } from '../drivers/types'
-import { getDefaultDatabase } from './utils'
+import { Database } from './drivers/database'
+import { Fetch, fetchWithAuth } from './packages/utils/fetch'
+import { SQLiteCloudPubSubClient } from './packages/pubsub/SQLiteCloudPubSubClient'
+import { SQLiteCloudWebliteClient } from './packages/weblite/SQLiteCloudWebliteClient'
+import { SQLiteCloudFileClient } from './packages/storage/SQLiteCloudFileClient'
+import { SQLiteCloudCommand } from './drivers/types'
+import { getDefaultDatabase } from './packages/utils'
 
 interface SQLiteCloudClientConfig {
   connectionString: string
   fetch?: Fetch
 }
 
-
-
 export class SQLiteCloudClient {
   private connectionString: string
   private fetch: Fetch
diff --git a/src/packages/pubsub/SQLiteCloudPubSubClient.ts b/src/packages/pubsub/SQLiteCloudPubSubClient.ts
@@ -1,8 +1,7 @@
-import { SQLiteCloudConnection } from '../drivers/connection'
-import SQLiteCloudTlsConnection from '../drivers/connection-tls'
-import { Database } from '../drivers/database'
-import { SQLiteCloudConfig } from '../drivers/types'
-import { formatCommand, getDbFromConfig } from './utils'
+import { SQLiteCloudConnection } from '../../drivers/connection'
+import SQLiteCloudTlsConnection from '../../drivers/connection-tls'
+import { Database } from '../../drivers/database'
+import { getDbFromConfig } from '../utils'
 
 export type PubSubCallback<T = any> = (error: Error | null, results?: T) => void
 
diff --git a/src/packages/storage/SQLiteCloudFileClient.ts b/src/packages/storage/SQLiteCloudFileClient.ts
@@ -1,6 +1,6 @@
-import { SQLiteCloudError } from "../drivers/types"
-import { getAPIUrl } from "./utils"
-import { Fetch, fetchWithAuth } from "./fetch"
+import { SQLiteCloudError } from "../../drivers/types"
+import { getAPIUrl } from "../utils"
+import { Fetch, fetchWithAuth } from "../utils/fetch"
 
 interface SQLiteCloudFile {
   createBucket(bucket: string, path: string): Promise<Response>
diff --git a/src/packages/test/SQLiteCloudClient.test.ts b/src/packages/test/SQLiteCloudClient.test.ts
diff --git a/src/packages/utils/fetch.ts b/src/packages/utils/fetch.ts
diff --git a/src/packages/utils/index.ts b/src/packages/utils/index.ts
diff --git a/src/packages/vector/SQLiteCloudVectorClient.ts b/src/packages/vector/SQLiteCloudVectorClient.ts
@@ -1,4 +1,4 @@
-import { Database } from "../drivers/database";
+import { Database } from "../../drivers/database";
 
 interface Column {
   name: string;
diff --git a/src/packages/weblite/SQLiteCloudWebliteClient.ts b/src/packages/weblite/SQLiteCloudWebliteClient.ts
@@ -1,6 +1,7 @@
-import { SQLiteCloudError, UploadOptions } from '../drivers/types'
-import { Fetch, fetchWithAuth } from './fetch'
-import { DEFAULT_HEADERS } from '../drivers/constants'
+import { SQLiteCloudError, UploadOptions } from '../../drivers/types'
+import { Fetch, fetchWithAuth } from '../utils/fetch'
+import { DEFAULT_HEADERS } from '../../drivers/constants'
+import { getAPIUrl } from '../utils'
 
 interface SQLiteCloudWeblite {
   upload(databaseName: string, file: File | Buffer | Blob | string, opts: UploadOptions): Promise<Response>
@@ -85,7 +86,4 @@ export class SQLiteCloudWebliteClient implements SQLiteCloudWeblite {
     return response
   }
 }
-function getAPIUrl(connectionString: string, arg1: string): string {
-  throw new Error('Function not implemented.')
-}
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sqlitecloud/drivers",`
`3`		`- "version": "1.0.357",`
	`3`	`+ "version": "1.0.358",`
`4`	`4`	`"description": "SQLiteCloud drivers for Typescript/Javascript in edge, web and node clients",`
`5`	`5`	`"main": "./lib/index.js",`
`6`	`6`	`"types": "./lib/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Database } from "../drivers/database";`
	`1`	`+import { Database } from "../../drivers/database";`
`2`	`2`
`3`	`3`	`interface Column {`
`4`	`4`	`name: string;`