chore: remove needless logic for finding headings in mdast

ivan-lednev · Nov 10, 2024 · 1ee2332 · 1ee2332
1 parent 4dc5211
commit 1ee2332
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 45 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -20,7 +20,7 @@ import {
   fromMarkdown,
   positionContainsPoint,
   sortListsRecursively,
-  sortListsRecursivelyUnderHeading,
+  sortListsRecursivelyInMarkdown,
   toEditorPos,
   toMarkdown,
   toMdastPoint,
@@ -270,11 +270,7 @@ export default class DayPlanner extends Plugin {
             applyScopedUpdates(
               contents,
               this.settings().plannerHeading,
-              (scoped) =>
-                sortListsRecursivelyUnderHeading(
-                  scoped,
-                  this.settings().plannerHeading,
-                ),
+              sortListsRecursivelyInMarkdown,
             )
         : undefined;
 

diff --git a/src/mdast/mdast.ts b/src/mdast/mdast.ts
@@ -27,35 +27,17 @@ export function toMarkdown(nodes: Nodes) {
   );
 }
 
-export function sortListsRecursivelyUnderHeading(
-  contents: string,
-  heading: string,
-) {
-  const mdastRoot = fromMarkdown(contents);
-  const headingWithChildren = findHeadingWithChildren(mdastRoot, heading);
-
-  if (!headingWithChildren) {
-    return contents;
-  }
-
-  const firstNode = headingWithChildren.children.at(0);
-  const lastNode = headingWithChildren.children.at(-1);
-
-  isNotVoid(firstNode?.position?.start?.offset);
-  isNotVoid(lastNode?.position?.end?.offset);
+export function sortListsRecursivelyInMarkdown(contents: string) {
+  const root = fromMarkdown(contents);
 
   const sorted = {
-    ...headingWithChildren,
-    children: headingWithChildren.children.map((child) =>
+    ...root,
+    children: root.children.map((child) =>
       sortListsRecursively(child, compareByTimestampInText),
     ),
   };
 
-  return (
-    contents.substring(0, firstNode.position.start.offset) +
-    toMarkdown(sorted) +
-    contents.substring(lastNode.position.end.offset + 1)
-  );
+  return toMarkdown(sorted);
 }
 
 export function findHeadingWithChildren(

diff --git a/src/service/diff-writer.ts b/src/service/diff-writer.ts
@@ -305,6 +305,9 @@ export function getTaskDiffFromEditState(base: LocalTask[], next: LocalTask[]) {
   );
 }
 
+/**
+ * Turns the changes to a view into a list of updates that can be applied to the vault.
+ */
 export function mapTaskDiffToUpdates(
   diff: ViewDiff,
   mode: EditMode,

diff --git a/tests/diff-writer.test.ts b/tests/diff-writer.test.ts
@@ -7,7 +7,7 @@ import {
 import { vi, test, expect, describe } from "vitest";
 
 import { defaultDayFormat } from "../src/constants";
-import { sortListsRecursivelyUnderHeading } from "../src/mdast/mdast";
+import { sortListsRecursivelyInMarkdown } from "../src/mdast/mdast";
 import {
   applyScopedUpdates,
   createTransaction,
@@ -41,8 +41,9 @@ async function writeDiff(props: {
   diff: ViewDiff;
   files: Array<InMemoryFile>;
   mode: EditMode;
+  afterEach?: (contents: string) => string;
 }) {
-  const { diff, files, mode } = props;
+  const { diff, files, mode, afterEach } = props;
 
   const getTasksApi = () => {
     throw new Error("Can't access tasks API inside tests");
@@ -55,17 +56,7 @@ async function writeDiff(props: {
   const transaction = createTransaction({
     updates,
     settings: defaultSettingsForTests,
-    afterEach: (contents: string) =>
-      applyScopedUpdates(
-        contents,
-        defaultSettingsForTests.plannerHeading,
-        (scoped) =>
-          sortListsRecursivelyUnderHeading(
-            scoped,
-            // todo: remove heading
-            defaultSettingsForTests.plannerHeading,
-          ),
-      ),
+    afterEach,
   });
   const writer = new TransactionWriter(vaultFacade);
 
@@ -281,8 +272,8 @@ describe("From diff to vault", () => {
     expect(vault.getAbstractFileByPath(tomorrowDailynotePath).contents)
       .toBe(`# Day planner
 
-- 00:00 - 00:30 Moved
 - Other
+- 00:00 - 00:30 Moved
 `);
   });
 
@@ -492,7 +483,17 @@ describe("From diff to vault", () => {
         ],
       };
 
-      const { vault } = await writeDiff({ diff, files, mode: EditMode.DRAG });
+      const { vault } = await writeDiff({
+        diff,
+        files,
+        mode: EditMode.DRAG,
+        afterEach: (contents: string) =>
+          applyScopedUpdates(
+            contents,
+            defaultSettingsForTests.plannerHeading,
+            sortListsRecursivelyInMarkdown,
+          ),
+      });
 
       expect(vault.getAbstractFileByPath("2023-01-01.md").contents)
         .toBe(`# Day planner
@@ -545,7 +546,17 @@ describe("From diff to vault", () => {
         ],
       };
 
-      const { vault } = await writeDiff({ diff, files, mode: EditMode.DRAG });
+      const { vault } = await writeDiff({
+        diff,
+        files,
+        mode: EditMode.DRAG,
+        afterEach: (contents: string) =>
+          applyScopedUpdates(
+            contents,
+            defaultSettingsForTests.plannerHeading,
+            sortListsRecursivelyInMarkdown,
+          ),
+      });
 
       expect(vault.getAbstractFileByPath("2023-01-01.md").contents)
         .toBe(`# Day planner