From 5fd01864f1f9ead2b583c79de4ce3a25da6e2450 Mon Sep 17 00:00:00 2001
From: Panagiotis Bakatselos <github@pmpak.com>
Date: Tue, 28 Nov 2023 11:38:47 +0100
Subject: [PATCH] fix: Fix alphabetical order of extracted keys (#35)

Addresses the issue when the `--sort` flag is used, where keys with
lowercase characters were incorrectly positioned at the bottom of
the file after keys with uppercase characters, breaking the alphabetical
order.

Closes #15
---
 .../sort-by-key.post-processor.ts             |  3 +-
 .../sort-by-key.post-processor.spec.ts        | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/post-processors/sort-by-key.post-processor.ts b/src/post-processors/sort-by-key.post-processor.ts
index 459a12de..6786b521 100644
--- a/src/post-processors/sort-by-key.post-processor.ts
+++ b/src/post-processors/sort-by-key.post-processor.ts
@@ -5,6 +5,7 @@ export class SortByKeyPostProcessor implements PostProcessorInterface {
 	public name: string = 'SortByKey';
 
 	public process(draft: TranslationCollection, extracted: TranslationCollection, existing: TranslationCollection): TranslationCollection {
-		return draft.sort();
+		const compareFn = new Intl.Collator('en', {sensitivity: 'base'}).compare;
+		return draft.sort(compareFn);
 	}
 }
diff --git a/tests/post-processors/sort-by-key.post-processor.spec.ts b/tests/post-processors/sort-by-key.post-processor.spec.ts
index 98287ada..a023a86a 100644
--- a/tests/post-processors/sort-by-key.post-processor.spec.ts
+++ b/tests/post-processors/sort-by-key.post-processor.spec.ts
@@ -28,4 +28,40 @@ describe('SortByKeyPostProcessor', () => {
 			z: {value: 'last value', sourceFiles: []}
 		});
 	});
+
+	it('should perform case insensitive sorting', () => {
+		const collection = new TranslationCollection({
+			c: { value: 'letter c', sourceFiles: [] },
+			j: { value: 'letter j', sourceFiles: [] },
+			b: { value: 'letter b', sourceFiles: [] },
+			a: { value: 'letter a', sourceFiles: [] },
+			h: { value: 'letter h', sourceFiles: [] },
+			B: { value: 'letter B', sourceFiles: [] },
+			H: { value: 'letter H', sourceFiles: [] },
+			i: { value: 'letter i', sourceFiles: [] },
+			C: { value: 'letter C', sourceFiles: [] },
+			e: { value: 'letter e', sourceFiles: [] },
+			f: { value: 'letter f', sourceFiles: [] },
+			d: { value: 'letter d', sourceFiles: [] },
+			A: { value: 'letter A', sourceFiles: [] },
+			g: { value: 'letter g', sourceFiles: [] }
+		});
+
+		expect(processor.process(collection, new TranslationCollection(), new TranslationCollection()).values).to.deep.equal({
+			A: { value: 'letter A', sourceFiles: [] },
+			a: { value: 'letter a', sourceFiles: [] },
+			B: { value: 'letter B', sourceFiles: [] },
+			b: { value: 'letter b', sourceFiles: [] },
+			c: { value: 'letter c', sourceFiles: [] },
+			C: { value: 'letter C', sourceFiles: [] },
+			d: { value: 'letter d', sourceFiles: [] },
+			e: { value: 'letter e', sourceFiles: [] },
+			f: { value: 'letter f', sourceFiles: [] },
+			g: { value: 'letter g', sourceFiles: [] },
+			H: { value: 'letter H', sourceFiles: [] },
+			h: { value: 'letter h', sourceFiles: [] },
+			i: { value: 'letter i', sourceFiles: [] },
+			j: { value: 'letter j', sourceFiles: [] }
+		});
+	});
 });