@lingui/babel-plugin-extract-messages 5.9.2 → 6.0.0-next.0

package/dist/index.d.mts

@@ -18,4 +18,5 @@ declare function export_default({ types: t }: {
     types: BabelTypes;
 }): PluginObj;
 
-export { type ExtractPluginOpts, type ExtractedMessage, type Origin, export_default as default };
+export { export_default as default };
+export type { ExtractPluginOpts, ExtractedMessage, Origin };

package/dist/index.mjs

@@ -1,16 +1,15 @@
 function collectMessage(path, props, ctx) {
-  if (props.id === void 0)
-    return;
+  if (props.id === void 0) return;
   const node = path.node;
-  const line = node.loc ? node.loc.start.line : null;
-  const column = node.loc ? node.loc.start.column : null;
+  const line = node.loc ? node.loc.start.line : void 0;
+  const column = node.loc ? node.loc.start.column : void 0;
   ctx.opts.onMessageExtracted({
     id: props.id,
     message: props.message,
     context: props.context,
     comment: props.comment,
     placeholders: props.placeholders || {},
-    origin: [ctx.file.opts.filename, line, column]
+    origin: ctx.file.opts.filename ? [ctx.file.opts.filename, line, column] : void 0
   });
 }
 function getTextFromExpression(t, exp, hub, emitErrorOnVariable = true) {
@@ -41,7 +40,7 @@ function getTextFromExpression(t, exp, hub, emitErrorOnVariable = true) {
       );
       return "";
     }
-    return exp.quasis[0]?.value?.cooked;
+    return exp.quasis[0]?.value?.cooked || "";
   }
   if (emitErrorOnVariable) {
     console.warn(
@@ -52,6 +51,7 @@ function getTextFromExpression(t, exp, hub, emitErrorOnVariable = true) {
       ).message
     );
   }
