eslint-plugin-formatjs 5.3.1 → 5.4.1

package/lib_esnext/package.json

@@ -1,7 +1,7 @@
 {
     "name": "eslint-plugin-formatjs",
     "description": "ESLint plugin for formatjs",
-    "version": "5.3.1",
+    "version": "5.4.1",
     "license": "MIT",
     "author": "Long Ho <holevietlong@gmail.com>",
     "dependencies": {

package/lib_esnext/util.js

@@ -67,9 +67,19 @@ export function extractMessageDescriptor(node) {
         if (isStringLiteral(valueNode)) {
             value = valueNode.value;
         }
+        // like "`asd`"
         else if (isTemplateLiteralWithoutVar(valueNode)) {
             value = valueNode.quasis[0].value.cooked;
         }
+        // like "dedent`asd`"
+        else if (valueNode.type === 'TaggedTemplateExpression') {
+            const { quasi } = valueNode;
+            if (!isTemplateLiteralWithoutVar(quasi)) {
+                throw new Error('Tagged template expression must be no substitution');
+            }
+            value = quasi.quasis[0].value.cooked;
+        }
+        // like "`asd` + `asd`"
         else if (valueNode.type === 'BinaryExpression') {
             const [result, isStatic] = staticallyEvaluateStringConcat(valueNode);
             if (isStatic) {
@@ -132,9 +142,18 @@ function extractMessageDescriptorFromJSXElement(node) {
                         value = result;
                     }
                 }
+                // like "`asd`"
                 else if (isTemplateLiteralWithoutVar(expression)) {
                     value = expression.quasis[0].value.cooked;
                 }
+                // like "dedent`asd`"
+                else if (expression.type === 'TaggedTemplateExpression') {
+                    const { quasi } = expression;
+                    if (!isTemplateLiteralWithoutVar(quasi)) {
+                        throw new Error('Tagged template expression must be no substitution');
+                    }
+                    value = quasi.quasis[0].value.cooked;
+                }
             }
         }
         switch (key.name) {

package/package.json

@@ -1,24 +1,20 @@
 {
   "name": "eslint-plugin-formatjs",
   "description": "ESLint plugin for formatjs",
-  "version": "5.3.1",
-  "license": "MIT",
+  "version": "5.4.1",
   "author": "Long Ho <holevietlong@gmail.com>",
+  "bugs": "https://github.com/formatjs/formatjs/issues",
   "dependencies": {
+    "@formatjs/icu-messageformat-parser": "2.11.3",
+    "@formatjs/ts-transformer": "3.14.1",
     "@types/eslint": "^9.6.1",
     "@types/picomatch": "^3",
     "@typescript-eslint/utils": "^8.27.0",
     "magic-string": "^0.30.0",
     "picomatch": "2 || 3 || 4",
     "tslib": "^2.8.0",
-    "unicode-emoji-utils": "^1.2.0",
-    "@formatjs/icu-messageformat-parser": "2.11.2",
-    "@formatjs/ts-transformer": "3.13.34"
-  },
-  "peerDependencies": {
-    "eslint": "^9.23.0"
+    "unicode-emoji-utils": "^1.2.0"
   },
-  "bugs": "https://github.com/formatjs/formatjs/issues",
   "homepage": "https://github.com/formatjs/formatjs#readme",
   "keywords": [
     "eslint",
@@ -26,6 +22,10 @@
     "formatjs",
     "i18n"
   ],
+  "license": "MIT",
   "main": "index.js",
+  "peerDependencies": {
+    "eslint": "9.30.1"
+  },
   "repository": "formatjs/formatjs.git"
 }

package/util.js

@@ -74,9 +74,19 @@ function extractMessageDescriptor(node) {
         if (isStringLiteral(valueNode)) {
             value = valueNode.value;
         }
+        // like "`asd`"
         else if (isTemplateLiteralWithoutVar(valueNode)) {
             value = valueNode.quasis[0].value.cooked;
         }
+        // like "dedent`asd`"
+        else if (valueNode.type === 'TaggedTemplateExpression') {
+            const { quasi } = valueNode;
+            if (!isTemplateLiteralWithoutVar(quasi)) {
+                throw new Error('Tagged template expression must be no substitution');
+            }
+            value = quasi.quasis[0].value.cooked;
+        }
+        // like "`asd` + `asd`"
         else if (valueNode.type === 'BinaryExpression') {
             const [result, isStatic] = staticallyEvaluateStringConcat(valueNode);
             if (isStatic) {
@@ -139,9 +149,18 @@ function extractMessageDescriptorFromJSXElement(node) {
                         value = result;
                     }
                 }
+                // like "`asd`"
                 else if (isTemplateLiteralWithoutVar(expression)) {
                     value = expression.quasis[0].value.cooked;
                 }
+                // like "dedent`asd`"
+                else if (expression.type === 'TaggedTemplateExpression') {
+                    const { quasi } = expression;
+                    if (!isTemplateLiteralWithoutVar(quasi)) {
+                        throw new Error('Tagged template expression must be no substitution');
+                    }
+                    value = quasi.quasis[0].value.cooked;
+                }
             }
         }
         switch (key.name) {