@seamapi/react 2.19.1 → 3.0.0-beta.1

package/src/lib/seam/components/ClimateSettingScheduleTable/ClimateSettingScheduleRowDetails.tsx

@@ -1,5 +1,5 @@
+import type { ClimateSettingSchedule } from '@seamapi/types/connect'
 import { DateTime } from 'luxon'
-import type { ClimateSettingSchedule } from 'seamapi'
 
 import { useDevice } from 'lib/seam/devices/use-device.js'
 import { DotDivider } from 'lib/ui/layout/DotDivider.js'

package/src/lib/seam/components/ClimateSettingScheduleTable/ClimateSettingScheduleTable.tsx

@@ -1,6 +1,6 @@
+import type { ClimateSettingSchedule } from '@seamapi/types/connect'
 import classNames from 'classnames'
 import { useCallback, useMemo, useState } from 'react'
-import type { ClimateSettingSchedule } from 'seamapi'
 
 import { compareByCreatedAtDesc } from 'lib/dates.js'
 import { NestedClimateSettingScheduleDetails } from 'lib/seam/components/ClimateSettingScheduleDetails/ClimateSettingScheduleDetails.js'
@@ -9,10 +9,7 @@ import {
   type CommonProps,
   withRequiredCommonProps,
 } from 'lib/seam/components/common-props.js'
-import {
-  useClimateSettingSchedules,
-  type UseClimateSettingSchedulesData,
-} from 'lib/seam/thermostats/climate-setting-schedules/use-climate-setting-schedules.js'
+import { useClimateSettingSchedules } from 'lib/seam/thermostats/climate-setting-schedules/use-climate-setting-schedules.js'
 import { useComponentTelemetry } from 'lib/telemetry/index.js'
 import { ContentHeader } from 'lib/ui/layout/ContentHeader.js'
 import { LoadingToast } from 'lib/ui/LoadingToast/LoadingToast.js'
