refactor: split out hostd-types

SiaFoundation · Apr 15, 2024 · 4c98b74 · 4c98b74
1 parent d2180c1
commit 4c98b74
Show file tree

Hide file tree

Showing 35 changed files with 853 additions and 406 deletions.
diff --git a/.changeset/big-penguins-sell.md b/.changeset/big-penguins-sell.md
@@ -0,0 +1,5 @@
+---
+'@siafoundation/hostd-types': minor
+---
+
+Introduced new library for hostd types.
diff --git a/apps/hostd/components/Contracts/ContractContextMenu.tsx b/apps/hostd/components/Contracts/ContractContextMenu.tsx
@@ -12,10 +12,8 @@ import {
   Text,
 } from '@siafoundation/design-system'
 import { CaretDown16, DataCheck16 } from '@siafoundation/react-icons'
-import {
-  ContractStatus,
-  useContractsIntegrityCheck,
-} from '@siafoundation/hostd-react'
+import { ContractStatus } from '@siafoundation/hostd-types'
+import { useContractsIntegrityCheck } from '@siafoundation/hostd-react'
 import { useDialog } from '../../contexts/dialog'
 import { useCallback } from 'react'
 

diff --git a/apps/hostd/components/DirectorySelectMenu/DirectorySelectCmd/index.tsx b/apps/hostd/components/DirectorySelectMenu/DirectorySelectCmd/index.tsx
@@ -3,7 +3,7 @@ import { Page } from '../../CmdRoot/types'
 import { Text } from '@siafoundation/design-system'
 import { FolderIcon } from '@siafoundation/react-icons'
 import { DirectorySelectEmpty } from './DirectorySelectEmpty'
-import { SystemDirResponse } from '@siafoundation/hostd-react'
+import { SystemDirectoryResponse } from '@siafoundation/hostd-types'
 import { useHostOSPathSeparator } from '../../../hooks/useHostOSPathSeparator'
 import { getChildDirectoryPath } from '../../../lib/system'
 import { DirectorySelectError } from './DirectorySelectError'
