gtx-cli 2.5.24 → 2.5.25

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 2.5.25
+
+### Patch Changes
+
+- [#876](https://github.com/generaltranslation/gt/pull/876) [`28bd6d5`](https://github.com/generaltranslation/gt/commit/28bd6d5f1ed50658da2e3adc5b59a40804b00b02) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Adding experimental alphabetical sort for JSONs with locales as keys
+
 ## 2.5.24
 
 ### Patch Changes

package/dist/formats/json/mergeJson.js

@@ -207,16 +207,10 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
     return [JSON.stringify(mergedJson, null, 2)];
 }
 function sortByLocaleOrder(items, sourceObjectOptions, localeOrder, sourceObjectPointer, defaultLocale) {
-    if (sourceObjectOptions.experimentalSort !== 'locales' ||
-        !localeOrder.length ||
-        !sourceObjectOptions.key) {
+    const sortMode = sourceObjectOptions.experimentalSort;
+    if (!sortMode || !sourceObjectOptions.key) {
         return items;
     }
-    const orderedLocaleList = [
-        defaultLocale,
-        ...localeOrder.filter((locale) => locale !== defaultLocale),
-    ];
-    const localeOrderValues = orderedLocaleList.map((locale) => getIdentifyingLocaleProperty(locale, sourceObjectPointer, sourceObjectOptions));
     const itemsWithLocale = items.map((item) => {
         let localeValue;
         try {
@@ -237,21 +231,56 @@ function sortByLocaleOrder(items, sourceObjectOptions, localeOrder, sourceObject
         }
         return { item, localeValue };
     });
-    const orderedItems = [];
-    const remainingItems = [...itemsWithLocale];
-    for (const localeValue of localeOrderValues) {
-        for (let i = 0; i < remainingItems.length;) {
-            const entry = remainingItems[i];
-            if (entry.localeValue === localeValue) {
-                orderedItems.push(entry.item);
-                remainingItems.splice(i, 1);
+    if (sortMode === 'locales') {
+        if (!localeOrder.length) {
+            return items;
+        }
+        const orderedLocaleList = [
+            defaultLocale,
+            ...localeOrder.filter((locale) => locale !== defaultLocale),
+        ];
+        const localeOrderValues = orderedLocaleList.map((locale) => getIdentifyingLocaleProperty(locale, sourceObjectPointer, sourceObjectOptions));
+        const orderedItems = [];
+        const remainingItems = [...itemsWithLocale];
+        for (const localeValue of localeOrderValues) {
+            for (let i = 0; i < remainingItems.length;) {
+                const entry = remainingItems[i];
+                if (entry.localeValue === localeValue) {
+                    orderedItems.push(entry.item);
+                    remainingItems.splice(i, 1);
+                    continue;
+                }
+                i += 1;
+            }
+        }
+        remainingItems.forEach((entry) => orderedItems.push(entry.item));
+        return orderedItems;
+    }
+    if (sortMode === 'localesAlphabetical') {
+        const defaultLocaleValue = getIdentifyingLocaleProperty(defaultLocale, sourceObjectPointer, sourceObjectOptions);
+        const defaultItems = [];
+        const sortableItems = [];
+        const remainingItems = [];
+        for (const entry of itemsWithLocale) {
+            if (entry.localeValue === defaultLocaleValue) {
+                defaultItems.push(entry);
+                continue;
+            }
+            if (entry.localeValue) {
+                sortableItems.push(entry);
                 continue;
             }
-            i += 1;
+            remainingItems.push(entry);
         }
+        sortableItems.sort((a, b) => {
+            if (!a.localeValue || !b.localeValue) {
+                return 0;
+            }
+            return a.localeValue.localeCompare(b.localeValue);
+        });
+        return [...defaultItems, ...sortableItems, ...remainingItems].map((entry) => entry.item);
     }
-    remainingItems.forEach((entry) => orderedItems.push(entry.item));
-    return orderedItems;
+    return items;
 }
 /**
  * Apply transformations to the sourceItem in-place

package/dist/types/index.d.ts

@@ -208,7 +208,7 @@ export type SourceObjectOptions = {
     key?: string;
     localeProperty?: string;
     transform?: TransformOptions;
-    experimentalSort?: 'locales';
+    experimentalSort?: 'locales' | 'localesAlphabetical';
 };
 export type TransformOptions = {
     [transformPath: string]: TransformOption;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "2.5.24",
+  "version": "2.5.25",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [