@qping/plugin-bus 0.7.0 → 0.8.0

package/dist/i18n.mjs

@@ -13,7 +13,7 @@ var defer = () => {
 };
 var makeString = (object) => {
   if (object == null) return "";
-  return "" + object;
+  return String(object);
 };
 var copy = (a, s, t2) => {
   a.forEach((m) => {
@@ -21,7 +21,7 @@ var copy = (a, s, t2) => {
   });
 };
 var lastOfPathSeparatorRegExp = /###/g;
-var cleanKey = (key) => key && key.indexOf("###") > -1 ? key.replace(lastOfPathSeparatorRegExp, ".") : key;
+var cleanKey = (key) => key && key.includes("###") ? key.replace(lastOfPathSeparatorRegExp, ".") : key;
 var canNotTraverseDeeper = (object) => !object || isString(object);
 var getLastOfPath = (object, path, Empty) => {
   const stack = !isString(path) ? path : path.split(".");
@@ -92,7 +92,7 @@ var getPathWithDefaults = (data, defaultData, key) => {
 var deepExtend = (target, source, overwrite) => {
   for (const prop in source) {
     if (prop !== "__proto__" && prop !== "constructor") {
-      if (prop in target) {
+      if (Object.prototype.hasOwnProperty.call(target, prop)) {
         if (isString(target[prop]) || target[prop] instanceof String || isString(source[prop]) || source[prop] instanceof String) {
           if (overwrite) target[prop] = source[prop];
         } else {
@@ -145,7 +145,7 @@ var looksLikeObjectPathRegExpCache = new RegExpCache(20);
 var looksLikeObjectPath = (key, nsSeparator, keySeparator) => {
   nsSeparator = nsSeparator || "";
   keySeparator = keySeparator || "";
-  const possibleChars = chars.filter((c) => nsSeparator.indexOf(c) < 0 && keySeparator.indexOf(c) < 0);
+  const possibleChars = chars.filter((c) => !nsSeparator.includes(c) && !keySeparator.includes(c));
   if (possibleChars.length === 0) return true;
   const r = looksLikeObjectPathRegExpCache.getRegExp(`(${possibleChars.map((c) => c === "?" ? "\\?" : c).join("|")})`);
   let matched = !r.test(key);
@@ -178,7 +178,7 @@ var deepFind = (obj, path, keySeparator = ".") => {
       nextPath += tokens[j];
       next = current[nextPath];
       if (next !== void 0) {
-        if (["string", "number", "boolean"].indexOf(typeof next) > -1 && j < tokens.length - 1) {
+        if (["string", "number", "boolean"].includes(typeof next) && j < tokens.length - 1) {
           continue;
         }
         i += j - i + 1;
@@ -229,6 +229,7 @@ var Logger = class _Logger {
   }
   forward(args, lvl, prefix, debugOnly) {
     if (debugOnly && !this.debug) return null;
+    args = args.map((a) => isString(a) ? a.replace(/[\r\n\x00-\x1F\x7F]/g, " ") : a);
     if (isString(args[0])) args[0] = `${prefix}${this.prefix} ${args[0]}`;
     return this.logger[lvl](args);
   }
@@ -267,6 +268,14 @@ var EventEmitter = class {
     }
     this.observers[event].delete(listener);
   }
+  once(event, listener) {
+    const wrapper = (...args) => {
+      listener(...args);
+      this.off(event, wrapper);
+    };
+    this.on(event, wrapper);
+    return this;
+  }
   emit(event, ...args) {
     if (this.observers[event]) {
       const cloned = Array.from(this.observers[event].entries());
@@ -280,7 +289,7 @@ var EventEmitter = class {
       const cloned = Array.from(this.observers["*"].entries());
       cloned.forEach(([observer, numTimesAdded]) => {
         for (let i = 0; i < numTimesAdded; i++) {
-          observer.apply(observer, [event, ...args]);
+          observer(event, ...args);
         }
       });
     }
@@ -302,7 +311,7 @@ var ResourceStore = class extends EventEmitter {
     }
   }
   addNamespaces(ns) {
-    if (this.options.ns.indexOf(ns) < 0) {
+    if (!this.options.ns.includes(ns)) {
       this.options.ns.push(ns);
     }
   }
@@ -316,7 +325,7 @@ var ResourceStore = class extends EventEmitter {
     const keySeparator = options.keySeparator !== void 0 ? options.keySeparator : this.options.keySeparator;
     const ignoreJSONStructure = options.ignoreJSONStructure !== void 0 ? options.ignoreJSONStructure : this.options.ignoreJSONStructure;
     let path;
-    if (lng.indexOf(".") > -1) {
+    if (lng.includes(".")) {
       path = lng.split(".");
     } else {
       path = [lng, ns];
@@ -331,7 +340,7 @@ var ResourceStore = class extends EventEmitter {
       }
     }
     const result = getPath(this.data, path);
-    if (!result && !ns && !key && lng.indexOf(".") > -1) {
+    if (!result && !ns && !key && lng.includes(".")) {
       lng = path[0];
       ns = path[1];
       key = path.slice(2).join(".");
@@ -345,7 +354,7 @@ var ResourceStore = class extends EventEmitter {
     const keySeparator = options.keySeparator !== void 0 ? options.keySeparator : this.options.keySeparator;
     let path = [lng, ns];
     if (key) path = path.concat(keySeparator ? key.split(keySeparator) : key);
-    if (lng.indexOf(".") > -1) {
+    if (lng.includes(".")) {
       path = lng.split(".");
       value = ns;
       ns = path[1];
@@ -369,7 +378,7 @@ var ResourceStore = class extends EventEmitter {
     skipCopy: false
   }) {
     let path = [lng, ns];
-    if (lng.indexOf(".") > -1) {
+    if (lng.includes(".")) {
       path = lng.split(".");
       deep = resources;
       resources = ns;
@@ -447,16 +456,19 @@ function keysFromSelector(selector, opts) {
   } = selector(createProxy());
   const keySeparator = opts?.keySeparator ?? ".";
   const nsSeparator = opts?.nsSeparator ?? ":";
+  const strict = opts?.enableSelector === "strict";
   if (path.length > 1 && nsSeparator) {
     const ns = opts?.ns;
-    const nsArray = Array.isArray(ns) ? ns : null;
-    if (nsArray && nsArray.length > 1 && nsArray.slice(1).includes(path[0])) {
-      return `${path[0]}${nsSeparator}${path.slice(1).join(keySeparator)}`;
+    const nsList = strict ? Array.isArray(ns) ? ns : ns ? [ns] : null : Array.isArray(ns) ? ns : null;
+    if (nsList) {
+      const candidates = strict ? nsList : nsList.length > 1 ? nsList.slice(1) : [];
+      if (candidates.includes(path[0])) {
+        return `${path[0]}${nsSeparator}${path.slice(1).join(keySeparator)}`;
+      }
     }
   }
   return path.join(keySeparator);
 }
-var checkedLoadedFor = {};
 var shouldHandleAsObject = (res) => !isString(res) && typeof res !== "boolean" && typeof res !== "number";
 var Translator = class _Translator extends EventEmitter {
   constructor(services, options = {}) {
@@ -467,6 +479,7 @@ var Translator = class _Translator extends EventEmitter {
       this.options.keySeparator = ".";
     }
     this.logger = baseLogger.create("translator");
+    this.checkedLoadedFor = {};
   }
   changeLanguage(lng) {
     if (lng) this.language = lng;
@@ -491,7 +504,7 @@ var Translator = class _Translator extends EventEmitter {
     if (nsSeparator === void 0) nsSeparator = ":";
     const keySeparator = opt.keySeparator !== void 0 ? opt.keySeparator : this.options.keySeparator;
     let namespaces = opt.ns || this.options.defaultNS || [];
-    const wouldCheckForNsInKey = nsSeparator && key.indexOf(nsSeparator) > -1;
+    const wouldCheckForNsInKey = nsSeparator && key.includes(nsSeparator);
     const seemsNaturalLanguage = !this.options.userDefinedKeySeparator && !opt.keySeparator && !this.options.userDefinedNsSeparator && !opt.nsSeparator && !looksLikeObjectPath(key, nsSeparator, keySeparator);
     if (wouldCheckForNsInKey && !seemsNaturalLanguage) {
       const m = key.match(this.interpolator.nestingRegexp);
@@ -502,7 +515,7 @@ var Translator = class _Translator extends EventEmitter {
         };
       }
       const parts = key.split(nsSeparator);
-      if (nsSeparator !== keySeparator || nsSeparator === keySeparator && this.options.ns.indexOf(parts[0]) > -1) namespaces = parts.shift();
+      if (nsSeparator !== keySeparator || nsSeparator === keySeparator && this.options.ns.includes(parts[0])) namespaces = parts.shift();
       key = parts.join(keySeparator);
     }
     return {
@@ -589,7 +602,7 @@ var Translator = class _Translator extends EventEmitter {
     }
     const handleAsObject = shouldHandleAsObject(resForObjHndl);
     const resType = Object.prototype.toString.apply(resForObjHndl);
-    if (handleAsObjectInI18nFormat && resForObjHndl && handleAsObject && noObject.indexOf(resType) < 0 && !(isString(joinArrays) && Array.isArray(resForObjHndl))) {
+    if (handleAsObjectInI18nFormat && resForObjHndl && handleAsObject && !noObject.includes(resType) && !(isString(joinArrays) && Array.isArray(resForObjHndl))) {
       if (!opt.returnObjects && !this.options.returnObjects) {
         if (!this.options.returnedObjectHandler) {
           this.logger.warn("accessing an object - but returnObjects options is not enabled!");
@@ -653,7 +666,7 @@ var Translator = class _Translator extends EventEmitter {
       const resForMissing = missingKeyNoValueFallbackToKey && usedKey ? void 0 : res;
       const updateMissing = hasDefaultValue && defaultValue !== res && this.options.updateMissing;
       if (usedKey || usedDefault || updateMissing) {
-        this.logger.log(updateMissing ? "updateKey" : "missingKey", lng, namespace, key, updateMissing ? defaultValue : res);
+        this.logger.log(updateMissing ? "updateKey" : "missingKey", lng, namespace, needsPluralHandling && !updateMissing ? `${key}${this.pluralResolver.getSuffix(lng, opt.count, opt)}` : key, updateMissing ? defaultValue : res);
         if (keySeparator) {
           const fk = this.resolve(key, {
             ...opt,
@@ -685,7 +698,7 @@ var Translator = class _Translator extends EventEmitter {
           if (this.options.saveMissingPlurals && needsPluralHandling) {
             lngs.forEach((language) => {
               const suffixes = this.pluralResolver.getSuffixes(language, opt);
-              if (needsZeroSuffixLookup && opt[`defaultValue${this.options.pluralSeparator}zero`] && suffixes.indexOf(`${this.options.pluralSeparator}zero`) < 0) {
+              if (needsZeroSuffixLookup && opt[`defaultValue${this.options.pluralSeparator}zero`] && !suffixes.includes(`${this.options.pluralSeparator}zero`)) {
                 suffixes.push(`${this.options.pluralSeparator}zero`);
               }
               suffixes.forEach((suffix) => {
@@ -795,8 +808,8 @@ var Translator = class _Translator extends EventEmitter {
       namespaces.forEach((ns) => {
         if (this.isValidLookup(found)) return;
         usedNS = ns;
-        if (!checkedLoadedFor[`${codes[0]}-${ns}`] && this.utils?.hasLoadedNamespace && !this.utils?.hasLoadedNamespace(usedNS)) {
-          checkedLoadedFor[`${codes[0]}-${ns}`] = true;
+        if (!this.checkedLoadedFor[`${codes[0]}-${ns}`] && this.utils?.hasLoadedNamespace && !this.utils?.hasLoadedNamespace(usedNS)) {
+          this.checkedLoadedFor[`${codes[0]}-${ns}`] = true;
           this.logger.warn(`key "${usedKey}" for languages "${codes.join(", ")}" won't get resolved as namespace "${usedNS}" 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!!!");
         }
         codes.forEach((code) => {
@@ -811,7 +824,7 @@ var Translator = class _Translator extends EventEmitter {
             const zeroSuffix = `${this.options.pluralSeparator}zero`;
             const ordinalPrefix = `${this.options.pluralSeparator}ordinal${this.options.pluralSeparator}`;
             if (needsPluralHandling) {
-              if (opt.ordinal && pluralSuffix.indexOf(ordinalPrefix) === 0) {
+              if (opt.ordinal && pluralSuffix.startsWith(ordinalPrefix)) {
                 finalKeys.push(key + pluralSuffix.replace(ordinalPrefix, this.options.pluralSeparator));
               }
               finalKeys.push(key + pluralSuffix);
@@ -823,7 +836,7 @@ var Translator = class _Translator extends EventEmitter {
               const contextKey = `${key}${this.options.contextSeparator || "_"}${opt.context}`;
               finalKeys.push(contextKey);
               if (needsPluralHandling) {
-                if (opt.ordinal && pluralSuffix.indexOf(ordinalPrefix) === 0) {
+                if (opt.ordinal && pluralSuffix.startsWith(ordinalPrefix)) {
                   finalKeys.push(contextKey + pluralSuffix.replace(ordinalPrefix, this.options.pluralSeparator));
                 }
                 finalKeys.push(contextKey + pluralSuffix);
@@ -863,7 +876,10 @@ var Translator = class _Translator extends EventEmitter {
     const useOptionsReplaceForData = options.replace && !isString(options.replace);
     let data = useOptionsReplaceForData ? options.replace : options;
     if (useOptionsReplaceForData && typeof options.count !== "undefined") {
-      data.count = options.count;
+      data = {
+        ...data,
+        count: options.count
+      };
     }
     if (this.options.interpolation.defaultVariables) {
       data = {
@@ -884,7 +900,7 @@ var Translator = class _Translator extends EventEmitter {
   static hasDefaultValue(options) {
     const prefix = "defaultValue";
     for (const option in options) {
-      if (Object.prototype.hasOwnProperty.call(options, option) && prefix === option.substring(0, prefix.length) && void 0 !== options[option]) {
+      if (Object.prototype.hasOwnProperty.call(options, option) && option.startsWith(prefix) && void 0 !== options[option]) {
         return true;
       }
     }
@@ -896,10 +912,14 @@ var LanguageUtil = class {
     this.options = options;
     this.supportedLngs = this.options.supportedLngs || false;
     this.logger = baseLogger.create("languageUtils");
+    this.resolveHierarchyCache = {};
+  }
+  clearCache() {
+    this.resolveHierarchyCache = {};
   }
   getScriptPartFromCode(code) {
     code = getCleanedCode(code);
-    if (!code || code.indexOf("-") < 0) return null;
+    if (!code || !code.includes("-")) return null;
     const p = code.split("-");
     if (p.length === 2) return null;
     p.pop();
@@ -908,12 +928,12 @@ var LanguageUtil = class {
   }
   getLanguagePartFromCode(code) {
     code = getCleanedCode(code);
-    if (!code || code.indexOf("-") < 0) return code;
+    if (!code || !code.includes("-")) return code;
     const p = code.split("-");
     return this.formatLanguageCode(p[0]);
   }
   formatLanguageCode(code) {
-    if (isString(code) && code.indexOf("-") > -1) {
+    if (isString(code) && code.includes("-")) {
       let formattedCode;
       try {
         formattedCode = Intl.getCanonicalLocales(code)[0];
@@ -934,7 +954,7 @@ var LanguageUtil = class {
     if (this.options.load === "languageOnly" || this.options.nonExplicitSupportedLngs) {
       code = this.getLanguagePartFromCode(code);
     }
-    return !this.supportedLngs || !this.supportedLngs.length || this.supportedLngs.indexOf(code) > -1;
+    return !this.supportedLngs || !this.supportedLngs.length || this.supportedLngs.includes(code);
   }
   getBestMatchFromCodes(codes) {
     if (!codes) return null;
@@ -952,10 +972,11 @@ var LanguageUtil = class {
         const lngOnly = this.getLanguagePartFromCode(code);
         if (this.isSupportedCode(lngOnly)) return found = lngOnly;
         found = this.options.supportedLngs.find((supportedLng) => {
-          if (supportedLng === lngOnly) return supportedLng;
-          if (supportedLng.indexOf("-") < 0 && lngOnly.indexOf("-") < 0) return;
-          if (supportedLng.indexOf("-") > 0 && lngOnly.indexOf("-") < 0 && supportedLng.substring(0, supportedLng.indexOf("-")) === lngOnly) return supportedLng;
-          if (supportedLng.indexOf(lngOnly) === 0 && lngOnly.length > 1) return supportedLng;
+          if (supportedLng === lngOnly) return true;
+          if (!supportedLng.includes("-") && !lngOnly.includes("-")) return false;
+          if (supportedLng.includes("-") && !lngOnly.includes("-") && supportedLng.slice(0, supportedLng.indexOf("-")) === lngOnly) return true;
+          if (supportedLng.startsWith(lngOnly) && lngOnly.length > 1) return true;
+          return false;
         });
       });
     }
@@ -976,6 +997,27 @@ var LanguageUtil = class {
     return found || [];
   }
   toResolveHierarchy(code, fallbackCode) {
+    const fallbackLng = this.options.fallbackLng;
+    const fallbackLngKey = Array.isArray(fallbackLng) ? fallbackLng.join("|") : fallbackLng;
+    if (fallbackLngKey !== this._cachedFallbackLng) {
+      this.resolveHierarchyCache = {};
+      this._cachedFallbackLng = fallbackLngKey;
+    }
+    const hasCacheableFallback = fallbackCode === void 0 || fallbackCode === false || isString(fallbackCode);
+    const usesUncacheableOptionsFallback = fallbackCode === void 0 && typeof this.options.fallbackLng === "function";
+    const cacheable = isString(code) && hasCacheableFallback && !usesUncacheableOptionsFallback;
+    let cacheKey = null;
+    if (cacheable) {
+      let fallbackCacheKey;
+      if (fallbackCode === void 0) fallbackCacheKey = "undefined";
+      else if (fallbackCode === false) fallbackCacheKey = "boolean:false";
+      else fallbackCacheKey = `string:${fallbackCode}`;
+      cacheKey = `${code.length}:${code}|${fallbackCacheKey}`;
+    }
+    if (cacheKey !== null) {
+      const cached = this.resolveHierarchyCache[cacheKey];
+      if (cached !== void 0) return cached.slice();
+    }
     const fallbackCodes = this.getFallbackCodes((fallbackCode === false ? [] : fallbackCode) || this.options.fallbackLng || [], code);
     const codes = [];
     const addCode = (c) => {
@@ -986,7 +1028,7 @@ var LanguageUtil = class {
         this.logger.warn(`rejecting language code not found in supportedLngs: ${c}`);
       }
     };
-    if (isString(code) && (code.indexOf("-") > -1 || code.indexOf("_") > -1)) {
+    if (isString(code) && (code.includes("-") || code.includes("_"))) {
       if (this.options.load !== "languageOnly") addCode(this.formatLanguageCode(code));
       if (this.options.load !== "languageOnly" && this.options.load !== "currentOnly") addCode(this.getScriptPartFromCode(code));
       if (this.options.load !== "currentOnly") addCode(this.getLanguagePartFromCode(code));
@@ -994,8 +1036,12 @@ var LanguageUtil = class {
       addCode(this.formatLanguageCode(code));
     }
     fallbackCodes.forEach((fc) => {
-      if (codes.indexOf(fc) < 0) addCode(this.formatLanguageCode(fc));
+      if (!codes.includes(fc)) addCode(this.formatLanguageCode(fc));
     });
+    if (cacheKey !== null) {
+      this.resolveHierarchyCache[cacheKey] = codes;
+      return codes.slice();
+    }
     return codes;
   }
 };
@@ -1118,8 +1164,8 @@ var Interpolator = class {
     this.prefix = prefix ? regexEscape(prefix) : prefixEscaped || "{{";
     this.suffix = suffix ? regexEscape(suffix) : suffixEscaped || "}}";
     this.formatSeparator = formatSeparator || ",";
-    this.unescapePrefix = unescapeSuffix ? "" : unescapePrefix || "-";
-    this.unescapeSuffix = this.unescapePrefix ? "" : unescapeSuffix || "";
+    this.unescapePrefix = unescapeSuffix ? "" : unescapePrefix ? regexEscape(unescapePrefix) : "-";
+    this.unescapeSuffix = this.unescapePrefix ? "" : unescapeSuffix ? regexEscape(unescapeSuffix) : "";
     this.nestingPrefix = nestingPrefix ? regexEscape(nestingPrefix) : nestingPrefixEscaped || regexEscape("$t(");
     this.nestingSuffix = nestingSuffix ? regexEscape(nestingSuffix) : nestingSuffixEscaped || regexEscape(")");
     this.nestingOptionsSeparator = nestingOptionsSeparator || ",";
@@ -1148,7 +1194,7 @@ var Interpolator = class {
     let replaces;
     const defaultData = this.options && this.options.interpolation && this.options.interpolation.defaultVariables || {};
     const handleFormat = (key) => {
-      if (key.indexOf(this.formatSeparator) < 0) {
+      if (!key.includes(this.formatSeparator)) {
         const path = deepFindWithDefaults(data, defaultData, key, this.options.keySeparator, this.options.ignoreJSONStructure);
         return this.alwaysFormat ? this.format(path, void 0, lng, {
           ...options,
@@ -1166,14 +1212,17 @@ var Interpolator = class {
       });
     };
     this.resetRegExp();
+    if (!this.escapeValue && typeof str === "string" && /\$t\([^)]*\{[^}]*\{\{/.test(str)) {
+      this.logger.warn("nesting options string contains interpolated variables with escapeValue: false \u2014 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.");
+    }
     const missingInterpolationHandler = options?.missingInterpolationHandler || this.options.missingInterpolationHandler;
     const skipOnVariables = options?.interpolation?.skipOnVariables !== void 0 ? options.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables;
     const todos = [{
       regex: this.regexpUnescape,
-      safeValue: (val) => regexSafe(val)
+      safeValue: (val) => val
     }, {
       regex: this.regexp,
-      safeValue: (val) => this.escapeValue ? regexSafe(this.escape(val)) : regexSafe(val)
+      safeValue: (val) => this.escapeValue ? this.escape(val) : val
     }];
     todos.forEach((todo) => {
       replaces = 0;
@@ -1197,9 +1246,9 @@ var Interpolator = class {
           value = makeString(value);
         }
         const safeValue = todo.safeValue(value);
-        str = str.replace(match[0], safeValue);
+        str = str.replace(match[0], regexSafe(safeValue));
         if (skipOnVariables) {
-          todo.regex.lastIndex += value.length;
+          todo.regex.lastIndex += safeValue.length;
           todo.regex.lastIndex -= match[0].length;
         } else {
           todo.regex.lastIndex = 0;
@@ -1218,7 +1267,7 @@ var Interpolator = class {
     let clonedOptions;
     const handleHasOptions = (key, inheritedOptions) => {
       const sep = this.nestingOptionsSeparator;
-      if (key.indexOf(sep) < 0) return key;
+      if (!key.includes(sep)) return key;
       const c = key.split(new RegExp(`${regexEscape(sep)}[ ]*{`));
       let optionsString = `{${c[1]}`;
       key = c[0];
@@ -1238,7 +1287,7 @@ var Interpolator = class {
         this.logger.warn(`failed parsing options string in nesting for key ${key}`, e);
         return `${key}${sep}${optionsString}`;
       }
-      if (clonedOptions.defaultValue && clonedOptions.defaultValue.indexOf(this.prefix) > -1) delete clonedOptions.defaultValue;
+      if (clonedOptions.defaultValue && clonedOptions.defaultValue.includes(this.prefix)) delete clonedOptions.defaultValue;
       return key;
     };
     while (match = this.nestingRegexp.exec(str)) {
@@ -1249,7 +1298,7 @@ var Interpolator = class {
       clonedOptions = clonedOptions.replace && !isString(clonedOptions.replace) ? clonedOptions.replace : clonedOptions;
       clonedOptions.applyPostProcessor = false;
       delete clonedOptions.defaultValue;
-      const keyEndIndex = /{.*}/.test(match[1]) ? match[1].lastIndexOf("}") + 1 : match[1].indexOf(this.formatSeparator);
+      const keyEndIndex = /{.*}/s.test(match[1]) ? match[1].lastIndexOf("}") + 1 : match[1].indexOf(this.formatSeparator);
       if (keyEndIndex !== -1) {
         formatters = match[1].slice(keyEndIndex).split(this.formatSeparator).map((elem) => elem.trim()).filter(Boolean);
         match[1] = match[1].slice(0, keyEndIndex);
@@ -1276,13 +1325,13 @@ var Interpolator = class {
 var parseFormatStr = (formatStr) => {
   let formatName = formatStr.toLowerCase().trim();
   const formatOptions = {};
-  if (formatStr.indexOf("(") > -1) {
+  if (formatStr.includes("(")) {
     const p = formatStr.split("(");
     formatName = p[0].toLowerCase().trim();
-    const optStr = p[1].substring(0, p[1].length - 1);
-    if (formatName === "currency" && optStr.indexOf(":") < 0) {
+    const optStr = p[1].slice(0, -1);
+    if (formatName === "currency" && !optStr.includes(":")) {
       if (!formatOptions.currency) formatOptions.currency = optStr.trim();
-    } else if (formatName === "relativetime" && optStr.indexOf(":") < 0) {
+    } else if (formatName === "relativetime" && !optStr.includes(":")) {
       if (!formatOptions.range) formatOptions.range = optStr.trim();
     } else {
       const opts = optStr.split(";");
@@ -1376,10 +1425,16 @@ var Formatter = class {
     this.formats[name.toLowerCase().trim()] = createCachedFormatter(fc);
   }
   format(value, format, lng, options = {}) {
-    const formats = format.split(this.formatSeparator);
-    if (formats.length > 1 && formats[0].indexOf("(") > 1 && formats[0].indexOf(")") < 0 && formats.find((f) => f.indexOf(")") > -1)) {
-      const lastIndex = formats.findIndex((f) => f.indexOf(")") > -1);
-      formats[0] = [formats[0], ...formats.splice(1, lastIndex)].join(this.formatSeparator);
+    if (!format) return value;
+    if (value == null) return value;
+    const rawFormats = format.split(this.formatSeparator);
+    const formats = [];
+    for (let i = 0; i < rawFormats.length; i++) {
+      let f = rawFormats[i];
+      while (f.indexOf("(") > -1 && !f.includes(")") && i + 1 < rawFormats.length) {
+        f = `${f}${this.formatSeparator}${rawFormats[++i]}`;
+      }
+      formats.push(f);
     }
     const result = formats.reduce((mem, f) => {
       const {
@@ -1532,7 +1587,7 @@ var Connector = class extends EventEmitter {
       }
       if (err && data && tried < this.maxRetries) {
         setTimeout(() => {
-          this.read.call(this, lng, ns, fcName, tried + 1, wait * 2, callback);
+          this.read(lng, ns, fcName, tried + 1, wait * 2, callback);
         }, wait);
         return;
       }
@@ -1636,11 +1691,11 @@ var get = () => ({
   nonExplicitSupportedLngs: false,
   load: "all",
   preload: false,
-  simplifyPluralSuffix: true,
   keySeparator: ".",
   nsSeparator: ":",
   pluralSeparator: "_",
   contextSeparator: "_",
+  enableSelector: false,
   partialBundledLanguages: false,
   saveMissing: false,
   updateMissing: false,
@@ -1673,7 +1728,6 @@ var get = () => ({
   },
   interpolation: {
     escapeValue: true,
-    format: (value) => value,
     prefix: "{{",
     suffix: "}}",
     formatSeparator: ",",
@@ -1690,10 +1744,9 @@ var transformOptions = (options) => {
   if (isString(options.ns)) options.ns = [options.ns];
   if (isString(options.fallbackLng)) options.fallbackLng = [options.fallbackLng];
   if (isString(options.fallbackNS)) options.fallbackNS = [options.fallbackNS];
-  if (options.supportedLngs?.indexOf?.("cimode") < 0) {
+  if (options.supportedLngs && !options.supportedLngs.includes("cimode")) {
     options.supportedLngs = options.supportedLngs.concat(["cimode"]);
   }
-  if (typeof options.initImmediate === "boolean") options.initAsync = options.initImmediate;
   return options;
 };
 var noop = () => {
@@ -1706,28 +1759,6 @@ var bindMemberFunctions = (inst) => {
     }
   });
 };
-var SUPPORT_NOTICE_KEY = "__i18next_supportNoticeShown";
-var getSupportNoticeShown = () => {
-  if (typeof globalThis !== "undefined" && !!globalThis[SUPPORT_NOTICE_KEY]) return true;
-  if (typeof process !== "undefined" && process.env && process.env.I18NEXT_NO_SUPPORT_NOTICE) return true;
-  if (typeof process !== "undefined" && process.env && process.env.NODE_ENV === "production") return true;
-  return false;
-};
-var setSupportNoticeShown = () => {
-  if (typeof globalThis !== "undefined") globalThis[SUPPORT_NOTICE_KEY] = true;
-};
-var usesLocize = (inst) => {
-  if (inst?.modules?.backend?.name?.indexOf("Locize") > 0) return true;
-  if (inst?.modules?.backend?.constructor?.name?.indexOf("Locize") > 0) return true;
-  if (inst?.options?.backend?.backends) {
-    if (inst.options.backend.backends.some((b) => b?.name?.indexOf("Locize") > 0 || b?.constructor?.name?.indexOf("Locize") > 0)) return true;
-  }
-  if (inst?.options?.backend?.projectId) return true;
-  if (inst?.options?.backend?.backendOptions) {
-    if (inst.options.backend.backendOptions.some((b) => b?.projectId)) return true;
-  }
-  return false;
-};
 var I18n = class _I18n extends EventEmitter {
   constructor(options = {}, callback) {
     super();
@@ -1757,7 +1788,7 @@ var I18n = class _I18n extends EventEmitter {
     if (options.defaultNS == null && options.ns) {
       if (isString(options.ns)) {
         options.defaultNS = options.ns;
-      } else if (options.ns.indexOf("translation") < 0) {
+      } else if (!options.ns.includes("translation")) {
         options.defaultNS = options.ns[0];
       }
     }
@@ -1780,10 +1811,6 @@ var I18n = class _I18n extends EventEmitter {
     if (typeof this.options.overloadTranslationOptionHandler !== "function") {
       this.options.overloadTranslationOptionHandler = defOpts.overloadTranslationOptionHandler;
     }
-    if (this.options.showSupportNotice !== false && !usesLocize(this) && !getSupportNoticeShown()) {
-      if (typeof console !== "undefined" && typeof console.info !== "undefined") console.info("\u{1F310} i18next is made possible by our own product, Locize \u2014 consider powering your project with managed localization (AI, CDN, integrations): https://locize.com \u{1F499}");
-      setSupportNoticeShown();
-    }
     const createClassOnDemand = (ClassOrObject) => {
       if (!ClassOrObject) return null;
       if (typeof ClassOrObject === "function") return new ClassOrObject();
@@ -1808,14 +1835,9 @@ var I18n = class _I18n extends EventEmitter {
       s.resourceStore = this.store;
       s.languageUtils = lu;
       s.pluralResolver = new PluralResolver(lu, {
-        prepend: this.options.pluralSeparator,
-        simplifyPluralSuffix: this.options.simplifyPluralSuffix
+        prepend: this.options.pluralSeparator
       });
-      const usingLegacyFormatFunction = this.options.interpolation.format && this.options.interpolation.format !== defOpts.interpolation.format;
-      if (usingLegacyFormatFunction) {
-        this.logger.deprecate(`init: you are still using the legacy format function, please use the new approach: https://www.i18next.com/translation-function/formatting`);
-      }
-      if (formatter && (!this.options.interpolation.format || this.options.interpolation.format === defOpts.interpolation.format)) {
+      if (formatter) {
         s.formatter = createClassOnDemand(formatter);
         if (s.formatter.init) s.formatter.init(s, this.options);
         this.options.interpolation.format = s.formatter.format.bind(s.formatter);
@@ -1875,7 +1897,7 @@ var I18n = class _I18n extends EventEmitter {
         deferred.resolve(t2);
         callback(err, t2);
       };
-      if (this.languages && !this.isInitialized) return finish(null, this.t.bind(this));
+      if ((this.languages || this.isLanguageChangingTo) && !this.isInitialized) return finish(null, this.t.bind(this));
       this.changeLanguage(this.options.lng, finish);
     };
     if (this.options.resources || !this.options.initAsync) {
@@ -1898,7 +1920,7 @@ var I18n = class _I18n extends EventEmitter {
         const lngs = this.services.languageUtils.toResolveHierarchy(lng);
         lngs.forEach((l) => {
           if (l === "cimode") return;
-          if (toLoad.indexOf(l) < 0) toLoad.push(l);
+          if (!toLoad.includes(l)) toLoad.push(l);
         });
       };
       if (!usedLng) {
@@ -1963,16 +1985,16 @@ var I18n = class _I18n extends EventEmitter {
   }
   setResolvedLanguage(l) {
     if (!l || !this.languages) return;
-    if (["cimode", "dev"].indexOf(l) > -1) return;
+    if (["cimode", "dev"].includes(l)) return;
     for (let li = 0; li < this.languages.length; li++) {
       const lngInLngs = this.languages[li];
-      if (["cimode", "dev"].indexOf(lngInLngs) > -1) continue;
+      if (["cimode", "dev"].includes(lngInLngs)) continue;
       if (this.store.hasLanguageSomeTranslations(lngInLngs)) {
         this.resolvedLanguage = lngInLngs;
         break;
       }
     }
-    if (!this.resolvedLanguage && this.languages.indexOf(l) < 0 && this.store.hasLanguageSomeTranslations(l)) {
+    if (!this.resolvedLanguage && !this.languages.includes(l) && this.store.hasLanguageSomeTranslations(l)) {
       this.resolvedLanguage = l;
       this.languages.unshift(l);
     }
@@ -2030,7 +2052,8 @@ var I18n = class _I18n extends EventEmitter {
     }
     return deferred;
   }
-  getFixedT(lng, ns, keyPrefix) {
+  getFixedT(lng, ns, keyPrefix, fixedOpts) {
+    const scopeNs = fixedOpts?.scopeNs;
     const fixedT = (key, opts, ...rest) => {
       let o;
       if (typeof opts !== "object") {
@@ -2042,12 +2065,14 @@ var I18n = class _I18n extends EventEmitter {
       }
       o.lng = o.lng || fixedT.lng;
       o.lngs = o.lngs || fixedT.lngs;
+      const explicitCallNs = o.ns !== void 0 && o.ns !== null;
       o.ns = o.ns || fixedT.ns;
       if (o.keyPrefix !== "") o.keyPrefix = o.keyPrefix || keyPrefix || fixedT.keyPrefix;
       const selectorOpts = {
         ...this.options,
         ...o
       };
+      if (Array.isArray(scopeNs) && !explicitCallNs) selectorOpts.ns = scopeNs;
       if (typeof o.keyPrefix === "function") o.keyPrefix = keysFromSelector(o.keyPrefix, selectorOpts);
       const keySeparator = this.options.keySeparator || ".";
       let resultKey;
@@ -2114,7 +2139,7 @@ var I18n = class _I18n extends EventEmitter {
     }
     if (isString(ns)) ns = [ns];
     ns.forEach((n) => {
-      if (this.options.ns.indexOf(n) < 0) this.options.ns.push(n);
+      if (!this.options.ns.includes(n)) this.options.ns.push(n);
     });
     this.loadResources((err) => {
       deferred.resolve();
@@ -2126,7 +2151,7 @@ var I18n = class _I18n extends EventEmitter {
     const deferred = defer();
     if (isString(lngs)) lngs = [lngs];
     const preloaded = this.options.preload || [];
-    const newLngs = lngs.filter((lng) => preloaded.indexOf(lng) < 0 && this.services.languageUtils.isSupportedCode(lng));
+    const newLngs = lngs.filter((lng) => !preloaded.includes(lng) && this.services.languageUtils.isSupportedCode(lng));
     if (!newLngs.length) {
       if (callback) callback();
       return Promise.resolve();
@@ -2152,7 +2177,7 @@ var I18n = class _I18n extends EventEmitter {
     const rtlLngs = ["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"];
     const languageUtils = this.services?.languageUtils || new LanguageUtil(get());
     if (lng.toLowerCase().indexOf("-latn") > 1) return "ltr";
-    return rtlLngs.indexOf(languageUtils.getLanguagePartFromCode(lng)) > -1 || lng.toLowerCase().indexOf("-arab") > 1 ? "rtl" : "ltr";
+    return rtlLngs.includes(languageUtils.getLanguagePartFromCode(lng)) || lng.toLowerCase().indexOf("-arab") > 1 ? "rtl" : "ltr";
   }
   static createInstance(options = {}, callback) {
     const instance2 = new _I18n(options, callback);
@@ -2273,9 +2298,8 @@ var MyToolsI18n = class {
     void this.#instance.init({
       lng: this.#locale,
       fallbackLng: this.#fallbackLocale,
-      initImmediate: false,
+      initAsync: false,
       debug: false,
-      showSupportNotice: false,
       keySeparator: false,
       nsSeparator: false,
       interpolation: { escapeValue: false },