react-i18next 11.15.3 → 11.15.6

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 11.15.6
+
+- fix error for typescript 4.6 [1453](https://github.com/i18next/react-i18next/pull/1463)
+
+### 11.15.5
+
+- types: fix never return type when using plurals [1453](https://github.com/i18next/react-i18next/pull/1453)
+
+### 11.15.4
+
+- types: add values field to Plural component in macros [1446](https://github.com/i18next/react-i18next/pull/1446)
+
 ### 11.15.3
 
 - types: fix for issue introduced with type extension for react-native [1436](https://github.com/i18next/react-i18next/pull/1436)

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 i18next
+Copyright (c) 2022 i18next
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-i18next",
-  "version": "11.15.3",
+  "version": "11.15.6",
   "description": "Internationalization for react done right. Using the i18next i18n ecosystem.",
   "main": "dist/commonjs/index.js",
   "types": "./index.d.ts",
@@ -86,7 +86,7 @@
     "rollup-plugin-terser": "^5.1.1",
     "sinon": "^7.2.3",
     "tslint": "^5.20.1",
-    "typescript": "^4.5.2",
+    "typescript": "4.6.2",
     "yargs": "^13.3.0"
   },
   "peerDependencies": {

package/ts4.1/icu.macro.d.ts

@@ -14,6 +14,7 @@ declare module 'react-i18next/icu.macro' {
     i18n?: i18n;
     ns?: N;
     count: number;
+    values?: {};
     zero?: string | React.ReactElement;
     one?: string | React.ReactElement;
     two?: string | React.ReactElement;

package/ts4.1/index.d.ts

@@ -95,8 +95,10 @@ declare module 'i18next' {
   }
 }
 
+type PluralSuffix = 'zero' | 'one' | 'two' | 'few' | 'many' | 'other';
+
 type WithOrWithoutPlural<K> = TypeOptions['jsonFormat'] extends 'v4'
-  ? K extends `${infer B}_${'zero' | 'one' | 'two' | 'few' | 'many' | 'other'}`
+  ? K extends `${infer B}_${PluralSuffix}`
     ? B | K
     : K
   : K;
@@ -150,6 +152,12 @@ export type NormalizeByTypeOptions<
   R = TypeOptionsFallback<TranslationValue, Options['returnEmptyString'], ''>
 > = TypeOptionsFallback<R, Options['returnNull'], null>;
 
+type StringIfPlural<T> = TypeOptions['jsonFormat'] extends 'v4'
+  ? T extends `${string}_${PluralSuffix}`
+    ? string
+    : never
+  : never;
+
 type NormalizeReturn<
   T,
   V,
@@ -162,7 +170,7 @@ type NormalizeReturn<
   ? K extends keyof T
     ? NormalizeReturn<T[K], R>
     : never
-  : never;
+  : StringIfPlural<keyof T>;
 
 type NormalizeMultiReturn<T, V> = V extends `${infer N}:${infer R}`
   ? N extends keyof T
@@ -319,7 +327,7 @@ export function withTranslation<N extends Namespace = DefaultNamespace>(
     withRef?: boolean;
   },
 ): <
-  C extends React.ComponentType<React.ComponentProps<C> & WithTranslationProps>,
+  C extends React.ComponentType<React.ComponentProps<any> & WithTranslationProps>,
   ResolvedProps = JSX.LibraryManagedAttributes<
     C,
     Subtract<React.ComponentProps<C>, WithTranslationProps>