small changes

Author: mProjectsCode

jsEngine/JsMDRC.ts

@@ -35,12 +35,12 @@ export class JsMDRC extends MarkdownRenderChild {
 	}
 
 	buildExecutionContext(): JsExecutionContext {
-		console.log(this.ctx);
+		// console.log(this.ctx);
 		const file = this.getExecutionFile()!;
 		return {
 			file: file,
 			metadata: this.plugin.app.metadataCache.getFileCache(file),
-			line: 0,
+			block: undefined,
 		};
 	}
 
@@ -108,12 +108,12 @@ export class JsMDRC extends MarkdownRenderChild {
 	}
 
 	async onload(): Promise<void> {
-		console.log('load');
+		// console.log('load');
 
 		await this.render();
 	}
 
 	onunload(): void {
-		console.log('unload');
+		// console.log('unload');
 	}
 }

jsEngine/api/Internal.ts

@@ -1,7 +1,7 @@
 import { type API } from './API';
 import { type EngineExecutionParams } from '../engine/Engine';
-import { type JsExecution } from '../engine/JsExecution';
-import { type Component, TFile } from 'obsidian';
+import { type JsExecution, type JsExecutionContext } from '../engine/JsExecution';
+import { Component, TFile } from 'obsidian';
 import { ResultRenderer } from '../engine/ResultRenderer';
 
 /**
@@ -49,4 +49,37 @@ export class InternalAPI {
 		fullParams.code = await this.apiInstance.app.vault.read(file);
 		return await this.execute(fullParams);
 	}
+
+	/**
+	 * Lead and execute the given file.
+	 * This method also handles the lifetime of the execution.
+	 * The component for the execution is created and destroyed automatically.
+	 *
+	 * @param path
+	 * @param params
+	 */
+	public async executeFileSimple(path: string, params?: Omit<EngineExecutionParams, 'code' | 'component'>): Promise<JsExecution> {
+		const component = new Component();
+		component.load();
+		try {
+			return await this.executeFile(path, { component: component, ...params });
+		} finally {
+			component.unload();
+		}
+	}
+
+	public async getContextForFile(path: string): Promise<JsExecutionContext> {
+		const file = this.apiInstance.app.vault.getAbstractFileByPath(path);
+		if (!file || !(file instanceof TFile)) {
+			throw new Error(`File ${path} not found.`);
+		}
+
+		const metadata = this.apiInstance.app.metadataCache.getFileCache(file);
+
+		return {
+			file: file,
+			metadata: metadata,
+			block: undefined,
+		};
+	}
 }

jsEngine/engine/ExecutionStatsComponent.svelte

@@ -28,10 +28,10 @@
 				</tr>
 			</thead>
 			<tbody>
-				{#each execution.globals as arg (arg.key)}
+				{#each Object.entries(execution.globals) as arg (arg[0])}
 					<tr>
-						<td>{arg.key}</td>
-						<td>{typeof arg.value}</td>
+						<td>{arg[0]}</td>
+						<td>{typeof arg[1]}</td>
 					</tr>
 				{:else}
 					<tr>

jsEngine/engine/JsExecution.ts

@@ -28,7 +28,12 @@ export interface JsExecutionContext {
 	/**
 	 * Currently unused.
 	 */
-	line: number;
+	block: Block | undefined;
+}
+
+export interface Block {
+	from: number;
+	to: number;
 }
 
 /**

jsEngine/engine/ResultRenderer.ts

@@ -45,7 +45,7 @@ export class ResultRenderer {
 		}
 
 		if (value instanceof MarkdownString) {
-			console.log(value.content);
+			console.log('js-engine | Rendering Markdown String\n', value.content);
 			await value.render(this.plugin.app, this.container, this.sourcePath, this.component);
 			return;
 		}

jsEngine/main.ts

@@ -1,4 +1,4 @@
-import { type App, Component, Plugin, type PluginManifest } from 'obsidian';
+import { type App, Plugin, type PluginManifest } from 'obsidian';
 import { JS_ENGINE_DEFAULT_SETTINGS, type JsEnginePluginSettings } from './Settings';
 import { type Mode } from 'codemirror';
 import { JsMDRC } from './JsMDRC';
@@ -40,17 +40,7 @@ export default class JsEnginePlugin extends Plugin {
 			name: 'Execute JS File',
 			callback: () => {
 				new JSFileSelectModal(this, async selected => {
-					const component = new Component();
-					component.load();
-					try {
-						await this.api.internal.executeFile(selected.path, {
-							component: component,
-						});
-					} catch (e) {
-						console.warn(e);
-					} finally {
-						component.unload();
-					}
+					await this.api.internal.executeFileSimple(selected.path);
 				}).open();
 			},
 		});