I give up, we use unknown now

Author: mProjectsCode

jsEngine/api/PromptAPI.ts

@@ -1,9 +1,10 @@
 import type { API } from 'jsEngine/api/API';
 import { ButtonStyleType } from 'jsEngine/utils/Util';
 import { SvelteModal } from 'jsEngine/api/prompts/SvelteModal';
-import { ButtonModalComponent } from 'jsEngine/api/prompts/ButtonModalComponent';
+import ButtonModalComponent from 'jsEngine/api/prompts/ButtonModalComponent.svelte';
 import { Suggester } from 'jsEngine/api/prompts/Suggester';
-import { customMount } from 'jsEngine/utils/SvelteUtils';
+import { mount } from 'svelte';
+import type { AnySvelteComponent } from 'jsEngine/utils/SvelteUtils';
 
 export interface ModalPromptOptions {
 	/**
@@ -69,17 +70,19 @@ export class PromptAPI {
 	public button<T>(options: ButtonPromptOptions<T>): Promise<T | undefined> {
 		return new Promise<T | undefined>((resolve, reject) => {
 			try {
-				new SvelteModal(
+				new SvelteModal<AnySvelteComponent, unknown>(
 					this.apiInstance.app,
 					options,
 					(modal, targetEl) => {
-						return customMount<ButtonModalComponent<T>>(ButtonModalComponent, targetEl, {
-							options,
-							modal,
+						return mount(ButtonModalComponent, {
+							target: targetEl,
+							props: {
+								options,
+								modal,
+							},
 						});
 					},
-					// we cast to narrow the type, so that it is inferred correctly
-					resolve as (value: T | undefined) => void,
+					resolve as (value: unknown) => void,
 				).open();
 			} catch (error) {
 				reject(error);

jsEngine/api/prompts/ButtonModalComponent.d.ts

@@ -1,4 +1,4 @@
-<script lang="ts" generics="T">
+<script lang="ts">
 	import type { ButtonPromptOptions } from 'jsEngine/api/PromptAPI';
 	import Button from 'jsEngine/utils/Button.svelte';
 	import type { SvelteModal } from './SvelteModal';
@@ -8,8 +8,8 @@
 		options,
 		modal,
 	}: {
-		options: ButtonPromptOptions<T>;
-		modal: SvelteModal<any, T>;
+		options: ButtonPromptOptions<unknown>;
+		modal: SvelteModal<any, unknown>;
 	} = $props();
 </script>
 

jsEngine/api/prompts/ButtonModalComponent.svelte

@@ -1,18 +1,19 @@
 import { type App, Modal } from 'obsidian';
-import { type Component as SvelteComponent, unmount } from 'svelte';
+import { unmount } from 'svelte';
 import type { ModalPromptOptions } from 'jsEngine/api/PromptAPI';
+import type { AnySvelteComponent, MountedComponent } from 'jsEngine/utils/SvelteUtils';
 
-export class SvelteModal<Component extends SvelteComponent, T> extends Modal {
-	private component: ReturnType<Component> | undefined;
+export class SvelteModal<Component extends AnySvelteComponent, T> extends Modal {
+	private component: MountedComponent<Component> | undefined;
 	private readonly options: ModalPromptOptions;
-	private readonly createComponent: (modal: SvelteModal<Component, T>, targetEl: HTMLElement) => ReturnType<Component>;
+	private readonly createComponent: (modal: SvelteModal<Component, T>, targetEl: HTMLElement) => MountedComponent<Component>;
 	private readonly onSubmit: (value: T | undefined) => void;
 	private submitted: boolean;
 
 	constructor(
 		app: App,
 		options: ModalPromptOptions,
-		createComponent: (modal: SvelteModal<Component, T>, targetEl: HTMLElement) => ReturnType<Component>,
+		createComponent: (modal: SvelteModal<Component, T>, targetEl: HTMLElement) => MountedComponent<Component>,
 		onSubmit: (value: T | undefined) => void,
 	) {
 		super(app);

jsEngine/api/prompts/SvelteModal.ts

@@ -2,8 +2,8 @@ import { type App, Modal } from 'obsidian';
 import type JsEnginePlugin from 'jsEngine/main';
 import ExecutionStatsComponent from 'jsEngine/engine/ExecutionStatsComponent.svelte';
 import { type JsExecution } from 'jsEngine/engine/JsExecution';
-import { unmount } from 'svelte';
-import { customMount, type MountedComponent } from 'jsEngine/utils/SvelteUtils';
+import { mount, unmount } from 'svelte';
+import { type MountedComponent } from 'jsEngine/utils/SvelteUtils';
 
 /**
  * @internal
@@ -37,8 +37,11 @@ export class ExecutionStatsModal extends Modal {
 			return;
 		}
 
-		this.component = customMount(ExecutionStatsComponent, this.contentEl, {
-			execution: this.execution,
+		this.component = mount(ExecutionStatsComponent, {
+			target: this.contentEl,
+			props: {
+				execution: this.execution,
+			},
 		});
 	}
 

jsEngine/engine/ExecutionStatsModal.ts

@@ -8,6 +8,8 @@ export * from './api/Internal';
 export * from './api/LibAPI';
 export * from './api/MarkdownAPI';
 export * from './api/MessageAPI';
+export * from './api/PromptAPI';
+export * from './api/QueryAPI';
 export * from './api/reactive/ReactiveComponent';
 export * from './api/markdown/AbstractMarkdownElement';
 export * from './api/markdown/AbstractMarkdownElementContainer';

jsEngine/index.ts

@@ -1,8 +1,8 @@
 import { type App, Modal } from 'obsidian';
 import type JsEnginePlugin from 'jsEngine/main';
 import MessageDisplayComponent from 'jsEngine/messages/MessageDisplayComponent.svelte';
-import { unmount } from 'svelte';
-import { customMount, type MountedComponent } from 'jsEngine/utils/SvelteUtils';
+import { mount, unmount } from 'svelte';
+import { type MountedComponent } from 'jsEngine/utils/SvelteUtils';
 
 export class MessageDisplay extends Modal {
 	/**
@@ -22,8 +22,11 @@ export class MessageDisplay extends Modal {
 			unmount(this.component);
 		}
 
-		this.component = customMount<MessageDisplayComponent>(MessageDisplayComponent, this.contentEl, {
-			messageManager: this.plugin.messageManager,
+		this.component = mount(MessageDisplayComponent, {
+			target: this.contentEl,
+			props: {
+				messageManager: this.plugin.messageManager,
+			},
 		});
 	}
 

jsEngine/messages/MessageDisplay.ts

@@ -1,19 +1,14 @@
-/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { mount, type Component, type ComponentProps, type SvelteComponent } from 'svelte';
-
-export function customMount<Comp extends Component<any, any> | SvelteComponent>(
-	component: Component<any, any> | SvelteComponent,
-	target: HTMLElement,
-	props: ComponentProps<Comp>,
-): ComponentExports<Comp> {
-	return mount(component as any, { target, props });
-}
+import { type Component, type SvelteComponent } from 'svelte';
 
 export type AnyRecord = Record<string, any>;
 export type UnknownRecord = Record<string, unknown>;
+type IfAny<T, Y, N> = 0 extends 1 & T ? Y : N;
 
 export type ComponentExports<Comp extends Component<any, any> | SvelteComponent> =
-	Comp extends SvelteComponent<any, infer Exports> ? (Exports extends any ? AnyRecord : Exports) : AnyRecord;
+	Comp extends SvelteComponent<any, infer Exports> ? IfAny<Exports, AnyRecord, Exports> : AnyRecord;
 
 export type MountedComponent<Comp extends Component<any, any> | SvelteComponent> = ComponentExports<Comp>;
+
+export type AnySvelteComponent = Component<any, any>;