Merge branch 'release'

Author: mProjectsCode

exampleVault/Advanced Example/Note 1.md

@@ -53,7 +53,7 @@ mdBuilder.createTable(
 	["Quest", "Completed", "Started On", "Completed On"],
 	quests.map(x => [
 		x.name,
-		x.removed !== -1 ? "[x]" : "[ ]",
+		x.removed !== -1 ? "☑" : "☐",
 		x.added,
 		x.removed !== -1 ? x.removed : "", 
 	])

exampleVault/Advanced Example/Note 2.md

@@ -54,7 +54,7 @@ mdBuilder.createTable(
 	["Quest", "Completed", "Started On", "Completed On"],
 	quests.map(x => [
 		x.name,
-		x.removed !== -1 ? "[x]" : "[ ]",
+		x.removed !== -1 ? "☑" : "☐",
 		x.added,
 		x.removed !== -1 ? x.removed : "", 
 	])

exampleVault/Advanced Example/Note 3.md

@@ -54,7 +54,7 @@ mdBuilder.createTable(
 	["Quest", "Completed", "Started On", "Completed On"],
 	quests.map(x => [
 		x.name,
-		x.removed !== -1 ? "[x]" : "[ ]",
+		x.removed !== -1 ? "☑" : "☐",
 		x.added,
 		x.removed !== -1 ? x.removed : "", 
 	])

exampleVault/Test.md

@@ -1,5 +1,5 @@
 ---
-text: asdadasd
+text: asdakdbg
 number: 12234234
 ---
 
@@ -15,6 +15,8 @@ return engine.markdown.create(a);
 ```
 Some more text
 
+# Big Markdown Chunk
+
 ```js-engine
 let markdownBuilder = engine.markdown.createBuilder()
 
@@ -84,3 +86,40 @@ component.addChild(inputField)
 component.addChild(inputField2)
 ```
 
+# Reactive Idea (TODO)
+
+```js
+// define a function that takes in some args and returns what should be rendered
+function render(args) {
+	return 'Something';
+}
+
+// create a reactive component, passing in the function and arguments for the initial render
+const reactive = engine.reactive(render, initialArgs);
+
+// subscribe to events and call refresh with new arguments, which causes the render function to be rerun with these arguments, replacing the existing content
+event.on('...', (args) => reactive.refresh(args));
+
+// return the reactive component
+return reactive;
+```
+
+```js-engine
+
+function render(args) {
+	console.log(args)
+	return args?.text ?? "undefined";
+}
+
+const reactive = engine.reactive(render, context.metadata.frontmatter);
+
+const unloadCb = engine.app.metadataCache.on('changed', async (file, data, cache) => { 
+	if (file.path === context.file.path) { 
+		reactive.refresh(cache.frontmatter);
+	}
+}); 
+
+component.registerEvent(unloadCb);
+
+return reactive;
+```

exampleVault/dv.js

@@ -0,0 +1,77 @@
+const indexNotes = dv.pages('"IndexNotes"');
+const mainNotes = dv.pages('"MainNotes"');
+
+console.log(indexNotes, mainNotes);
+
+let error = '';
+
+let mainNotesArr = mainNotes.map(x => ({
+	splitFileName: x.file.name.split('-'),
+	file: x.file,
+}));
+
+let mainNoteTree = {
+	type: 'root',
+	groups: {},
+	children: {},
+};
+
+for (const mainNote of mainNotesArr) {
+	if (mainNoteTree.groups[mainNote.splitFileName[0]] === undefined) {
+		mainNoteTree.groups[mainNote.splitFileName[0]] = [mainNote];
+	} else {
+		mainNoteTree.groups[mainNote.splitFileName[0]].push(mainNote);
+	}
+}
+
+for (const [key, value] of Object.entries(mainNoteTree.groups)) {
+	value.sort((a, b) => a.splitFileName.length - b.splitFileName.length);
+
+	let subtree = {
+		type: 'subtree',
+		file: undefined,
+		fileName: key,
+		fileNameParts: [],
+		children: {},
+	}
+
+	for (const v of value) {
+		// we skip the first note
+		if (v.splitFileName.length === 1) {
+			subtree.file = v.file;
+			continue;
+		}
+
+		let parent = subtree;
+
+		for (let i = 1; i < v.splitFileName.length - 1; i++) {
+			parent = parent.children[v.splitFileName[i]];
+		}
+
+		parent.children[v.splitFileName[v.splitFileName.length - 1]] = {
+			type: 'subtree',
+			file: v.file,
+			fileName: key,
+			fileNameParts: v.splitFileName.splice(1),
+			children: {},
+		}
+	}
+
+	mainNoteTree.children[key] = subtree;
+}
+
+console.log(mainNoteTree);
+
+const selectedFileName = "Plugins";
+
+const selectedIndexNote = indexNotes.find(x => x.file.name === selectedFileName);
+
+const selectedIndexNoteLinks = selectedIndexNote.file.link;
+
+
+console.log(selectedIndexNoteLinks);
+
+
+
+
+

exampleVault/test.js

@@ -0,0 +1,17 @@
+// Step 1: Get Prompts
+const title = await tp.system.prompt("Enter Site Name");
+const parentLocation = await tp.system.prompt("Enter Parent Location");
+
+const parentFile = app.vault.getAbstractFileByPath("3. Gazetteer/1. Settlements/" + parentLocation + "/" + parentLocation + ".md");
+const parentFileCache = await app.metadataCache.getFileCache(parentFile);
+
+// Step 2: Change Frontmatter
+await app.fileManager.processFrontMatter(tp.config.target_file, (frontmatter) => { 
+	frontmatter.Location = parentLocation; 
+	frontmatter.LocationHex = parentFileCache.LocationHex;
+});
+
+
+// Step 3: Move and Rename
+await tp.file.move("3. Gazetteer/1. Settlements/" + parentLocation + "/" + title);
+

src/JsMDRC.ts

@@ -7,6 +7,7 @@ import { MessageWrapper } from './messages/MessageManager';
 import MessageComponent from './messages/MessageComponent.svelte';
 
 import { JsExecution } from './jsEngine/JsExecution';
+import { ResultRenderer } from './ResultRenderer';
 
 export class JsMDRC extends MarkdownRenderChild {
 	plugin: JsEnginePlugin;

src/ResultRenderer.ts

@@ -0,0 +1,65 @@
+import { MarkdownBuilder } from './api/markdown/MarkdownBuilder';
+import { MarkdownString } from './api/markdown/MarkdownString';
+import { MessageWrapper } from './messages/MessageManager';
+import MessageComponent from './messages/MessageComponent.svelte';
+import { Component } from 'obsidian';
+import JsEnginePlugin from './main';
+import { ReactiveComponent } from './api/reactive/ReactiveComponent';
+
+export class ResultRenderer {
+	readonly plugin: JsEnginePlugin;
+	readonly container: HTMLElement;
+	readonly sourcePath: string;
+	readonly component: Component;
+
+	constructor(plugin: JsEnginePlugin, container: HTMLElement, sourcePath: string, component: Component) {
+		this.plugin = plugin;
+		this.container = container;
+		this.sourcePath = sourcePath;
+		this.component = component;
+	}
+
+	public async render(content: unknown): Promise<void> {
+		if (content == null) {
+			return;
+		}
+
+		this.container.empty();
+
+		if (typeof content === 'string') {
+			this.container.innerText = content;
+			return;
+		}
+
+		if (content instanceof MarkdownBuilder) {
+			content = content.toMarkdown();
+		}
+
+		if (content instanceof MarkdownString) {
+			console.log(content.content);
+			await content.render(this.container, this.sourcePath, this.component);
+			return;
+		}
+
+		if (content instanceof HTMLElement) {
+			this.container.append(content);
+		}
+
+		if (content instanceof MessageWrapper) {
+			new MessageComponent({
+				target: this.container,
+				props: {
+					messageWrapper: content,
+					messageManager: this.plugin.messageManager,
+					showDeleteButton: false,
+					showMessageSource: false,
+				},
+			});
+		}
+
+		if (content instanceof ReactiveComponent) {
+			content.setRenderer(this);
+			content.initialRender();
+		}
+	}
+}

src/api/API.ts

@@ -3,6 +3,7 @@ import { App, Plugin } from 'obsidian';
 import JsEnginePlugin from '../main';
 import { InstanceId } from './InstanceId';
 import { MessageAPI } from './MessageAPI';
+import { ReactiveComponent, ReactiveRenderFunction } from './reactive/ReactiveComponent';
 
 export class API {
 	/**
@@ -56,4 +57,8 @@ export class API {
 	public getPlugin(pluginId: string): Plugin {
 		return this.app.plugins.getPlugin(pluginId);
 	}
+
+	public reactive(fn: ReactiveRenderFunction, ...initialArgs: any[]): ReactiveComponent {
+		return new ReactiveComponent(fn, initialArgs);
+	}
 }

src/api/reactive/ReactiveComponent.ts

@@ -0,0 +1,26 @@
+import { ResultRenderer } from '../../ResultRenderer';
+
+export type ReactiveRenderFunction = (...args: any[]) => unknown;
+
+export class ReactiveComponent {
+	readonly _render: ReactiveRenderFunction;
+	readonly initialArgs: any[];
+	renderer: ResultRenderer | undefined;
+
+	constructor(_render: ReactiveRenderFunction, initialArgs: any[]) {
+		this._render = _render;
+		this.initialArgs = initialArgs;
+	}
+
+	public refresh(...args: any[]): void {
+		this.renderer?.render(this._render(...args));
+	}
+
+	public initialRender(): void {
+		this.refresh(...this.initialArgs);
+	}
+
+	public setRenderer(renderer: ResultRenderer): void {
+		this.renderer = renderer;
+	}
+}