test(dnd): add tests

Author: ycnmhd

package-lock.json

@@ -17,34 +17,35 @@
         "@codemirror/language": "6.9.1",
         "@commitlint/cli": "17.4.0",
         "@commitlint/config-conventional": "17.4.0",
-        "@popperjs/core": "2.11.8",
         "@tsconfig/svelte": "5.0.2",
         "@types/electron": "1.6.10",
-        "@types/node": "16.11.6",
+        "@types/node": "20.11.24",
         "@types/uniqid": "5.3.4",
-        "@typescript-eslint/eslint-plugin": "7.0.2",
-        "@typescript-eslint/parser": "7.0.2",
+        "@typescript-eslint/eslint-plugin": "7.1.0",
+        "@typescript-eslint/parser": "7.1.0",
         "builtin-modules": "3.3.0",
-        "classnames": "^2.5.1",
-        "esbuild": "0.17.3",
+        "classnames": "2.5.1",
+        "esbuild": "0.20.1",
         "esbuild-plugin-inline-worker": "0.1.1",
         "esbuild-svelte": "0.8.0",
-        "eslint": "8.56.0",
+        "eslint": "8.57.0",
         "eslint-plugin-svelte": "2.35.1",
         "husky": "8.0.3",
-        "lint-staged": "13.1.0",
-        "lucide-svelte": "0.292.0",
+        "lint-staged": "13.3.0",
+        "lucide-svelte": "0.344.0",
         "monkey-around": "3.0.0",
+        "nanoid": "5.0.6",
         "obsidian": "latest",
-        "prettier": "3.0.3",
-        "prettier-plugin-svelte": "3.1.2",
-        "svelte": "4.2.1",
+        "prettier": "3.2.5",
+        "prettier-plugin-svelte": "3.2.2",
+        "svelte": "4.2.12",
         "svelte-eslint-parser": "0.33.1",
-        "svelte-preprocess": "5.0.4",
-        "tslib": "2.4.0",
+        "svelte-preprocess": "5.1.3",
+        "tslib": "2.6.2",
         "typescript": "5.3.3",
-        "vitest": "0.34.5",
-        "nanoid": "5.0.6"
+        "vitest": "1.3.1"
+    },
+    "dependencies": {
+        "jsdom": "^24.0.0"
     }
-
 }

package.json

@@ -8,10 +8,7 @@ export const defaultDocumentState = (): ViewState => ({
             activeBranch: {
                 node: '',
                 group: '',
-                childNodes: new Set<string>(),
                 childGroups: new Set<string>(),
-                parentNodes: new Set<string>(),
-                siblingNodes: new Set<string>(),
                 sortedParentNodes: [],
             },
             dnd: {

src/stores/document/default-document-state.ts

@@ -21,10 +21,7 @@ export type DNDState = {
     node: string;
 };
 export type ActiveBranch = {
-    parentNodes: Set<string>;
-    childNodes: Set<string>;
     childGroups: Set<string>;
-    siblingNodes: Set<string>;
     node: string;
     sortedParentNodes: NodeId[];
     group: string;

src/stores/document/document-type.ts

@@ -17,7 +17,7 @@ const alignBranch = (
     };
     if (nodeId) {
         alignElement(container, nodeId, behavior, localState, 'both');
-        for (const id of state.document.state.activeBranch.parentNodes) {
+        for (const id of state.document.state.activeBranch.sortedParentNodes) {
             alignElement(container, id, behavior, localState);
         }
         for (const id of state.document.state.activeBranch.childGroups) {

src/stores/document/effects/align-branch-effect.ts

@@ -13,7 +13,8 @@ export const saveDocumentEffect = (
             action.type === 'DROP_NODE' ||
             action.type === 'APPLY_SNAPSHOT' ||
             action.type === 'TREE/DELETE_NODE' ||
-            action.type === 'MERGE_NODE'
+            action.type === 'MERGE_NODE' ||
+            action.type === 'MOVE_NODE'
         ) {
             await save(action.type);
         }

src/stores/document/effects/save-document-effect.ts

@@ -3,7 +3,6 @@ import { Columns, NodeId } from 'src/stores/document/document-type';
 export type StringSet = Set<string>;
 export const traverseDown = (
     childGroups: NodeId[],
-    childNodes: StringSet,
     columns: Columns,
     nodeId: NodeId,
     columnIndex = 0,
@@ -14,10 +13,8 @@ export const traverseDown = (
             if (group.parentId === nodeId) {
                 if (!nodeId.startsWith('-r')) childGroups.push(nodeId);
                 for (const childNodeId of group.nodes) {
-                    childNodes.add(childNodeId);
                     traverseDown(
                         childGroups,
-                        childNodes,
                         columns,
                         childNodeId,
                         columnIndex + 1,

src/stores/document/helpers/search/find-siblings.ts

@@ -15,7 +15,7 @@ export const onDragStart = (
     const node = action.payload.nodeId;
     if (node) {
         const childGroups: NodeId[] = [];
-        traverseDown(childGroups, new Set<string>(), columns, node);
+        traverseDown(childGroups, columns, node);
         state.node = action.payload.nodeId;
         state.childGroups = new Set(childGroups);
     }

src/stores/document/helpers/search/traverse-down.ts

@@ -75,10 +75,7 @@ describe('update-active-node', () => {
             ],
             state: {
                 activeBranch: {
-                    parentNodes: new Set([]),
                     childGroups: new Set([]),
-                    childNodes: new Set([]),
-                    siblingNodes: new Set([]),
                     sortedParentNodes: [],
                     node: activeNodeId,
                     group: 'r-lt8upk0k',
@@ -149,24 +146,7 @@ describe('update-active-node', () => {
             ],
             state: {
                 activeBranch: {
-                    parentNodes: new Set([]),
                     childGroups: new Set([activeNodeId, child4]),
-                    childNodes: new Set([
-                        child1,
-                        child2,
-                        child3,
-                        child4,
-                        child4_1,
-                    ]),
-                    siblingNodes: new Set([
-                        'n-lt8upk0u',
-                        'n-lt8upk0v',
-                        'n-lt8upk0z',
-                        'n-lt8upk10',
-                        'n-lt8upk11',
-                        'n-lt8upk12',
-                        'n-lt8upk13',
-                    ]),
                     sortedParentNodes: [],
                     node: activeNodeId,
                     group: 'r-lt8upk0k',