add internal api

Author: mProjectsCode

exampleVault/Test.md

@@ -1,5 +1,5 @@
 ---
-text: taasd
+text: asdadasd
 number: 12234234
 ---
 
@@ -52,6 +52,11 @@ let lib = await engine.importJs("lib.js");
 return lib.getGreeting();
 ```
 
+```js-engine
+let lib = await self.require.import("lib.js");
+return lib.getGreeting();
+```
+
 ```js-engine
 let lib = await engine.importJs("svelte_project/dist/assets/index-9a060cab.js");
 console.log(lib);

src/JsMDRC.ts

@@ -48,63 +48,24 @@ export class JsMDRC extends MarkdownRenderChild {
 		};
 	}
 
-	buildExecutionArgs(container: HTMLElement): ExecutionArgument[] {
-		return [
-			{
-				key: 'component',
-				value: this,
-			},
-			{
-				key: 'container',
-				value: container,
-			},
-		];
-	}
-
-	async tryRun(args: ExecutionArgument[], context: ExecutionContext): Promise<JsExecution> {
-		return this.plugin.jsEngine.execute(this.content, args, context);
+	async tryRun(context: ExecutionContext): Promise<JsExecution> {
+		return this.plugin.jsEngine.execute({
+			code: this.content,
+			context: context,
+			contextOverrides: {},
+			component: this,
+			container: this.containerEl,
+		});
 	}
 
 	async renderResults(container: HTMLElement): Promise<void> {
-		const args = this.buildExecutionArgs(container);
 		const context = this.buildExecutionContext();
-		this.jsExecution = await this.tryRun(args, context);
-		let result = this.jsExecution.result;
-
-		if (!result) {
-			return;
-		}
-
-		if (typeof result === 'string') {
-			container.innerText = result;
-			return;
-		}
 
-		if (result instanceof MarkdownBuilder) {
-			result = result.toMarkdown();
-		}
-
-		if (result instanceof MarkdownString) {
-			console.log(result.content);
-			await result.render(container, this.ctx.sourcePath, this);
-			return;
-		}
+		this.jsExecution = await this.tryRun(context);
+		const result = this.jsExecution.result;
 
-		if (result instanceof HTMLElement) {
-			container.append(result);
-		}
-
-		if (result instanceof MessageWrapper) {
-			new MessageComponent({
-				target: container,
-				props: {
-					messageWrapper: result,
-					messageManager: this.plugin.messageManager,
-					showDeleteButton: false,
-					showMessageSource: false,
-				},
-			});
-		}
+		const renderer = new ResultRenderer(this.plugin, container, this.ctx.sourcePath, this);
+		await renderer.render(result);
 	}
 
 	renderExecutionStats(container: HTMLElement): void {

src/api/Internal.ts

@@ -0,0 +1,24 @@
+import { API } from "./API";
+import { EngineExecutionParams } from "../jsEngine/JsEngine";
+import { JsExecution } from "../jsEngine/JsExecution";
+import { Component } from "obsidian";
+import { ResultRenderer } from "../ResultRenderer";
+
+/**
+ * The internal API provides access to some of js engines internals.
+ */
+export class InternalAPI {
+	private readonly apiInstance: API;
+
+	constructor(apiInstance: API) {
+		this.apiInstance = apiInstance;
+	}
+
+	public async excute(params: EngineExecutionParams): Promise<JsExecution> {
+		return await this.apiInstance.plugin.jsEngine.execute(params);
+	}
+
+	public createRenderer(container: HTMLElement, sourcePath: string, component: Component): ResultRenderer {
+		return new ResultRenderer(this.apiInstance.plugin, container, sourcePath, component);
+	}
+}

src/jsEngine/JsEngine.ts

@@ -1,9 +1,11 @@
 import JsEnginePlugin from '../main';
 import { App } from 'obsidian';
 import { ExecutionArgument, ExecutionContext } from '../ArgumentManager';
-import { JsExecution } from './JsExecution';
+import { JsExecution, JsExecutionParams } from "./JsExecution";
 import { ExecutionStatsModal } from './ExecutionStatsModal';
 
+export type EngineExecutionParams = Omit<JsExecutionParams, 'app' | 'plugin'>
+
 export class JsEngine {
 	private readonly app: App;
 	private readonly plugin: JsEnginePlugin;
@@ -19,8 +21,8 @@ export class JsEngine {
 		this.activeExecutions = new Map<string, JsExecution>();
 	}
 
-	async execute(code: string, args: ExecutionArgument[], context: ExecutionContext): Promise<JsExecution> {
-		const execution = new JsExecution(this.app, this.plugin, code, args, context);
+	async execute(params: EngineExecutionParams): Promise<JsExecution> {
+		const execution = new JsExecution({app: this.app, plugin: this.plugin, ...params});
 		this.activeExecutions.set(execution.uuid, execution);
 
 		execution.buildFunction();

src/jsEngine/JsExecution.ts

@@ -1,20 +1,31 @@
-import { App } from 'obsidian';
+import { App, Component } from "obsidian";
 import JsEnginePlugin from '../main';
 import { ExecutionArgument, ExecutionContext } from '../ArgumentManager';
 import { MessageType, MessageWrapper } from '../messages/MessageManager';
 import { API } from '../api/API';
 import { InstanceId, InstanceType } from '../api/InstanceId';
+import { Obj } from "tern";
 
 const AsyncFunction = async function (): Promise<void> {}.constructor;
 
+export interface JsExecutionParams {
+	app: App;
+	plugin: JsEnginePlugin;
+	code: string;
+	component: Component;
+	container?: HTMLElement | undefined;
+	context?: ExecutionContext | undefined;
+	contextOverrides?: Record<string, unknown> | undefined;
+}
+
 export class JsExecution {
 	readonly app: App;
 	readonly plugin: JsEnginePlugin;
 
 	uuid: string;
 	code: string;
 	args: ExecutionArgument[];
-	context: ExecutionContext | undefined;
+	context: ExecutionContext & Record<string, unknown>;
 	apiInstance: API;
 	messages: MessageWrapper[];
 
@@ -27,12 +38,12 @@ export class JsExecution {
 	functionBuildTime: number | undefined;
 	functionRunTime: number | undefined;
 
-	constructor(app: App, plugin: JsEnginePlugin, code: string, args: ExecutionArgument[], context?: ExecutionContext) {
-		this.app = app;
-		this.plugin = plugin;
+	constructor(params: JsExecutionParams) {
+		this.app = params.app;
+		this.plugin = params.plugin;
 
-		this.code = code;
-		this.context = context;
+		this.code = params.code;
+		this.context = Object.assign({}, params.context, params.contextOverrides);
 
 		this.uuid = self.crypto.randomUUID();
 		this.apiInstance = new API(this.app, this.plugin, new InstanceId(InstanceType.JS_EXECUTION, this.uuid));
@@ -53,7 +64,14 @@ export class JsExecution {
 				key: 'context',
 				value: this.context,
 			},
-			...args,
+			{
+				key: 'component',
+				value: params.component,
+			},
+			{
+				key: 'container',
+				value: params.container,
+			},
 		];
 	}