Merge branch 'main' into kh/bug-terms

Author: tyrasd

lib/build.js

@@ -9,7 +9,7 @@ import marky from 'marky';
 import { createRequire } from 'module';
 import { compile, toSafeIdentifier } from 'json-schema-to-typescript-lite';
 
-import fetchTranslations, { expandTStrings } from './translations.js';
+import fetchTranslations, { expandTStrings, sortObject } from './translations.js';
 
 const require = createRequire(import.meta.url);
 
@@ -162,6 +162,10 @@ function processData(options, type) {
     shell.rm('-rf', [distDir + '/translations']);
   }
 
+  categories = sortObject(categories);
+  fields = sortObject(fields);
+  presets = sortObject(presets);
+
   fs.writeFileSync(distDir + '/preset_categories.json', JSON.stringify(categories, null, 4));
   fs.writeFileSync(distDir + '/fields.json', JSON.stringify(fields, null, 4));
   fs.writeFileSync(distDir + '/presets.json', JSON.stringify(presets, null, 4));

lib/translations.js

@@ -70,6 +70,18 @@ export function expandTStrings(tstrings) {
   }
 }
 
+/**
+ * Sorts the keys of an object alphabetically
+ * @template {object} T @param {T} original @returns {T}
+ */
+export function sortObject(original) {
+  const sorted = {};
+  for (const k of Object.keys(original).sort()) {
+    sorted[k] = original[k];
+  }
+  return sorted;
+}
+
 function fetchTranslations(options) {
 
   // Transifex doesn't allow anonymous downloading
@@ -164,9 +176,7 @@ function fetchTranslations(options) {
       };
     }
 
-    const keys = Object.keys(dataLocales).sort();
-    let sortedLocales = {};
-    keys.forEach(k => sortedLocales[k] = dataLocales[k]);
+    const sortedLocales = sortObject(dataLocales);
     fs.writeFileSync(`${outDir}/index.json`, JSON.stringify(sortedLocales));
     fs.writeFileSync(`${outDir}/index.min.json`, JSON.stringify(sortedLocales, null, 4));
   }