fix(babel-plugin-react-intl): fix pragma parsing so it can search for non-import nodes

Author: Long Ho

packages/babel-plugin-react-intl/src/index.ts

@@ -45,9 +45,9 @@ interface MessageDescriptor {
 export type ExtractedMessageDescriptor = MessageDescriptor &
   Partial<SourceLocation> & {file?: string};
 
-export type ExtractionResult = {
+export type ExtractionResult<M = Record<string, string>> = {
   messages: ExtractedMessageDescriptor[];
-  meta: Map<string, string>;
+  meta: M;
 };
 
 type MessageDescriptorPath = Record<
@@ -89,7 +89,7 @@ interface BabelTransformationFile {
 
 interface State {
   ReactIntlMessages: Map<string, ExtractedMessageDescriptor>;
-  ReactIntlMeta: Map<string, string>;
+  ReactIntlMeta: Record<string, string>;
 }
 
 function getICUMessageValue(
@@ -361,7 +361,7 @@ export default declare((api: any, options: OptionsSchema) => {
     pre() {
       if (!this.ReactIntlMessages) {
         this.ReactIntlMessages = new Map();
-        this.ReactIntlMeta = new Map();
+        this.ReactIntlMeta = {};
       }
     },
 
@@ -411,26 +411,32 @@ export default declare((api: any, options: OptionsSchema) => {
     },
 
     visitor: {
-      ImportDeclaration(path) {
-        const comments = path.node.leadingComments;
+      Program(path) {
+        const {body} = path.node;
         const {ReactIntlMeta} = this;
-        if (!pragma || !comments) {
+        if (!pragma) {
           return;
         }
-        const pragmaLine = comments
-          .map(c => c.value)
-          .find(c => c.includes(pragma));
-        if (!pragmaLine) {
-          return;
+        for (const {leadingComments} of body) {
+          if (!leadingComments) {
+            continue;
+          }
+          const pragmaLineNode = leadingComments.find(c =>
+            c.value.includes(pragma)
+          );
+          if (!pragmaLineNode) {
+            continue;
+          }
+
+          pragmaLineNode.value
+            .split(pragma)[1]
+            .trim()
+            .split(/\s+/g)
+            .forEach(kv => {
+              const [k, v] = kv.split(':');
+              ReactIntlMeta[k] = v;
+            });
         }
-        pragmaLine
-          .split(pragma)[1]
-          .trim()
-          .split(/\s+/g)
-          .forEach(kv => {
-            const [k, v] = kv.split(':');
-            ReactIntlMeta.set(k, v);
-          });
       },
       JSXOpeningElement(
         path,

packages/babel-plugin-react-intl/test/__snapshots__/index.test.ts.snap

@@ -9,7 +9,7 @@ Object {
       "id": "foo.bar.baz",
     },
   ],
-  "meta": Map {},
+  "meta": Object {},
 }
 `;
 
@@ -84,8 +84,8 @@ Object {
       "id": "escaped.apostrophe",
     },
   ],
-  "meta": Map {
-    "project" => "amazing",
+  "meta": Object {
+    "project": "amazing",
   },
 }
 `;
@@ -197,7 +197,9 @@ Object {
       "id": "foo.bar.baz",
     },
   ],
-  "meta": Map {},
+  "meta": Object {
+    "project": "amazing2",
+  },
 }
 `;
 
@@ -217,6 +219,7 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== \\"function\\") ret
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== \\"object\\" && typeof obj !== \\"function\\") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+// @react-intl project:amazing2
 class Foo extends _react.Component {
   render() {
     return (
@@ -260,7 +263,7 @@ Object {
       "id": "foo.bar.baz",
     },
   ],
-  "meta": Map {},
+  "meta": Object {},
 }
 `;
 
@@ -328,7 +331,7 @@ Object {
       "id": "foo.bar.baz",
     },
   ],
-  "meta": Map {},
+  "meta": Object {},
 }
 `;
 
@@ -382,7 +385,7 @@ Object {
       "id": "foo",
     },
   ],
-  "meta": Map {},
+  "meta": Object {},
 }
 `;
 
@@ -453,7 +456,7 @@ Object {
       "id": "foo",
     },
   ],
-  "meta": Map {},
+  "meta": Object {},
 }
 `;
 

packages/babel-plugin-react-intl/test/fixtures/descriptionsAsObjects/actual.js

@@ -1,6 +1,7 @@
 import React, {Component} from 'react';
 import {FormattedMessage} from 'react-intl';
 
+// @react-intl project:amazing2
 export default class Foo extends Component {
   render() {
     return (