@@ -27,7 +27,7 @@ export function DirectorySelectCmd({
   afterSelect,
 }: {
   path: string
-  dir: SWRResponse<SystemDirResponse, SWRError>
+  dir: SWRResponse<SystemDirectoryResponse, SWRError>
   setPath: (path: string) => void
   currentPage?: Page
   beforeSelect?: () => void

diff --git a/apps/hostd/components/DirectorySelectMenu/index.tsx b/apps/hostd/components/DirectorySelectMenu/index.tsx
@@ -1,6 +1,6 @@
 import { Panel, ScrollArea } from '@siafoundation/design-system'
 import { SWRError } from '@siafoundation/react-core'
-import { SystemDirResponse } from '@siafoundation/hostd-react'
+import { SystemDirectoryResponse } from '@siafoundation/hostd-types'
 import { Command } from 'cmdk'
 import { SWRResponse } from 'swr'
 import {
@@ -10,7 +10,7 @@ import {
 
 type Props = {
   path: string
-  dir: SWRResponse<SystemDirResponse, SWRError>
+  dir: SWRResponse<SystemDirectoryResponse, SWRError>
   onChange: (path: string) => void
 }
 

diff --git a/apps/hostd/components/Volumes/VolumeContextMenu.tsx b/apps/hostd/components/Volumes/VolumeContextMenu.tsx
@@ -17,8 +17,8 @@ import {
   Edit16,
   Close16,
 } from '@siafoundation/react-icons'
+import { VolumeStatus } from '@siafoundation/hostd-types'
 import {
-  VolumeStatus,
   useVolume,
   useVolumeCancel,
   useVolumeUpdate,

diff --git a/apps/hostd/contexts/config/resources.ts b/apps/hostd/contexts/config/resources.ts
@@ -1,5 +1,5 @@
 import { SWRError } from '@siafoundation/react-core'
-import { HostSettings } from '@siafoundation/hostd-react'
+import { HostSettings } from '@siafoundation/hostd-types'
 
 export type Resources = {
   settings: {

diff --git a/apps/hostd/contexts/config/transform.ts b/apps/hostd/contexts/config/transform.ts
@@ -4,7 +4,7 @@ import {
   DNSDuckDNSOptions,
   DNSNoIPOptions,
   HostSettings,
-} from '@siafoundation/hostd-react'
+} from '@siafoundation/hostd-types'
 import {
   bytesToMB,
   MBToBytes,

diff --git a/apps/hostd/contexts/config/types.ts b/apps/hostd/contexts/config/types.ts
@@ -1,4 +1,4 @@
-import { DNSProvider } from '@siafoundation/hostd-react'
+import { DNSProvider } from '@siafoundation/hostd-types'
 import BigNumber from 'bignumber.js'
 
 export const scDecimalPlaces = 6

diff --git a/apps/hostd/contexts/contracts/columns.tsx b/apps/hostd/contexts/contracts/columns.tsx
@@ -14,7 +14,7 @@ import {
   ArrowDownRight16,
   Money16,
 } from '@siafoundation/react-icons'
-import { ContractStatus } from '@siafoundation/hostd-react'
+import { ContractStatus } from '@siafoundation/hostd-types'
 import { blockHeightToTime, humanBytes, humanDate } from '@siafoundation/units'
 import { ContractContextMenu } from '../../components/Contracts/ContractContextMenu'
 import { ContractData, TableColumnId } from './types'

diff --git a/apps/hostd/contexts/contracts/dataset.ts b/apps/hostd/contexts/contracts/dataset.ts
@@ -1,5 +1,6 @@
 import { useMemo } from 'react'
-import { Contract, useContracts } from '@siafoundation/hostd-react'
+import { Contract } from '@siafoundation/hostd-types'
+import { useContracts } from '@siafoundation/hostd-react'
 import { ContractData } from './types'
 import BigNumber from 'bignumber.js'
 

diff --git a/apps/hostd/contexts/contracts/index.tsx b/apps/hostd/contexts/contracts/index.tsx
@@ -5,10 +5,8 @@ import {
   getContractsTimeRangeBlockHeight,
 } from '@siafoundation/design-system'
 import { useRouter } from 'next/router'
-import {
-  ContractStatus,
-  useContracts as useContractsData,
-} from '@siafoundation/hostd-react'
+import { ContractStatus } from '@siafoundation/hostd-types'
+import { useContracts as useContractsData } from '@siafoundation/hostd-react'
 import { createContext, useContext, useMemo } from 'react'
 import {
   columnsDefaultVisible,

diff --git a/apps/hostd/contexts/contracts/types.ts b/apps/hostd/contexts/contracts/types.ts
@@ -8,7 +8,7 @@ import {
 import {
   ContractFilterSortField,
   ContractStatus,
-} from '@siafoundation/hostd-react'
+} from '@siafoundation/hostd-types'
 import BigNumber from 'bignumber.js'
 
 export type ContractData = {

diff --git a/apps/hostd/contexts/volumes/dataset.ts b/apps/hostd/contexts/volumes/dataset.ts
@@ -1,5 +1,6 @@
 import { useMemo } from 'react'
-import { useVolumes, VolumeMeta } from '@siafoundation/hostd-react'
+import { VolumeMeta } from '@siafoundation/hostd-types'
+import { useVolumes } from '@siafoundation/hostd-react'
 import { VolumeData } from './types'
 import BigNumber from 'bignumber.js'
 import { MiBToBytes } from '@siafoundation/units'

diff --git a/apps/hostd/contexts/volumes/index.tsx b/apps/hostd/contexts/volumes/index.tsx
@@ -3,10 +3,8 @@ import {
   useDatasetEmptyState,
   secondsInMilliseconds,
 } from '@siafoundation/design-system'
-import {
-  VolumeMeta,
-  useVolumes as useVolumesData,
-} from '@siafoundation/hostd-react'
+import { VolumeMeta } from '@siafoundation/hostd-types'
+import { useVolumes as useVolumesData } from '@siafoundation/hostd-react'
 import { createContext, useContext, useMemo } from 'react'
 import { columnsDefaultVisible, TableColumnId } from './types'
 import { columns } from './columns'

diff --git a/apps/hostd/contexts/volumes/types.ts b/apps/hostd/contexts/volumes/types.ts
@@ -1,4 +1,4 @@
-import { VolumeStatus } from '@siafoundation/hostd-react'
+import { VolumeStatus } from '@siafoundation/hostd-types'
 import BigNumber from 'bignumber.js'
 
 export type VolumeData = {

diff --git a/apps/hostd/dialogs/AlertsDialog.tsx b/apps/hostd/dialogs/AlertsDialog.tsx
@@ -5,11 +5,8 @@ import {
   triggerSuccessToast,
   ValueCopyable,
 } from '@siafoundation/design-system'
-import {
-  AlertSeverity,
-  useAlerts,
-  useAlertsDismiss,
-} from '@siafoundation/hostd-react'
+import { AlertSeverity } from '@siafoundation/hostd-types'
+import { useAlerts, useAlertsDismiss } from '@siafoundation/hostd-react'
 import { humanTime } from '@siafoundation/units'
 import { useCallback } from 'react'
 import { defaultDatasetRefreshInterval } from '../config/swr'

diff --git a/libs/hostd-react/package.json b/libs/hostd-react/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@siafoundation/hostd-react",
-  "description": " React hooks for interacting with `hostd`.",
+  "description": "React hooks for interacting with `hostd`.",
   "version": "4.0.0",
   "license": "MIT",
-  "peerDependencies": {
+  "dependencies": {
     "swr": "^2.1.1",
     "@siafoundation/react-core": "^1.1.0",
-    "@siafoundation/types": "^0.2.0"
+    "@siafoundation/hostd-types": "0.0.0"
   },
   "types": "./src/index.d.ts"
 }