@@ -187,7 +184,7 @@ export function ClimateSettingScheduleTable({
 }
 
 function Content(props: {
-  climateSettingSchedules: Array<UseClimateSettingSchedulesData[number]>
+  climateSettingSchedules: ClimateSettingSchedule[]
   onClimateSettingScheduleClick: (climateSettingScheduleId: string) => void
 }): JSX.Element {
   const { climateSettingSchedules, onClimateSettingScheduleClick } = props

package/src/lib/seam/components/ConnectAccountButton/ConnectAccountButton.tsx

@@ -18,7 +18,7 @@ export function ConnectAccountButton({
 }: ConnectAccountButtonProps = {}): JSX.Element {
   useComponentTelemetry('ConnectAccountButton')
 
-  const { isLoading, mutate } = useCreateConnectWebview({
+  const { isPending, mutate } = useCreateConnectWebview({
     willNavigateToWebview: true,
   })
 
@@ -34,7 +34,7 @@ export function ConnectAccountButton({
       size='small'
       onClick={handleClick}
       className={className}
-      disabled={isLoading}
+      disabled={isPending}
     >
       {t.connectAccount}
     </Button>

package/src/lib/seam/components/CreateAccessCodeForm/CreateAccessCodeForm.tsx

@@ -1,13 +1,17 @@
+import {
+  isSeamHttpInvalidInputError,
+  type SeamHttpApiError,
+} from '@seamapi/http/connect'
+import type { AccessCode, Device } from '@seamapi/types/connect'
 import { useState } from 'react'
-import type { AccessCode, SeamError } from 'seamapi'
 
+import { shake } from 'lib/object.js'
 import { useCreateAccessCode } from 'lib/seam/access-codes/use-create-access-code.js'
 import {
   type CommonProps,
   withRequiredCommonProps,
 } from 'lib/seam/components/common-props.js'
-import { useDevice, type UseDeviceData } from 'lib/seam/devices/use-device.js'
-import { getValidationError } from 'lib/seam/error-handlers.js'
+import { useDevice } from 'lib/seam/devices/use-device.js'
 import { useComponentTelemetry } from 'lib/telemetry/index.js'
 import {
   AccessCodeForm,
@@ -55,7 +59,7 @@ function Content({
   onBack,
   onSuccess,
 }: Omit<CreateAccessCodeFormProps, 'deviceId'> & {
-  device: NonNullable<UseDeviceData>
+  device: Device
 }): JSX.Element {
   const { submit, isSubmitting, responseErrors } = useSubmitCreateAccessCode({
     onSuccess: (accessCode: AccessCode) => {
@@ -89,7 +93,7 @@ function useSubmitCreateAccessCode(params: {
   responseErrors: ResponseErrors | null
 } {
   const { onSuccess } = params
-  const { mutate, isLoading: isSubmitting } = useCreateAccessCode()
+  const { mutate, isPending: isSubmitting } = useCreateAccessCode()
   const { responseErrors, handleResponseError, resetResponseErrors } =
     useResponseErrors()
 
@@ -141,7 +145,7 @@ function useSubmitCreateAccessCode(params: {
 
 export function useResponseErrors(): {
   responseErrors: ResponseErrors | null
-  handleResponseError: (error: SeamError) => void
+  handleResponseError: (error: SeamHttpApiError) => void
   resetResponseErrors: () => void
 } {
   const [responseErrors, setResponseErrors] = useState<Record<
@@ -149,17 +153,17 @@ export function useResponseErrors(): {
     string | undefined
   > | null>(null)
 
-  const handleResponseError = (error: SeamError): void => {
-    const code = getValidationError({ error, property: 'code' })
-    const name = getValidationError({ error, property: 'name' })
-
-    if (code != null || name != null) {
-      setResponseErrors({
-        code,
-        name,
+  const handleResponseError = (error: SeamHttpApiError): void => {
+    if (isSeamHttpInvalidInputError(error)) {
+      const errors = shake({
+        code: error.getValidationErrorMessages('code')[0],
+        name: error.getValidationErrorMessages('name')[0],
       })
-
-      return
+      if (Object.keys(errors).length === 0) {
+        setResponseErrors({
+          unknown: error.message,
+        })
+      }
     }
 
     setResponseErrors({

package/src/lib/seam/components/CreateClimateSettingScheduleForm/CreateClimateSettingScheduleForm.tsx

@@ -30,7 +30,7 @@ function useSubmitCreateClimateSettingSchedule(onSuccess?: () => void): {
   submit: (data: ClimateSettingScheduleFormSubmitData) => void
   isSubmitting: boolean
 } {
-  const { mutate, isLoading: isSubmitting } = useCreateClimateSettingSchedule()
+  const { mutate, isPending: isSubmitting } = useCreateClimateSettingSchedule()
   const submit = (data: ClimateSettingScheduleFormSubmitData): void => {
     const { name, deviceId, startDate, endDate, climateSetting } = data
 

package/src/lib/seam/components/DeviceDetails/DeviceDetails.tsx

@@ -1,5 +1,3 @@
-import { isLockDevice, isNoiseSensorDevice, isThermostatDevice } from 'seamapi'
-
 import {
   type CommonProps,
   withRequiredCommonProps,
@@ -8,6 +6,9 @@ import { LockDeviceDetails } from 'lib/seam/components/DeviceDetails/LockDeviceD
 import { NoiseSensorDeviceDetails } from 'lib/seam/components/DeviceDetails/NoiseSensorDeviceDetails.js'
 import { ThermostatDeviceDetails } from 'lib/seam/components/DeviceDetails/ThermostatDeviceDetails.js'
 import { useDevice } from 'lib/seam/devices/use-device.js'
+import { isLockDevice } from 'lib/seam/locks/lock-device.js'
+import { isNoiseSensorDevice } from 'lib/seam/noise-sensors/noise-sensor-device.js'
+import { isThermostatDevice } from 'lib/seam/thermostats/thermostat-device.js'
 import { useComponentTelemetry } from 'lib/telemetry/index.js'
 
 export interface DeviceDetailsProps extends CommonProps {

package/src/lib/seam/components/DeviceDetails/DeviceInfo.tsx

@@ -1,4 +1,4 @@
-import type { CommonDevice } from 'seamapi'
+import type { Device } from '@seamapi/types/connect'
 
 import { BeeIcon } from 'lib/icons/Bee.js'
 import type { CommonProps } from 'lib/seam/components/common-props.js'
@@ -13,7 +13,7 @@ interface DeviceInfoProps
       'disableConnectedAccountInformation' | 'disableResourceIds'
     >
   > {
-  device: CommonDevice
+  device: Device
 }
 
 export function DeviceInfo({
@@ -21,7 +21,9 @@ export function DeviceInfo({
   disableConnectedAccountInformation,
   disableResourceIds,
 }: DeviceInfoProps): JSX.Element | null {
-  const { connectedAccount } = useConnectedAccount(device.connected_account_id)
+  const { connectedAccount } = useConnectedAccount({
+    connected_account_id: device.connected_account_id,
+  })
   return (
     <DetailSection
       label={t.deviceInfo}

package/src/lib/seam/components/DeviceDetails/DeviceModel.tsx

@@ -1,7 +1,7 @@
-import type { CommonDevice } from 'seamapi'
+import type { Device } from '@seamapi/types/connect'
 
 interface DeviceModelProps {
-  device: CommonDevice
+  device: Device
 }
 
 export function DeviceModel({ device }: DeviceModelProps): JSX.Element | null {

package/src/lib/seam/components/DeviceDetails/LockDeviceDetails.tsx

@@ -1,5 +1,4 @@
 import classNames from 'classnames'
-import type { LockDevice } from 'seamapi'
 
 import { ChevronRightIcon } from 'lib/icons/ChevronRight.js'
 import { useAccessCodes } from 'lib/seam/access-codes/use-access-codes.js'
@@ -7,11 +6,12 @@ import { NestedAccessCodeTable } from 'lib/seam/components/AccessCodeTable/Acces
 import type { NestedSpecificDeviceDetailsProps } from 'lib/seam/components/DeviceDetails/DeviceDetails.js'
 import { DeviceInfo } from 'lib/seam/components/DeviceDetails/DeviceInfo.js'
 import { DeviceModel } from 'lib/seam/components/DeviceDetails/DeviceModel.js'
-import { useToggleLock } from 'lib/seam/devices/use-toggle-lock.js'
 import { deviceErrorFilter, deviceWarningFilter } from 'lib/seam/filters.js'
+import type { LockDevice } from 'lib/seam/locks/lock-device.js'
+import { useToggleLock } from 'lib/seam/locks/use-toggle-lock.js'
 import { Alerts } from 'lib/ui/Alert/Alerts.js'
 import { Button } from 'lib/ui/Button.js'
-import { BatteryStatus } from 'lib/ui/device/BatteryStatus.js'
+import { BatteryStatusIndicator } from 'lib/ui/device/BatteryStatusIndicator.js'
 import { DeviceImage } from 'lib/ui/device/DeviceImage.js'
 import { OnlineStatus } from 'lib/ui/device/OnlineStatus.js'
 import { ContentHeader } from 'lib/ui/layout/ContentHeader.js'
@@ -36,7 +36,7 @@ export function LockDeviceDetails({
   className,
 }: LockDeviceDetailsProps): JSX.Element | null {
   const [accessCodesOpen, toggleAccessCodesOpen] = useToggle()
-  const toggleLock = useToggleLock(device)
+  const toggleLock = useToggleLock()
   const { accessCodes } = useAccessCodes({
     device_id: device.device_id,
   })
@@ -102,7 +102,7 @@ export function LockDeviceDetails({
                 <span className='seam-label'>{t.status}:</span>{' '}
                 <OnlineStatus device={device} />
                 <span className='seam-label'>{t.power}:</span>{' '}
-                <BatteryStatus device={device} />
+                <BatteryStatusIndicator device={device} />
                 <DeviceModel device={device} />
               </div>
             </div>
@@ -133,7 +133,7 @@ export function LockDeviceDetails({
                   <Button
                     size='small'
                     onClick={() => {
-                      toggleLock.mutate()
+                      toggleLock.mutate(device)
                     }}
                   >
                     {toggleLockLabel}

package/src/lib/seam/components/DeviceDetails/NoiseSensorDeviceDetails.tsx

@@ -1,10 +1,10 @@
 import classNames from 'classnames'
 import { useState } from 'react'
-import type { NoiseSensorDevice } from 'seamapi'
 
 import type { NestedSpecificDeviceDetailsProps } from 'lib/seam/components/DeviceDetails/DeviceDetails.js'
 import { DeviceInfo } from 'lib/seam/components/DeviceDetails/DeviceInfo.js'
 import { DeviceModel } from 'lib/seam/components/DeviceDetails/DeviceModel.js'
+import type { NoiseSensorDevice } from 'lib/seam/noise-sensors/noise-sensor-device.js'
 import { DeviceImage } from 'lib/ui/device/DeviceImage.js'
 import { NoiseLevelStatus } from 'lib/ui/device/NoiseLevelStatus.js'
 import { OnlineStatus } from 'lib/ui/device/OnlineStatus.js'

package/src/lib/seam/components/DeviceDetails/ThermostatDeviceDetails.tsx

@@ -1,6 +1,5 @@
 import classNames from 'classnames'
 import { useEffect, useState } from 'react'
-import type { HvacModeSetting, ThermostatDevice } from 'seamapi'
 
 import { debounce } from 'lib/debounce.js'
 import { CheckBlackIcon } from 'lib/icons/CheckBlack.js'
@@ -9,13 +8,17 @@ import { NestedClimateSettingScheduleTable } from 'lib/seam/components/ClimateSe
 import type { NestedSpecificDeviceDetailsProps } from 'lib/seam/components/DeviceDetails/DeviceDetails.js'
 import { DeviceInfo } from 'lib/seam/components/DeviceDetails/DeviceInfo.js'
 import { useClimateSettingSchedules } from 'lib/seam/thermostats/climate-setting-schedules/use-climate-setting-schedules.js'
+import { getSupportedThermostatModes } from 'lib/seam/thermostats/temperature-bounds.js'
+import type {
+  HvacModeSetting,
+  ThermostatDevice,
+} from 'lib/seam/thermostats/thermostat-device.js'
 import { useCoolThermostat } from 'lib/seam/thermostats/use-cool-thermostat.js'
 import { useHeatCoolThermostat } from 'lib/seam/thermostats/use-heat-cool-thermostat.js'
 import { useHeatThermostat } from 'lib/seam/thermostats/use-heat-thermostat.js'
+import { useSetThermostatFanMode } from 'lib/seam/thermostats/use-set-thermostat-fan-mode.js'
 import { useSetThermostatOff } from 'lib/seam/thermostats/use-set-thermostat-off.js'
-import { useUpdateFanMode } from 'lib/seam/thermostats/use-update-fan-mode.js'
 import { useUpdateThermostat } from 'lib/seam/thermostats/use-update-thermostat.js'
-import { getSupportedThermostatModes } from 'lib/temperature-bounds.js'
 import { AccordionRow } from 'lib/ui/layout/AccordionRow.js'
 import { ContentHeader } from 'lib/ui/layout/ContentHeader.js'
 import { DetailRow } from 'lib/ui/layout/DetailRow.js'
@@ -203,7 +206,7 @@ function ManualOverrideRow({
 }
 
 function FanModeRow({ device }: { device: ThermostatDevice }): JSX.Element {
-  const { mutate, isSuccess, isError } = useUpdateFanMode()
+  const { mutate, isSuccess, isError } = useSetThermostatFanMode()
 
   return (
     <>

package/src/lib/seam/components/DeviceTable/DeviceHealthBar.tsx

@@ -1,9 +1,12 @@
-import type { ConnectedAccountError, DeviceError } from 'seamapi'
+import type {
+  ConnectedAccountError,
+  Device,
+  DeviceError,
+} from '@seamapi/types/connect'
 
 import { CheckIcon } from 'lib/icons/Check.js'
 import { ExclamationCircleOutlineIcon } from 'lib/icons/ExclamationCircleOutline.js'
 import { OnlineStatusAccountOfflineIcon } from 'lib/icons/OnlineStatusAccountOffline.js'
-import type { UseDevicesData } from 'lib/seam/devices/use-devices.js'
 import {
   connectedAccountErrorFilter,
   deviceErrorFilter,
@@ -15,7 +18,7 @@ export type AccountFilter = 'account_issues'
 export type DeviceFilter = 'device_issues'
 
 interface DeviceHealthBarProps {
-  devices: Array<UseDevicesData[number]>
+  devices: Device[]
   filter: AccountFilter | DeviceFilter | null
   onFilterSelect: (filter: AccountFilter | DeviceFilter | null) => void
   errorFilter: (error: DeviceError | ConnectedAccountError) => boolean

package/src/lib/seam/components/DeviceTable/DeviceRow.tsx

@@ -1,10 +1,8 @@
+import type { Device } from '@seamapi/types/connect'
 import classNames from 'classnames'
 
-import type {
-  UseDevicesData,
-  UseDevicesParams,
-} from 'lib/seam/devices/use-devices.js'
-import { BatteryStatus } from 'lib/ui/device/BatteryStatus.js'
+import type { UseDevicesParams } from 'lib/seam/devices/use-devices.js'
+import { BatteryStatusIndicator } from 'lib/ui/device/BatteryStatusIndicator.js'
 import { DeviceImage } from 'lib/ui/device/DeviceImage.js'
 import { LockStatus } from 'lib/ui/device/LockStatus.js'
 import {
@@ -22,7 +20,7 @@ interface Props {
 }
 
 interface DeviceRowProps {
-  device: UseDevicesData[number]
+  device: Device
   onClick: () => void
 }
 
@@ -62,7 +60,7 @@ export function DeviceRow({
           </span>
           <div className='seam-device-statuses'>
             <OnlineStatus device={device} />
-            {isConnected && <BatteryStatus device={device} />}
+            {isConnected && <BatteryStatusIndicator device={device} />}
             {isConnected && <LockStatus device={device} />}
           </div>
         </div>

package/src/lib/seam/components/DeviceTable/DeviceTable.tsx

@@ -1,11 +1,6 @@
+import type { Device } from '@seamapi/types/connect'
 import classNames from 'classnames'
 import { useCallback, useMemo, useState } from 'react'
-import {
-  type CommonDevice,
-  isLockDevice,
-  isNoiseSensorDevice,
-  isThermostatDevice,
-} from 'seamapi'
 
 import { compareByCreatedAtDesc } from 'lib/dates.js'
 import {
@@ -19,10 +14,10 @@ import {
   DeviceHealthBar,
 } from 'lib/seam/components/DeviceTable/DeviceHealthBar.js'
 import { DeviceRow } from 'lib/seam/components/DeviceTable/DeviceRow.js'
-import {
-  useDevices,
-  type UseDevicesData,
-} from 'lib/seam/devices/use-devices.js'
+import { useDevices } from 'lib/seam/devices/use-devices.js'
+import { isLockDevice } from 'lib/seam/locks/lock-device.js'
+import { isNoiseSensorDevice } from 'lib/seam/noise-sensors/noise-sensor-device.js'
+import { isThermostatDevice } from 'lib/seam/thermostats/thermostat-device.js'
 import { useComponentTelemetry } from 'lib/telemetry/index.js'
 import { ContentHeader } from 'lib/ui/layout/ContentHeader.js'
 import { LoadingToast } from 'lib/ui/LoadingToast/LoadingToast.js'
@@ -34,8 +29,6 @@ import { TableTitle } from 'lib/ui/Table/TableTitle.js'
 import { SearchTextField } from 'lib/ui/TextField/SearchTextField.js'
 import { Caption } from 'lib/ui/typography/Caption.js'
 
-type Device = UseDevicesData[number]
-
 export interface DeviceTableProps extends CommonProps {
   deviceIds?: string[]
   connectedAccountIds?: string[]
@@ -48,7 +41,7 @@ export interface DeviceTableProps extends CommonProps {
 }
 
 export const defaultDeviceFilter = (
-  device: CommonDevice,
+  device: Device,
   searchInputValue: string
 ): boolean => {
   const value = searchInputValue.trim()
@@ -184,7 +177,7 @@ export function DeviceTable({
 }
 
 function Content(props: {
-  devices: Array<UseDevicesData[number]>
+  devices: Device[]
   onDeviceClick: (deviceId: string) => void
   errorFilter: (error: any) => boolean
 }): JSX.Element {

package/src/lib/seam/components/EditAccessCodeForm/EditAccessCodeForm.tsx

@@ -1,7 +1,6 @@
-import {
-  useAccessCode,
-  type UseAccessCodeData,
-} from 'lib/seam/access-codes/use-access-code.js'
+import type { AccessCode } from '@seamapi/types/connect'
+
+import { useAccessCode } from 'lib/seam/access-codes/use-access-code.js'
 import { useUpdateAccessCode } from 'lib/seam/access-codes/use-update-access-code.js'
 import {
   type CommonProps,
@@ -56,7 +55,7 @@ function Content({
   accessCode,
   onSuccess,
 }: Omit<EditAccessCodeFormProps, 'accessCodeId'> & {
-  accessCode: NonNullable<UseAccessCodeData>
+  accessCode: AccessCode
 }): JSX.Element | null {
   const { device } = useDevice({
     device_id: accessCode.device_id,
@@ -93,14 +92,14 @@ function Content({
 }
 
 function useSubmitEditAccessCode(
-  accessCode: NonNullable<UseAccessCodeData>,
+  accessCode: AccessCode,
   onSuccess?: () => void
 ): {
   submit: (data: AccessCodeFormSubmitData) => void
   isSubmitting: boolean
   responseErrors: ResponseErrors | null
 } {
-  const { mutate, isLoading: isSubmitting } = useUpdateAccessCode()
+  const { mutate, isPending: isSubmitting } = useUpdateAccessCode()
   const { responseErrors, handleResponseError, resetResponseErrors } =
     useResponseErrors()
 

package/src/lib/seam/components/SupportedDeviceTable/SupportedDeviceContent.tsx

@@ -2,7 +2,6 @@ import type { DeviceModel } from '@seamapi/types/devicedb'
 import { useMemo } from 'react'
 
 import { SupportedDeviceManufacturerSection } from 'lib/seam/components/SupportedDeviceTable/SupportedDeviceManufacturerSection.js'
-import type { UseDeviceModelsData } from 'lib/seam/components/SupportedDeviceTable/use-device-models.js'
 import {
   type DeviceModelFilters,
   useFilteredDeviceModels,
@@ -28,7 +27,7 @@ export function SupportedDeviceContent({
   includeIf,
   excludeIf,
 }: SupportedDeviceContentProps): JSX.Element | null {
-  const { deviceModels, isLoading, isError, refetch } = useFilteredDeviceModels(
+  const { deviceModels, isPending, isError, refetch } = useFilteredDeviceModels(
     {
       filterValue,
       filters,
@@ -44,7 +43,7 @@ export function SupportedDeviceContent({
     [deviceModels]
   )
 
-  if (isLoading) {
+  if (isPending) {
     return (
       <div className='seam-supported-device-table-content-state-block'>
         <p>{t.loading}</p>
@@ -140,7 +139,7 @@ function EmptyResult({
 }
 
 const groupDeviceModelsByManufacturer = (
-  deviceModels: UseDeviceModelsData
+  deviceModels: DeviceModel[]
 ): Record<string, DeviceModel[]> => {
   const result: Record<string, DeviceModel[]> = {}
 

package/src/lib/seam/components/SupportedDeviceTable/SupportedDeviceContentRows.tsx

@@ -1,8 +1,9 @@
+import type { DeviceModel } from '@seamapi/types/devicedb'
+
 import { SupportedDeviceRow } from 'lib/seam/components/SupportedDeviceTable/SupportedDeviceRow.js'
-import type { UseDeviceModelsData } from 'lib/seam/components/SupportedDeviceTable/use-device-models.js'
 
 interface SupportedDeviceContentRowsProps {
-  deviceModels: UseDeviceModelsData
+  deviceModels: DeviceModel[]
 }
 
 export function SupportedDeviceContentRows({

package/src/lib/seam/components/SupportedDeviceTable/use-device-model.ts

@@ -1,45 +1,40 @@
+import type { SeamHttpApiError } from '@seamapi/http/connect'
 import type {
   DeviceModel,
   RouteRequestParams,
   RouteResponse,
 } from '@seamapi/types/devicedb'
 import { useQuery } from '@tanstack/react-query'
-import type { SeamError } from 'seamapi'
 
 import { useSeamClient } from 'lib/seam/use-seam-client.js'
 import type { UseSeamQueryResult } from 'lib/seam/use-seam-query-result.js'
 
-export type UseDeviceModelParams = DeviceModelsGetParams | string
+export type UseDeviceModelParams = DeviceModelsGetParams
+
 export type UseDeviceModelData = DeviceModel | null
 
 export function useDeviceModel(
-  params?: UseDeviceModelParams
+  params: UseDeviceModelParams
 ): UseSeamQueryResult<'deviceModel', UseDeviceModelData> {
-  const normalizedParams =
-    typeof params === 'string' ? { device_model_id: params } : params
-
   const { client: seam } = useSeamClient()
-  const { data, ...rest } = useQuery<
-    DeviceModelsGetResponse['device_model'] | null,
-    SeamError
-  >({
+  const { data, ...rest } = useQuery<UseDeviceModelData, SeamHttpApiError>({
     enabled: seam != null,
-    queryKey: ['internal', 'device_models', 'get', normalizedParams],
+    queryKey: ['internal', 'device_models', 'get', params],
     queryFn: async () => {
       if (seam == null) return null
       const {
         data: { device_model: deviceModel },
       } = await seam.client.get<DeviceModelsGetResponse>(
         '/internal/devicedb/v1/device_models/get',
-        { params: normalizedParams }
+        { params }
       )
-      return deviceModel
+      // UPSTREAM: Response type does not match DeviceModel.
+      return deviceModel as DeviceModel
     },
   })
 
   return {
     ...rest,
-    // @ts-expect-error: Upstream mismatch between type and route type.
     deviceModel: data,
   }
 }

package/src/lib/seam/components/SupportedDeviceTable/use-device-models.ts

@@ -1,15 +1,16 @@
+import type { SeamHttpApiError } from '@seamapi/http/connect'
 import type {
   DeviceModel,
   RouteRequestParams,
   RouteResponse,
 } from '@seamapi/types/devicedb'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
-import type { SeamError } from 'seamapi'
 
 import { useSeamClient } from 'lib/seam/use-seam-client.js'
 import type { UseSeamQueryResult } from 'lib/seam/use-seam-query-result.js'
 
 export type UseDeviceModelsParams = DeviceModelsListParams
+
 export type UseDeviceModelsData = DeviceModel[]
 
 export function useDeviceModels(
@@ -18,10 +19,7 @@ export function useDeviceModels(
   const { client: seam } = useSeamClient()
   const queryClient = useQueryClient()
 
-  const { data, ...rest } = useQuery<
-    DeviceModelsListResponse['device_models'],
-    SeamError
-  >({
+  const { data, ...rest } = useQuery<UseDeviceModelsData, SeamHttpApiError>({
     enabled: seam != null,
     queryKey: ['internal', 'device_models', 'list', params],
     queryFn: async () => {
@@ -32,9 +30,6 @@ export function useDeviceModels(
         '/internal/devicedb/v1/device_models/list',
         { params }
       )
-      return deviceModels
-    },
-    onSuccess: (deviceModels) => {
       for (const deviceModel of deviceModels) {
         queryClient.setQueryData(
           [
@@ -46,12 +41,13 @@ export function useDeviceModels(
           deviceModel
         )
       }
+      // UPSTREAM: Response type does not match DeviceModel[].
+      return deviceModels as DeviceModel[]
     },
   })
 
   return {
     ...rest,
-    // @ts-expect-error: Upstream mismatch between type and route type.
     deviceModels: data,
   }
 }

package/src/lib/seam/components/SupportedDeviceTable/use-manufacturer.ts

@@ -1,37 +1,32 @@
+import type { SeamHttpApiError } from '@seamapi/http/connect'
 import type {
   Manufacturer,
   RouteRequestParams,
   RouteResponse,
 } from '@seamapi/types/devicedb'
 import { useQuery } from '@tanstack/react-query'
-import type { SeamError } from 'seamapi'
 
 import { useSeamClient } from 'lib/seam/use-seam-client.js'
 import type { UseSeamQueryResult } from 'lib/seam/use-seam-query-result.js'
 
-export type UseManufacturerParams = ManufacturersGetParams | string
+export type UseManufacturerParams = ManufacturersGetParams
+
 export type UseManufacturerData = Manufacturer | null
 
 export function useManufacturer(
-  params?: UseManufacturerParams
+  params: UseManufacturerParams
 ): UseSeamQueryResult<'manufacturer', UseManufacturerData> {
-  const normalizedParams =
-    typeof params === 'string' ? { manufacturer_id: params } : params
-
   const { client: seam } = useSeamClient()
-  const { data, ...rest } = useQuery<
-    ManufacturersGetResponse['manufacturer'] | null,
-    SeamError
-  >({
+  const { data, ...rest } = useQuery<UseManufacturerData, SeamHttpApiError>({
     enabled: seam != null,
-    queryKey: ['internal', 'manufacturers', 'get', normalizedParams],
+    queryKey: ['internal', 'manufacturers', 'get', params],
     queryFn: async () => {
       if (seam == null) return null
       const {
         data: { manufacturer },
       } = await seam.client.get<ManufacturersGetResponse>(
         '/internal/devicedb/v1/manufacturers/get',
-        { params: normalizedParams }
+        { params }
       )
       return manufacturer
     },