fix(@formatjs/ts-transformer): ignore msgs without id & defaultMessage

formatjs · May 8, 2020 · 903beed · 903beed
1 parent 3b496ea
commit 903beed
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/packages/ts-transformer/src/transform.ts b/packages/ts-transformer/src/transform.ts
@@ -130,10 +130,10 @@ function extractMessageDescriptor(
     }
   });
   // We extracted nothing
-  if (!Object.entries(msg).find(([_, v]) => v)) {
+  if (!msg.defaultMessage && !msg.id) {
     return;
   }
-  if (!msg.id && overrideIdFn) {
+  if (!msg.id && msg.defaultMessage && overrideIdFn) {
     switch (typeof overrideIdFn) {
       case 'string':
         msg.id = interpolateName(

diff --git a/packages/ts-transformer/tests/__snapshots__/index.test.ts.snap b/packages/ts-transformer/tests/__snapshots__/index.test.ts.snap
@@ -183,6 +183,7 @@ class Foo extends react_1.Component {
                 defaultMessage: \\"Hello Nurse!\\"
             }),
             invalid: this.props.intl.formatMessage(objectPointer),
+            invalid2: this.props.intl.formatMessage({ id, defaultMessage, description: 'asd' })
         };
         return (react_1.default.createElement(\\"div\\", null,
             react_1.default.createElement(\\"h1\\", null, msgs.header),
@@ -375,7 +376,7 @@ Object {
     name: intl.formatMessage({
         id: \\"HELLO.undefined.6.undefined\\",
         defaultMessage: \\"layer2\\"
-    })
+    }),
 });
 ",
   "msgs": Array [

diff --git a/packages/ts-transformer/tests/fixtures/extractFromFormatMessage.tsx b/packages/ts-transformer/tests/fixtures/extractFromFormatMessage.tsx
@@ -22,6 +22,11 @@ class Foo extends Component {
         description: 'Another message',
       }),
       invalid: this.props.intl.formatMessage(objectPointer),
+      invalid2: this.props.intl.formatMessage({
+        id,
+        defaultMessage,
+        description: 'asd',
+      }),
     };
 
     return (