@lingui/react 4.11.4 → 5.0.0-next.1

package/dist/index-rsc.cjs

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

package/dist/index-rsc.d.cts

@@ -1,5 +1,5 @@
-import { T as TransProps, b as I18nContext } from './shared/react.e5f95de8.cjs';
-export { d as TransRenderCallbackOrComponent, c as TransRenderProps } from './shared/react.e5f95de8.cjs';
+import { T as TransProps, b as I18nContext } from './shared/react.b2b749a9.cjs';
+export { d as TransRenderCallbackOrComponent, c as TransRenderProps } from './shared/react.b2b749a9.cjs';
 import React from 'react';
 import '@lingui/core';
 

package/dist/index-rsc.d.mts

@@ -1,5 +1,5 @@
-import { T as TransProps, b as I18nContext } from './shared/react.e5f95de8.mjs';
-export { d as TransRenderCallbackOrComponent, c as TransRenderProps } from './shared/react.e5f95de8.mjs';
+import { T as TransProps, b as I18nContext } from './shared/react.b2b749a9.mjs';
+export { d as TransRenderCallbackOrComponent, c as TransRenderProps } from './shared/react.b2b749a9.mjs';
 import React from 'react';
 import '@lingui/core';
 

package/dist/index-rsc.d.ts

@@ -1,5 +1,5 @@
-import { T as TransProps, b as I18nContext } from './shared/react.e5f95de8.js';
-export { d as TransRenderCallbackOrComponent, c as TransRenderProps } from './shared/react.e5f95de8.js';
+import { T as TransProps, b as I18nContext } from './shared/react.b2b749a9.js';
+export { d as TransRenderCallbackOrComponent, c as TransRenderProps } from './shared/react.b2b749a9.js';
 import React from 'react';
 import '@lingui/core';
 

package/dist/index-rsc.mjs

@@ -1,5 +1,5 @@
 import { getI18n } from './server.mjs';
-import { T as TransNoContext } from './shared/react.ac956f45.mjs';
+import { T as TransNoContext } from './shared/react.1807f7b5.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.fdbc1485.cjs');
+const TransNoContext = require('./shared/react.3eab4fb8.cjs');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { T as TransProps } from './shared/react.e5f95de8.cjs';
-export { b as I18nContext, I as I18nProvider, a as I18nProviderProps, L as LinguiContext, d as TransRenderCallbackOrComponent, c as TransRenderProps, u as useLingui } from './shared/react.e5f95de8.cjs';
+import { T as TransProps } from './shared/react.b2b749a9.cjs';
+export { b as I18nContext, I as I18nProvider, a as I18nProviderProps, L as LinguiContext, d as TransRenderCallbackOrComponent, c as TransRenderProps, u as useLingui } from './shared/react.b2b749a9.cjs';
 import React from 'react';
 import '@lingui/core';
 

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { T as TransProps } from './shared/react.e5f95de8.mjs';
-export { b as I18nContext, I as I18nProvider, a as I18nProviderProps, L as LinguiContext, d as TransRenderCallbackOrComponent, c as TransRenderProps, u as useLingui } from './shared/react.e5f95de8.mjs';
+import { T as TransProps } from './shared/react.b2b749a9.mjs';
+export { b as I18nContext, I as I18nProvider, a as I18nProviderProps, L as LinguiContext, d as TransRenderCallbackOrComponent, c as TransRenderProps, u as useLingui } from './shared/react.b2b749a9.mjs';
 import React from 'react';
 import '@lingui/core';
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { T as TransProps } from './shared/react.e5f95de8.js';
-export { b as I18nContext, I as I18nProvider, a as I18nProviderProps, L as LinguiContext, d as TransRenderCallbackOrComponent, c as TransRenderProps, u as useLingui } from './shared/react.e5f95de8.js';
+import { T as TransProps } from './shared/react.b2b749a9.js';
+export { b as I18nContext, I as I18nProvider, a as I18nProviderProps, L as LinguiContext, d as TransRenderCallbackOrComponent, c as TransRenderProps, u as useLingui } from './shared/react.b2b749a9.js';
 import React from 'react';
 import '@lingui/core';
 

package/dist/index.mjs

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

package/dist/server.cjs

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

package/dist/server.d.cts

@@ -1,5 +1,5 @@
-import { b as I18nContext } from './shared/react.e5f95de8.cjs';
-export { e as TransNoContext, T as TransProps, d as TransRenderCallbackOrComponent, c as TransRenderProps } from './shared/react.e5f95de8.cjs';
+import { b as I18nContext } from './shared/react.b2b749a9.cjs';
+export { e as TransNoContext, T as TransProps, d as TransRenderCallbackOrComponent, c as TransRenderProps } from './shared/react.b2b749a9.cjs';
 import { I18n } from '@lingui/core';
 import 'react';
 

package/dist/server.d.mts

