refactor(db): move wallet related code to separate directory (#529)

Author: beeman

packages/background/src/services/db.ts

@@ -5,9 +5,9 @@ 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 { 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 { walletCreate } from '@workspace/db/wallet/wallet-create'
+import type { WalletCreateInput } from '@workspace/db/wallet/wallet-create-input'
 import { deriveFromMnemonicAtIndex } from '@workspace/keypair/derive-from-mnemonic-at-index'
 import { ellipsify } from '@workspace/ui/lib/ellipsify'
 
@@ -45,11 +45,11 @@ export const [registerDbService, getDbService] = defineProxyService('DbService',
     },
   },
   wallet: {
-    createWithAccount: async (input: WalletInputCreate) => {
+    createWithAccount: async (input: WalletCreateInput) => {
       // First, we see if we can derive the first account from this mnemonic
       const derivedAccount = await deriveFromMnemonicAtIndex({ mnemonic: input.mnemonic })
       // If so, we create the wallet
-      const walletId = await dbWalletCreate(db, input)
+      const walletId = await walletCreate(db, input)
       // After creating the wallet we can create the account
       await accountCreate(db, {
         ...derivedAccount,

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

@@ -1,26 +1,26 @@
 import { type MutateOptions, mutationOptions, queryOptions } from '@tanstack/react-query'
 import { db } from '@workspace/db/db'
-import { dbWalletCreate } from '@workspace/db/db-wallet-create'
-import { dbWalletDelete } from '@workspace/db/db-wallet-delete'
-import { dbWalletFindMany } from '@workspace/db/db-wallet-find-many'
-import { dbWalletFindUnique } from '@workspace/db/db-wallet-find-unique'
-import { dbWalletSetActive } from '@workspace/db/db-wallet-set-active'
-import { dbWalletUpdate } from '@workspace/db/db-wallet-update'
-import type { WalletInputCreate } from '@workspace/db/dto/wallet-input-create'
-import type { WalletInputFindMany } from '@workspace/db/dto/wallet-input-find-many'
-import type { WalletInputUpdate } from '@workspace/db/dto/wallet-input-update'
+import { walletCreate } from '@workspace/db/wallet/wallet-create'
+import type { WalletCreateInput } from '@workspace/db/wallet/wallet-create-input'
+import { walletDelete } from '@workspace/db/wallet/wallet-delete'
+import { walletFindMany } from '@workspace/db/wallet/wallet-find-many'
+import type { WalletFindManyInput } from '@workspace/db/wallet/wallet-find-many-input'
+import { walletFindUnique } from '@workspace/db/wallet/wallet-find-unique'
+import { walletSetActive } from '@workspace/db/wallet/wallet-set-active'
+import { walletUpdate } from '@workspace/db/wallet/wallet-update'
+import type { WalletUpdateInput } from '@workspace/db/wallet/wallet-update-input'
 import { queryClient } from './db-query-client.tsx'
 import { dbSettingOptions } from './db-setting-options.tsx'
 
-export type DbWalletCreateMutateOptions = MutateOptions<string, Error, { input: WalletInputCreate }>
+export type DbWalletCreateMutateOptions = MutateOptions<string, Error, { input: WalletCreateInput }>
 export type DbWalletDeleteMutateOptions = MutateOptions<void, Error, { id: string }>
 export type DbWalletSetActiveMutateOptions = MutateOptions<void, Error, { id: string }>
-export type DbWalletUpdateMutateOptions = MutateOptions<number, Error, { input: WalletInputUpdate }>
+export type DbWalletUpdateMutateOptions = MutateOptions<number, Error, { input: WalletUpdateInput }>
 
 export const dbWalletOptions = {
   create: (props: DbWalletCreateMutateOptions = {}) =>
     mutationOptions({
-      mutationFn: ({ input }: { input: WalletInputCreate }) => dbWalletCreate(db, input),
+      mutationFn: ({ input }: { input: WalletCreateInput }) => walletCreate(db, input),
       onSuccess: () => {
         queryClient.invalidateQueries(dbSettingOptions.getAll())
         queryClient.invalidateQueries(dbSettingOptions.getValue('activeWalletId'))
@@ -29,22 +29,22 @@ export const dbWalletOptions = {
     }),
   delete: (props: DbWalletDeleteMutateOptions = {}) =>
     mutationOptions({
-      mutationFn: ({ id }: { id: string }) => dbWalletDelete(db, id),
+      mutationFn: ({ id }: { id: string }) => walletDelete(db, id),
       ...props,
     }),
-  findMany: (input: WalletInputFindMany) =>
+  findMany: (input: WalletFindManyInput) =>
     queryOptions({
-      queryFn: () => dbWalletFindMany(db, input),
-      queryKey: ['dbWalletFindMany', input],
+      queryFn: () => walletFindMany(db, input),
+      queryKey: ['walletFindMany', input],
     }),
   findUnique: (id: string) =>
     queryOptions({
-      queryFn: () => dbWalletFindUnique(db, id),
-      queryKey: ['dbWalletFindUnique', id],
+      queryFn: () => walletFindUnique(db, id),
+      queryKey: ['walletFindUnique', id],
     }),
   setActive: (props: DbWalletSetActiveMutateOptions = {}) =>
     mutationOptions({
-      mutationFn: ({ id }: { id: string }) => dbWalletSetActive(db, id),
+      mutationFn: ({ id }: { id: string }) => walletSetActive(db, id),
       onSuccess: () => {
         queryClient.invalidateQueries(dbSettingOptions.getAll())
         queryClient.invalidateQueries(dbSettingOptions.getValue('activeWalletId'))
@@ -54,7 +54,7 @@ export const dbWalletOptions = {
     }),
   update: (props: DbWalletUpdateMutateOptions = {}) =>
     mutationOptions({
-      mutationFn: ({ id, input }: { id: string; input: WalletInputUpdate }) => dbWalletUpdate(db, id, input),
+      mutationFn: ({ id, input }: { id: string; input: WalletUpdateInput }) => walletUpdate(db, id, input),
       ...props,
     }),
 }

packages/db-react/src/use-db-wallet-find-many.tsx

@@ -1,8 +1,8 @@
 import { useQuery } from '@tanstack/react-query'
-import type { WalletInputFindMany } from '@workspace/db/dto/wallet-input-find-many'
+import type { WalletFindManyInput } from '@workspace/db/wallet/wallet-find-many-input'
 
 import { dbWalletOptions } from './db-wallet-options.tsx'
 
-export function useDbWalletFindMany({ input }: { input: WalletInputFindMany }) {
+export function useDbWalletFindMany({ input }: { input: WalletFindManyInput }) {
   return useQuery(dbWalletOptions.findMany(input))
 }

packages/db-react/src/use-db-wallet-live.tsx

@@ -1,8 +1,8 @@
 import { db } from '@workspace/db/db'
-import { dbWalletFindMany } from '@workspace/db/db-wallet-find-many'
-import type { Wallet } from '@workspace/db/entity/wallet'
+import type { Wallet } from '@workspace/db/wallet/wallet'
+import { walletFindMany } from '@workspace/db/wallet/wallet-find-many'
 import { useLiveQuery } from 'dexie-react-hooks'
 
 export function useDbWalletLive() {
-  return useLiveQuery<Wallet[], Wallet[]>(() => dbWalletFindMany(db), [], [])
+  return useLiveQuery<Wallet[], Wallet[]>(() => walletFindMany(db), [], [])
 }

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 { Wallet } from './entity/wallet.ts'
 import type { Network } from './network/network.ts'
 import type { Setting } from './setting/setting.ts'
+import type { Wallet } from './wallet/wallet.ts'
 
 export interface DatabaseConfig {
   name: string

packages/db/src/db-wallet-update.ts

@@ -1,8 +1,8 @@
 import { tryCatch } from '@workspace/core/try-catch'
 
-import type { Database } from './database.ts'
+import type { Database } from '../database.ts'
 
-export async function dbWalletCreateDetermineOrder(db: Database): Promise<number> {
+export async function walletCreateDetermineOrder(db: Database): Promise<number> {
   const { data, error } = await tryCatch(db.wallets.orderBy('order').last())
 
   if (error) {