changes to move to new branch

franciskafieh · Oct 14, 2024 · 14195ad · 14195ad
1 parent 5f3db7c
commit 14195ad
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 63 deletions.
diff --git a/src/logic/log_note/getFill.ts b/src/logic/log_note/getFill.ts
@@ -1,4 +1,6 @@
+import { Settings } from "../../interfaces/Settings";
 import { Context } from "../../interfaces/context/Context";
+import { TrackedFile } from "../../types";
 
 export function getFill(context: Context) {
 	const settings = context.settings;
@@ -10,7 +12,7 @@ export function getFill(context: Context) {
 	const created = [];
 	const modified = [];
 	const deleted = [];
-	const trackedFiles = settings.trackedFiles;
+	const trackedFiles = getSortedTrackedFiles(settings.trackedFiles, settings);
 	for (const trackedFile of trackedFiles) {
 		if (!trackedFile.matchesCriteria || !trackedFile.path) {
 			continue;
@@ -50,3 +52,15 @@ export function getFill(context: Context) {
 	}
 	return { created, modified, deleted };
 }
+
+// todo
+function getSortedTrackedFiles(
+	nonSorted: TrackedFile[],
+	settings: Settings
+): TrackedFile[] {
+	if (!settings.sortPlaceholder) {
+		return nonSorted;
+	}
+
+	return nonSorted.sort((a, b) => a.path - b);
+}
diff --git a/tests/logic/log_note/getFill.test.ts b/tests/logic/log_note/getFill.test.ts
@@ -282,103 +282,67 @@ describe("getFill should respect sort settings", () => {
 		});
 	});
 
-	// todo way to inject mock ctime for test?
 	const ctimePaths = [
 		{
-			path: "a.md",
+			path: "ctime-10.md",
 			matchesCriteria: true,
 			supposedList: "modified",
 		},
 		{
-			path: "c.md",
+			path: "ctime-1000000000.md",
 			matchesCriteria: true,
 			supposedList: "modified",
 		},
 		{
-			path: "d.md",
+			path: "ctime-5.md",
 			matchesCriteria: true,
 			supposedList: "modified",
 		},
 		{
-			path: "b.md",
+			path: "ctime-1.md",
 			matchesCriteria: true,
 			supposedList: "modified",
 		},
 	];
 
 	it("should sort numerically for ascending ctime built-in placeholder", () => {
-		const settings = builder.setTrackedFiles().build();
+		const settings = builder
+			.setTrackedFiles(ctimePaths as TrackedFile[])
+			.setSortPlaceholder("[[ctime]]")
+			.build();
 
 		const context = createTestContextWithSettings(settings);
 
 		expect(getFill(context)).toEqual({
 			created: [],
-			modified: ["a.md", "b.md", "c.md", "d.md"],
+			modified: [
+				"ctime-1.md",
+				"ctime-5.md",
+				"ctime-10.md",
+				"ctime-1000000000.md",
+			],
 			deleted: [],
 		});
 	});
 
 	it("should sort reverse-numerically for descending ctime built-in placeholder", () => {
-		const settings = builder.setTrackedFiles().build();
+		const settings = builder
+			.setTrackedFiles(ctimePaths as TrackedFile[])
+			.setSortPlaceholder("[[ctime]]")
+			.setSortOrder("desc")
+			.build();
 
 		const context = createTestContextWithSettings(settings);
 
 		expect(getFill(context)).toEqual({
 			created: [],
-			modified: ["a.md", "b.md", "c.md", "d.md"],
+			modified: [
+				"ctime-1000000000.md",
+				"ctime-10.md",
+				"ctime-5.md",
+				"ctime-1.md",
+			],
 			deleted: [],
 		});
 	});
-
-	it("should work with alpha frontmatter", () => {
-		// const settings = builder
-		// 	.setTrackedFiles(alphaPaths as TrackedFile[])
-		// 	.setSortOrder("desc")
-		// 	.build();
-		// const context = createTestContextWithSettings(settings);
-		// expect(getFill(context)).toEqual({
-		// 	created: [],
-		// 	modified: ["d.md", "c.md", "b.md", "a.md"],
-		// 	deleted: [],
-		// });
-	});
-
-	it("should work with numerical frontmatter", () => {
-		// const settings = builder
-		// 	.setTrackedFiles(alphaPaths as TrackedFile[])
-		// 	.setSortOrder("desc")
-		// 	.build();
-		// const context = createTestContextWithSettings(settings);
-		// expect(getFill(context)).toEqual({
-		// 	created: [],
-		// 	modified: ["d.md", "c.md", "b.md", "a.md"],
-		// 	deleted: [],
-		// });
-	});
-
-	it("should not work with boolean frontmatter", () => {
-		// const settings = builder
-		// 	.setTrackedFiles(alphaPaths as TrackedFile[])
-		// 	.setSortOrder("desc")
-		// 	.build();
-		// const context = createTestContextWithSettings(settings);
-		// expect(getFill(context)).toEqual({
-		// 	created: [],
-		// 	modified: ["d.md", "c.md", "b.md", "a.md"],
-		// 	deleted: [],
-		// });
-	});
-
-	it("should not work with any sort of array (tags or frontmatter)", () => {
-		// const settings = builder
-		// 	.setTrackedFiles(alphaPaths as TrackedFile[])
-		// 	.setSortOrder("desc")
-		// 	.build();
-		// const context = createTestContextWithSettings(settings);
-		// expect(getFill(context)).toEqual({
-		// 	created: [],
-		// 	modified: ["d.md", "c.md", "b.md", "a.md"],
-		// 	deleted: [],
-		// });
-	});
 });
diff --git a/tests/stubs/context/fileConverterStub.test.ts b/tests/stubs/context/fileConverterStub.test.ts
@@ -15,7 +15,7 @@ describe("file converter should work as expected", () => {
 		);
 	});
 
-	// improve this maybe? be able to inject this into file converter without having to re-write all the tests
+	// improve this maybe? need a way to inject this into file converter without having to re-write all the tests
 	it("should return file with ctime if special name", () => {
 		expect(fileConverter.fromPath("ctime-10.md")?.stat.ctime).toBe(10);
 	});