@lingui/react 5.5.0 → 5.5.2

package/dist/index-rsc.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 const server = require('./server.cjs');
-const TransNoContext = require('./shared/react.9788d7fd.cjs');
+const TransNoContext = require('./shared/react.6e08509a.cjs');
 const React = require('react');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }

package/dist/index-rsc.mjs

@@ -1,5 +1,5 @@
 import { getI18n } from './server.mjs';
-import { T as TransNoContext } from './shared/react.31c3b5fa.mjs';
+import { T as TransNoContext } from './shared/react.3519b71e.mjs';
 import React from 'react';
 
 function TransRsc(props) {

package/dist/index.cjs

@@ -2,7 +2,7 @@
 'use strict';
 
 const React = require('react');
-const TransNoContext = require('./shared/react.9788d7fd.cjs');
+const TransNoContext = require('./shared/react.6e08509a.cjs');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 

package/dist/index.mjs

@@ -1,6 +1,6 @@
 'use client';
 import React from 'react';
-import { T as TransNoContext } from './shared/react.31c3b5fa.mjs';
+import { T as TransNoContext } from './shared/react.3519b71e.mjs';
 
 const LinguiContext = React.createContext(null);
 const useLinguiInternal = (devErrorMessage) => {

package/dist/server.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const TransNoContext = require('./shared/react.9788d7fd.cjs');
+const TransNoContext = require('./shared/react.6e08509a.cjs');
 const React = require('react');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }

package/dist/server.mjs

@@ -1,4 +1,4 @@
-export { T as TransNoContext } from './shared/react.31c3b5fa.mjs';
+export { T as TransNoContext } from './shared/react.3519b71e.mjs';
 import React from 'react';
 
 let cache = null;

package/dist/shared/{react.31c3b5fa.mjs → react.3519b71e.mjs}

@@ -20,10 +20,10 @@ const voidElementTags = {
   menuitem: true
 };
 function formatElements(value, elements = {}) {
-  const uniqueId = makeCounter(0, "$lingui$");
   const parts = value.split(tagRe);
   if (parts.length === 1)
     return value;
+  const uniqueId = makeCounter(0, "$lingui$");
   const tree = [];
   const before = parts.shift();
   if (before)
@@ -77,18 +77,7 @@ function TransNoContext(props) {
     formats,
     lingui: { i18n, defaultComponent }
   } = props;
-  const values = { ...props.values };
-  const components = { ...props.components };
-  if (values) {
-    Object.keys(values).forEach((key) => {
-      const index = Object.keys(components).length;
-      if (typeof values[key] === "string" || typeof values[key] === "number") {
-        return;
-      }
-      components[index] = /* @__PURE__ */ React.createElement(React.Fragment, null, values[key]);
-      values[key] = `<${index}/>`;
-    });
-  }
+  const { values, components } = getInterpolationValuesAndComponents(props);
   const _translation = i18n && typeof i18n._ === "function" ? i18n._(id, values, { message, formats }) : id;
   const translation = _translation ? formatElements(_translation, components) : null;
   if (render === null || component === null) {
@@ -125,5 +114,24 @@ function TransNoContext(props) {
 const RenderFragment = ({ children }) => {
   return /* @__PURE__ */ React.createElement(React.Fragment, null, children);
 };
+const getInterpolationValuesAndComponents = (props) => {
+  if (!props.values) {
+    return {
+      values: void 0,
+      components: props.components
+    };
+  }
+  const values = { ...props.values };
+  const components = { ...props.components };
+  Object.entries(props.values).forEach(([key, valueForKey]) => {
+    if (typeof valueForKey === "string" || typeof valueForKey === "number") {
+      return;
+    }
+    const index = Object.keys(components).length;
+    components[index] = /* @__PURE__ */ React.createElement(React.Fragment, null, valueForKey);
+    values[key] = `<${index}/>`;
+  });
+  return { values, components };
+};
 
 export { TransNoContext as T };

package/dist/shared/{react.9788d7fd.cjs → react.6e08509a.cjs}

@@ -26,10 +26,10 @@ const voidElementTags = {
   menuitem: true
 };
 function formatElements(value, elements = {}) {
-  const uniqueId = makeCounter(0, "$lingui$");
   const parts = value.split(tagRe);
   if (parts.length === 1)
     return value;
+  const uniqueId = makeCounter(0, "$lingui$");
   const tree = [];
   const before = parts.shift();
   if (before)
@@ -83,18 +83,7 @@ function TransNoContext(props) {
     formats,
     lingui: { i18n, defaultComponent }
   } = props;
-  const values = { ...props.values };
-  const components = { ...props.components };
-  if (values) {
-    Object.keys(values).forEach((key) => {
-      const index = Object.keys(components).length;
-      if (typeof values[key] === "string" || typeof values[key] === "number") {
-        return;
-      }
-      components[index] = /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, values[key]);
-      values[key] = `<${index}/>`;
-    });
-  }
+  const { values, components } = getInterpolationValuesAndComponents(props);
   const _translation = i18n && typeof i18n._ === "function" ? i18n._(id, values, { message, formats }) : id;
   const translation = _translation ? formatElements(_translation, components) : null;
   if (render === null || component === null) {
@@ -131,5 +120,24 @@ function TransNoContext(props) {
 const RenderFragment = ({ children }) => {
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children);
 };
+const getInterpolationValuesAndComponents = (props) => {
+  if (!props.values) {
+    return {
+      values: void 0,
+      components: props.components
+    };
+  }
+  const values = { ...props.values };
+  const components = { ...props.components };
+  Object.entries(props.values).forEach(([key, valueForKey]) => {
+    if (typeof valueForKey === "string" || typeof valueForKey === "number") {
+      return;
+    }
+    const index = Object.keys(components).length;
+    components[index] = /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, valueForKey);
+    values[key] = `<${index}/>`;
+  });
+  return { values, components };
+};
 
 exports.TransNoContext = TransNoContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/react",
-  "version": "5.5.0",
+  "version": "5.5.2",
   "sideEffects": false,
   "description": "React components for translations",
   "main": "./dist/index.cjs",
@@ -79,7 +79,7 @@
     "macro/index.js"
   ],
   "peerDependencies": {
-    "@lingui/babel-plugin-lingui-macro": "5.5.0",
+    "@lingui/babel-plugin-lingui-macro": "5.5.2",
     "babel-plugin-macros": "2 || 3",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
   },
@@ -93,7 +93,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@lingui/core": "5.5.0"
+    "@lingui/core": "5.5.2"
   },
   "devDependencies": {
     "@lingui/jest-mocks": "*",
@@ -105,5 +105,5 @@
     "react-dom": "^18.2.0",
     "unbuild": "2.0.0"
   },
-  "gitHead": "26700f071cd540651822b7f786d3c1d07c9d8625"
+  "gitHead": "197bcd9ab7eca588ba9436a2d20996f92deb7547"
 }