refactor: getCurrFile

src/API.ts

@@ -19,7 +19,7 @@ import {
 } from "./Utils/HierUtils";
 import { createIndex } from "./Commands/CreateIndex";
 import { refreshIndex } from "./refreshIndex";
-import {getFile} from "./Utils/ObsidianUtils";
+import {getCurrFile} from "./Utils/ObsidianUtils";
 
 export class BCAPI implements BCAPII {
   app: App;
@@ -48,15 +48,15 @@ export class BCAPI implements BCAPII {
     getSubForFields(g, fields);
 
   public dfsAllPaths = (
-    fromNode = getFile()?.basename,
+    fromNode = getCurrFile()?.basename,
     g = this.mainG
   ) => dfsAllPaths(g, fromNode);
 
   public createIndex = (allPaths: string[][], wikilinks = false) =>
     createIndex(allPaths, wikilinks);
 
   public getMatrixNeighbours = (
-    fromNode = getFile()?.basename
+    fromNode = getCurrFile()?.basename
   ) => getMatrixNeighbours(this.plugin, fromNode);
 
   public getOppDir = (dir: Directions) => getOppDir(dir);

src/Commands/CreateIndex.ts

@@ -3,7 +3,7 @@ import { info } from "loglevel";
 import { copy } from "obsidian-community-lib/dist/utils";
 import type BCPlugin from "../main";
 import { dfsAllPaths, getSinks, getSubInDirs } from "../Utils/graphUtils";
-import {getFile, makeWiki} from "../Utils/ObsidianUtils";
+import {getCurrFile, makeWiki} from "../Utils/ObsidianUtils";
 
 /**
  * Returns a copy of `index`, doesn't mutate.
@@ -80,7 +80,7 @@ export function createIndex(
 export async function copyLocalIndex(plugin: BCPlugin) {
   const { settings, closedG } = plugin;
   const { wikilinkIndex } = settings;
-  const { basename } = getFile()
+  const { basename } = getCurrFile()
 
   const onlyDowns = getSubInDirs(closedG, "down");
   const allPaths = dfsAllPaths(onlyDowns, basename);

src/Commands/WriteBCs.ts

@@ -2,11 +2,11 @@ import { warn } from "loglevel";
 import { Notice, TFile } from "obsidian";
 import type BCPlugin from "../main";
 import { getOppFields } from "../Utils/HierUtils";
-import {changeYaml, getFile, splitAtYaml} from "../Utils/ObsidianUtils";
+import {changeYaml, getCurrFile, splitAtYaml} from "../Utils/ObsidianUtils";
 
 export async function writeBCToFile(plugin: BCPlugin, currFile?: TFile) {
   const { app, settings, mainG } = plugin;
-  const file = currFile ?? getFile();
+  const file = currFile ?? getCurrFile();
 
   const { limitWriteBCCheckboxes, writeBCsInline, userHiers } = settings;
 

src/Commands/jumpToFirstDir.ts

@@ -2,11 +2,11 @@ import { Notice } from "obsidian";
 import type { Directions } from "../interfaces";
 import type BCPlugin from "../main";
 import { getRealnImplied } from "../Utils/graphUtils";
-import {getFile} from "../Utils/ObsidianUtils";
+import {getCurrFile} from "../Utils/ObsidianUtils";
 
 export async function jumpToFirstDir(plugin: BCPlugin, dir: Directions) {
   const { limitJumpToFirstFields } = plugin.settings;
-  const file = getFile();
+  const file = getCurrFile();
   if (!file) {
     new Notice("You need to be focussed on a Markdown file");
     return;

src/Commands/threading.ts

@@ -2,7 +2,7 @@ import { App, normalizePath, Notice, TFile } from "obsidian";
 import type { Directions } from "../interfaces";
 import type BCPlugin from "../main";
 import { getFieldInfo, getOppFields } from "../Utils/HierUtils";
-import {createOrUpdateYaml, getFile, splitAtYaml} from "../Utils/ObsidianUtils";
+import {createOrUpdateYaml, getCurrFile, splitAtYaml} from "../Utils/ObsidianUtils";
 
 const resolveThreadingNameTemplate = (
   template: string,
@@ -70,7 +70,7 @@ export async function thread(plugin: BCPlugin, field: string) {
     writeBCsInline,
   } = settings;
 
-  const currFile = getFile();
+  const currFile = getCurrFile();
   if (!currFile) return;
 
   const newFileParent = app.fileManager.getNewFileParent(currFile.path);

src/Components/SideTree.svelte

@@ -15,7 +15,7 @@
   import { dropDendron } from "../Utils/generalUtils";
   import { dfsAllPaths, getSubInDirs } from "../Utils/graphUtils";
   import type TreeView from "../Views/TreeView";
-  import {getFile} from "../Utils/ObsidianUtils";
+  import {getCurrFile} from "../Utils/ObsidianUtils";
 
   export let plugin: BCPlugin;
   export let view: TreeView;
@@ -24,12 +24,12 @@
 
   let dir: Directions = "down";
   let frozen = false;
-  let { basename } = getFile();
+  let { basename } = getCurrFile();
 
   plugin.registerEvent(
     app.workspace.on("active-leaf-change", () => {
       if (frozen) return;
-      basename = getFile()?.basename;
+      basename = getCurrFile()?.basename;
     })
   );
 
@@ -51,7 +51,7 @@
   aria-label-position="left"
   on:click={() => {
     frozen = !frozen;
-    if (!frozen) basename = getFile()?.basename;
+    if (!frozen) basename = getCurrFile()?.basename;
   }}
 >
   {#if frozen}

src/Components/VisComp.svelte

@@ -17,15 +17,15 @@
   import { tidyTree } from "../Visualisations/TidyTree";
   import { treeMap } from "../Visualisations/TreeMap";
   import type { VisModal } from "../Visualisations/VisModal";
-  import {getFile} from "../Utils/ObsidianUtils";
+  import {getCurrFile} from "../Utils/ObsidianUtils";
 
   export let modal: VisModal;
 
   const { app, plugin } = modal;
   const { mainG, settings } = plugin;
   const { visGraph, visRelation, visClosed, visAll } = settings;
 
-  const currFile = getFile();
+  const currFile = getCurrFile();
 
   const selectors = [
     {

src/Utils/ObsidianUtils.ts

@@ -15,7 +15,7 @@ import type { MetaeditApi } from "../interfaces";
 import type BCPlugin from "../main";
 import { splitAndTrim } from "./generalUtils";
 
-export const getFile = (): TFile | null => {
+export const getCurrFile = (): TFile | null => {
   let file = app.workspace.getActiveFile()
   if (!file) {
     file = app.workspace.lastActiveFile
@@ -147,7 +147,7 @@ export async function waitForCache(plugin: BCPlugin) {
     let basename: string;
     while (!basename || !app.plugins.plugins.dataview.api.page(basename)) {
       await wait(100);
-      basename = getFile()?.basename;
+      basename = getCurrFile()?.basename;
     }
   } else {
     await waitForResolvedLinks(app);
@@ -173,7 +173,7 @@ export function isInsideYaml(app: App): boolean | null {
 
   const { editor } = activeLeaf.view;
 
-  const file = getFile();
+  const file = getCurrFile();
   if (!file) return null;
 
   const { frontmatter } = metadataCache.getFileCache(file);

src/Views/MatrixView.ts

@@ -19,7 +19,7 @@ import type {
 import type BCPlugin from "../main";
 import { splitAndTrim } from "../Utils/generalUtils";
 import { getOppDir, getOppFields } from "../Utils/HierUtils";
-import {getDVApi, getFile, linkClass} from "../Utils/ObsidianUtils";
+import {getDVApi, getCurrFile, linkClass} from "../Utils/ObsidianUtils";
 
 export function getMatrixNeighbours(plugin: BCPlugin, currNode: string) {
   const { closedG, settings } = plugin;
@@ -300,7 +300,7 @@ export default class MatrixView extends ItemView {
 
       const { userHiers } = plugin.settings;
 
-      const currFile = getFile();
+      const currFile = getCurrFile();
       if (!currFile) return;
 
       const hierSquares = this.getHierSquares(userHiers, currFile).filter(

src/Visualisations/CirclePacking.ts

@@ -4,7 +4,7 @@ import type { App, TFile } from "obsidian";
 import type { AdjListItem, d3Link, d3Node } from "../interfaces";
 import { bfsAdjList, dfsFlatAdjList, VisModal } from "./VisModal";
 import { openOrSwitch } from "obsidian-community-lib";
-import {getFile} from "../Utils/ObsidianUtils";
+import {getCurrFile} from "../Utils/ObsidianUtils";
 
 export const circlePacking = (
   graph: Graph,
@@ -81,7 +81,7 @@ export const circlePacking = (
   node.attr("aria-label", (d: AdjListItem) => d.name);
 
   const nodeClick = (event: MouseEvent, dest: string) => {
-    const currFile = getFile();
+    const currFile = getCurrFile();
     openOrSwitch(app, dest, event);
     modal.close();
   };