@@ -1,5 +1,5 @@
-import { b as I18nContext } from './shared/react.e5f95de8.mjs';
-export { e as TransNoContext, T as TransProps, d as TransRenderCallbackOrComponent, c as TransRenderProps } from './shared/react.e5f95de8.mjs';
+import { b as I18nContext } from './shared/react.b2b749a9.mjs';
+export { e as TransNoContext, T as TransProps, d as TransRenderCallbackOrComponent, c as TransRenderProps } from './shared/react.b2b749a9.mjs';
 import { I18n } from '@lingui/core';
 import 'react';
 

package/dist/server.d.ts

@@ -1,5 +1,5 @@
-import { b as I18nContext } from './shared/react.e5f95de8.js';
-export { e as TransNoContext, T as TransProps, d as TransRenderCallbackOrComponent, c as TransRenderProps } from './shared/react.e5f95de8.js';
+import { b as I18nContext } from './shared/react.b2b749a9.js';
+export { e as TransNoContext, T as TransProps, d as TransRenderCallbackOrComponent, c as TransRenderProps } from './shared/react.b2b749a9.js';
 import { I18n } from '@lingui/core';
 import 'react';
 

package/dist/server.mjs

@@ -1,4 +1,4 @@
-export { T as TransNoContext } from './shared/react.ac956f45.mjs';
+export { T as TransNoContext } from './shared/react.1807f7b5.mjs';
 import React from 'react';
 
 let cache = null;

package/dist/shared/{react.ac956f45.mjs → react.1807f7b5.mjs}

