Fix errors

Author: polyipseity

assets/locales/en/asset.json

@@ -75,7 +75,7 @@
 		"platforms": {
 			"darwin-icon": "terminal:macos",
 			"linux-icon": "terminal:linux",
-			"win32-icon": "terminal:windows"
+			"win32-icon": "grid-2x2"
 		},
 		"profile-icon": "$t(asset:generic.terminal-alt-icon)",
 		"profile-types": {

sources/icons.ts

@@ -2,14 +2,13 @@ import {
 	UnnamespacedID,
 	registerIcon,
 } from "@polyipseity/obsidian-plugin-library"
-import { siLinux, siMacos, siWindows } from "simple-icons"
+import { siLinux, siMacos } from "simple-icons"
 import type { TerminalPlugin } from "./main.js"
 
 export function loadIcons(context: TerminalPlugin): void {
 	for (const [key, value] of Object.entries({
 		linux: siLinux,
 		macos: siMacos,
-		windows: siWindows,
 	})) {
 		registerIcon(
 			context,

sources/patch.ts

@@ -192,7 +192,6 @@ export class EarlyPatchManager extends ResourceComponent<EarlyPatch> {
 
 	public constructor(
 		protected readonly app: App,
-		// eslint-disable-next-line @typescript-eslint/no-magic-numbers
 		protected readonly options?: Parameters<typeof earlyPatch>[1],
 	) { super() }
 
@@ -217,6 +216,7 @@ function patchRequire(
 	const { settings } = context
 	return around(self0, {
 		require(next) {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 			return function fn(
 				this: typeof self0 | undefined,
 				...args: Parameters<typeof next>
@@ -228,7 +228,7 @@ function patchRequire(
 					/* @__PURE__ */ self0.console.debug(error)
 					return dynamicRequireSync(new Map(), ...args)
 				}
-			} as NodeRequire
+			} as NodeJS.Require
 		},
 		toString: aroundIdentityFactory(),
 	})

sources/settings-data.ts

@@ -217,7 +217,8 @@ export namespace Settings {
 				profile,
 			})
 		}
-		export type Platforms<T extends string> = { readonly [_ in T]?: boolean }
+		export type Platforms<T extends string> =
+			Readonly<Partial<Record<T, boolean>>>
 		interface Base {
 			readonly type: Type
 			readonly name: string
@@ -304,7 +305,7 @@ export namespace Settings {
 					V extends Platforms<Vs[number]>,
 					const Vs extends ReadonlyTuple<string>,
 				>(defaults: V, from: Unchecked<V>, set: Vs): Platforms<Vs[number]> => {
-					const ret2: { [_ in Vs[number]]?: boolean } = {}
+					const ret2: Partial<Record<Vs[number], boolean>> = {}
 					for (const platform0 of set) {
 						const platform: Vs[number] = platform0
 						if (!(platform in from)) { continue }
@@ -641,6 +642,7 @@ export namespace Settings {
 						: ((): ILinkHandler => {
 							const unc2 = launderUnchecked<ILinkHandler>(unc.linkHandler),
 								ret = {
+									// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 									activate: fixTyped(
 										DEFAULT_LINK_HANDLER,
 										unc2,
@@ -653,12 +655,14 @@ export namespace Settings {
 										"allowNonHttpProtocols",
 										["undefined", "boolean"],
 									),
+									// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 									hover: fixTyped(
 										DEFAULT_LINK_HANDLER,
 										unc2,
 										"hover",
 										["undefined", "function"],
 									) as ILinkHandler["hover"],
+									// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 									leave: fixTyped(
 										DEFAULT_LINK_HANDLER,
 										unc2,
@@ -682,30 +686,35 @@ export namespace Settings {
 						: ((): ILogger => {
 							const unc2 = launderUnchecked<ILogger>(unc.logger),
 								ret = {
+									// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 									debug: fixTyped(
 										DEFAULT_LOGGER,
 										unc2,
 										"debug",
 										["function"],
 									) as ILogger["debug"],
+									// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 									error: fixTyped(
 										DEFAULT_LOGGER,
 										unc2,
 										"error",
 										["function"],
 									) as ILogger["error"],
+									// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 									info: fixTyped(
 										DEFAULT_LOGGER,
 										unc2,
 										"info",
 										["function"],
 									) as ILogger["info"],
+									// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 									trace: fixTyped(
 										DEFAULT_LOGGER,
 										unc2,
 										"trace",
 										["function"],
 									) as ILogger["trace"],
+									// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 									warn: fixTyped(
 										DEFAULT_LOGGER,
 										unc2,

sources/terminal/emulator-addons.ts

@@ -15,6 +15,7 @@ export class DisposerAddon extends Functions implements ITerminalAddon {
 		super({ async: false, settled: true }, ...args)
 	}
 
+	// eslint-disable-next-line @typescript-eslint/class-methods-use-this
 	public activate(_terminal: Terminal): void {
 		// Noop
 	}

sources/terminal/profile-presets.ts

@@ -70,14 +70,14 @@ export interface ProfilePresets0 {
 	readonly wslIntegrated: Settings.Profile.Integrated
 	readonly zshIntegrated: Settings.Profile.Integrated
 }
-type ExternalDefaults = {
-	readonly [_ in `${Pseudoterminal.SupportedPlatforms[number]
-	}ExternalDefault`]: Settings.Profile.External
-}
-type IntegratedDefaults = {
-	readonly [_ in `${Pseudoterminal.SupportedPlatforms[number]
-	}IntegratedDefault`]: Settings.Profile.Integrated
-}
+type ExternalDefaults = Readonly<
+Record<`${Pseudoterminal.SupportedPlatforms[number]
+	}ExternalDefault`, Settings.Profile.External>
+	>
+type IntegratedDefaults = Readonly<
+Record<`${Pseudoterminal.SupportedPlatforms[number]
+	}IntegratedDefault`, Settings.Profile.Integrated>
+>
 export interface ProfilePresets
 	extends ProfilePresets0, ExternalDefaults, IntegratedDefaults { }
 const PROFILE_PRESETS0 = deepFreeze({

sources/terminal/pseudoterminal.ts

@@ -40,6 +40,7 @@ import {
 	remove,
 	replaceAllRegex,
 	sleep2,
+	toJSONOrString,
 	typedKeys,
 } from "@polyipseity/obsidian-plugin-library"
 import type { IMarker, Terminal } from "@xterm/xterm"
@@ -118,7 +119,7 @@ export class RefPsuedoterminal<T extends Pseudoterminal,
 		}
 		this.delegate.onExit.then(
 			async ret => { (await this.#exit).resolve(ret) },
-			async error => { (await this.#exit).reject(error) },
+			async (error: unknown) => { (await this.#exit).reject(error) },
 		)
 		++this.#ref[0]
 	}
@@ -981,7 +982,7 @@ class UnixPseudoterminal implements Pseudoterminal {
 		const [shell, stream2] = await Promise.all([this.shell, stream]),
 			cmdio = shell.stdio[UnixPseudoterminal.#cmdio]
 		if (!(cmdio instanceof stream2.Writable)) {
-			throw new TypeError(String(cmdio))
+			throw new TypeError(toJSONOrString(cmdio))
 		}
 		await writePromise(cmdio, `${columns}x${rows}\n`)
 	}

sources/terminal/util.ts

@@ -247,7 +247,8 @@ export class TerminalTextArea implements IDisposable {
 					datum !== void 0;
 					datum = data0.shift()) {
 					const { cursorX, cursorY } = active,
-						lineWidth = this.#widths[cursorY] ?? 0,
+						// eslint-disable-next-line no-multi-assign
+						lineWidth = this.#widths[cursorY] ??= 0,
 						line = active.getLine(cursorY)
 					switch (datum) {
 						case "": break

sources/terminal/view.ts

@@ -20,7 +20,6 @@ import {
 	consumeEvent,
 	createChildElement,
 	deepFreeze,
-	destroyWithOutro,
 	dynamicRequire,
 	extname,
 	fixTyped,
@@ -61,6 +60,7 @@ import {
 	openProfile,
 } from "./profile-properties.js"
 import { cloneDeep, noop } from "lodash-es"
+import { mount, unmount } from "svelte"
 import { BUNDLE } from "../import.js"
 import type { DeepWritable } from "ts-essentials"
 import type { LigaturesAddon } from "@xterm/addon-ligatures"
@@ -258,7 +258,7 @@ export class TerminalView extends ItemView {
 	protected readonly focusedScope = new Scope()
 	#title0 = ""
 	#emulator0: TerminalView.EMULATOR | null = null
-	#find0: FindComponent | null = null
+	#find0: ReturnType<typeof FindComponent> | null = null
 	#state = TerminalView.State.DEFAULT
 
 	public constructor(
@@ -303,7 +303,7 @@ export class TerminalView extends ItemView {
 		return this.#emulator0
 	}
 
-	get #find(): FindComponent | null {
+	get #find(): ReturnType<typeof FindComponent> | null {
 		return this.#find0
 	}
 
@@ -368,8 +368,13 @@ export class TerminalView extends ItemView {
 		this.#emulator0 = val
 	}
 
-	set #find(val: FindComponent | null) {
-		if (this.#find) { destroyWithOutro(this.#find) }
+	set #find(val: ReturnType<typeof FindComponent> | null) {
+		if (this.#find) {
+			unmount(this.#find, { outro: true })
+				.catch((error: unknown) => {
+					activeSelf(this.contentEl).console.warn(error)
+				})
+		}
 		this.#find0 = val
 	}
 
@@ -498,7 +503,7 @@ export class TerminalView extends ItemView {
 
 		this.register(language.onChangeLanguage.listen(() => {
 			updateView(context, this)
-			this.#find?.$set({ i18n: i18n.t })
+			this.#find?.setI18n(i18n.t)
 		}))
 
 		this.register(() => { keymap.popScope(scope) })
@@ -564,11 +569,11 @@ export class TerminalView extends ItemView {
 						/* @__PURE__ */ activeSelf(contentEl).console.debug(error)
 						empty = true
 					}
-					if (empty) { this.#find?.$set({ results: "" }) }
+					if (empty) { this.#find?.setResults("") }
 				},
 				optional: { anchor?: Element } = {}
 			assignExact(optional, "anchor", contentEl.firstElementChild ?? void 0)
-			this.#find = new FindComponent({
+			this.#find = mount(FindComponent, {
 				intro: true,
 				props: {
 					i18n: i18n.t,
@@ -583,8 +588,8 @@ export class TerminalView extends ItemView {
 				...optional,
 			})
 		}
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-call
-		this.#find["focus"]()
+
+		this.#find.focus()
 	}
 
 	protected startEmulator(focus: boolean): void {
@@ -715,7 +720,7 @@ export class TerminalView extends ItemView {
 										emulator.reopen()
 										emulator.resize(false).catch(warn)
 									}),
-									() => { this.#find?.$set({ results: "" }) },
+									() => { this.#find?.setResults("") },
 								),
 								dragAndDrop: new DragAndDropAddon(ele),
 								ligatures: new LigaturesAddon({}),
@@ -747,7 +752,7 @@ export class TerminalView extends ItemView {
 									: settings.value.errorNoticeTimeout,
 								context,
 							)
-						}, error => {
+						}, (error: unknown) => {
 							printError(anyToError(error), () =>
 								i18n.t("errors.error-spawning-terminal"), context)
 						})
@@ -775,7 +780,7 @@ export class TerminalView extends ItemView {
 										index: resultIndex + 1,
 									},
 								})
-						this.#find?.$set({ results })
+						this.#find?.setResults(results)
 					})
 
 					emulator.resize().catch(warn)