@jetshop/format-message-estree-util 6.1.4 → 6.2.12

package/index.js

@@ -44,12 +44,13 @@ exports = module.exports = {
     if (context && context.type === 'eslint') {
       var scope = context.context.getScope();
       while (!binding && scope) {
-        var ref = scope.variables.filter(function(variable) {
+        var ref = scope.variables.find(function(variable) {
           return variable.name === node.name;
-        })[0];
+        });
         binding = ref && ref.defs && ref.defs[0];
         scope = scope.upper;
       }
+
       return binding;
     }
   },
@@ -68,7 +69,43 @@ exports = module.exports = {
     );
   },
 
+  isImportIntlContext: function(binding) {
+    if (!binding || !binding.node) return false;
+
+    var node = binding.node;
+    var parent = binding.path ? binding.path.parentPath.node : node.parent;
+
+    return (
+      parent &&
+      parent.source &&
+      this.isStringLiteral(parent.source) &&
+      MODULE_NAME_PATTERN.test(parent.source.value) &&
+      node.type === 'ImportSpecifier' &&
+      node.imported &&
+      node.imported.name === 'Intl'
+    );
+  },
+
+  isImportUseIntl: function(binding) {
+    if (!binding || !binding.node) return false;
+
+    var node = binding.node;
+    var parent = binding.path ? binding.path.parentPath.node : node.parent;
+
+    return (
+      parent &&
+      parent.source &&
+      this.isStringLiteral(parent.source) &&
+      MODULE_NAME_PATTERN.test(parent.source.value) &&
+      node.type === 'ImportSpecifier' &&
+      node.imported &&
+      node.imported.name === 'useIntl'
+    );
+  },
+
   isImportFormatMessage: function(binding) {
+    if (!binding || !binding.node) return false;
+
     var node = binding.node;
     var parent = binding.path ? binding.path.parentPath.node : node.parent;
     return (
@@ -97,6 +134,48 @@ exports = module.exports = {
     );
   },
 
+  isIntlContextCall: function(binding) {
+    if (!binding || !binding.node) return false;
+
+    var parent = binding.path ? binding.path.parentPath : binding.node.parent;
+    if (!parent) return false;
+
+    var element = parent.parentPath
+      ? parent.parentPath &&
+        parent.parentPath.parentPath &&
+        parent.parentPath.parentPath.node
+      : parent.parent;
+
+    if (!element || !element.openingElement) {
+      return false;
+    }
+
+    var openingElement = element.openingElement;
+
+    if (openingElement.name && openingElement.name.type === 'JSXIdentifier') {
+      return this.isImportIntlContext(this.getBinding(openingElement.name));
+    }
+
+    return false;
+  },
+
+  isUseIntlCall: function(binding) {
+    if (!binding || !binding.node) return false;
+
+    if (
+      binding.node.type === 'VariableDeclarator' &&
+      binding.node.init &&
+      binding.node.init.type === 'CallExpression'
+    ) {
+      const callee = this.getBinding(binding.node.init.callee);
+      if (!callee || !callee.node) return false;
+
+      return this.isImportUseIntl(callee);
+    }
+
+    return false;
+  },
+
   isFormatMessage: function(node) {
     if (node.type !== 'Identifier') return false;
     var binding = this.getBinding(node);
@@ -107,7 +186,9 @@ exports = module.exports = {
       (binding.node.type === 'VariableDeclarator' &&
         binding.node.id.type === 'Identifier' &&
         binding.node.init &&
-        this.isRequireFormatMessage(binding.node.init))
+        this.isRequireFormatMessage(binding.node.init)) ||
+      this.isIntlContextCall(binding) ||
+      this.isUseIntlCall(binding)
     );
   },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetshop/format-message-estree-util",
-  "version": "6.1.4",
+  "version": "6.2.12",
   "description": "Utility functions for format-message use in ECMAScript ASTs",
   "author": "Andy VanWagoner <andy@vanwago.net>",
   "homepage": "https://github.com/format-message/format-message/tree/master/packages/format-message-estree-util",
@@ -11,5 +11,5 @@
     "format-message",
     "estree"
   ],
-  "gitHead": "fcecc189fbfe3c8227576c6c01895ce18cbb0048"
+  "gitHead": "700ed9f7952edf4c921027e264ec0dfa9a8a8626"
 }