Merge pull request #31 from Filson14/master

Allow to use with custom module

Author: akameco

cli.js

@@ -16,6 +16,7 @@ const cli = meow(
   -d, --default-locale  default locale
   --flat                json [default: true] | yaml [default: false]
   --delimiter           json | yaml [default: .]
+  --module-name         module source name from where components are imported
 
   Example
   $ extract-messages --locales=ja,en --output app/translations 'app/**/*.js'
@@ -46,6 +47,9 @@ const cli = meow(
       delimiter: {
         type: 'string',
         default: '.'
+      },
+      'module-name': {
+        type: 'string'
       }
     }
   }

index.js

@@ -80,15 +80,23 @@ module.exports = async (locales, pattern, buildDir, opts) => {
 
   const ext = isJson(opts.format) ? 'json' : 'yml'
 
-  const { defaultLocale } = opts
+  const { defaultLocale, moduleName } = opts
 
   const delimiter = opts.delimiter ? opts.delimiter : '.'
 
   const oldLocaleMaps = loadLocaleFiles(locales, buildDir, ext, delimiter)
 
-  const newLocaleMaps = await extractReactIntl(locales, pattern, {
-    defaultLocale
-  })
+  const extractorOptions = { defaultLocale }
+
+  if (moduleName) {
+    extractorOptions.moduleSourceName = moduleName
+  }
+
+  const newLocaleMaps = await extractReactIntl(
+    locales,
+    pattern,
+    extractorOptions
+  )
 
   return Promise.all(
     locales.map(locale => {

package.json

@@ -36,7 +36,7 @@
     "messages"
   ],
   "dependencies": {
-    "extract-react-intl": "^0.8.1",
+    "extract-react-intl": "^0.9.0",
     "flat": "^4.1.0",
     "js-yaml": "^3.12.1",
     "load-json-file": "^5.1.0",

readme.md

@@ -93,6 +93,7 @@ $ extract-messages --help
   --flat             json [default: true] | yaml [default: false]
   --default-locale   default locale [default: en]
   --delimiter        json | yaml [default: .]
+  --module-name      module source name from where components are imported [default: react-intl]
 
   Example
   $ extract-messages --locales=ja,en --output app/translations 'app/**/*.js'
@@ -163,6 +164,13 @@ If format is `yaml`, set to `false`.
 Be careful if `false`.
 See [this issue](https://github.com/akameco/extract-react-intl-messages/issues/3).
 
+##### moduleName
+
+Type: `string`<br>
+Default: `react-intl`
+
+Set from where _defineMessages_, `<FormatterMessage />` and `<FormattedHTML />` are imported.
+
 ## Contributors
 
 Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)):

test/fixtures/custom/a/messages.js

@@ -0,0 +1,12 @@
+import { defineMessages } from '../i18n'
+
+export default defineMessages({
+  hello: {
+    id: 'a.custom.hello',
+    defaultMessage: 'hello'
+  },
+  world: {
+    id: 'a.custom.world',
+    defaultMessage: 'world'
+  }
+})

test/fixtures/custom/b/messages.js

@@ -0,0 +1,8 @@
+import { defineMessages } from '../i18n'
+
+export default defineMessages({
+  hello: {
+    id: 'b.custom.message',
+    defaultMessage: 'Message'
+  }
+})

test/fixtures/custom/i18n.js

@@ -0,0 +1 @@
+export { defineMessages } from 'react-intl'

test/json/snapshots/test.js.md

@@ -132,4 +132,39 @@ Generated by [AVA](https://ava.li).
       'c.hello',
       'y.hello',
       'z.hello',
-    ]
+
+## export using custom module
+
+> Snapshot 1
+
+    {
+      'a.custom.hello': 'hello',
+      'a.custom.world': 'world',
+      'b.custom.message': 'Message',
+    }
+
+> Snapshot 2
+
+    {
+      'a.custom.hello': '',
+      'a.custom.world': '',
+      'b.custom.message': '',
+    }
+
+## export using custom module
+
+> Snapshot 1
+
+    {
+      'a.custom.hello': 'hello',
+      'a.custom.world': 'world',
+      'b.custom.message': 'Message',
+    }
+
+> Snapshot 2
+
+    {
+      'a.custom.hello': '',
+      'a.custom.world': '',
+      'b.custom.message': '',
+    }

test/json/snapshots/test.js.snap

@@ -64,3 +64,13 @@ test('delimiter - nest', async t => {
   t.snapshot(en)
   t.snapshot(ja)
 })
+
+test('export using custom module', async t => {
+  const tmp = tempy.directory()
+  const opts = { moduleName: '../i18n' }
+  await m(['en', 'ja'], 'test/fixtures/custom/**/*.js', tmp, opts)
+  const en = JSON.parse(fs.readFileSync(path.resolve(tmp, 'en.json'), 'utf8'))
+  const ja = JSON.parse(fs.readFileSync(path.resolve(tmp, 'ja.json'), 'utf8'))
+  t.snapshot(en)
+  t.snapshot(ja)
+})