stream-engine-widgets 0.3.23 → 0.3.25

package/dist/stream-engine-widgets.js

@@ -3,6 +3,7 @@ import { r as reactDomExports } from './index-BsDK2hqc.js';
 import { g as getDefaultExportFromCjs } from './index-DxAI6Tai.js';
 import { P as Player } from './player-static--rFjcMT2.js';
 import { L as Loader } from './loader-C6xf7J_T.js';
+import { _ as _assertThisInitialized, a as _inherits, b as _getPrototypeOf } from './getPrototypeOf-a55cCBEE.js';
 
 function _mergeNamespaces(n, m) {
   for (var i = 0; i < m.length; i++) {
@@ -989,8 +990,59 @@ const __variableDynamicImportRuntimeHelper = (glob, path, segs) => {
   });
 };
 
-const matchHtmlEntity = /&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g;
-const htmlEntities = {
+function _typeof(o) {
+  "@babel/helpers - typeof";
+
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
+    return typeof o;
+  } : function (o) {
+    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+  }, _typeof(o);
+}
+
+function toPrimitive(t, r) {
+  if ("object" != _typeof(t) || !t) return t;
+  var e = t[Symbol.toPrimitive];
+  if (void 0 !== e) {
+    var i = e.call(t, r);
+    if ("object" != _typeof(i)) return i;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return ("string" === r ? String : Number)(t);
+}
+
+function toPropertyKey(t) {
+  var i = toPrimitive(t, "string");
+  return "symbol" == _typeof(i) ? i : i + "";
+}
+
+function _defineProperty(e, r, t) {
+  return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+    value: t,
+    enumerable: true,
+    configurable: true,
+    writable: true
+  }) : e[r] = t, e;
+}
+
+function _classCallCheck(a, n) {
+  if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
+}
+
+function _defineProperties(e, r) {
+  for (var t = 0; t < r.length; t++) {
+    var o = r[t];
+    o.enumerable = o.enumerable || false, o.configurable = true, "value" in o && (o.writable = true), Object.defineProperty(e, toPropertyKey(o.key), o);
+  }
+}
+function _createClass(e, r, t) {
+  return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", {
+    writable: false
+  }), e;
+}
+
+var matchHtmlEntity = /&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g;
+var htmlEntities = {
   '&amp;': '&',
   '&#38;': '&',
   '&lt;': '<',
@@ -1012,10 +1064,21 @@ const htmlEntities = {
   '&#x2F;': '/',
   '&#47;': '/'
 };
-const unescapeHtmlEntity = m => htmlEntities[m];
-const unescape = text => text.replace(matchHtmlEntity, unescapeHtmlEntity);
 
-let defaultOptions = {
+var unescapeHtmlEntity = function unescapeHtmlEntity(m) {
+  return htmlEntities[m];
+};
+
+var unescape = function unescape(text) {
+  return text.replace(matchHtmlEntity, unescapeHtmlEntity);
+};
+
+function ownKeys$7(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread$7(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$7(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$7(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+const {createContext} = await importShared('react');
+var defaultOptions = {
   bindI18n: 'languageChanged',
   bindI18nStore: '',
   transEmptyNodeValue: '',
@@ -1023,163 +1086,268 @@ let defaultOptions = {
   transWrapTextNodes: '',
   transKeepBasicHtmlNodesFor: ['br', 'strong', 'i', 'p'],
   useSuspense: true,
-  unescape
-};
-const setDefaults = function () {
-  let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  defaultOptions = {
-    ...defaultOptions,
-    ...options
-  };
+  unescape: unescape
 };
+var I18nContext = createContext();
+function setDefaults() {
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  defaultOptions = _objectSpread$7(_objectSpread$7({}, defaultOptions), options);
+}
+(function () {
+  function ReportNamespaces() {
+    _classCallCheck(this, ReportNamespaces);
+
+    this.usedNamespaces = {};
+  }
+
+  _createClass(ReportNamespaces, [{
+    key: "addUsedNamespaces",
+    value: function addUsedNamespaces(namespaces) {
+      var _this = this;
+
+      namespaces.forEach(function (ns) {
+        if (!_this.usedNamespaces[ns]) _this.usedNamespaces[ns] = true;
+      });
+    }
+  }, {
+    key: "getUsedNamespaces",
+    value: function getUsedNamespaces() {
+      return Object.keys(this.usedNamespaces);
+    }
+  }]);
 
-const initReactI18next = {
+  return ReportNamespaces;
+})();
+var initReactI18next = {
   type: '3rdParty',
-  init(instance) {
+  init: function init(instance) {
     setDefaults(instance.options.react);
   }
 };
 
-const {createContext} = await importShared('react');
-const I18nContext = createContext();
+function _arrayWithHoles(r) {
+  if (Array.isArray(r)) return r;
+}
+
+function _arrayLikeToArray(r, a) {
+  (null == a || a > r.length) && (a = r.length);
+  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+  return n;
+}
+
+function _unsupportedIterableToArray(r, a) {
+  if (r) {
+    if ("string" == typeof r) return _arrayLikeToArray(r, a);
+    var t = {}.toString.call(r).slice(8, -1);
+    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
+  }
+}
+
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
 
-const {createElement,useMemo} = await importShared('react');
+const {createElement,useMemo: useMemo$1} = await importShared('react');
 function I18nextProvider(_ref) {
-  let {
-    i18n,
-    defaultNS,
-    children
-  } = _ref;
-  const value = useMemo(() => ({
-    i18n,
-    defaultNS
-  }), [i18n, defaultNS]);
+  var i18n = _ref.i18n,
+      defaultNS = _ref.defaultNS,
+      children = _ref.children;
+  var value = useMemo$1(function () {
+    return {
+      i18n: i18n,
+      defaultNS: defaultNS
+    };
+  }, [i18n, defaultNS]);
   return createElement(I18nContext.Provider, {
-    value
+    value: value
   }, children);
 }
 
-const consoleLogger = {
+function _possibleConstructorReturn(t, e) {
+  if (e && ("object" == _typeof(e) || "function" == typeof e)) return e;
+  if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
+  return _assertThisInitialized(t);
+}
+
+function _iterableToArray(r) {
+  if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
+}
+
+function _toArray(r) {
+  return _arrayWithHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableRest();
+}
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+var consoleLogger = {
   type: 'logger',
-  log(args) {
+  log: function log(args) {
     this.output('log', args);
   },
-  warn(args) {
+  warn: function warn(args) {
     this.output('warn', args);
   },
-  error(args) {
+  error: function error(args) {
     this.output('error', args);
   },
-  output(type, args) {
+  output: function output(type, args) {
     if (console && console[type]) console[type].apply(console, args);
   }
 };
-class Logger {
-  constructor(concreteLogger) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+var Logger = function () {
+  function Logger(concreteLogger) {
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+    _classCallCheck(this, Logger);
+
     this.init(concreteLogger, options);
   }
-  init(concreteLogger) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    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];
-    }
-    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];
+
+  _createClass(Logger, [{
+    key: "init",
+    value: function init(concreteLogger) {
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      this.prefix = options.prefix || 'i18next:';
+      this.logger = concreteLogger || consoleLogger;
+      this.options = options;
+      this.debug = options.debug;
+    }
+  }, {
+    key: "setDebug",
+    value: function setDebug(bool) {
+      this.debug = bool;
+    }
+  }, {
+    key: "log",
+    value: function log() {
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+
+      return this.forward(args, 'log', '', true);
     }
-    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];
+  }, {
+    key: "warn",
+    value: function warn() {
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
+      }
+
+      return this.forward(args, 'warn', '', true);
     }
-    return this.forward(args, 'error', '');
-  }
-  deprecate() {
-    for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-      args[_key4] = arguments[_key4];
+  }, {
+    key: "error",
+    value: function error() {
+      for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+        args[_key3] = arguments[_key3];
+      }
+
+      return this.forward(args, 'error', '');
     }
-    return this.forward(args, 'warn', 'WARNING DEPRECATED: ', true);
-  }
-  forward(args, lvl, prefix, debugOnly) {
-    if (debugOnly && !this.debug) return null;
-    if (typeof args[0] === 'string') args[0] = `${prefix}${this.prefix} ${args[0]}`;
-    return this.logger[lvl](args);
-  }
-  create(moduleName) {
-    return new Logger(this.logger, {
-      ...{
-        prefix: `${this.prefix}:${moduleName}:`
-      },
-      ...this.options
-    });
-  }
-  clone(options) {
-    options = options || this.options;
-    options.prefix = options.prefix || this.prefix;
-    return new Logger(this.logger, options);
-  }
-}
+  }, {
+    key: "deprecate",
+    value: function deprecate() {
+      for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+        args[_key4] = arguments[_key4];
+      }
+
+      return this.forward(args, 'warn', 'WARNING DEPRECATED: ', true);
+    }
+  }, {
+    key: "forward",
+    value: function forward(args, lvl, prefix, debugOnly) {
+      if (debugOnly && !this.debug) return null;
+      if (typeof args[0] === 'string') args[0] = "".concat(prefix).concat(this.prefix, " ").concat(args[0]);
+      return this.logger[lvl](args);
+    }
+  }, {
+    key: "create",
+    value: function create(moduleName) {
+      return new Logger(this.logger, _objectSpread(_objectSpread({}, {
+        prefix: "".concat(this.prefix, ":").concat(moduleName, ":")
+      }), this.options));
+    }
+  }, {
+    key: "clone",
+    value: function clone(options) {
+      options = options || this.options;
+      options.prefix = options.prefix || this.prefix;
+      return new Logger(this.logger, options);
+    }
+  }]);
+
+  return Logger;
+}();
+
 var baseLogger = new Logger();
 
-class EventEmitter {
-  constructor() {
+var EventEmitter = function () {
+  function EventEmitter() {
+    _classCallCheck(this, EventEmitter);
+
     this.observers = {};
   }
-  on(events, listener) {
-    events.split(' ').forEach(event => {
-      if (!this.observers[event]) this.observers[event] = new Map();
-      const numListeners = this.observers[event].get(listener) || 0;
-      this.observers[event].set(listener, numListeners + 1);
-    });
-    return this;
-  }
-  off(event, listener) {
-    if (!this.observers[event]) return;
-    if (!listener) {
-      delete this.observers[event];
-      return;
-    }
-    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];
-    }
-    if (this.observers[event]) {
-      const cloned = Array.from(this.observers[event].entries());
-      cloned.forEach(_ref => {
-        let [observer, numTimesAdded] = _ref;
-        for (let i = 0; i < numTimesAdded; i++) {
-          observer(...args);
-        }
+
+  _createClass(EventEmitter, [{
+    key: "on",
+    value: function on(events, listener) {
+      var _this = this;
+
+      events.split(' ').forEach(function (event) {
+        _this.observers[event] = _this.observers[event] || [];
+
+        _this.observers[event].push(listener);
       });
+      return this;
     }
-    if (this.observers['*']) {
-      const cloned = Array.from(this.observers['*'].entries());
-      cloned.forEach(_ref2 => {
-        let [observer, numTimesAdded] = _ref2;
-        for (let i = 0; i < numTimesAdded; i++) {
-          observer.apply(observer, [event, ...args]);
-        }
+  }, {
+    key: "off",
+    value: function off(event, listener) {
+      if (!this.observers[event]) return;
+
+      if (!listener) {
+        delete this.observers[event];
+        return;
+      }
+
+      this.observers[event] = this.observers[event].filter(function (l) {
+        return l !== listener;
       });
     }
-  }
-}
+  }, {
+    key: "emit",
+    value: function 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];
+      }
+
+      if (this.observers[event]) {
+        var cloned = [].concat(this.observers[event]);
+        cloned.forEach(function (observer) {
+          observer.apply(void 0, args);
+        });
+      }
+
+      if (this.observers['*']) {
+        var _cloned = [].concat(this.observers['*']);
+
+        _cloned.forEach(function (observer) {
+          observer.apply(observer, [event].concat(args));
+        });
+      }
+    }
+  }]);
+
+  return EventEmitter;
+}();
 
 function defer() {
-  let res;
-  let rej;
-  const promise = new Promise((resolve, reject) => {
+  var res;
+  var rej;
+  var promise = new Promise(function (resolve, reject) {
     res = resolve;
     rej = reject;
   });
@@ -1192,84 +1360,75 @@ function makeString(object) {
   return '' + object;
 }
 function copy(a, s, t) {
-  a.forEach(m => {
+  a.forEach(function (m) {
     if (s[m]) t[m] = s[m];
   });
 }
-const lastOfPathSeparatorRegExp = /###/g;
+
 function getLastOfPath(object, path, Empty) {
   function cleanKey(key) {
-    return key && key.indexOf('###') > -1 ? key.replace(lastOfPathSeparatorRegExp, '.') : key;
+    return key && key.indexOf('###') > -1 ? key.replace(/###/g, '.') : key;
   }
+
   function canNotTraverseDeeper() {
     return !object || typeof object === 'string';
   }
-  const stack = typeof path !== 'string' ? path : path.split('.');
-  let stackIndex = 0;
-  while (stackIndex < stack.length - 1) {
+
+  var stack = typeof path !== 'string' ? [].concat(path) : path.split('.');
+
+  while (stack.length > 1) {
     if (canNotTraverseDeeper()) return {};
-    const key = cleanKey(stack[stackIndex]);
+    var key = cleanKey(stack.shift());
     if (!object[key] && Empty) object[key] = new Empty();
+
     if (Object.prototype.hasOwnProperty.call(object, key)) {
       object = object[key];
     } else {
       object = {};
     }
-    ++stackIndex;
   }
+
   if (canNotTraverseDeeper()) return {};
   return {
     obj: object,
-    k: cleanKey(stack[stackIndex])
+    k: cleanKey(stack.shift())
   };
 }
+
 function setPath(object, path, newValue) {
-  const {
-    obj,
-    k
-  } = getLastOfPath(object, path, Object);
-  if (obj !== undefined || path.length === 1) {
-    obj[k] = newValue;
-    return;
-  }
-  let e = path[path.length - 1];
-  let p = path.slice(0, path.length - 1);
-  let last = getLastOfPath(object, p, Object);
-  while (last.obj === undefined && p.length) {
-    e = `${p[p.length - 1]}.${e}`;
-    p = p.slice(0, p.length - 1);
-    last = getLastOfPath(object, p, Object);
-    if (last && last.obj && typeof last.obj[`${last.k}.${e}`] !== 'undefined') {
-      last.obj = undefined;
-    }
-  }
-  last.obj[`${last.k}.${e}`] = newValue;
+  var _getLastOfPath = getLastOfPath(object, path, Object),
+      obj = _getLastOfPath.obj,
+      k = _getLastOfPath.k;
+
+  obj[k] = newValue;
 }
 function pushPath(object, path, newValue, concat) {
-  const {
-    obj,
-    k
-  } = getLastOfPath(object, path, Object);
+  var _getLastOfPath2 = getLastOfPath(object, path, Object),
+      obj = _getLastOfPath2.obj,
+      k = _getLastOfPath2.k;
+
   obj[k] = obj[k] || [];
   obj[k].push(newValue);
 }
 function getPath(object, path) {
-  const {
-    obj,
-    k
-  } = getLastOfPath(object, path);
+  var _getLastOfPath3 = getLastOfPath(object, path),
+      obj = _getLastOfPath3.obj,
+      k = _getLastOfPath3.k;
+
   if (!obj) return undefined;
   return obj[k];
 }
 function getPathWithDefaults(data, defaultData, key) {
-  const value = getPath(data, key);
+  var value = getPath(data, key);
+
   if (value !== undefined) {
     return value;
   }
+
   return getPath(defaultData, key);
 }
 function deepExtend(target, source, overwrite) {
-  for (const prop in source) {
+  for (var prop in source) {
     if (prop !== '__proto__' && prop !== 'constructor') {
       if (prop in target) {
         if (typeof target[prop] === 'string' || target[prop] instanceof String || typeof source[prop] === 'string' || source[prop] instanceof String) {
@@ -1282,6 +1441,7 @@ function deepExtend(target, source, overwrite) {
       }
     }
   }
+
   return target;
 }
 function regexEscape(str) {
@@ -1297,758 +1457,880 @@ var _entityMap = {
 };
 function escape(data) {
   if (typeof data === 'string') {
-    return data.replace(/[&<>"'\/]/g, s => _entityMap[s]);
+    return data.replace(/[&<>"'\/]/g, function (s) {
+      return _entityMap[s];
+    });
   }
+
   return data;
 }
-class RegExpCache {
-  constructor(capacity) {
-    this.capacity = capacity;
-    this.regExpMap = new Map();
-    this.regExpQueue = [];
-  }
-  getRegExp(pattern) {
-    const regExpFromCache = this.regExpMap.get(pattern);
-    if (regExpFromCache !== undefined) {
-      return regExpFromCache;
-    }
-    const regExpNew = new RegExp(pattern);
-    if (this.regExpQueue.length === this.capacity) {
-      this.regExpMap.delete(this.regExpQueue.shift());
-    }
-    this.regExpMap.set(pattern, regExpNew);
-    this.regExpQueue.push(pattern);
-    return regExpNew;
-  }
-}
-const chars = [' ', ',', '?', '!', ';'];
-const looksLikeObjectPathRegExpCache = new RegExpCache(20);
+var isIE10 = typeof window !== 'undefined' && window.navigator && typeof window.navigator.userAgentData === 'undefined' && window.navigator.userAgent && window.navigator.userAgent.indexOf('MSIE') > -1;
+var chars = [' ', ',', '?', '!', ';'];
 function looksLikeObjectPath(key, nsSeparator, keySeparator) {
   nsSeparator = nsSeparator || '';
   keySeparator = keySeparator || '';
-  const possibleChars = chars.filter(c => nsSeparator.indexOf(c) < 0 && keySeparator.indexOf(c) < 0);
+  var possibleChars = chars.filter(function (c) {
+    return nsSeparator.indexOf(c) < 0 && keySeparator.indexOf(c) < 0;
+  });
   if (possibleChars.length === 0) return true;
-  const r = looksLikeObjectPathRegExpCache.getRegExp(`(${possibleChars.map(c => c === '?' ? '\\?' : c).join('|')})`);
-  let matched = !r.test(key);
+  var r = new RegExp("(".concat(possibleChars.map(function (c) {
+    return c === '?' ? '\\?' : c;
+  }).join('|'), ")"));
+  var matched = !r.test(key);
+
   if (!matched) {
-    const ki = key.indexOf(keySeparator);
+    var ki = key.indexOf(keySeparator);
+
     if (ki > 0 && !r.test(key.substring(0, ki))) {
       matched = true;
     }
   }
+
   return matched;
 }
+
+function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$1(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 function deepFind(obj, path) {
-  let keySeparator = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '.';
+  var keySeparator = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '.';
   if (!obj) return undefined;
   if (obj[path]) return obj[path];
-  const tokens = path.split(keySeparator);
-  let current = obj;
-  for (let i = 0; i < tokens.length;) {
-    if (!current || typeof current !== 'object') {
+  var paths = path.split(keySeparator);
+  var current = obj;
+
+  for (var i = 0; i < paths.length; ++i) {
+    if (!current) return undefined;
+
+    if (typeof current[paths[i]] === 'string' && i + 1 < paths.length) {
       return undefined;
     }
-    let next;
-    let nextPath = '';
-    for (let j = i; j < tokens.length; ++j) {
-      if (j !== i) {
-        nextPath += keySeparator;
+
+    if (current[paths[i]] === undefined) {
+      var j = 2;
+      var p = paths.slice(i, i + j).join(keySeparator);
+      var mix = current[p];
+
+      while (mix === undefined && paths.length > i + j) {
+        j++;
+        p = paths.slice(i, i + j).join(keySeparator);
+        mix = current[p];
       }
-      nextPath += tokens[j];
-      next = current[nextPath];
-      if (next !== undefined) {
-        if (['string', 'number', 'boolean'].indexOf(typeof next) > -1 && j < tokens.length - 1) {
-          continue;
-        }
-        i += j - i + 1;
-        break;
+
+      if (mix === undefined) return undefined;
+      if (mix === null) return null;
+
+      if (path.endsWith(p)) {
+        if (typeof mix === 'string') return mix;
+        if (p && typeof mix[p] === 'string') return mix[p];
       }
+
+      var joinedPath = paths.slice(i + j).join(keySeparator);
+      if (joinedPath) return deepFind(mix, joinedPath, keySeparator);
+      return undefined;
     }
-    current = next;
+
+    current = current[paths[i]];
   }
+
   return current;
 }
-function getCleanedCode(code) {
-  if (code && code.indexOf('_') > 0) return code.replace('_', '-');
-  return code;
-}
 
-class ResourceStore extends EventEmitter {
-  constructor(data) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+var ResourceStore = function (_EventEmitter) {
+  _inherits(ResourceStore, _EventEmitter);
+
+  var _super = _createSuper(ResourceStore);
+
+  function ResourceStore(data) {
+    var _this;
+
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
       ns: ['translation'],
       defaultNS: 'translation'
     };
-    super();
-    this.data = data || {};
-    this.options = options;
-    if (this.options.keySeparator === undefined) {
-      this.options.keySeparator = '.';
-    }
-    if (this.options.ignoreJSONStructure === undefined) {
-      this.options.ignoreJSONStructure = true;
+
+    _classCallCheck(this, ResourceStore);
+
+    _this = _super.call(this);
+
+    if (isIE10) {
+      EventEmitter.call(_assertThisInitialized(_this));
     }
-  }
-  addNamespaces(ns) {
-    if (this.options.ns.indexOf(ns) < 0) {
-      this.options.ns.push(ns);
+
+    _this.data = data || {};
+    _this.options = options;
+
+    if (_this.options.keySeparator === undefined) {
+      _this.options.keySeparator = '.';
     }
-  }
-  removeNamespaces(ns) {
-    const index = this.options.ns.indexOf(ns);
-    if (index > -1) {
-      this.options.ns.splice(index, 1);
+
+    if (_this.options.ignoreJSONStructure === undefined) {
+      _this.options.ignoreJSONStructure = true;
     }
+
+    return _this;
   }
-  getResource(lng, ns, key) {
-    let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-    const keySeparator = options.keySeparator !== undefined ? options.keySeparator : this.options.keySeparator;
-    const ignoreJSONStructure = options.ignoreJSONStructure !== undefined ? options.ignoreJSONStructure : this.options.ignoreJSONStructure;
-    let path;
-    if (lng.indexOf('.') > -1) {
-      path = lng.split('.');
-    } else {
-      path = [lng, ns];
-      if (key) {
-        if (Array.isArray(key)) {
-          path.push(...key);
-        } else if (typeof key === 'string' && keySeparator) {
-          path.push(...key.split(keySeparator));
-        } else {
-          path.push(key);
-        }
+
+  _createClass(ResourceStore, [{
+    key: "addNamespaces",
+    value: function addNamespaces(ns) {
+      if (this.options.ns.indexOf(ns) < 0) {
+        this.options.ns.push(ns);
       }
     }
-    const result = getPath(this.data, path);
-    if (!result && !ns && !key && lng.indexOf('.') > -1) {
-      lng = path[0];
-      ns = path[1];
-      key = path.slice(2).join('.');
+  }, {
+    key: "removeNamespaces",
+    value: function removeNamespaces(ns) {
+      var index = this.options.ns.indexOf(ns);
+
+      if (index > -1) {
+        this.options.ns.splice(index, 1);
+      }
     }
-    if (result || !ignoreJSONStructure || typeof key !== 'string') return result;
-    return deepFind(this.data && this.data[lng] && this.data[lng][ns], key, keySeparator);
-  }
-  addResource(lng, ns, key, value) {
-    let options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {
-      silent: false
-    };
-    const keySeparator = options.keySeparator !== undefined ? options.keySeparator : this.options.keySeparator;
-    let path = [lng, ns];
-    if (key) path = path.concat(keySeparator ? key.split(keySeparator) : key);
-    if (lng.indexOf('.') > -1) {
-      path = lng.split('.');
-      value = ns;
-      ns = path[1];
-    }
-    this.addNamespaces(ns);
-    setPath(this.data, path, value);
-    if (!options.silent) this.emit('added', lng, ns, key, value);
-  }
-  addResources(lng, ns, resources) {
-    let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
-      silent: false
-    };
-    for (const m in resources) {
-      if (typeof resources[m] === 'string' || Array.isArray(resources[m])) this.addResource(lng, ns, m, resources[m], {
-        silent: true
-      });
+  }, {
+    key: "getResource",
+    value: function getResource(lng, ns, key) {
+      var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+      var keySeparator = options.keySeparator !== undefined ? options.keySeparator : this.options.keySeparator;
+      var ignoreJSONStructure = options.ignoreJSONStructure !== undefined ? options.ignoreJSONStructure : this.options.ignoreJSONStructure;
+      var path = [lng, ns];
+      if (key && typeof key !== 'string') path = path.concat(key);
+      if (key && typeof key === 'string') path = path.concat(keySeparator ? key.split(keySeparator) : key);
+
+      if (lng.indexOf('.') > -1) {
+        path = lng.split('.');
+      }
+
+      var result = getPath(this.data, path);
+      if (result || !ignoreJSONStructure || typeof key !== 'string') return result;
+      return deepFind(this.data && this.data[lng] && this.data[lng][ns], key, keySeparator);
+    }
+  }, {
+    key: "addResource",
+    value: function addResource(lng, ns, key, value) {
+      var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {
+        silent: false
+      };
+      var keySeparator = this.options.keySeparator;
+      if (keySeparator === undefined) keySeparator = '.';
+      var path = [lng, ns];
+      if (key) path = path.concat(keySeparator ? key.split(keySeparator) : key);
+
+      if (lng.indexOf('.') > -1) {
+        path = lng.split('.');
+        value = ns;
+        ns = path[1];
+      }
+
+      this.addNamespaces(ns);
+      setPath(this.data, path, value);
+      if (!options.silent) this.emit('added', lng, ns, key, value);
+    }
+  }, {
+    key: "addResources",
+    value: function addResources(lng, ns, resources) {
+      var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
+        silent: false
+      };
+
+      for (var m in resources) {
+        if (typeof resources[m] === 'string' || Object.prototype.toString.apply(resources[m]) === '[object Array]') this.addResource(lng, ns, m, resources[m], {
+          silent: true
+        });
+      }
+
+      if (!options.silent) this.emit('added', lng, ns, resources);
     }
-    if (!options.silent) this.emit('added', lng, ns, resources);
-  }
-  addResourceBundle(lng, ns, resources, deep, overwrite) {
-    let options = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {
-      silent: false,
-      skipCopy: false
-    };
-    let path = [lng, ns];
-    if (lng.indexOf('.') > -1) {
-      path = lng.split('.');
-      deep = resources;
-      resources = ns;
-      ns = path[1];
-    }
-    this.addNamespaces(ns);
-    let pack = getPath(this.data, path) || {};
-    if (!options.skipCopy) resources = JSON.parse(JSON.stringify(resources));
-    if (deep) {
-      deepExtend(pack, resources, overwrite);
-    } else {
-      pack = {
-        ...pack,
-        ...resources
+  }, {
+    key: "addResourceBundle",
+    value: function addResourceBundle(lng, ns, resources, deep, overwrite) {
+      var options = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {
+        silent: false
       };
+      var path = [lng, ns];
+
+      if (lng.indexOf('.') > -1) {
+        path = lng.split('.');
+        deep = resources;
+        resources = ns;
+        ns = path[1];
+      }
+
+      this.addNamespaces(ns);
+      var pack = getPath(this.data, path) || {};
+
+      if (deep) {
+        deepExtend(pack, resources, overwrite);
+      } else {
+        pack = _objectSpread$1(_objectSpread$1({}, pack), resources);
+      }
+
+      setPath(this.data, path, pack);
+      if (!options.silent) this.emit('added', lng, ns, resources);
+    }
+  }, {
+    key: "removeResourceBundle",
+    value: function removeResourceBundle(lng, ns) {
+      if (this.hasResourceBundle(lng, ns)) {
+        delete this.data[lng][ns];
+      }
+
+      this.removeNamespaces(ns);
+      this.emit('removed', lng, ns);
+    }
+  }, {
+    key: "hasResourceBundle",
+    value: function hasResourceBundle(lng, ns) {
+      return this.getResource(lng, ns) !== undefined;
+    }
+  }, {
+    key: "getResourceBundle",
+    value: function getResourceBundle(lng, ns) {
+      if (!ns) ns = this.options.defaultNS;
+      if (this.options.compatibilityAPI === 'v1') return _objectSpread$1(_objectSpread$1({}, {}), this.getResource(lng, ns));
+      return this.getResource(lng, ns);
+    }
+  }, {
+    key: "getDataByLanguage",
+    value: function getDataByLanguage(lng) {
+      return this.data[lng];
+    }
+  }, {
+    key: "hasLanguageSomeTranslations",
+    value: function hasLanguageSomeTranslations(lng) {
+      var data = this.getDataByLanguage(lng);
+      var n = data && Object.keys(data) || [];
+      return !!n.find(function (v) {
+        return data[v] && Object.keys(data[v]).length > 0;
+      });
     }
-    setPath(this.data, path, pack);
-    if (!options.silent) this.emit('added', lng, ns, resources);
-  }
-  removeResourceBundle(lng, ns) {
-    if (this.hasResourceBundle(lng, ns)) {
-      delete this.data[lng][ns];
+  }, {
+    key: "toJSON",
+    value: function toJSON() {
+      return this.data;
     }
-    this.removeNamespaces(ns);
-    this.emit('removed', lng, ns);
-  }
-  hasResourceBundle(lng, ns) {
-    return this.getResource(lng, ns) !== undefined;
-  }
-  getResourceBundle(lng, ns) {
-    if (!ns) ns = this.options.defaultNS;
-    if (this.options.compatibilityAPI === 'v1') return {
-      ...{},
-      ...this.getResource(lng, ns)
-    };
-    return this.getResource(lng, ns);
-  }
-  getDataByLanguage(lng) {
-    return this.data[lng];
-  }
-  hasLanguageSomeTranslations(lng) {
-    const data = this.getDataByLanguage(lng);
-    const n = data && Object.keys(data) || [];
-    return !!n.find(v => data[v] && Object.keys(data[v]).length > 0);
-  }
-  toJSON() {
-    return this.data;
-  }
-}
+  }]);
+
+  return ResourceStore;
+}(EventEmitter);
 
 var postProcessor = {
   processors: {},
-  addPostProcessor(module) {
+  addPostProcessor: function addPostProcessor(module) {
     this.processors[module.name] = module;
   },
-  handle(processors, value, key, options, translator) {
-    processors.forEach(processor => {
-      if (this.processors[processor]) value = this.processors[processor].process(value, key, options, translator);
+  handle: function handle(processors, value, key, options, translator) {
+    var _this = this;
+
+    processors.forEach(function (processor) {
+      if (_this.processors[processor]) value = _this.processors[processor].process(value, key, options, translator);
     });
     return value;
   }
 };
 
-const checkedLoadedFor = {};
-class Translator extends EventEmitter {
-  constructor(services) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    super();
-    copy(['resourceStore', 'languageUtils', 'pluralResolver', 'interpolator', 'backendConnector', 'i18nFormat', 'utils'], services, this);
-    this.options = options;
-    if (this.options.keySeparator === undefined) {
-      this.options.keySeparator = '.';
+function ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$2(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _createSuper$1(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$1(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct$1() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var checkedLoadedFor = {};
+
+var Translator = function (_EventEmitter) {
+  _inherits(Translator, _EventEmitter);
+
+  var _super = _createSuper$1(Translator);
+
+  function Translator(services) {
+    var _this;
+
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+    _classCallCheck(this, Translator);
+
+    _this = _super.call(this);
+
+    if (isIE10) {
+      EventEmitter.call(_assertThisInitialized(_this));
     }
-    this.logger = baseLogger.create('translator');
-  }
-  changeLanguage(lng) {
-    if (lng) this.language = lng;
-  }
-  exists(key) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
-      interpolation: {}
-    };
-    if (key === undefined || key === null) {
-      return false;
+
+    copy(['resourceStore', 'languageUtils', 'pluralResolver', 'interpolator', 'backendConnector', 'i18nFormat', 'utils'], services, _assertThisInitialized(_this));
+    _this.options = options;
+
+    if (_this.options.keySeparator === undefined) {
+      _this.options.keySeparator = '.';
     }
-    const resolved = this.resolve(key, options);
-    return resolved && resolved.res !== undefined;
+
+    _this.logger = baseLogger.create('translator');
+    return _this;
   }
-  extractFromKey(key, options) {
-    let nsSeparator = options.nsSeparator !== undefined ? options.nsSeparator : this.options.nsSeparator;
-    if (nsSeparator === undefined) nsSeparator = ':';
-    const keySeparator = options.keySeparator !== undefined ? options.keySeparator : this.options.keySeparator;
-    let namespaces = options.ns || this.options.defaultNS || [];
-    const wouldCheckForNsInKey = nsSeparator && key.indexOf(nsSeparator) > -1;
-    const seemsNaturalLanguage = !this.options.userDefinedKeySeparator && !options.keySeparator && !this.options.userDefinedNsSeparator && !options.nsSeparator && !looksLikeObjectPath(key, nsSeparator, keySeparator);
-    if (wouldCheckForNsInKey && !seemsNaturalLanguage) {
-      const m = key.match(this.interpolator.nestingRegexp);
-      if (m && m.length > 0) {
-        return {
-          key,
-          namespaces
-        };
+
+  _createClass(Translator, [{
+    key: "changeLanguage",
+    value: function changeLanguage(lng) {
+      if (lng) this.language = lng;
+    }
+  }, {
+    key: "exists",
+    value: function exists(key) {
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+        interpolation: {}
+      };
+
+      if (key === undefined || key === null) {
+        return false;
       }
-      const parts = key.split(nsSeparator);
-      if (nsSeparator !== keySeparator || nsSeparator === keySeparator && this.options.ns.indexOf(parts[0]) > -1) namespaces = parts.shift();
-      key = parts.join(keySeparator);
-    }
-    if (typeof namespaces === 'string') namespaces = [namespaces];
-    return {
-      key,
-      namespaces
-    };
-  }
-  translate(keys, options, lastKey) {
-    if (typeof options !== 'object' && this.options.overloadTranslationOptionHandler) {
-      options = this.options.overloadTranslationOptionHandler(arguments);
-    }
-    if (typeof options === 'object') options = {
-      ...options
-    };
-    if (!options) options = {};
-    if (keys === undefined || keys === null) return '';
-    if (!Array.isArray(keys)) keys = [String(keys)];
-    const returnDetails = options.returnDetails !== undefined ? options.returnDetails : this.options.returnDetails;
-    const keySeparator = options.keySeparator !== undefined ? options.keySeparator : this.options.keySeparator;
-    const {
-      key,
-      namespaces
-    } = this.extractFromKey(keys[keys.length - 1], options);
-    const namespace = namespaces[namespaces.length - 1];
-    const lng = options.lng || this.language;
-    const appendNamespaceToCIMode = options.appendNamespaceToCIMode || this.options.appendNamespaceToCIMode;
-    if (lng && lng.toLowerCase() === 'cimode') {
-      if (appendNamespaceToCIMode) {
-        const nsSeparator = options.nsSeparator || this.options.nsSeparator;
-        if (returnDetails) {
+
+      var resolved = this.resolve(key, options);
+      return resolved && resolved.res !== undefined;
+    }
+  }, {
+    key: "extractFromKey",
+    value: function extractFromKey(key, options) {
+      var nsSeparator = options.nsSeparator !== undefined ? options.nsSeparator : this.options.nsSeparator;
+      if (nsSeparator === undefined) nsSeparator = ':';
+      var keySeparator = options.keySeparator !== undefined ? options.keySeparator : this.options.keySeparator;
+      var namespaces = options.ns || this.options.defaultNS || [];
+      var wouldCheckForNsInKey = nsSeparator && key.indexOf(nsSeparator) > -1;
+      var seemsNaturalLanguage = !this.options.userDefinedKeySeparator && !options.keySeparator && !this.options.userDefinedNsSeparator && !options.nsSeparator && !looksLikeObjectPath(key, nsSeparator, keySeparator);
+
+      if (wouldCheckForNsInKey && !seemsNaturalLanguage) {
+        var m = key.match(this.interpolator.nestingRegexp);
+
+        if (m && m.length > 0) {
           return {
-            res: `${namespace}${nsSeparator}${key}`,
-            usedKey: key,
-            exactUsedKey: key,
-            usedLng: lng,
-            usedNS: namespace,
-            usedParams: this.getUsedParamsDetails(options)
+            key: key,
+            namespaces: namespaces
           };
         }
-        return `${namespace}${nsSeparator}${key}`;
+
+        var parts = key.split(nsSeparator);
+        if (nsSeparator !== keySeparator || nsSeparator === keySeparator && this.options.ns.indexOf(parts[0]) > -1) namespaces = parts.shift();
+        key = parts.join(keySeparator);
       }
-      if (returnDetails) {
-        return {
-          res: key,
-          usedKey: key,
-          exactUsedKey: key,
-          usedLng: lng,
-          usedNS: namespace,
-          usedParams: this.getUsedParamsDetails(options)
-        };
+
+      if (typeof namespaces === 'string') namespaces = [namespaces];
+      return {
+        key: key,
+        namespaces: namespaces
+      };
+    }
+  }, {
+    key: "translate",
+    value: function translate(keys, options, lastKey) {
+      var _this2 = this;
+
+      if (_typeof(options) !== 'object' && this.options.overloadTranslationOptionHandler) {
+        options = this.options.overloadTranslationOptionHandler(arguments);
       }
-      return key;
-    }
-    const resolved = this.resolve(keys, options);
-    let res = resolved && resolved.res;
-    const resUsedKey = resolved && resolved.usedKey || key;
-    const resExactUsedKey = resolved && resolved.exactUsedKey || key;
-    const resType = Object.prototype.toString.apply(res);
-    const noObject = ['[object Number]', '[object Function]', '[object RegExp]'];
-    const joinArrays = options.joinArrays !== undefined ? options.joinArrays : this.options.joinArrays;
-    const handleAsObjectInI18nFormat = !this.i18nFormat || this.i18nFormat.handleAsObject;
-    const handleAsObject = typeof res !== 'string' && typeof res !== 'boolean' && typeof res !== 'number';
-    if (handleAsObjectInI18nFormat && res && handleAsObject && noObject.indexOf(resType) < 0 && !(typeof joinArrays === 'string' && Array.isArray(res))) {
-      if (!options.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, res, {
-          ...options,
-          ns: namespaces
-        }) : `key '${key} (${this.language})' returned an object instead of string.`;
-        if (returnDetails) {
-          resolved.res = r;
-          resolved.usedParams = this.getUsedParamsDetails(options);
-          return resolved;
-        }
-        return r;
-      }
-      if (keySeparator) {
-        const resTypeIsArray = Array.isArray(res);
-        const copy = resTypeIsArray ? [] : {};
-        const newKeyToUse = resTypeIsArray ? resExactUsedKey : resUsedKey;
-        for (const m in res) {
-          if (Object.prototype.hasOwnProperty.call(res, m)) {
-            const deepKey = `${newKeyToUse}${keySeparator}${m}`;
-            copy[m] = this.translate(deepKey, {
-              ...options,
-              ...{
-                joinArrays: false,
-                ns: namespaces
-              }
-            });
-            if (copy[m] === deepKey) copy[m] = res[m];
+
+      if (!options) options = {};
+      if (keys === undefined || keys === null) return '';
+      if (!Array.isArray(keys)) keys = [String(keys)];
+      var returnDetails = options.returnDetails !== undefined ? options.returnDetails : this.options.returnDetails;
+      var keySeparator = options.keySeparator !== undefined ? options.keySeparator : this.options.keySeparator;
+
+      var _this$extractFromKey = this.extractFromKey(keys[keys.length - 1], options),
+          key = _this$extractFromKey.key,
+          namespaces = _this$extractFromKey.namespaces;
+
+      var namespace = namespaces[namespaces.length - 1];
+      var lng = options.lng || this.language;
+      var appendNamespaceToCIMode = options.appendNamespaceToCIMode || this.options.appendNamespaceToCIMode;
+
+      if (lng && lng.toLowerCase() === 'cimode') {
+        if (appendNamespaceToCIMode) {
+          var nsSeparator = options.nsSeparator || this.options.nsSeparator;
+
+          if (returnDetails) {
+            resolved.res = "".concat(namespace).concat(nsSeparator).concat(key);
+            return resolved;
           }
+
+          return "".concat(namespace).concat(nsSeparator).concat(key);
         }
-        res = copy;
+
+        if (returnDetails) {
+          resolved.res = key;
+          return resolved;
+        }
+
+        return key;
       }
-    } else if (handleAsObjectInI18nFormat && typeof joinArrays === 'string' && Array.isArray(res)) {
-      res = res.join(joinArrays);
-      if (res) res = this.extendTranslation(res, keys, options, lastKey);
-    } else {
-      let usedDefault = false;
-      let usedKey = false;
-      const needsPluralHandling = options.count !== undefined && typeof options.count !== 'string';
-      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, {
-        ordinal: false
-      }) : '';
-      const needsZeroSuffixLookup = needsPluralHandling && !options.ordinal && options.count === 0 && this.pluralResolver.shouldUseIntlApi();
-      const defaultValue = needsZeroSuffixLookup && options[`defaultValue${this.options.pluralSeparator}zero`] || options[`defaultValue${defaultValueSuffix}`] || options[`defaultValue${defaultValueSuffixOrdinalFallback}`] || options.defaultValue;
-      if (!this.isValidLookup(res) && hasDefaultValue) {
-        usedDefault = true;
-        res = defaultValue;
-      }
-      if (!this.isValidLookup(res)) {
-        usedKey = true;
-        res = key;
-      }
-      const missingKeyNoValueFallbackToKey = options.missingKeyNoValueFallbackToKey || this.options.missingKeyNoValueFallbackToKey;
-      const resForMissing = missingKeyNoValueFallbackToKey && usedKey ? undefined : 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);
+
+      var resolved = this.resolve(keys, options);
+      var res = resolved && resolved.res;
+      var resUsedKey = resolved && resolved.usedKey || key;
+      var resExactUsedKey = resolved && resolved.exactUsedKey || key;
+      var resType = Object.prototype.toString.apply(res);
+      var noObject = ['[object Number]', '[object Function]', '[object RegExp]'];
+      var joinArrays = options.joinArrays !== undefined ? options.joinArrays : this.options.joinArrays;
+      var handleAsObjectInI18nFormat = !this.i18nFormat || this.i18nFormat.handleAsObject;
+      var handleAsObject = typeof res !== 'string' && typeof res !== 'boolean' && typeof res !== 'number';
+
+      if (handleAsObjectInI18nFormat && res && handleAsObject && noObject.indexOf(resType) < 0 && !(typeof joinArrays === 'string' && resType === '[object Array]')) {
+        if (!options.returnObjects && !this.options.returnObjects) {
+          if (!this.options.returnedObjectHandler) {
+            this.logger.warn('accessing an object - but returnObjects options is not enabled!');
+          }
+
+          var r = this.options.returnedObjectHandler ? this.options.returnedObjectHandler(resUsedKey, res, _objectSpread$2(_objectSpread$2({}, options), {}, {
+            ns: namespaces
+          })) : "key '".concat(key, " (").concat(this.language, ")' returned an object instead of string.");
+
+          if (returnDetails) {
+            resolved.res = r;
+            return resolved;
+          }
+
+          return r;
+        }
+
         if (keySeparator) {
-          const fk = this.resolve(key, {
-            ...options,
-            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.');
+          var resTypeIsArray = resType === '[object Array]';
+          var copy = resTypeIsArray ? [] : {};
+          var newKeyToUse = resTypeIsArray ? resExactUsedKey : resUsedKey;
+
+          for (var m in res) {
+            if (Object.prototype.hasOwnProperty.call(res, m)) {
+              var deepKey = "".concat(newKeyToUse).concat(keySeparator).concat(m);
+              copy[m] = this.translate(deepKey, _objectSpread$2(_objectSpread$2({}, options), {
+                joinArrays: false,
+                ns: namespaces
+              }));
+              if (copy[m] === deepKey) copy[m] = res[m];
+            }
+          }
+
+          res = copy;
+        }
+      } else if (handleAsObjectInI18nFormat && typeof joinArrays === 'string' && resType === '[object Array]') {
+        res = res.join(joinArrays);
+        if (res) res = this.extendTranslation(res, keys, options, lastKey);
+      } else {
+        var usedDefault = false;
+        var usedKey = false;
+        var needsPluralHandling = options.count !== undefined && typeof options.count !== 'string';
+        var hasDefaultValue = Translator.hasDefaultValue(options);
+        var defaultValueSuffix = needsPluralHandling ? this.pluralResolver.getSuffix(lng, options.count, options) : '';
+        var defaultValue = options["defaultValue".concat(defaultValueSuffix)] || options.defaultValue;
+
+        if (!this.isValidLookup(res) && hasDefaultValue) {
+          usedDefault = true;
+          res = defaultValue;
+        }
+
+        if (!this.isValidLookup(res)) {
+          usedKey = true;
+          res = key;
         }
-        let lngs = [];
-        const fallbackLngs = this.languageUtils.getFallbackCodes(this.options.fallbackLng, options.lng || this.language);
-        if (this.options.saveMissingTo === 'fallback' && fallbackLngs && fallbackLngs[0]) {
-          for (let i = 0; i < fallbackLngs.length; i++) {
-            lngs.push(fallbackLngs[i]);
+
+        var missingKeyNoValueFallbackToKey = options.missingKeyNoValueFallbackToKey || this.options.missingKeyNoValueFallbackToKey;
+        var resForMissing = missingKeyNoValueFallbackToKey && usedKey ? undefined : res;
+        var updateMissing = hasDefaultValue && defaultValue !== res && this.options.updateMissing;
+
+        if (usedKey || usedDefault || updateMissing) {
+          this.logger.log(updateMissing ? 'updateKey' : 'missingKey', lng, namespace, key, updateMissing ? defaultValue : res);
+
+          if (keySeparator) {
+            var fk = this.resolve(key, _objectSpread$2(_objectSpread$2({}, options), {}, {
+              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.');
           }
-        } else if (this.options.saveMissingTo === 'all') {
-          lngs = this.languageUtils.toResolveHierarchy(options.lng || this.language);
-        } else {
-          lngs.push(options.lng || this.language);
-        }
-        const send = (l, k, specificDefaultValue) => {
-          const defaultForMissing = hasDefaultValue && specificDefaultValue !== res ? specificDefaultValue : resForMissing;
-          if (this.options.missingKeyHandler) {
-            this.options.missingKeyHandler(l, namespace, k, defaultForMissing, updateMissing, options);
-          } else if (this.backendConnector && this.backendConnector.saveMissing) {
-            this.backendConnector.saveMissing(l, namespace, k, defaultForMissing, updateMissing, options);
+
+          var lngs = [];
+          var fallbackLngs = this.languageUtils.getFallbackCodes(this.options.fallbackLng, options.lng || this.language);
+
+          if (this.options.saveMissingTo === 'fallback' && fallbackLngs && fallbackLngs[0]) {
+            for (var i = 0; i < fallbackLngs.length; i++) {
+              lngs.push(fallbackLngs[i]);
+            }
+          } else if (this.options.saveMissingTo === 'all') {
+            lngs = this.languageUtils.toResolveHierarchy(options.lng || this.language);
+          } else {
+            lngs.push(options.lng || this.language);
           }
-          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) {
-                suffixes.push(`${this.options.pluralSeparator}zero`);
-              }
-              suffixes.forEach(suffix => {
-                send([language], key + suffix, options[`defaultValue${suffix}`] || defaultValue);
+
+          var send = function send(l, k, specificDefaultValue) {
+            var defaultForMissing = hasDefaultValue && specificDefaultValue !== res ? specificDefaultValue : resForMissing;
+
+            if (_this2.options.missingKeyHandler) {
+              _this2.options.missingKeyHandler(l, namespace, k, defaultForMissing, updateMissing, options);
+            } else if (_this2.backendConnector && _this2.backendConnector.saveMissing) {
+              _this2.backendConnector.saveMissing(l, namespace, k, defaultForMissing, updateMissing, options);
+            }
+
+            _this2.emit('missingKey', l, namespace, k, res);
+          };
+
+          if (this.options.saveMissing) {
+            if (this.options.saveMissingPlurals && needsPluralHandling) {
+              lngs.forEach(function (language) {
+                _this2.pluralResolver.getSuffixes(language, options).forEach(function (suffix) {
+                  send([language], key + suffix, options["defaultValue".concat(suffix)] || defaultValue);
+                });
               });
-            });
+            } else {
+              send(lngs, key, defaultValue);
+            }
+          }
+        }
+
+        res = this.extendTranslation(res, keys, options, resolved, lastKey);
+        if (usedKey && res === key && this.options.appendNamespaceToMissingKey) res = "".concat(namespace, ":").concat(key);
+
+        if ((usedKey || usedDefault) && this.options.parseMissingKeyHandler) {
+          if (this.options.compatibilityAPI !== 'v1') {
+            res = this.options.parseMissingKeyHandler(this.options.appendNamespaceToMissingKey ? "".concat(namespace, ":").concat(key) : key, usedDefault ? res : undefined);
           } else {
-            send(lngs, key, defaultValue);
+            res = this.options.parseMissingKeyHandler(res);
           }
         }
       }
-      res = this.extendTranslation(res, keys, options, resolved, lastKey);
-      if (usedKey && res === key && this.options.appendNamespaceToMissingKey) res = `${namespace}:${key}`;
-      if ((usedKey || usedDefault) && this.options.parseMissingKeyHandler) {
-        if (this.options.compatibilityAPI !== 'v1') {
-          res = this.options.parseMissingKeyHandler(this.options.appendNamespaceToMissingKey ? `${namespace}:${key}` : key, usedDefault ? res : undefined);
-        } else {
-          res = this.options.parseMissingKeyHandler(res);
-        }
+
+      if (returnDetails) {
+        resolved.res = res;
+        return resolved;
       }
+
+      return res;
     }
-    if (returnDetails) {
-      resolved.res = res;
-      resolved.usedParams = this.getUsedParamsDetails(options);
-      return resolved;
-    }
-    return res;
-  }
-  extendTranslation(res, key, options, resolved, lastKey) {
-    var _this = this;
-    if (this.i18nFormat && this.i18nFormat.parse) {
-      res = this.i18nFormat.parse(res, {
-        ...this.options.interpolation.defaultVariables,
-        ...options
-      }, options.lng || this.language || resolved.usedLng, resolved.usedNS, resolved.usedKey, {
-        resolved
-      });
-    } else if (!options.skipInterpolation) {
-      if (options.interpolation) this.interpolator.init({
-        ...options,
-        ...{
-          interpolation: {
-            ...this.options.interpolation,
-            ...options.interpolation
-          }
+  }, {
+    key: "extendTranslation",
+    value: function extendTranslation(res, key, options, resolved, lastKey) {
+      var _this3 = this;
+
+      if (this.i18nFormat && this.i18nFormat.parse) {
+        res = this.i18nFormat.parse(res, _objectSpread$2(_objectSpread$2({}, this.options.interpolation.defaultVariables), options), resolved.usedLng, resolved.usedNS, resolved.usedKey, {
+          resolved: resolved
+        });
+      } else if (!options.skipInterpolation) {
+        if (options.interpolation) this.interpolator.init(_objectSpread$2(_objectSpread$2({}, options), {
+          interpolation: _objectSpread$2(_objectSpread$2({}, this.options.interpolation), options.interpolation)
+        }));
+        var skipOnVariables = typeof res === 'string' && (options && options.interpolation && options.interpolation.skipOnVariables !== undefined ? options.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables);
+        var nestBef;
+
+        if (skipOnVariables) {
+          var nb = res.match(this.interpolator.nestingRegexp);
+          nestBef = nb && nb.length;
         }
-      });
-      const skipOnVariables = typeof res === 'string' && (options && options.interpolation && options.interpolation.skipOnVariables !== undefined ? options.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 && typeof options.replace !== 'string' ? options.replace : options;
-      if (this.options.interpolation.defaultVariables) data = {
-        ...this.options.interpolation.defaultVariables,
-        ...data
-      };
-      res = this.interpolator.interpolate(res, data, options.lng || this.language, options);
-      if (skipOnVariables) {
-        const na = res.match(this.interpolator.nestingRegexp);
-        const nestAft = na && na.length;
-        if (nestBef < nestAft) options.nest = false;
-      }
-      if (!options.lng && this.options.compatibilityAPI !== 'v1' && resolved && resolved.res) options.lng = 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 && lastKey[0] === args[0] && !options.context) {
-          _this.logger.warn(`It seems you are nesting recursively key: ${args[0]} in key: ${key[0]}`);
-          return null;
+
+        var data = options.replace && typeof options.replace !== 'string' ? options.replace : options;
+        if (this.options.interpolation.defaultVariables) data = _objectSpread$2(_objectSpread$2({}, this.options.interpolation.defaultVariables), data);
+        res = this.interpolator.interpolate(res, data, options.lng || this.language, options);
+
+        if (skipOnVariables) {
+          var na = res.match(this.interpolator.nestingRegexp);
+          var nestAft = na && na.length;
+          if (nestBef < nestAft) options.nest = false;
         }
-        return _this.translate(...args, key);
-      }, options);
-      if (options.interpolation) this.interpolator.reset();
-    }
-    const postProcess = options.postProcess || this.options.postProcess;
-    const postProcessorNames = typeof postProcess === 'string' ? [postProcess] : postProcess;
-    if (res !== undefined && res !== null && postProcessorNames && postProcessorNames.length && options.applyPostProcessor !== false) {
-      res = postProcessor.handle(postProcessorNames, res, key, this.options && this.options.postProcessPassResolved ? {
-        i18nResolved: {
-          ...resolved,
-          usedParams: this.getUsedParamsDetails(options)
-        },
-        ...options
-      } : options, this);
+
+        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 && lastKey[0] === args[0] && !options.context) {
+            _this3.logger.warn("It seems you are nesting recursively key: ".concat(args[0], " in key: ").concat(key[0]));
+
+            return null;
+          }
+
+          return _this3.translate.apply(_this3, args.concat([key]));
+        }, options);
+        if (options.interpolation) this.interpolator.reset();
+      }
+
+      var postProcess = options.postProcess || this.options.postProcess;
+      var postProcessorNames = typeof postProcess === 'string' ? [postProcess] : postProcess;
+
+      if (res !== undefined && res !== null && postProcessorNames && postProcessorNames.length && options.applyPostProcessor !== false) {
+        res = postProcessor.handle(postProcessorNames, res, key, this.options && this.options.postProcessPassResolved ? _objectSpread$2({
+          i18nResolved: resolved
+        }, options) : options, this);
+      }
+
+      return res;
     }
-    return res;
-  }
-  resolve(keys) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    let found;
-    let usedKey;
-    let exactUsedKey;
-    let usedLng;
-    let usedNS;
-    if (typeof keys === 'string') keys = [keys];
-    keys.forEach(k => {
-      if (this.isValidLookup(found)) return;
-      const extracted = this.extractFromKey(k, options);
-      const key = extracted.key;
-      usedKey = key;
-      let namespaces = extracted.namespaces;
-      if (this.options.fallbackNS) namespaces = namespaces.concat(this.options.fallbackNS);
-      const needsPluralHandling = options.count !== undefined && typeof options.count !== 'string';
-      const needsZeroSuffixLookup = needsPluralHandling && !options.ordinal && options.count === 0 && this.pluralResolver.shouldUseIntlApi();
-      const needsContextHandling = options.context !== undefined && (typeof options.context === 'string' || typeof options.context === 'number') && options.context !== '';
-      const codes = options.lngs ? options.lngs : this.languageUtils.toResolveHierarchy(options.lng || this.language, options.fallbackLng);
-      namespaces.forEach(ns => {
-        if (this.isValidLookup(found)) return;
-        usedNS = ns;
-        if (!checkedLoadedFor[`${codes[0]}-${ns}`] && this.utils && this.utils.hasLoadedNamespace && !this.utils.hasLoadedNamespace(usedNS)) {
-          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 => {
-          if (this.isValidLookup(found)) return;
-          usedLng = code;
-          const finalKeys = [key];
-          if (this.i18nFormat && this.i18nFormat.addLookupKeys) {
-            this.i18nFormat.addLookupKeys(finalKeys, key, code, ns, options);
-          } else {
-            let pluralSuffix;
-            if (needsPluralHandling) pluralSuffix = this.pluralResolver.getSuffix(code, options.count, options);
-            const zeroSuffix = `${this.options.pluralSeparator}zero`;
-            const ordinalPrefix = `${this.options.pluralSeparator}ordinal${this.options.pluralSeparator}`;
-            if (needsPluralHandling) {
-              finalKeys.push(key + pluralSuffix);
-              if (options.ordinal && pluralSuffix.indexOf(ordinalPrefix) === 0) {
-                finalKeys.push(key + pluralSuffix.replace(ordinalPrefix, this.options.pluralSeparator));
-              }
-              if (needsZeroSuffixLookup) {
-                finalKeys.push(key + zeroSuffix);
-              }
-            }
-            if (needsContextHandling) {
-              const contextKey = `${key}${this.options.contextSeparator}${options.context}`;
-              finalKeys.push(contextKey);
+  }, {
+    key: "resolve",
+    value: function resolve(keys) {
+      var _this4 = this;
+
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var found;
+      var usedKey;
+      var exactUsedKey;
+      var usedLng;
+      var usedNS;
+      if (typeof keys === 'string') keys = [keys];
+      keys.forEach(function (k) {
+        if (_this4.isValidLookup(found)) return;
+
+        var extracted = _this4.extractFromKey(k, options);
+
+        var key = extracted.key;
+        usedKey = key;
+        var namespaces = extracted.namespaces;
+        if (_this4.options.fallbackNS) namespaces = namespaces.concat(_this4.options.fallbackNS);
+        var needsPluralHandling = options.count !== undefined && typeof options.count !== 'string';
+
+        var needsZeroSuffixLookup = needsPluralHandling && !options.ordinal && options.count === 0 && _this4.pluralResolver.shouldUseIntlApi();
+
+        var needsContextHandling = options.context !== undefined && (typeof options.context === 'string' || typeof options.context === 'number') && options.context !== '';
+        var codes = options.lngs ? options.lngs : _this4.languageUtils.toResolveHierarchy(options.lng || _this4.language, options.fallbackLng);
+        namespaces.forEach(function (ns) {
+          if (_this4.isValidLookup(found)) return;
+          usedNS = ns;
+
+          if (!checkedLoadedFor["".concat(codes[0], "-").concat(ns)] && _this4.utils && _this4.utils.hasLoadedNamespace && !_this4.utils.hasLoadedNamespace(usedNS)) {
+            checkedLoadedFor["".concat(codes[0], "-").concat(ns)] = true;
+
+            _this4.logger.warn("key \"".concat(usedKey, "\" for languages \"").concat(codes.join(', '), "\" won't get resolved as namespace \"").concat(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(function (code) {
+            if (_this4.isValidLookup(found)) return;
+            usedLng = code;
+            var finalKeys = [key];
+
+            if (_this4.i18nFormat && _this4.i18nFormat.addLookupKeys) {
+              _this4.i18nFormat.addLookupKeys(finalKeys, key, code, ns, options);
+            } else {
+              var pluralSuffix;
+              if (needsPluralHandling) pluralSuffix = _this4.pluralResolver.getSuffix(code, options.count, options);
+              var zeroSuffix = "".concat(_this4.options.pluralSeparator, "zero");
+
               if (needsPluralHandling) {
-                finalKeys.push(contextKey + pluralSuffix);
-                if (options.ordinal && pluralSuffix.indexOf(ordinalPrefix) === 0) {
-                  finalKeys.push(contextKey + pluralSuffix.replace(ordinalPrefix, this.options.pluralSeparator));
-                }
+                finalKeys.push(key + pluralSuffix);
+
                 if (needsZeroSuffixLookup) {
-                  finalKeys.push(contextKey + zeroSuffix);
+                  finalKeys.push(key + zeroSuffix);
+                }
+              }
+
+              if (needsContextHandling) {
+                var contextKey = "".concat(key).concat(_this4.options.contextSeparator).concat(options.context);
+                finalKeys.push(contextKey);
+
+                if (needsPluralHandling) {
+                  finalKeys.push(contextKey + pluralSuffix);
+
+                  if (needsZeroSuffixLookup) {
+                    finalKeys.push(contextKey + zeroSuffix);
+                  }
                 }
               }
             }
-          }
-          let possibleKey;
-          while (possibleKey = finalKeys.pop()) {
-            if (!this.isValidLookup(found)) {
-              exactUsedKey = possibleKey;
-              found = this.getResource(code, ns, possibleKey, options);
+
+            var possibleKey;
+
+            while (possibleKey = finalKeys.pop()) {
+              if (!_this4.isValidLookup(found)) {
+                exactUsedKey = possibleKey;
+                found = _this4.getResource(code, ns, possibleKey, options);
+              }
             }
-          }
+          });
         });
       });
-    });
-    return {
-      res: found,
-      usedKey,
-      exactUsedKey,
-      usedLng,
-      usedNS
-    };
-  }
-  isValidLookup(res) {
-    return res !== undefined && !(!this.options.returnNull && res === null) && !(!this.options.returnEmptyString && res === '');
-  }
-  getResource(code, ns, key) {
-    let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-    if (this.i18nFormat && this.i18nFormat.getResource) return this.i18nFormat.getResource(code, ns, key, options);
-    return this.resourceStore.getResource(code, ns, key, options);
-  }
-  getUsedParamsDetails() {
-    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const optionsKeys = ['defaultValue', 'ordinal', 'context', 'replace', 'lng', 'lngs', 'fallbackLng', 'ns', 'keySeparator', 'nsSeparator', 'returnObjects', 'returnDetails', 'joinArrays', 'postProcess', 'interpolation'];
-    const useOptionsReplaceForData = options.replace && typeof options.replace !== 'string';
-    let data = useOptionsReplaceForData ? options.replace : options;
-    if (useOptionsReplaceForData && typeof options.count !== 'undefined') {
-      data.count = options.count;
-    }
-    if (this.options.interpolation.defaultVariables) {
-      data = {
-        ...this.options.interpolation.defaultVariables,
-        ...data
-      };
-    }
-    if (!useOptionsReplaceForData) {
-      data = {
-        ...data
+      return {
+        res: found,
+        usedKey: usedKey,
+        exactUsedKey: exactUsedKey,
+        usedLng: usedLng,
+        usedNS: usedNS
       };
-      for (const key of optionsKeys) {
-        delete data[key];
-      }
     }
-    return data;
-  }
-  static hasDefaultValue(options) {
-    const prefix = 'defaultValue';
-    for (const option in options) {
-      if (Object.prototype.hasOwnProperty.call(options, option) && prefix === option.substring(0, prefix.length) && undefined !== options[option]) {
-        return true;
+  }, {
+    key: "isValidLookup",
+    value: function isValidLookup(res) {
+      return res !== undefined && !(!this.options.returnNull && res === null) && !(!this.options.returnEmptyString && res === '');
+    }
+  }, {
+    key: "getResource",
+    value: function getResource(code, ns, key) {
+      var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+      if (this.i18nFormat && this.i18nFormat.getResource) return this.i18nFormat.getResource(code, ns, key, options);
+      return this.resourceStore.getResource(code, ns, key, options);
+    }
+  }], [{
+    key: "hasDefaultValue",
+    value: function hasDefaultValue(options) {
+      var prefix = 'defaultValue';
+
+      for (var option in options) {
+        if (Object.prototype.hasOwnProperty.call(options, option) && prefix === option.substring(0, prefix.length) && undefined !== options[option]) {
+          return true;
+        }
       }
+
+      return false;
     }
-    return false;
-  }
-}
+  }]);
+
+  return Translator;
+}(EventEmitter);
 
 function capitalize(string) {
   return string.charAt(0).toUpperCase() + string.slice(1);
 }
-class LanguageUtil {
-  constructor(options) {
+
+var LanguageUtil = function () {
+  function LanguageUtil(options) {
+    _classCallCheck(this, LanguageUtil);
+
     this.options = options;
     this.supportedLngs = this.options.supportedLngs || false;
     this.logger = baseLogger.create('languageUtils');
   }
-  getScriptPartFromCode(code) {
-    code = getCleanedCode(code);
-    if (!code || code.indexOf('-') < 0) return null;
-    const p = code.split('-');
-    if (p.length === 2) return null;
-    p.pop();
-    if (p[p.length - 1].toLowerCase() === 'x') return null;
-    return this.formatLanguageCode(p.join('-'));
-  }
-  getLanguagePartFromCode(code) {
-    code = getCleanedCode(code);
-    if (!code || code.indexOf('-') < 0) return code;
-    const p = code.split('-');
-    return this.formatLanguageCode(p[0]);
-  }
-  formatLanguageCode(code) {
-    if (typeof code === 'string' && code.indexOf('-') > -1) {
-      const specialCases = ['hans', 'hant', 'latn', 'cyrl', 'cans', 'mong', 'arab'];
-      let p = code.split('-');
-      if (this.options.lowerCaseLng) {
-        p = p.map(part => part.toLowerCase());
-      } else if (p.length === 2) {
-        p[0] = p[0].toLowerCase();
-        p[1] = p[1].toUpperCase();
-        if (specialCases.indexOf(p[1].toLowerCase()) > -1) p[1] = capitalize(p[1].toLowerCase());
-      } else if (p.length === 3) {
-        p[0] = p[0].toLowerCase();
-        if (p[1].length === 2) p[1] = p[1].toUpperCase();
-        if (p[0] !== 'sgn' && p[2].length === 2) p[2] = p[2].toUpperCase();
-        if (specialCases.indexOf(p[1].toLowerCase()) > -1) p[1] = capitalize(p[1].toLowerCase());
-        if (specialCases.indexOf(p[2].toLowerCase()) > -1) p[2] = capitalize(p[2].toLowerCase());
-      }
-      return p.join('-');
-    }
-    return this.options.cleanCode || this.options.lowerCaseLng ? code.toLowerCase() : code;
-  }
-  isSupportedCode(code) {
-    if (this.options.load === 'languageOnly' || this.options.nonExplicitSupportedLngs) {
-      code = this.getLanguagePartFromCode(code);
+
+  _createClass(LanguageUtil, [{
+    key: "getScriptPartFromCode",
+    value: function getScriptPartFromCode(code) {
+      if (!code || code.indexOf('-') < 0) return null;
+      var p = code.split('-');
+      if (p.length === 2) return null;
+      p.pop();
+      if (p[p.length - 1].toLowerCase() === 'x') return null;
+      return this.formatLanguageCode(p.join('-'));
+    }
+  }, {
+    key: "getLanguagePartFromCode",
+    value: function getLanguagePartFromCode(code) {
+      if (!code || code.indexOf('-') < 0) return code;
+      var p = code.split('-');
+      return this.formatLanguageCode(p[0]);
+    }
+  }, {
+    key: "formatLanguageCode",
+    value: function formatLanguageCode(code) {
+      if (typeof code === 'string' && code.indexOf('-') > -1) {
+        var specialCases = ['hans', 'hant', 'latn', 'cyrl', 'cans', 'mong', 'arab'];
+        var p = code.split('-');
+
+        if (this.options.lowerCaseLng) {
+          p = p.map(function (part) {
+            return part.toLowerCase();
+          });
+        } else if (p.length === 2) {
+          p[0] = p[0].toLowerCase();
+          p[1] = p[1].toUpperCase();
+          if (specialCases.indexOf(p[1].toLowerCase()) > -1) p[1] = capitalize(p[1].toLowerCase());
+        } else if (p.length === 3) {
+          p[0] = p[0].toLowerCase();
+          if (p[1].length === 2) p[1] = p[1].toUpperCase();
+          if (p[0] !== 'sgn' && p[2].length === 2) p[2] = p[2].toUpperCase();
+          if (specialCases.indexOf(p[1].toLowerCase()) > -1) p[1] = capitalize(p[1].toLowerCase());
+          if (specialCases.indexOf(p[2].toLowerCase()) > -1) p[2] = capitalize(p[2].toLowerCase());
+        }
+
+        return p.join('-');
+      }
+
+      return this.options.cleanCode || this.options.lowerCaseLng ? code.toLowerCase() : code;
     }
-    return !this.supportedLngs || !this.supportedLngs.length || this.supportedLngs.indexOf(code) > -1;
-  }
-  getBestMatchFromCodes(codes) {
-    if (!codes) return null;
-    let found;
-    codes.forEach(code => {
-      if (found) return;
-      const cleanedLng = this.formatLanguageCode(code);
-      if (!this.options.supportedLngs || this.isSupportedCode(cleanedLng)) found = cleanedLng;
-    });
-    if (!found && this.options.supportedLngs) {
-      codes.forEach(code => {
+  }, {
+    key: "isSupportedCode",
+    value: function isSupportedCode(code) {
+      if (this.options.load === 'languageOnly' || this.options.nonExplicitSupportedLngs) {
+        code = this.getLanguagePartFromCode(code);
+      }
+
+      return !this.supportedLngs || !this.supportedLngs.length || this.supportedLngs.indexOf(code) > -1;
+    }
+  }, {
+    key: "getBestMatchFromCodes",
+    value: function getBestMatchFromCodes(codes) {
+      var _this = this;
+
+      if (!codes) return null;
+      var found;
+      codes.forEach(function (code) {
         if (found) return;
-        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;
+
+        var cleanedLng = _this.formatLanguageCode(code);
+
+        if (!_this.options.supportedLngs || _this.isSupportedCode(cleanedLng)) found = cleanedLng;
+      });
+
+      if (!found && this.options.supportedLngs) {
+        codes.forEach(function (code) {
+          if (found) return;
+
+          var lngOnly = _this.getLanguagePartFromCode(code);
+
+          if (_this.isSupportedCode(lngOnly)) return found = lngOnly;
+          found = _this.options.supportedLngs.find(function (supportedLng) {
+            if (supportedLng.indexOf(lngOnly) === 0) return supportedLng;
+          });
         });
+      }
+
+      if (!found) found = this.getFallbackCodes(this.options.fallbackLng)[0];
+      return found;
+    }
+  }, {
+    key: "getFallbackCodes",
+    value: function getFallbackCodes(fallbacks, code) {
+      if (!fallbacks) return [];
+      if (typeof fallbacks === 'function') fallbacks = fallbacks(code);
+      if (typeof fallbacks === 'string') fallbacks = [fallbacks];
+      if (Object.prototype.toString.apply(fallbacks) === '[object Array]') return fallbacks;
+      if (!code) return fallbacks["default"] || [];
+      var found = fallbacks[code];
+      if (!found) found = fallbacks[this.getScriptPartFromCode(code)];
+      if (!found) found = fallbacks[this.formatLanguageCode(code)];
+      if (!found) found = fallbacks[this.getLanguagePartFromCode(code)];
+      if (!found) found = fallbacks["default"];
+      return found || [];
+    }
+  }, {
+    key: "toResolveHierarchy",
+    value: function toResolveHierarchy(code, fallbackCode) {
+      var _this2 = this;
+
+      var fallbackCodes = this.getFallbackCodes(fallbackCode || this.options.fallbackLng || [], code);
+      var codes = [];
+
+      var addCode = function addCode(c) {
+        if (!c) return;
+
+        if (_this2.isSupportedCode(c)) {
+          codes.push(c);
+        } else {
+          _this2.logger.warn("rejecting language code not found in supportedLngs: ".concat(c));
+        }
+      };
+
+      if (typeof code === 'string' && code.indexOf('-') > -1) {
+        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));
+      } else if (typeof code === 'string') {
+        addCode(this.formatLanguageCode(code));
+      }
+
+      fallbackCodes.forEach(function (fc) {
+        if (codes.indexOf(fc) < 0) addCode(_this2.formatLanguageCode(fc));
       });
+      return codes;
     }
-    if (!found) found = this.getFallbackCodes(this.options.fallbackLng)[0];
-    return found;
-  }
-  getFallbackCodes(fallbacks, code) {
-    if (!fallbacks) return [];
-    if (typeof fallbacks === 'function') fallbacks = fallbacks(code);
-    if (typeof fallbacks === 'string') fallbacks = [fallbacks];
-    if (Array.isArray(fallbacks)) return fallbacks;
-    if (!code) return fallbacks.default || [];
-    let found = fallbacks[code];
-    if (!found) found = fallbacks[this.getScriptPartFromCode(code)];
-    if (!found) found = fallbacks[this.formatLanguageCode(code)];
-    if (!found) found = fallbacks[this.getLanguagePartFromCode(code)];
-    if (!found) found = fallbacks.default;
-    return found || [];
-  }
-  toResolveHierarchy(code, fallbackCode) {
-    const fallbackCodes = this.getFallbackCodes(fallbackCode || this.options.fallbackLng || [], code);
-    const codes = [];
-    const addCode = c => {
-      if (!c) return;
-      if (this.isSupportedCode(c)) {
-        codes.push(c);
-      } else {
-        this.logger.warn(`rejecting language code not found in supportedLngs: ${c}`);
-      }
-    };
-    if (typeof code === 'string' && (code.indexOf('-') > -1 || code.indexOf('_') > -1)) {
-      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));
-    } else if (typeof code === 'string') {
-      addCode(this.formatLanguageCode(code));
-    }
-    fallbackCodes.forEach(fc => {
-      if (codes.indexOf(fc) < 0) addCode(this.formatLanguageCode(fc));
-    });
-    return codes;
-  }
-}
+  }]);
+
+  return LanguageUtil;
+}();
 
-let sets = [{
+var sets = [{
   lngs: ['ach', 'ak', 'am', 'arn', 'br', 'fil', 'gun', 'ln', 'mfe', 'mg', 'mi', 'oc', 'pt', 'pt-BR', 'tg', 'tl', 'ti', 'tr', 'uz', 'wa'],
   nr: [1, 2],
   fc: 1
@@ -2141,77 +2423,76 @@ let sets = [{
   nr: [1, 2, 20, 21],
   fc: 22
 }];
-let _rulesPluralsTypes = {
-  1: function (n) {
+var _rulesPluralsTypes = {
+  1: function _(n) {
     return Number(n > 1);
   },
-  2: function (n) {
+  2: function _(n) {
     return Number(n != 1);
   },
-  3: function (n) {
+  3: function _(n) {
     return 0;
   },
-  4: function (n) {
+  4: function _(n) {
     return Number(n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2);
   },
-  5: function (n) {
+  5: function _(n) {
     return Number(n == 0 ? 0 : n == 1 ? 1 : n == 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5);
   },
-  6: function (n) {
+  6: function _(n) {
     return Number(n == 1 ? 0 : n >= 2 && n <= 4 ? 1 : 2);
   },
-  7: function (n) {
+  7: function _(n) {
     return Number(n == 1 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2);
   },
-  8: function (n) {
+  8: function _(n) {
     return Number(n == 1 ? 0 : n == 2 ? 1 : n != 8 && n != 11 ? 2 : 3);
   },
-  9: function (n) {
+  9: function _(n) {
     return Number(n >= 2);
   },
-  10: function (n) {
+  10: function _(n) {
     return Number(n == 1 ? 0 : n == 2 ? 1 : n < 7 ? 2 : n < 11 ? 3 : 4);
   },
-  11: function (n) {
+  11: function _(n) {
     return Number(n == 1 || n == 11 ? 0 : n == 2 || n == 12 ? 1 : n > 2 && n < 20 ? 2 : 3);
   },
-  12: function (n) {
+  12: function _(n) {
     return Number(n % 10 != 1 || n % 100 == 11);
   },
-  13: function (n) {
+  13: function _(n) {
     return Number(n !== 0);
   },
-  14: function (n) {
+  14: function _(n) {
     return Number(n == 1 ? 0 : n == 2 ? 1 : n == 3 ? 2 : 3);
   },
-  15: function (n) {
+  15: function _(n) {
     return Number(n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2);
   },
-  16: function (n) {
+  16: function _(n) {
     return Number(n % 10 == 1 && n % 100 != 11 ? 0 : n !== 0 ? 1 : 2);
   },
-  17: function (n) {
+  17: function _(n) {
     return Number(n == 1 || n % 10 == 1 && n % 100 != 11 ? 0 : 1);
   },
-  18: function (n) {
+  18: function _(n) {
     return Number(n == 0 ? 0 : n == 1 ? 1 : 2);
   },
-  19: function (n) {
+  19: function _(n) {
     return Number(n == 1 ? 0 : n == 0 || n % 100 > 1 && n % 100 < 11 ? 1 : n % 100 > 10 && n % 100 < 20 ? 2 : 3);
   },
-  20: function (n) {
+  20: function _(n) {
     return Number(n == 1 ? 0 : n == 0 || n % 100 > 0 && n % 100 < 20 ? 1 : 2);
   },
-  21: function (n) {
+  21: function _(n) {
     return Number(n % 100 == 1 ? 1 : n % 100 == 2 ? 2 : n % 100 == 3 || n % 100 == 4 ? 3 : 0);
   },
-  22: function (n) {
+  22: function _(n) {
     return Number(n == 1 ? 0 : n == 2 ? 1 : (n < 0 || n > 10) && n % 10 == 0 ? 2 : 3);
   }
 };
-const nonIntlVersions = ['v1', 'v2', 'v3'];
-const intlVersions = ['v4'];
-const suffixesOrder = {
+var deprecatedJsonVersions = ['v1', 'v2', 'v3'];
+var suffixesOrder = {
   zero: 0,
   one: 1,
   two: 2,
@@ -2219,10 +2500,11 @@ const suffixesOrder = {
   many: 4,
   other: 5
 };
+
 function createRules() {
-  const rules = {};
-  sets.forEach(set => {
-    set.lngs.forEach(l => {
+  var rules = {};
+  sets.forEach(function (set) {
+    set.lngs.forEach(function (l) {
       rules[l] = {
         numbers: set.nr,
         plurals: _rulesPluralsTypes[set.fc]
@@ -2231,432 +2513,542 @@ function createRules() {
   });
   return rules;
 }
-class PluralResolver {
-  constructor(languageUtils) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+var PluralResolver = function () {
+  function PluralResolver(languageUtils) {
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+    _classCallCheck(this, PluralResolver);
+
     this.languageUtils = languageUtils;
     this.options = options;
     this.logger = baseLogger.create('pluralResolver');
-    if ((!this.options.compatibilityJSON || intlVersions.includes(this.options.compatibilityJSON)) && (typeof Intl === 'undefined' || !Intl.PluralRules)) {
+
+    if ((!this.options.compatibilityJSON || this.options.compatibilityJSON === 'v4') && (typeof Intl === 'undefined' || !Intl.PluralRules)) {
       this.options.compatibilityJSON = 'v3';
       this.logger.error('Your environment seems not to be Intl API compatible, use an Intl.PluralRules polyfill. Will fallback to the compatibilityJSON v3 format handling.');
     }
+
     this.rules = createRules();
   }
-  addRule(lng, obj) {
-    this.rules[lng] = obj;
-  }
-  getRule(code) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    if (this.shouldUseIntlApi()) {
-      try {
-        return new Intl.PluralRules(getCleanedCode(code === 'dev' ? 'en' : code), {
-          type: options.ordinal ? 'ordinal' : 'cardinal'
-        });
-      } catch (err) {
-        return;
+
+  _createClass(PluralResolver, [{
+    key: "addRule",
+    value: function addRule(lng, obj) {
+      this.rules[lng] = obj;
+    }
+  }, {
+    key: "getRule",
+    value: function getRule(code) {
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+      if (this.shouldUseIntlApi()) {
+        try {
+          return new Intl.PluralRules(code, {
+            type: options.ordinal ? 'ordinal' : 'cardinal'
+          });
+        } catch (_unused) {
+          return;
+        }
       }
+
+      return this.rules[code] || this.rules[this.languageUtils.getLanguagePartFromCode(code)];
     }
-    return this.rules[code] || this.rules[this.languageUtils.getLanguagePartFromCode(code)];
-  }
-  needsPlural(code) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    const rule = this.getRule(code, options);
-    if (this.shouldUseIntlApi()) {
-      return rule && rule.resolvedOptions().pluralCategories.length > 1;
+  }, {
+    key: "needsPlural",
+    value: function needsPlural(code) {
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var rule = this.getRule(code, options);
+
+      if (this.shouldUseIntlApi()) {
+        return rule && rule.resolvedOptions().pluralCategories.length > 1;
+      }
+
+      return rule && rule.numbers.length > 1;
+    }
+  }, {
+    key: "getPluralFormsOfKey",
+    value: function getPluralFormsOfKey(code, key) {
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      return this.getSuffixes(code, options).map(function (suffix) {
+        return "".concat(key).concat(suffix);
+      });
     }
-    return rule && rule.numbers.length > 1;
-  }
-  getPluralFormsOfKey(code, key) {
-    let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    return this.getSuffixes(code, options).map(suffix => `${key}${suffix}`);
-  }
-  getSuffixes(code) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    const rule = this.getRule(code, options);
-    if (!rule) {
-      return [];
+  }, {
+    key: "getSuffixes",
+    value: function getSuffixes(code) {
+      var _this = this;
+
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var rule = this.getRule(code, options);
+
+      if (!rule) {
+        return [];
+      }
+
+      if (this.shouldUseIntlApi()) {
+        return rule.resolvedOptions().pluralCategories.sort(function (pluralCategory1, pluralCategory2) {
+          return suffixesOrder[pluralCategory1] - suffixesOrder[pluralCategory2];
+        }).map(function (pluralCategory) {
+          return "".concat(_this.options.prepend).concat(pluralCategory);
+        });
+      }
+
+      return rule.numbers.map(function (number) {
+        return _this.getSuffix(code, number, options);
+      });
     }
-    if (this.shouldUseIntlApi()) {
-      return rule.resolvedOptions().pluralCategories.sort((pluralCategory1, pluralCategory2) => suffixesOrder[pluralCategory1] - suffixesOrder[pluralCategory2]).map(pluralCategory => `${this.options.prepend}${options.ordinal ? `ordinal${this.options.prepend}` : ''}${pluralCategory}`);
+  }, {
+    key: "getSuffix",
+    value: function getSuffix(code, count) {
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var rule = this.getRule(code, options);
+
+      if (rule) {
+        if (this.shouldUseIntlApi()) {
+          return "".concat(this.options.prepend).concat(rule.select(count));
+        }
+
+        return this.getSuffixRetroCompatible(rule, count);
+      }
+
+      this.logger.warn("no plural rule found for: ".concat(code));
+      return '';
     }
-    return rule.numbers.map(number => this.getSuffix(code, number, options));
-  }
-  getSuffix(code, count) {
-    let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    const rule = this.getRule(code, options);
-    if (rule) {
-      if (this.shouldUseIntlApi()) {
-        return `${this.options.prepend}${options.ordinal ? `ordinal${this.options.prepend}` : ''}${rule.select(count)}`;
+  }, {
+    key: "getSuffixRetroCompatible",
+    value: function getSuffixRetroCompatible(rule, count) {
+      var _this2 = this;
+
+      var idx = rule.noAbs ? rule.plurals(count) : rule.plurals(Math.abs(count));
+      var suffix = rule.numbers[idx];
+
+      if (this.options.simplifyPluralSuffix && rule.numbers.length === 2 && rule.numbers[0] === 1) {
+        if (suffix === 2) {
+          suffix = 'plural';
+        } else if (suffix === 1) {
+          suffix = '';
+        }
+      }
+
+      var returnSuffix = function returnSuffix() {
+        return _this2.options.prepend && suffix.toString() ? _this2.options.prepend + suffix.toString() : suffix.toString();
+      };
+
+      if (this.options.compatibilityJSON === 'v1') {
+        if (suffix === 1) return '';
+        if (typeof suffix === 'number') return "_plural_".concat(suffix.toString());
+        return returnSuffix();
+      } else if (this.options.compatibilityJSON === 'v2') {
+        return returnSuffix();
+      } else if (this.options.simplifyPluralSuffix && rule.numbers.length === 2 && rule.numbers[0] === 1) {
+        return returnSuffix();
       }
-      return this.getSuffixRetroCompatible(rule, count);
+
+      return this.options.prepend && idx.toString() ? this.options.prepend + idx.toString() : idx.toString();
     }
-    this.logger.warn(`no plural rule found for: ${code}`);
-    return '';
-  }
-  getSuffixRetroCompatible(rule, count) {
-    const idx = rule.noAbs ? rule.plurals(count) : rule.plurals(Math.abs(count));
-    let suffix = rule.numbers[idx];
-    if (this.options.simplifyPluralSuffix && rule.numbers.length === 2 && rule.numbers[0] === 1) {
-      if (suffix === 2) {
-        suffix = 'plural';
-      } else if (suffix === 1) {
-        suffix = '';
-      }
-    }
-    const returnSuffix = () => this.options.prepend && suffix.toString() ? this.options.prepend + suffix.toString() : suffix.toString();
-    if (this.options.compatibilityJSON === 'v1') {
-      if (suffix === 1) return '';
-      if (typeof suffix === 'number') return `_plural_${suffix.toString()}`;
-      return returnSuffix();
-    } else if (this.options.compatibilityJSON === 'v2') {
-      return returnSuffix();
-    } else if (this.options.simplifyPluralSuffix && rule.numbers.length === 2 && rule.numbers[0] === 1) {
-      return returnSuffix();
-    }
-    return this.options.prepend && idx.toString() ? this.options.prepend + idx.toString() : idx.toString();
-  }
-  shouldUseIntlApi() {
-    return !nonIntlVersions.includes(this.options.compatibilityJSON);
-  }
-}
+  }, {
+    key: "shouldUseIntlApi",
+    value: function shouldUseIntlApi() {
+      return !deprecatedJsonVersions.includes(this.options.compatibilityJSON);
+    }
+  }]);
+
+  return PluralResolver;
+}();
+
+function ownKeys$3(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread$3(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$3(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$3(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+var Interpolator = function () {
+  function Interpolator() {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    _classCallCheck(this, Interpolator);
 
-function deepFindWithDefaults(data, defaultData, key) {
-  let keySeparator = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '.';
-  let ignoreJSONStructure = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
-  let path = getPathWithDefaults(data, defaultData, key);
-  if (!path && ignoreJSONStructure && typeof key === 'string') {
-    path = deepFind(data, key, keySeparator);
-    if (path === undefined) path = deepFind(defaultData, key, keySeparator);
-  }
-  return path;
-}
-class Interpolator {
-  constructor() {
-    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     this.logger = baseLogger.create('interpolator');
     this.options = options;
-    this.format = options.interpolation && options.interpolation.format || (value => value);
-    this.init(options);
-  }
-  init() {
-    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    if (!options.interpolation) options.interpolation = {
-      escapeValue: true
+
+    this.format = options.interpolation && options.interpolation.format || function (value) {
+      return value;
     };
-    const {
-      escape: escape$1,
-      escapeValue,
-      useRawValueToEscape,
-      prefix,
-      prefixEscaped,
-      suffix,
-      suffixEscaped,
-      formatSeparator,
-      unescapeSuffix,
-      unescapePrefix,
-      nestingPrefix,
-      nestingPrefixEscaped,
-      nestingSuffix,
-      nestingSuffixEscaped,
-      nestingOptionsSeparator,
-      maxReplaces,
-      alwaysFormat
-    } = options.interpolation;
-    this.escape = escape$1 !== undefined ? escape$1 : escape;
-    this.escapeValue = escapeValue !== undefined ? escapeValue : true;
-    this.useRawValueToEscape = useRawValueToEscape !== undefined ? useRawValueToEscape : false;
-    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.nestingPrefix = nestingPrefix ? regexEscape(nestingPrefix) : nestingPrefixEscaped || regexEscape('$t(');
-    this.nestingSuffix = nestingSuffix ? regexEscape(nestingSuffix) : nestingSuffixEscaped || regexEscape(')');
-    this.nestingOptionsSeparator = nestingOptionsSeparator || ',';
-    this.maxReplaces = maxReplaces || 1000;
-    this.alwaysFormat = alwaysFormat !== undefined ? alwaysFormat : false;
-    this.resetRegExp();
-  }
-  reset() {
-    if (this.options) this.init(this.options);
+
+    this.init(options);
   }
-  resetRegExp() {
-    const getOrResetRegExp = (existingRegExp, pattern) => {
-      if (existingRegExp && existingRegExp.source === pattern) {
-        existingRegExp.lastIndex = 0;
-        return existingRegExp;
+
+  _createClass(Interpolator, [{
+    key: "init",
+    value: function init() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      if (!options.interpolation) options.interpolation = {
+        escapeValue: true
+      };
+      var iOpts = options.interpolation;
+      this.escape = iOpts.escape !== undefined ? iOpts.escape : escape;
+      this.escapeValue = iOpts.escapeValue !== undefined ? iOpts.escapeValue : true;
+      this.useRawValueToEscape = iOpts.useRawValueToEscape !== undefined ? iOpts.useRawValueToEscape : false;
+      this.prefix = iOpts.prefix ? regexEscape(iOpts.prefix) : iOpts.prefixEscaped || '{{';
+      this.suffix = iOpts.suffix ? regexEscape(iOpts.suffix) : iOpts.suffixEscaped || '}}';
+      this.formatSeparator = iOpts.formatSeparator ? iOpts.formatSeparator : iOpts.formatSeparator || ',';
+      this.unescapePrefix = iOpts.unescapeSuffix ? '' : iOpts.unescapePrefix || '-';
+      this.unescapeSuffix = this.unescapePrefix ? '' : iOpts.unescapeSuffix || '';
+      this.nestingPrefix = iOpts.nestingPrefix ? regexEscape(iOpts.nestingPrefix) : iOpts.nestingPrefixEscaped || regexEscape('$t(');
+      this.nestingSuffix = iOpts.nestingSuffix ? regexEscape(iOpts.nestingSuffix) : iOpts.nestingSuffixEscaped || regexEscape(')');
+      this.nestingOptionsSeparator = iOpts.nestingOptionsSeparator ? iOpts.nestingOptionsSeparator : iOpts.nestingOptionsSeparator || ',';
+      this.maxReplaces = iOpts.maxReplaces ? iOpts.maxReplaces : 1000;
+      this.alwaysFormat = iOpts.alwaysFormat !== undefined ? iOpts.alwaysFormat : false;
+      this.resetRegExp();
+    }
+  }, {
+    key: "reset",
+    value: function reset() {
+      if (this.options) this.init(this.options);
+    }
+  }, {
+    key: "resetRegExp",
+    value: function resetRegExp() {
+      var regexpStr = "".concat(this.prefix, "(.+?)").concat(this.suffix);
+      this.regexp = new RegExp(regexpStr, 'g');
+      var regexpUnescapeStr = "".concat(this.prefix).concat(this.unescapePrefix, "(.+?)").concat(this.unescapeSuffix).concat(this.suffix);
+      this.regexpUnescape = new RegExp(regexpUnescapeStr, 'g');
+      var nestingRegexpStr = "".concat(this.nestingPrefix, "(.+?)").concat(this.nestingSuffix);
+      this.nestingRegexp = new RegExp(nestingRegexpStr, 'g');
+    }
+  }, {
+    key: "interpolate",
+    value: function interpolate(str, data, lng, options) {
+      var _this = this;
+
+      var match;
+      var value;
+      var replaces;
+      var defaultData = this.options && this.options.interpolation && this.options.interpolation.defaultVariables || {};
+
+      function regexSafe(val) {
+        return val.replace(/\$/g, '$$$$');
       }
-      return new RegExp(pattern, 'g');
-    };
-    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}`);
-  }
-  interpolate(str, data, lng, options) {
-    let match;
-    let value;
-    let replaces;
-    const defaultData = this.options && this.options.interpolation && this.options.interpolation.defaultVariables || {};
-    function regexSafe(val) {
-      return val.replace(/\$/g, '$$$$');
-    }
-    const handleFormat = key => {
-      if (key.indexOf(this.formatSeparator) < 0) {
-        const path = deepFindWithDefaults(data, defaultData, key, this.options.keySeparator, this.options.ignoreJSONStructure);
-        return this.alwaysFormat ? this.format(path, undefined, lng, {
-          ...options,
-          ...data,
-          interpolationkey: key
-        }) : path;
-      }
-      const p = key.split(this.formatSeparator);
-      const k = p.shift().trim();
-      const f = p.join(this.formatSeparator).trim();
-      return this.format(deepFindWithDefaults(data, defaultData, k, this.options.keySeparator, this.options.ignoreJSONStructure), f, lng, {
-        ...options,
-        ...data,
-        interpolationkey: k
-      });
-    };
-    this.resetRegExp();
-    const missingInterpolationHandler = options && options.missingInterpolationHandler || this.options.missingInterpolationHandler;
-    const skipOnVariables = options && options.interpolation && options.interpolation.skipOnVariables !== undefined ? options.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables;
-    const todos = [{
-      regex: this.regexpUnescape,
-      safeValue: val => regexSafe(val)
-    }, {
-      regex: this.regexp,
-      safeValue: val => this.escapeValue ? regexSafe(this.escape(val)) : regexSafe(val)
-    }];
-    todos.forEach(todo => {
-      replaces = 0;
-      while (match = todo.regex.exec(str)) {
-        const matchedVar = match[1].trim();
-        value = handleFormat(matchedVar);
-        if (value === undefined) {
-          if (typeof missingInterpolationHandler === 'function') {
-            const temp = missingInterpolationHandler(str, match, options);
-            value = typeof temp === 'string' ? temp : '';
-          } else if (options && Object.prototype.hasOwnProperty.call(options, matchedVar)) {
-            value = '';
-          } else if (skipOnVariables) {
-            value = match[0];
-            continue;
+
+      var handleFormat = function handleFormat(key) {
+        if (key.indexOf(_this.formatSeparator) < 0) {
+          var path = getPathWithDefaults(data, defaultData, key);
+          return _this.alwaysFormat ? _this.format(path, undefined, lng, _objectSpread$3(_objectSpread$3(_objectSpread$3({}, options), data), {}, {
+            interpolationkey: key
+          })) : path;
+        }
+
+        var p = key.split(_this.formatSeparator);
+        var k = p.shift().trim();
+        var f = p.join(_this.formatSeparator).trim();
+        return _this.format(getPathWithDefaults(data, defaultData, k), f, lng, _objectSpread$3(_objectSpread$3(_objectSpread$3({}, options), data), {}, {
+          interpolationkey: k
+        }));
+      };
+
+      this.resetRegExp();
+      var missingInterpolationHandler = options && options.missingInterpolationHandler || this.options.missingInterpolationHandler;
+      var skipOnVariables = options && options.interpolation && options.interpolation.skipOnVariables !== undefined ? options.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables;
+      var todos = [{
+        regex: this.regexpUnescape,
+        safeValue: function safeValue(val) {
+          return regexSafe(val);
+        }
+      }, {
+        regex: this.regexp,
+        safeValue: function safeValue(val) {
+          return _this.escapeValue ? regexSafe(_this.escape(val)) : regexSafe(val);
+        }
+      }];
+      todos.forEach(function (todo) {
+        replaces = 0;
+
+        while (match = todo.regex.exec(str)) {
+          var matchedVar = match[1].trim();
+          value = handleFormat(matchedVar);
+
+          if (value === undefined) {
+            if (typeof missingInterpolationHandler === 'function') {
+              var temp = missingInterpolationHandler(str, match, options);
+              value = typeof temp === 'string' ? temp : '';
+            } else if (options && options.hasOwnProperty(matchedVar)) {
+              value = '';
+            } else if (skipOnVariables) {
+              value = match[0];
+              continue;
+            } else {
+              _this.logger.warn("missed to pass in variable ".concat(matchedVar, " for interpolating ").concat(str));
+
+              value = '';
+            }
+          } else if (typeof value !== 'string' && !_this.useRawValueToEscape) {
+            value = makeString(value);
+          }
+
+          var safeValue = todo.safeValue(value);
+          str = str.replace(match[0], safeValue);
+
+          if (skipOnVariables) {
+            todo.regex.lastIndex += value.length;
+            todo.regex.lastIndex -= match[0].length;
           } else {
-            this.logger.warn(`missed to pass in variable ${matchedVar} for interpolating ${str}`);
-            value = '';
+            todo.regex.lastIndex = 0;
+          }
+
+          replaces++;
+
+          if (replaces >= _this.maxReplaces) {
+            break;
           }
-        } else if (typeof value !== 'string' && !this.useRawValueToEscape) {
-          value = makeString(value);
         }
-        const safeValue = todo.safeValue(value);
-        str = str.replace(match[0], safeValue);
-        if (skipOnVariables) {
-          todo.regex.lastIndex += value.length;
-          todo.regex.lastIndex -= match[0].length;
-        } else {
-          todo.regex.lastIndex = 0;
+      });
+      return str;
+    }
+  }, {
+    key: "nest",
+    value: function nest(str, fc) {
+      var _this2 = this;
+
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var match;
+      var value;
+
+      var clonedOptions = _objectSpread$3({}, options);
+
+      clonedOptions.applyPostProcessor = false;
+      delete clonedOptions.defaultValue;
+
+      function handleHasOptions(key, inheritedOptions) {
+        var sep = this.nestingOptionsSeparator;
+        if (key.indexOf(sep) < 0) return key;
+        var c = key.split(new RegExp("".concat(sep, "[ ]*{")));
+        var optionsString = "{".concat(c[1]);
+        key = c[0];
+        optionsString = this.interpolate(optionsString, clonedOptions);
+        var matchedSingleQuotes = optionsString.match(/'/g);
+        var matchedDoubleQuotes = optionsString.match(/"/g);
+
+        if (matchedSingleQuotes && matchedSingleQuotes.length % 2 === 0 && !matchedDoubleQuotes || matchedDoubleQuotes.length % 2 !== 0) {
+          optionsString = optionsString.replace(/'/g, '"');
         }
-        replaces++;
-        if (replaces >= this.maxReplaces) {
-          break;
+
+        try {
+          clonedOptions = JSON.parse(optionsString);
+          if (inheritedOptions) clonedOptions = _objectSpread$3(_objectSpread$3({}, inheritedOptions), clonedOptions);
+        } catch (e) {
+          this.logger.warn("failed parsing options string in nesting for key ".concat(key), e);
+          return "".concat(key).concat(sep).concat(optionsString);
         }
+
+        delete clonedOptions.defaultValue;
+        return key;
       }
-    });
-    return str;
-  }
-  nest(str, fc) {
-    let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    let match;
-    let value;
-    let clonedOptions;
-    function handleHasOptions(key, inheritedOptions) {
-      const sep = this.nestingOptionsSeparator;
-      if (key.indexOf(sep) < 0) return key;
-      const c = key.split(new RegExp(`${sep}[ ]*{`));
-      let optionsString = `{${c[1]}`;
-      key = c[0];
-      optionsString = this.interpolate(optionsString, clonedOptions);
-      const matchedSingleQuotes = optionsString.match(/'/g);
-      const matchedDoubleQuotes = optionsString.match(/"/g);
-      if (matchedSingleQuotes && matchedSingleQuotes.length % 2 === 0 && !matchedDoubleQuotes || matchedDoubleQuotes.length % 2 !== 0) {
-        optionsString = optionsString.replace(/'/g, '"');
-      }
-      try {
-        clonedOptions = JSON.parse(optionsString);
-        if (inheritedOptions) clonedOptions = {
-          ...inheritedOptions,
-          ...clonedOptions
-        };
-      } catch (e) {
-        this.logger.warn(`failed parsing options string in nesting for key ${key}`, e);
-        return `${key}${sep}${optionsString}`;
+
+      while (match = this.nestingRegexp.exec(str)) {
+        var formatters = [];
+        var doReduce = false;
+
+        if (match[0].indexOf(this.formatSeparator) !== -1 && !/{.*}/.test(match[1])) {
+          var r = match[1].split(this.formatSeparator).map(function (elem) {
+            return elem.trim();
+          });
+          match[1] = r.shift();
+          formatters = r;
+          doReduce = true;
+        }
+
+        value = fc(handleHasOptions.call(this, match[1].trim(), clonedOptions), clonedOptions);
+        if (value && match[0] === str && typeof value !== 'string') return value;
+        if (typeof value !== 'string') value = makeString(value);
+
+        if (!value) {
+          this.logger.warn("missed to resolve ".concat(match[1], " for nesting ").concat(str));
+          value = '';
+        }
+
+        if (doReduce) {
+          value = formatters.reduce(function (v, f) {
+            return _this2.format(v, f, options.lng, _objectSpread$3(_objectSpread$3({}, options), {}, {
+              interpolationkey: match[1].trim()
+            }));
+          }, value.trim());
+        }
+
+        str = str.replace(match[0], value);
+        this.regexp.lastIndex = 0;
       }
-      if (clonedOptions.defaultValue && clonedOptions.defaultValue.indexOf(this.prefix) > -1) delete clonedOptions.defaultValue;
-      return key;
+
+      return str;
     }
-    while (match = this.nestingRegexp.exec(str)) {
-      let formatters = [];
-      clonedOptions = {
-        ...options
-      };
-      clonedOptions = clonedOptions.replace && typeof clonedOptions.replace !== 'string' ? clonedOptions.replace : clonedOptions;
-      clonedOptions.applyPostProcessor = false;
-      delete clonedOptions.defaultValue;
-      let doReduce = false;
-      if (match[0].indexOf(this.formatSeparator) !== -1 && !/{.*}/.test(match[1])) {
-        const r = match[1].split(this.formatSeparator).map(elem => elem.trim());
-        match[1] = r.shift();
-        formatters = r;
-        doReduce = true;
-      }
-      value = fc(handleHasOptions.call(this, match[1].trim(), clonedOptions), clonedOptions);
-      if (value && match[0] === str && typeof value !== 'string') return value;
-      if (typeof value !== 'string') value = makeString(value);
-      if (!value) {
-        this.logger.warn(`missed to resolve ${match[1]} for nesting ${str}`);
-        value = '';
-      }
-      if (doReduce) {
-        value = formatters.reduce((v, f) => this.format(v, f, options.lng, {
-          ...options,
-          interpolationkey: match[1].trim()
-        }), value.trim());
-      }
-      str = str.replace(match[0], value);
-      this.regexp.lastIndex = 0;
-    }
-    return str;
-  }
-}
+  }]);
+
+  return Interpolator;
+}();
+
+function ownKeys$4(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$4(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function parseFormatStr(formatStr) {
-  let formatName = formatStr.toLowerCase().trim();
-  const formatOptions = {};
+  var formatName = formatStr.toLowerCase().trim();
+  var formatOptions = {};
+
   if (formatStr.indexOf('(') > -1) {
-    const p = formatStr.split('(');
+    var p = formatStr.split('(');
     formatName = p[0].toLowerCase().trim();
-    const optStr = p[1].substring(0, p[1].length - 1);
+    var optStr = p[1].substring(0, p[1].length - 1);
+
     if (formatName === 'currency' && optStr.indexOf(':') < 0) {
       if (!formatOptions.currency) formatOptions.currency = optStr.trim();
     } else if (formatName === 'relativetime' && optStr.indexOf(':') < 0) {
       if (!formatOptions.range) formatOptions.range = optStr.trim();
     } else {
-      const opts = optStr.split(';');
-      opts.forEach(opt => {
-        if (opt) {
-          const [key, ...rest] = opt.split(':');
-          const val = rest.join(':').trim().replace(/^'+|'+$/g, '');
-          const trimmedKey = key.trim();
-          if (!formatOptions[trimmedKey]) formatOptions[trimmedKey] = val;
-          if (val === 'false') formatOptions[trimmedKey] = false;
-          if (val === 'true') formatOptions[trimmedKey] = true;
-          if (!isNaN(val)) formatOptions[trimmedKey] = parseInt(val, 10);
-        }
+      var opts = optStr.split(';');
+      opts.forEach(function (opt) {
+        if (!opt) return;
+
+        var _opt$split = opt.split(':'),
+            _opt$split2 = _toArray(_opt$split),
+            key = _opt$split2[0],
+            rest = _opt$split2.slice(1);
+
+        var val = rest.join(':').trim().replace(/^'+|'+$/g, '');
+        if (!formatOptions[key.trim()]) formatOptions[key.trim()] = val;
+        if (val === 'false') formatOptions[key.trim()] = false;
+        if (val === 'true') formatOptions[key.trim()] = true;
+        if (!isNaN(val)) formatOptions[key.trim()] = parseInt(val, 10);
       });
     }
   }
+
   return {
-    formatName,
-    formatOptions
+    formatName: formatName,
+    formatOptions: formatOptions
   };
 }
+
 function createCachedFormatter(fn) {
-  const cache = {};
+  var cache = {};
   return function invokeFormatter(val, lng, options) {
-    const key = lng + JSON.stringify(options);
-    let formatter = cache[key];
+    var key = lng + JSON.stringify(options);
+    var formatter = cache[key];
+
     if (!formatter) {
-      formatter = fn(getCleanedCode(lng), options);
+      formatter = fn(lng, options);
       cache[key] = formatter;
     }
+
     return formatter(val);
   };
 }
-class Formatter {
-  constructor() {
-    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+var Formatter = function () {
+  function Formatter() {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    _classCallCheck(this, Formatter);
+
     this.logger = baseLogger.create('formatter');
     this.options = options;
     this.formats = {
-      number: createCachedFormatter((lng, opt) => {
-        const formatter = new Intl.NumberFormat(lng, {
-          ...opt
-        });
-        return val => formatter.format(val);
+      number: createCachedFormatter(function (lng, options) {
+        var formatter = new Intl.NumberFormat(lng, options);
+        return function (val) {
+          return formatter.format(val);
+        };
       }),
-      currency: createCachedFormatter((lng, opt) => {
-        const formatter = new Intl.NumberFormat(lng, {
-          ...opt,
+      currency: createCachedFormatter(function (lng, options) {
+        var formatter = new Intl.NumberFormat(lng, _objectSpread$4(_objectSpread$4({}, options), {}, {
           style: 'currency'
-        });
-        return val => formatter.format(val);
+        }));
+        return function (val) {
+          return formatter.format(val);
+        };
       }),
-      datetime: createCachedFormatter((lng, opt) => {
-        const formatter = new Intl.DateTimeFormat(lng, {
-          ...opt
-        });
-        return val => formatter.format(val);
+      datetime: createCachedFormatter(function (lng, options) {
+        var formatter = new Intl.DateTimeFormat(lng, _objectSpread$4({}, options));
+        return function (val) {
+          return formatter.format(val);
+        };
       }),
-      relativetime: createCachedFormatter((lng, opt) => {
-        const formatter = new Intl.RelativeTimeFormat(lng, {
-          ...opt
-        });
-        return val => formatter.format(val, opt.range || 'day');
+      relativetime: createCachedFormatter(function (lng, options) {
+        var formatter = new Intl.RelativeTimeFormat(lng, _objectSpread$4({}, options));
+        return function (val) {
+          return formatter.format(val, options.range || 'day');
+        };
       }),
-      list: createCachedFormatter((lng, opt) => {
-        const formatter = new Intl.ListFormat(lng, {
-          ...opt
-        });
-        return val => formatter.format(val);
+      list: createCachedFormatter(function (lng, options) {
+        var formatter = new Intl.ListFormat(lng, _objectSpread$4({}, options));
+        return function (val) {
+          return formatter.format(val);
+        };
       })
     };
     this.init(options);
   }
-  init(services) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
-      interpolation: {}
-    };
-    const iOpts = options.interpolation;
-    this.formatSeparator = iOpts.formatSeparator ? iOpts.formatSeparator : iOpts.formatSeparator || ',';
-  }
-  add(name, fc) {
-    this.formats[name.toLowerCase().trim()] = fc;
-  }
-  addCached(name, fc) {
-    this.formats[name.toLowerCase().trim()] = createCachedFormatter(fc);
-  }
-  format(value, format, lng) {
-    let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-    const formats = format.split(this.formatSeparator);
-    const result = formats.reduce((mem, f) => {
-      const {
-        formatName,
-        formatOptions
-      } = parseFormatStr(f);
-      if (this.formats[formatName]) {
-        let formatted = mem;
-        try {
-          const valOptions = options && options.formatParams && options.formatParams[options.interpolationkey] || {};
-          const l = valOptions.locale || valOptions.lng || options.locale || options.lng || lng;
-          formatted = this.formats[formatName](mem, l, {
-            ...formatOptions,
-            ...options,
-            ...valOptions
-          });
-        } catch (error) {
-          this.logger.warn(error);
+
+  _createClass(Formatter, [{
+    key: "init",
+    value: function init(services) {
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+        interpolation: {}
+      };
+      var iOpts = options.interpolation;
+      this.formatSeparator = iOpts.formatSeparator ? iOpts.formatSeparator : iOpts.formatSeparator || ',';
+    }
+  }, {
+    key: "add",
+    value: function add(name, fc) {
+      this.formats[name.toLowerCase().trim()] = fc;
+    }
+  }, {
+    key: "addCached",
+    value: function addCached(name, fc) {
+      this.formats[name.toLowerCase().trim()] = createCachedFormatter(fc);
+    }
+  }, {
+    key: "format",
+    value: function format(value, _format, lng, options) {
+      var _this = this;
+
+      var formats = _format.split(this.formatSeparator);
+
+      var result = formats.reduce(function (mem, f) {
+        var _parseFormatStr = parseFormatStr(f),
+            formatName = _parseFormatStr.formatName,
+            formatOptions = _parseFormatStr.formatOptions;
+
+        if (_this.formats[formatName]) {
+          var formatted = mem;
+
+          try {
+            var valOptions = options && options.formatParams && options.formatParams[options.interpolationkey] || {};
+            var l = valOptions.locale || valOptions.lng || options.locale || options.lng || lng;
+            formatted = _this.formats[formatName](mem, l, _objectSpread$4(_objectSpread$4(_objectSpread$4({}, formatOptions), options), valOptions));
+          } catch (error) {
+            _this.logger.warn(error);
+          }
+
+          return formatted;
+        } else {
+          _this.logger.warn("there was no format function for ".concat(formatName));
         }
-        return formatted;
-      } else {
-        this.logger.warn(`there was no format function for ${formatName}`);
-      }
-      return mem;
-    }, value);
-    return result;
-  }
-}
+
+        return mem;
+      }, value);
+      return result;
+    }
+  }]);
+
+  return Formatter;
+}();
+
+function ownKeys$5(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$5(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _createSuper$2(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$2(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct$2() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function removePending(q, name) {
   if (q.pending[name] !== undefined) {
@@ -2664,225 +3056,257 @@ function removePending(q, name) {
     q.pendingCount--;
   }
 }
-class Connector extends EventEmitter {
-  constructor(backend, store, services) {
-    let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-    super();
-    this.backend = backend;
-    this.store = store;
-    this.services = services;
-    this.languageUtils = services.languageUtils;
-    this.options = options;
-    this.logger = baseLogger.create('backendConnector');
-    this.waitingReads = [];
-    this.maxParallelReads = options.maxParallelReads || 10;
-    this.readingCalls = 0;
-    this.maxRetries = options.maxRetries >= 0 ? options.maxRetries : 5;
-    this.retryTimeout = options.retryTimeout >= 1 ? options.retryTimeout : 350;
-    this.state = {};
-    this.queue = [];
-    if (this.backend && this.backend.init) {
-      this.backend.init(services, options.backend, options);
+
+var Connector = function (_EventEmitter) {
+  _inherits(Connector, _EventEmitter);
+
+  var _super = _createSuper$2(Connector);
+
+  function Connector(backend, store, services) {
+    var _this;
+
+    var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+
+    _classCallCheck(this, Connector);
+
+    _this = _super.call(this);
+
+    if (isIE10) {
+      EventEmitter.call(_assertThisInitialized(_this));
     }
-  }
-  queueLoad(languages, namespaces, options, callback) {
-    const toLoad = {};
-    const pending = {};
-    const toLoadLanguages = {};
-    const toLoadNamespaces = {};
-    languages.forEach(lng => {
-      let hasAllNamespaces = true;
-      namespaces.forEach(ns => {
-        const name = `${lng}|${ns}`;
-        if (!options.reload && this.store.hasResourceBundle(lng, ns)) {
-          this.state[name] = 2;
-        } else if (this.state[name] < 0) ; else if (this.state[name] === 1) {
-          if (pending[name] === undefined) pending[name] = true;
-        } else {
-          this.state[name] = 1;
-          hasAllNamespaces = false;
-          if (pending[name] === undefined) pending[name] = true;
-          if (toLoad[name] === undefined) toLoad[name] = true;
-          if (toLoadNamespaces[ns] === undefined) toLoadNamespaces[ns] = true;
-        }
-      });
-      if (!hasAllNamespaces) toLoadLanguages[lng] = true;
-    });
-    if (Object.keys(toLoad).length || Object.keys(pending).length) {
-      this.queue.push({
-        pending,
-        pendingCount: Object.keys(pending).length,
-        loaded: {},
-        errors: [],
-        callback
-      });
+
+    _this.backend = backend;
+    _this.store = store;
+    _this.services = services;
+    _this.languageUtils = services.languageUtils;
+    _this.options = options;
+    _this.logger = baseLogger.create('backendConnector');
+    _this.waitingReads = [];
+    _this.maxParallelReads = options.maxParallelReads || 10;
+    _this.readingCalls = 0;
+    _this.maxRetries = options.maxRetries >= 0 ? options.maxRetries : 5;
+    _this.retryTimeout = options.retryTimeout >= 1 ? options.retryTimeout : 350;
+    _this.state = {};
+    _this.queue = [];
+
+    if (_this.backend && _this.backend.init) {
+      _this.backend.init(services, options.backend, options);
     }
-    return {
-      toLoad: Object.keys(toLoad),
-      pending: Object.keys(pending),
-      toLoadLanguages: Object.keys(toLoadLanguages),
-      toLoadNamespaces: Object.keys(toLoadNamespaces)
-    };
+
+    return _this;
   }
-  loaded(name, err, data) {
-    const s = name.split('|');
-    const lng = s[0];
-    const ns = s[1];
-    if (err) this.emit('failedLoading', lng, ns, err);
-    if (data) {
-      this.store.addResourceBundle(lng, ns, data, undefined, undefined, {
-        skipCopy: true
+
+  _createClass(Connector, [{
+    key: "queueLoad",
+    value: function queueLoad(languages, namespaces, options, callback) {
+      var _this2 = this;
+
+      var toLoad = {};
+      var pending = {};
+      var toLoadLanguages = {};
+      var toLoadNamespaces = {};
+      languages.forEach(function (lng) {
+        var hasAllNamespaces = true;
+        namespaces.forEach(function (ns) {
+          var name = "".concat(lng, "|").concat(ns);
+
+          if (!options.reload && _this2.store.hasResourceBundle(lng, ns)) {
+            _this2.state[name] = 2;
+          } else if (_this2.state[name] < 0) ; else if (_this2.state[name] === 1) {
+            if (pending[name] === undefined) pending[name] = true;
+          } else {
+            _this2.state[name] = 1;
+            hasAllNamespaces = false;
+            if (pending[name] === undefined) pending[name] = true;
+            if (toLoad[name] === undefined) toLoad[name] = true;
+            if (toLoadNamespaces[ns] === undefined) toLoadNamespaces[ns] = true;
+          }
+        });
+        if (!hasAllNamespaces) toLoadLanguages[lng] = true;
       });
+
+      if (Object.keys(toLoad).length || Object.keys(pending).length) {
+        this.queue.push({
+          pending: pending,
+          pendingCount: Object.keys(pending).length,
+          loaded: {},
+          errors: [],
+          callback: callback
+        });
+      }
+
+      return {
+        toLoad: Object.keys(toLoad),
+        pending: Object.keys(pending),
+        toLoadLanguages: Object.keys(toLoadLanguages),
+        toLoadNamespaces: Object.keys(toLoadNamespaces)
+      };
     }
-    this.state[name] = err ? -1 : 2;
-    const loaded = {};
-    this.queue.forEach(q => {
-      pushPath(q.loaded, [lng], ns);
-      removePending(q, name);
-      if (err) q.errors.push(err);
-      if (q.pendingCount === 0 && !q.done) {
-        Object.keys(q.loaded).forEach(l => {
-          if (!loaded[l]) loaded[l] = {};
-          const loadedKeys = q.loaded[l];
-          if (loadedKeys.length) {
-            loadedKeys.forEach(n => {
-              if (loaded[l][n] === undefined) loaded[l][n] = true;
-            });
+  }, {
+    key: "loaded",
+    value: function loaded(name, err, data) {
+      var s = name.split('|');
+      var lng = s[0];
+      var ns = s[1];
+      if (err) this.emit('failedLoading', lng, ns, err);
+
+      if (data) {
+        this.store.addResourceBundle(lng, ns, data);
+      }
+
+      this.state[name] = err ? -1 : 2;
+      var loaded = {};
+      this.queue.forEach(function (q) {
+        pushPath(q.loaded, [lng], ns);
+        removePending(q, name);
+        if (err) q.errors.push(err);
+
+        if (q.pendingCount === 0 && !q.done) {
+          Object.keys(q.loaded).forEach(function (l) {
+            if (!loaded[l]) loaded[l] = {};
+            var loadedKeys = q.loaded[l];
+
+            if (loadedKeys.length) {
+              loadedKeys.forEach(function (ns) {
+                if (loaded[l][ns] === undefined) loaded[l][ns] = true;
+              });
+            }
+          });
+          q.done = true;
+
+          if (q.errors.length) {
+            q.callback(q.errors);
+          } else {
+            q.callback();
           }
-        });
-        q.done = true;
-        if (q.errors.length) {
-          q.callback(q.errors);
-        } else {
-          q.callback();
         }
-      }
-    });
-    this.emit('loaded', loaded);
-    this.queue = this.queue.filter(q => !q.done);
-  }
-  read(lng, ns, fcName) {
-    let tried = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-    let wait = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : this.retryTimeout;
-    let callback = arguments.length > 5 ? arguments[5] : undefined;
-    if (!lng.length) return callback(null, {});
-    if (this.readingCalls >= this.maxParallelReads) {
-      this.waitingReads.push({
-        lng,
-        ns,
-        fcName,
-        tried,
-        wait,
-        callback
       });
-      return;
-    }
-    this.readingCalls++;
-    const resolver = (err, data) => {
-      this.readingCalls--;
-      if (this.waitingReads.length > 0) {
-        const next = this.waitingReads.shift();
-        this.read(next.lng, next.ns, next.fcName, next.tried, next.wait, next.callback);
-      }
-      if (err && data && tried < this.maxRetries) {
-        setTimeout(() => {
-          this.read.call(this, lng, ns, fcName, tried + 1, wait * 2, callback);
-        }, wait);
+      this.emit('loaded', loaded);
+      this.queue = this.queue.filter(function (q) {
+        return !q.done;
+      });
+    }
+  }, {
+    key: "read",
+    value: function read(lng, ns, fcName) {
+      var _this3 = this;
+
+      var tried = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+      var wait = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : this.retryTimeout;
+      var callback = arguments.length > 5 ? arguments[5] : undefined;
+      if (!lng.length) return callback(null, {});
+
+      if (this.readingCalls >= this.maxParallelReads) {
+        this.waitingReads.push({
+          lng: lng,
+          ns: ns,
+          fcName: fcName,
+          tried: tried,
+          wait: wait,
+          callback: callback
+        });
         return;
       }
-      callback(err, data);
-    };
-    const fc = this.backend[fcName].bind(this.backend);
-    if (fc.length === 2) {
-      try {
-        const r = fc(lng, ns);
-        if (r && typeof r.then === 'function') {
-          r.then(data => resolver(null, data)).catch(resolver);
-        } else {
-          resolver(null, r);
+
+      this.readingCalls++;
+      return this.backend[fcName](lng, ns, function (err, data) {
+        _this3.readingCalls--;
+
+        if (_this3.waitingReads.length > 0) {
+          var next = _this3.waitingReads.shift();
+
+          _this3.read(next.lng, next.ns, next.fcName, next.tried, next.wait, next.callback);
         }
-      } catch (err) {
-        resolver(err);
+
+        if (err && data && tried < _this3.maxRetries) {
+          setTimeout(function () {
+            _this3.read.call(_this3, lng, ns, fcName, tried + 1, wait * 2, callback);
+          }, wait);
+          return;
+        }
+
+        callback(err, data);
+      });
+    }
+  }, {
+    key: "prepareLoading",
+    value: function prepareLoading(languages, namespaces) {
+      var _this4 = this;
+
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var callback = arguments.length > 3 ? arguments[3] : undefined;
+
+      if (!this.backend) {
+        this.logger.warn('No backend was added via i18next.use. Will not load resources.');
+        return callback && callback();
+      }
+
+      if (typeof languages === 'string') languages = this.languageUtils.toResolveHierarchy(languages);
+      if (typeof namespaces === 'string') namespaces = [namespaces];
+      var toLoad = this.queueLoad(languages, namespaces, options, callback);
+
+      if (!toLoad.toLoad.length) {
+        if (!toLoad.pending.length) callback();
+        return null;
       }
-      return;
+
+      toLoad.toLoad.forEach(function (name) {
+        _this4.loadOne(name);
+      });
     }
-    return fc(lng, ns, resolver);
-  }
-  prepareLoading(languages, namespaces) {
-    let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    let callback = arguments.length > 3 ? arguments[3] : undefined;
-    if (!this.backend) {
-      this.logger.warn('No backend was added via i18next.use. Will not load resources.');
-      return callback && callback();
-    }
-    if (typeof languages === 'string') languages = this.languageUtils.toResolveHierarchy(languages);
-    if (typeof namespaces === 'string') namespaces = [namespaces];
-    const toLoad = this.queueLoad(languages, namespaces, options, callback);
-    if (!toLoad.toLoad.length) {
-      if (!toLoad.pending.length) callback();
-      return null;
+  }, {
+    key: "load",
+    value: function load(languages, namespaces, callback) {
+      this.prepareLoading(languages, namespaces, {}, callback);
+    }
+  }, {
+    key: "reload",
+    value: function reload(languages, namespaces, callback) {
+      this.prepareLoading(languages, namespaces, {
+        reload: true
+      }, callback);
+    }
+  }, {
+    key: "loadOne",
+    value: function loadOne(name) {
+      var _this5 = this;
+
+      var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+      var s = name.split('|');
+      var lng = s[0];
+      var ns = s[1];
+      this.read(lng, ns, 'read', undefined, undefined, function (err, data) {
+        if (err) _this5.logger.warn("".concat(prefix, "loading namespace ").concat(ns, " for language ").concat(lng, " failed"), err);
+        if (!err && data) _this5.logger.log("".concat(prefix, "loaded namespace ").concat(ns, " for language ").concat(lng), data);
+
+        _this5.loaded(name, err, data);
+      });
     }
-    toLoad.toLoad.forEach(name => {
-      this.loadOne(name);
-    });
-  }
-  load(languages, namespaces, callback) {
-    this.prepareLoading(languages, namespaces, {}, callback);
-  }
-  reload(languages, namespaces, callback) {
-    this.prepareLoading(languages, namespaces, {
-      reload: true
-    }, callback);
-  }
-  loadOne(name) {
-    let prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-    const s = name.split('|');
-    const lng = s[0];
-    const ns = s[1];
-    this.read(lng, ns, 'read', undefined, undefined, (err, data) => {
-      if (err) this.logger.warn(`${prefix}loading namespace ${ns} for language ${lng} failed`, err);
-      if (!err && data) this.logger.log(`${prefix}loaded namespace ${ns} for language ${lng}`, data);
-      this.loaded(name, err, data);
-    });
-  }
-  saveMissing(languages, namespace, key, fallbackValue, isUpdate) {
-    let options = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
-    let clb = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : () => {};
-    if (this.services.utils && this.services.utils.hasLoadedNamespace && !this.services.utils.hasLoadedNamespace(namespace)) {
-      this.logger.warn(`did not save key "${key}" 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;
-    }
-    if (key === undefined || key === null || key === '') return;
-    if (this.backend && this.backend.create) {
-      const opts = {
-        ...options,
-        isUpdate
-      };
-      const fc = this.backend.create.bind(this.backend);
-      if (fc.length < 6) {
-        try {
-          let r;
-          if (fc.length === 5) {
-            r = fc(languages, namespace, key, fallbackValue, opts);
-          } else {
-            r = fc(languages, namespace, key, fallbackValue);
-          }
-          if (r && typeof r.then === 'function') {
-            r.then(data => clb(null, data)).catch(clb);
-          } else {
-            clb(null, r);
-          }
-        } catch (err) {
-          clb(err);
-        }
-      } else {
-        fc(languages, namespace, key, fallbackValue, clb, opts);
+  }, {
+    key: "saveMissing",
+    value: function saveMissing(languages, namespace, key, fallbackValue, isUpdate) {
+      var options = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
+
+      if (this.services.utils && this.services.utils.hasLoadedNamespace && !this.services.utils.hasLoadedNamespace(namespace)) {
+        this.logger.warn("did not save key \"".concat(key, "\" as the namespace \"").concat(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;
       }
+
+      if (key === undefined || key === null || key === '') return;
+
+      if (this.backend && this.backend.create) {
+        this.backend.create(languages, namespace, key, fallbackValue, null, _objectSpread$5(_objectSpread$5({}, options), {}, {
+          isUpdate: isUpdate
+        }));
+      }
+
+      if (!languages || !languages[0]) return;
+      this.store.addResource(languages[0], namespace, key, fallbackValue);
     }
-    if (!languages || !languages[0]) return;
-    this.store.addResource(languages[0], namespace, key, fallbackValue);
-  }
-}
+  }]);
+
+  return Connector;
+}(EventEmitter);
 
 function get() {
   return {
@@ -2910,7 +3334,7 @@ function get() {
     missingInterpolationHandler: false,
     postProcess: false,
     postProcessPassResolved: false,
-    returnNull: false,
+    returnNull: true,
     returnEmptyString: true,
     returnObjects: false,
     joinArrays: false,
@@ -2919,21 +3343,25 @@ function get() {
     appendNamespaceToMissingKey: false,
     appendNamespaceToCIMode: false,
     overloadTranslationOptionHandler: function handle(args) {
-      let ret = {};
-      if (typeof args[1] === 'object') ret = args[1];
+      var ret = {};
+      if (_typeof(args[1]) === 'object') ret = args[1];
       if (typeof args[1] === 'string') ret.defaultValue = args[1];
       if (typeof args[2] === 'string') ret.tDescription = args[2];
-      if (typeof args[2] === 'object' || typeof args[3] === 'object') {
-        const options = args[3] || args[2];
-        Object.keys(options).forEach(key => {
+
+      if (_typeof(args[2]) === 'object' || _typeof(args[3]) === 'object') {
+        var options = args[3] || args[2];
+        Object.keys(options).forEach(function (key) {
           ret[key] = options[key];
         });
       }
+
       return ret;
     },
     interpolation: {
       escapeValue: true,
-      format: value => value,
+      format: function format(value, _format, lng, options) {
+        return value;
+      },
       prefix: '{{',
       suffix: '}}',
       formatSeparator: ',',
@@ -2950,496 +3378,636 @@ function transformOptions(options) {
   if (typeof options.ns === 'string') options.ns = [options.ns];
   if (typeof options.fallbackLng === 'string') options.fallbackLng = [options.fallbackLng];
   if (typeof options.fallbackNS === 'string') options.fallbackNS = [options.fallbackNS];
+
   if (options.supportedLngs && options.supportedLngs.indexOf('cimode') < 0) {
     options.supportedLngs = options.supportedLngs.concat(['cimode']);
   }
+
   return options;
 }
 
+function ownKeys$6(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$6(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _createSuper$3(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$3(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct$3() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 function noop() {}
+
 function bindMemberFunctions(inst) {
-  const mems = Object.getOwnPropertyNames(Object.getPrototypeOf(inst));
-  mems.forEach(mem => {
+  var mems = Object.getOwnPropertyNames(Object.getPrototypeOf(inst));
+  mems.forEach(function (mem) {
     if (typeof inst[mem] === 'function') {
       inst[mem] = inst[mem].bind(inst);
     }
   });
 }
-class I18n extends EventEmitter {
-  constructor() {
-    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    let callback = arguments.length > 1 ? arguments[1] : undefined;
-    super();
-    this.options = transformOptions(options);
-    this.services = {};
-    this.logger = baseLogger;
-    this.modules = {
-      external: []
-    };
-    bindMemberFunctions(this);
-    if (callback && !this.isInitialized && !options.isClone) {
-      if (!this.options.initImmediate) {
-        this.init(options, callback);
-        return this;
-      }
-      setTimeout(() => {
-        this.init(options, callback);
-      }, 0);
+
+var I18n = function (_EventEmitter) {
+  _inherits(I18n, _EventEmitter);
+
+  var _super = _createSuper$3(I18n);
+
+  function I18n() {
+    var _this;
+
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var callback = arguments.length > 1 ? arguments[1] : undefined;
+
+    _classCallCheck(this, I18n);
+
+    _this = _super.call(this);
+
+    if (isIE10) {
+      EventEmitter.call(_assertThisInitialized(_this));
     }
-  }
-  init() {
-    var _this = this;
-    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    let callback = arguments.length > 1 ? arguments[1] : undefined;
-    this.isInitializing = true;
-    if (typeof options === 'function') {
-      callback = options;
-      options = {};
-    }
-    if (!options.defaultNS && options.defaultNS !== false && options.ns) {
-      if (typeof options.ns === 'string') {
-        options.defaultNS = options.ns;
-      } else if (options.ns.indexOf('translation') < 0) {
-        options.defaultNS = options.ns[0];
-      }
-    }
-    const defOpts = get();
-    this.options = {
-      ...defOpts,
-      ...this.options,
-      ...transformOptions(options)
+
+    _this.options = transformOptions(options);
+    _this.services = {};
+    _this.logger = baseLogger;
+    _this.modules = {
+      external: []
     };
-    if (this.options.compatibilityAPI !== 'v1') {
-      this.options.interpolation = {
-        ...defOpts.interpolation,
-        ...this.options.interpolation
-      };
-    }
-    if (options.keySeparator !== undefined) {
-      this.options.userDefinedKeySeparator = options.keySeparator;
-    }
-    if (options.nsSeparator !== undefined) {
-      this.options.userDefinedNsSeparator = options.nsSeparator;
-    }
-    function createClassOnDemand(ClassOrObject) {
-      if (!ClassOrObject) return null;
-      if (typeof ClassOrObject === 'function') return new ClassOrObject();
-      return ClassOrObject;
+    bindMemberFunctions(_assertThisInitialized(_this));
+
+    if (callback && !_this.isInitialized && !options.isClone) {
+      if (!_this.options.initImmediate) {
+        _this.init(options, callback);
+
+        return _possibleConstructorReturn(_this, _assertThisInitialized(_this));
+      }
+
+      setTimeout(function () {
+        _this.init(options, callback);
+      }, 0);
     }
-    if (!this.options.isClone) {
-      if (this.modules.logger) {
-        baseLogger.init(createClassOnDemand(this.modules.logger), this.options);
-      } else {
-        baseLogger.init(null, this.options);
-      }
-      let formatter;
-      if (this.modules.formatter) {
-        formatter = this.modules.formatter;
-      } else if (typeof Intl !== 'undefined') {
-        formatter = Formatter;
-      }
-      const lu = new LanguageUtil(this.options);
-      this.store = new ResourceStore(this.options.resources, this.options);
-      const s = this.services;
-      s.logger = baseLogger;
-      s.resourceStore = this.store;
-      s.languageUtils = lu;
-      s.pluralResolver = new PluralResolver(lu, {
-        prepend: this.options.pluralSeparator,
-        compatibilityJSON: this.options.compatibilityJSON,
-        simplifyPluralSuffix: this.options.simplifyPluralSuffix
-      });
-      if (formatter && (!this.options.interpolation.format || this.options.interpolation.format === defOpts.interpolation.format)) {
-        s.formatter = createClassOnDemand(formatter);
-        s.formatter.init(s, this.options);
-        this.options.interpolation.format = s.formatter.format.bind(s.formatter);
-      }
-      s.interpolator = new Interpolator(this.options);
-      s.utils = {
-        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];
+
+    return _this;
+  }
+
+  _createClass(I18n, [{
+    key: "init",
+    value: function init() {
+      var _this2 = this;
+
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var callback = arguments.length > 1 ? arguments[1] : undefined;
+
+      if (typeof options === 'function') {
+        callback = options;
+        options = {};
+      }
+
+      if (!options.defaultNS && options.defaultNS !== false && options.ns) {
+        if (typeof options.ns === 'string') {
+          options.defaultNS = options.ns;
+        } else if (options.ns.indexOf('translation') < 0) {
+          options.defaultNS = options.ns[0];
         }
-        _this.emit(event, ...args);
-      });
-      if (this.modules.languageDetector) {
-        s.languageDetector = createClassOnDemand(this.modules.languageDetector);
-        if (s.languageDetector.init) s.languageDetector.init(s, this.options.detection, this.options);
       }
-      if (this.modules.i18nFormat) {
-        s.i18nFormat = createClassOnDemand(this.modules.i18nFormat);
-        if (s.i18nFormat.init) s.i18nFormat.init(this);
+
+      var defOpts = get();
+      this.options = _objectSpread$6(_objectSpread$6(_objectSpread$6({}, defOpts), this.options), transformOptions(options));
+
+      if (this.options.compatibilityAPI !== 'v1') {
+        this.options.interpolation = _objectSpread$6(_objectSpread$6({}, defOpts.interpolation), this.options.interpolation);
+      }
+
+      if (options.keySeparator !== undefined) {
+        this.options.userDefinedKeySeparator = options.keySeparator;
+      }
+
+      if (options.nsSeparator !== undefined) {
+        this.options.userDefinedNsSeparator = options.nsSeparator;
+      }
+
+      function createClassOnDemand(ClassOrObject) {
+        if (!ClassOrObject) return null;
+        if (typeof ClassOrObject === 'function') return new ClassOrObject();
+        return ClassOrObject;
       }
-      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];
+
+      if (!this.options.isClone) {
+        if (this.modules.logger) {
+          baseLogger.init(createClassOnDemand(this.modules.logger), this.options);
+        } else {
+          baseLogger.init(null, this.options);
+        }
+
+        var formatter;
+
+        if (this.modules.formatter) {
+          formatter = this.modules.formatter;
+        } else if (typeof Intl !== 'undefined') {
+          formatter = Formatter;
+        }
+
+        var lu = new LanguageUtil(this.options);
+        this.store = new ResourceStore(this.options.resources, this.options);
+        var s = this.services;
+        s.logger = baseLogger;
+        s.resourceStore = this.store;
+        s.languageUtils = lu;
+        s.pluralResolver = new PluralResolver(lu, {
+          prepend: this.options.pluralSeparator,
+          compatibilityJSON: this.options.compatibilityJSON,
+          simplifyPluralSuffix: this.options.simplifyPluralSuffix
+        });
+
+        if (formatter && (!this.options.interpolation.format || this.options.interpolation.format === defOpts.interpolation.format)) {
+          s.formatter = createClassOnDemand(formatter);
+          s.formatter.init(s, this.options);
+          this.options.interpolation.format = s.formatter.format.bind(s.formatter);
+        }
+
+        s.interpolator = new Interpolator(this.options);
+        s.utils = {
+          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];
+          }
+
+          _this2.emit.apply(_this2, [event].concat(args));
+        });
+
+        if (this.modules.languageDetector) {
+          s.languageDetector = createClassOnDemand(this.modules.languageDetector);
+          s.languageDetector.init(s, this.options.detection, this.options);
+        }
+
+        if (this.modules.i18nFormat) {
+          s.i18nFormat = createClassOnDemand(this.modules.i18nFormat);
+          if (s.i18nFormat.init) s.i18nFormat.init(this);
         }
-        _this.emit(event, ...args);
+
+        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];
+          }
+
+          _this2.emit.apply(_this2, [event].concat(args));
+        });
+        this.modules.external.forEach(function (m) {
+          if (m.init) m.init(_this2);
+        });
+      }
+
+      this.format = this.options.interpolation.format;
+      if (!callback) callback = noop;
+
+      if (this.options.fallbackLng && !this.services.languageDetector && !this.options.lng) {
+        var codes = this.services.languageUtils.getFallbackCodes(this.options.fallbackLng);
+        if (codes.length > 0 && codes[0] !== 'dev') this.options.lng = codes[0];
+      }
+
+      if (!this.services.languageDetector && !this.options.lng) {
+        this.logger.warn('init: no languageDetector is used and no lng is defined');
+      }
+
+      var storeApi = ['getResource', 'hasResourceBundle', 'getResourceBundle', 'getDataByLanguage'];
+      storeApi.forEach(function (fcName) {
+        _this2[fcName] = function () {
+          var _this2$store;
+
+          return (_this2$store = _this2.store)[fcName].apply(_this2$store, arguments);
+        };
       });
-      this.modules.external.forEach(m => {
-        if (m.init) m.init(this);
+      var storeApiChained = ['addResource', 'addResources', 'addResourceBundle', 'removeResourceBundle'];
+      storeApiChained.forEach(function (fcName) {
+        _this2[fcName] = function () {
+          var _this2$store2;
+
+          (_this2$store2 = _this2.store)[fcName].apply(_this2$store2, arguments);
+
+          return _this2;
+        };
       });
-    }
-    this.format = this.options.interpolation.format;
-    if (!callback) callback = noop;
-    if (this.options.fallbackLng && !this.services.languageDetector && !this.options.lng) {
-      const codes = this.services.languageUtils.getFallbackCodes(this.options.fallbackLng);
-      if (codes.length > 0 && codes[0] !== 'dev') this.options.lng = codes[0];
-    }
-    if (!this.services.languageDetector && !this.options.lng) {
-      this.logger.warn('init: no languageDetector is used and no lng is defined');
-    }
-    const storeApi = ['getResource', 'hasResourceBundle', 'getResourceBundle', 'getDataByLanguage'];
-    storeApi.forEach(fcName => {
-      this[fcName] = function () {
-        return _this.store[fcName](...arguments);
-      };
-    });
-    const storeApiChained = ['addResource', 'addResources', 'addResourceBundle', 'removeResourceBundle'];
-    storeApiChained.forEach(fcName => {
-      this[fcName] = function () {
-        _this.store[fcName](...arguments);
-        return _this;
-      };
-    });
-    const deferred = defer();
-    const load = () => {
-      const finish = (err, t) => {
-        this.isInitializing = false;
-        if (this.isInitialized && !this.initializedStoreOnce) this.logger.warn('init: i18next is already initialized. You should call init just once!');
-        this.isInitialized = true;
-        if (!this.options.isClone) this.logger.log('initialized', this.options);
-        this.emit('initialized', this.options);
-        deferred.resolve(t);
-        callback(err, t);
+      var deferred = defer();
+
+      var load = function load() {
+        var finish = function finish(err, t) {
+          if (_this2.isInitialized && !_this2.initializedStoreOnce) _this2.logger.warn('init: i18next is already initialized. You should call init just once!');
+          _this2.isInitialized = true;
+          if (!_this2.options.isClone) _this2.logger.log('initialized', _this2.options);
+
+          _this2.emit('initialized', _this2.options);
+
+          deferred.resolve(t);
+          callback(err, t);
+        };
+
+        if (_this2.languages && _this2.options.compatibilityAPI !== 'v1' && !_this2.isInitialized) return finish(null, _this2.t.bind(_this2));
+
+        _this2.changeLanguage(_this2.options.lng, finish);
       };
-      if (this.languages && this.options.compatibilityAPI !== 'v1' && !this.isInitialized) return finish(null, this.t.bind(this));
-      this.changeLanguage(this.options.lng, finish);
-    };
-    if (this.options.resources || !this.options.initImmediate) {
-      load();
-    } else {
-      setTimeout(load, 0);
+
+      if (this.options.resources || !this.options.initImmediate) {
+        load();
+      } else {
+        setTimeout(load, 0);
+      }
+
+      return deferred;
     }
-    return deferred;
-  }
-  loadResources(language) {
-    let callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : noop;
-    let usedCallback = callback;
-    const usedLng = typeof language === 'string' ? language : this.language;
-    if (typeof language === 'function') usedCallback = language;
-    if (!this.options.resources || this.options.partialBundledLanguages) {
-      if (usedLng && usedLng.toLowerCase() === 'cimode' && (!this.options.preload || this.options.preload.length === 0)) return usedCallback();
-      const toLoad = [];
-      const append = lng => {
-        if (!lng) return;
-        if (lng === 'cimode') return;
-        const lngs = this.services.languageUtils.toResolveHierarchy(lng);
-        lngs.forEach(l => {
-          if (l === 'cimode') return;
-          if (toLoad.indexOf(l) < 0) toLoad.push(l);
+  }, {
+    key: "loadResources",
+    value: function loadResources(language) {
+      var _this3 = this;
+
+      var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : noop;
+      var usedCallback = callback;
+      var usedLng = typeof language === 'string' ? language : this.language;
+      if (typeof language === 'function') usedCallback = language;
+
+      if (!this.options.resources || this.options.partialBundledLanguages) {
+        if (usedLng && usedLng.toLowerCase() === 'cimode') return usedCallback();
+        var toLoad = [];
+
+        var append = function append(lng) {
+          if (!lng) return;
+
+          var lngs = _this3.services.languageUtils.toResolveHierarchy(lng);
+
+          lngs.forEach(function (l) {
+            if (toLoad.indexOf(l) < 0) toLoad.push(l);
+          });
+        };
+
+        if (!usedLng) {
+          var fallbacks = this.services.languageUtils.getFallbackCodes(this.options.fallbackLng);
+          fallbacks.forEach(function (l) {
+            return append(l);
+          });
+        } else {
+          append(usedLng);
+        }
+
+        if (this.options.preload) {
+          this.options.preload.forEach(function (l) {
+            return append(l);
+          });
+        }
+
+        this.services.backendConnector.load(toLoad, this.options.ns, function (e) {
+          if (!e && !_this3.resolvedLanguage && _this3.language) _this3.setResolvedLanguage(_this3.language);
+          usedCallback(e);
         });
-      };
-      if (!usedLng) {
-        const fallbacks = this.services.languageUtils.getFallbackCodes(this.options.fallbackLng);
-        fallbacks.forEach(l => append(l));
       } else {
-        append(usedLng);
-      }
-      if (this.options.preload) {
-        this.options.preload.forEach(l => append(l));
+        usedCallback(null);
       }
-      this.services.backendConnector.load(toLoad, this.options.ns, e => {
-        if (!e && !this.resolvedLanguage && this.language) this.setResolvedLanguage(this.language);
-        usedCallback(e);
-      });
-    } else {
-      usedCallback(null);
     }
-  }
-  reloadResources(lngs, ns, callback) {
-    const deferred = defer();
-    if (!lngs) lngs = this.languages;
-    if (!ns) ns = this.options.ns;
-    if (!callback) callback = noop;
-    this.services.backendConnector.reload(lngs, ns, err => {
-      deferred.resolve();
-      callback(err);
-    });
-    return deferred;
-  }
-  use(module) {
-    if (!module) throw new Error('You are passing an undefined module! Please check the object you are passing to i18next.use()');
-    if (!module.type) throw new Error('You are passing a wrong module! Please check the object you are passing to i18next.use()');
-    if (module.type === 'backend') {
-      this.modules.backend = module;
-    }
-    if (module.type === 'logger' || module.log && module.warn && module.error) {
-      this.modules.logger = module;
-    }
-    if (module.type === 'languageDetector') {
-      this.modules.languageDetector = module;
-    }
-    if (module.type === 'i18nFormat') {
-      this.modules.i18nFormat = module;
-    }
-    if (module.type === 'postProcessor') {
-      postProcessor.addPostProcessor(module);
-    }
-    if (module.type === 'formatter') {
-      this.modules.formatter = module;
-    }
-    if (module.type === '3rdParty') {
-      this.modules.external.push(module);
+  }, {
+    key: "reloadResources",
+    value: function reloadResources(lngs, ns, callback) {
+      var deferred = defer();
+      if (!lngs) lngs = this.languages;
+      if (!ns) ns = this.options.ns;
+      if (!callback) callback = noop;
+      this.services.backendConnector.reload(lngs, ns, function (err) {
+        deferred.resolve();
+        callback(err);
+      });
+      return deferred;
     }
-    return this;
-  }
-  setResolvedLanguage(l) {
-    if (!l || !this.languages) return;
-    if (['cimode', 'dev'].indexOf(l) > -1) return;
-    for (let li = 0; li < this.languages.length; li++) {
-      const lngInLngs = this.languages[li];
-      if (['cimode', 'dev'].indexOf(lngInLngs) > -1) continue;
-      if (this.store.hasLanguageSomeTranslations(lngInLngs)) {
-        this.resolvedLanguage = lngInLngs;
-        break;
+  }, {
+    key: "use",
+    value: function use(module) {
+      if (!module) throw new Error('You are passing an undefined module! Please check the object you are passing to i18next.use()');
+      if (!module.type) throw new Error('You are passing a wrong module! Please check the object you are passing to i18next.use()');
+
+      if (module.type === 'backend') {
+        this.modules.backend = module;
+      }
+
+      if (module.type === 'logger' || module.log && module.warn && module.error) {
+        this.modules.logger = module;
+      }
+
+      if (module.type === 'languageDetector') {
+        this.modules.languageDetector = module;
       }
+
+      if (module.type === 'i18nFormat') {
+        this.modules.i18nFormat = module;
+      }
+
+      if (module.type === 'postProcessor') {
+        postProcessor.addPostProcessor(module);
+      }
+
+      if (module.type === 'formatter') {
+        this.modules.formatter = module;
+      }
+
+      if (module.type === '3rdParty') {
+        this.modules.external.push(module);
+      }
+
+      return this;
     }
-  }
-  changeLanguage(lng, callback) {
-    var _this2 = this;
-    this.isLanguageChangingTo = lng;
-    const deferred = defer();
-    this.emit('languageChanging', lng);
-    const setLngProps = l => {
-      this.language = l;
-      this.languages = this.services.languageUtils.toResolveHierarchy(l);
-      this.resolvedLanguage = undefined;
-      this.setResolvedLanguage(l);
-    };
-    const done = (err, l) => {
-      if (l) {
-        setLngProps(l);
-        this.translator.changeLanguage(l);
-        this.isLanguageChangingTo = undefined;
-        this.emit('languageChanged', l);
-        this.logger.log('languageChanged', l);
-      } else {
-        this.isLanguageChangingTo = undefined;
+  }, {
+    key: "setResolvedLanguage",
+    value: function setResolvedLanguage(l) {
+      if (!l || !this.languages) return;
+      if (['cimode', 'dev'].indexOf(l) > -1) return;
+
+      for (var li = 0; li < this.languages.length; li++) {
+        var lngInLngs = this.languages[li];
+        if (['cimode', 'dev'].indexOf(lngInLngs) > -1) continue;
+
+        if (this.store.hasLanguageSomeTranslations(lngInLngs)) {
+          this.resolvedLanguage = lngInLngs;
+          break;
+        }
       }
-      deferred.resolve(function () {
-        return _this2.t(...arguments);
-      });
-      if (callback) callback(err, function () {
-        return _this2.t(...arguments);
-      });
-    };
-    const setLng = lngs => {
-      if (!lng && !lngs && this.services.languageDetector) lngs = [];
-      const l = typeof lngs === 'string' ? lngs : this.services.languageUtils.getBestMatchFromCodes(lngs);
-      if (l) {
-        if (!this.language) {
+    }
+  }, {
+    key: "changeLanguage",
+    value: function changeLanguage(lng, callback) {
+      var _this4 = this;
+
+      this.isLanguageChangingTo = lng;
+      var deferred = defer();
+      this.emit('languageChanging', lng);
+
+      var setLngProps = function setLngProps(l) {
+        _this4.language = l;
+        _this4.languages = _this4.services.languageUtils.toResolveHierarchy(l);
+        _this4.resolvedLanguage = undefined;
+
+        _this4.setResolvedLanguage(l);
+      };
+
+      var done = function done(err, l) {
+        if (l) {
           setLngProps(l);
+
+          _this4.translator.changeLanguage(l);
+
+          _this4.isLanguageChangingTo = undefined;
+
+          _this4.emit('languageChanged', l);
+
+          _this4.logger.log('languageChanged', l);
+        } else {
+          _this4.isLanguageChangingTo = undefined;
         }
-        if (!this.translator.language) this.translator.changeLanguage(l);
-        if (this.services.languageDetector && this.services.languageDetector.cacheUserLanguage) this.services.languageDetector.cacheUserLanguage(l);
-      }
-      this.loadResources(l, err => {
-        done(err, l);
-      });
-    };
-    if (!lng && this.services.languageDetector && !this.services.languageDetector.async) {
-      setLng(this.services.languageDetector.detect());
-    } else if (!lng && this.services.languageDetector && this.services.languageDetector.async) {
-      if (this.services.languageDetector.detect.length === 0) {
-        this.services.languageDetector.detect().then(setLng);
-      } else {
+
+        deferred.resolve(function () {
+          return _this4.t.apply(_this4, arguments);
+        });
+        if (callback) callback(err, function () {
+          return _this4.t.apply(_this4, arguments);
+        });
+      };
+
+      var setLng = function setLng(lngs) {
+        if (!lng && !lngs && _this4.services.languageDetector) lngs = [];
+        var l = typeof lngs === 'string' ? lngs : _this4.services.languageUtils.getBestMatchFromCodes(lngs);
+
+        if (l) {
+          if (!_this4.language) {
+            setLngProps(l);
+          }
+
+          if (!_this4.translator.language) _this4.translator.changeLanguage(l);
+          if (_this4.services.languageDetector) _this4.services.languageDetector.cacheUserLanguage(l);
+        }
+
+        _this4.loadResources(l, function (err) {
+          done(err, l);
+        });
+      };
+
+      if (!lng && this.services.languageDetector && !this.services.languageDetector.async) {
+        setLng(this.services.languageDetector.detect());
+      } else if (!lng && this.services.languageDetector && this.services.languageDetector.async) {
         this.services.languageDetector.detect(setLng);
-      }
-    } else {
-      setLng(lng);
-    }
-    return deferred;
-  }
-  getFixedT(lng, ns, keyPrefix) {
-    var _this3 = this;
-    const fixedT = function (key, opts) {
-      let options;
-      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([key, opts].concat(rest));
       } else {
-        options = {
-          ...opts
-        };
+        setLng(lng);
       }
-      options.lng = options.lng || fixedT.lng;
-      options.lngs = options.lngs || fixedT.lngs;
-      options.ns = options.ns || fixedT.ns;
-      options.keyPrefix = options.keyPrefix || keyPrefix || fixedT.keyPrefix;
-      const keySeparator = _this3.options.keySeparator || '.';
-      let resultKey;
-      if (options.keyPrefix && Array.isArray(key)) {
-        resultKey = key.map(k => `${options.keyPrefix}${keySeparator}${k}`);
+
+      return deferred;
+    }
+  }, {
+    key: "getFixedT",
+    value: function getFixedT(lng, ns, keyPrefix) {
+      var _this5 = this;
+
+      var fixedT = function fixedT(key, opts) {
+        var options;
+
+        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 = _this5.options.overloadTranslationOptionHandler([key, opts].concat(rest));
+        } else {
+          options = _objectSpread$6({}, opts);
+        }
+
+        options.lng = options.lng || fixedT.lng;
+        options.lngs = options.lngs || fixedT.lngs;
+        options.ns = options.ns || fixedT.ns;
+        options.keyPrefix = options.keyPrefix || keyPrefix || fixedT.keyPrefix;
+        var keySeparator = _this5.options.keySeparator || '.';
+        var resultKey = options.keyPrefix ? "".concat(options.keyPrefix).concat(keySeparator).concat(key) : key;
+        return _this5.t(resultKey, options);
+      };
+
+      if (typeof lng === 'string') {
+        fixedT.lng = lng;
       } else {
-        resultKey = options.keyPrefix ? `${options.keyPrefix}${keySeparator}${key}` : key;
+        fixedT.lngs = lng;
       }
-      return _this3.t(resultKey, options);
-    };
-    if (typeof lng === 'string') {
-      fixedT.lng = lng;
-    } else {
-      fixedT.lngs = lng;
+
+      fixedT.ns = ns;
+      fixedT.keyPrefix = keyPrefix;
+      return fixedT;
+    }
+  }, {
+    key: "t",
+    value: function t() {
+      var _this$translator;
+
+      return this.translator && (_this$translator = this.translator).translate.apply(_this$translator, arguments);
     }
-    fixedT.ns = ns;
-    fixedT.keyPrefix = keyPrefix;
-    return fixedT;
-  }
-  t() {
-    return this.translator && this.translator.translate(...arguments);
-  }
-  exists() {
-    return this.translator && this.translator.exists(...arguments);
-  }
-  setDefaultNamespace(ns) {
-    this.options.defaultNS = ns;
-  }
-  hasLoadedNamespace(ns) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    if (!this.isInitialized) {
-      this.logger.warn('hasLoadedNamespace: i18next was not initialized', this.languages);
-      return false;
+  }, {
+    key: "exists",
+    value: function exists() {
+      var _this$translator2;
+
+      return this.translator && (_this$translator2 = this.translator).exists.apply(_this$translator2, arguments);
     }
-    if (!this.languages || !this.languages.length) {
-      this.logger.warn('hasLoadedNamespace: i18n.languages were undefined or empty', this.languages);
-      return false;
+  }, {
+    key: "setDefaultNamespace",
+    value: function setDefaultNamespace(ns) {
+      this.options.defaultNS = ns;
     }
-    const lng = options.lng || this.resolvedLanguage || this.languages[0];
-    const fallbackLng = this.options ? this.options.fallbackLng : false;
-    const lastLng = this.languages[this.languages.length - 1];
-    if (lng.toLowerCase() === 'cimode') return true;
-    const loadNotPending = (l, n) => {
-      const loadState = this.services.backendConnector.state[`${l}|${n}`];
-      return loadState === -1 || loadState === 2;
-    };
-    if (options.precheck) {
-      const preResult = options.precheck(this, loadNotPending);
-      if (preResult !== undefined) return preResult;
+  }, {
+    key: "hasLoadedNamespace",
+    value: function hasLoadedNamespace(ns) {
+      var _this6 = this;
+
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+      if (!this.isInitialized) {
+        this.logger.warn('hasLoadedNamespace: i18next was not initialized', this.languages);
+        return false;
+      }
+
+      if (!this.languages || !this.languages.length) {
+        this.logger.warn('hasLoadedNamespace: i18n.languages were undefined or empty', this.languages);
+        return false;
+      }
+
+      var lng = this.resolvedLanguage || this.languages[0];
+      var fallbackLng = this.options ? this.options.fallbackLng : false;
+      var lastLng = this.languages[this.languages.length - 1];
+      if (lng.toLowerCase() === 'cimode') return true;
+
+      var loadNotPending = function loadNotPending(l, n) {
+        var loadState = _this6.services.backendConnector.state["".concat(l, "|").concat(n)];
+
+        return loadState === -1 || loadState === 2;
+      };
+
+      if (options.precheck) {
+        var preResult = options.precheck(this, loadNotPending);
+        if (preResult !== undefined) return preResult;
+      }
+
+      if (this.hasResourceBundle(lng, ns)) return true;
+      if (!this.services.backendConnector.backend || this.options.resources && !this.options.partialBundledLanguages) return true;
+      if (loadNotPending(lng, ns) && (!fallbackLng || loadNotPending(lastLng, ns))) return true;
+      return false;
     }
-    if (this.hasResourceBundle(lng, ns)) return true;
-    if (!this.services.backendConnector.backend || this.options.resources && !this.options.partialBundledLanguages) return true;
-    if (loadNotPending(lng, ns) && (!fallbackLng || loadNotPending(lastLng, ns))) return true;
-    return false;
-  }
-  loadNamespaces(ns, callback) {
-    const deferred = defer();
-    if (!this.options.ns) {
-      if (callback) callback();
-      return Promise.resolve();
-    }
-    if (typeof ns === 'string') ns = [ns];
-    ns.forEach(n => {
-      if (this.options.ns.indexOf(n) < 0) this.options.ns.push(n);
-    });
-    this.loadResources(err => {
-      deferred.resolve();
-      if (callback) callback(err);
-    });
-    return deferred;
-  }
-  loadLanguages(lngs, callback) {
-    const deferred = defer();
-    if (typeof lngs === 'string') lngs = [lngs];
-    const preloaded = this.options.preload || [];
-    const newLngs = lngs.filter(lng => preloaded.indexOf(lng) < 0 && this.services.languageUtils.isSupportedCode(lng));
-    if (!newLngs.length) {
-      if (callback) callback();
-      return Promise.resolve();
-    }
-    this.options.preload = preloaded.concat(newLngs);
-    this.loadResources(err => {
-      deferred.resolve();
-      if (callback) callback(err);
-    });
-    return deferred;
-  }
-  dir(lng) {
-    if (!lng) lng = this.resolvedLanguage || (this.languages && this.languages.length > 0 ? this.languages[0] : this.language);
-    if (!lng) return 'rtl';
-    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 && this.services.languageUtils || new LanguageUtil(get());
-    return rtlLngs.indexOf(languageUtils.getLanguagePartFromCode(lng)) > -1 || lng.toLowerCase().indexOf('-arab') > 1 ? 'rtl' : 'ltr';
-  }
-  static createInstance() {
-    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    let callback = arguments.length > 1 ? arguments[1] : undefined;
-    return new I18n(options, callback);
-  }
-  cloneInstance() {
-    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    let callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : noop;
-    const forkResourceStore = options.forkResourceStore;
-    if (forkResourceStore) delete options.forkResourceStore;
-    const mergedOptions = {
-      ...this.options,
-      ...options,
-      ...{
+  }, {
+    key: "loadNamespaces",
+    value: function loadNamespaces(ns, callback) {
+      var _this7 = this;
+
+      var deferred = defer();
+
+      if (!this.options.ns) {
+        callback && callback();
+        return Promise.resolve();
+      }
+
+      if (typeof ns === 'string') ns = [ns];
+      ns.forEach(function (n) {
+        if (_this7.options.ns.indexOf(n) < 0) _this7.options.ns.push(n);
+      });
+      this.loadResources(function (err) {
+        deferred.resolve();
+        if (callback) callback(err);
+      });
+      return deferred;
+    }
+  }, {
+    key: "loadLanguages",
+    value: function loadLanguages(lngs, callback) {
+      var deferred = defer();
+      if (typeof lngs === 'string') lngs = [lngs];
+      var preloaded = this.options.preload || [];
+      var newLngs = lngs.filter(function (lng) {
+        return preloaded.indexOf(lng) < 0;
+      });
+
+      if (!newLngs.length) {
+        if (callback) callback();
+        return Promise.resolve();
+      }
+
+      this.options.preload = preloaded.concat(newLngs);
+      this.loadResources(function (err) {
+        deferred.resolve();
+        if (callback) callback(err);
+      });
+      return deferred;
+    }
+  }, {
+    key: "dir",
+    value: function dir(lng) {
+      if (!lng) lng = this.resolvedLanguage || (this.languages && this.languages.length > 0 ? this.languages[0] : this.language);
+      if (!lng) return 'rtl';
+      var 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'];
+      return rtlLngs.indexOf(this.services.languageUtils.getLanguagePartFromCode(lng)) > -1 || lng.toLowerCase().indexOf('-arab') > 1 ? 'rtl' : 'ltr';
+    }
+  }, {
+    key: "cloneInstance",
+    value: function cloneInstance() {
+      var _this8 = this;
+
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : noop;
+
+      var mergedOptions = _objectSpread$6(_objectSpread$6(_objectSpread$6({}, this.options), options), {
         isClone: true
+      });
+
+      var clone = new I18n(mergedOptions);
+
+      if (options.debug !== undefined || options.prefix !== undefined) {
+        clone.logger = clone.logger.clone(options);
       }
-    };
-    const clone = new I18n(mergedOptions);
-    if (options.debug !== undefined || options.prefix !== undefined) {
-      clone.logger = clone.logger.clone(options);
+
+      var membersToCopy = ['store', 'services', 'language'];
+      membersToCopy.forEach(function (m) {
+        clone[m] = _this8[m];
+      });
+      clone.services = _objectSpread$6({}, this.services);
+      clone.services.utils = {
+        hasLoadedNamespace: clone.hasLoadedNamespace.bind(clone)
+      };
+      clone.translator = new Translator(clone.services, clone.options);
+      clone.translator.on('*', function (event) {
+        for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
+          args[_key4 - 1] = arguments[_key4];
+        }
+
+        clone.emit.apply(clone, [event].concat(args));
+      });
+      clone.init(mergedOptions, callback);
+      clone.translator.options = clone.options;
+      clone.translator.backendConnector.services.utils = {
+        hasLoadedNamespace: clone.hasLoadedNamespace.bind(clone)
+      };
+      return clone;
     }
-    const membersToCopy = ['store', 'services', 'language'];
-    membersToCopy.forEach(m => {
-      clone[m] = this[m];
-    });
-    clone.services = {
-      ...this.services
-    };
-    clone.services.utils = {
-      hasLoadedNamespace: clone.hasLoadedNamespace.bind(clone)
-    };
-    if (forkResourceStore) {
-      clone.store = new ResourceStore(this.store.data, mergedOptions);
-      clone.services.resourceStore = clone.store;
+  }, {
+    key: "toJSON",
+    value: function toJSON() {
+      return {
+        options: this.options,
+        store: this.store,
+        language: this.language,
+        languages: this.languages,
+        resolvedLanguage: this.resolvedLanguage
+      };
     }
-    clone.translator = new Translator(clone.services, mergedOptions);
-    clone.translator.on('*', function (event) {
-      for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
-        args[_key4 - 1] = arguments[_key4];
-      }
-      clone.emit(event, ...args);
-    });
-    clone.init(mergedOptions, callback);
-    clone.translator.options = mergedOptions;
-    clone.translator.backendConnector.services.utils = {
-      hasLoadedNamespace: clone.hasLoadedNamespace.bind(clone)
-    };
-    return clone;
-  }
-  toJSON() {
-    return {
-      options: this.options,
-      store: this.store,
-      language: this.language,
-      languages: this.languages,
-      resolvedLanguage: this.resolvedLanguage
-    };
-  }
-}
-const instance = I18n.createInstance();
+  }]);
+
+  return I18n;
+}(EventEmitter);
+
+_defineProperty(I18n, "createInstance", function () {
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var callback = arguments.length > 1 ? arguments[1] : undefined;
+  return new I18n(options, callback);
+});
+
+var instance = I18n.createInstance();
 instance.createInstance = I18n.createInstance;
 
 instance.createInstance;
-instance.dir;
 instance.init;
 instance.loadResources;
 instance.reloadResources;
@@ -3479,7 +4047,7 @@ const WidgetI18nProvider = ({ children }) => {
   return /* @__PURE__ */ jsxRuntimeExports.jsx(I18nextProvider, { i18n: instance, children });
 };
 
-const {Suspense: Suspense$1,lazy: lazy$1,useEffect: useEffect$1,useState: useState$1,useRef} = await importShared('react');
+const {Suspense: Suspense$1,lazy: lazy$1,useEffect: useEffect$1,useState: useState$1,useRef,useCallback,useMemo} = await importShared('react');
 
 const __federation_var_VFCMFSectionGrid = await __federation_method_getRemote("VFCMF" , "./SectionGrid");
  let SectionGrid = __federation_method_unwrapDefault(__federation_var_VFCMFSectionGrid); 
@@ -3497,7 +4065,7 @@ const SECTION_COMPONENTS = {
   scroll: SectionScroll,
   default: SectionGrid
 };
-const Widget = ({ token, apiurl, viewercountry, requireauth }) => {
+const Widget = ({ token, apiurl, viewercountry, requireauth, labels }) => {
   const widgetRef = useRef(null);
   const [widgetState, setWidgetState] = useState$1({
     data: {},
@@ -3513,7 +4081,7 @@ const Widget = ({ token, apiurl, viewercountry, requireauth }) => {
   });
   const normalizedRequireAuth = requireauth === true || requireauth === "true";
   const normalizedViewerCountry = viewercountry || "";
-  const dispatchWidgetEvent = (eventType, eventData) => {
+  const dispatchWidgetEvent = useCallback((eventType, eventData) => {
     if (widgetRef?.current) {
       const customEvent = new CustomEvent(`widget-${eventType}`, {
         detail: {
@@ -3526,12 +4094,12 @@ const Widget = ({ token, apiurl, viewercountry, requireauth }) => {
       });
       widgetRef.current.dispatchEvent(customEvent);
     }
-  };
-  const eventHandlers = {
+  }, [token]);
+  const eventHandlers = useMemo(() => ({
     onError: (error2) => dispatchWidgetEvent("data-load-error", error2),
     onDataLoadCompleted: (eventData) => dispatchWidgetEvent("data-loaded", eventData),
     onWidgetItemClick: (itemData) => dispatchWidgetEvent("item-click", itemData)
-  };
+  }), [dispatchWidgetEvent]);
   const handleClosePlayer = () => {
     setPlayerState({
       isOpen: false,
@@ -3539,7 +4107,7 @@ const Widget = ({ token, apiurl, viewercountry, requireauth }) => {
     });
   };
   const apiUrl = apiurl || "https://apiv3.videoflow.io";
-  const widgetDataToSectionData = (data2) => {
+  const widgetDataToSectionData = useCallback((data2) => {
     if (data2.type === VIDEO_SECTION_TYPE) {
       return {
         description: "",
@@ -3587,7 +4155,7 @@ const Widget = ({ token, apiurl, viewercountry, requireauth }) => {
       apiUrl,
       eventHandlers
     };
-  };
+  }, [apiUrl, eventHandlers]);
   const applyStyle = (css) => {
     if (!css) return;
     const style = document.createElement("style");
@@ -3601,14 +4169,15 @@ const Widget = ({ token, apiurl, viewercountry, requireauth }) => {
       return SECTION_COMPONENTS[layout] || SECTION_COMPONENTS.default;
     }
     if (type2 === BLAZE_WIDGET_TYPE) {
-      return lazy$1(() => import('./blaze-CFK3LEal.js'));
+      return lazy$1(() => import('./blaze-CKjlj6PD.js'));
     }
-    return lazy$1(() => __variableDynamicImportRuntimeHelper((/* #__PURE__ */ Object.assign({"./widgets/gallery/gallery.jsx": () => import('./gallery-BnwImwd1.js'),"./widgets/matches/matches.jsx": () => import('./matches-C8-8ztat.js'),"./widgets/matchesStandalone/matchesStandalone.jsx": () => import('./matchesStandalone-D5u5Zh1z.js'),"./widgets/player/player.jsx": () => import('./player-B4I31inR.js'),"./widgets/poster/poster.jsx": () => import('./poster-Dh_-i4eF.js'),"./widgets/poster/posterItem.jsx": () => import('./posterItem-DR1i18lq.js'),"./widgets/scroll/scroll.jsx": () => import('./scroll-D-CmUvAZ.js'),"./widgets/story/story.jsx": () => import('./story-Cpvsn3p0.js')})), `./widgets/${type2}/${type2}.jsx`, 4));
+    return lazy$1(() => __variableDynamicImportRuntimeHelper((/* #__PURE__ */ Object.assign({"./widgets/gallery/gallery.jsx": () => import('./gallery-BnwImwd1.js'),"./widgets/matches/matches.jsx": () => import('./matches-C8-8ztat.js'),"./widgets/matchesStandalone/matchesStandalone.jsx": () => import('./matchesStandalone-D5u5Zh1z.js'),"./widgets/player/player.jsx": () => import('./player-B4I31inR.js'),"./widgets/poster/poster.jsx": () => import('./poster-Dh_-i4eF.js'),"./widgets/poster/posterItem.jsx": () => import('./posterItem-DR1i18lq.js'),"./widgets/scroll/scroll.jsx": () => import('./scroll-D-CmUvAZ.js'),"./widgets/story/story.jsx": () => import('./story-CUXTTEzQ.js')})), `./widgets/${type2}/${type2}.jsx`, 4));
   };
   useEffect$1(() => {
-    const fetchData = async () => {
+    const fetchWidgetConfig = async () => {
       try {
-        const response = await fetch(`${apiUrl}/widgets/${token}`);
+        const url = `${apiUrl}/widgets/${token}`;
+        const response = await fetch(url);
         if (!response.ok) {
           throw new Error(`${response.status}: ${response.statusText}`);
         }
@@ -3635,8 +4204,8 @@ const Widget = ({ token, apiurl, viewercountry, requireauth }) => {
         eventHandlers.onError("Content is not available");
       }
     };
-    fetchData();
-  }, [token, apiUrl]);
+    fetchWidgetConfig();
+  }, [token, apiUrl, eventHandlers, widgetDataToSectionData]);
   const { data, loading, error, Component, type } = widgetState;
   if (error) return null;
   return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { ref: widgetRef, children: loading ? /* @__PURE__ */ jsxRuntimeExports.jsx(Loader, {}) : /* @__PURE__ */ jsxRuntimeExports.jsx(Suspense$1, { fallback: /* @__PURE__ */ jsxRuntimeExports.jsx(Loader, {}), children: Component && (type === VIDEO_SECTION_TYPE ? /* @__PURE__ */ jsxRuntimeExports.jsxs(WidgetI18nProvider, { children: [
@@ -3658,7 +4227,8 @@ const Widget = ({ token, apiurl, viewercountry, requireauth }) => {
       apiUrl: data.apiUrl,
       viewerCountry: normalizedViewerCountry,
       requireAuth: normalizedRequireAuth,
-      eventHandlers: data.eventHandlers
+      eventHandlers: data.eventHandlers,
+      labels
     }
   )) }) });
 };
@@ -3696,11 +4266,23 @@ const ChannelWidget = ({ token, type }) => {
 
 const React = await importShared('react');
 
+/**
+ * Widget Component PropTypes
+ * @property {string} token - Widget identifier for fetching configuration from API
+ * @property {string} apiurl - Optional API URL override for widget data
+ * @property {string} viewercountry - ISO country code for geo-based content filtering
+ * @property {boolean|string} requireauth - Whether authentication is required to view content
+ * @property {string} labels - JSON string for dynamic label filtering based on current video context
+ *                             Format: '{"isAndGroup": boolean, "labels": string[]}'
+ *                             When provided, overrides widget's static selector configuration
+ *                             Example: '{"isAndGroup": false, "labels": ["sports", "football"]}'
+ */
 Widget.propTypes = {
-  token         : PropTypes.string,
-  apiurl        : PropTypes.string,
-  viewercountry : PropTypes.string,
-  requireauth   : PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
+  token          : PropTypes.string,
+  apiurl         : PropTypes.string,
+  viewercountry  : PropTypes.string,
+  requireauth    : PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
+  labels         : PropTypes.string, 
 };
 
 ChannelWidget.propTypes = {