fix(DownView): 🐛 Don't depend on Create Index > make wikilinks setting

SkepticMystic · Nov 30, 2021 · 61c9770 · 61c9770
1 parent 6e1147f
commit 61c9770
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/src/Components/Down.svelte b/src/Components/Down.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { info } from "loglevel";
   import {
     hoverPreview,
     isInVault,
@@ -36,13 +37,13 @@
     const down = getSubInDirs(closed, "down");
 
     const allPaths = dfsAllPaths(down, basename);
-    const index = plugin.createIndex(allPaths);
-    console.log({ allPaths, index, down: down.inspect() });
+    const index = plugin.createIndex(allPaths, false);
+    info({ allPaths, index });
 
-    lines = index.split("\n").map((line) => line.split("- ")) as [
-      string,
-      string
-    ][];
+    lines = index
+      .split("\n")
+      .map((line) => line.split("- "))
+      .filter((pair) => pair.length > 1) as [string, string][];
   }
 </script>
 

diff --git a/src/Components/Stats.svelte b/src/Components/Stats.svelte
@@ -23,20 +23,21 @@
     nodesToo = true
   ) {
     const gInfo = hierData[dir][gType];
+    const { wikilinkIndex } = settings;
 
     if (nodesToo) {
       gInfo.nodes = gInfo.graph.nodes();
       gInfo.nodesStr = gInfo.nodes
-        .map((n) => makeWiki(settings.wikilinkIndex, n))
+        .map((n) => makeWiki(n, wikilinkIndex))
         .join("\n");
     }
 
     gInfo.edges = gInfo.graph.edges();
     const edgeStrArr = gInfo.graph.mapEdges(
       (k, a, s, t) =>
-        `${makeWiki(settings.wikilinkIndex, nodesToo ? s : t)} ${
+        `${makeWiki(nodesToo ? s : t, wikilinkIndex)} ${
           ARROW_DIRECTIONS[dir]
-        } ${makeWiki(settings.wikilinkIndex, nodesToo ? t : s)}`
+        } ${makeWiki(nodesToo ? t : s, wikilinkIndex)}`
     );
     gInfo.edgesStr = edgeStrArr.join("\n");
   }

diff --git a/src/main.ts b/src/main.ts
@@ -1147,9 +1147,11 @@ export default class BCPlugin extends Plugin {
 
   // !SECTION OneSource
 
-  createIndex(allPaths: string[][]): string {
+  createIndex(
+    allPaths: string[][],
+    asWikilinks: boolean = this.settings.wikilinkIndex
+  ): string {
     let index = "";
-    const { wikilinkIndex, aliasesInIndex } = this.settings;
     const copy = cloneDeep(allPaths);
     const reversed = copy.map((path) => path.reverse());
     reversed.forEach((path) => path.shift());
@@ -1171,10 +1173,9 @@ export default class BCPlugin extends Plugin {
         ) {
           continue;
         } else {
-          index += `${indent.repeat(depth)}- ${makeWiki(
-            wikilinkIndex,
-            currNode
-          )}`;
+          index += `${indent.repeat(depth)}- ${
+            asWikilinks ? makeWiki(currNode) : currNode
+          }`;
 
           index += "\n";
 

diff --git a/src/sharedFunctions.ts b/src/sharedFunctions.ts
@@ -134,7 +134,7 @@ export function complement<T>(A: T[], B: T[]) {
   return A.filter((a) => !B.includes(a));
 }
 
-export function makeWiki(wikiQ: boolean, str: string) {
+export function makeWiki(str: string, wikiQ = true) {
   let copy = str.slice();
   if (wikiQ) {
     copy = "[[" + copy;