@prosopo/cli 3.8.11 → 3.8.12

package/dist/bundle/{i18next-DZyUEvVF.js → i18next-CzgfK_Ir.js}

@@ -12,11 +12,11 @@ var n = {
 		e = n, t = r;
 	});
 	return n.resolve = e, n.reject = t, n;
-}, a = (e) => e == null ? "" : "" + e, o = (e, t, n) => {
+}, a = (e) => e == null ? "" : String(e), o = (e, t, n) => {
 	e.forEach((e) => {
 		t[e] && (n[e] = t[e]);
 	});
-}, s = /###/g, c = (e) => e && e.indexOf("###") > -1 ? e.replace(s, ".") : e, l = (e) => !e || r(e), u = (e, t, n) => {
+}, s = /###/g, c = (e) => e && e.includes("###") ? e.replace(s, ".") : e, l = (e) => !e || r(e), u = (e, t, n) => {
 	let i = r(t) ? t.split(".") : t, a = 0;
 	for (; a < i.length - 1;) {
 		if (l(e)) return {};
@@ -46,7 +46,7 @@ var n = {
 	let r = p(e, n);
 	return r === void 0 ? p(t, n) : r;
 }, h = (e, t, n) => {
-	for (let i in t) i !== "__proto__" && i !== "constructor" && (i in e ? r(e[i]) || e[i] instanceof String || r(t[i]) || t[i] instanceof String ? n && (e[i] = t[i]) : h(e[i], t[i], n) : e[i] = t[i]);
+	for (let i in t) i !== "__proto__" && i !== "constructor" && (Object.prototype.hasOwnProperty.call(e, i) ? r(e[i]) || e[i] instanceof String || r(t[i]) || t[i] instanceof String ? n && (e[i] = t[i]) : h(e[i], t[i], n) : e[i] = t[i]);
 	return e;
 }, g = (e) => e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"), _ = {
 	"&": "&amp;",
@@ -73,7 +73,7 @@ var n = {
 	";"
 ], x = new y(20), S = (e, t, n) => {
 	t ||= "", n ||= "";
-	let r = b.filter((e) => t.indexOf(e) < 0 && n.indexOf(e) < 0);
+	let r = b.filter((e) => !t.includes(e) && !n.includes(e));
 	if (r.length === 0) return !0;
 	let i = x.getRegExp(`(${r.map((e) => e === "?" ? "\\?" : e).join("|")})`), a = !i.test(e);
 	if (!a) {
@@ -81,8 +81,7 @@ var n = {
 		t > 0 && !i.test(e.substring(0, t)) && (a = !0);
 	}
 	return a;
-}, C = function(e, t) {
-	let n = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : ".";
+}, C = (e, t, n = ".") => {
 	if (!e) return;
 	if (e[t]) return Object.prototype.hasOwnProperty.call(e, t) ? e[t] : void 0;
 	let r = t.split(n), i = e;
@@ -94,14 +93,14 @@ var n = {
 				"string",
 				"number",
 				"boolean"
-			].indexOf(typeof t) > -1 && o < r.length - 1) continue;
+			].includes(typeof t) && o < r.length - 1) continue;
 			e += o - e + 1;
 			break;
 		}
 		i = t;
 	}
 	return i;
