@lingui/macro 4.0.0-next.8 → 4.1.0

package/dist/index.cjs

@@ -434,6 +434,9 @@ class MacroJSX {
       );
     };
     this.replacePath = (path) => {
+      if (!path.isJSXElement()) {
+        return path;
+      }
       const tokens = this.tokenizeNode(path);
       const messageFormat = new ICUMessageFormat();
       const {
@@ -813,13 +816,21 @@ function macro({ references, state, babel, config: config2 }) {
       stripNonEssentialProps,
       nameMap
     });
-    if (macro2.replacePath(path))
-      needsI18nImport = true;
+    try {
+      if (macro2.replacePath(path))
+        needsI18nImport = true;
+    } catch (e) {
+      reportUnsupportedSyntax(path, e);
+    }
   });
   const jsxNodesArray = Array.from(jsxNodes);
   jsxNodesArray.filter(isRootPath(jsxNodesArray)).forEach((path) => {
     const macro2 = new MacroJSX(babel, { stripNonEssentialProps, nameMap });
-    macro2.replacePath(path);
+    try {
+      macro2.replacePath(path);
+    } catch (e) {
+      reportUnsupportedSyntax(path, e);
+    }
   });
   if (needsI18nImport) {
     addImport(babel, state, i18nImportModule, i18nImportName);
@@ -828,6 +839,14 @@ function macro({ references, state, babel, config: config2 }) {
     addImport(babel, state, TransImportModule, TransImportName);
   }
 }
+function reportUnsupportedSyntax(path, e) {
+  throw path.buildCodeFrameError(
+    `Unsupported macro usage. Please check the examples at https://lingui.dev/ref/macro#examples-of-js-macros. 
+ If you think this is a bug, fill in an issue at https://github.com/lingui/js-lingui/issues
+ 
+ Error: ${e.message}`
+  );
+}
 function addImport(babel, state, module2, importName) {
   const { types: t } = babel;
   const linguiImport = state.file.path.node.body.find(

package/dist/index.mjs

@@ -432,6 +432,9 @@ class MacroJSX {
       );
     };
     this.replacePath = (path) => {
+      if (!path.isJSXElement()) {
+        return path;
+      }
       const tokens = this.tokenizeNode(path);
       const messageFormat = new ICUMessageFormat();
       const {
@@ -811,13 +814,21 @@ function macro({ references, state, babel, config: config2 }) {
       stripNonEssentialProps,
       nameMap
     });
-    if (macro2.replacePath(path))
-      needsI18nImport = true;
+    try {
+      if (macro2.replacePath(path))
+        needsI18nImport = true;
+    } catch (e) {
+      reportUnsupportedSyntax(path, e);
+    }
   });
   const jsxNodesArray = Array.from(jsxNodes);
   jsxNodesArray.filter(isRootPath(jsxNodesArray)).forEach((path) => {
     const macro2 = new MacroJSX(babel, { stripNonEssentialProps, nameMap });
-    macro2.replacePath(path);
+    try {
+      macro2.replacePath(path);
+    } catch (e) {
+      reportUnsupportedSyntax(path, e);
+    }
   });
   if (needsI18nImport) {
     addImport(babel, state, i18nImportModule, i18nImportName);
@@ -826,6 +837,14 @@ function macro({ references, state, babel, config: config2 }) {
     addImport(babel, state, TransImportModule, TransImportName);
   }
 }
+function reportUnsupportedSyntax(path, e) {
+  throw path.buildCodeFrameError(
+    `Unsupported macro usage. Please check the examples at https://lingui.dev/ref/macro#examples-of-js-macros. 
+ If you think this is a bug, fill in an issue at https://github.com/lingui/js-lingui/issues
+ 
+ Error: ${e.message}`
+  );
+}
 function addImport(babel, state, module2, importName) {
   const { types: t } = babel;
   const linguiImport = state.file.path.node.body.find(

package/index.d.ts

@@ -1,7 +1,7 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
-import type { ReactElement, ReactNode, VFC, FC } from "react"
+import type { ReactNode, VFC, FC } from "react"
 import type { I18n, MessageDescriptor } from "@lingui/core"
-import type { TransRenderProps } from "@lingui/react"
+import type { TransRenderCallbackOrComponent } from "@lingui/react"
 
 export type ChoiceOptions = {
   /** Offset of value when calculating plural forms */
@@ -216,12 +216,10 @@ export function defineMessage(
  */
 export const msg: typeof defineMessage
 
-type CommonProps = {
+type CommonProps = TransRenderCallbackOrComponent & {
   id?: string
   comment?: string
   context?: string
-  render?: (props: TransRenderProps) => ReactElement<any, any> | null
-  i18n?: I18n
 }
 
 type TransProps = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/macro",
-  "version": "4.0.0-next.8",
+  "version": "4.1.0",
   "description": "Macro for generating messages in ICU MessageFormat syntax",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -58,12 +58,12 @@
   "dependencies": {
     "@babel/runtime": "^7.20.13",
     "@babel/types": "^7.20.7",
-    "@lingui/conf": "^4.0.0-next.8",
-    "@lingui/core": "^4.0.0-next.8",
-    "@lingui/message-utils": "^4.0.0-next.8"
+    "@lingui/conf": "4.1.0",
+    "@lingui/core": "4.1.0",
+    "@lingui/message-utils": "4.1.0"
   },
   "peerDependencies": {
-    "@lingui/react": "4.0.0-next.8",
+    "@lingui/react": "^4.0.0",
     "babel-plugin-macros": "2 || 3"
   },
   "devDependencies": {
@@ -75,5 +75,5 @@
     "tsd": "^0.26.1",
     "unbuild": "^1.1.2"
   },
-  "gitHead": "c9104b3227327030db3f1c684acba65ea2c0d03f"
+  "gitHead": "471813c5de9ade3acccf647e18922b570a804577"
 }