fix

Author: timofei-iatsenko

packages/babel-plugin-extract-messages/test/extract-messages.test.ts

@@ -47,7 +47,7 @@ const transformCode = (
         [
           linguiMacroPlugin,
           {
-            extract: true,
+            descriptorFields: "all",
           } satisfies LinguiPluginOpts,
         ],
         [plugin, pluginOpts],

packages/babel-plugin-lingui-macro/src/index.ts

@@ -1,48 +1,34 @@
-import type { PluginObj, Visitor, PluginPass } from "@babel/core"
+import type { PluginObj, PluginPass, Visitor } from "@babel/core"
 import type * as babelTypes from "@babel/types"
-import { Program, Identifier } from "@babel/types"
+import { Identifier, Program } from "@babel/types"
 import { MacroJSX } from "./macroJsx"
 import type { NodePath } from "@babel/traverse"
 import { MacroJs } from "./macroJs"
 import { JsMacroName } from "./constants"
 import {
-  type LinguiConfigNormalized,
   getConfig as loadConfig,
   LinguiConfig,
+  type LinguiConfigNormalized,
 } from "@lingui/conf"
+import { ResolvedDescriptorFields } from "./messageDescriptorUtils"
 
 let config: LinguiConfigNormalized
 
-/**
- * Controls which descriptor fields are preserved in the transformed code.
- *
- * - `"auto"` (default): In production (`NODE_ENV === "production"`), keeps only the `id`.
- *    Otherwise, behaves like `"all"`.
- * - `"all"`: Keeps every field: `id`, `message`, `context`, and `comment`.
- *    Used by Lingui CLI during extraction.
- * - `"id-only"`: Strips everything except the `id`. Most optimized for production.
- * - `"message"`: Keeps `id`, `message`, and `context` (but not `comment`).
- *    Use when you need runtime access to message and context.
- */
-export type DescriptorFields = "auto" | "all" | "id-only" | "message"
-
-/**
- * The resolved mode after evaluating `"auto"` against the current environment.
- */
-export type ResolvedDescriptorFields = "all" | "id-only" | "message"
-
 export type LinguiPluginOpts = {
   /**
    * Controls which descriptor fields are preserved in the transformed code.
    *
-   * - `"auto"` (default): In production, keeps only the `id`. Otherwise, keeps all fields.
-   * - `"all"`: Keeps `id`, `message`, `context`, and `comment`. Used by CLI during extraction.
-   * - `"id-only"`: Strips everything except `id`. Most optimized for production.
+   * - `"auto"` (default): In production (`NODE_ENV === "production"`), keeps only the `id`.
+   *    Otherwise, behaves like `"all"`.
+   * - `"all"`: Keeps every field: `id`, `message`, `context`, and `comment`.
+   *    Used by Lingui CLI during extraction.
+   * - `"id-only"`: Strips everything except the `id`. Most optimized for production.
    * - `"message"`: Keeps `id`, `message`, and `context` (but not `comment`).
+   *    Use when you need runtime access to message and context.
    *
    * @default "auto"
    */
-  descriptorFields?: DescriptorFields
+  descriptorFields?: "auto" | "all" | "id-only" | "message"
 
   /**
    * Resolved and normalized Lingui Configuration

packages/babel-plugin-lingui-macro/src/macroJs.ts

@@ -13,7 +13,10 @@ import type { NodePath } from "@babel/traverse"
 
 import { Tokens } from "./icu"
 import { JsMacroName } from "./constants"
-import { createMessageDescriptorFromTokens } from "./messageDescriptorUtils"
+import {
+  createMessageDescriptorFromTokens,
+  ResolvedDescriptorFields,
+} from "./messageDescriptorUtils"
 import {
   isLinguiIdentifier,
   isDefineMessage,
@@ -23,7 +26,6 @@ import {
   createMacroJsContext,
   MacroJsContext,
 } from "./macroJsAst"
-import type { ResolvedDescriptorFields } from "./index"
 
 export type MacroJsOpts = {
   i18nImportName: string

packages/babel-plugin-lingui-macro/src/macroJsAst.ts

@@ -11,9 +11,11 @@ import {
 } from "@babel/types"
 import { JsMacroName, MsgDescriptorPropKey } from "./constants"
 import { ArgToken, TextToken, Token } from "./icu"
-import { createMessageDescriptorFromTokens } from "./messageDescriptorUtils"
+import {
+  createMessageDescriptorFromTokens,
+  ResolvedDescriptorFields,
+} from "./messageDescriptorUtils"
 import { makeCounter } from "./utils"
-import type { ResolvedDescriptorFields } from "./index"
 
 export type MacroJsContext = {
   // Positional expressions counter (e.g. for placeholders `Hello {0}, today is {1}`)

packages/babel-plugin-lingui-macro/src/macroJsx.ts

@@ -20,15 +20,17 @@ import { ArgToken, ElementToken, TextToken, Token } from "./icu"
 import { makeCounter } from "./utils"
 import { JsxMacroName, MsgDescriptorPropKey, JsMacroName } from "./constants"
 import cleanJSXElementLiteralChild from "./utils/cleanJSXElementLiteralChild"
-import { createMessageDescriptorFromTokens } from "./messageDescriptorUtils"
+import {
+  createMessageDescriptorFromTokens,
+  ResolvedDescriptorFields,
+} from "./messageDescriptorUtils"
 import {
   createMacroJsContext,
   MacroJsContext,
   tokenizeExpression,
 } from "./macroJsAst"
 import { LinguiConfigNormalized } from "@lingui/conf"
 import { PluginPass } from "@babel/core"
-import type { ResolvedDescriptorFields } from "./index"
 
 const pluralRuleRe = /(_[\d\w]+|zero|one|two|few|many|other)/
 const jsx2icuExactChoice = (value: string) =>

packages/babel-plugin-lingui-macro/src/messageDescriptorUtils.ts

@@ -1,14 +1,13 @@
-import { ICUMessageFormat, Tokens, ParsedResult } from "./icu"
+import { ICUMessageFormat, ParsedResult, Tokens } from "./icu"
+import * as types from "@babel/types"
 import {
-  SourceLocation,
-  ObjectProperty,
-  ObjectExpression,
   Expression,
+  ObjectExpression,
+  ObjectProperty,
+  SourceLocation,
 } from "@babel/types"
 import { EXTRACT_MARK, MsgDescriptorPropKey } from "./constants"
-import * as types from "@babel/types"
 import { generateMessageId } from "@lingui/message-utils/generateMessageId"
-import type { ResolvedDescriptorFields } from "./index"
 
 function buildICUFromTokens(tokens: Tokens) {
   const messageFormat = new ICUMessageFormat()
@@ -26,6 +25,13 @@ function isObjectProperty(
   return "type" in node
 }
 
+/**
+ * The resolved mode after evaluating `"auto"` against the current environment.
+ *
+ * @see LinguiPluginOpts.descriptorFields
+ */
+export type ResolvedDescriptorFields = "all" | "id-only" | "message"
+
 export function createMessageDescriptorFromTokens(
   tokens: Tokens,
   oldLoc: SourceLocation,

website/docs/guides/optimizing-bundle-size.md

@@ -151,7 +151,7 @@ You want to keep original messages, context, and use runtime compilation, even i
 
 ```ts
 // Macro config
-descriptorFields: "message"
+descriptorFields: "message";
 
 // Runtime setup
 i18n.setMessagesCompiler(compileMessage);
@@ -167,7 +167,7 @@ You want everything to be stripped in both environments. Useful for catching iss
 
 ```ts
 // Macro config
-descriptorFields: "id-only"
+descriptorFields: "id-only";
 
 // Runtime setup
 i18n.setMessagesCompiler(null);