refactor(db-react): remove db prefix from hooks and helpers (#538)

Author: beeman

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

@@ -1,6 +1,6 @@
 import type { DataTag, DefaultError, QueryClient, QueryKey, UndefinedInitialDataOptions } from '@tanstack/react-query'
 
-export async function dbGetOrFetchQuery<
+export async function getOrFetchQuery<
   TQueryFnData = unknown,
   TError = DefaultError,
   TData = TQueryFnData,

packages/db-react/src/db-get-or-fetch.tsx renamed to packages/db-react/src/get-or-fetch.tsx

@@ -10,25 +10,25 @@ import { accountSetActive } from '@workspace/db/account/account-set-active'
 import { accountUpdate } from '@workspace/db/account/account-update'
 import type { AccountUpdateInput } from '@workspace/db/account/account-update-input'
 import { db } from '@workspace/db/db'
-import { queryClient } from './db-query-client.tsx'
-import { dbSettingOptions } from './db-setting-options.tsx'
+import { optionsSetting } from './options-setting.tsx'
+import { queryClient } from './query-client.tsx'
 
-export type DbAccountCreateMutateOptions = MutateOptions<string, Error, { input: AccountCreateInput }>
-export type DbAccountDeleteMutateOptions = MutateOptions<void, Error, { id: string }>
-export type DbAccountSetActiveMutateOptions = MutateOptions<void, Error, { id: string }>
-export type DbAccountUpdateMutateOptions = MutateOptions<number, Error, { input: AccountUpdateInput }>
+export type AccountCreateMutateOptions = MutateOptions<string, Error, { input: AccountCreateInput }>
+export type AccountDeleteMutateOptions = MutateOptions<void, Error, { id: string }>
+export type AccountSetActiveMutateOptions = MutateOptions<void, Error, { id: string }>
+export type AccountUpdateMutateOptions = MutateOptions<number, Error, { input: AccountUpdateInput }>
 
-export const dbAccountOptions = {
-  create: (props: DbAccountCreateMutateOptions = {}) =>
+export const optionsAccount = {
+  create: (props: AccountCreateMutateOptions = {}) =>
     mutationOptions({
       mutationFn: ({ input }: { input: AccountCreateInput }) => accountCreate(db, input),
       onSuccess: () => {
-        queryClient.invalidateQueries(dbSettingOptions.getAll())
-        queryClient.invalidateQueries(dbSettingOptions.getValue('activeAccountId'))
+        queryClient.invalidateQueries(optionsSetting.getAll())
+        queryClient.invalidateQueries(optionsSetting.getValue('activeAccountId'))
       },
       ...props,
     }),
-  delete: (props: DbAccountDeleteMutateOptions = {}) =>
+  delete: (props: AccountDeleteMutateOptions = {}) =>
     mutationOptions({
       mutationFn: ({ id }: { id: string }) => accountDelete(db, id),
       ...props,
@@ -48,17 +48,17 @@ export const dbAccountOptions = {
       queryFn: () => accountFindUnique(db, id),
       queryKey: ['accountFindUnique', id],
     }),
-  setActive: (props: DbAccountSetActiveMutateOptions = {}) =>
+  setActive: (props: AccountSetActiveMutateOptions = {}) =>
     mutationOptions({
       mutationFn: ({ id }: { id: string }) => accountSetActive(db, id),
       onSuccess: () => {
-        queryClient.invalidateQueries(dbSettingOptions.getAll())
-        queryClient.invalidateQueries(dbSettingOptions.getValue('activeWalletId'))
-        queryClient.invalidateQueries(dbSettingOptions.getValue('activeAccountId'))
+        queryClient.invalidateQueries(optionsSetting.getAll())
+        queryClient.invalidateQueries(optionsSetting.getValue('activeWalletId'))
+        queryClient.invalidateQueries(optionsSetting.getValue('activeAccountId'))
       },
       ...props,
     }),
-  update: (props: DbAccountUpdateMutateOptions = {}) =>
+  update: (props: AccountUpdateMutateOptions = {}) =>
     mutationOptions({
       mutationFn: ({ id, input }: { id: string; input: AccountUpdateInput }) => accountUpdate(db, id, input),
       ...props,

packages/db-react/src/db-account-options.tsx renamed to packages/db-react/src/options-account.tsx

@@ -11,19 +11,19 @@ import type { NetworkUpdateInput } from '@workspace/db/network/network-update-in
 import { toastError } from '@workspace/ui/lib/toast-error'
 import { toastSuccess } from '@workspace/ui/lib/toast-success'
 
-export type DbNetworkCreateMutateOptions = MutateOptions<string, Error, { input: NetworkCreateInput }>
-export type DbNetworkDeleteMutateOptions = MutateOptions<void, Error, { id: string }>
-export type DbNetworkUpdateMutateOptions = MutateOptions<number, Error, { input: NetworkUpdateInput }>
+export type NetworkCreateMutateOptions = MutateOptions<string, Error, { input: NetworkCreateInput }>
+export type NetworkDeleteMutateOptions = MutateOptions<void, Error, { id: string }>
+export type NetworkUpdateMutateOptions = MutateOptions<number, Error, { input: NetworkUpdateInput }>
 
-export const dbNetworkOptions = {
-  create: (props: DbNetworkCreateMutateOptions = {}) =>
+export const optionsNetwork = {
+  create: (props: NetworkCreateMutateOptions = {}) =>
     mutationOptions({
       mutationFn: ({ input }: { input: NetworkCreateInput }) => networkCreate(db, input),
       onError: () => toastError('Error creating network'),
       onSuccess: () => toastSuccess('Network created'),
       ...props,
     }),
-  delete: (props: DbNetworkDeleteMutateOptions = {}) =>
+  delete: (props: NetworkDeleteMutateOptions = {}) =>
     mutationOptions({
       mutationFn: ({ id }: { id: string }) => networkDelete(db, id),
       onError: () => toastError('Error deleting network'),
@@ -40,7 +40,7 @@ export const dbNetworkOptions = {
       queryFn: () => networkFindUnique(db, id),
       queryKey: ['networkFindUnique', id],
     }),
-  update: (props: DbNetworkUpdateMutateOptions) =>
+  update: (props: NetworkUpdateMutateOptions) =>
     mutationOptions({
       mutationFn: ({ id, input }: { id: string; input: NetworkUpdateInput }) => networkUpdate(db, id, input),
       onError: () => toastError('Error updating network'),

packages/db-react/src/db-network-options.tsx renamed to packages/db-react/src/options-network.tsx

@@ -5,11 +5,11 @@ 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'
+import { queryClient } from './query-client.tsx'
 
-export type DbSettingSetValueMutateOptions = MutateOptions<void, Error, string>
+export type SettingSetValueMutateOptions = MutateOptions<void, Error, string>
 
-export const dbSettingOptions = {
+export const optionsSetting = {
   getAll: () =>
     queryOptions({
       queryFn: () => settingGetAll(db),
@@ -20,13 +20,13 @@ export const dbSettingOptions = {
       queryFn: () => settingGetValue(db, key),
       queryKey: ['settingGetValue', key],
     }),
-  setValue: (key: SettingKey, props: DbSettingSetValueMutateOptions = {}) =>
+  setValue: (key: SettingKey, props: SettingSetValueMutateOptions = {}) =>
     mutationOptions({
       mutationFn: (value: string) => settingSetValue(db, key, value),
       onError: () => toastError('Error setting value'),
       onSuccess: () => {
-        queryClient.invalidateQueries(dbSettingOptions.getValue(key))
-        queryClient.invalidateQueries(dbSettingOptions.getAll())
+        queryClient.invalidateQueries(optionsSetting.getValue(key))
+        queryClient.invalidateQueries(optionsSetting.getAll())
       },
       ...props,
     }),

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

@@ -9,25 +9,25 @@ 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'
+import { optionsSetting } from './options-setting.tsx'
+import { queryClient } from './query-client.tsx'
 
-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: WalletUpdateInput }>
+export type WalletCreateMutateOptions = MutateOptions<string, Error, { input: WalletCreateInput }>
+export type WalletDeleteMutateOptions = MutateOptions<void, Error, { id: string }>
+export type WalletSetActiveMutateOptions = MutateOptions<void, Error, { id: string }>
+export type WalletUpdateMutateOptions = MutateOptions<number, Error, { input: WalletUpdateInput }>
 
-export const dbWalletOptions = {
-  create: (props: DbWalletCreateMutateOptions = {}) =>
+export const optionsWallet = {
+  create: (props: WalletCreateMutateOptions = {}) =>
     mutationOptions({
       mutationFn: ({ input }: { input: WalletCreateInput }) => walletCreate(db, input),
       onSuccess: () => {
-        queryClient.invalidateQueries(dbSettingOptions.getAll())
-        queryClient.invalidateQueries(dbSettingOptions.getValue('activeWalletId'))
+        queryClient.invalidateQueries(optionsSetting.getAll())
+        queryClient.invalidateQueries(optionsSetting.getValue('activeWalletId'))
       },
       ...props,
     }),
-  delete: (props: DbWalletDeleteMutateOptions = {}) =>
+  delete: (props: WalletDeleteMutateOptions = {}) =>
     mutationOptions({
       mutationFn: ({ id }: { id: string }) => walletDelete(db, id),
       ...props,
@@ -42,17 +42,17 @@ export const dbWalletOptions = {
       queryFn: () => walletFindUnique(db, id),
       queryKey: ['walletFindUnique', id],
     }),
-  setActive: (props: DbWalletSetActiveMutateOptions = {}) =>
+  setActive: (props: WalletSetActiveMutateOptions = {}) =>
     mutationOptions({
       mutationFn: ({ id }: { id: string }) => walletSetActive(db, id),
       onSuccess: () => {
-        queryClient.invalidateQueries(dbSettingOptions.getAll())
-        queryClient.invalidateQueries(dbSettingOptions.getValue('activeWalletId'))
-        queryClient.invalidateQueries(dbSettingOptions.getValue('activeAccountId'))
+        queryClient.invalidateQueries(optionsSetting.getAll())
+        queryClient.invalidateQueries(optionsSetting.getValue('activeWalletId'))
+        queryClient.invalidateQueries(optionsSetting.getValue('activeAccountId'))
       },
       ...props,
     }),
-  update: (props: DbWalletUpdateMutateOptions = {}) =>
+  update: (props: WalletUpdateMutateOptions = {}) =>
     mutationOptions({
       mutationFn: ({ id, input }: { id: string; input: WalletUpdateInput }) => walletUpdate(db, id, input),
       ...props,

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

@@ -0,0 +1,32 @@
+import type { Account } from '@workspace/db/account/account'
+import type { Network } from '@workspace/db/network/network'
+import type { Setting } from '@workspace/db/setting/setting'
+import { getOrFetchQuery } from './get-or-fetch.tsx'
+import { optionsAccount } from './options-account.tsx'
+import { optionsNetwork } from './options-network.tsx'
+import { optionsSetting } from './options-setting.tsx'
+import { queryClient } from './query-client.tsx'
+
+export interface RootLoaderData {
+  accounts: Account[]
+  networks: Network[]
+  settings: Setting[]
+}
+
+export async function rootLoader() {
+  const [networks, settings] = await Promise.all([
+    getOrFetchQuery(queryClient, optionsNetwork.findMany({})),
+    getOrFetchQuery(queryClient, optionsSetting.getAll()),
+  ])
+
+  const activeWalletId = settings.find((s) => s.key === 'activeWalletId')?.value
+  const accounts = activeWalletId
+    ? await getOrFetchQuery(queryClient, optionsAccount.findByWalletId(activeWalletId))
+    : []
+
+  return {
+    accounts,
+    networks,
+    settings,
+  }
+}

packages/db-react/src/db-query-client.tsx renamed to packages/db-react/src/query-client.tsx

@@ -0,0 +1,18 @@
+import { useMemo } from 'react'
+import { useAccountLive } from './use-account-live.tsx'
+import { useSetting } from './use-setting.tsx'
+
+export function useAccountActive() {
+  const [accountId] = useSetting('activeAccountId')
+  const [walletId] = useSetting('activeWalletId')
+  if (!walletId) {
+    throw new Error('No active wallet set.')
+  }
+  const accountLive = useAccountLive({ walletId })
+  const account = useMemo(() => accountLive.find((item) => item.id === accountId), [accountId, accountLive])
+  if (!account) {
+    throw new Error('No active account set.')
+  }
+
+  return account
+}

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

@@ -0,0 +1,7 @@
+import { useMutation } from '@tanstack/react-query'
+import type { AccountCreateMutateOptions } from './options-account.tsx'
+import { optionsAccount } from './options-account.tsx'
+
+export function useAccountCreate(props: AccountCreateMutateOptions = {}) {
+  return useMutation(optionsAccount.create(props))
+}