fix

Author: kazupon

packages/vue-i18n-core/src/composer.ts

@@ -1202,17 +1202,17 @@ export interface ComposerNumberFormatting<
    * @returns Formatted value
    */
   <
-    PartType extends string | Intl.NumberFormatPart[] =
+    Key extends string = string,
+    Return extends string | Intl.NumberFormatPart[] =
       | string
-      | Intl.NumberFormatPart[],
-    Key extends string = string
+      | Intl.NumberFormatPart[]
   >(
     value: number,
     keyOrOptions:
       | Key
       | ResourceKeys
       | NumberOptions<Key | ResourceKeys, Locales>
-  ): PartType
+  ): Return
   /**
    * Number Formatting
    *
@@ -1228,18 +1228,18 @@ export interface ComposerNumberFormatting<
    * @returns Formatted value
    */
   <
-    PartType extends string | Intl.NumberFormatPart[] =
+    Key extends string = string,
+    Return extends string | Intl.NumberFormatPart[] =
       | string
-      | Intl.NumberFormatPart[],
-    Key extends string = string
+      | Intl.NumberFormatPart[]
   >(
     value: number,
     keyOrOptions:
       | Key
       | ResourceKeys
       | NumberOptions<Key | ResourceKeys, Locales>,
     locale: Locales
-  ): PartType
+  ): Return
 }
 
 /**

packages/vue-i18n-core/test/composer.test-d.ts

@@ -357,21 +357,24 @@ test('strict composer with direct options', () => {
     string | Intl.NumberFormatPart[]
   >()
   expectTypeOf(
-    strictDirectComposer.n<string, 'foo' | 'bar'>(1, 'currency', 'zh')
+    strictDirectComposer.n<string, string>(1, 'currency', 'zh')
   ).toEqualTypeOf<string>()
   expectTypeOf(
     strictDirectComposer.n(1, { key: 'currency', locale: 'en', part: true })
   ).toEqualTypeOf<string | Intl.NumberFormatPart[]>()
   expectTypeOf(
-    strictDirectComposer.n<Intl.NumberFormatPart[]>(1, {
+    strictDirectComposer.n<string, Intl.NumberFormatPart[]>(1, {
       key: 'currency',
       locale: 'en',
       part: true
     })
   ).toEqualTypeOf<Intl.NumberFormatPart[]>()
-  expectTypeOf(strictDirectComposer.n(1, 'custom')).toEqualTypeOf<
+  expectTypeOf(strictDirectComposer.n(1, 'currency')).toEqualTypeOf<
     string | Intl.NumberFormatPart[]
   >()
+  expectTypeOf(
+    strictDirectComposer.n<string, string>(1, 'currency')
+  ).toEqualTypeOf<string>()
 
   // const noOptionsComposer = createComposer({ missingWarn: true })
   const noOptionsComposer = createComposer({ locale: 'en' })

packages/vue-i18n/src/vue.d.ts

@@ -705,10 +705,10 @@ declare module 'vue' {
      * @returns formatted value
      */
     $n<
-      PartType extends string | Intl.NumberFormatPart[] =
+      Key extends string = string,
+      Return extends string | Intl.NumberFormatPart[] =
         | string
         | Intl.NumberFormatPart[],
-      Key extends string = string,
       DefinedNumberFormat extends
         RemovedIndexResources<DefineDateTimeFormat> = RemovedIndexResources<DefineDateTimeFormat>,
       Keys = IsEmptyObject<DefinedNumberFormat> extends false
@@ -720,7 +720,7 @@ declare module 'vue' {
     >(
       value: number,
       options: NumberOptions<Key, ResourceKeys>
-    ): PartType
+    ): Return
     /**
      * Number formatting
      *
@@ -761,10 +761,10 @@ declare module 'vue' {
      * @returns formatted value
      */
     $n<
-      PartType extends string | Intl.NumberFormatPart[] =
+      Key extends string = string,
+      Return extends string | Intl.NumberFormatPart[] =
         | string
         | Intl.NumberFormatPart[],
-      Key extends string = string,
       DefinedNumberFormat extends
         RemovedIndexResources<DefineDateTimeFormat> = RemovedIndexResources<DefineDateTimeFormat>,
       Keys = IsEmptyObject<DefinedNumberFormat> extends false
@@ -777,7 +777,7 @@ declare module 'vue' {
       value: number,
       options: NumberOptions<Key, ResourceKeys>,
       locale: Locale
-    ): PartType
+    ): Return
 
     /**
      * Locale messages getter