Add --sort-when-not-flat option as keys were not sorted in flat mode

akameco · Feb 27, 2020 · 7260b69 · 7260b69
1 parent c997462
commit 7260b69
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/cli.js b/cli.js
@@ -15,6 +15,7 @@ const cli = meow(
   -f, --format          json | yaml [default: json]
   -d, --default-locale  default locale
   --flat                json [default: true] | yaml [default: false]
+  --sort-when-not-flat  keys are sorted even when flat option is false [default: false]
 
   Example
   $ extract-messages --locales=ja,en --output app/translations 'app/**/*.js'
@@ -25,6 +26,9 @@ const cli = meow(
       flat: {
         type: 'boolean'
       },
+      'sort-when-not-flat': {
+        type: 'boolean'
+      },
       output: {
         type: 'string',
         alias: 'o'

diff --git a/src/index.ts b/src/index.ts
@@ -61,6 +61,7 @@ type Opts = {
   defaultLocale: string
   format?: string
   flat?: boolean
+  sortWhenNotFlat?: boolean
   [key: string]: unknown
 }
 
@@ -72,6 +73,7 @@ const extractMessage = async (
   {
     format = 'json',
     flat = isJson(format),
+    sortWhenNotFlat = false,
     defaultLocale = 'en',
     ...opts
   }: Opts = {
@@ -121,6 +123,8 @@ const extractMessage = async (
 
       const fomattedLocaleMap: object = flat
         ? sortKeys(localeMap, { deep: true })
+        : sortWhenNotFlat
+        ? sortKeys(unflatten(localeMap, { object: true }), { deep: true })
         : unflatten(sortKeys(localeMap), { object: true })
 
       const fn = isJson(format) ? writeJson : writeYaml