oh types where art though

dominikg · dominikg · commit 9d2f7550bd5d · 2025-05-05T14:40:31.000+02:00
diff --git a/packages/svelte/src/toolbar/configure.js b/packages/svelte/src/toolbar/configure.js
@@ -1,6 +1,6 @@
 /**
  * toolbar config
- * @type {import('./public.d.ts').Config}
+ * @type {import('./public.d.ts').ResolvedConfig}
  */
 const config = {
 	tools: []
@@ -12,24 +12,27 @@ const config = {
 export function configure(options) {
 	for (const [key, value] of Object.entries(options)) {
 		if (key === 'tools') {
-			for (let tool of /** @type {import('./public.d.ts').Config.tools[0][]}*/ value) {
-				if(typeof tool === 'function') {
-					tool = tool(); // TODO lazy init?
-				}
-				/** @type {import('./public.d.ts').Tool}*/
-				const existing = config.tools.find((t) => t.name === tool.name);
-				if (existing) {
-					for (const [k, v] of Object.entries(tool)) {
-						existing[k] = v;
-					}
-				} else {
-					config.tools.push(tool);
-				}
-			}
+			continue
 		} else {
+			// @ts-expect-error index access
 			config[key] = value;
 		}
 	}
+	if(options.tools) {
+		for (let tool of options.tools) {
+			/** @type {import('./public.d.ts').Tool} */
+			const resolved_tool = typeof tool === 'function' ? tool() : tool;
+			const existing = config.tools.find((t) => t.name === resolved_tool.name);
+			if (existing) {
+				for (const [k, v] of Object.entries(tool)) {
+					// @ts-expect-error index access
+					existing[k] = v;
+				}
+			} else {
+				config.tools.push(resolved_tool);
+			}
+		}
+	}
 }
 
 /**
diff --git a/packages/svelte/src/toolbar/public.d.ts b/packages/svelte/src/toolbar/public.d.ts
@@ -14,3 +14,7 @@ export interface Config {
 	position?: 'top' | 'bottom';
 	tools?: (Tool | ToolFn)[];
 }
+
+export interface ResolvedConfig extends Config {
+	tools: Tool[]
+}
diff --git a/packages/svelte/src/toolbar/runtime.js b/packages/svelte/src/toolbar/runtime.js
@@ -1,19 +1,17 @@
 import ToolBar from './ToolBar.svelte';
 import { mount } from 'svelte';
-function create_toolbar_host() {
-	const id = 'svelte-toolbar-host';
-	if (document.getElementById(id) != null) {
-		console.debug('svelte-toolbar-host already exists, skipping');
-		return;
-	}
-	const el = document.createElement('div');
-	el.setAttribute('id', id);
-	// appending to documentElement adds it outside of body
-	document.documentElement.appendChild(el);
-	return el;
-}
+
 export function mountUI() {
-	if (typeof window !== 'undefined') {
-		mount(ToolBar, { target: create_toolbar_host() });
+	if(typeof window !== 'undefined') {
+		const id = 'svelte-toolbar-host';
+		if (document.getElementById(id) != null) {
+			console.debug('svelte-toolbar-host already exists, skipping');
+			return
+		}
+		const el = document.createElement('div');
+		el.setAttribute('id', id);
+		// appending to documentElement adds it outside of body
+		document.documentElement.appendChild(el);
+		mount(ToolBar, { target: el });
 	}
 }
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
@@ -2563,6 +2563,10 @@ declare module 'svelte/toolbar' {
 		position?: 'top' | 'bottom';
 		tools?: (Tool | ToolFn)[];
 	}
+
+	export interface ResolvedConfig extends Config {
+		tools: Tool[]
+	}
 	export function configure(options: Partial<Config>): void;
 
 	export function getConfig(): Config;

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,7 @@ export interface Config {`
`14`	`14`	`position?: 'top' \| 'bottom';`
`15`	`15`	`tools?: (Tool \| ToolFn)[];`
`16`	`16`	`}`
	`17`	`+`
	`18`	`+export interface ResolvedConfig extends Config {`
	`19`	`+ tools: Tool[]`
	`20`	`+}`