@@ -82,12 +82,11 @@ function TransNoContext(props) {
   const components = { ...props.components };
   if (values) {
     Object.keys(values).forEach((key) => {
-      const value = values[key];
-      const valueIsReactEl = React.isValidElement(value) || Array.isArray(value) && value.every(React.isValidElement);
-      if (!valueIsReactEl)
-        return;
       const index = Object.keys(components).length;
-      components[index] = value;
+      if (typeof values[key] === "string" || typeof values[key] === "number") {
+        return;
+      }
+      components[index] = /* @__PURE__ */ React.createElement(React.Fragment, null, values[key]);
       values[key] = `<${index}/>`;
     });
   }
@@ -101,8 +100,6 @@ function TransNoContext(props) {
     id,
     message,
     translation,
-    // TODO vonovak - remove isTranslated prop in v5 release
-    isTranslated: id !== translation && message !== translation,
     children: translation
     // for type-compatibility with `component` prop
   };

package/dist/shared/{react.fdbc1485.cjs → react.3eab4fb8.cjs}

@@ -88,12 +88,11 @@ function TransNoContext(props) {
   const components = { ...props.components };
   if (values) {
     Object.keys(values).forEach((key) => {
-      const value = values[key];
-      const valueIsReactEl = React__default.isValidElement(value) || Array.isArray(value) && value.every(React__default.isValidElement);
-      if (!valueIsReactEl)
-        return;
       const index = Object.keys(components).length;
-      components[index] = value;
+      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}/>`;
     });
   }
@@ -107,8 +106,6 @@ function TransNoContext(props) {
     id,
     message,
     translation,
-    // TODO vonovak - remove isTranslated prop in v5 release
-    isTranslated: id !== translation && message !== translation,
     children: translation
     // for type-compatibility with `component` prop
   };

package/dist/shared/{react.e5f95de8.d.cts → react.b2b749a9.d.cts}

@@ -6,10 +6,6 @@ type TransRenderProps = {
     translation: React.ReactNode;
     children: React.ReactNode;
     message?: string | null;
-    /**
-     * @deprecated isTranslated prop is undocumented and buggy. It'll be removed in v5 release.
-     * */
-    isTranslated: boolean;
 };
 type TransRenderCallbackOrComponent = {
     component?: undefined;

package/dist/shared/{react.e5f95de8.d.mts → react.b2b749a9.d.mts}

@@ -6,10 +6,6 @@ type TransRenderProps = {
     translation: React.ReactNode;
     children: React.ReactNode;
     message?: string | null;
-    /**
-     * @deprecated isTranslated prop is undocumented and buggy. It'll be removed in v5 release.
-     * */
-    isTranslated: boolean;
 };
 type TransRenderCallbackOrComponent = {
     component?: undefined;

package/dist/shared/{react.e5f95de8.d.ts → react.b2b749a9.d.ts}

@@ -6,10 +6,6 @@ type TransRenderProps = {
     translation: React.ReactNode;
     children: React.ReactNode;
     message?: string | null;
-    /**
-     * @deprecated isTranslated prop is undocumented and buggy. It'll be removed in v5 release.
-     * */
-    isTranslated: boolean;
 };
 type TransRenderCallbackOrComponent = {
     component?: undefined;

package/macro/index.d.ts

@@ -0,0 +1,137 @@
+import type { ReactNode, VFC, FC } from "react"
+import type { TransRenderCallbackOrComponent, I18nContext } from "@lingui/react"
+import type { MacroMessageDescriptor } from "@lingui/core/macro"
+
+type CommonProps = TransRenderCallbackOrComponent & {
+  id?: string
+  comment?: string
+  context?: string
+}
+
+type TransProps = {
+  children: ReactNode
+} & CommonProps
+
+type PluralChoiceProps = {
+  value: string | number
+  /** Offset of value when calculating plural forms */
+  offset?: number
+  zero?: ReactNode
+  one?: ReactNode
+  two?: ReactNode
+  few?: ReactNode
+  many?: ReactNode
+
+  /** Catch-all option */
+  other: ReactNode
+  /** Exact match form, corresponds to =N rule */
+  [digit: `_${number}`]: ReactNode
+} & CommonProps
+
+type SelectChoiceProps = {
+  value: string
+  /** Catch-all option */
+  other: ReactNode
+  [option: `_${string}`]: ReactNode
+} & CommonProps
+
+/**
+ * Trans is the basic macro for static messages,
+ * messages with variables, but also for messages with inline markup
+ *
+ * @example
+ * ```
+ * <Trans>Hello {username}. Read the <a href="/docs">docs</a>.</Trans>
+ * ```
+ * @example
+ * ```
+ * <Trans id="custom.id">Hello {username}.</Trans>
+ * ```
+ */
+export const Trans: FC<TransProps>
+
+/**
+ * Props of Plural macro are transformed into plural format.
+ *
+ * @example
+ * ```
+ * import { Plural } from "@lingui/core/macro"
+ * <Plural value={numBooks} one="Book" other="Books" />
+ *
+ * // ↓ ↓ ↓ ↓ ↓ ↓
+ * import { Trans } from "@lingui/react"
+ * <Trans id="{numBooks, plural, one {Book} other {Books}}" values={{ numBooks }} />
+ * ```
+ */
+export const Plural: VFC<PluralChoiceProps>
+/**
+ * Props of SelectOrdinal macro are transformed into selectOrdinal format.
+ *
+ * @example
+ * ```
+ * // count == 1 -> 1st
+ * // count == 2 -> 2nd
+ * // count == 3 -> 3rd
+ * // count == 4 -> 4th
+ * <SelectOrdinal
+ *     value={count}
+ *     one="#st"
+ *     two="#nd"
+ *     few="#rd"
+ *     other="#th"
+ * />
+ * ```
+ */
+export const SelectOrdinal: VFC<PluralChoiceProps>
+
+/**
+ * Props of Select macro are transformed into select format
+ *
+ * @example
+ * ```
+ * // gender == "female"      -> Her book
+ * // gender == "male"        -> His book
+ * // gender == "non-binary"  -> Their book
+ *
+ * <Select
+ *     value={gender}
+ *     _male="His book"
+ *     _female="Her book"
+ *     other="Their book"
+ * />
+ * ```
+ */
+export const Select: VFC<SelectChoiceProps>
+
+declare function _t(descriptor: MacroMessageDescriptor): string
+declare function _t(
+  literals: TemplateStringsArray,
+  ...placeholders: any[]
+): string
+
+/**
+ *
+ * Macro version of useLingui replaces _ function with `t` macro function which is bound to i18n passed from React.Context
+ *
+ * Returned `t` macro function has all the same signatures as global `t`
+ *
+ * @example
+ * ```
+ * const { t } = useLingui();
+ * const message = t`Text`;
+ * ```
+ *
+ * @example
+ * ```
+ * const { i18n, t } = useLingui();
+ * const locale = i18n.locale;
+ * const message = t({
+ *   id: "msg.hello",
+ *   comment: "Greetings at the homepage",
+ *   message: `Hello ${name}`,
+ * });
+ * ```
+ */
+export function useLingui(): Omit<I18nContext, "_"> & {
+  t: typeof _t
+}

package/macro/index.js

@@ -0,0 +1 @@
+module.exports = require("@lingui/babel-plugin-lingui-macro/macro")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/react",
-  "version": "4.11.4",
+  "version": "5.0.0-next.1",
   "sideEffects": false,
   "description": "React components for translations",
   "main": "./dist/index.cjs",
@@ -63,29 +63,46 @@
         "default": "./dist/server.mjs"
       }
     },
+    "./macro": {
+      "types": "./macro/index.d.ts",
+      "default": "./macro/index.js"
+    },
     "./package.json": "./package.json"
   },
   "files": [
     "LICENSE",
     "README.md",
-    "dist/"
+    "dist/",
+    "macro/index.d.ts",
+    "macro/index.js"
   ],
   "peerDependencies": {
+    "@lingui/babel-plugin-lingui-macro": "5.0.0-next.1",
+    "babel-plugin-macros": "2 || 3",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
+  "peerDependenciesMeta": {
+    "@lingui/babel-plugin-lingui-macro": {
+      "optional": true
+    },
+    "babel-plugin-macros": {
+      "optional": true
+    }
+  },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@lingui/core": "4.11.4"
+    "@lingui/core": "^5.0.0-next.1"
   },
   "devDependencies": {
-    "@lingui/jest-mocks": "*",
+    "@lingui/jest-mocks": "^3.0.3",
     "@testing-library/react": "^14.0.0",
     "@types/react": "^18.2.13",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "tsd": "^0.26.1",
     "unbuild": "2.0.0"
   },
-  "gitHead": "43d4e671360e8e5f1b820e4e061c1926d95c120b"
+  "gitHead": "7936155f7b29ecdc6191042a9a2e363962ab482d"
 }