fix: Backlinks will no longer disappear in preview upon editing

dendronhq · Mar 24, 2022 · 8646744 · 8646744
1 parent 91a4d15
commit 8646744
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 79 deletions.
diff --git a/packages/engine-server/src/enginev2.ts b/packages/engine-server/src/enginev2.ts
@@ -169,6 +169,9 @@ export class DendronEngineV2 implements DEngine {
     this.renderedCache = createRenderedCache(this.config, this.logger);
   }
 
+  /**
+   * TODO: Fix backlinks not being updated when adding new reference to another note or renaming old reference
+   */
   async getLinks(
     opts: Optional<GetLinksRequest, "ws">
   ): Promise<GetNoteLinksPayload> {
@@ -190,7 +193,8 @@ export class DendronEngineV2 implements DEngine {
       default:
         assertUnreachable(type);
     }
-    return { data: links, error: null };
+    const backlinks = note.links.filter((link) => link.type === "backlink");
+    return { data: links.concat(backlinks), error: null };
   }
 
   async getAnchors(opts: GetAnchorsRequest): Promise<GetNoteAnchorsPayload> {

diff --git a/packages/engine-server/src/markdown/remark/utils.ts b/packages/engine-server/src/markdown/remark/utils.ts
@@ -378,9 +378,7 @@ export class LinkUtils {
   }
   /**
    * Get all links from the note body
-   * Currently, just look for wiki links and keep existing backlinks
-   *
-   * TODO: Fix backlinks not being updated when adding new reference to another note or renaming old reference
+   * Currently, just look for wiki links
    *
    * @param opts.filter - {type, loc
    *
@@ -412,8 +410,7 @@ export class LinkUtils {
       filter: { loc: filter?.loc },
       note,
     });
-    const backlinks = note.links.filter((link) => link.type === "backlink");
-    return links.concat(backlinks);
+    return links;
   }
 
   static findHashTags({ links }: { links: DLink[] }) {

diff --git a/...ne-test-utils/src/__tests__/engine-server/markdown/__snapshots__/remarkUtils.spec.ts.snap b/...ne-test-utils/src/__tests__/engine-server/markdown/__snapshots__/remarkUtils.spec.ts.snap
@@ -70,32 +70,7 @@ Array [
 ]
 `;
 
-exports[`RemarkUtils and LinkUtils findLinks backlink 1`] = `
-Array [
-  Object {
-    "alias": undefined,
-    "from": Object {
-      "fname": "simple-note-ref",
-      "vaultName": "vault1",
-    },
-    "position": Position {
-      "end": Object {
-        "column": 25,
-        "line": 1,
-        "offset": 24,
-      },
-      "indent": Array [],
-      "start": Object {
-        "column": 1,
-        "line": 1,
-        "offset": 0,
-      },
-    },
-    "type": "backlink",
-    "value": "simple-note-ref.one",
-  },
-]
-`;
+exports[`RemarkUtils and LinkUtils findLinks backlink 1`] = `Array []`;
 
 exports[`RemarkUtils and LinkUtils findLinks empty link 1`] = `Array []`;
 
@@ -231,28 +206,6 @@ Array [
     "value": "foo.two",
     "xvault": false,
   },
-  Object {
-    "alias": undefined,
-    "from": Object {
-      "fname": "foo",
-      "vaultName": "vault1",
-    },
-    "position": Position {
-      "end": Object {
-        "column": 13,
-        "line": 1,
-        "offset": 12,
-      },
-      "indent": Array [],
-      "start": Object {
-        "column": 1,
-        "line": 1,
-        "offset": 0,
-      },
-    },
-    "type": "backlink",
-    "value": "foo.one",
-  },
 ]
 `;
 

diff --git a/packages/engine-test-utils/src/__tests__/engine-server/markdown/remarkUtils.spec.ts b/packages/engine-test-utils/src/__tests__/engine-server/markdown/remarkUtils.spec.ts
@@ -220,21 +220,6 @@ describe("RemarkUtils and LinkUtils", () => {
       }
     );
 
-    testWithEngine(
-      "backlink",
-      async ({ engine }) => {
-        const note = engine.notes["simple-note-ref.one"];
-        const links = LinkUtils.findLinks({ note, engine });
-        expect(links).toMatchSnapshot();
-        expect(links[0].from?.fname).toEqual("simple-note-ref");
-      },
-      {
-        preSetupHook: async (opts) => {
-          await ENGINE_HOOKS.setupRefs(opts);
-        },
-      }
-    );
-
     testWithEngine(
       "xvault link",
       async ({ engine }) => {
@@ -311,16 +296,6 @@ describe("RemarkUtils and LinkUtils", () => {
             },
             target: links[1],
           });
-          checkLink({
-            src: {
-              from: {
-                fname: "foo",
-                vaultName: "vault1",
-              },
-              type: "backlink",
-            },
-            target: links[2],
-          });
         },
         {
           expect,