+  return "";
 }
 function getNodeSource(fileContents, node) {
   return fileContents.slice(node.start, node.end);
@@ -102,7 +102,7 @@ function extractFromObjectExpression(t, exp, hub) {
 }
 const I18N_OBJECT = "i18n";
 function hasComment(node, comment) {
-  return node.leadingComments && node.leadingComments.some((comm) => comm.value.trim() === comment);
+  return !!node.leadingComments?.some((comm) => comm.value.trim() === comment);
 }
 function hasIgnoreComment(node) {
   return hasComment(node, "lingui-extract-ignore");
@@ -130,8 +130,7 @@ function index({ types: t }) {
       // Extract translation from <Trans /> component.
       JSXElement(path, ctx) {
         const { node } = path;
-        if (!isTransComponent(path))
-          return;
+        if (!isTransComponent(path)) return;
         const attrs = node.openingElement.attributes || [];
         if (attrs.find(
           (attr) => t.isJSXSpreadAttribute(attr) && hasI18nComment(attr.argument)
@@ -233,8 +232,7 @@ function index({ types: t }) {
       },
       // Extract message descriptors
       ObjectExpression(path, ctx) {
-        if (!hasI18nComment(path.node))
-          return;
+        if (!hasI18nComment(path.node)) return;
         extractFromMessageDescriptor(path, ctx);
       }
     }

package/package.json

@@ -1,10 +1,8 @@
 {
   "name": "@lingui/babel-plugin-extract-messages",
-  "version": "5.9.2",
+  "version": "6.0.0-next.0",
   "description": "Babel plugin for collecting messages from source code for internationalization",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "type": "module",
   "author": {
     "name": "Tomáš Ehrlich",
     "email": "tomas.ehrlich@gmail.com"
@@ -21,14 +19,17 @@
     "multilingual"
   ],
   "scripts": {
-    "build": "rimraf ./dist && unbuild",
-    "stub": "unbuild --stub"
+    "build": "unbuild",
+    "check-types": "tsc --noEmit"
   },
   "files": [
     "LICENSE",
     "README.md",
     "dist/"
   ],
+  "exports": {
+    ".": "./dist/index.mjs"
+  },
   "homepage": "https://lingui.dev",
   "repository": {
     "type": "git",
@@ -39,15 +40,19 @@
     "url": "https://github.com/lingui/js-lingui/issues"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.19.0"
   },
   "devDependencies": {
     "@babel/core": "^7.21.0",
     "@babel/traverse": "^7.20.12",
     "@babel/types": "^7.20.7",
-    "@lingui/babel-plugin-lingui-macro": "5.9.2",
-    "@lingui/jest-mocks": "3.0.3",
-    "unbuild": "2.0.0"
+    "@lingui/babel-plugin-lingui-macro": "6.0.0-next.0",
+    "@lingui/test-utils": "3.0.3",
+    "unbuild": "3.6.1",
+    "vitest": "4.0.18"
+  },
+  "unbuild": {
+    "declaration": "node16"
   },
-  "gitHead": "7b30f31b5510c98442eabbcef531a6b70e1c1381"
+  "gitHead": "a9576050487a4f7dfbc88db20814d5a1bb861c8c"
 }

package/dist/index.cjs

@@ -1,246 +0,0 @@
-'use strict';
-
-function collectMessage(path, props, ctx) {
-  if (props.id === void 0)
-    return;
-  const node = path.node;
-  const line = node.loc ? node.loc.start.line : null;
-  const column = node.loc ? node.loc.start.column : null;
-  ctx.opts.onMessageExtracted({
-    id: props.id,
-    message: props.message,
-    context: props.context,
-    comment: props.comment,
-    placeholders: props.placeholders || {},
-    origin: [ctx.file.opts.filename, line, column]
-  });
-}
-function getTextFromExpression(t, exp, hub, emitErrorOnVariable = true) {
-  if (t.isStringLiteral(exp)) {
-    return exp.value;
-  }
-  if (t.isBinaryExpression(exp)) {
-    return getTextFromExpression(
-      t,
-      exp.left,
-      hub,
-      emitErrorOnVariable
-    ) + getTextFromExpression(
-      t,
-      exp.right,
-      hub,
-      emitErrorOnVariable
-    );
-  }
-  if (t.isTemplateLiteral(exp)) {
-    if (exp?.quasis.length > 1) {
-      console.warn(
-        hub.buildError(
-          exp,
-          "Could not extract from template literal with expressions.",
-          SyntaxError
-        ).message
-      );
-      return "";
-    }
-    return exp.quasis[0]?.value?.cooked;
-  }
-  if (emitErrorOnVariable) {
-    console.warn(
-      hub.buildError(
-        exp,
-        "Only strings or template literals could be extracted.",
-        SyntaxError
-      ).message
-    );
-  }
-}
-function getNodeSource(fileContents, node) {
-  return fileContents.slice(node.start, node.end);
-}
-function valuesObjectExpressionToPlaceholdersRecord(t, exp, hub) {
-  const props = {};
-  exp.properties.forEach(({ key, value }, i) => {
-    let name;
-    if (t.isStringLiteral(key) || t.isNumericLiteral(key)) {
-      name = key.value.toString();
-    } else if (t.isIdentifier(key)) {
-      name = key.name;
-    } else {
-      console.warn(
-        hub.buildError(
-          exp,
-          `Could not extract values to placeholders. The key #${i} has unsupported syntax`,
-          SyntaxError
-        ).message
-      );
-    }
-    if (name) {
-      props[name] = getNodeSource(hub.getCode(), value);
-    }
-  });
-  return props;
-}
-function extractFromObjectExpression(t, exp, hub) {
-  const props = {};
-  const textKeys = ["id", "message", "comment", "context"];
-  exp.properties.forEach(({ key, value }, i) => {
-    const name = key.name;
-    if (name === "values" && t.isObjectExpression(value)) {
-      props.placeholders = valuesObjectExpressionToPlaceholdersRecord(
-        t,
-        value,
-        hub
-      );
-    } else if (textKeys.includes(name)) {
-      props[name] = getTextFromExpression(
-        t,
-        value,
-        hub
-      );
-    }
-  });
-  return props;
-}
-const I18N_OBJECT = "i18n";
-function hasComment(node, comment) {
-  return node.leadingComments && node.leadingComments.some((comm) => comm.value.trim() === comment);
-}
-function hasIgnoreComment(node) {
-  return hasComment(node, "lingui-extract-ignore");
-}
-function hasI18nComment(node) {
-  return hasComment(node, "i18n");
-}
-function index({ types: t }) {
-  function isTransComponent(path) {
-    return path.isJSXElement() && path.get("openingElement").get("name").referencesImport("@lingui/react", "Trans");
-  }
-  const isI18nMethod = (node) => t.isMemberExpression(node) && (t.isIdentifier(node.object, { name: I18N_OBJECT }) || t.isMemberExpression(node.object) && t.isIdentifier(node.object.property, { name: I18N_OBJECT })) && (t.isIdentifier(node.property, { name: "_" }) || t.isIdentifier(node.property, { name: "t" }));
-  const extractFromMessageDescriptor = (path, ctx) => {
-    const props = extractFromObjectExpression(t, path.node, ctx.file.hub);
-    if (!props.id) {
-      console.warn(
-        path.buildCodeFrameError("Missing message ID, skipping.").message
-      );
-      return;
-    }
-    collectMessage(path, props, ctx);
-  };
-  return {
-    visitor: {
-      // Extract translation from <Trans /> component.
-      JSXElement(path, ctx) {
-        const { node } = path;
-        if (!isTransComponent(path))
-          return;
-        const attrs = node.openingElement.attributes || [];
-        if (attrs.find(
-          (attr) => t.isJSXSpreadAttribute(attr) && hasI18nComment(attr.argument)
-        )) {
-          return;
-        }
-        const props = attrs.reduce((acc, item) => {
-          if (t.isJSXSpreadAttribute(item)) {
-            return acc;
-          }
-          const key = item.name.name;
-          if (key === "id" || key === "message" || key === "comment" || key === "context") {
-            if (t.isStringLiteral(item.value)) {
-              acc[key] = item.value.value;
-            } else if (t.isJSXExpressionContainer(item.value) && t.isStringLiteral(item.value.expression)) {
-              acc[key] = item.value.expression.value;
-            }
-          }
-          if (key === "values" && t.isJSXExpressionContainer(item.value) && t.isObjectExpression(item.value.expression)) {
-            acc.placeholders = valuesObjectExpressionToPlaceholdersRecord(
-              t,
-              item.value.expression,
-              ctx.file.hub
-            );
-          }
-          return acc;
-        }, {});
-        if (!props.id) {
-          const idProp = attrs.filter(
-            (item) => t.isJSXAttribute(item) && item.name.name === "id"
-          )[0];
-          if (idProp === void 0 || t.isLiteral(props.id)) {
-            console.warn(
-              path.buildCodeFrameError("Missing message ID, skipping.").message
-            );
-          }
-          return;
-        }
-        collectMessage(path, props, ctx);
-      },
-      CallExpression(path, ctx) {
-        if ([path.node, path.parent].some((node) => hasIgnoreComment(node))) {
-          return;
-        }
-        const firstArgument = path.get("arguments")[0];
-        if (!isI18nMethod(path.node.callee)) {
-          return;
-        }
-        if (hasI18nComment(firstArgument.node)) {
-          return;
-        }
-        if (firstArgument.isObjectExpression()) {
-          extractFromMessageDescriptor(firstArgument, ctx);
-          return;
-        } else {
-          let props = {
-            id: getTextFromExpression(
-              t,
-              firstArgument.node,
-              ctx.file.hub,
-              false
-            )
-          };
-          if (!props.id) {
-            return;
-          }
-          const secondArgument = path.node.arguments[1];
-          if (secondArgument && t.isObjectExpression(secondArgument)) {
-            props.placeholders = valuesObjectExpressionToPlaceholdersRecord(
-              t,
-              secondArgument,
-              ctx.file.hub
-            );
-          }
-          const msgDescArg = path.node.arguments[2];
-          if (t.isObjectExpression(msgDescArg)) {
-            props = {
-              ...props,
-              ...extractFromObjectExpression(t, msgDescArg, ctx.file.hub)
-            };
-          }
-          collectMessage(path, props, ctx);
-        }
-      },
-      StringLiteral(path, ctx) {
-        if (!hasI18nComment(path.node)) {
-          return;
-        }
-        const props = {
-          id: path.node.value
-        };
-        if (!props.id) {
-          console.warn(
-            path.buildCodeFrameError("Empty StringLiteral, skipping.").message
-          );
-          return;
-        }
-        collectMessage(path, props, ctx);
-      },
-      // Extract message descriptors
-      ObjectExpression(path, ctx) {
-        if (!hasI18nComment(path.node))
-          return;
-        extractFromMessageDescriptor(path, ctx);
-      }
-    }
-  };
-}
-
-module.exports = index;

package/dist/index.d.cts

@@ -1,21 +0,0 @@
-import * as BabelTypesNamespace from '@babel/types';
-import { PluginObj } from '@babel/core';
-
-type BabelTypes = typeof BabelTypesNamespace;
-type ExtractedMessage = {
-    id: string;
-    message?: string;
-    context?: string;
-    origin?: Origin;
-    comment?: string;
-    placeholders?: Record<string, string>;
-};
-type ExtractPluginOpts = {
-    onMessageExtracted(msg: ExtractedMessage): void;
-};
-type Origin = [filename: string, line: number, column?: number];
-declare function export_default({ types: t }: {
-    types: BabelTypes;
-}): PluginObj;
-
-export { type ExtractPluginOpts, type ExtractedMessage, type Origin, export_default as default };

package/dist/index.d.ts

@@ -1,21 +0,0 @@
-import * as BabelTypesNamespace from '@babel/types';
-import { PluginObj } from '@babel/core';
-
-type BabelTypes = typeof BabelTypesNamespace;
-type ExtractedMessage = {
-    id: string;
-    message?: string;
-    context?: string;
-    origin?: Origin;
-    comment?: string;
-    placeholders?: Record<string, string>;
-};
-type ExtractPluginOpts = {
-    onMessageExtracted(msg: ExtractedMessage): void;
-};
-type Origin = [filename: string, line: number, column?: number];
-declare function export_default({ types: t }: {
-    types: BabelTypes;
-}): PluginObj;
-
-export { type ExtractPluginOpts, type ExtractedMessage, type Origin, export_default as default };