refactor(db): move setting related code to separate directory (#528)

Author: beeman

packages/background/src/services/db.ts

@@ -5,17 +5,17 @@ import type { Account } from '@workspace/db/account/account'
 import { accountCreate } from '@workspace/db/account/account-create'
 import { accountFindUnique } from '@workspace/db/account/account-find-unique'
 import { db } from '@workspace/db/db'
-import { dbSettingGetValue } from '@workspace/db/db-setting-get-value'
 import { dbWalletCreate } from '@workspace/db/db-wallet-create'
 import type { WalletInputCreate } from '@workspace/db/dto/wallet-input-create'
+import { settingGetValue } from '@workspace/db/setting/setting-get-value'
 import { deriveFromMnemonicAtIndex } from '@workspace/keypair/derive-from-mnemonic-at-index'
 import { ellipsify } from '@workspace/ui/lib/ellipsify'
 
 // TODO: Database abstraction layer to avoid duplicating this code from db and db-react packages
 export const [registerDbService, getDbService] = defineProxyService('DbService', () => ({
   account: {
     active: async (): Promise<Account> => {
-      const accountId = await dbSettingGetValue(db, 'activeAccountId')
+      const accountId = await settingGetValue(db, 'activeAccountId')
       if (!accountId) {
         throw new Error('No active account set')
       }

packages/db-react/src/db-loader.tsx

@@ -1,6 +1,6 @@
 import type { Account } from '@workspace/db/account/account'
-import type { Setting } from '@workspace/db/entity/setting'
 import type { Network } from '@workspace/db/network/network'
+import type { Setting } from '@workspace/db/setting/setting'
 import { dbAccountOptions } from './db-account-options.tsx'
 import { dbGetOrFetchQuery } from './db-get-or-fetch.tsx'
 import { dbNetworkOptions } from './db-network-options.tsx'

packages/db-react/src/db-setting-options.tsx

@@ -1,9 +1,9 @@
 import { type MutateOptions, mutationOptions, queryOptions } from '@tanstack/react-query'
 import { db } from '@workspace/db/db'
-import { dbSettingGetAll } from '@workspace/db/db-setting-get-all'
-import { dbSettingGetValue } from '@workspace/db/db-setting-get-value'
-import { dbSettingSetValue } from '@workspace/db/db-setting-set-value'
-import type { SettingKey } from '@workspace/db/entity/setting-key'
+import { settingGetAll } from '@workspace/db/setting/setting-get-all'
+import { settingGetValue } from '@workspace/db/setting/setting-get-value'
+import type { SettingKey } from '@workspace/db/setting/setting-key'
+import { settingSetValue } from '@workspace/db/setting/setting-set-value'
 import { toastError } from '@workspace/ui/lib/toast-error'
 import { queryClient } from './db-query-client.tsx'
 
@@ -12,17 +12,17 @@ export type DbSettingSetValueMutateOptions = MutateOptions<void, Error, string>
 export const dbSettingOptions = {
   getAll: () =>
     queryOptions({
-      queryFn: () => dbSettingGetAll(db),
-      queryKey: ['dbSettingGetAll'],
+      queryFn: () => settingGetAll(db),
+      queryKey: ['settingGetAll'],
     }),
   getValue: (key: SettingKey) =>
     queryOptions({
-      queryFn: () => dbSettingGetValue(db, key),
-      queryKey: ['dbSettingGetValue', key],
+      queryFn: () => settingGetValue(db, key),
+      queryKey: ['settingGetValue', key],
     }),
   setValue: (key: SettingKey, props: DbSettingSetValueMutateOptions = {}) =>
     mutationOptions({
-      mutationFn: (value: string) => dbSettingSetValue(db, key, value),
+      mutationFn: (value: string) => settingSetValue(db, key, value),
       onError: () => toastError('Error setting value'),
       onSuccess: () => {
         queryClient.invalidateQueries(dbSettingOptions.getValue(key))

packages/db-react/src/use-db-setting-get-value-live.tsx

@@ -1,6 +1,6 @@
 import { db } from '@workspace/db/db'
-import { dbSettingGetValue } from '@workspace/db/db-setting-get-value'
-import type { SettingKey } from '@workspace/db/entity/setting-key'
+import { settingGetValue } from '@workspace/db/setting/setting-get-value'
+import type { SettingKey } from '@workspace/db/setting/setting-key'
 import { useLiveQuery } from 'dexie-react-hooks'
 import { useRootLoaderData } from './use-root-loader-data.tsx'
 
@@ -12,5 +12,5 @@ export function useDbSettingGetValueLive(key: SettingKey) {
 
   const value = data.settings.find((s) => s.key === key)?.value ?? null
 
-  return useLiveQuery<null | string, null | string>(() => dbSettingGetValue(db, key), [key], value)
+  return useLiveQuery<null | string, null | string>(() => settingGetValue(db, key), [key], value)
 }

packages/db-react/src/use-db-setting-get-value.tsx

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query'
-import type { SettingKey } from '@workspace/db/entity/setting-key'
+import type { SettingKey } from '@workspace/db/setting/setting-key'
 
 import { dbSettingOptions } from './db-setting-options.tsx'
 

packages/db-react/src/use-db-setting-set-value.tsx

@@ -1,5 +1,5 @@
 import { useMutation } from '@tanstack/react-query'
-import type { SettingKey } from '@workspace/db/entity/setting-key'
+import type { SettingKey } from '@workspace/db/setting/setting-key'
 import type { DbSettingSetValueMutateOptions } from './db-setting-options.tsx'
 import { dbSettingOptions } from './db-setting-options.tsx'
 

packages/db-react/src/use-db-setting.tsx

@@ -1,4 +1,4 @@
-import type { SettingKey } from '@workspace/db/entity/setting-key'
+import type { SettingKey } from '@workspace/db/setting/setting-key'
 
 import { useDbSettingGetValueLive } from './use-db-setting-get-value-live.tsx'
 import { useDbSettingSetValue } from './use-db-setting-set-value.tsx'

packages/db/src/account/account-create.ts

@@ -1,8 +1,8 @@
 import { tryCatch } from '@workspace/core/try-catch'
 
 import type { Database } from '../database.ts'
-import { dbSettingGetValue } from '../db-setting-get-value.ts'
-import { dbSettingSetValue } from '../db-setting-set-value.ts'
+import { settingGetValue } from '../setting/setting-get-value.ts'
+import { settingSetValue } from '../setting/setting-set-value.ts'
 import { accountCreateDetermineOrder } from './account-create-determine-order.ts'
 import type { AccountCreateInput } from './account-create-input.ts'
 import { accountCreateSchema } from './account-create-schema.ts'
@@ -28,9 +28,9 @@ export async function accountCreate(db: Database, input: AccountCreateInput): Pr
       throw new Error(`Error creating account`)
     }
 
-    const activeAccountId = await dbSettingGetValue(db, 'activeAccountId')
+    const activeAccountId = await settingGetValue(db, 'activeAccountId')
     if (!activeAccountId) {
-      await dbSettingSetValue(db, 'activeAccountId', data)
+      await settingSetValue(db, 'activeAccountId', data)
     }
 
     return data

packages/db/src/account/account-set-active.ts

@@ -1,7 +1,7 @@
 import type { Database } from '../database.ts'
-import { dbSettingFindUniqueByKey } from '../db-setting-find-unique-by-key.ts'
-import { dbSettingSetValue } from '../db-setting-set-value.ts'
-import type { SettingKey } from '../entity/setting-key.ts'
+import { settingFindUniqueByKey } from '../setting/setting-find-unique-by-key.ts'
+import type { SettingKey } from '../setting/setting-key.ts'
+import { settingSetValue } from '../setting/setting-set-value.ts'
 import { accountFindUnique } from './account-find-unique.ts'
 
 export async function accountSetActive(db: Database, id: string) {
@@ -18,13 +18,13 @@ export async function accountSetActive(db: Database, id: string) {
     const keyWallet: SettingKey = 'activeWalletId'
     const keyAccount: SettingKey = 'activeAccountId'
     // get the `activeWalletId` setting
-    const activeWallet = await dbSettingFindUniqueByKey(db, keyWallet)
+    const activeWallet = await settingFindUniqueByKey(db, keyWallet)
 
     // ensure that the request `Account.walletId` is equal to `activeWalletId`
     if (found.walletId !== activeWallet?.value) {
-      await dbSettingSetValue(db, keyWallet, found.walletId)
+      await settingSetValue(db, keyWallet, found.walletId)
     }
 
-    await dbSettingSetValue(db, keyAccount, accountId)
+    await settingSetValue(db, keyAccount, accountId)
   })
 }

packages/db/src/database.ts

@@ -1,9 +1,9 @@
 import { Dexie, type Table } from 'dexie'
 import type { Account } from './account/account.ts'
 import { dbPopulate } from './db-populate.ts'
-import type { Setting } from './entity/setting.ts'
 import type { Wallet } from './entity/wallet.ts'
 import type { Network } from './network/network.ts'
+import type { Setting } from './setting/setting.ts'
 
 export interface DatabaseConfig {
   name: string