@lingui/macro 4.0.0-next.4 → 4.0.0-next.6

package/dist/index.cjs

@@ -3,7 +3,7 @@
 const babelPluginMacros = require('babel-plugin-macros');
 const conf = require('@lingui/conf');
 const types = require('@babel/types');
-const api = require('@lingui/cli/api');
+const generateMessageId = require('@lingui/message-utils/generateMessageId');
 
 const metaOptions = ["id", "comment", "props"];
 const escapedMetaOptionsRe = new RegExp(`^_(${metaOptions.join("|")})$`);
@@ -229,7 +229,7 @@ class MacroJs {
   createIdProperty(message, context) {
     return this.createObjectProperty(
       ID,
-      this.types.stringLiteral(api.generateMessageId(message, context))
+      this.types.stringLiteral(generateMessageId.generateMessageId(message, context))
     );
   }
   createValuesProperty(values) {
@@ -313,13 +313,6 @@ class MacroJs {
     return token;
   }
   tokenizeExpression(node) {
-    if (this.isArg(node) && this.types.isCallExpression(node)) {
-      return {
-        type: "arg",
-        name: node.arguments[0].value,
-        value: void 0
-      };
-    }
     return {
       type: "arg",
       name: this.expressionToArgument(node),
@@ -392,9 +385,6 @@ class MacroJs {
   isDefineMessage(node) {
     return this.isLinguiIdentifier(node, "defineMessage") || this.isLinguiIdentifier(node, "msg");
   }
-  isArg(node) {
-    return this.types.isCallExpression(node) && this.isLinguiIdentifier(node.callee, "arg");
-  }
   isI18nMethod(node) {
     return this.types.isTaggedTemplateExpression(node) && (this.isLinguiIdentifier(node.tag, "t") || this.types.isCallExpression(node.tag) && this.isLinguiIdentifier(node.tag.callee, "t"));
   }
@@ -467,7 +457,7 @@ class MacroJSX {
         );
       } else {
         attributes.push(
-          this.createStringJsxAttribute(ID, api.generateMessageId(message, context))
+          this.createStringJsxAttribute(ID, generateMessageId.generateMessageId(message, context))
         );
       }
       if (!this.stripNonEssentialProps) {

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { createMacro } from 'babel-plugin-macros';
 import { getConfig as getConfig$1 } from '@lingui/conf';
 import { isJSXEmptyExpression, isObjectProperty, isImportSpecifier, isIdentifier } from '@babel/types';
-import { generateMessageId } from '@lingui/cli/api';
+import { generateMessageId } from '@lingui/message-utils/generateMessageId';
 
 const metaOptions = ["id", "comment", "props"];
 const escapedMetaOptionsRe = new RegExp(`^_(${metaOptions.join("|")})$`);
@@ -311,13 +311,6 @@ class MacroJs {
     return token;
   }
   tokenizeExpression(node) {
-    if (this.isArg(node) && this.types.isCallExpression(node)) {
-      return {
-        type: "arg",
-        name: node.arguments[0].value,
-        value: void 0
-      };
-    }
     return {
       type: "arg",
       name: this.expressionToArgument(node),
@@ -390,9 +383,6 @@ class MacroJs {
   isDefineMessage(node) {
     return this.isLinguiIdentifier(node, "defineMessage") || this.isLinguiIdentifier(node, "msg");
   }
-  isArg(node) {
-    return this.types.isCallExpression(node) && this.isLinguiIdentifier(node.callee, "arg");
-  }
   isI18nMethod(node) {
     return this.types.isTaggedTemplateExpression(node) && (this.isLinguiIdentifier(node.tag, "t") || this.types.isCallExpression(node.tag) && this.isLinguiIdentifier(node.tag.callee, "t"));
   }

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@lingui/macro",
-  "version": "4.0.0-next.4",
+  "version": "4.0.0-next.6",
   "description": "Macro for generating messages in ICU MessageFormat syntax",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./index.d.ts",
+  "sideEffects": false,
   "author": {
     "name": "Tomáš Ehrlich",
     "email": "tomas.ehrlich@gmail.com"
@@ -38,6 +39,14 @@
         "types": "./index.d.ts",
         "default": "./dist/index.mjs"
       }
+    },
+    "./node": {
+      "require": {
+        "types": "./dist/index.d.ts"
+      },
+      "import": {
+        "types": "./dist/index.d.ts"
+      }
     }
   },
   "files": [
@@ -49,12 +58,12 @@
   "dependencies": {
     "@babel/runtime": "^7.20.13",
     "@babel/types": "^7.20.7",
-    "@lingui/cli": "^4.0.0-next.4",
-    "@lingui/conf": "^4.0.0-next.4"
+    "@lingui/conf": "^4.0.0-next.6",
+    "@lingui/core": "^4.0.0-next.6",
+    "@lingui/message-utils": "^4.0.0-next.6"
   },
   "peerDependencies": {
-    "@lingui/core": "4.0.0-next.4",
-    "@lingui/react": "4.0.0-next.4",
+    "@lingui/react": "4.0.0-next.6",
     "babel-plugin-macros": "2 || 3"
   },
   "devDependencies": {
@@ -66,5 +75,5 @@
     "tsd": "^0.26.1",
     "unbuild": "^1.1.2"
   },
-  "gitHead": "3b999e35d26e67dec7cf0591f794be782e11022c"
+  "gitHead": "d4d9e149b2419d1796e14176d53703a7cff4b82c"
 }