fix: correct type

Author: chambo-e

packages/use-i18n/src/__tests__/formatUnit.ts

@@ -1,11 +1,7 @@
-import memoizeIntlConstructor from 'intl-format-cache'
-import IntlTranslationFormat from 'intl-messageformat'
 import formatUnit, { FormatUnitOptions, supportedUnits } from '../formatUnit'
 
 const locales = ['en', 'fr', 'ro']
 
-const getTranslationFormat = memoizeIntlConstructor(IntlTranslationFormat)
-
 const tests = [
   ...Object.keys(supportedUnits).map(unit => [
     'should work with',
@@ -57,13 +53,13 @@ describe('formatUnit', () => {
   test('should return empty string for unknown unit', () => {
     expect(
       // @ts-expect-error We test the use case when unit is unknown
-      formatUnit('fr', 123, { unit: 'unknown' }, getTranslationFormat),
+      formatUnit('fr', 123, { unit: 'unknown' }),
     ).toMatchSnapshot()
   })
 
   test.each(tests)('%s %o', (_, options, locale, amount) => {
     expect(
-      formatUnit(locale as string, amount as number, options as FormatUnitOptions, getTranslationFormat),
+      formatUnit(locale as string, amount as number, options as FormatUnitOptions),
     ).toMatchSnapshot()
   })
 })

packages/use-i18n/src/formatUnit.ts

@@ -1,5 +1,4 @@
 import filesize from 'filesize'
-import { Options } from 'intl-messageformat'
 import formatters from './formatters'
 
 // We are on base 10, so we should use IEC standard here ...
@@ -16,6 +15,7 @@ const exponents = [
 ]
 
 type Exponent = typeof exponents[number]
+type ExponentName = '' | 'kilo' | 'mega' | 'giga' | 'tera' | 'peta' | 'exa' | 'zetta' | 'yotta'
 
 const frOctet = {
   plural: 'octets',
@@ -56,7 +56,6 @@ const compoundUnitsSymbols = {
 
 type Unit = 'bit' | 'byte'
 type CompoundUnit = 'second'
-type FormatPlural = (message: string, locales?: string | string[] | undefined, overrideFormats?: undefined, opts?: Options | undefined) => { format: ({ amount }: { amount: number}) => string}
 
 const formatShortUnit = (locale: string, exponent: Exponent, unit: Unit, compoundUnit?: CompoundUnit) => {
   let shortenedUnit = symbols.short[unit]
@@ -145,7 +144,12 @@ const format =
     }`
   }
 
-export const supportedUnits = {
+type SimpleUnits = `${ExponentName}${Unit}${'-humanized' | ''}`
+type ComplexUnits = `${Unit}${'s' | ''}${'-humanized' | ''}`
+type PerSecondUnit = `bit${'s' | ''}${'-per-second' | ''}${'-humanized' | ''}`
+type SupportedUnits = SimpleUnits | ComplexUnits | PerSecondUnit
+
+export const supportedUnits: Partial<Record<SupportedUnits, ReturnType<typeof format>>> = {
   // bits
   'bits-humanized': format({ humanize: true, unit: 'bit' }),
   'bits-per-second-humanized': format({
@@ -194,7 +198,7 @@ export const supportedUnits = {
 }
 
 export interface FormatUnitOptions {
-  unit: keyof typeof supportedUnits
+  unit: SupportedUnits
   short?: boolean
 }