From 266bac7af6d92a85cc2218e0fdef99e5af797d71 Mon Sep 17 00:00:00 2001
From: SebastianMC <23032356+SebastianMC@users.noreply.github.com>
Date: Wed, 6 Nov 2024 12:13:32 +0100
Subject: [PATCH] Major refactoring of sorting structures. Unit tests fixes -
 problems were only on the automatically converted unit tests, no in the
 refactored logic. A good sign.

---
 src/test/unit/custom-sort.spec.ts            |  4 +-
 src/test/unit/sorting-spec-processor.spec.ts | 46 +++++++++++++-------
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/test/unit/custom-sort.spec.ts b/src/test/unit/custom-sort.spec.ts
index e51d32f..689f83f 100644
--- a/src/test/unit/custom-sort.spec.ts
+++ b/src/test/unit/custom-sort.spec.ts
@@ -2112,10 +2112,10 @@ describe('determineSortingGroup', () => {
 				groups: [{
 					type: CustomSortGroupType.ExactPrefix,
 					exactPrefix: 'Ref',
-					sorting: { order: CustomSortOrder.standardObsidian,
+					sorting: { order: CustomSortOrder.standardObsidian },
+					secondarySorting: { order: CustomSortOrder.byMetadataFieldAlphabeticalReverse,
 						byMetadata: 'metadata-field-for-sorting'
 					},
-					secondarySorting: { order: CustomSortOrder.byMetadataFieldAlphabeticalReverse },
 				}]
 			}
 			const ctx: Partial<ProcessingContext> = {
diff --git a/src/test/unit/sorting-spec-processor.spec.ts b/src/test/unit/sorting-spec-processor.spec.ts
index 27e38a9..1c611cd 100644
--- a/src/test/unit/sorting-spec-processor.spec.ts
+++ b/src/test/unit/sorting-spec-processor.spec.ts
@@ -8,7 +8,7 @@ import {
 	Date_dd_Mmm_yyyy_NormalizerFn,
 	detectSortingSymbols,
 	escapeRegexUnsafeCharacters,
-	extractSortingSymbol,
+	extractSortingSymbol, FolderPathToSortSpecMap,
 	hasMoreThanOneSortingSymbol,
 	NumberNormalizerFn,
 	RegexpUsedAs,
@@ -1548,8 +1548,10 @@ describe('SortingSpecProcessor', () => {
 		expect(result?.sortSpecByPath).toEqual({
 			"/": {
 				defaultSorting: { order: CustomSortOrder.byCreatedTime, },
-				defaultSecondarySorting: { order: CustomSortOrder.byMetadataFieldAlphabeticalReverse, },
-				byMetadataFieldSecondary: "someMdataFld",
+				defaultSecondarySorting: {
+					order: CustomSortOrder.byMetadataFieldAlphabeticalReverse,
+					byMetadata: "someMdataFld"
+				},
 				groups: [{
 					exactText: "Nothing",
 					sorting: { order: CustomSortOrder.alphabeticalReverse, },
@@ -1571,25 +1573,37 @@ describe('SortingSpecProcessor', () => {
 				}, {
 					combineWithIdx: 4,
 					exactPrefix: "Abc",
-					sorting: { order: CustomSortOrder.byMetadataFieldAlphabetical, },
-					byMetadata: "abc-def",
-					secondarySorting: { order: CustomSortOrder.byMetadataFieldTrueAlphabetical, },
-					byMetadataFieldSecondary: "ghi-jkl1",
+					sorting: {
+						order: CustomSortOrder.byMetadataFieldAlphabetical,
+						byMetadata: "abc-def",
+					},
+					secondarySorting: {
+						order: CustomSortOrder.byMetadataFieldTrueAlphabetical,
+						byMetadata: "ghi-jkl1"
+					},
 					type: CustomSortGroupType.ExactPrefix
 				}, {
 					combineWithIdx: 4,
 					exactSuffix: "Def",
-					sorting: { order: CustomSortOrder.byMetadataFieldAlphabetical, },
-					byMetadata: "abc-def",
-					secondarySorting: { order: CustomSortOrder.byMetadataFieldTrueAlphabetical, },
-					byMetadataFieldSecondary: "ghi-jkl1",
+					sorting: {
+						order: CustomSortOrder.byMetadataFieldAlphabetical,
+						byMetadata: "abc-def",
+					},
+					secondarySorting: {
+						order: CustomSortOrder.byMetadataFieldTrueAlphabetical,
+						byMetadata: "ghi-jkl1"
+					},
 					type: CustomSortGroupType.ExactSuffix
 				}, {
 					combineWithIdx: 4,
-					sorting: { order: CustomSortOrder.byMetadataFieldAlphabetical, },
-					byMetadata: "abc-def",
-					secondarySorting: { order: CustomSortOrder.byMetadataFieldTrueAlphabetical, },
-					byMetadataFieldSecondary: "ghi-jkl1",
+					sorting: {
+						order: CustomSortOrder.byMetadataFieldAlphabetical,
+						byMetadata: "abc-def"
+					},
+					secondarySorting: {
+						order: CustomSortOrder.byMetadataFieldTrueAlphabetical,
+						byMetadata: "ghi-jkl1"
+					},
 					type: CustomSortGroupType.MatchAll
 				}, {
 					exactText: "Unreachable line",
@@ -1600,7 +1614,7 @@ describe('SortingSpecProcessor', () => {
 				outsidersGroupIdx: 8,
 				targetFoldersPaths: ['/']
 			}
-		})
+		} as FolderPathToSortSpecMap)
 		expect(result?.sortSpecByWildcard).toBeUndefined()
 	})
 })