Merge pull request #8 from GreenArron/master

Fix missing imports with custom types

Author: drPilman

README.md

@@ -1,5 +1,7 @@
 # Obsidian Nested tags graph Plugin
 
+> **Note**: this is a fork from [drPilman's addon](https://github.com/drPilman/obsidian-graph-nested-tags) updated to work with new obsidian versions, inspired by code from [folders2graph](https://github.com/ratibus11/folders2graph). 
+
 This is a plugin for [Obsidian](https://obsidian.md).
 
 Links nested tags (Sub_tag->Tag) in graph view:
@@ -12,10 +14,10 @@ Links nested tags (Sub_tag->Tag) in graph view:
 4. Profit!!!
 
 
-[obsidian forum feature request](https://forum.obsidian.md/t/view-structure-of-nested-tags-on-graph/11386/22)
+[Original Obsidian forum feature request](https://forum.obsidian.md/t/view-structure-of-nested-tags-on-graph/11386/22)
 
 > Caution! At the moment, there is no Obsidian API for working with the graph. So I did a bit of reverse engineering and found this method. Since this is not part of the public API, I have no confidence that this will work on newer versions.
 
 ## Manually installing the plugin
 
--   Copy over `main.js`, `manifest.json` to your vault `VaultFolder/.obsidian/plugins/graph-nested-tags/`.
+-   Go to releases, copy over `main.js`, `manifest.json` to your vault `VaultFolder/.obsidian/plugins/graph-nested-tags/`.

esbuild.config.mjs

@@ -15,7 +15,7 @@ const context = await esbuild.context({
 	banner: {
 		js: banner,
 	},
-	entryPoints: ["main.ts"],
+	entryPoints: ["src/main.ts"],
 	bundle: true,
 	external: [
 		"obsidian",

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "graph-nested-tags",
 	"name": "Nested tags graph",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"minAppVersion": "0.15.0",
 	"description": "Links nested tags in graph view",
 	"author": "drpilman",

package-lock.json

@@ -1,8 +1,8 @@
 {
 	"name": "graph-nested-tags",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"description": "Links nested tags in graph view",
-	"main": "main.js",
+	"main": "src/main.js",
 	"scripts": {
 		"dev": "node esbuild.config.mjs",
 		"build": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production",

package.json

@@ -0,0 +1,10 @@
+import { WorkspaceLeaf } from "obsidian";
+import { LeafRenderer } from "./LeafRenderer";
+
+type CustomLeaf = {
+	view: {
+		renderer: LeafRenderer;
+	};
+};
+
+export type GraphLeafWithCustomRenderer = WorkspaceLeaf & CustomLeaf;

src/interfaces/GraphLeafWithCustomRenderer.ts

@@ -0,0 +1,4 @@
+export type LeafRenderer = {
+	setData: Function;
+	originalSetData?: Function;
+};

src/interfaces/LeafRenderer.ts

@@ -1,15 +1,18 @@
 import { Plugin } from "obsidian";
-import { GraphLeaf } from "types";
+import { GraphLeafWithCustomRenderer } from "./interfaces/GraphLeafWithCustomRenderer";
+
 
 export default class GraphNestedTagsPlugin extends Plugin {
-	// At nodes changes graphLeaf.view.renderer.setData calls, so we need to step in and change links.
-	inject_setData(graphLeaf: GraphLeaf) {
-		const r = graphLeaf.view.renderer;
+	// inject our own wrapper around graphLeaf.view.renderer.setData
+	// which will manipulate add tag -> subtag hierarchy  
+	inject_setData(graphLeaf: GraphLeafWithCustomRenderer) {
+		const leafRenderer = graphLeaf.view.renderer;
 
-		if (!r._setData) {
-			r._setData = r.setData;
+		if (leafRenderer.originalSetData == undefined) {
+			leafRenderer.originalSetData = leafRenderer.setData;
 		}
-		r.setData = (data: any) => {
+
+		leafRenderer.setData = (data: any) => {
 			const nodes = data.nodes;
 			let parent;
 			let last_tag: string;
@@ -30,7 +33,7 @@ export default class GraphNestedTagsPlugin extends Plugin {
 					}
 				}
 			}
-			return r._setData?.(data);
+			return leafRenderer.originalSetData?.(data);
 		};
 		return graphLeaf;
 	}
@@ -43,9 +46,9 @@ export default class GraphNestedTagsPlugin extends Plugin {
 					"graph"
 				)) {
 					if (
-						(leaf as GraphLeaf).view.renderer._setData === undefined
+						(leaf as GraphLeafWithCustomRenderer).view.renderer.originalSetData === undefined
 					) {
-						this.inject_setData(leaf as GraphLeaf);
+						this.inject_setData(leaf as GraphLeafWithCustomRenderer);
 					}
 				}
 			})
@@ -58,13 +61,13 @@ export default class GraphNestedTagsPlugin extends Plugin {
 	}
 
 	onunload() {
-		// undone injections and reload the Graphs
+		// undo injections and reload the Graphs
 		for (const leaf of this.app.workspace.getLeavesOfType(
 			"graph"
-		) as GraphLeaf[]) {
-			if (leaf.view.renderer._setData) {
-				leaf.view.renderer.setData = leaf.view.renderer._setData;
-				delete leaf.view.renderer._setData;
+		) as GraphLeafWithCustomRenderer[]) {
+			if (leaf.view.renderer.originalSetData) {
+				leaf.view.renderer.setData = leaf.view.renderer.originalSetData;
+				delete leaf.view.renderer.originalSetData;
 				leaf.view.unload();
 				leaf.view.load();
 			}
@@ -74,4 +77,4 @@ export default class GraphNestedTagsPlugin extends Plugin {
 	async loadSettings() {}
 
 	async saveSettings() {}
-}
+}

main.ts renamed to src/main.ts

@@ -1,5 +1,6 @@
 {
 	"1.0.0": "0.15.0",
 	"1.0.1": "0.15.0",
-	"1.0.2": "0.15.0"
+	"1.0.2": "0.15.0",
+	"1.0.3": "0.15.0"
 }