i18next 22.4.2 → 22.4.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"type":"module","version":"22.4.2"}
1
+ {"type":"module","version":"22.4.4"}
package/index.d.ts CHANGED
@@ -879,13 +879,20 @@ export type TFuncReturn<
879
879
  : TDefaultResult;
880
880
 
881
881
  export interface TFunction<
882
- N extends Namespace | null = DefaultNamespace,
882
+ N extends Namespace = DefaultNamespace,
883
883
  TKPrefix = undefined,
884
884
  ActualNS extends Namespace = N extends null ? DefaultNamespace : N,
885
885
  > {
886
886
  // just key without options etc...
887
887
  <
888
- TKeys extends TFuncKey<PassedNS, TKPrefix> | TemplateStringsArray extends infer A ? A : never,
888
+ TKeys extends TFuncKey<N, TKPrefix> | TemplateStringsArray extends infer A ? A : never,
889
+ TDefaultResult extends DefaultTFuncReturn = string,
890
+ TInterpolationMap extends object = StringMap,
891
+ >(
892
+ key: TKeys | TKeys[],
893
+ ): TFuncReturn<N, TKeys, TDefaultResult, TKPrefix>;
894
+ <
895
+ TKeys extends TFuncKey<PassedNS, TKPrefix>,
889
896
  TDefaultResult extends DefaultTFuncReturn = string,
890
897
  TInterpolationMap extends object = StringMap,
891
898
  PassedNS extends Namespace = N extends string ? N : N extends unknown ? DefaultNamespace : N,
@@ -895,7 +902,7 @@ export interface TFunction<
895
902
 
896
903
  // with returnDetails: true, returnObjects: true and ns prop in options
897
904
  <
898
- TKeys extends TFuncKey<Namespace, TKPrefix> | TemplateStringsArray extends infer A ? A : never,
905
+ TKeys extends TFuncKey<Namespace, TKPrefix>,
899
906
  TDefaultResult extends DefaultTFuncReturnWithObject = object,
900
907
  TInterpolationMap extends object = StringMap,
901
908
  PassedNS extends Namespace = N extends string ? N : N extends null ? DefaultNamespace : N,
@@ -910,7 +917,7 @@ export interface TFunction<
910
917
 
911
918
  // with returnObjects: true and ns prop in options
912
919
  <
913
- TKeys extends TFuncKey<Namespace, TKPrefix> | TemplateStringsArray extends infer A ? A : never,
920
+ TKeys extends TFuncKey<Namespace, TKPrefix>,
914
921
  TDefaultResult extends DefaultTFuncReturnWithObject = object,
915
922
  TInterpolationMap extends object = StringMap,
916
923
  PassedNS extends Namespace = N extends string ? N : N extends null ? DefaultNamespace : N,
@@ -921,7 +928,7 @@ export interface TFunction<
921
928
 
922
929
  // with passed ns prop in options
923
930
  <
924
- TKeys extends TFuncKey<PassedNS, TKPrefix> | TemplateStringsArray extends infer A ? A : never,
931
+ TKeys extends TFuncKey<PassedNS, TKPrefix>,
925
932
  TDefaultResult extends DefaultTFuncReturn = string,
926
933
  TInterpolationMap extends object = StringMap,
927
934
  PassedNS extends Namespace = N extends string ? N : N extends null ? DefaultNamespace : N,
@@ -961,19 +968,27 @@ export interface TFunction<
961
968
  ): TFuncReturn<ActualNS, TKeys, TDefaultResult, TKPrefix>;
962
969
 
963
970
  // with options
971
+ // <
972
+ // TKeys extends TFuncKey<UsedNS, TKPrefix> | TemplateStringsArray extends infer A ? A : never,
973
+ // TDefaultResult extends DefaultTFuncReturn = string,
974
+ // TInterpolationMap extends object = StringMap,
975
+ // PassedNS extends Namespace = N extends string ? N : N extends null ? DefaultNamespace : N,
976
+ // PassedOpt extends TOptions<TInterpolationMap> = TOptions<TInterpolationMap>,
977
+ // UsedNS extends Namespace = Pick<PassedOpt, 'ns'> extends { ns: string }
978
+ // ? PassedNS
979
+ // : ActualNS | DefaultNamespace,
980
+ // >(
981
+ // key: TKeys | TKeys[],
982
+ // options: PassedOpt,
983
+ // ): TFuncReturn<UsedNS, TKeys, TDefaultResult, TKPrefix>;
964
984
  <
965
- TKeys extends TFuncKey<UsedNS, TKPrefix> | TemplateStringsArray extends infer A ? A : never,
985
+ TKeys extends TFuncKey<N, TKPrefix> | TemplateStringsArray extends infer A ? A : never,
966
986
  TDefaultResult extends DefaultTFuncReturn = string,
967
987
  TInterpolationMap extends object = StringMap,
968
- PassedNS extends Namespace = N extends string ? N : N extends null ? DefaultNamespace : N,
969
- PassedOpt extends TOptions<TInterpolationMap> = TOptions<TInterpolationMap>,
970
- UsedNS extends Namespace = Pick<PassedOpt, 'ns'> extends { ns: string }
971
- ? PassedNS
972
- : ActualNS | DefaultNamespace,
973
988
  >(
974
989
  key: TKeys | TKeys[],
975
- options: PassedOpt,
976
- ): TFuncReturn<UsedNS, TKeys, TDefaultResult, TKPrefix>;
990
+ options: TOptions<TInterpolationMap>,
991
+ ): TFuncReturn<N, TKeys, TDefaultResult, TKPrefix>;
977
992
 
978
993
  // defaultValue
979
994
  <
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "i18next",
3
- "version": "22.4.2",
3
+ "version": "22.4.4",
4
4
  "description": "i18next internationalization framework",
5
5
  "main": "./dist/cjs/i18next.js",
6
6
  "module": "./dist/esm/i18next.js",