Merge pull request #3 from SectorLabs/sort-object-keys

Sort keys for messages and metadata
SectorLabs · Oct 17, 2018 · e115539 · e115539
2 parents 829c1e7 + 88bf9d2
commit e115539
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/dist/lingui-multi.js b/dist/lingui-multi.js
@@ -93,11 +93,11 @@ const extractCatalogs = (packageFile, packageObject, localesDir, locales) => {
 
     const minimalCatalog = Object.assign(createMinimalCatalog(complexCatalog), loadMinimalCatalogBypassErrors(localesDir, locale))
 
-    writeMinimalCatalog(minimalCatalog, localesDir, locale)
+    writeMinimalCatalog(sortObjectKeys(minimalCatalog), localesDir, locale)
 
     // Write metadata catalog only to source locale directory
     if (locale === options.sourceLocale) {
-      writeMetadataCatalog(complexCatalog, localesDir, locale)
+      writeMetadataCatalog(sortObjectKeys(complexCatalog), localesDir, locale)
     }
 
     console.info(`${locale} ${Object.keys(minimalCatalog).length}`)
@@ -266,6 +266,14 @@ const _getJsonFilePath = (directory, locale, suffix = '') => {
   return jsonFile
 }
 
+const sortObjectKeys = (obj) => {
+  const sortedObj = {};
+  Object.keys(obj).sort().forEach(function(key) {
+    sortedObj[key] = obj[key];
+  });
+  return sortedObj;
+}
+
 const createMinimalCatalog = (complexCatalog) =>
   Object.keys(complexCatalog)
     .reduce((final, key) => Object.assign(final, {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sector-labs/lingui-multi",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "Command line utility to compile multiple catalogs from a single js-lingui messages.json file.",
   "repository": {
     "url": "git+ssh://github.com/SectorLabs/lingui-multi.git",