update deps; update types

Author: mProjectsCode

JsEngine.d.ts

@@ -158,11 +158,10 @@ declare module 'jsEngine/messages/MessageManager' {
 }
 declare module 'jsEngine/settings/StartupScriptModal' {
 	import type JsEnginePlugin from 'jsEngine/main';
-	import StartupScripts from 'jsEngine/settings/StartupScripts.svelte';
 	import { Modal } from 'obsidian';
 	export class StartupScriptsModal extends Modal {
-		plugin: JsEnginePlugin;
-		component?: ReturnType<typeof StartupScripts>;
+		private readonly plugin;
+		private component?;
 		constructor(plugin: JsEnginePlugin);
 		onOpen(): void;
 		onClose(): void;
@@ -194,7 +193,8 @@ declare module 'jsEngine/api/markdown/MarkdownElementType' {
 }
 declare module 'jsEngine/api/markdown/MarkdownString' {
 	import type { API } from 'jsEngine/api/API';
-	import type { App, Component } from 'obsidian';
+	import type { Component } from 'obsidian';
+	import { App } from 'obsidian';
 	/**
 	 * A string that should be rendered as markdown by the plugin.
 	 */
@@ -689,6 +689,7 @@ declare module 'jsEngine/utils/Validators' {
 	import { z } from 'zod';
 	export function schemaForType<T>(): <S extends z.ZodType<T, any, any>>(arg: S) => S;
 	export function validateAPIArgs<T>(validator: z.ZodType<T>, args: T): void;
+	export function zodFunction<T extends Function>(): z.ZodCustom<T, T>;
 	export class Validators {
 		htmlElement: z.ZodType<HTMLElement, any, any>;
 		voidFunction: z.ZodType<() => void, any, any>;
@@ -1417,6 +1418,10 @@ declare module 'jsEngine/engine/JsExecution' {
 	}
 	export interface JSFileExecutionContext {
 		executionSource: ExecutionSource.JSFile;
+		/**
+		 * There is no associated markdown file.
+		 */
+		file: undefined;
 		/**
 		 * The JS that is being executed.
 		 */

bun.lockb

@@ -79,6 +79,7 @@ export class InternalAPI {
 		return await this.execute({
 			context: {
 				executionSource: ExecutionSource.JSFile,
+				file: undefined,
 				jsFile: file,
 			},
 			...params,
@@ -212,6 +213,7 @@ export class InternalAPI {
 
 		return {
 			executionSource: ExecutionSource.JSFile,
+			file: undefined,
 			jsFile: file,
 		};
 	}

jsEngine/api/Internal.ts

@@ -1,5 +1,5 @@
 import type { API } from 'jsEngine/api/API';
-import { validateAPIArgs } from 'jsEngine/utils/Validators';
+import { validateAPIArgs, zodFunction } from 'jsEngine/utils/Validators';
 import type { CachedMetadata, TFile } from 'obsidian';
 import { getAllTags } from 'obsidian';
 import { z } from 'zod';
@@ -27,7 +27,7 @@ export class QueryAPI {
 	 * ```
 	 */
 	public files<T>(query: (file: TFile) => T | undefined): T[] {
-		validateAPIArgs(z.object({ query: z.function().args(this.apiInstance.validators.tFile).returns(z.unknown()) }), { query });
+		validateAPIArgs(z.object({ query: zodFunction() }), { query });
 
 		return this.apiInstance.app.vault
 			.getMarkdownFiles()
@@ -47,10 +47,7 @@ export class QueryAPI {
 	public filesWithMetadata<T>(query: (file: TFile, cache: CachedMetadata | undefined, tags: string[], frontmatterTags: string[]) => T | undefined): T[] {
 		validateAPIArgs(
 			z.object({
-				query: z
-					.function()
-					.args(this.apiInstance.validators.tFile, this.apiInstance.validators.cachedMetadata.optional(), z.string().array(), z.string().array())
-					.returns(z.unknown()),
+				query: zodFunction(),
 			}),
 			{ query },
 		);

jsEngine/api/QueryAPI.ts

@@ -1,6 +1,7 @@
 import type { API } from 'jsEngine/api/API';
 import { validateAPIArgs } from 'jsEngine/utils/Validators';
-import type { App, Component } from 'obsidian';
+import type { Component } from 'obsidian';
+import { App } from 'obsidian';
 import { MarkdownRenderer } from 'obsidian';
 import { z } from 'zod';
 
@@ -22,7 +23,7 @@ export class MarkdownString {
 	async render(app: App, element: HTMLElement, sourcePath: string, component: Component): Promise<void> {
 		validateAPIArgs(
 			z.object({
-				app: z.object({}),
+				app: z.instanceof(App),
 				element: this.apiInstance.validators.htmlElement,
 				sourcePath: z.string(),
 				component: this.apiInstance.validators.component,

jsEngine/api/markdown/MarkdownString.ts

@@ -42,7 +42,7 @@ export class SvelteModal<Component extends AnySvelteComponent, T> extends Modal
 		}
 
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 		this.contentEl.empty();
 	}

jsEngine/api/prompts/SvelteModal.ts

@@ -26,7 +26,7 @@ export class ExecutionStatsModal extends Modal {
 	public onOpen(): void {
 		this.contentEl.empty();
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 
 		if (!this.contentEl.hasClass('js-engine-execution-stats-modal')) {
@@ -49,7 +49,7 @@ export class ExecutionStatsModal extends Modal {
 	public onClose(): void {
 		this.contentEl.empty();
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 	}
 }

jsEngine/engine/ExecutionStatsModal.ts

@@ -74,6 +74,10 @@ export interface MarkdownOtherExecutionContext {
 
 export interface JSFileExecutionContext {
 	executionSource: ExecutionSource.JSFile;
+	/**
+	 * There is no associated markdown file.
+	 */
+	file: undefined;
 	/**
 	 * The JS that is being executed.
 	 */

jsEngine/engine/JsExecution.ts

@@ -68,7 +68,7 @@ export class ResultRenderer {
 			});
 
 			this.component.register(() => {
-				unmount(svelteComponent);
+				void unmount(svelteComponent);
 			});
 			return;
 		}

jsEngine/engine/ResultRenderer.ts

@@ -20,7 +20,7 @@ export class MessageDisplay extends Modal {
 	public onOpen(): void {
 		this.contentEl.empty();
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 
 		this.component = mount(MessageDisplayComponent, {
@@ -34,7 +34,7 @@ export class MessageDisplay extends Modal {
 	public onClose(): void {
 		this.contentEl.empty();
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 	}
 }