-}, w = (e) => e?.replace("_", "-"), T = {
+}, w = (e) => e?.replace(/_/g, "-"), T = {
 	type: "logger",
 	log(e) {
 		this.output("log", e);
@@ -116,32 +115,26 @@ var n = {
 		console?.[e]?.apply?.(console, t);
 	}
 }, E = new class e {
-	constructor(e) {
-		let t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+	constructor(e, t = {}) {
 		this.init(e, t);
 	}
-	init(e) {
-		let t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+	init(e, t = {}) {
 		this.prefix = t.prefix || "i18next:", this.logger = e || T, this.options = t, this.debug = t.debug;
 	}
-	log() {
-		var e = [...arguments];
+	log(...e) {
 		return this.forward(e, "log", "", !0);
 	}
-	warn() {
-		var e = [...arguments];
+	warn(...e) {
 		return this.forward(e, "warn", "", !0);
 	}
-	error() {
-		var e = [...arguments];
+	error(...e) {
 		return this.forward(e, "error", "");
 	}
-	deprecate() {
-		var e = [...arguments];
+	deprecate(...e) {
 		return this.forward(e, "warn", "WARNING DEPRECATED: ", !0);
 	}
 	forward(e, t, n, i) {
-		return i && !this.debug ? null : (r(e[0]) && (e[0] = `${n}${this.prefix} ${e[0]}`), this.logger[t](e));
+		return i && !this.debug ? null : (e = e.map((e) => r(e) ? e.replace(/[\r\n\x00-\x1F\x7F]/g, " ") : e), r(e[0]) && (e[0] = `${n}${this.prefix} ${e[0]}`), this.logger[t](e));
 	}
 	create(t) {
 		return new e(this.logger, {
@@ -172,52 +165,53 @@ var n = {
 			this.observers[e].delete(t);
 		}
 	}
-	emit(e) {
-		var t = [...arguments].slice(1);
-		this.observers[e] && Array.from(this.observers[e].entries()).forEach((e) => {
-			let [n, r] = e;
-			for (let e = 0; e < r; e++) n(...t);
-		}), this.observers["*"] && Array.from(this.observers["*"].entries()).forEach((n) => {
-			let [r, i] = n;
-			for (let n = 0; n < i; n++) r.apply(r, [e, ...t]);
+	once(e, t) {
+		let n = (...r) => {
+			t(...r), this.off(e, n);
+		};
+		return this.on(e, n), this;
+	}
+	emit(e, ...t) {
+		this.observers[e] && Array.from(this.observers[e].entries()).forEach(([e, n]) => {
+			for (let r = 0; r < n; r++) e(...t);
+		}), this.observers["*"] && Array.from(this.observers["*"].entries()).forEach(([n, r]) => {
+			for (let i = 0; i < r; i++) n(e, ...t);
 		});
 	}
 }, O = class extends D {
-	constructor(e) {
-		let t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {
-			ns: ["translation"],
-			defaultNS: "translation"
-		};
+	constructor(e, t = {
+		ns: ["translation"],
+		defaultNS: "translation"
+	}) {
 		super(), this.data = e || {}, this.options = t, this.options.keySeparator === void 0 && (this.options.keySeparator = "."), this.options.ignoreJSONStructure === void 0 && (this.options.ignoreJSONStructure = !0);
 	}
 	addNamespaces(e) {
-		this.options.ns.indexOf(e) < 0 && this.options.ns.push(e);
+		this.options.ns.includes(e) || this.options.ns.push(e);
 	}
 	removeNamespaces(e) {
 		let t = this.options.ns.indexOf(e);
 		t > -1 && this.options.ns.splice(t, 1);
 	}
-	getResource(e, t, n) {
-		let i = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {}, a = i.keySeparator === void 0 ? this.options.keySeparator : i.keySeparator, o = i.ignoreJSONStructure === void 0 ? this.options.ignoreJSONStructure : i.ignoreJSONStructure, s;
-		e.indexOf(".") > -1 ? s = e.split(".") : (s = [e, t], n && (Array.isArray(n) ? s.push(...n) : r(n) && a ? s.push(...n.split(a)) : s.push(n)));
+	getResource(e, t, n, i = {}) {
+		let a = i.keySeparator === void 0 ? this.options.keySeparator : i.keySeparator, o = i.ignoreJSONStructure === void 0 ? this.options.ignoreJSONStructure : i.ignoreJSONStructure, s;
+		e.includes(".") ? s = e.split(".") : (s = [e, t], n && (Array.isArray(n) ? s.push(...n) : r(n) && a ? s.push(...n.split(a)) : s.push(n)));
 		let c = p(this.data, s);
-		return !c && !t && !n && e.indexOf(".") > -1 && (e = s[0], t = s[1], n = s.slice(2).join(".")), c || !o || !r(n) ? c : C(this.data?.[e]?.[t], n, a);
+		return !c && !t && !n && e.includes(".") && (e = s[0], t = s[1], n = s.slice(2).join(".")), c || !o || !r(n) ? c : C(this.data?.[e]?.[t], n, a);
 	}
-	addResource(e, t, n, r) {
-		let i = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : { silent: !1 }, a = i.keySeparator === void 0 ? this.options.keySeparator : i.keySeparator, o = [e, t];
-		n && (o = o.concat(a ? n.split(a) : n)), e.indexOf(".") > -1 && (o = e.split("."), r = t, t = o[1]), this.addNamespaces(t), d(this.data, o, r), i.silent || this.emit("added", e, t, n, r);
+	addResource(e, t, n, r, i = { silent: !1 }) {
+		let a = i.keySeparator === void 0 ? this.options.keySeparator : i.keySeparator, o = [e, t];
+		n && (o = o.concat(a ? n.split(a) : n)), e.includes(".") && (o = e.split("."), r = t, t = o[1]), this.addNamespaces(t), d(this.data, o, r), i.silent || this.emit("added", e, t, n, r);
 	}
-	addResources(e, t, n) {
-		let i = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : { silent: !1 };
+	addResources(e, t, n, i = { silent: !1 }) {
 		for (let i in n) (r(n[i]) || Array.isArray(n[i])) && this.addResource(e, t, i, n[i], { silent: !0 });
 		i.silent || this.emit("added", e, t, n);
 	}
-	addResourceBundle(e, t, n, r, i) {
-		let a = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : {
-			silent: !1,
-			skipCopy: !1
-		}, o = [e, t];
-		e.indexOf(".") > -1 && (o = e.split("."), r = n, n = t, t = o[1]), this.addNamespaces(t);
+	addResourceBundle(e, t, n, r, i, a = {
+		silent: !1,
+		skipCopy: !1
+	}) {
+		let o = [e, t];
+		e.includes(".") && (o = e.split("."), r = n, n = t, t = o[1]), this.addNamespaces(t);
 		let s = p(this.data, o) || {};
 		a.skipCopy || (n = JSON.parse(JSON.stringify(n))), r ? h(s, n, i) : s = {
 			...s,
@@ -253,9 +247,21 @@ var n = {
 			t = this.processors[e]?.process(t, n, r, i) ?? t;
 		}), t;
 	}
-}, A = {}, j = (e) => !r(e) && typeof e != "boolean" && typeof e != "number", M = class e extends D {
-	constructor(e) {
-		let t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+}, A = Symbol("i18next/PATH_KEY");
+function j() {
+	let e = [], t = Object.create(null), n;
+	return t.get = (r, i) => (n?.revoke?.(), i === A ? e : (e.push(i), n = Proxy.revocable(r, t), n.proxy)), Proxy.revocable(Object.create(null), t).proxy;
+}
+function M(e, t) {
+	let { [A]: n } = e(j()), r = t?.keySeparator ?? ".", i = t?.nsSeparator ?? ":", a = t?.enableSelector === "strict";
+	if (n.length > 1 && i) {
+		let e = t?.ns, o = a ? Array.isArray(e) ? e : e ? [e] : null : Array.isArray(e) ? e : null;
+		if (o && (a ? o : o.length > 1 ? o.slice(1) : []).includes(n[0])) return `${n[0]}${i}${n.slice(1).join(r)}`;
+	}
+	return n.join(r);
+}
+var N = (e) => !r(e) && typeof e != "boolean" && typeof e != "number", P = class e extends D {
+	constructor(e, t = {}) {
 		super(), o([
 			"resourceStore",
 			"languageUtils",
@@ -264,19 +270,23 @@ var n = {
 			"backendConnector",
 			"i18nFormat",
 			"utils"
-		], e, this), this.options = t, this.options.keySeparator === void 0 && (this.options.keySeparator = "."), this.logger = E.create("translator");
+		], e, this), this.options = t, this.options.keySeparator === void 0 && (this.options.keySeparator = "."), this.logger = E.create("translator"), this.checkedLoadedFor = {};
 	}
 	changeLanguage(e) {
 		e && (this.language = e);
 	}
-	exists(e) {
-		let t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : { interpolation: {} };
-		return e != null && this.resolve(e, t)?.res !== void 0;
+	exists(e, t = { interpolation: {} }) {
+		let n = { ...t };
+		if (e == null) return !1;
+		let r = this.resolve(e, n);
+		if (r?.res === void 0) return !1;
+		let i = N(r.res);
+		return !(n.returnObjects === !1 && i);
 	}
 	extractFromKey(e, t) {
 		let n = t.nsSeparator === void 0 ? this.options.nsSeparator : t.nsSeparator;
 		n === void 0 && (n = ":");
-		let i = t.keySeparator === void 0 ? this.options.keySeparator : t.keySeparator, a = t.ns || this.options.defaultNS || [], o = n && e.indexOf(n) > -1, s = !this.options.userDefinedKeySeparator && !t.keySeparator && !this.options.userDefinedNsSeparator && !t.nsSeparator && !S(e, n, i);
+		let i = t.keySeparator === void 0 ? this.options.keySeparator : t.keySeparator, a = t.ns || this.options.defaultNS || [], o = n && e.includes(n), s = !this.options.userDefinedKeySeparator && !t.keySeparator && !this.options.userDefinedNsSeparator && !t.nsSeparator && !S(e, n, i);
 		if (o && !s) {
 			let t = e.match(this.interpolator.nestingRegexp);
 			if (t && t.length > 0) return {
@@ -284,7 +294,7 @@ var n = {
 				namespaces: r(a) ? [a] : a
 			};
 			let o = e.split(n);
-			(n !== i || n === i && this.options.ns.indexOf(o[0]) > -1) && (a = o.shift()), e = o.join(i);
+			(n !== i || n === i && this.options.ns.includes(o[0])) && (a = o.shift()), e = o.join(i);
 		}
 		return {
 			key: e,
@@ -292,96 +302,98 @@ var n = {
 		};
 	}
 	translate(t, n, i) {
-		if (typeof n != "object" && this.options.overloadTranslationOptionHandler && (n = this.options.overloadTranslationOptionHandler(arguments)), typeof n == "object" && (n = { ...n }), n ||= {}, t == null) return "";
-		Array.isArray(t) || (t = [String(t)]);
-		let a = n.returnDetails === void 0 ? this.options.returnDetails : n.returnDetails, o = n.keySeparator === void 0 ? this.options.keySeparator : n.keySeparator, { key: s, namespaces: c } = this.extractFromKey(t[t.length - 1], n), l = c[c.length - 1], u = n.lng || this.language, d = n.appendNamespaceToCIMode || this.options.appendNamespaceToCIMode;
-		if (u?.toLowerCase() === "cimode") {
-			if (d) {
-				let e = n.nsSeparator || this.options.nsSeparator;
-				return a ? {
-					res: `${l}${e}${s}`,
-					usedKey: s,
-					exactUsedKey: s,
-					usedLng: u,
-					usedNS: l,
-					usedParams: this.getUsedParamsDetails(n)
-				} : `${l}${e}${s}`;
-			}
-			return a ? {
-				res: s,
-				usedKey: s,
-				exactUsedKey: s,
-				usedLng: u,
-				usedNS: l,
-				usedParams: this.getUsedParamsDetails(n)
-			} : s;
-		}
-		let f = this.resolve(t, n), p = f?.res, m = f?.usedKey || s, h = f?.exactUsedKey || s, g = [
+		let a = typeof n == "object" ? { ...n } : n;
+		if (typeof a != "object" && this.options.overloadTranslationOptionHandler && (a = this.options.overloadTranslationOptionHandler(arguments)), typeof a == "object" && (a = { ...a }), a ||= {}, t == null) return "";
+		typeof t == "function" && (t = M(t, {
+			...this.options,
+			...a
+		})), Array.isArray(t) || (t = [String(t)]), t = t.map((e) => typeof e == "function" ? M(e, {
+			...this.options,
+			...a
+		}) : String(e));
+		let o = a.returnDetails === void 0 ? this.options.returnDetails : a.returnDetails, s = a.keySeparator === void 0 ? this.options.keySeparator : a.keySeparator, { key: c, namespaces: l } = this.extractFromKey(t[t.length - 1], a), u = l[l.length - 1], d = a.nsSeparator === void 0 ? this.options.nsSeparator : a.nsSeparator;
+		d === void 0 && (d = ":");
+		let f = a.lng || this.language, p = a.appendNamespaceToCIMode || this.options.appendNamespaceToCIMode;
+		if (f?.toLowerCase() === "cimode") return p ? o ? {
+			res: `${u}${d}${c}`,
+			usedKey: c,
+			exactUsedKey: c,
+			usedLng: f,
+			usedNS: u,
+			usedParams: this.getUsedParamsDetails(a)
+		} : `${u}${d}${c}` : o ? {
+			res: c,
+			usedKey: c,
+			exactUsedKey: c,
+			usedLng: f,
+			usedNS: u,
+			usedParams: this.getUsedParamsDetails(a)
+		} : c;
+		let m = this.resolve(t, a), h = m?.res, g = m?.usedKey || c, _ = m?.exactUsedKey || c, v = [
 			"[object Number]",
 			"[object Function]",
 			"[object RegExp]"
-		], _ = n.joinArrays === void 0 ? this.options.joinArrays : n.joinArrays, v = !this.i18nFormat || this.i18nFormat.handleAsObject, y = n.count !== void 0 && !r(n.count), b = e.hasDefaultValue(n), x = y ? this.pluralResolver.getSuffix(u, n.count, n) : "", S = n.ordinal && y ? this.pluralResolver.getSuffix(u, n.count, { ordinal: !1 }) : "", C = y && !n.ordinal && n.count === 0, w = C && n[`defaultValue${this.options.pluralSeparator}zero`] || n[`defaultValue${x}`] || n[`defaultValue${S}`] || n.defaultValue, T = p;
-		v && !p && b && (T = w);
-		let E = j(T), D = Object.prototype.toString.apply(T);
-		if (v && T && E && g.indexOf(D) < 0 && !(r(_) && Array.isArray(T))) {
-			if (!n.returnObjects && !this.options.returnObjects) {
+		], y = a.joinArrays === void 0 ? this.options.joinArrays : a.joinArrays, b = !this.i18nFormat || this.i18nFormat.handleAsObject, x = a.count !== void 0 && !r(a.count), S = e.hasDefaultValue(a), C = x ? this.pluralResolver.getSuffix(f, a.count, a) : "", w = a.ordinal && x ? this.pluralResolver.getSuffix(f, a.count, { ordinal: !1 }) : "", T = x && !a.ordinal && a.count === 0, E = T && a[`defaultValue${this.options.pluralSeparator}zero`] || a[`defaultValue${C}`] || a[`defaultValue${w}`] || a.defaultValue, D = h;
+		b && !h && S && (D = E);
+		let O = N(D), k = Object.prototype.toString.apply(D);
+		if (b && D && O && !v.includes(k) && !(r(y) && Array.isArray(D))) {
+			if (!a.returnObjects && !this.options.returnObjects) {
 				this.options.returnedObjectHandler || this.logger.warn("accessing an object - but returnObjects options is not enabled!");
-				let e = this.options.returnedObjectHandler ? this.options.returnedObjectHandler(m, T, {
-					...n,
-					ns: c
-				}) : `key '${s} (${this.language})' returned an object instead of string.`;
-				return a ? (f.res = e, f.usedParams = this.getUsedParamsDetails(n), f) : e;
+				let e = this.options.returnedObjectHandler ? this.options.returnedObjectHandler(g, D, {
+					...a,
+					ns: l
+				}) : `key '${c} (${this.language})' returned an object instead of string.`;
+				return o ? (m.res = e, m.usedParams = this.getUsedParamsDetails(a), m) : e;
 			}
-			if (o) {
-				let e = Array.isArray(T), t = e ? [] : {}, r = e ? h : m;
-				for (let e in T) if (Object.prototype.hasOwnProperty.call(T, e)) {
-					let i = `${r}${o}${e}`;
-					b && !p ? t[e] = this.translate(i, {
-						...n,
-						defaultValue: j(w) ? w[e] : void 0,
+			if (s) {
+				let e = Array.isArray(D), t = e ? [] : {}, n = e ? _ : g;
+				for (let e in D) if (Object.prototype.hasOwnProperty.call(D, e)) {
+					let r = `${n}${s}${e}`;
+					S && !h ? t[e] = this.translate(r, {
+						...a,
+						defaultValue: N(E) ? E[e] : void 0,
 						joinArrays: !1,
-						ns: c
-					}) : t[e] = this.translate(i, {
-						...n,
+						ns: l
+					}) : t[e] = this.translate(r, {
+						...a,
 						joinArrays: !1,
-						ns: c
-					}), t[e] === i && (t[e] = T[e]);
+						ns: l
+					}), t[e] === r && (t[e] = D[e]);
 				}
-				p = t;
+				h = t;
 			}
-		} else if (v && r(_) && Array.isArray(p)) p = p.join(_), p &&= this.extendTranslation(p, t, n, i);
+		} else if (b && r(y) && Array.isArray(h)) h = h.join(y), h &&= this.extendTranslation(h, t, a, i);
 		else {
-			let e = !1, r = !1;
-			!this.isValidLookup(p) && b && (e = !0, p = w), this.isValidLookup(p) || (r = !0, p = s);
-			let a = (n.missingKeyNoValueFallbackToKey || this.options.missingKeyNoValueFallbackToKey) && r ? void 0 : p, c = b && w !== p && this.options.updateMissing;
-			if (r || e || c) {
-				if (this.logger.log(c ? "updateKey" : "missingKey", u, l, s, c ? w : p), o) {
-					let e = this.resolve(s, {
-						...n,
+			let e = !1, n = !1;
+			!this.isValidLookup(h) && S && (e = !0, h = E), this.isValidLookup(h) || (n = !0, h = c);
+			let r = (a.missingKeyNoValueFallbackToKey || this.options.missingKeyNoValueFallbackToKey) && n ? void 0 : h, o = S && E !== h && this.options.updateMissing;
+			if (n || e || o) {
+				if (this.logger.log(o ? "updateKey" : "missingKey", f, u, x && !o ? `${c}${this.pluralResolver.getSuffix(f, a.count, a)}` : c, o ? E : h), s) {
+					let e = this.resolve(c, {
+						...a,
 						keySeparator: !1
 					});
 					e && e.res && this.logger.warn("Seems the loaded translations were in flat JSON format instead of nested. Either set keySeparator: false on init or make sure your translations are published in nested format.");
 				}
-				let e = [], t = this.languageUtils.getFallbackCodes(this.options.fallbackLng, n.lng || this.language);
+				let e = [], t = this.languageUtils.getFallbackCodes(this.options.fallbackLng, a.lng || this.language);
 				if (this.options.saveMissingTo === "fallback" && t && t[0]) for (let n = 0; n < t.length; n++) e.push(t[n]);
-				else this.options.saveMissingTo === "all" ? e = this.languageUtils.toResolveHierarchy(n.lng || this.language) : e.push(n.lng || this.language);
-				let r = (e, t, r) => {
-					let i = b && r !== p ? r : a;
-					this.options.missingKeyHandler ? this.options.missingKeyHandler(e, l, t, i, c, n) : this.backendConnector?.saveMissing && this.backendConnector.saveMissing(e, l, t, i, c, n), this.emit("missingKey", e, l, t, p);
+				else this.options.saveMissingTo === "all" ? e = this.languageUtils.toResolveHierarchy(a.lng || this.language) : e.push(a.lng || this.language);
+				let n = (e, t, n) => {
+					let i = S && n !== h ? n : r;
+					this.options.missingKeyHandler ? this.options.missingKeyHandler(e, u, t, i, o, a) : this.backendConnector?.saveMissing && this.backendConnector.saveMissing(e, u, t, i, o, a), this.emit("missingKey", e, u, t, h);
 				};
-				this.options.saveMissing && (this.options.saveMissingPlurals && y ? e.forEach((e) => {
-					let t = this.pluralResolver.getSuffixes(e, n);
-					C && n[`defaultValue${this.options.pluralSeparator}zero`] && t.indexOf(`${this.options.pluralSeparator}zero`) < 0 && t.push(`${this.options.pluralSeparator}zero`), t.forEach((t) => {
-						r([e], s + t, n[`defaultValue${t}`] || w);
+				this.options.saveMissing && (this.options.saveMissingPlurals && x ? e.forEach((e) => {
+					let t = this.pluralResolver.getSuffixes(e, a);
+					T && a[`defaultValue${this.options.pluralSeparator}zero`] && !t.includes(`${this.options.pluralSeparator}zero`) && t.push(`${this.options.pluralSeparator}zero`), t.forEach((t) => {
+						n([e], c + t, a[`defaultValue${t}`] || E);
 					});
-				}) : r(e, s, w));
+				}) : n(e, c, E));
 			}
-			p = this.extendTranslation(p, t, n, f, i), r && p === s && this.options.appendNamespaceToMissingKey && (p = `${l}:${s}`), (r || e) && this.options.parseMissingKeyHandler && (p = this.options.parseMissingKeyHandler(this.options.appendNamespaceToMissingKey ? `${l}:${s}` : s, e ? p : void 0));
+			h = this.extendTranslation(h, t, a, m, i), n && h === c && this.options.appendNamespaceToMissingKey && (h = `${u}${d}${c}`), (n || e) && this.options.parseMissingKeyHandler && (h = this.options.parseMissingKeyHandler(this.options.appendNamespaceToMissingKey ? `${u}${d}${c}` : c, e ? h : void 0, a));
 		}
-		return a ? (f.res = p, f.usedParams = this.getUsedParamsDetails(n), f) : p;
+		return o ? (m.res = h, m.usedParams = this.getUsedParamsDetails(a), m) : h;
 	}
 	extendTranslation(e, t, n, i, a) {
-		var o = this;
 		if (this.i18nFormat?.parse) e = this.i18nFormat.parse(e, {
 			...this.options.interpolation.defaultVariables,
 			...n
@@ -394,26 +406,23 @@ var n = {
 					...n.interpolation
 				}
 			});
-			let s = r(e) && (n?.interpolation?.skipOnVariables === void 0 ? this.options.interpolation.skipOnVariables : n.interpolation.skipOnVariables), c;
-			if (s) {
+			let o = r(e) && (n?.interpolation?.skipOnVariables === void 0 ? this.options.interpolation.skipOnVariables : n.interpolation.skipOnVariables), s;
+			if (o) {
 				let t = e.match(this.interpolator.nestingRegexp);
-				c = t && t.length;
+				s = t && t.length;
 			}
-			let l = n.replace && !r(n.replace) ? n.replace : n;
-			if (this.options.interpolation.defaultVariables && (l = {
+			let c = n.replace && !r(n.replace) ? n.replace : n;
+			if (this.options.interpolation.defaultVariables && (c = {
 				...this.options.interpolation.defaultVariables,
-				...l
-			}), e = this.interpolator.interpolate(e, l, n.lng || this.language || i.usedLng, n), s) {
+				...c
+			}), e = this.interpolator.interpolate(e, c, n.lng || this.language || i.usedLng, n), o) {
 				let t = e.match(this.interpolator.nestingRegexp), r = t && t.length;
-				c < r && (n.nest = !1);
+				s < r && (n.nest = !1);
 			}
-			!n.lng && i && i.res && (n.lng = this.language || i.usedLng), n.nest !== !1 && (e = this.interpolator.nest(e, function() {
-				var e = [...arguments];
-				return a?.[0] === e[0] && !n.context ? (o.logger.warn(`It seems you are nesting recursively key: ${e[0]} in key: ${t[0]}`), null) : o.translate(...e, t);
-			}, n)), n.interpolation && this.interpolator.reset();
+			!n.lng && i && i.res && (n.lng = this.language || i.usedLng), n.nest !== !1 && (e = this.interpolator.nest(e, (...e) => a?.[0] === e[0] && !n.context ? (this.logger.warn(`It seems you are nesting recursively key: ${e[0]} in key: ${t[0]}`), null) : this.translate(...e, t), n)), n.interpolation && this.interpolator.reset();
 		}
-		let s = n.postProcess || this.options.postProcess, c = r(s) ? [s] : s;
-		return e != null && c?.length && n.applyPostProcessor !== !1 && (e = k.handle(c, e, t, this.options && this.options.postProcessPassResolved ? {
+		let o = n.postProcess || this.options.postProcess, s = r(o) ? [o] : o;
+		return e != null && s?.length && n.applyPostProcessor !== !1 && (e = k.handle(s, e, t, this.options && this.options.postProcessPassResolved ? {
 			i18nResolved: {
 				...i,
 				usedParams: this.getUsedParamsDetails(n)
@@ -421,9 +430,12 @@ var n = {
 			...n
 		} : n, this)), e;
 	}
-	resolve(e) {
-		let t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, n, i, a, o, s;
-		return r(e) && (e = [e]), e.forEach((e) => {
+	resolve(e, t = {}) {
+		let n, i, a, o, s;
+		return r(e) && (e = [e]), Array.isArray(e) && (e = e.map((e) => typeof e == "function" ? M(e, {
+			...this.options,
+			...t
+		}) : e)), e.forEach((e) => {
 			if (this.isValidLookup(n)) return;
 			let c = this.extractFromKey(e, t), l = c.key;
 			i = l;
@@ -431,7 +443,7 @@ var n = {
 			this.options.fallbackNS && (u = u.concat(this.options.fallbackNS));
 			let d = t.count !== void 0 && !r(t.count), f = d && !t.ordinal && t.count === 0, p = t.context !== void 0 && (r(t.context) || typeof t.context == "number") && t.context !== "", m = t.lngs ? t.lngs : this.languageUtils.toResolveHierarchy(t.lng || this.language, t.fallbackLng);
 			u.forEach((e) => {
-				this.isValidLookup(n) || (s = e, !A[`${m[0]}-${e}`] && this.utils?.hasLoadedNamespace && !this.utils?.hasLoadedNamespace(s) && (A[`${m[0]}-${e}`] = !0, this.logger.warn(`key "${i}" for languages "${m.join(", ")}" won't get resolved as namespace "${s}" was not yet loaded`, "This means something IS WRONG in your setup. You access the t function before i18next.init / i18next.loadNamespace / i18next.changeLanguage was done. Wait for the callback or Promise to resolve before accessing it!!!")), m.forEach((r) => {
+				this.isValidLookup(n) || (s = e, !this.checkedLoadedFor[`${m[0]}-${e}`] && this.utils?.hasLoadedNamespace && !this.utils?.hasLoadedNamespace(s) && (this.checkedLoadedFor[`${m[0]}-${e}`] = !0, this.logger.warn(`key "${i}" for languages "${m.join(", ")}" won't get resolved as namespace "${s}" was not yet loaded`, "This means something IS WRONG in your setup. You access the t function before i18next.init / i18next.loadNamespace / i18next.changeLanguage was done. Wait for the callback or Promise to resolve before accessing it!!!")), m.forEach((r) => {
 					if (this.isValidLookup(n)) return;
 					o = r;
 					let i = [l];
@@ -440,9 +452,9 @@ var n = {
 						let e;
 						d && (e = this.pluralResolver.getSuffix(r, t.count, t));
 						let n = `${this.options.pluralSeparator}zero`, a = `${this.options.pluralSeparator}ordinal${this.options.pluralSeparator}`;
-						if (d && (i.push(l + e), t.ordinal && e.indexOf(a) === 0 && i.push(l + e.replace(a, this.options.pluralSeparator)), f && i.push(l + n)), p) {
-							let r = `${l}${this.options.contextSeparator}${t.context}`;
-							i.push(r), d && (i.push(r + e), t.ordinal && e.indexOf(a) === 0 && i.push(r + e.replace(a, this.options.pluralSeparator)), f && i.push(r + n));
+						if (d && (t.ordinal && e.startsWith(a) && i.push(l + e.replace(a, this.options.pluralSeparator)), i.push(l + e), f && i.push(l + n)), p) {
+							let r = `${l}${this.options.contextSeparator || "_"}${t.context}`;
+							i.push(r), d && (t.ordinal && e.startsWith(a) && i.push(r + e.replace(a, this.options.pluralSeparator)), i.push(r + e), f && i.push(r + n));
 						}
 					}
 					let s;
@@ -460,12 +472,11 @@ var n = {
 	isValidLookup(e) {
 		return e !== void 0 && !(!this.options.returnNull && e === null) && !(!this.options.returnEmptyString && e === "");
 	}
-	getResource(e, t, n) {
-		let r = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {};
+	getResource(e, t, n, r = {}) {
 		return this.i18nFormat?.getResource ? this.i18nFormat.getResource(e, t, n, r) : this.resourceStore.getResource(e, t, n, r);
 	}
-	getUsedParamsDetails() {
-		let e = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, t = [
+	getUsedParamsDetails(e = {}) {
+		let t = [
 			"defaultValue",
 			"ordinal",
 			"context",
@@ -482,7 +493,10 @@ var n = {
 			"postProcess",
 			"interpolation"
 		], n = e.replace && !r(e.replace), i = n ? e.replace : e;
-		if (n && e.count !== void 0 && (i.count = e.count), this.options.interpolation.defaultVariables && (i = {
+		if (n && e.count !== void 0 && (i = {
+			...i,
+			count: e.count
+		}), this.options.interpolation.defaultVariables && (i = {
 			...this.options.interpolation.defaultVariables,
 			...i
 		}), !n) {
@@ -492,25 +506,28 @@ var n = {
 		return i;
 	}
 	static hasDefaultValue(e) {
-		for (let t in e) if (Object.prototype.hasOwnProperty.call(e, t) && t.substring(0, 12) === "defaultValue" && e[t] !== void 0) return !0;
+		for (let t in e) if (Object.prototype.hasOwnProperty.call(e, t) && t.startsWith("defaultValue") && e[t] !== void 0) return !0;
 		return !1;
 	}
-}, N = class {
+}, F = class {
 	constructor(e) {
-		this.options = e, this.supportedLngs = this.options.supportedLngs || !1, this.logger = E.create("languageUtils");
+		this.options = e, this.supportedLngs = this.options.supportedLngs || !1, this.logger = E.create("languageUtils"), this.resolveHierarchyCache = {};
+	}
+	clearCache() {
+		this.resolveHierarchyCache = {};
 	}
 	getScriptPartFromCode(e) {
-		if (e = w(e), !e || e.indexOf("-") < 0) return null;
+		if (e = w(e), !e || !e.includes("-")) return null;
 		let t = e.split("-");
 		return t.length === 2 || (t.pop(), t[t.length - 1].toLowerCase() === "x") ? null : this.formatLanguageCode(t.join("-"));
 	}
 	getLanguagePartFromCode(e) {
-		if (e = w(e), !e || e.indexOf("-") < 0) return e;
+		if (e = w(e), !e || !e.includes("-")) return e;
 		let t = e.split("-");
 		return this.formatLanguageCode(t[0]);
 	}
 	formatLanguageCode(e) {
-		if (r(e) && e.indexOf("-") > -1) {
+		if (r(e) && e.includes("-")) {
 			let t;
 			try {
 				t = Intl.getCanonicalLocales(e)[0];
@@ -520,7 +537,7 @@ var n = {
 		return this.options.cleanCode || this.options.lowerCaseLng ? e.toLowerCase() : e;
 	}
 	isSupportedCode(e) {
-		return (this.options.load === "languageOnly" || this.options.nonExplicitSupportedLngs) && (e = this.getLanguagePartFromCode(e)), !this.supportedLngs || !this.supportedLngs.length || this.supportedLngs.indexOf(e) > -1;
+		return (this.options.load === "languageOnly" || this.options.nonExplicitSupportedLngs) && (e = this.getLanguagePartFromCode(e)), !this.supportedLngs || !this.supportedLngs.length || this.supportedLngs.includes(e);
 	}
 	getBestMatchFromCodes(e) {
 		if (!e) return null;
@@ -531,11 +548,11 @@ var n = {
 			(!this.options.supportedLngs || this.isSupportedCode(n)) && (t = n);
 		}), !t && this.options.supportedLngs && e.forEach((e) => {
 			if (t) return;
-			let n = this.getLanguagePartFromCode(e);
+			let n = this.getScriptPartFromCode(e);
 			if (this.isSupportedCode(n)) return t = n;
-			t = this.options.supportedLngs.find((e) => {
-				if (e === n || !(e.indexOf("-") < 0 && n.indexOf("-") < 0) && (e.indexOf("-") > 0 && n.indexOf("-") < 0 && e.substring(0, e.indexOf("-")) === n || e.indexOf(n) === 0 && n.length > 1)) return e;
-			});
+			let r = this.getLanguagePartFromCode(e);
+			if (this.isSupportedCode(r)) return t = r;
+			t = this.options.supportedLngs.find((e) => e === r ? !0 : !e.includes("-") && !r.includes("-") ? !1 : !!(e.includes("-") && !r.includes("-") && e.slice(0, e.indexOf("-")) === r || e.startsWith(r) && r.length > 1));
 		}), t ||= this.getFallbackCodes(this.options.fallbackLng)[0], t;
 	}
 	getFallbackCodes(e, t) {
@@ -546,36 +563,43 @@ var n = {
 		return n ||= e[this.getScriptPartFromCode(t)], n ||= e[this.formatLanguageCode(t)], n ||= e[this.getLanguagePartFromCode(t)], n ||= e.default, n || [];
 	}
 	toResolveHierarchy(e, t) {
-		let n = this.getFallbackCodes(t || this.options.fallbackLng || [], e), i = [], a = (e) => {
-			e && (this.isSupportedCode(e) ? i.push(e) : this.logger.warn(`rejecting language code not found in supportedLngs: ${e}`));
+		let n = this.options.fallbackLng, i = Array.isArray(n) ? n.join("|") : n;
+		i !== this._cachedFallbackLng && (this.resolveHierarchyCache = {}, this._cachedFallbackLng = i);
+		let a = t === void 0 || t === !1 || r(t), o = t === void 0 && typeof this.options.fallbackLng == "function", s = r(e) && a && !o, c = null;
+		if (s) {
+			let n;
+			n = t === void 0 ? "undefined" : t === !1 ? "boolean:false" : `string:${t}`, c = `${e.length}:${e}|${n}`;
+		}
+		if (c !== null) {
+			let e = this.resolveHierarchyCache[c];
+			if (e !== void 0) return e.slice();
+		}
+		let l = this.getFallbackCodes((t === !1 ? [] : t) || this.options.fallbackLng || [], e), u = [], d = (e) => {
+			e && (this.isSupportedCode(e) ? u.push(e) : this.logger.warn(`rejecting language code not found in supportedLngs: ${e}`));
 		};
-		return r(e) && (e.indexOf("-") > -1 || e.indexOf("_") > -1) ? (this.options.load !== "languageOnly" && a(this.formatLanguageCode(e)), this.options.load !== "languageOnly" && this.options.load !== "currentOnly" && a(this.getScriptPartFromCode(e)), this.options.load !== "currentOnly" && a(this.getLanguagePartFromCode(e))) : r(e) && a(this.formatLanguageCode(e)), n.forEach((e) => {
-			i.indexOf(e) < 0 && a(this.formatLanguageCode(e));
-		}), i;
+		return r(e) && (e.includes("-") || e.includes("_")) ? (this.options.load !== "languageOnly" && d(this.formatLanguageCode(e)), this.options.load !== "languageOnly" && this.options.load !== "currentOnly" && d(this.getScriptPartFromCode(e)), this.options.load !== "currentOnly" && d(this.getLanguagePartFromCode(e))) : r(e) && d(this.formatLanguageCode(e)), l.forEach((e) => {
+			u.includes(e) || d(this.formatLanguageCode(e));
+		}), c === null ? u : (this.resolveHierarchyCache[c] = u, u.slice());
 	}
-}, P = {
+}, I = {
 	zero: 0,
 	one: 1,
 	two: 2,
 	few: 3,
 	many: 4,
 	other: 5
-}, F = {
+}, L = {
 	select: (e) => e === 1 ? "one" : "other",
 	resolvedOptions: () => ({ pluralCategories: ["one", "other"] })
-}, I = class {
-	constructor(e) {
-		let t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+}, R = class {
+	constructor(e, t = {}) {
 		this.languageUtils = e, this.options = t, this.logger = E.create("pluralResolver"), this.pluralRulesCache = {};
 	}
-	addRule(e, t) {
-		this.rules[e] = t;
-	}
 	clearCache() {
 		this.pluralRulesCache = {};
 	}
-	getRule(e) {
-		let t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, n = w(e === "dev" ? "en" : e), r = t.ordinal ? "ordinal" : "cardinal", i = JSON.stringify({
+	getRule(e, t = {}) {
+		let n = w(e === "dev" ? "en" : e), r = t.ordinal ? "ordinal" : "cardinal", i = JSON.stringify({
 			cleanedCode: n,
 			type: r
 		});
@@ -584,54 +608,51 @@ var n = {
 		try {
 			a = new Intl.PluralRules(n, { type: r });
 		} catch {
-			if (!Intl) return this.logger.error("No Intl support, please use an Intl polyfill!"), F;
-			if (!e.match(/-|_/)) return F;
+			if (typeof Intl > "u") return this.logger.error("No Intl support, please use an Intl polyfill!"), L;
+			if (!e.match(/-|_/)) return L;
 			let n = this.languageUtils.getLanguagePartFromCode(e);
 			a = this.getRule(n, t);
 		}
 		return this.pluralRulesCache[i] = a, a;
 	}
-	needsPlural(e) {
-		let t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, n = this.getRule(e, t);
+	needsPlural(e, t = {}) {
+		let n = this.getRule(e, t);
 		return n ||= this.getRule("dev", t), n?.resolvedOptions().pluralCategories.length > 1;
 	}
-	getPluralFormsOfKey(e, t) {
-		let n = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
+	getPluralFormsOfKey(e, t, n = {}) {
 		return this.getSuffixes(e, n).map((e) => `${t}${e}`);
 	}
-	getSuffixes(e) {
-		let t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, n = this.getRule(e, t);
-		return n ||= this.getRule("dev", t), n ? n.resolvedOptions().pluralCategories.sort((e, t) => P[e] - P[t]).map((e) => `${this.options.prepend}${t.ordinal ? `ordinal${this.options.prepend}` : ""}${e}`) : [];
+	getSuffixes(e, t = {}) {
+		let n = this.getRule(e, t);
+		return n ||= this.getRule("dev", t), n ? n.resolvedOptions().pluralCategories.sort((e, t) => I[e] - I[t]).map((e) => `${this.options.prepend}${t.ordinal ? `ordinal${this.options.prepend}` : ""}${e}`) : [];
 	}
-	getSuffix(e, t) {
-		let n = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {}, r = this.getRule(e, n);
+	getSuffix(e, t, n = {}) {
+		let r = this.getRule(e, n);
 		return r ? `${this.options.prepend}${n.ordinal ? `ordinal${this.options.prepend}` : ""}${r.select(t)}` : (this.logger.warn(`no plural rule found for: ${e}`), this.getSuffix("dev", t, n));
 	}
-}, L = function(e, t, n) {
-	let i = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : ".", a = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : !0, o = m(e, t, n);
+}, z = (e, t, n, i = ".", a = !0) => {
+	let o = m(e, t, n);
 	return !o && a && r(n) && (o = C(e, n, i), o === void 0 && (o = C(t, n, i))), o;
-}, R = (e) => e.replace(/\$/g, "$$$$"), z = class {
-	constructor() {
-		let e = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+}, B = (e) => e.replace(/\$/g, "$$$$"), V = class {
+	constructor(e = {}) {
 		this.logger = E.create("interpolator"), this.options = e, this.format = e?.interpolation?.format || ((e) => e), this.init(e);
 	}
-	init() {
-		let e = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+	init(e = {}) {
 		e.interpolation ||= { escapeValue: !0 };
 		let { escape: t, escapeValue: n, useRawValueToEscape: r, prefix: i, prefixEscaped: a, suffix: o, suffixEscaped: s, formatSeparator: c, unescapeSuffix: l, unescapePrefix: u, nestingPrefix: d, nestingPrefixEscaped: f, nestingSuffix: p, nestingSuffixEscaped: m, nestingOptionsSeparator: h, maxReplaces: _, alwaysFormat: y } = e.interpolation;
-		this.escape = t === void 0 ? v : t, this.escapeValue = n === void 0 || n, this.useRawValueToEscape = r !== void 0 && r, this.prefix = i ? g(i) : a || "{{", this.suffix = o ? g(o) : s || "}}", this.formatSeparator = c || ",", this.unescapePrefix = l ? "" : u || "-", this.unescapeSuffix = this.unescapePrefix ? "" : l || "", this.nestingPrefix = d ? g(d) : f || g("$t("), this.nestingSuffix = p ? g(p) : m || g(")"), this.nestingOptionsSeparator = h || ",", this.maxReplaces = _ || 1e3, this.alwaysFormat = y !== void 0 && y, this.resetRegExp();
+		this.escape = t === void 0 ? v : t, this.escapeValue = n === void 0 || n, this.useRawValueToEscape = r !== void 0 && r, this.prefix = i ? g(i) : a || "{{", this.suffix = o ? g(o) : s || "}}", this.formatSeparator = c || ",", this.unescapePrefix = l ? "" : u ? g(u) : "-", this.unescapeSuffix = this.unescapePrefix ? "" : l ? g(l) : "", this.nestingPrefix = d ? g(d) : f || g("$t("), this.nestingSuffix = p ? g(p) : m || g(")"), this.nestingOptionsSeparator = h || ",", this.maxReplaces = _ || 1e3, this.alwaysFormat = y !== void 0 && y, this.resetRegExp();
 	}
 	reset() {
 		this.options && this.init(this.options);
 	}
 	resetRegExp() {
 		let e = (e, t) => e?.source === t ? (e.lastIndex = 0, e) : new RegExp(t, "g");
-		this.regexp = e(this.regexp, `${this.prefix}(.+?)${this.suffix}`), this.regexpUnescape = e(this.regexpUnescape, `${this.prefix}${this.unescapePrefix}(.+?)${this.unescapeSuffix}${this.suffix}`), this.nestingRegexp = e(this.nestingRegexp, `${this.nestingPrefix}(.+?)${this.nestingSuffix}`);
+		this.regexp = e(this.regexp, `${this.prefix}(.+?)${this.suffix}`), this.regexpUnescape = e(this.regexpUnescape, `${this.prefix}${this.unescapePrefix}(.+?)${this.unescapeSuffix}${this.suffix}`), this.nestingRegexp = e(this.nestingRegexp, `${this.nestingPrefix}((?:[^()"']+|"[^"]*"|'[^']*'|\\((?:[^()]|"[^"]*"|'[^']*')*\\))*?)${this.nestingSuffix}`);
 	}
 	interpolate(e, t, n, i) {
 		let o, s, c, l = this.options && this.options.interpolation && this.options.interpolation.defaultVariables || {}, u = (e) => {
-			if (e.indexOf(this.formatSeparator) < 0) {
-				let r = L(t, l, e, this.options.keySeparator, this.options.ignoreJSONStructure);
+			if (!e.includes(this.formatSeparator)) {
+				let r = z(t, l, e, this.options.keySeparator, this.options.ignoreJSONStructure);
 				return this.alwaysFormat ? this.format(r, void 0, n, {
 					...i,
 					...t,
@@ -639,20 +660,20 @@ var n = {
 				}) : r;
 			}
 			let r = e.split(this.formatSeparator), a = r.shift().trim(), o = r.join(this.formatSeparator).trim();
-			return this.format(L(t, l, a, this.options.keySeparator, this.options.ignoreJSONStructure), o, n, {
+			return this.format(z(t, l, a, this.options.keySeparator, this.options.ignoreJSONStructure), o, n, {
 				...i,
 				...t,
 				interpolationkey: a
 			});
 		};
-		this.resetRegExp();
+		this.resetRegExp(), !this.escapeValue && typeof e == "string" && /\$t\([^)]*\{[^}]*\{\{/.test(e) && this.logger.warn("nesting options string contains interpolated variables with escapeValue: false — if any of those values are attacker-controlled they can inject additional nesting options (e.g. redirect lng/ns). Sanitise untrusted input before passing it to t(), or keep escapeValue: true.");
 		let d = i?.missingInterpolationHandler || this.options.missingInterpolationHandler, f = i?.interpolation?.skipOnVariables === void 0 ? this.options.interpolation.skipOnVariables : i.interpolation.skipOnVariables;
 		return [{
 			regex: this.regexpUnescape,
-			safeValue: (e) => R(e)
+			safeValue: (e) => e
 		}, {
 			regex: this.regexp,
-			safeValue: (e) => this.escapeValue ? R(this.escape(e)) : R(e)
+			safeValue: (e) => this.escapeValue ? this.escape(e) : e
 		}].forEach((t) => {
 			for (c = 0; o = t.regex.exec(e);) {
 				let n = o[1].trim();
@@ -666,18 +687,18 @@ var n = {
 				} else this.logger.warn(`missed to pass in variable ${n} for interpolating ${e}`), s = "";
 				else !r(s) && !this.useRawValueToEscape && (s = a(s));
 				let l = t.safeValue(s);
-				if (e = e.replace(o[0], l), f ? (t.regex.lastIndex += s.length, t.regex.lastIndex -= o[0].length) : t.regex.lastIndex = 0, c++, c >= this.maxReplaces) break;
+				if (e = e.replace(o[0], B(l)), f ? (t.regex.lastIndex += l.length, t.regex.lastIndex -= o[0].length) : t.regex.lastIndex = 0, c++, c >= this.maxReplaces) break;
 			}
 		}), e;
 	}
-	nest(e, t) {
-		let n = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {}, i, o, s, c = (e, t) => {
+	nest(e, t, n = {}) {
+		let i, o, s, c = (e, t) => {
 			let n = this.nestingOptionsSeparator;
-			if (e.indexOf(n) < 0) return e;
-			let r = e.split(RegExp(`${n}[ ]*{`)), i = `{${r[1]}`;
+			if (!e.includes(n)) return e;
+			let r = e.split(RegExp(`${g(n)}[ ]*{`)), i = `{${r[1]}`;
 			e = r[0], i = this.interpolate(i, s);
 			let a = i.match(/'/g), o = i.match(/"/g);
-			((a?.length ?? 0) % 2 == 0 && !o || o.length % 2 != 0) && (i = i.replace(/'/g, "\""));
+			((a?.length ?? 0) % 2 == 0 && !o || (o?.length ?? 0) % 2 != 0) && (i = i.replace(/'/g, "\""));
 			try {
 				s = JSON.parse(i), t && (s = {
 					...t,
@@ -686,31 +707,27 @@ var n = {
 			} catch (t) {
 				return this.logger.warn(`failed parsing options string in nesting for key ${e}`, t), `${e}${n}${i}`;
 			}
-			return s.defaultValue && s.defaultValue.indexOf(this.prefix) > -1 && delete s.defaultValue, e;
+			return s.defaultValue && s.defaultValue.includes(this.prefix) && delete s.defaultValue, e;
 		};
 		for (; i = this.nestingRegexp.exec(e);) {
 			let l = [];
 			s = { ...n }, s = s.replace && !r(s.replace) ? s.replace : s, s.applyPostProcessor = !1, delete s.defaultValue;
-			let u = !1;
-			if (i[0].indexOf(this.formatSeparator) !== -1 && !/{.*}/.test(i[1])) {
-				let e = i[1].split(this.formatSeparator).map((e) => e.trim());
-				i[1] = e.shift(), l = e, u = !0;
-			}
-			if (o = t(c.call(this, i[1].trim(), s), s), o && i[0] === e && !r(o)) return o;
-			r(o) || (o = a(o)), o ||= (this.logger.warn(`missed to resolve ${i[1]} for nesting ${e}`), ""), u && (o = l.reduce((e, t) => this.format(e, t, n.lng, {
+			let u = /{.*}/s.test(i[1]) ? i[1].lastIndexOf("}") + 1 : i[1].indexOf(this.formatSeparator);
+			if (u !== -1 && (l = i[1].slice(u).split(this.formatSeparator).map((e) => e.trim()).filter(Boolean), i[1] = i[1].slice(0, u)), o = t(c.call(this, i[1].trim(), s), s), o && i[0] === e && !r(o)) return o;
+			r(o) || (o = a(o)), o ||= (this.logger.warn(`missed to resolve ${i[1]} for nesting ${e}`), ""), l.length && (o = l.reduce((e, t) => this.format(e, t, n.lng, {
 				...n,
 				interpolationkey: i[1].trim()
-			}), o.trim())), e = e.replace(i[0], o), this.regexp.lastIndex = 0;
+			}), o.trim())), e = e.replace(i[0], B(a(o))), this.regexp.lastIndex = 0;
 		}
 		return e;
 	}
-}, B = (e) => {
+}, H = (e) => {
 	let t = e.toLowerCase().trim(), n = {};
-	if (e.indexOf("(") > -1) {
+	if (e.includes("(")) {
 		let r = e.split("(");
 		t = r[0].toLowerCase().trim();
-		let i = r[1].substring(0, r[1].length - 1);
-		t === "currency" && i.indexOf(":") < 0 ? n.currency ||= i.trim() : t === "relativetime" && i.indexOf(":") < 0 ? n.range ||= i.trim() : i.split(";").forEach((e) => {
+		let i = r[1].slice(0, -1);
+		t === "currency" && !i.includes(":") ? n.currency ||= i.trim() : t === "relativetime" && !i.includes(":") ? n.range ||= i.trim() : i.split(";").forEach((e) => {
 			if (e) {
 				let [t, ...r] = e.split(":"), i = r.join(":").trim().replace(/^'+|'+$/g, ""), a = t.trim();
 				n[a] || (n[a] = i), i === "false" && (n[a] = !1), i === "true" && (n[a] = !0), isNaN(i) || (n[a] = parseInt(i, 10));
@@ -721,7 +738,7 @@ var n = {
 		formatName: t,
 		formatOptions: n
 	};
-}, V = (e) => {
+}, U = (e) => {
 	let t = {};
 	return (n, r, i) => {
 		let a = i;
@@ -732,53 +749,55 @@ var n = {
 		let o = r + JSON.stringify(a), s = t[o];
 		return s || (s = e(w(r), i), t[o] = s), s(n);
 	};
-}, H = class {
-	constructor() {
-		let e = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-		this.logger = E.create("formatter"), this.options = e, this.formats = {
-			number: V((e, t) => {
+}, W = (e) => (t, n, r) => e(w(n), r)(t), G = class {
+	constructor(e = {}) {
+		this.logger = E.create("formatter"), this.options = e, this.init(e);
+	}
+	init(e, t = { interpolation: {} }) {
+		this.formatSeparator = t.interpolation.formatSeparator || ",";
+		let n = t.cacheInBuiltFormats ? U : W;
+		this.formats = {
+			number: n((e, t) => {
 				let n = new Intl.NumberFormat(e, { ...t });
 				return (e) => n.format(e);
 			}),
-			currency: V((e, t) => {
+			currency: n((e, t) => {
 				let n = new Intl.NumberFormat(e, {
 					...t,
 					style: "currency"
 				});
 				return (e) => n.format(e);
 			}),
-			datetime: V((e, t) => {
+			datetime: n((e, t) => {
 				let n = new Intl.DateTimeFormat(e, { ...t });
 				return (e) => n.format(e);
 			}),
-			relativetime: V((e, t) => {
+			relativetime: n((e, t) => {
 				let n = new Intl.RelativeTimeFormat(e, { ...t });
 				return (e) => n.format(e, t.range || "day");
 			}),
-			list: V((e, t) => {
+			list: n((e, t) => {
 				let n = new Intl.ListFormat(e, { ...t });
 				return (e) => n.format(e);
 			})
-		}, this.init(e);
-	}
-	init(e) {
-		let t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : { interpolation: {} };
-		this.formatSeparator = t.interpolation.formatSeparator || ",";
+		};
 	}
 	add(e, t) {
 		this.formats[e.toLowerCase().trim()] = t;
 	}
 	addCached(e, t) {
-		this.formats[e.toLowerCase().trim()] = V(t);
-	}
-	format(e, t, n) {
-		let r = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {}, i = t.split(this.formatSeparator);
-		if (i.length > 1 && i[0].indexOf("(") > 1 && i[0].indexOf(")") < 0 && i.find((e) => e.indexOf(")") > -1)) {
-			let e = i.findIndex((e) => e.indexOf(")") > -1);
-			i[0] = [i[0], ...i.splice(1, e)].join(this.formatSeparator);
+		this.formats[e.toLowerCase().trim()] = U(t);
+	}
+	format(e, t, n, r = {}) {
+		if (!t || e == null) return e;
+		let i = t.split(this.formatSeparator), a = [];
+		for (let e = 0; e < i.length; e++) {
+			let t = i[e];
+			for (; t.indexOf("(") > -1 && !t.includes(")") && e + 1 < i.length;) t = `${t}${this.formatSeparator}${i[++e]}`;
+			a.push(t);
 		}
-		return i.reduce((e, t) => {
-			let { formatName: i, formatOptions: a } = B(t);
+		return a.reduce((e, t) => {
+			let { formatName: i, formatOptions: a } = H(t);
 			if (this.formats[i]) {
 				let t = e;
 				try {
@@ -796,11 +815,10 @@ var n = {
 			return e;
 		}, e);
 	}
-}, U = (e, t) => {
+}, K = (e, t) => {
 	e.pending[t] !== void 0 && (delete e.pending[t], e.pendingCount--);
-}, W = class extends D {
-	constructor(e, t, n) {
-		let r = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {};
+}, q = class extends D {
+	constructor(e, t, n, r = {}) {
 		super(), this.backend = e, this.store = t, this.services = n, this.languageUtils = n.languageUtils, this.options = r, this.logger = E.create("backendConnector"), this.waitingReads = [], this.maxParallelReads = r.maxParallelReads || 10, this.readingCalls = 0, this.maxRetries = r.maxRetries >= 0 ? r.maxRetries : 5, this.retryTimeout = r.retryTimeout >= 1 ? r.retryTimeout : 350, this.state = {}, this.queue = [], this.backend?.init?.(n, r.backend, r);
 	}
 	queueLoad(e, t, n, r) {
@@ -829,7 +847,7 @@ var n = {
 		t && this.emit("failedLoading", i, a, t), !t && n && this.store.addResourceBundle(i, a, n, void 0, void 0, { skipCopy: !0 }), this.state[e] = t ? -1 : 2, t && n && (this.state[e] = 0);
 		let o = {};
 		this.queue.forEach((n) => {
-			f(n.loaded, [i], a), U(n, e), t && n.errors.push(t), n.pendingCount === 0 && !n.done && (Object.keys(n.loaded).forEach((e) => {
+			f(n.loaded, [i], a), K(n, e), t && n.errors.push(t), n.pendingCount === 0 && !n.done && (Object.keys(n.loaded).forEach((e) => {
 				o[e] || (o[e] = {});
 				let t = n.loaded[e];
 				t.length && t.forEach((t) => {
@@ -838,8 +856,7 @@ var n = {
 			}), n.done = !0, n.errors.length ? n.callback(n.errors) : n.callback());
 		}), this.emit("loaded", o), this.queue = this.queue.filter((e) => !e.done);
 	}
-	read(e, t, n) {
-		let r = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : 0, i = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : this.retryTimeout, a = arguments.length > 5 ? arguments[5] : void 0;
+	read(e, t, n, r = 0, i = this.retryTimeout, a) {
 		if (!e.length) return a(null, {});
 		if (this.readingCalls >= this.maxParallelReads) {
 			this.waitingReads.push({
@@ -860,7 +877,7 @@ var n = {
 			}
 			if (o && s && r < this.maxRetries) {
 				setTimeout(() => {
-					this.read.call(this, e, t, n, r + 1, i * 2, a);
+					this.read(e, t, n, r + 1, i * 2, a);
 				}, i);
 				return;
 			}
@@ -877,8 +894,7 @@ var n = {
 		}
 		return s(e, t, o);
 	}
-	prepareLoading(e, t) {
-		let n = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {}, i = arguments.length > 3 ? arguments[3] : void 0;
+	prepareLoading(e, t, n = {}, i) {
 		if (!this.backend) return this.logger.warn("No backend was added via i18next.use. Will not load resources."), i && i();
 		r(e) && (e = this.languageUtils.toResolveHierarchy(e)), r(t) && (t = [t]);
 		let a = this.queueLoad(e, t, n, i);
@@ -893,14 +909,13 @@ var n = {
 	reload(e, t, n) {
 		this.prepareLoading(e, t, { reload: !0 }, n);
 	}
-	loadOne(e) {
-		let t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "", n = e.split("|"), r = n[0], i = n[1];
+	loadOne(e, t = "") {
+		let n = e.split("|"), r = n[0], i = n[1];
 		this.read(r, i, "read", void 0, void 0, (n, a) => {
 			n && this.logger.warn(`${t}loading namespace ${i} for language ${r} failed`, n), !n && a && this.logger.log(`${t}loaded namespace ${i} for language ${r}`, a), this.loaded(e, n, a);
 		});
 	}
-	saveMissing(e, t, n, r, i) {
-		let a = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : {}, o = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : () => {};
+	saveMissing(e, t, n, r, i, a = {}, o = () => {}) {
 		if (this.services?.utils?.hasLoadedNamespace && !this.services?.utils?.hasLoadedNamespace(t)) {
 			this.logger.warn(`did not save key "${n}" as the namespace "${t}" was not yet loaded`, "This means something IS WRONG in your setup. You access the t function before i18next.init / i18next.loadNamespace / i18next.changeLanguage was done. Wait for the callback or Promise to resolve before accessing it!!!");
 			return;
@@ -922,7 +937,7 @@ var n = {
 			!e || !e[0] || this.store.addResource(e[0], t, n, r);
 		}
 	}
-}, G = () => ({
+}, J = () => ({
 	debug: !1,
 	initAsync: !0,
 	ns: ["translation"],
@@ -933,11 +948,11 @@ var n = {
 	nonExplicitSupportedLngs: !1,
 	load: "all",
 	preload: !1,
-	simplifyPluralSuffix: !0,
 	keySeparator: ".",
 	nsSeparator: ":",
 	pluralSeparator: "_",
 	contextSeparator: "_",
+	enableSelector: !1,
 	partialBundledLanguages: !1,
 	saveMissing: !1,
 	updateMissing: !1,
@@ -967,7 +982,6 @@ var n = {
 	},
 	interpolation: {
 		escapeValue: !0,
-		format: (e) => e,
 		prefix: "{{",
 		suffix: "}}",
 		formatSeparator: ",",
@@ -977,56 +991,49 @@ var n = {
 		nestingOptionsSeparator: ",",
 		maxReplaces: 1e3,
 		skipOnVariables: !0
-	}
-}), K = (e) => (r(e.ns) && (e.ns = [e.ns]), r(e.fallbackLng) && (e.fallbackLng = [e.fallbackLng]), r(e.fallbackNS) && (e.fallbackNS = [e.fallbackNS]), e.supportedLngs?.indexOf?.("cimode") < 0 && (e.supportedLngs = e.supportedLngs.concat(["cimode"])), typeof e.initImmediate == "boolean" && (e.initAsync = e.initImmediate), e), q = () => {}, J = (e) => {
+	},
+	cacheInBuiltFormats: !0
+}), Y = (e) => (r(e.ns) && (e.ns = [e.ns]), r(e.fallbackLng) && (e.fallbackLng = [e.fallbackLng]), r(e.fallbackNS) && (e.fallbackNS = [e.fallbackNS]), e.supportedLngs && !e.supportedLngs.includes("cimode") && (e.supportedLngs = e.supportedLngs.concat(["cimode"])), e), X = () => {}, Z = (e) => {
 	Object.getOwnPropertyNames(Object.getPrototypeOf(e)).forEach((t) => {
 		typeof e[t] == "function" && (e[t] = e[t].bind(e));
 	});
-}, Y = class e extends D {
-	constructor() {
-		let e = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, t = arguments.length > 1 ? arguments[1] : void 0;
-		if (super(), this.options = K(e), this.services = {}, this.logger = E, this.modules = { external: [] }, J(this), t && !this.isInitialized && !e.isClone) {
+}, Q = class e extends D {
+	constructor(e = {}, t) {
+		if (super(), this.options = Y(e), this.services = {}, this.logger = E, this.modules = { external: [] }, Z(this), t && !this.isInitialized && !e.isClone) {
 			if (!this.options.initAsync) return this.init(e, t), this;
 			setTimeout(() => {
 				this.init(e, t);
 			}, 0);
 		}
 	}
-	init() {
-		var e = this;
-		let t = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, n = arguments.length > 1 ? arguments[1] : void 0;
-		this.isInitializing = !0, typeof t == "function" && (n = t, t = {}), t.defaultNS == null && t.ns && (r(t.ns) ? t.defaultNS = t.ns : t.ns.indexOf("translation") < 0 && (t.defaultNS = t.ns[0]));
-		let a = G();
+	init(e = {}, t) {
+		this.isInitializing = !0, typeof e == "function" && (t = e, e = {}), e.defaultNS == null && e.ns && (r(e.ns) ? e.defaultNS = e.ns : e.ns.includes("translation") || (e.defaultNS = e.ns[0]));
+		let n = J();
 		this.options = {
-			...a,
+			...n,
 			...this.options,
-			...K(t)
+			...Y(e)
 		}, this.options.interpolation = {
-			...a.interpolation,
+			...n.interpolation,
 			...this.options.interpolation
-		}, t.keySeparator !== void 0 && (this.options.userDefinedKeySeparator = t.keySeparator), t.nsSeparator !== void 0 && (this.options.userDefinedNsSeparator = t.nsSeparator);
-		let o = (e) => e ? typeof e == "function" ? new e() : e : null;
+		}, e.keySeparator !== void 0 && (this.options.userDefinedKeySeparator = e.keySeparator), e.nsSeparator !== void 0 && (this.options.userDefinedNsSeparator = e.nsSeparator), typeof this.options.overloadTranslationOptionHandler != "function" && (this.options.overloadTranslationOptionHandler = n.overloadTranslationOptionHandler);
+		let a = (e) => e ? typeof e == "function" ? new e() : e : null;
 		if (!this.options.isClone) {
-			this.modules.logger ? E.init(o(this.modules.logger), this.options) : E.init(null, this.options);
-			let t;
-			t = this.modules.formatter ? this.modules.formatter : H;
-			let n = new N(this.options);
+			this.modules.logger ? E.init(a(this.modules.logger), this.options) : E.init(null, this.options);
+			let e;
+			e = this.modules.formatter ? this.modules.formatter : G;
+			let t = new F(this.options);
 			this.store = new O(this.options.resources, this.options);
-			let r = this.services;
-			r.logger = E, r.resourceStore = this.store, r.languageUtils = n, r.pluralResolver = new I(n, {
-				prepend: this.options.pluralSeparator,
-				simplifyPluralSuffix: this.options.simplifyPluralSuffix
-			}), t && (!this.options.interpolation.format || this.options.interpolation.format === a.interpolation.format) && (r.formatter = o(t), r.formatter.init(r, this.options), this.options.interpolation.format = r.formatter.format.bind(r.formatter)), r.interpolator = new z(this.options), r.utils = { hasLoadedNamespace: this.hasLoadedNamespace.bind(this) }, r.backendConnector = new W(o(this.modules.backend), r.resourceStore, r, this.options), r.backendConnector.on("*", function(t) {
-				var n = [...arguments].slice(1);
-				e.emit(t, ...n);
-			}), this.modules.languageDetector && (r.languageDetector = o(this.modules.languageDetector), r.languageDetector.init && r.languageDetector.init(r, this.options.detection, this.options)), this.modules.i18nFormat && (r.i18nFormat = o(this.modules.i18nFormat), r.i18nFormat.init && r.i18nFormat.init(this)), this.translator = new M(this.services, this.options), this.translator.on("*", function(t) {
-				var n = [...arguments].slice(1);
-				e.emit(t, ...n);
+			let n = this.services;
+			n.logger = E, n.resourceStore = this.store, n.languageUtils = t, n.pluralResolver = new R(t, { prepend: this.options.pluralSeparator }), e && (n.formatter = a(e), n.formatter.init && n.formatter.init(n, this.options), this.options.interpolation.format = n.formatter.format.bind(n.formatter)), n.interpolator = new V(this.options), n.utils = { hasLoadedNamespace: this.hasLoadedNamespace.bind(this) }, n.backendConnector = new q(a(this.modules.backend), n.resourceStore, n, this.options), n.backendConnector.on("*", (e, ...t) => {
+				this.emit(e, ...t);
+			}), this.modules.languageDetector && (n.languageDetector = a(this.modules.languageDetector), n.languageDetector.init && n.languageDetector.init(n, this.options.detection, this.options)), this.modules.i18nFormat && (n.i18nFormat = a(this.modules.i18nFormat), n.i18nFormat.init && n.i18nFormat.init(this)), this.translator = new P(this.services, this.options), this.translator.on("*", (e, ...t) => {
+				this.emit(e, ...t);
 			}), this.modules.external.forEach((e) => {
 				e.init && e.init(this);
 			});
 		}
-		if (this.format = this.options.interpolation.format, n ||= q, this.options.fallbackLng && !this.services.languageDetector && !this.options.lng) {
+		if (this.format = this.options.interpolation.format, t ||= X, this.options.fallbackLng && !this.services.languageDetector && !this.options.lng) {
 			let e = this.services.languageUtils.getFallbackCodes(this.options.fallbackLng);
 			e.length > 0 && e[0] !== "dev" && (this.options.lng = e[0]);
 		}
@@ -1035,46 +1042,42 @@ var n = {
 			"hasResourceBundle",
 			"getResourceBundle",
 			"getDataByLanguage"
-		].forEach((t) => {
-			this[t] = function() {
-				return e.store[t](...arguments);
-			};
+		].forEach((e) => {
+			this[e] = (...t) => this.store[e](...t);
 		}), [
 			"addResource",
 			"addResources",
 			"addResourceBundle",
 			"removeResourceBundle"
-		].forEach((t) => {
-			this[t] = function() {
-				return e.store[t](...arguments), e;
-			};
+		].forEach((e) => {
+			this[e] = (...t) => (this.store[e](...t), this);
 		});
-		let s = i(), c = () => {
-			let e = (e, t) => {
-				this.isInitializing = !1, this.isInitialized && !this.initializedStoreOnce && this.logger.warn("init: i18next is already initialized. You should call init just once!"), this.isInitialized = !0, this.options.isClone || this.logger.log("initialized", this.options), this.emit("initialized", this.options), s.resolve(t), n(e, t);
+		let o = i(), s = () => {
+			let e = (e, n) => {
+				this.isInitializing = !1, this.isInitialized && !this.initializedStoreOnce && this.logger.warn("init: i18next is already initialized. You should call init just once!"), this.isInitialized = !0, this.options.isClone || this.logger.log("initialized", this.options), this.emit("initialized", this.options), o.resolve(n), t(e, n);
 			};
-			if (this.languages && !this.isInitialized) return e(null, this.t.bind(this));
+			if ((this.languages || this.isLanguageChangingTo) && !this.isInitialized) return e(null, this.t.bind(this));
 			this.changeLanguage(this.options.lng, e);
 		};
-		return this.options.resources || !this.options.initAsync ? c() : setTimeout(c, 0), s;
+		return this.options.resources || !this.options.initAsync ? s() : setTimeout(s, 0), o;
 	}
-	loadResources(e) {
-		let t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : q, n = r(e) ? e : this.language;
-		if (typeof e == "function" && (t = e), !this.options.resources || this.options.partialBundledLanguages) {
-			if (n?.toLowerCase() === "cimode" && (!this.options.preload || this.options.preload.length === 0)) return t();
-			let e = [], r = (t) => {
+	loadResources(e, t = X) {
+		let n = t, i = r(e) ? e : this.language;
+		if (typeof e == "function" && (n = e), !this.options.resources || this.options.partialBundledLanguages) {
+			if (i?.toLowerCase() === "cimode" && (!this.options.preload || this.options.preload.length === 0)) return n();
+			let e = [], t = (t) => {
 				t && t !== "cimode" && this.services.languageUtils.toResolveHierarchy(t).forEach((t) => {
-					t !== "cimode" && e.indexOf(t) < 0 && e.push(t);
+					t !== "cimode" && (e.includes(t) || e.push(t));
 				});
 			};
-			n ? r(n) : this.services.languageUtils.getFallbackCodes(this.options.fallbackLng).forEach((e) => r(e)), this.options.preload?.forEach?.((e) => r(e)), this.services.backendConnector.load(e, this.options.ns, (e) => {
-				!e && !this.resolvedLanguage && this.language && this.setResolvedLanguage(this.language), t(e);
+			i ? t(i) : this.services.languageUtils.getFallbackCodes(this.options.fallbackLng).forEach((e) => t(e)), this.options.preload?.forEach?.((e) => t(e)), this.services.backendConnector.load(e, this.options.ns, (e) => {
+				!e && !this.resolvedLanguage && this.language && this.setResolvedLanguage(this.language), n(e);
 			});
-		} else t(null);
+		} else n(null);
 	}
 	reloadResources(e, t, n) {
 		let r = i();
-		return typeof e == "function" && (n = e, e = void 0), typeof t == "function" && (n = t, t = void 0), e ||= this.languages, t ||= this.options.ns, n ||= q, this.services.backendConnector.reload(e, t, (e) => {
+		return typeof e == "function" && (n = e, e = void 0), typeof t == "function" && (n = t, t = void 0), e ||= this.languages, t ||= this.options.ns, n ||= X, this.services.backendConnector.reload(e, t, (e) => {
 			r.resolve(), n(e);
 		}), r;
 	}
@@ -1084,63 +1087,60 @@ var n = {
 		return e.type === "backend" && (this.modules.backend = e), (e.type === "logger" || e.log && e.warn && e.error) && (this.modules.logger = e), e.type === "languageDetector" && (this.modules.languageDetector = e), e.type === "i18nFormat" && (this.modules.i18nFormat = e), e.type === "postProcessor" && k.addPostProcessor(e), e.type === "formatter" && (this.modules.formatter = e), e.type === "3rdParty" && this.modules.external.push(e), this;
 	}
 	setResolvedLanguage(e) {
-		if (!(!e || !this.languages) && !(["cimode", "dev"].indexOf(e) > -1)) for (let e = 0; e < this.languages.length; e++) {
-			let t = this.languages[e];
-			if (!(["cimode", "dev"].indexOf(t) > -1) && this.store.hasLanguageSomeTranslations(t)) {
-				this.resolvedLanguage = t;
-				break;
+		if (!(!e || !this.languages) && !["cimode", "dev"].includes(e)) {
+			for (let e = 0; e < this.languages.length; e++) {
+				let t = this.languages[e];
+				if (!["cimode", "dev"].includes(t) && this.store.hasLanguageSomeTranslations(t)) {
+					this.resolvedLanguage = t;
+					break;
+				}
 			}
+			!this.resolvedLanguage && !this.languages.includes(e) && this.store.hasLanguageSomeTranslations(e) && (this.resolvedLanguage = e, this.languages.unshift(e));
 		}
 	}
 	changeLanguage(e, t) {
-		var n = this;
 		this.isLanguageChangingTo = e;
-		let a = i();
+		let n = i();
 		this.emit("languageChanging", e);
-		let o = (e) => {
+		let a = (e) => {
 			this.language = e, this.languages = this.services.languageUtils.toResolveHierarchy(e), this.resolvedLanguage = void 0, this.setResolvedLanguage(e);
-		}, s = (e, r) => {
-			r ? (o(r), this.translator.changeLanguage(r), this.isLanguageChangingTo = void 0, this.emit("languageChanged", r), this.logger.log("languageChanged", r)) : this.isLanguageChangingTo = void 0, a.resolve(function() {
-				return n.t(...arguments);
-			}), t && t(e, function() {
-				return n.t(...arguments);
-			});
-		}, c = (t) => {
+		}, o = (r, i) => {
+			i ? this.isLanguageChangingTo === e && (a(i), this.translator.changeLanguage(i), this.isLanguageChangingTo = void 0, this.emit("languageChanged", i), this.logger.log("languageChanged", i)) : this.isLanguageChangingTo = void 0, n.resolve((...e) => this.t(...e)), t && t(r, (...e) => this.t(...e));
+		}, s = (t) => {
 			!e && !t && this.services.languageDetector && (t = []);
-			let n = r(t) ? t : this.services.languageUtils.getBestMatchFromCodes(t);
-			n && (this.language || o(n), this.translator.language || this.translator.changeLanguage(n), this.services.languageDetector?.cacheUserLanguage?.(n)), this.loadResources(n, (e) => {
-				s(e, n);
+			let n = r(t) ? t : t && t[0], i = this.store.hasLanguageSomeTranslations(n) ? n : this.services.languageUtils.getBestMatchFromCodes(r(t) ? [t] : t);
+			i && (this.language || a(i), this.translator.language || this.translator.changeLanguage(i), this.services.languageDetector?.cacheUserLanguage?.(i)), this.loadResources(i, (e) => {
+				o(e, i);
 			});
 		};
-		return !e && this.services.languageDetector && !this.services.languageDetector.async ? c(this.services.languageDetector.detect()) : !e && this.services.languageDetector && this.services.languageDetector.async ? this.services.languageDetector.detect.length === 0 ? this.services.languageDetector.detect().then(c) : this.services.languageDetector.detect(c) : c(e), a;
-	}
-	getFixedT(e, t, n) {
-		var i = this;
-		let a = function(e, t) {
-			let r;
-			if (typeof t != "object") {
-				var o = [...arguments].slice(2);
-				r = i.options.overloadTranslationOptionHandler([e, t].concat(o));
-			} else r = { ...t };
-			r.lng = r.lng || a.lng, r.lngs = r.lngs || a.lngs, r.ns = r.ns || a.ns, r.keyPrefix !== "" && (r.keyPrefix = r.keyPrefix || n || a.keyPrefix);
-			let s = i.options.keySeparator || ".", c;
-			return c = r.keyPrefix && Array.isArray(e) ? e.map((e) => `${r.keyPrefix}${s}${e}`) : r.keyPrefix ? `${r.keyPrefix}${s}${e}` : e, i.t(c, r);
+		return !e && this.services.languageDetector && !this.services.languageDetector.async ? s(this.services.languageDetector.detect()) : !e && this.services.languageDetector && this.services.languageDetector.async ? this.services.languageDetector.detect.length === 0 ? this.services.languageDetector.detect().then(s) : this.services.languageDetector.detect(s) : s(e), n;
+	}
+	getFixedT(e, t, n, i) {
+		let a = i?.scopeNs, o = (e, t, ...r) => {
+			let i;
+			i = typeof t == "object" ? { ...t } : this.options.overloadTranslationOptionHandler([e, t].concat(r)), i.lng = i.lng || o.lng, i.lngs = i.lngs || o.lngs;
+			let s = i.ns !== void 0 && i.ns !== null;
+			i.ns = i.ns || o.ns, i.keyPrefix !== "" && (i.keyPrefix = i.keyPrefix || n || o.keyPrefix);
+			let c = {
+				...this.options,
+				...i
+			};
+			Array.isArray(a) && !s && (c.ns = a), typeof i.keyPrefix == "function" && (i.keyPrefix = M(i.keyPrefix, c));
+			let l = this.options.keySeparator || ".", u;
+			return i.keyPrefix && Array.isArray(e) ? u = e.map((e) => (typeof e == "function" && (e = M(e, c)), `${i.keyPrefix}${l}${e}`)) : (typeof e == "function" && (e = M(e, c)), u = i.keyPrefix ? `${i.keyPrefix}${l}${e}` : e), this.t(u, i);
 		};
-		return r(e) ? a.lng = e : a.lngs = e, a.ns = t, a.keyPrefix = n, a;
+		return r(e) ? o.lng = e : o.lngs = e, o.ns = t, o.keyPrefix = n, o;
 	}
-	t() {
-		var e = [...arguments];
+	t(...e) {
 		return this.translator?.translate(...e);
 	}
-	exists() {
-		var e = [...arguments];
+	exists(...e) {
 		return this.translator?.exists(...e);
 	}
 	setDefaultNamespace(e) {
 		this.options.defaultNS = e;
 	}
-	hasLoadedNamespace(e) {
-		let t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+	hasLoadedNamespace(e, t = {}) {
 		if (!this.isInitialized) return this.logger.warn("hasLoadedNamespace: i18next was not initialized", this.languages), !1;
 		if (!this.languages || !this.languages.length) return this.logger.warn("hasLoadedNamespace: i18n.languages were undefined or empty", this.languages), !1;
 		let n = t.lng || this.resolvedLanguage || this.languages[0], r = this.options ? this.options.fallbackLng : !1, i = this.languages[this.languages.length - 1];
@@ -1158,7 +1158,7 @@ var n = {
 	loadNamespaces(e, t) {
 		let n = i();
 		return this.options.ns ? (r(e) && (e = [e]), e.forEach((e) => {
-			this.options.ns.indexOf(e) < 0 && this.options.ns.push(e);
+			this.options.ns.includes(e) || this.options.ns.push(e);
 		}), this.loadResources((e) => {
 			n.resolve(), t && t(e);
 		}), n) : (t && t(), Promise.resolve());
@@ -1166,36 +1166,53 @@ var n = {
 	loadLanguages(e, t) {
 		let n = i();
 		r(e) && (e = [e]);
-		let a = this.options.preload || [], o = e.filter((e) => a.indexOf(e) < 0 && this.services.languageUtils.isSupportedCode(e));
+		let a = this.options.preload || [], o = e.filter((e) => !a.includes(e) && this.services.languageUtils.isSupportedCode(e));
 		return o.length ? (this.options.preload = a.concat(o), this.loadResources((e) => {
 			n.resolve(), t && t(e);
 		}), n) : (t && t(), Promise.resolve());
 	}
 	dir(e) {
 		if (e ||= this.resolvedLanguage || (this.languages?.length > 0 ? this.languages[0] : this.language), !e) return "rtl";
-		let t = /* @__PURE__ */ "ar.shu.sqr.ssh.xaa.yhd.yud.aao.abh.abv.acm.acq.acw.acx.acy.adf.ads.aeb.aec.afb.ajp.apc.apd.arb.arq.ars.ary.arz.auz.avl.ayh.ayl.ayn.ayp.bbz.pga.he.iw.ps.pbt.pbu.pst.prp.prd.ug.ur.ydd.yds.yih.ji.yi.hbo.men.xmn.fa.jpr.peo.pes.prs.dv.sam.ckb".split("."), n = this.services?.languageUtils || new N(G());
-		return t.indexOf(n.getLanguagePartFromCode(e)) > -1 || e.toLowerCase().indexOf("-arab") > 1 ? "rtl" : "ltr";
+		try {
+			let t = new Intl.Locale(e);
+			if (t && t.getTextInfo) {
+				let e = t.getTextInfo();
+				if (e && e.direction) return e.direction;
+			}
+		} catch {}
+		let t = /* @__PURE__ */ "ar.shu.sqr.ssh.xaa.yhd.yud.aao.abh.abv.acm.acq.acw.acx.acy.adf.ads.aeb.aec.afb.ajp.apc.apd.arb.arq.ars.ary.arz.auz.avl.ayh.ayl.ayn.ayp.bbz.pga.he.iw.ps.pbt.pbu.pst.prp.prd.ug.ur.ydd.yds.yih.ji.yi.hbo.men.xmn.fa.jpr.peo.pes.prs.dv.sam.ckb".split("."), n = this.services?.languageUtils || new F(J());
+		return e.toLowerCase().indexOf("-latn") > 1 ? "ltr" : t.includes(n.getLanguagePartFromCode(e)) || e.toLowerCase().indexOf("-arab") > 1 ? "rtl" : "ltr";
 	}
-	static createInstance() {
-		let t = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, n = arguments.length > 1 ? arguments[1] : void 0;
-		return new e(t, n);
+	static createInstance(t = {}, n) {
+		let r = new e(t, n);
+		return r.createInstance = e.createInstance, r;
 	}
-	cloneInstance() {
-		let t = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, n = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : q, r = t.forkResourceStore;
+	cloneInstance(t = {}, n = X) {
+		let r = t.forkResourceStore;
 		r && delete t.forkResourceStore;
 		let i = {
 			...this.options,
 			...t,
 			isClone: !0
 		}, a = new e(i);
-		return (t.debug !== void 0 || t.prefix !== void 0) && (a.logger = a.logger.clone(t)), [
+		if ((t.debug !== void 0 || t.prefix !== void 0) && (a.logger = a.logger.clone(t)), [
 			"store",
 			"services",
 			"language"
 		].forEach((e) => {
 			a[e] = this[e];
-		}), a.services = { ...this.services }, a.services.utils = { hasLoadedNamespace: a.hasLoadedNamespace.bind(a) }, r && (a.store = new O(Object.keys(this.store.data).reduce((e, t) => (e[t] = { ...this.store.data[t] }, Object.keys(e[t]).reduce((n, r) => (n[r] = { ...e[t][r] }, n), {})), {}), i), a.services.resourceStore = a.store), a.translator = new M(a.services, i), a.translator.on("*", function(e) {
-			var t = [...arguments].slice(1);
+		}), a.services = { ...this.services }, a.services.utils = { hasLoadedNamespace: a.hasLoadedNamespace.bind(a) }, r && (a.store = new O(Object.keys(this.store.data).reduce((e, t) => (e[t] = { ...this.store.data[t] }, e[t] = Object.keys(e[t]).reduce((n, r) => (n[r] = { ...e[t][r] }, n), e[t]), e), {}), i), a.services.resourceStore = a.store), t.interpolation) {
+			let e = {
+				...J().interpolation,
+				...this.options.interpolation,
+				...t.interpolation
+			}, n = {
+				...i,
+				interpolation: e
+			};
+			a.services.interpolator = new V(n);
+		}
+		return a.translator = new P(a.services, i), a.translator.on("*", (e, ...t) => {
 			a.emit(e, ...t);
 		}), a.init(i, n), a.translator.options = i, a.translator.backendConnector.services.utils = { hasLoadedNamespace: a.hasLoadedNamespace.bind(a) }, a;
 	}
@@ -1208,7 +1225,7 @@ var n = {
 			resolvedLanguage: this.resolvedLanguage
 		};
 	}
-}, X = Y.createInstance();
-X.createInstance = Y.createInstance, X.createInstance, X.dir, X.init, X.loadResources, X.reloadResources, X.use, X.changeLanguage, X.getFixedT, X.t, X.exists, X.setDefaultNamespace, X.hasLoadedNamespace, X.loadNamespaces, X.loadLanguages;
+}.createInstance();
+Q.createInstance, Q.dir, Q.init, Q.loadResources, Q.reloadResources, Q.use, Q.changeLanguage, Q.getFixedT, Q.t, Q.exists, Q.setDefaultNamespace, Q.hasLoadedNamespace, Q.loadNamespaces, Q.loadLanguages;
 //#endregion
-export { n, X as t };
+export { n, Q as t };