react-i18next 17.0.5 → 17.0.7

package/dist/commonjs/TransWithoutContext.js

@@ -26,17 +26,6 @@ const getChildren = node => {
 };
 const hasValidReactChildren = children => Array.isArray(children) && children.every(_react.isValidElement);
 const getAsArray = data => Array.isArray(data) ? data : [data];
-const hasNonKeepReactDescendant = (children, keepArray) => {
-  if (children == null) return false;
-  return getAsArray(children).some(child => {
-    if (!(0, _react.isValidElement)(child)) return false;
-    const props = child.props || {};
-    const propCount = Object.keys(props).length;
-    const isKeepEligible = keepArray.indexOf(child.type) > -1 && propCount <= 1 && !props.i18nIsDynamicList;
-    if (!isKeepEligible) return true;
-    return hasNonKeepReactDescendant(props.children, keepArray);
-  });
-};
 const mergeProps = (source, target) => {
   const newTarget = {
     ...target
@@ -86,7 +75,7 @@ const nodesToString = (children, i18nOptions, i18n, i18nKey) => {
         stringNode += `<${childIndex}></${childIndex}>`;
         return;
       }
-      if (shouldKeepChild && childPropsCount <= 1 && !hasNonKeepReactDescendant(childChildren, keepArray)) {
+      if (shouldKeepChild && childPropsCount <= 1) {
         const cnt = (0, _utils.isString)(childChildren) ? childChildren : nodesToString(childChildren, i18nOptions, i18n, i18nKey);
         stringNode += `<${type}>${cnt}</${type}>`;
         return;
@@ -227,6 +216,7 @@ const renderNodes = (children, knownComponentsMap, targetString, i18n, i18nOptio
   const mapAST = (reactNode, astNode, rootReactNode) => {
     const reactNodes = getAsArray(reactNode);
     const astNodes = getAsArray(astNode);
+    const keepTagOccurrence = {};
     return astNodes.reduce((mem, node, i) => {
       const translationContent = node.children?.[0]?.content && i18n.services.interpolator.interpolate(node.children[0].content, opts, i18n.language);
       if (node.type === 'tag') {
@@ -271,7 +261,22 @@ const renderNodes = (children, knownComponentsMap, targetString, i18n, i18nOptio
                 key: `${node.name}-${i}`
               }));
             } else {
-              const inner = mapAST(reactNodes, node.children, rootReactNode);
+              const occurrence = keepTagOccurrence[node.name] || 0;
+              keepTagOccurrence[node.name] = occurrence + 1;
+              let matched;
+              let seen = 0;
+              for (let r = 0; r < reactNodes.length; r += 1) {
+                const rn = reactNodes[r];
+                if ((0, _react.isValidElement)(rn) && rn.type === node.name) {
+                  if (seen === occurrence) {
+                    matched = rn;
+                    break;
+                  }
+                  seen += 1;
+                }
+              }
+              const innerScope = matched ? getAsArray(getChildren(matched)) : reactNodes;
+              const inner = mapAST(innerScope, node.children, rootReactNode);
               mem.push((0, _react.createElement)(node.name, {
                 key: `${node.name}-${i}`
               }, inner));

package/dist/commonjs/useTranslation.js

@@ -79,7 +79,9 @@ const useTranslation = (ns, props = {}) => {
     if (lastSnapshot && lastSnapshot.ready === calculatedReady && lastSnapshot.lng === currentLng && lastSnapshot.keyPrefix === keyPrefix && lastSnapshot.revision === currentRevision) {
       return lastSnapshot;
     }
-    const calculatedT = i18n.getFixedT(currentLng, i18nOptions.nsMode === 'fallback' ? namespaces : namespaces[0], keyPrefix);
+    const calculatedT = i18n.getFixedT(currentLng, i18nOptions.nsMode === 'fallback' ? namespaces : namespaces[0], keyPrefix, {
+      scopeNs: namespaces
+    });
     const newSnapshot = {
       t: calculatedT,
       ready: calculatedReady,

package/dist/es/TransWithoutContext.js

@@ -18,17 +18,6 @@ const getChildren = node => {
 };
 const hasValidReactChildren = children => Array.isArray(children) && children.every(isValidElement);
 const getAsArray = data => Array.isArray(data) ? data : [data];
-const hasNonKeepReactDescendant = (children, keepArray) => {
-  if (children == null) return false;
-  return getAsArray(children).some(child => {
-    if (!isValidElement(child)) return false;
-    const props = child.props || {};
-    const propCount = Object.keys(props).length;
-    const isKeepEligible = keepArray.indexOf(child.type) > -1 && propCount <= 1 && !props.i18nIsDynamicList;
-    if (!isKeepEligible) return true;
-    return hasNonKeepReactDescendant(props.children, keepArray);
-  });
-};
 const mergeProps = (source, target) => {
   const newTarget = {
     ...target
@@ -78,7 +67,7 @@ export const nodesToString = (children, i18nOptions, i18n, i18nKey) => {
         stringNode += `<${childIndex}></${childIndex}>`;
         return;
       }
-      if (shouldKeepChild && childPropsCount <= 1 && !hasNonKeepReactDescendant(childChildren, keepArray)) {
+      if (shouldKeepChild && childPropsCount <= 1) {
         const cnt = isString(childChildren) ? childChildren : nodesToString(childChildren, i18nOptions, i18n, i18nKey);
         stringNode += `<${type}>${cnt}</${type}>`;
         return;
@@ -218,6 +207,7 @@ const renderNodes = (children, knownComponentsMap, targetString, i18n, i18nOptio
   const mapAST = (reactNode, astNode, rootReactNode) => {
     const reactNodes = getAsArray(reactNode);
     const astNodes = getAsArray(astNode);
+    const keepTagOccurrence = {};
     return astNodes.reduce((mem, node, i) => {
       const translationContent = node.children?.[0]?.content && i18n.services.interpolator.interpolate(node.children[0].content, opts, i18n.language);
       if (node.type === 'tag') {
@@ -262,7 +252,22 @@ const renderNodes = (children, knownComponentsMap, targetString, i18n, i18nOptio
                 key: `${node.name}-${i}`
               }));
             } else {
-              const inner = mapAST(reactNodes, node.children, rootReactNode);
+              const occurrence = keepTagOccurrence[node.name] || 0;
+              keepTagOccurrence[node.name] = occurrence + 1;
+              let matched;
+              let seen = 0;
+              for (let r = 0; r < reactNodes.length; r += 1) {
+                const rn = reactNodes[r];
+                if (isValidElement(rn) && rn.type === node.name) {
+                  if (seen === occurrence) {
+                    matched = rn;
+                    break;
+                  }
+                  seen += 1;
+                }
+              }
+              const innerScope = matched ? getAsArray(getChildren(matched)) : reactNodes;
+              const inner = mapAST(innerScope, node.children, rootReactNode);
               mem.push(createElement(node.name, {
                 key: `${node.name}-${i}`
               }, inner));

package/dist/es/package.json

@@ -1 +1 @@
-{"type":"module","version":"17.0.5"}
+{"type":"module","version":"17.0.7"}

package/dist/es/useTranslation.js

@@ -73,7 +73,9 @@ export const useTranslation = (ns, props = {}) => {
     if (lastSnapshot && lastSnapshot.ready === calculatedReady && lastSnapshot.lng === currentLng && lastSnapshot.keyPrefix === keyPrefix && lastSnapshot.revision === currentRevision) {
       return lastSnapshot;
     }
-    const calculatedT = i18n.getFixedT(currentLng, i18nOptions.nsMode === 'fallback' ? namespaces : namespaces[0], keyPrefix);
+    const calculatedT = i18n.getFixedT(currentLng, i18nOptions.nsMode === 'fallback' ? namespaces : namespaces[0], keyPrefix, {
+      scopeNs: namespaces
+    });
     const newSnapshot = {
       t: calculatedT,
       ready: calculatedReady,

package/dist/umd/react-i18next.js

@@ -234,6 +234,7 @@
     }
     forward(args, lvl, prefix, debugOnly) {
       if (debugOnly && !this.debug) return null;
+      args = args.map(a => isString$1(a) ? a.replace(/[\r\n\x00-\x1F\x7F]/g, ' ') : a);
       if (isString$1(args[0])) args[0] = `${prefix}${this.prefix} ${args[0]}`;
       return this.logger[lvl](args);
     }
@@ -666,7 +667,7 @@
         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);
+          this.logger.log(updateMissing ? 'updateKey' : 'missingKey', lng, namespace, needsPluralHandling && !updateMissing ? `${key}${this.pluralResolver.getSuffix(lng, opt.count, opt)}` : key, updateMissing ? defaultValue : res);
           if (keySeparator) {
             const fk = this.resolve(key, {
               ...opt,
@@ -1131,8 +1132,8 @@
       this.prefix = prefix ? regexEscape(prefix) : prefixEscaped || '{{';
       this.suffix = suffix ? regexEscape(suffix) : suffixEscaped || '}}';
       this.formatSeparator = formatSeparator || ',';
-      this.unescapePrefix = unescapeSuffix ? '' : unescapePrefix || '-';
-      this.unescapeSuffix = this.unescapePrefix ? '' : unescapeSuffix || '';
+      this.unescapePrefix = unescapeSuffix ? '' : unescapePrefix ? regexEscape(unescapePrefix) : '-';
+      this.unescapeSuffix = this.unescapePrefix ? '' : unescapeSuffix ? regexEscape(unescapeSuffix) : '';
       this.nestingPrefix = nestingPrefix ? regexEscape(nestingPrefix) : nestingPrefixEscaped || regexEscape('$t(');
       this.nestingSuffix = nestingSuffix ? regexEscape(nestingSuffix) : nestingSuffixEscaped || regexEscape(')');
       this.nestingOptionsSeparator = nestingOptionsSeparator || ',';
@@ -1179,6 +1180,9 @@
         });
       };
       this.resetRegExp();
+      if (!this.escapeValue && typeof str === 'string' && /\$t\([^)]*\{[^}]*\{\{/.test(str)) {
+        this.logger.warn('nesting options string contains interpolated variables with escapeValue: false — ' + 'if any of those values are attacker-controlled they can inject additional ' + 'nesting options (e.g. redirect lng/ns). Sanitise untrusted input before passing ' + 'it to t(), or keep escapeValue: true.');
+      }
       const missingInterpolationHandler = options?.missingInterpolationHandler || this.options.missingInterpolationHandler;
       const skipOnVariables = options?.interpolation?.skipOnVariables !== undefined ? options.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables;
       const todos = [{
@@ -1853,7 +1857,7 @@
           deferred.resolve(t);
           callback(err, t);
         };
-        if (this.languages && !this.isInitialized) return finish(null, this.t.bind(this));
+        if ((this.languages || this.isLanguageChangingTo) && !this.isInitialized) return finish(null, this.t.bind(this));
         this.changeLanguage(this.options.lng, finish);
       };
       if (this.options.resources || !this.options.initAsync) {
@@ -2008,7 +2012,8 @@
       }
       return deferred;
     }
-    getFixedT(lng, ns, keyPrefix) {
+    getFixedT(lng, ns, keyPrefix, fixedOpts) {
+      const scopeNs = fixedOpts?.scopeNs;
       const fixedT = (key, opts, ...rest) => {
         let o;
         if (typeof opts !== 'object') {
@@ -2020,12 +2025,14 @@
         }
         o.lng = o.lng || fixedT.lng;
         o.lngs = o.lngs || fixedT.lngs;
+        const explicitCallNs = o.ns !== undefined && o.ns !== null;
         o.ns = o.ns || fixedT.ns;
         if (o.keyPrefix !== '') o.keyPrefix = o.keyPrefix || keyPrefix || fixedT.keyPrefix;
         const selectorOpts = {
           ...this.options,
           ...o
         };
+        if (Array.isArray(scopeNs) && !explicitCallNs) selectorOpts.ns = scopeNs;
         if (typeof o.keyPrefix === 'function') o.keyPrefix = keysFromSelector(o.keyPrefix, selectorOpts);
         const keySeparator = this.options.keySeparator || '.';
         let resultKey;
@@ -2476,17 +2483,6 @@
   };
   const hasValidReactChildren = children => Array.isArray(children) && children.every(React.isValidElement);
   const getAsArray = data => Array.isArray(data) ? data : [data];
-  const hasNonKeepReactDescendant = (children, keepArray) => {
-    if (children == null) return false;
-    return getAsArray(children).some(child => {
-      if (!React.isValidElement(child)) return false;
-      const props = child.props || {};
-      const propCount = Object.keys(props).length;
-      const isKeepEligible = keepArray.indexOf(child.type) > -1 && propCount <= 1 && !props.i18nIsDynamicList;
-      if (!isKeepEligible) return true;
-      return hasNonKeepReactDescendant(props.children, keepArray);
-    });
-  };
   const mergeProps = (source, target) => {
     const newTarget = {
       ...target
@@ -2536,7 +2532,7 @@
           stringNode += `<${childIndex}></${childIndex}>`;
           return;
         }
-        if (shouldKeepChild && childPropsCount <= 1 && !hasNonKeepReactDescendant(childChildren, keepArray)) {
+        if (shouldKeepChild && childPropsCount <= 1) {
           const cnt = isString(childChildren) ? childChildren : nodesToString(childChildren, i18nOptions, i18n, i18nKey);
           stringNode += `<${type}>${cnt}</${type}>`;
           return;
@@ -2676,6 +2672,7 @@
     const mapAST = (reactNode, astNode, rootReactNode) => {
       const reactNodes = getAsArray(reactNode);
       const astNodes = getAsArray(astNode);
+      const keepTagOccurrence = {};
       return astNodes.reduce((mem, node, i) => {
         const translationContent = node.children?.[0]?.content && i18n.services.interpolator.interpolate(node.children[0].content, opts, i18n.language);
         if (node.type === 'tag') {
@@ -2720,7 +2717,22 @@
                   key: `${node.name}-${i}`
                 }));
               } else {
-                const inner = mapAST(reactNodes, node.children, rootReactNode);
+                const occurrence = keepTagOccurrence[node.name] || 0;
+                keepTagOccurrence[node.name] = occurrence + 1;
+                let matched;
+                let seen = 0;
+                for (let r = 0; r < reactNodes.length; r += 1) {
+                  const rn = reactNodes[r];
+                  if (React.isValidElement(rn) && rn.type === node.name) {
+                    if (seen === occurrence) {
+                      matched = rn;
+                      break;
+                    }
+                    seen += 1;
+                  }
+                }
+                const innerScope = matched ? getAsArray(getChildren(matched)) : reactNodes;
+                const inner = mapAST(innerScope, node.children, rootReactNode);
                 mem.push(React.createElement(node.name, {
                   key: `${node.name}-${i}`
                 }, inner));
@@ -3612,7 +3624,9 @@
       if (lastSnapshot && lastSnapshot.ready === calculatedReady && lastSnapshot.lng === currentLng && lastSnapshot.keyPrefix === keyPrefix && lastSnapshot.revision === currentRevision) {
         return lastSnapshot;
       }
-      const calculatedT = i18n.getFixedT(currentLng, i18nOptions.nsMode === 'fallback' ? namespaces : namespaces[0], keyPrefix);
+      const calculatedT = i18n.getFixedT(currentLng, i18nOptions.nsMode === 'fallback' ? namespaces : namespaces[0], keyPrefix, {
+        scopeNs: namespaces
+      });
       const newSnapshot = {
         t: calculatedT,
         ready: calculatedReady,