gantt-task-react-v 1.0.35 → 1.0.36

package/dist/gantt-task-react.es.js

@@ -170,8 +170,7 @@ const looksLikeObjectPath = (key2, nsSeparator, keySeparator) => {
   }
   return matched;
 };
-const deepFind = function(obj, path) {
-  let keySeparator = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : ".";
+const deepFind = (obj, path, keySeparator = ".") => {
   if (!obj)
     return void 0;
   if (obj[path]) {
@@ -223,39 +222,25 @@ const consoleLogger = {
   }
 };
 class Logger {
-  constructor(concreteLogger) {
-    let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  constructor(concreteLogger, options = {}) {
     this.init(concreteLogger, options);
   }
-  init(concreteLogger) {
-    let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  init(concreteLogger, options = {}) {
     this.prefix = options.prefix || "i18next:";
     this.logger = concreteLogger || consoleLogger;
     this.options = options;
     this.debug = options.debug;
   }
-  log() {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
+  log(...args) {
     return this.forward(args, "log", "", true);
   }
-  warn() {
-    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-      args[_key2] = arguments[_key2];
-    }
+  warn(...args) {
     return this.forward(args, "warn", "", true);
   }
-  error() {
-    for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-      args[_key3] = arguments[_key3];
-    }
+  error(...args) {
     return this.forward(args, "error", "");
   }
-  deprecate() {
-    for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-      args[_key4] = arguments[_key4];
-    }
+  deprecate(...args) {
     return this.forward(args, "warn", "WARNING DEPRECATED: ", true);
   }
   forward(args, lvl, prefix, debugOnly) {
@@ -302,14 +287,10 @@ class EventEmitter {
     }
     this.observers[event].delete(listener);
   }
-  emit(event) {
-    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args[_key - 1] = arguments[_key];
-    }
+  emit(event, ...args) {
     if (this.observers[event]) {
       const cloned = Array.from(this.observers[event].entries());
-      cloned.forEach((_ref) => {
-        let [observer, numTimesAdded] = _ref;
+      cloned.forEach(([observer, numTimesAdded]) => {
         for (let i = 0; i < numTimesAdded; i++) {
           observer(...args);
         }
@@ -317,8 +298,7 @@ class EventEmitter {
     }
     if (this.observers["*"]) {
       const cloned = Array.from(this.observers["*"].entries());
-      cloned.forEach((_ref2) => {
-        let [observer, numTimesAdded] = _ref2;
+      cloned.forEach(([observer, numTimesAdded]) => {
         for (let i = 0; i < numTimesAdded; i++) {
           observer.apply(observer, [event, ...args]);
         }
@@ -327,11 +307,10 @@ class EventEmitter {
   }
 }
 class ResourceStore extends EventEmitter {
-  constructor(data) {
-    let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {
-      ns: ["translation"],
-      defaultNS: "translation"
-    };
+  constructor(data, options = {
+    ns: ["translation"],
+    defaultNS: "translation"
+  }) {
     super();
     this.data = data || {};
     this.options = options;
@@ -353,9 +332,8 @@ class ResourceStore extends EventEmitter {
       this.options.ns.splice(index2, 1);
     }
   }
-  getResource(lng, ns, key2) {
+  getResource(lng, ns, key2, options = {}) {
     var _a, _b;
-    let options = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {};
     const keySeparator = options.keySeparator !== void 0 ? options.keySeparator : this.options.keySeparator;
     const ignoreJSONStructure = options.ignoreJSONStructure !== void 0 ? options.ignoreJSONStructure : this.options.ignoreJSONStructure;
     let path;
@@ -383,10 +361,9 @@ class ResourceStore extends EventEmitter {
       return result;
     return deepFind((_b = (_a = this.data) == null ? void 0 : _a[lng]) == null ? void 0 : _b[ns], key2, keySeparator);
   }
-  addResource(lng, ns, key2, value) {
-    let options = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : {
-      silent: false
-    };
+  addResource(lng, ns, key2, value, options = {
+    silent: false
+  }) {
     const keySeparator = options.keySeparator !== void 0 ? options.keySeparator : this.options.keySeparator;
     let path = [lng, ns];
     if (key2)
@@ -401,10 +378,9 @@ class ResourceStore extends EventEmitter {
     if (!options.silent)
       this.emit("added", lng, ns, key2, value);
   }
-  addResources(lng, ns, resources) {
-    let options = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {
-      silent: false
-    };
+  addResources(lng, ns, resources, options = {
+    silent: false
+  }) {
     for (const m in resources) {
       if (isString$1(resources[m]) || Array.isArray(resources[m]))
         this.addResource(lng, ns, m, resources[m], {
@@ -414,11 +390,10 @@ class ResourceStore extends EventEmitter {
     if (!options.silent)
       this.emit("added", lng, ns, resources);
   }
-  addResourceBundle(lng, ns, resources, deep, overwrite) {
-    let options = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : {
-      silent: false,
-      skipCopy: false
-    };
+  addResourceBundle(lng, ns, resources, deep, overwrite, options = {
+    silent: false,
+    skipCopy: false
+  }) {
     let path = [lng, ns];
     if (lng.indexOf(".") > -1) {
       path = lng.split(".");
@@ -482,11 +457,32 @@ var postProcessor = {
     return value;
   }
 };
+const PATH_KEY = Symbol("i18next/PATH_KEY");
+function createProxy() {
+  const state = [];
+  const handler = /* @__PURE__ */ Object.create(null);
+  let proxy;
+  handler.get = (target, key2) => {
+    var _a;
+    (_a = proxy == null ? void 0 : proxy.revoke) == null ? void 0 : _a.call(proxy);
+    if (key2 === PATH_KEY)
+      return state;
+    state.push(key2);
+    proxy = Proxy.revocable(target, handler);
+    return proxy.proxy;
+  };
+  return Proxy.revocable(/* @__PURE__ */ Object.create(null), handler).proxy;
+}
+function keysFromSelector(selector, opts) {
+  const {
+    [PATH_KEY]: path
+  } = selector(createProxy());
+  return path.join((opts == null ? void 0 : opts.keySeparator) ?? ".");
+}
 const checkedLoadedFor = {};
 const shouldHandleAsObject = (res) => !isString$1(res) && typeof res !== "boolean" && typeof res !== "number";
 class Translator extends EventEmitter {
-  constructor(services) {
-    let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  constructor(services, options = {}) {
     super();
     copy(["resourceStore", "languageUtils", "pluralResolver", "interpolator", "backendConnector", "i18nFormat", "utils"], services, this);
     this.options = options;
@@ -499,24 +495,25 @@ class Translator extends EventEmitter {
     if (lng)
       this.language = lng;
   }
-  exists(key2) {
-    let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {
-      interpolation: {}
+  exists(key2, o = {
+    interpolation: {}
+  }) {
+    const opt = {
+      ...o
     };
-    if (key2 == null) {
+    if (key2 == null)
       return false;
-    }
-    const resolved = this.resolve(key2, options);
+    const resolved = this.resolve(key2, opt);
     return (resolved == null ? void 0 : resolved.res) !== void 0;
   }
-  extractFromKey(key2, options) {
-    let nsSeparator = options.nsSeparator !== void 0 ? options.nsSeparator : this.options.nsSeparator;
+  extractFromKey(key2, opt) {
+    let nsSeparator = opt.nsSeparator !== void 0 ? opt.nsSeparator : this.options.nsSeparator;
     if (nsSeparator === void 0)
       nsSeparator = ":";
-    const keySeparator = options.keySeparator !== void 0 ? options.keySeparator : this.options.keySeparator;
-    let namespaces = options.ns || this.options.defaultNS || [];
+    const keySeparator = opt.keySeparator !== void 0 ? opt.keySeparator : this.options.keySeparator;
+    let namespaces = opt.ns || this.options.defaultNS || [];
     const wouldCheckForNsInKey = nsSeparator && key2.indexOf(nsSeparator) > -1;
-    const seemsNaturalLanguage = !this.options.userDefinedKeySeparator && !options.keySeparator && !this.options.userDefinedNsSeparator && !options.nsSeparator && !looksLikeObjectPath(key2, nsSeparator, keySeparator);
+    const seemsNaturalLanguage = !this.options.userDefinedKeySeparator && !opt.keySeparator && !this.options.userDefinedNsSeparator && !opt.nsSeparator && !looksLikeObjectPath(key2, nsSeparator, keySeparator);
     if (wouldCheckForNsInKey && !seemsNaturalLanguage) {
       const m = key2.match(this.interpolator.nestingRegexp);
       if (m && m.length > 0) {
@@ -535,32 +532,42 @@ class Translator extends EventEmitter {
       namespaces: isString$1(namespaces) ? [namespaces] : namespaces
     };
   }
-  translate(keys, options, lastKey) {
-    if (typeof options !== "object" && this.options.overloadTranslationOptionHandler) {
-      options = this.options.overloadTranslationOptionHandler(arguments);
+  translate(keys, o, lastKey) {
+    let opt = typeof o === "object" ? {
+      ...o
+    } : o;
+    if (typeof opt !== "object" && this.options.overloadTranslationOptionHandler) {
+      opt = this.options.overloadTranslationOptionHandler(arguments);
     }
-    if (typeof options === "object")
-      options = {
-        ...options
+    if (typeof opt === "object")
+      opt = {
+        ...opt
       };
-    if (!options)
-      options = {};
+    if (!opt)
+      opt = {};
     if (keys == null)
       return "";
+    if (typeof keys === "function")
+      keys = keysFromSelector(keys, {
+        ...this.options,
+        ...opt
+      });
     if (!Array.isArray(keys))
       keys = [String(keys)];
-    const returnDetails = options.returnDetails !== void 0 ? options.returnDetails : this.options.returnDetails;
-    const keySeparator = options.keySeparator !== void 0 ? options.keySeparator : this.options.keySeparator;
+    const returnDetails = opt.returnDetails !== void 0 ? opt.returnDetails : this.options.returnDetails;
+    const keySeparator = opt.keySeparator !== void 0 ? opt.keySeparator : this.options.keySeparator;
     const {
       key: key2,
       namespaces
-    } = this.extractFromKey(keys[keys.length - 1], options);
+    } = this.extractFromKey(keys[keys.length - 1], opt);
     const namespace = namespaces[namespaces.length - 1];
-    const lng = options.lng || this.language;
-    const appendNamespaceToCIMode = options.appendNamespaceToCIMode || this.options.appendNamespaceToCIMode;
+    let nsSeparator = opt.nsSeparator !== void 0 ? opt.nsSeparator : this.options.nsSeparator;
+    if (nsSeparator === void 0)
+      nsSeparator = ":";
+    const lng = opt.lng || this.language;
+    const appendNamespaceToCIMode = opt.appendNamespaceToCIMode || this.options.appendNamespaceToCIMode;
     if ((lng == null ? void 0 : lng.toLowerCase()) === "cimode") {
       if (appendNamespaceToCIMode) {
-        const nsSeparator = options.nsSeparator || this.options.nsSeparator;
         if (returnDetails) {
           return {
             res: `${namespace}${nsSeparator}${key2}`,
@@ -568,7 +575,7 @@ class Translator extends EventEmitter {
             exactUsedKey: key2,
             usedLng: lng,
             usedNS: namespace,
-            usedParams: this.getUsedParamsDetails(options)
+            usedParams: this.getUsedParamsDetails(opt)
           };
         }
         return `${namespace}${nsSeparator}${key2}`;
@@ -580,26 +587,26 @@ class Translator extends EventEmitter {
           exactUsedKey: key2,
           usedLng: lng,
           usedNS: namespace,
-          usedParams: this.getUsedParamsDetails(options)
+          usedParams: this.getUsedParamsDetails(opt)
         };
       }
       return key2;
     }
-    const resolved = this.resolve(keys, options);
+    const resolved = this.resolve(keys, opt);
     let res = resolved == null ? void 0 : resolved.res;
     const resUsedKey = (resolved == null ? void 0 : resolved.usedKey) || key2;
     const resExactUsedKey = (resolved == null ? void 0 : resolved.exactUsedKey) || key2;
     const noObject = ["[object Number]", "[object Function]", "[object RegExp]"];
-    const joinArrays = options.joinArrays !== void 0 ? options.joinArrays : this.options.joinArrays;
+    const joinArrays = opt.joinArrays !== void 0 ? opt.joinArrays : this.options.joinArrays;
     const handleAsObjectInI18nFormat = !this.i18nFormat || this.i18nFormat.handleAsObject;
-    const needsPluralHandling = options.count !== void 0 && !isString$1(options.count);
-    const hasDefaultValue = Translator.hasDefaultValue(options);
-    const defaultValueSuffix = needsPluralHandling ? this.pluralResolver.getSuffix(lng, options.count, options) : "";
-    const defaultValueSuffixOrdinalFallback = options.ordinal && needsPluralHandling ? this.pluralResolver.getSuffix(lng, options.count, {
+    const needsPluralHandling = opt.count !== void 0 && !isString$1(opt.count);
+    const hasDefaultValue = Translator.hasDefaultValue(opt);
+    const defaultValueSuffix = needsPluralHandling ? this.pluralResolver.getSuffix(lng, opt.count, opt) : "";
+    const defaultValueSuffixOrdinalFallback = opt.ordinal && needsPluralHandling ? this.pluralResolver.getSuffix(lng, opt.count, {
       ordinal: false
     }) : "";
-    const needsZeroSuffixLookup = needsPluralHandling && !options.ordinal && options.count === 0;
-    const defaultValue2 = needsZeroSuffixLookup && options[`defaultValue${this.options.pluralSeparator}zero`] || options[`defaultValue${defaultValueSuffix}`] || options[`defaultValue${defaultValueSuffixOrdinalFallback}`] || options.defaultValue;
+    const needsZeroSuffixLookup = needsPluralHandling && !opt.ordinal && opt.count === 0;
+    const defaultValue2 = needsZeroSuffixLookup && opt[`defaultValue${this.options.pluralSeparator}zero`] || opt[`defaultValue${defaultValueSuffix}`] || opt[`defaultValue${defaultValueSuffixOrdinalFallback}`] || opt.defaultValue;
     let resForObjHndl = res;
     if (handleAsObjectInI18nFormat && !res && hasDefaultValue) {
       resForObjHndl = defaultValue2;
@@ -607,17 +614,17 @@ class Translator extends EventEmitter {
     const handleAsObject = shouldHandleAsObject(resForObjHndl);
     const resType = Object.prototype.toString.apply(resForObjHndl);
     if (handleAsObjectInI18nFormat && resForObjHndl && handleAsObject && noObject.indexOf(resType) < 0 && !(isString$1(joinArrays) && Array.isArray(resForObjHndl))) {
-      if (!options.returnObjects && !this.options.returnObjects) {
+      if (!opt.returnObjects && !this.options.returnObjects) {
         if (!this.options.returnedObjectHandler) {
           this.logger.warn("accessing an object - but returnObjects options is not enabled!");
         }
         const r = this.options.returnedObjectHandler ? this.options.returnedObjectHandler(resUsedKey, resForObjHndl, {
-          ...options,
+          ...opt,
           ns: namespaces
         }) : `key '${key2} (${this.language})' returned an object instead of string.`;
         if (returnDetails) {
           resolved.res = r;
-          resolved.usedParams = this.getUsedParamsDetails(options);
+          resolved.usedParams = this.getUsedParamsDetails(opt);
           return resolved;
         }
         return r;
@@ -631,7 +638,7 @@ class Translator extends EventEmitter {
             const deepKey = `${newKeyToUse}${keySeparator}${m}`;
             if (hasDefaultValue && !res) {
               copy2[m] = this.translate(deepKey, {
-                ...options,
+                ...opt,
                 defaultValue: shouldHandleAsObject(defaultValue2) ? defaultValue2[m] : void 0,
                 ...{
                   joinArrays: false,
@@ -640,7 +647,7 @@ class Translator extends EventEmitter {
               });
             } else {
               copy2[m] = this.translate(deepKey, {
-                ...options,
+                ...opt,
                 ...{
                   joinArrays: false,
                   ns: namespaces
@@ -656,7 +663,7 @@ class Translator extends EventEmitter {
     } else if (handleAsObjectInI18nFormat && isString$1(joinArrays) && Array.isArray(res)) {
       res = res.join(joinArrays);
       if (res)
-        res = this.extendTranslation(res, keys, options, lastKey);
+        res = this.extendTranslation(res, keys, opt, lastKey);
     } else {
       let usedDefault = false;
       let usedKey = false;
@@ -668,49 +675,49 @@ class Translator extends EventEmitter {
         usedKey = true;
         res = key2;
       }
-      const missingKeyNoValueFallbackToKey = options.missingKeyNoValueFallbackToKey || this.options.missingKeyNoValueFallbackToKey;
+      const missingKeyNoValueFallbackToKey = opt.missingKeyNoValueFallbackToKey || this.options.missingKeyNoValueFallbackToKey;
       const resForMissing = missingKeyNoValueFallbackToKey && usedKey ? void 0 : res;
       const updateMissing = hasDefaultValue && defaultValue2 !== res && this.options.updateMissing;
       if (usedKey || usedDefault || updateMissing) {
         this.logger.log(updateMissing ? "updateKey" : "missingKey", lng, namespace, key2, updateMissing ? defaultValue2 : res);
         if (keySeparator) {
           const fk = this.resolve(key2, {
-            ...options,
+            ...opt,
             keySeparator: false
           });
           if (fk && fk.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 lngs = [];
-        const fallbackLngs = this.languageUtils.getFallbackCodes(this.options.fallbackLng, options.lng || this.language);
+        const fallbackLngs = this.languageUtils.getFallbackCodes(this.options.fallbackLng, opt.lng || this.language);
         if (this.options.saveMissingTo === "fallback" && fallbackLngs && fallbackLngs[0]) {
           for (let i = 0; i < fallbackLngs.length; i++) {
             lngs.push(fallbackLngs[i]);
           }
         } else if (this.options.saveMissingTo === "all") {
-          lngs = this.languageUtils.toResolveHierarchy(options.lng || this.language);
+          lngs = this.languageUtils.toResolveHierarchy(opt.lng || this.language);
         } else {
-          lngs.push(options.lng || this.language);
+          lngs.push(opt.lng || this.language);
         }
         const send = (l, k, specificDefaultValue) => {
           var _a;
           const defaultForMissing = hasDefaultValue && specificDefaultValue !== res ? specificDefaultValue : resForMissing;
           if (this.options.missingKeyHandler) {
-            this.options.missingKeyHandler(l, namespace, k, defaultForMissing, updateMissing, options);
+            this.options.missingKeyHandler(l, namespace, k, defaultForMissing, updateMissing, opt);
           } else if ((_a = this.backendConnector) == null ? void 0 : _a.saveMissing) {
-            this.backendConnector.saveMissing(l, namespace, k, defaultForMissing, updateMissing, options);
+            this.backendConnector.saveMissing(l, namespace, k, defaultForMissing, updateMissing, opt);
           }
           this.emit("missingKey", l, namespace, k, res);
         };
         if (this.options.saveMissing) {
           if (this.options.saveMissingPlurals && needsPluralHandling) {
             lngs.forEach((language) => {
-              const suffixes = this.pluralResolver.getSuffixes(language, options);
-              if (needsZeroSuffixLookup && options[`defaultValue${this.options.pluralSeparator}zero`] && suffixes.indexOf(`${this.options.pluralSeparator}zero`) < 0) {
+              const suffixes = this.pluralResolver.getSuffixes(language, opt);
+              if (needsZeroSuffixLookup && opt[`defaultValue${this.options.pluralSeparator}zero`] && suffixes.indexOf(`${this.options.pluralSeparator}zero`) < 0) {
                 suffixes.push(`${this.options.pluralSeparator}zero`);
               }
               suffixes.forEach((suffix) => {
-                send([language], key2 + suffix, options[`defaultValue${suffix}`] || defaultValue2);
+                send([language], key2 + suffix, opt[`defaultValue${suffix}`] || defaultValue2);
               });
             });
           } else {
@@ -718,91 +725,87 @@ class Translator extends EventEmitter {
           }
         }
       }
-      res = this.extendTranslation(res, keys, options, resolved, lastKey);
-      if (usedKey && res === key2 && this.options.appendNamespaceToMissingKey)
-        res = `${namespace}:${key2}`;
+      res = this.extendTranslation(res, keys, opt, resolved, lastKey);
+      if (usedKey && res === key2 && this.options.appendNamespaceToMissingKey) {
+        res = `${namespace}${nsSeparator}${key2}`;
+      }
       if ((usedKey || usedDefault) && this.options.parseMissingKeyHandler) {
-        res = this.options.parseMissingKeyHandler(this.options.appendNamespaceToMissingKey ? `${namespace}:${key2}` : key2, usedDefault ? res : void 0);
+        res = this.options.parseMissingKeyHandler(this.options.appendNamespaceToMissingKey ? `${namespace}${nsSeparator}${key2}` : key2, usedDefault ? res : void 0, opt);
       }
     }
     if (returnDetails) {
       resolved.res = res;
-      resolved.usedParams = this.getUsedParamsDetails(options);
+      resolved.usedParams = this.getUsedParamsDetails(opt);
       return resolved;
     }
     return res;
   }
-  extendTranslation(res, key2, options, resolved, lastKey) {
+  extendTranslation(res, key2, opt, resolved, lastKey) {
     var _a, _b;
-    var _this = this;
     if ((_a = this.i18nFormat) == null ? void 0 : _a.parse) {
       res = this.i18nFormat.parse(res, {
         ...this.options.interpolation.defaultVariables,
-        ...options
-      }, options.lng || this.language || resolved.usedLng, resolved.usedNS, resolved.usedKey, {
+        ...opt
+      }, opt.lng || this.language || resolved.usedLng, resolved.usedNS, resolved.usedKey, {
         resolved
       });
-    } else if (!options.skipInterpolation) {
-      if (options.interpolation)
+    } else if (!opt.skipInterpolation) {
+      if (opt.interpolation)
         this.interpolator.init({
-          ...options,
+          ...opt,
           ...{
             interpolation: {
               ...this.options.interpolation,
-              ...options.interpolation
+              ...opt.interpolation
             }
           }
         });
-      const skipOnVariables = isString$1(res) && (((_b = options == null ? void 0 : options.interpolation) == null ? void 0 : _b.skipOnVariables) !== void 0 ? options.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables);
+      const skipOnVariables = isString$1(res) && (((_b = opt == null ? void 0 : opt.interpolation) == null ? void 0 : _b.skipOnVariables) !== void 0 ? opt.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables);
       let nestBef;
       if (skipOnVariables) {
         const nb = res.match(this.interpolator.nestingRegexp);
         nestBef = nb && nb.length;
       }
-      let data = options.replace && !isString$1(options.replace) ? options.replace : options;
+      let data = opt.replace && !isString$1(opt.replace) ? opt.replace : opt;
       if (this.options.interpolation.defaultVariables)
         data = {
           ...this.options.interpolation.defaultVariables,
           ...data
         };
-      res = this.interpolator.interpolate(res, data, options.lng || this.language || resolved.usedLng, options);
+      res = this.interpolator.interpolate(res, data, opt.lng || this.language || resolved.usedLng, opt);
       if (skipOnVariables) {
         const na = res.match(this.interpolator.nestingRegexp);
         const nestAft = na && na.length;
         if (nestBef < nestAft)
-          options.nest = false;
-      }
-      if (!options.lng && resolved && resolved.res)
-        options.lng = this.language || resolved.usedLng;
-      if (options.nest !== false)
-        res = this.interpolator.nest(res, function() {
-          for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-            args[_key] = arguments[_key];
-          }
-          if ((lastKey == null ? void 0 : lastKey[0]) === args[0] && !options.context) {
-            _this.logger.warn(`It seems you are nesting recursively key: ${args[0]} in key: ${key2[0]}`);
+          opt.nest = false;
+      }
+      if (!opt.lng && resolved && resolved.res)
+        opt.lng = this.language || resolved.usedLng;
+      if (opt.nest !== false)
+        res = this.interpolator.nest(res, (...args) => {
+          if ((lastKey == null ? void 0 : lastKey[0]) === args[0] && !opt.context) {
+            this.logger.warn(`It seems you are nesting recursively key: ${args[0]} in key: ${key2[0]}`);
             return null;
           }
-          return _this.translate(...args, key2);
-        }, options);
-      if (options.interpolation)
+          return this.translate(...args, key2);
+        }, opt);
+      if (opt.interpolation)
         this.interpolator.reset();
     }
-    const postProcess = options.postProcess || this.options.postProcess;
+    const postProcess = opt.postProcess || this.options.postProcess;
     const postProcessorNames = isString$1(postProcess) ? [postProcess] : postProcess;
-    if (res != null && (postProcessorNames == null ? void 0 : postProcessorNames.length) && options.applyPostProcessor !== false) {
+    if (res != null && (postProcessorNames == null ? void 0 : postProcessorNames.length) && opt.applyPostProcessor !== false) {
       res = postProcessor.handle(postProcessorNames, res, key2, this.options && this.options.postProcessPassResolved ? {
         i18nResolved: {
           ...resolved,
-          usedParams: this.getUsedParamsDetails(options)
+          usedParams: this.getUsedParamsDetails(opt)
         },
-        ...options
-      } : options, this);
+        ...opt
+      } : opt, this);
     }
     return res;
   }
-  resolve(keys) {
-    let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  resolve(keys, opt = {}) {
     let found;
     let usedKey;
     let exactUsedKey;
@@ -813,16 +816,16 @@ class Translator extends EventEmitter {
     keys.forEach((k) => {
       if (this.isValidLookup(found))
         return;
-      const extracted = this.extractFromKey(k, options);
+      const extracted = this.extractFromKey(k, opt);
       const key2 = extracted.key;
       usedKey = key2;
       let namespaces = extracted.namespaces;
       if (this.options.fallbackNS)
         namespaces = namespaces.concat(this.options.fallbackNS);
-      const needsPluralHandling = options.count !== void 0 && !isString$1(options.count);
-      const needsZeroSuffixLookup = needsPluralHandling && !options.ordinal && options.count === 0;
-      const needsContextHandling = options.context !== void 0 && (isString$1(options.context) || typeof options.context === "number") && options.context !== "";
-      const codes = options.lngs ? options.lngs : this.languageUtils.toResolveHierarchy(options.lng || this.language, options.fallbackLng);
+      const needsPluralHandling = opt.count !== void 0 && !isString$1(opt.count);
+      const needsZeroSuffixLookup = needsPluralHandling && !opt.ordinal && opt.count === 0;
+      const needsContextHandling = opt.context !== void 0 && (isString$1(opt.context) || typeof opt.context === "number") && opt.context !== "";
+      const codes = opt.lngs ? opt.lngs : this.languageUtils.toResolveHierarchy(opt.lng || this.language, opt.fallbackLng);
       namespaces.forEach((ns) => {
         var _a, _b;
         if (this.isValidLookup(found))
@@ -839,30 +842,30 @@ class Translator extends EventEmitter {
           usedLng = code;
           const finalKeys = [key2];
           if ((_a2 = this.i18nFormat) == null ? void 0 : _a2.addLookupKeys) {
-            this.i18nFormat.addLookupKeys(finalKeys, key2, code, ns, options);
+            this.i18nFormat.addLookupKeys(finalKeys, key2, code, ns, opt);
           } else {
             let pluralSuffix;
             if (needsPluralHandling)
-              pluralSuffix = this.pluralResolver.getSuffix(code, options.count, options);
+              pluralSuffix = this.pluralResolver.getSuffix(code, opt.count, opt);
             const zeroSuffix = `${this.options.pluralSeparator}zero`;
             const ordinalPrefix = `${this.options.pluralSeparator}ordinal${this.options.pluralSeparator}`;
             if (needsPluralHandling) {
-              finalKeys.push(key2 + pluralSuffix);
-              if (options.ordinal && pluralSuffix.indexOf(ordinalPrefix) === 0) {
+              if (opt.ordinal && pluralSuffix.indexOf(ordinalPrefix) === 0) {
                 finalKeys.push(key2 + pluralSuffix.replace(ordinalPrefix, this.options.pluralSeparator));
               }
+              finalKeys.push(key2 + pluralSuffix);
               if (needsZeroSuffixLookup) {
                 finalKeys.push(key2 + zeroSuffix);
               }
             }
             if (needsContextHandling) {
-              const contextKey = `${key2}${this.options.contextSeparator}${options.context}`;
+              const contextKey = `${key2}${this.options.contextSeparator || "_"}${opt.context}`;
               finalKeys.push(contextKey);
               if (needsPluralHandling) {
-                finalKeys.push(contextKey + pluralSuffix);
-                if (options.ordinal && pluralSuffix.indexOf(ordinalPrefix) === 0) {
+                if (opt.ordinal && pluralSuffix.indexOf(ordinalPrefix) === 0) {
                   finalKeys.push(contextKey + pluralSuffix.replace(ordinalPrefix, this.options.pluralSeparator));
                 }
+                finalKeys.push(contextKey + pluralSuffix);
                 if (needsZeroSuffixLookup) {
                   finalKeys.push(contextKey + zeroSuffix);
                 }
@@ -873,7 +876,7 @@ class Translator extends EventEmitter {
           while (possibleKey = finalKeys.pop()) {
             if (!this.isValidLookup(found)) {
               exactUsedKey = possibleKey;
-              found = this.getResource(code, ns, possibleKey, options);
+              found = this.getResource(code, ns, possibleKey, opt);
             }
           }
         });
@@ -890,15 +893,13 @@ class Translator extends EventEmitter {
   isValidLookup(res) {
     return res !== void 0 && !(!this.options.returnNull && res === null) && !(!this.options.returnEmptyString && res === "");
   }
-  getResource(code, ns, key2) {
+  getResource(code, ns, key2, options = {}) {
     var _a;
-    let options = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {};
     if ((_a = this.i18nFormat) == null ? void 0 : _a.getResource)
       return this.i18nFormat.getResource(code, ns, key2, options);
     return this.resourceStore.getResource(code, ns, key2, options);
   }
-  getUsedParamsDetails() {
-    let options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+  getUsedParamsDetails(options = {}) {
     const optionsKeys = ["defaultValue", "ordinal", "context", "replace", "lng", "lngs", "fallbackLng", "ns", "keySeparator", "nsSeparator", "returnObjects", "returnDetails", "joinArrays", "postProcess", "interpolation"];
     const useOptionsReplaceForData = options.replace && !isString$1(options.replace);
     let data = useOptionsReplaceForData ? options.replace : options;
@@ -996,6 +997,9 @@ class LanguageUtil {
       codes.forEach((code) => {
         if (found)
           return;
+        const lngScOnly = this.getScriptPartFromCode(code);
+        if (this.isSupportedCode(lngScOnly))
+          return found = lngScOnly;
         const lngOnly = this.getLanguagePartFromCode(code);
         if (this.isSupportedCode(lngOnly))
           return found = lngOnly;
@@ -1038,7 +1042,7 @@ class LanguageUtil {
     return found || [];
   }
   toResolveHierarchy(code, fallbackCode) {
-    const fallbackCodes = this.getFallbackCodes(fallbackCode || this.options.fallbackLng || [], code);
+    const fallbackCodes = this.getFallbackCodes((fallbackCode === false ? [] : fallbackCode) || this.options.fallbackLng || [], code);
     const codes = [];
     const addCode = (c) => {
       if (!c)
@@ -1081,8 +1085,7 @@ const dummyRule = {
   })
 };
 class PluralResolver {
-  constructor(languageUtils) {
-    let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  constructor(languageUtils, options = {}) {
     this.languageUtils = languageUtils;
     this.options = options;
     this.logger = baseLogger.create("pluralResolver");
@@ -1094,8 +1097,7 @@ class PluralResolver {
   clearCache() {
     this.pluralRulesCache = {};
   }
-  getRule(code) {
-    let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  getRule(code, options = {}) {
     const cleanedCode = getCleanedCode(code === "dev" ? "en" : code);
     const type = options.ordinal ? "ordinal" : "cardinal";
     const cacheKey = JSON.stringify({
@@ -1123,19 +1125,16 @@ class PluralResolver {
     this.pluralRulesCache[cacheKey] = rule;
     return rule;
   }
-  needsPlural(code) {
-    let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  needsPlural(code, options = {}) {
     let rule = this.getRule(code, options);
     if (!rule)
       rule = this.getRule("dev", options);
     return (rule == null ? void 0 : rule.resolvedOptions().pluralCategories.length) > 1;
   }
-  getPluralFormsOfKey(code, key2) {
-    let options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
+  getPluralFormsOfKey(code, key2, options = {}) {
     return this.getSuffixes(code, options).map((suffix) => `${key2}${suffix}`);
   }
-  getSuffixes(code) {
-    let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  getSuffixes(code, options = {}) {
     let rule = this.getRule(code, options);
     if (!rule)
       rule = this.getRule("dev", options);
@@ -1143,8 +1142,7 @@ class PluralResolver {
       return [];
     return rule.resolvedOptions().pluralCategories.sort((pluralCategory1, pluralCategory2) => suffixesOrder[pluralCategory1] - suffixesOrder[pluralCategory2]).map((pluralCategory) => `${this.options.prepend}${options.ordinal ? `ordinal${this.options.prepend}` : ""}${pluralCategory}`);
   }
-  getSuffix(code, count2) {
-    let options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
+  getSuffix(code, count2, options = {}) {
     const rule = this.getRule(code, options);
     if (rule) {
       return `${this.options.prepend}${options.ordinal ? `ordinal${this.options.prepend}` : ""}${rule.select(count2)}`;
@@ -1153,9 +1151,7 @@ class PluralResolver {
     return this.getSuffix("dev", count2, options);
   }
 }
-const deepFindWithDefaults = function(data, defaultData2, key2) {
-  let keySeparator = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : ".";
-  let ignoreJSONStructure = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : true;
+const deepFindWithDefaults = (data, defaultData2, key2, keySeparator = ".", ignoreJSONStructure = true) => {
   let path = getPathWithDefaults(data, defaultData2, key2);
   if (!path && ignoreJSONStructure && isString$1(key2)) {
     path = deepFind(data, key2, keySeparator);
@@ -1166,16 +1162,14 @@ const deepFindWithDefaults = function(data, defaultData2, key2) {
 };
 const regexSafe = (val) => val.replace(/\$/g, "$$$$");
 class Interpolator {
-  constructor() {
+  constructor(options = {}) {
     var _a;
-    let options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
     this.logger = baseLogger.create("interpolator");
     this.options = options;
     this.format = ((_a = options == null ? void 0 : options.interpolation) == null ? void 0 : _a.format) || ((value) => value);
     this.init(options);
   }
-  init() {
-    let options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+  init(options = {}) {
     if (!options.interpolation)
       options.interpolation = {
         escapeValue: true
@@ -1228,7 +1222,7 @@ class Interpolator {
     };
     this.regexp = getOrResetRegExp(this.regexp, `${this.prefix}(.+?)${this.suffix}`);
     this.regexpUnescape = getOrResetRegExp(this.regexpUnescape, `${this.prefix}${this.unescapePrefix}(.+?)${this.unescapeSuffix}${this.suffix}`);
-    this.nestingRegexp = getOrResetRegExp(this.nestingRegexp, `${this.nestingPrefix}(.+?)${this.nestingSuffix}`);
+    this.nestingRegexp = getOrResetRegExp(this.nestingRegexp, `${this.nestingPrefix}((?:[^()"']+|"[^"]*"|'[^']*'|\\((?:[^()]|"[^"]*"|'[^']*')*\\))*?)${this.nestingSuffix}`);
   }
   interpolate(str, data, lng, options) {
     var _a;
@@ -1301,8 +1295,7 @@ class Interpolator {
     });
     return str;
   }
-  nest(str, fc) {
-    let options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
+  nest(str, fc, options = {}) {
     let match2;
     let value;
     let clonedOptions;
@@ -1342,12 +1335,10 @@ class Interpolator {
       clonedOptions = clonedOptions.replace && !isString$1(clonedOptions.replace) ? clonedOptions.replace : clonedOptions;
       clonedOptions.applyPostProcessor = false;
       delete clonedOptions.defaultValue;
-      let doReduce = false;
-      if (match2[0].indexOf(this.formatSeparator) !== -1 && !/{.*}/.test(match2[1])) {
-        const r = match2[1].split(this.formatSeparator).map((elem) => elem.trim());
-        match2[1] = r.shift();
-        formatters2 = r;
-        doReduce = true;
+      const keyEndIndex = /{.*}/.test(match2[1]) ? match2[1].lastIndexOf("}") + 1 : match2[1].indexOf(this.formatSeparator);
+      if (keyEndIndex !== -1) {
+        formatters2 = match2[1].slice(keyEndIndex).split(this.formatSeparator).map((elem) => elem.trim()).filter(Boolean);
+        match2[1] = match2[1].slice(0, keyEndIndex);
       }
       value = fc(handleHasOptions.call(this, match2[1].trim(), clonedOptions), clonedOptions);
       if (value && match2[0] === str && !isString$1(value))
@@ -1358,7 +1349,7 @@ class Interpolator {
         this.logger.warn(`missed to resolve ${match2[1]} for nesting ${str}`);
         value = "";
       }
-      if (doReduce) {
+      if (formatters2.length) {
         value = formatters2.reduce((v, f) => this.format(v, f, options.lng, {
           ...options,
           interpolationkey: match2[1].trim()
@@ -1409,68 +1400,68 @@ const parseFormatStr = (formatStr) => {
 };
 const createCachedFormatter = (fn) => {
   const cache = {};
-  return (val, lng, options) => {
-    let optForCache = options;
-    if (options && options.interpolationkey && options.formatParams && options.formatParams[options.interpolationkey] && options[options.interpolationkey]) {
+  return (v, l, o) => {
+    let optForCache = o;
+    if (o && o.interpolationkey && o.formatParams && o.formatParams[o.interpolationkey] && o[o.interpolationkey]) {
       optForCache = {
         ...optForCache,
-        [options.interpolationkey]: void 0
+        [o.interpolationkey]: void 0
       };
     }
-    const key2 = lng + JSON.stringify(optForCache);
-    let formatter = cache[key2];
-    if (!formatter) {
-      formatter = fn(getCleanedCode(lng), options);
-      cache[key2] = formatter;
+    const key2 = l + JSON.stringify(optForCache);
+    let frm = cache[key2];
+    if (!frm) {
+      frm = fn(getCleanedCode(l), o);
+      cache[key2] = frm;
     }
-    return formatter(val);
+    return frm(v);
   };
 };
+const createNonCachedFormatter = (fn) => (v, l, o) => fn(getCleanedCode(l), o)(v);
 class Formatter {
-  constructor() {
-    let options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+  constructor(options = {}) {
     this.logger = baseLogger.create("formatter");
     this.options = options;
+    this.init(options);
+  }
+  init(services, options = {
+    interpolation: {}
+  }) {
+    this.formatSeparator = options.interpolation.formatSeparator || ",";
+    const cf = options.cacheInBuiltFormats ? createCachedFormatter : createNonCachedFormatter;
     this.formats = {
-      number: createCachedFormatter((lng, opt) => {
+      number: cf((lng, opt) => {
         const formatter = new Intl.NumberFormat(lng, {
           ...opt
         });
         return (val) => formatter.format(val);
       }),
-      currency: createCachedFormatter((lng, opt) => {
+      currency: cf((lng, opt) => {
         const formatter = new Intl.NumberFormat(lng, {
           ...opt,
           style: "currency"
         });
         return (val) => formatter.format(val);
       }),
-      datetime: createCachedFormatter((lng, opt) => {
+      datetime: cf((lng, opt) => {
         const formatter = new Intl.DateTimeFormat(lng, {
           ...opt
         });
         return (val) => formatter.format(val);
       }),
-      relativetime: createCachedFormatter((lng, opt) => {
+      relativetime: cf((lng, opt) => {
         const formatter = new Intl.RelativeTimeFormat(lng, {
           ...opt
         });
         return (val) => formatter.format(val, opt.range || "day");
       }),
-      list: createCachedFormatter((lng, opt) => {
+      list: cf((lng, opt) => {
         const formatter = new Intl.ListFormat(lng, {
           ...opt
         });
         return (val) => formatter.format(val);
       })
     };
-    this.init(options);
-  }
-  init(services) {
-    let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {
-      interpolation: {}
-    };
-    this.formatSeparator = options.interpolation.formatSeparator || ",";
   }
   add(name, fc) {
     this.formats[name.toLowerCase().trim()] = fc;
@@ -1478,8 +1469,7 @@ class Formatter {
   addCached(name, fc) {
     this.formats[name.toLowerCase().trim()] = createCachedFormatter(fc);
   }
-  format(value, format2, lng) {
-    let options = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {};
+  format(value, format2, lng, options = {}) {
     const formats = format2.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);
@@ -1520,9 +1510,8 @@ const removePending = (q, name) => {
   }
 };
 class Connector extends EventEmitter {
-  constructor(backend, store, services) {
+  constructor(backend, store, services, options = {}) {
     var _a, _b;
-    let options = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {};
     super();
     this.backend = backend;
     this.store = store;
@@ -1628,10 +1617,7 @@ class Connector extends EventEmitter {
     this.emit("loaded", loaded);
     this.queue = this.queue.filter((q) => !q.done);
   }
-  read(lng, ns, fcName) {
-    let tried = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : 0;
-    let wait = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : this.retryTimeout;
-    let callback = arguments.length > 5 ? arguments[5] : void 0;
+  read(lng, ns, fcName, tried = 0, wait = this.retryTimeout, callback) {
     if (!lng.length)
       return callback(null, {});
     if (this.readingCalls >= this.maxParallelReads) {
@@ -1676,9 +1662,7 @@ class Connector extends EventEmitter {
     }
     return fc(lng, ns, resolver);
   }
-  prepareLoading(languages, namespaces) {
-    let options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
-    let callback = arguments.length > 3 ? arguments[3] : void 0;
+  prepareLoading(languages, namespaces, options = {}, callback) {
     if (!this.backend) {
       this.logger.warn("No backend was added via i18next.use. Will not load resources.");
       return callback && callback();
@@ -1705,8 +1689,7 @@ class Connector extends EventEmitter {
       reload: true
     }, callback);
   }
-  loadOne(name) {
-    let prefix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
+  loadOne(name, prefix = "") {
     const s = name.split("|");
     const lng = s[0];
     const ns = s[1];
@@ -1718,11 +1701,9 @@ class Connector extends EventEmitter {
       this.loaded(name, err, data);
     });
   }
-  saveMissing(languages, namespace, key2, fallbackValue, isUpdate) {
+  saveMissing(languages, namespace, key2, fallbackValue, isUpdate, options = {}, clb = () => {
+  }) {
     var _a, _b, _c, _d, _e;
-    let options = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : {};
-    let clb = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : () => {
-    };
     if (((_b = (_a = this.services) == null ? void 0 : _a.utils) == null ? void 0 : _b.hasLoadedNamespace) && !((_d = (_c = this.services) == null ? void 0 : _c.utils) == null ? void 0 : _d.hasLoadedNamespace(namespace))) {
       this.logger.warn(`did not save key "${key2}" as the namespace "${namespace}" 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;
@@ -1821,7 +1802,8 @@ const get = () => ({
     nestingOptionsSeparator: ",",
     maxReplaces: 1e3,
     skipOnVariables: true
-  }
+  },
+  cacheInBuiltFormats: true
 });
 const transformOptions = (options) => {
   var _a, _b;
@@ -1849,9 +1831,7 @@ const bindMemberFunctions = (inst) => {
   });
 };
 class I18n extends EventEmitter {
-  constructor() {
-    let options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-    let callback = arguments.length > 1 ? arguments[1] : void 0;
+  constructor(options = {}, callback) {
     super();
     this.options = transformOptions(options);
     this.services = {};
@@ -1870,10 +1850,7 @@ class I18n extends EventEmitter {
       }, 0);
     }
   }
-  init() {
-    var _this = this;
-    let options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-    let callback = arguments.length > 1 ? arguments[1] : void 0;
+  init(options = {}, callback) {
     this.isInitializing = true;
     if (typeof options === "function") {
       callback = options;
@@ -1931,9 +1908,14 @@ class I18n extends EventEmitter {
         prepend: this.options.pluralSeparator,
         simplifyPluralSuffix: this.options.simplifyPluralSuffix
       });
+      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)) {
         s.formatter = createClassOnDemand(formatter);
-        s.formatter.init(s, this.options);
+        if (s.formatter.init)
+          s.formatter.init(s, this.options);
         this.options.interpolation.format = s.formatter.format.bind(s.formatter);
       }
       s.interpolator = new Interpolator(this.options);
@@ -1941,11 +1923,8 @@ class I18n extends EventEmitter {
         hasLoadedNamespace: this.hasLoadedNamespace.bind(this)
       };
       s.backendConnector = new Connector(createClassOnDemand(this.modules.backend), s.resourceStore, s, this.options);
-      s.backendConnector.on("*", function(event) {
-        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-          args[_key - 1] = arguments[_key];
-        }
-        _this.emit(event, ...args);
+      s.backendConnector.on("*", (event, ...args) => {
+        this.emit(event, ...args);
       });
       if (this.modules.languageDetector) {
         s.languageDetector = createClassOnDemand(this.modules.languageDetector);
@@ -1958,11 +1937,8 @@ class I18n extends EventEmitter {
           s.i18nFormat.init(this);
       }
       this.translator = new Translator(this.services, this.options);
-      this.translator.on("*", function(event) {
-        for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-          args[_key2 - 1] = arguments[_key2];
-        }
-        _this.emit(event, ...args);
+      this.translator.on("*", (event, ...args) => {
+        this.emit(event, ...args);
       });
       this.modules.external.forEach((m) => {
         if (m.init)
@@ -1982,15 +1958,13 @@ class I18n extends EventEmitter {
     }
     const storeApi = ["getResource", "hasResourceBundle", "getResourceBundle", "getDataByLanguage"];
     storeApi.forEach((fcName) => {
-      this[fcName] = function() {
-        return _this.store[fcName](...arguments);
-      };
+      this[fcName] = (...args) => this.store[fcName](...args);
     });
     const storeApiChained = ["addResource", "addResources", "addResourceBundle", "removeResourceBundle"];
     storeApiChained.forEach((fcName) => {
-      this[fcName] = function() {
-        _this.store[fcName](...arguments);
-        return _this;
+      this[fcName] = (...args) => {
+        this.store[fcName](...args);
+        return this;
       };
     });
     const deferred = defer();
@@ -2017,9 +1991,8 @@ class I18n extends EventEmitter {
     }
     return deferred;
   }
-  loadResources(language) {
+  loadResources(language, callback = noop$1) {
     var _a, _b;
-    let callback = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : noop$1;
     let usedCallback = callback;
     const usedLng = isString$1(language) ? language : this.language;
     if (typeof language === "function")
@@ -2121,9 +2094,12 @@ class I18n extends EventEmitter {
         break;
       }
     }
+    if (!this.resolvedLanguage && this.languages.indexOf(l) < 0 && this.store.hasLanguageSomeTranslations(l)) {
+      this.resolvedLanguage = l;
+      this.languages.unshift(l);
+    }
   }
   changeLanguage(lng, callback) {
-    var _this2 = this;
     this.isLanguageChangingTo = lng;
     const deferred = defer();
     this.emit("languageChanging", lng);
@@ -2135,27 +2111,26 @@ class I18n extends EventEmitter {
     };
     const done = (err, l) => {
       if (l) {
-        setLngProps(l);
-        this.translator.changeLanguage(l);
-        this.isLanguageChangingTo = void 0;
-        this.emit("languageChanged", l);
-        this.logger.log("languageChanged", l);
+        if (this.isLanguageChangingTo === lng) {
+          setLngProps(l);
+          this.translator.changeLanguage(l);
+          this.isLanguageChangingTo = void 0;
+          this.emit("languageChanged", l);
+          this.logger.log("languageChanged", l);
+        }
       } else {
         this.isLanguageChangingTo = void 0;
       }
-      deferred.resolve(function() {
-        return _this2.t(...arguments);
-      });
+      deferred.resolve((...args) => this.t(...args));
       if (callback)
-        callback(err, function() {
-          return _this2.t(...arguments);
-        });
+        callback(err, (...args) => this.t(...args));
     };
     const setLng = (lngs) => {
       var _a, _b;
       if (!lng && !lngs && this.services.languageDetector)
         lngs = [];
-      const l = isString$1(lngs) ? lngs : this.services.languageUtils.getBestMatchFromCodes(lngs);
+      const fl = isString$1(lngs) ? lngs : lngs && lngs[0];
+      const l = this.store.hasLanguageSomeTranslations(fl) ? fl : this.services.languageUtils.getBestMatchFromCodes(isString$1(lngs) ? [lngs] : lngs);
       if (l) {
         if (!this.language) {
           setLngProps(l);
@@ -2182,32 +2157,40 @@ class I18n extends EventEmitter {
     return deferred;
   }
   getFixedT(lng, ns, keyPrefix) {
-    var _this3 = this;
-    const fixedT = function(key2, opts) {
-      let options;
+    const fixedT = (key2, opts, ...rest) => {
+      let o;
       if (typeof opts !== "object") {
-        for (var _len3 = arguments.length, rest = new Array(_len3 > 2 ? _len3 - 2 : 0), _key3 = 2; _key3 < _len3; _key3++) {
-          rest[_key3 - 2] = arguments[_key3];
-        }
-        options = _this3.options.overloadTranslationOptionHandler([key2, opts].concat(rest));
+        o = this.options.overloadTranslationOptionHandler([key2, opts].concat(rest));
       } else {
-        options = {
+        o = {
           ...opts
         };
       }
-      options.lng = options.lng || fixedT.lng;
-      options.lngs = options.lngs || fixedT.lngs;
-      options.ns = options.ns || fixedT.ns;
-      if (options.keyPrefix !== "")
-        options.keyPrefix = options.keyPrefix || keyPrefix || fixedT.keyPrefix;
-      const keySeparator = _this3.options.keySeparator || ".";
+      o.lng = o.lng || fixedT.lng;
+      o.lngs = o.lngs || fixedT.lngs;
+      o.ns = o.ns || fixedT.ns;
+      if (o.keyPrefix !== "")
+        o.keyPrefix = o.keyPrefix || keyPrefix || fixedT.keyPrefix;
+      const keySeparator = this.options.keySeparator || ".";
       let resultKey;
-      if (options.keyPrefix && Array.isArray(key2)) {
-        resultKey = key2.map((k) => `${options.keyPrefix}${keySeparator}${k}`);
+      if (o.keyPrefix && Array.isArray(key2)) {
+        resultKey = key2.map((k) => {
+          if (typeof k === "function")
+            k = keysFromSelector(k, {
+              ...this.options,
+              ...opts
+            });
+          return `${o.keyPrefix}${keySeparator}${k}`;
+        });
       } else {
-        resultKey = options.keyPrefix ? `${options.keyPrefix}${keySeparator}${key2}` : key2;
+        if (typeof key2 === "function")
+          key2 = keysFromSelector(key2, {
+            ...this.options,
+            ...opts
+          });
+        resultKey = o.keyPrefix ? `${o.keyPrefix}${keySeparator}${key2}` : key2;
       }
-      return _this3.t(resultKey, options);
+      return this.t(resultKey, o);
     };
     if (isString$1(lng)) {
       fixedT.lng = lng;
@@ -2218,25 +2201,18 @@ class I18n extends EventEmitter {
     fixedT.keyPrefix = keyPrefix;
     return fixedT;
   }
-  t() {
+  t(...args) {
     var _a;
-    for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-      args[_key4] = arguments[_key4];
-    }
     return (_a = this.translator) == null ? void 0 : _a.translate(...args);
   }
-  exists() {
+  exists(...args) {
     var _a;
-    for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-      args[_key5] = arguments[_key5];
-    }
     return (_a = this.translator) == null ? void 0 : _a.exists(...args);
   }
   setDefaultNamespace(ns) {
     this.options.defaultNS = ns;
   }
-  hasLoadedNamespace(ns) {
-    let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  hasLoadedNamespace(ns, options = {}) {
     if (!this.isInitialized) {
       this.logger.warn("hasLoadedNamespace: i18next was not initialized", this.languages);
       return false;
@@ -2312,18 +2288,25 @@ class I18n extends EventEmitter {
       lng = this.resolvedLanguage || (((_a = this.languages) == null ? void 0 : _a.length) > 0 ? this.languages[0] : this.language);
     if (!lng)
       return "rtl";
+    try {
+      const l = new Intl.Locale(lng);
+      if (l && l.getTextInfo) {
+        const ti = l.getTextInfo();
+        if (ti && ti.direction)
+          return ti.direction;
+      }
+    } catch (e) {
+    }
     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 = ((_b = this.services) == null ? void 0 : _b.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";
   }
-  static createInstance() {
-    let options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-    let callback = arguments.length > 1 ? arguments[1] : void 0;
+  static createInstance(options = {}, callback) {
     return new I18n(options, callback);
   }
-  cloneInstance() {
-    let options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-    let callback = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : noop$1;
+  cloneInstance(options = {}, callback = noop$1) {
     const forkResourceStore = options.forkResourceStore;
     if (forkResourceStore)
       delete options.forkResourceStore;
@@ -2353,21 +2336,19 @@ class I18n extends EventEmitter {
         prev[l] = {
           ...this.store.data[l]
         };
-        return Object.keys(prev[l]).reduce((acc, n) => {
+        prev[l] = Object.keys(prev[l]).reduce((acc, n) => {
           acc[n] = {
             ...prev[l][n]
           };
           return acc;
-        }, {});
+        }, prev[l]);
+        return prev;
       }, {});
       clone.store = new ResourceStore(clonedData, mergedOptions);
       clone.services.resourceStore = clone.store;
     }
     clone.translator = new Translator(clone.services, mergedOptions);
-    clone.translator.on("*", function(event) {
-      for (var _len6 = arguments.length, args = new Array(_len6 > 1 ? _len6 - 1 : 0), _key6 = 1; _key6 < _len6; _key6++) {
-        args[_key6 - 1] = arguments[_key6];
-      }
+    clone.translator.on("*", (event, ...args) => {
       clone.emit(event, ...args);
     });
     clone.init(mergedOptions, callback);
@@ -10656,14 +10637,14 @@ const TaskListTableDefaultInner = ({
   );
 };
 const TaskListTable = memo(TaskListTableDefaultInner);
-const taskListRoot = "_taskListRoot_ycl6i_1";
-const taskListHorizontalScroll = "_taskListHorizontalScroll_ycl6i_27";
-const taskListResizer = "_taskListResizer_ycl6i_91";
-const horizontalContainer$1 = "_horizontalContainer_ycl6i_155";
-const tableWrapper = "_tableWrapper_ycl6i_173";
-const scrollToTop = "_scrollToTop_ycl6i_185";
-const scrollToBottom = "_scrollToBottom_ycl6i_201";
-const hidden = "_hidden_ycl6i_217";
+const taskListRoot = "_taskListRoot_1x5nq_1";
+const taskListHorizontalScroll = "_taskListHorizontalScroll_1x5nq_25";
+const taskListResizer = "_taskListResizer_1x5nq_89";
+const horizontalContainer$1 = "_horizontalContainer_1x5nq_153";
+const tableWrapper = "_tableWrapper_1x5nq_171";
+const scrollToTop = "_scrollToTop_1x5nq_183";
+const scrollToBottom = "_scrollToBottom_1x5nq_199";
+const hidden = "_hidden_1x5nq_215";
 const styles$d = {
   taskListRoot,
   taskListHorizontalScroll,
@@ -13146,12 +13127,12 @@ const TaskGanttContentInner = (props) => {
   ] });
 };
 const TaskGanttContent = memo(TaskGanttContentInner);
-const ganttVerticalContainer = "_ganttVerticalContainer_1btnv_1";
-const horizontalContainer = "_horizontalContainer_1btnv_85";
-const ganttHeader = "_ganttHeader_1btnv_111";
-const ganttBodyScroll = "_ganttBodyScroll_1btnv_121";
-const wrapper = "_wrapper_1btnv_143";
-const calendarDragging = "_calendarDragging_1btnv_177";
+const ganttVerticalContainer = "_ganttVerticalContainer_1xboz_1";
+const horizontalContainer = "_horizontalContainer_1xboz_81";
+const ganttHeader = "_ganttHeader_1xboz_97";
+const ganttBodyScroll = "_ganttBodyScroll_1xboz_107";
+const wrapper = "_wrapper_1xboz_123";
+const calendarDragging = "_calendarDragging_1xboz_153";
 const styles$2 = {
   ganttVerticalContainer,
   horizontalContainer,
@@ -18769,8 +18750,8 @@ const Gantt = (props) => {
     [renderedColumnIndexes]
   );
   const svgWidth = useMemo(
-    () => Math.max(datesLength * distances.columnWidth, svgClientWidth),
-    [datesLength, distances, svgClientWidth]
+    () => datesLength * distances.columnWidth,
+    [datesLength, distances]
   );
   const countTaskCoordinates$1 = useCallback(
     (task) => countTaskCoordinates(