react-i18next 14.1.3 → 15.0.1

package/dist/es/Trans.js

@@ -2,29 +2,28 @@ import { useContext } from 'react';
 import { nodesToString, Trans as TransWithoutContext } from './TransWithoutContext.js';
 import { getI18n, I18nContext } from './context.js';
 export { nodesToString };
-export function Trans(_ref) {
-  let {
-    children,
-    count,
-    parent,
-    i18nKey,
-    context,
-    tOptions = {},
-    values,
-    defaults,
-    components,
-    ns,
-    i18n: i18nFromProps,
-    t: tFromProps,
-    shouldUnescape,
-    ...additionalProps
-  } = _ref;
+export function Trans({
+  children,
+  count,
+  parent,
+  i18nKey,
+  context,
+  tOptions = {},
+  values,
+  defaults,
+  components,
+  ns,
+  i18n: i18nFromProps,
+  t: tFromProps,
+  shouldUnescape,
+  ...additionalProps
+}) {
   const {
     i18n: i18nFromContext,
     defaultNS: defaultNSFromContext
   } = useContext(I18nContext) || {};
   const i18n = i18nFromProps || i18nFromContext || getI18n();
-  const t = tFromProps || i18n && i18n.t.bind(i18n);
+  const t = tFromProps || i18n?.t.bind(i18n);
   return TransWithoutContext({
     children,
     count,
@@ -35,7 +34,7 @@ export function Trans(_ref) {
     values,
     defaults,
     components,
-    ns: ns || t && t.ns || defaultNSFromContext || i18n && i18n.options && i18n.options.defaultNS,
+    ns: ns || t?.ns || defaultNSFromContext || i18n?.options?.defaultNS,
     i18n,
     t: tFromProps,
     shouldUnescape,

package/dist/es/TransWithoutContext.js

@@ -5,14 +5,14 @@ import { getDefaults } from './defaults.js';
 import { getI18n } from './i18nInstance.js';
 const hasChildren = (node, checkLength) => {
   if (!node) return false;
-  const base = node.props ? node.props.children : node.children;
+  const base = node.props?.children ?? node.children;
   if (checkLength) return base.length > 0;
   return !!base;
 };
 const getChildren = node => {
   if (!node) return [];
-  const children = node.props ? node.props.children : node.children;
-  return node.props && node.props.i18nIsDynamicList ? getAsArray(children) : children;
+  const children = node.props?.children ?? node.children;
+  return node.props?.i18nIsDynamicList ? getAsArray(children) : children;
 };
 const hasValidReactChildren = children => Array.isArray(children) && children.every(isValidElement);
 const getAsArray = data => Array.isArray(data) ? data : [data];
@@ -27,7 +27,7 @@ export const nodesToString = (children, i18nOptions) => {
   if (!children) return '';
   let stringNode = '';
   const childrenArray = getAsArray(children);
-  const keepArray = i18nOptions.transSupportBasicHtmlNodes && i18nOptions.transKeepBasicHtmlNodesFor ? i18nOptions.transKeepBasicHtmlNodesFor : [];
+  const keepArray = i18nOptions?.transSupportBasicHtmlNodes ? i18nOptions.transKeepBasicHtmlNodesFor ?? [] : [];
   childrenArray.forEach((child, childIndex) => {
     if (isString(child)) {
       stringNode += `${child}`;
@@ -91,7 +91,7 @@ const renderNodes = (children, targetString, i18n, i18nOptions, combinedTOpts, s
   const renderInner = (child, node, rootReactNode) => {
     const childs = getChildren(child);
     const mappedChildren = mapAST(childs, node.children, rootReactNode);
-    return hasValidReactChildren(childs) && mappedChildren.length === 0 || child.props && child.props.i18nIsDynamicList ? childs : mappedChildren;
+    return hasValidReactChildren(childs) && mappedChildren.length === 0 || child.props?.i18nIsDynamicList ? childs : mappedChildren;
   };
   const pushTranslatedJSX = (child, inner, mem, i, isVoid) => {
     if (child.dummy) {
@@ -117,7 +117,7 @@ const renderNodes = (children, targetString, i18n, i18nOptions, combinedTOpts, s
     const reactNodes = getAsArray(reactNode);
     const astNodes = getAsArray(astNode);
     return astNodes.reduce((mem, node, i) => {
-      const translationContent = node.children && node.children[0] && node.children[0].content && i18n.services.interpolator.interpolate(node.children[0].content, opts, i18n.language);
+      const translationContent = node.children?.[0]?.content && i18n.services.interpolator.interpolate(node.children[0].content, opts, i18n.language);
       if (node.type === 'tag') {
         let tmp = reactNodes[parseInt(node.name, 10)];
         if (rootReactNode.length === 1 && !tmp) tmp = rootReactNode[0][node.name];
@@ -185,23 +185,22 @@ const renderNodes = (children, targetString, i18n, i18nOptions, combinedTOpts, s
   }], ast, getAsArray(children || []));
   return getChildren(result[0]);
 };
-export function Trans(_ref) {
-  let {
-    children,
-    count,
-    parent,
-    i18nKey,
-    context,
-    tOptions = {},
-    values,
-    defaults,
-    components,
-    ns,
-    i18n: i18nFromProps,
-    t: tFromProps,
-    shouldUnescape,
-    ...additionalProps
-  } = _ref;
+export function Trans({
+  children,
+  count,
+  parent,
+  i18nKey,
+  context,
+  tOptions = {},
+  values,
+  defaults,
+  components,
+  ns,
+  i18n: i18nFromProps,
+  t: tFromProps,
+  shouldUnescape,
+  ...additionalProps
+}) {
   const i18n = i18nFromProps || getI18n();
   if (!i18n) {
     warnOnce('You will need to pass in an i18next instance by using i18nextReactModule');
@@ -210,9 +209,9 @@ export function Trans(_ref) {
   const t = tFromProps || i18n.t.bind(i18n) || (k => k);
   const reactI18nextOptions = {
     ...getDefaults(),
-    ...(i18n.options && i18n.options.react)
+    ...i18n.options?.react
   };
-  let namespaces = ns || t.ns || i18n.options && i18n.options.defaultNS;
+  let namespaces = ns || t.ns || i18n.options?.defaultNS;
   namespaces = isString(namespaces) ? [namespaces] : namespaces || ['translation'];
   const nodeAsString = nodesToString(children, reactI18nextOptions);
   const defaultValue = defaults || nodeAsString || reactI18nextOptions.transEmptyNodeValue || i18nKey;
@@ -220,7 +219,7 @@ export function Trans(_ref) {
     hashTransKey
   } = reactI18nextOptions;
   const key = i18nKey || (hashTransKey ? hashTransKey(nodeAsString || defaultValue) : nodeAsString || defaultValue);
-  if (i18n.options && i18n.options.interpolation && i18n.options.interpolation.defaultVariables) {
+  if (i18n.options?.interpolation?.defaultVariables) {
     values = values && Object.keys(values).length > 0 ? {
       ...values,
       ...i18n.options.interpolation.defaultVariables
@@ -256,6 +255,6 @@ export function Trans(_ref) {
     });
   }
   const content = renderNodes(components || children, translation, i18n, reactI18nextOptions, combinedTOpts, shouldUnescape);
-  const useAsParent = parent !== undefined ? parent : reactI18nextOptions.defaultTransParent;
+  const useAsParent = parent ?? reactI18nextOptions.defaultTransParent;
   return useAsParent ? createElement(useAsParent, additionalProps, content) : content;
 }

package/dist/es/Translation.js

@@ -1,13 +1,12 @@
 import { useTranslation } from './useTranslation.js';
-export function Translation(props) {
-  const {
-    ns,
-    children,
-    ...options
-  } = props;
+export const Translation = ({
+  ns,
+  children,
+  ...options
+}) => {
   const [t, i18n, ready] = useTranslation(ns, options);
   return children(t, {
     i18n,
     lng: i18n.language
   }, ready);
-}
+};

package/dist/es/context.js

@@ -10,13 +10,15 @@ export class ReportNamespaces {
   }
   addUsedNamespaces(namespaces) {
     namespaces.forEach(ns => {
-      if (!this.usedNamespaces[ns]) this.usedNamespaces[ns] = true;
+      this.usedNamespaces[ns] ??= true;
     });
   }
-  getUsedNamespaces = () => Object.keys(this.usedNamespaces);
+  getUsedNamespaces() {
+    return Object.keys(this.usedNamespaces);
+  }
 }
 export const composeInitialProps = ForComponent => async ctx => {
-  const componentsInitialProps = ForComponent.getInitialProps ? await ForComponent.getInitialProps(ctx) : {};
+  const componentsInitialProps = (await ForComponent.getInitialProps?.(ctx)) ?? {};
   const i18nInitialProps = getInitialProps();
   return {
     ...componentsInitialProps,
@@ -25,7 +27,7 @@ export const composeInitialProps = ForComponent => async ctx => {
 };
 export const getInitialProps = () => {
   const i18n = getI18n();
-  const namespaces = i18n.reportNamespaces ? i18n.reportNamespaces.getUsedNamespaces() : [];
+  const namespaces = i18n.reportNamespaces?.getUsedNamespaces() ?? [];
   const ret = {};
   const initialI18nStore = {};
   i18n.languages.forEach(l => {

package/dist/es/defaults.js

@@ -9,8 +9,7 @@ let defaultOptions = {
   useSuspense: true,
   unescape
 };
-export const setDefaults = function () {
-  let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+export const setDefaults = (options = {}) => {
   defaultOptions = {
     ...defaultOptions,
     ...options

package/dist/es/package.json

@@ -1 +1 @@
-{"type":"module","version":"14.1.3"}
+{"type":"module","version":"15.0.1"}

package/dist/es/useSSR.js

@@ -1,7 +1,6 @@
 import { useContext } from 'react';
 import { getI18n, I18nContext } from './context.js';
-export const useSSR = function (initialI18nStore, initialLanguage) {
-  let props = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+export const useSSR = (initialI18nStore, initialLanguage, props = {}) => {
   const {
     i18n: i18nFromProps
   } = props;
@@ -9,7 +8,7 @@ export const useSSR = function (initialI18nStore, initialLanguage) {
     i18n: i18nFromContext
   } = useContext(I18nContext) || {};
   const i18n = i18nFromProps || i18nFromContext || getI18n();
-  if (i18n.options && i18n.options.isClone) return;
+  if (i18n.options?.isClone) return;
   if (initialI18nStore && !i18n.initializedStoreOnce) {
     i18n.services.resourceStore.data = initialI18nStore;
     i18n.options.ns = Object.values(initialI18nStore).reduce((mem, lngResources) => {

package/dist/es/useTranslation.js

@@ -10,8 +10,7 @@ const usePrevious = (value, ignore) => {
 };
 const alwaysNewT = (i18n, language, namespace, keyPrefix) => i18n.getFixedT(language, namespace, keyPrefix);
 const useMemoizedT = (i18n, language, namespace, keyPrefix) => useCallback(alwaysNewT(i18n, language, namespace, keyPrefix), [i18n, language, namespace, keyPrefix]);
-export const useTranslation = function (ns) {
-  let props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+export const useTranslation = (ns, props = {}) => {
   const {
     i18n: i18nFromProps
   } = props;
@@ -34,7 +33,7 @@ export const useTranslation = function (ns) {
     retNotReady.ready = false;
     return retNotReady;
   }
-  if (i18n.options.react && i18n.options.react.wait !== undefined) warnOnce('It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.');
+  if (i18n.options.react?.wait) warnOnce('It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.');
   const i18nOptions = {
     ...getDefaults(),
     ...i18n.options.react,
@@ -44,9 +43,9 @@ export const useTranslation = function (ns) {
     useSuspense,
     keyPrefix
   } = i18nOptions;
-  let namespaces = ns || defaultNSFromContext || i18n.options && i18n.options.defaultNS;
+  let namespaces = ns || defaultNSFromContext || i18n.options?.defaultNS;
   namespaces = isString(namespaces) ? [namespaces] : namespaces || ['translation'];
-  if (i18n.reportNamespaces.addUsedNamespaces) i18n.reportNamespaces.addUsedNamespaces(namespaces);
+  i18n.reportNamespaces.addUsedNamespaces?.(namespaces);
   const ready = (i18n.isInitialized || i18n.initializedStoreOnce) && namespaces.every(n => hasLoadedNamespace(n, i18n, i18nOptions));
   const memoGetT = useMemoizedT(i18n, props.lng || null, i18nOptions.nsMode === 'fallback' ? namespaces : namespaces[0], keyPrefix);
   const getT = () => memoGetT;
@@ -79,11 +78,11 @@ export const useTranslation = function (ns) {
     const boundReset = () => {
       if (isMounted.current) setT(getNewT);
     };
-    if (bindI18n && i18n) i18n.on(bindI18n, boundReset);
-    if (bindI18nStore && i18n) i18n.store.on(bindI18nStore, boundReset);
+    if (bindI18n) i18n?.on(bindI18n, boundReset);
+    if (bindI18nStore) i18n?.store.on(bindI18nStore, boundReset);
     return () => {
       isMounted.current = false;
-      if (bindI18n && i18n) bindI18n.split(' ').forEach(e => i18n.off(e, boundReset));
+      if (i18n) bindI18n?.split(' ').forEach(e => i18n.off(e, boundReset));
       if (bindI18nStore && i18n) bindI18nStore.split(' ').forEach(e => i18n.store.off(e, boundReset));
     };
   }, [i18n, joinedNS]);

package/dist/es/utils.js

@@ -1,21 +1,15 @@
-export function warn() {
-  if (console && console.warn) {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
+export const warn = (...args) => {
+  if (console?.warn) {
     if (isString(args[0])) args[0] = `react-i18next:: ${args[0]}`;
     console.warn(...args);
   }
-}
+};
 const alreadyWarned = {};
-export function warnOnce() {
-  for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-    args[_key2] = arguments[_key2];
-  }
+export const warnOnce = (...args) => {
   if (isString(args[0]) && alreadyWarned[args[0]]) return;
   if (isString(args[0])) alreadyWarned[args[0]] = new Date();
   warn(...args);
-}
+};
 const loadedClb = (i18n, cb) => () => {
   if (i18n.isInitialized) {
     cb();
@@ -39,36 +33,15 @@ export const loadLanguages = (i18n, lng, ns, cb) => {
   });
   i18n.loadLanguages(lng, loadedClb(i18n, cb));
 };
-const oldI18nextHasLoadedNamespace = function (ns, i18n) {
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  const lng = i18n.languages[0];
-  const fallbackLng = i18n.options ? i18n.options.fallbackLng : false;
-  const lastLng = i18n.languages[i18n.languages.length - 1];
-  if (lng.toLowerCase() === 'cimode') return true;
-  const loadNotPending = (l, n) => {
-    const loadState = i18n.services.backendConnector.state[`${l}|${n}`];
-    return loadState === -1 || loadState === 2;
-  };
-  if (options.bindI18n && options.bindI18n.indexOf('languageChanging') > -1 && i18n.services.backendConnector.backend && i18n.isLanguageChangingTo && !loadNotPending(i18n.isLanguageChangingTo, ns)) return false;
-  if (i18n.hasResourceBundle(lng, ns)) return true;
-  if (!i18n.services.backendConnector.backend || i18n.options.resources && !i18n.options.partialBundledLanguages) return true;
-  if (loadNotPending(lng, ns) && (!fallbackLng || loadNotPending(lastLng, ns))) return true;
-  return false;
-};
-export const hasLoadedNamespace = function (ns, i18n) {
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+export const hasLoadedNamespace = (ns, i18n, options = {}) => {
   if (!i18n.languages || !i18n.languages.length) {
     warnOnce('i18n.languages were undefined or empty', i18n.languages);
     return true;
   }
-  const isNewerI18next = i18n.options.ignoreJSONStructure !== undefined;
-  if (!isNewerI18next) {
-    return oldI18nextHasLoadedNamespace(ns, i18n, options);
-  }
   return i18n.hasLoadedNamespace(ns, {
     lng: options.lng,
     precheck: (i18nInstance, loadNotPending) => {
-      if (options.bindI18n && options.bindI18n.indexOf('languageChanging') > -1 && i18nInstance.services.backendConnector.backend && i18nInstance.isLanguageChangingTo && !loadNotPending(i18nInstance.isLanguageChangingTo, ns)) return false;
+      if (options.bindI18n?.indexOf('languageChanging') > -1 && i18nInstance.services.backendConnector.backend && i18nInstance.isLanguageChangingTo && !loadNotPending(i18nInstance.isLanguageChangingTo, ns)) return false;
     }
   });
 };

package/dist/es/withSSR.js

@@ -3,12 +3,11 @@ import { useSSR } from './useSSR.js';
 import { composeInitialProps } from './context.js';
 import { getDisplayName } from './utils.js';
 export const withSSR = () => function Extend(WrappedComponent) {
-  function I18nextWithSSR(_ref) {
-    let {
-      initialI18nStore,
-      initialLanguage,
-      ...rest
-    } = _ref;
+  function I18nextWithSSR({
+    initialI18nStore,
+    initialLanguage,
+    ...rest
+  }) {
     useSSR(initialI18nStore, initialLanguage);
     return createElement(WrappedComponent, {
       ...rest

package/dist/es/withTranslation.js

@@ -1,36 +1,32 @@
 import { createElement, forwardRef as forwardRefReact } from 'react';
 import { useTranslation } from './useTranslation.js';
 import { getDisplayName } from './utils.js';
-export const withTranslation = function (ns) {
-  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return function Extend(WrappedComponent) {
-    function I18nextWithTranslation(_ref) {
-      let {
-        forwardedRef,
-        ...rest
-      } = _ref;
-      const [t, i18n, ready] = useTranslation(ns, {
-        ...rest,
-        keyPrefix: options.keyPrefix
-      });
-      const passDownProps = {
-        ...rest,
-        t,
-        i18n,
-        tReady: ready
-      };
-      if (options.withRef && forwardedRef) {
-        passDownProps.ref = forwardedRef;
-      } else if (!options.withRef && forwardedRef) {
-        passDownProps.forwardedRef = forwardedRef;
-      }
-      return createElement(WrappedComponent, passDownProps);
+export const withTranslation = (ns, options = {}) => function Extend(WrappedComponent) {
+  function I18nextWithTranslation({
+    forwardedRef,
+    ...rest
+  }) {
+    const [t, i18n, ready] = useTranslation(ns, {
+      ...rest,
+      keyPrefix: options.keyPrefix
+    });
+    const passDownProps = {
+      ...rest,
+      t,
+      i18n,
+      tReady: ready
+    };
+    if (options.withRef && forwardedRef) {
+      passDownProps.ref = forwardedRef;
+    } else if (!options.withRef && forwardedRef) {
+      passDownProps.forwardedRef = forwardedRef;
     }
-    I18nextWithTranslation.displayName = `withI18nextTranslation(${getDisplayName(WrappedComponent)})`;
-    I18nextWithTranslation.WrappedComponent = WrappedComponent;
-    const forwardRef = (props, ref) => createElement(I18nextWithTranslation, Object.assign({}, props, {
-      forwardedRef: ref
-    }));
-    return options.withRef ? forwardRefReact(forwardRef) : I18nextWithTranslation;
-  };
+    return createElement(WrappedComponent, passDownProps);
+  }
+  I18nextWithTranslation.displayName = `withI18nextTranslation(${getDisplayName(WrappedComponent)})`;
+  I18nextWithTranslation.WrappedComponent = WrappedComponent;
+  const forwardRef = (props, ref) => createElement(I18nextWithTranslation, Object.assign({}, props, {
+    forwardedRef: ref
+  }));
+  return options.withRef ? forwardRefReact(forwardRef) : I18nextWithTranslation;
 };