i18next 23.7.16 → 23.7.18

package/dist/esm/package.json

@@ -1 +1 @@
-{"type":"module","version":"23.7.16"}
+{"type":"module","version":"23.7.18"}

package/index.d.ts

@@ -1,5 +1,5 @@
 // Internal Helpers
-import type { $Dictionary } from './typescript/helpers.js';
+import type { $Dictionary, $NormalizeIntoArray } from './typescript/helpers.js';
 import type {
   DefaultNamespace,
   FlatNamespace,
@@ -217,12 +217,22 @@ export interface CloneOptions extends InitOptions {
   forkResourceStore?: boolean;
 }
 
-export interface CustomInstanceExtenstions {}
+export interface CustomInstanceExtensions {}
+
+// Used just here to exclude `DefaultNamespace` which can be both string or array from `FlatNamespace`
+// in TFunction declaration below.
+// Due to this only very special usage I'm not moving this inside helpers.
+type InferArrayValuesElseReturnType<T> = T extends (infer A)[] ? A : T;
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-export interface i18n extends CustomInstanceExtenstions {
+export interface i18n extends CustomInstanceExtensions {
   // Expose parameterized t in the i18next interface hierarchy
-  t: TFunction<[DefaultNamespace, ...Exclude<FlatNamespace, DefaultNamespace>[]]>;
+  t: TFunction<
+    [
+      ...$NormalizeIntoArray<DefaultNamespace>,
+      ...Exclude<FlatNamespace, InferArrayValuesElseReturnType<DefaultNamespace>>[],
+    ]
+  >;
 
   /**
    * The default of the i18next module is an i18next instance ready to be initialized by calling init.

package/index.v4.d.ts

@@ -1,5 +1,5 @@
 // Internal Helpers
-import type { $Dictionary } from './typescript/helpers.js';
+import type { $Dictionary, $NormalizeIntoArray } from './typescript/helpers.js';
 import type {
   DefaultNamespace,
   FlatNamespace,
@@ -217,12 +217,22 @@ export interface CloneOptions extends InitOptions {
   forkResourceStore?: boolean;
 }
 
-export interface CustomInstanceExtenstions {}
+export interface CustomInstanceExtensions {}
+
+// Used just here to exclude `DefaultNamespace` which can be both string or array from `FlatNamespace`
+// in TFunction declaration below.
+// Due to this only very special usage I'm not moving this inside helpers.
+type InferArrayValuesElseReturnType<T> = T extends (infer A)[] ? A : T;
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-export interface i18n extends CustomInstanceExtenstions {
+export interface i18n extends CustomInstanceExtensions {
   // Expose parameterized t in the i18next interface hierarchy
-  t: TFunction<[DefaultNamespace, ...Exclude<FlatNamespace, DefaultNamespace>[]]>;
+  t: TFunction<
+    [
+      ...$NormalizeIntoArray<DefaultNamespace>,
+      ...Exclude<FlatNamespace, InferArrayValuesElseReturnType<DefaultNamespace>>[],
+    ]
+  >;
 
   /**
    * The default of the i18next module is an i18next instance ready to be initialized by calling init.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next",
-  "version": "23.7.16",
+  "version": "23.7.18",
   "description": "i18next internationalization framework",
   "main": "./dist/cjs/i18next.js",
   "module": "./dist/esm/i18next.js",
@@ -101,12 +101,13 @@
     "vitest": "1.1.0"
   },
   "scripts": {
-    "lint": "eslint src typescript \"./*.{ts,mts}\"",
+    "lint": "eslint src typescript test \"./*.{ts,mts}\"",
     "pretest": "npm run generate_ts_v4_index && npm run lint",
-    "test": "vitest --typecheck --workspace vitest.workspace.mts --run",
-    "test:runtime": "vitest --workspace vitest.workspace.mts --project runtime",
-    "test:compatibility": "vitest --workspace vitest.workspace.mts --project compatibility",
-    "test:coverage": "npm run test:runtime -- --coverage --run",
+    "test": "vitest --run",
+    "test:coverage": "vitest --project runtime --project compatibility --coverage --run",
+    "test:runtime": "vitest --project runtime",
+    "test:compatibility": "vitest --project compatibility",
+    "test:local": "vitest --workspace vitest.workspace.local.mts",
     "build": "rimraf dist && rollup -c && echo '{\"type\":\"module\"}' > dist/esm/package.json && cpy \"./dist/umd/*.js\" ./",
     "generate_ts_v4_index": "cp index.d.ts index.v4.d.ts && node -e \"fs.writeFileSync('index.v4.d.ts', fs.readFileSync('index.v4.d.ts').toString().replace(/t.js/g, 't.v4.js').replace(/export type \\* /g, '// export type * '))\"",
     "fix_dist_package": "node -e 'console.log(`{\"type\":\"module\",\"version\":\"${process.env.npm_package_version}\"}`)' > dist/esm/package.json",

package/typescript/helpers.d.ts

@@ -1,5 +1,15 @@
-export type $MergeBy<T, K> = Omit<T, keyof K> & K;
+// Types
+
 export type $Dictionary<T = unknown> = { [key: string]: T };
+
+export type $SpecialObject = object | Array<string | object>;
+
+// Types Operators
+
+export type $MergeBy<T, K> = Omit<T, keyof K> & K;
+
 export type $OmitArrayKeys<Arr> = Arr extends readonly any[] ? Omit<Arr, keyof any[]> : Arr;
+
 export type $PreservedValue<Value, Fallback> = [Value] extends [never] ? Fallback : Value;
-export type $SpecialObject = object | Array<string | object>;
+
+export type $NormalizeIntoArray<T extends unknown | readonly unknown[]> = T extends readonly unknown[] ? T : [T];