fix: lint errors

chhoumann · Mar 27, 2023 · 6a42f41 · 6a42f41 · vercel · Mar 27, 2023
1 parent 0502bd7
commit 6a42f41
Show file tree

Hide file tree

Showing 48 changed files with 160 additions and 92 deletions.
diff --git a/src/MacrosManager.ts b/src/MacrosManager.ts
@@ -1,6 +1,6 @@
 import type { IMacro } from "./types/macros/IMacro";
+import type { App } from "obsidian";
 import {
-	App,
 	ButtonComponent,
 	Modal,
 	Setting,
@@ -223,7 +223,7 @@ export class MacrosManager extends Modal {
 						this.macroContainer.scrollHeight
 					);
 				} catch (error) {
-					log.logError(error);
+					log.logError(error as string);
 				}
 			});
 	}

diff --git a/src/choiceExecutor.ts b/src/choiceExecutor.ts
@@ -37,7 +37,7 @@ export class ChoiceExecutor implements IChoiceExecutor {
 			}
 			case ChoiceType.Multi: {
 				const multiChoice: IMultiChoice = choice as IMultiChoice;
-				await this.onChooseMultiType(multiChoice);
+				this.onChooseMultiType(multiChoice);
 				break;
 			}
 			default:
@@ -66,7 +66,7 @@ export class ChoiceExecutor implements IChoiceExecutor {
 	}
 
 	private async onChooseMacroType(macroChoice: IMacroChoice) {
-		const macroEngine = await new MacroChoiceEngine(
+		const macroEngine = new MacroChoiceEngine(
 			this.app,
 			this.plugin,
 			macroChoice,
@@ -81,7 +81,7 @@ export class ChoiceExecutor implements IChoiceExecutor {
 		});
 	}
 
-	private async onChooseMultiType(multiChoice: IMultiChoice) {
+	private onChooseMultiType(multiChoice: IMultiChoice) {
 		ChoiceSuggester.Open(this.plugin, multiChoice.choices, this);
 	}
 }
diff --git a/src/engine/CaptureChoiceEngine.ts b/src/engine/CaptureChoiceEngine.ts
@@ -115,7 +115,7 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 		filePath: string,
 		content: string
 	): Promise<{ file: TFile; content: string }> {
-		const file: TFile = await this.getFileByPath(filePath);
+		const file: TFile = this.getFileByPath(filePath);
 		if (!file) throw new Error("File not found");
 
 		// First format pass...

diff --git a/src/engine/MacroChoiceEngine.ts b/src/engine/MacroChoiceEngine.ts
@@ -82,7 +82,7 @@ export class MacroChoiceEngine extends QuickAddChoiceEngine {
 	protected async executeCommands(commands: ICommand[]) {
 		for (const command of commands) {
 			if (command?.type === CommandType.Obsidian)
-				await this.executeObsidianCommand(command as IObsidianCommand);
+				this.executeObsidianCommand(command as IObsidianCommand);
 			if (command?.type === CommandType.UserScript)
 				await this.executeUserScript(command as IUserScript);
 			if (command?.type === CommandType.Choice)
@@ -125,7 +125,7 @@ export class MacroChoiceEngine extends QuickAddChoiceEngine {
 			await this.userScriptDelegator(userScript);
 		} catch (error) {
 			log.logError(
-				`failed to run user script ${command.name}. Error:\n\n${error.message}`
+				`failed to run user script ${command.name}. Error:\n\n${(error as {message: string}).message}`
 			);
 		}
 
@@ -168,14 +168,17 @@ export class MacroChoiceEngine extends QuickAddChoiceEngine {
 			case "function":
 				if (this.userScriptCommand) {
 					await this.runScriptWithSettings(
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 						userScript,
 						this.userScriptCommand
 					);
 				} else {
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 					await this.onExportIsFunction(userScript);
 				}
 				break;
 			case "object":
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 				await this.onExportIsObject(userScript);
 				break;
 			case "bigint":
@@ -231,12 +234,13 @@ export class MacroChoiceEngine extends QuickAddChoiceEngine {
 
 			await this.userScriptDelegator(obj[selected]);
 		} catch (e) {
-			log.logMessage(e);
+			log.logMessage(e as string);
 		}
 	}
 
 	protected executeObsidianCommand(command: IObsidianCommand) {
 		// @ts-ignore
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-call
 		this.app.commands.executeCommandById(command.commandId);
 	}
 
@@ -274,10 +278,10 @@ export class MacroChoiceEngine extends QuickAddChoiceEngine {
 				await PasteCommand.run(this.app);
 				break;
 			case EditorCommandType.SelectActiveLine:
-				await SelectActiveLineCommand.run(this.app);
+				SelectActiveLineCommand.run(this.app);
 				break;
 			case EditorCommandType.SelectLinkOnActiveLine:
-				await SelectLinkOnActiveLineCommand.run(this.app);
+				SelectLinkOnActiveLineCommand.run(this.app);
 				break;
 		}
 	}

diff --git a/src/engine/QuickAddEngine.ts b/src/engine/QuickAddEngine.ts
@@ -36,8 +36,8 @@ export abstract class QuickAddEngine {
 		return await this.app.vault.adapter.exists(filePath);
 	}
 
-	protected async getFileByPath(filePath: string): Promise<TFile> {
-		const file = await this.app.vault.getAbstractFileByPath(filePath);
+	protected getFileByPath(filePath: string): TFile {
+		const file = this.app.vault.getAbstractFileByPath(filePath);
 
 		if (!file) {
 			log.logError(`${filePath} not found`);

diff --git a/src/engine/SingleInlineScriptEngine.ts b/src/engine/SingleInlineScriptEngine.ts
@@ -16,11 +16,14 @@ export class SingleInlineScriptEngine extends MacroChoiceEngine {
 
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	public async runAndGetOutput(code: string): Promise<any> {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 		const AsyncFunction = Object.getPrototypeOf(
 			async function () {}
 		).constructor;
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
 		const userCode = new AsyncFunction(code);
 
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
 		return await userCode.bind(this.params, this).call();
 	}
 }
diff --git a/src/engine/SingleMacroEngine.ts b/src/engine/SingleMacroEngine.ts
@@ -38,9 +38,12 @@ export class SingleMacroEngine extends MacroChoiceEngine {
 
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	protected override async onExportIsObject(obj: any): Promise<void> {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 		if (!this.memberAccess) return await super.onExportIsObject(obj);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 		let newObj = obj;
 		this.memberAccess.forEach((key) => {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 			newObj = newObj[key];
 		});
 

diff --git a/src/engine/StartupMacroEngine.ts b/src/engine/StartupMacroEngine.ts
@@ -15,10 +15,11 @@ export class StartupMacroEngine extends MacroChoiceEngine {
 		super(app, plugin, null, macros, choiceExecutor, null);
 	}
 
+	// eslint-disable-next-line @typescript-eslint/require-await
 	async run(): Promise<void> {
 		this.macros.forEach((macro) => {
 			if (macro.runOnStartup) {
-				this.executeCommands(macro.commands);
+				void this.executeCommands(macro.commands);
 			}
 		});
 	}

diff --git a/src/engine/TemplateChoiceEngine.ts b/src/engine/TemplateChoiceEngine.ts
@@ -156,7 +156,7 @@ export class TemplateChoiceEngine extends TemplateEngine {
 				});
 			}
 		} catch (error) {
-			log.logError(error);
+			log.logError(error as string);
 		}
 	}
 

diff --git a/src/engine/TemplateEngine.ts b/src/engine/TemplateEngine.ts
@@ -1,6 +1,7 @@
 import { QuickAddEngine } from "./QuickAddEngine";
 import { CompleteFormatter } from "../formatters/completeFormatter";
-import { App, TFile } from "obsidian";
+import type { App } from "obsidian";
+import { TFile } from "obsidian";
 import type QuickAdd from "../main";
 import {
 	getTemplater,
@@ -109,7 +110,7 @@ export abstract class TemplateEngine extends QuickAddEngine {
 			return createdFile;
 		} catch (e) {
 			log.logError(
-				`Could not create file with template: \n\n${e.message}`
+				`Could not create file with template: \n\n${(e as {message: string}).message}`
 			);
 			return null;
 		}
@@ -132,7 +133,7 @@ export abstract class TemplateEngine extends QuickAddEngine {
 
 			return file;
 		} catch (e) {
-			log.logError(e);
+			log.logError(e as string);
 			return null;
 		}
 	}
@@ -160,7 +161,7 @@ export abstract class TemplateEngine extends QuickAddEngine {
 
 			return file;
 		} catch (e) {
-			log.logError(e);
+			log.logError(e as string);
 			return null;
 		}
 	}

diff --git a/src/formatters/completeFormatter.ts b/src/formatters/completeFormatter.ts
@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Formatter } from "./formatter";
 import type { App } from "obsidian";
 import { getNaturalLanguageDates } from "../utilityObsidian";
@@ -113,6 +116,7 @@ export class CompleteFormatter extends Formatter {
 
 		for (const file of this.app.vault.getMarkdownFiles()) {
 			const cache = this.app.metadataCache.getFileCache(file);
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			const value = cache?.frontmatter?.[variableName];
 			if (!value || typeof value == "object") continue;
 
@@ -167,6 +171,7 @@ export class CompleteFormatter extends Formatter {
 		).run();
 	}
 
+	// eslint-disable-next-line @typescript-eslint/require-await
 	protected async getSelectedText(): Promise<string> {
 		const activeView = this.app.workspace.getActiveViewOfType(MarkdownView);
 		if (!activeView) return "";

diff --git a/src/formatters/fileNameDisplayFormatter.ts b/src/formatters/fileNameDisplayFormatter.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/require-await */
 import { Formatter } from "./formatter";
 import type { App } from "obsidian";
 import { getNaturalLanguageDates } from "../utilityObsidian";

diff --git a/src/formatters/formatDisplayFormatter.ts b/src/formatters/formatDisplayFormatter.ts
@@ -69,6 +69,7 @@ export class FormatDisplayFormatter extends Formatter {
 		}
 	}
 
+	// eslint-disable-next-line @typescript-eslint/require-await
 	protected async getSelectedText(): Promise<string> {
 		return "_selected_";
 	}

diff --git a/src/formatters/formatter.ts b/src/formatters/formatter.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import {
 	DATE_REGEX,
 	DATE_REGEX_FORMATTED,
@@ -84,6 +86,7 @@ export abstract class Formatter {
 		return output;
 	}
 
+	// eslint-disable-next-line @typescript-eslint/require-await
 	protected async replaceLinkToCurrentFileInString(
 		input: string
 	): Promise<string> {
@@ -213,6 +216,7 @@ export abstract class Formatter {
 		suggestedValues: string[]
 	): Promise<string> | string;
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	protected abstract suggestForField(variableName: string): any;
 
 	protected async replaceDateVariableInString(input: string) {
@@ -232,6 +236,7 @@ export abstract class Formatter {
 						await this.promptForVariable(variableName)
 					);
 
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 					const nld = this.getNaturalLanguageDates();
 					if (
 						!nld ||

diff --git a/src/gui/ChoiceBuilder/choiceBuilder.ts b/src/gui/ChoiceBuilder/choiceBuilder.ts
@@ -1,4 +1,5 @@
-import { App, Modal, Setting } from "obsidian";
+import type { App, Setting } from "obsidian";
+import { Modal } from "obsidian";
 import type IChoice from "../../types/choices/IChoice";
 import type { SvelteComponent } from "svelte";
 import GenericInputPrompt from "../GenericInputPrompt/GenericInputPrompt";
@@ -63,6 +64,7 @@ export abstract class ChoiceBuilder extends Modal {
 		});
 		headerEl.setText(choice.name);
 
+		// eslint-disable-next-line @typescript-eslint/no-misused-promises
 		headerEl.addEventListener("click", async (ev) => {
 			try {
 				const newName: string = await GenericInputPrompt.Prompt(

diff --git a/src/gui/ChoiceBuilder/macroChoiceBuilder.ts b/src/gui/ChoiceBuilder/macroChoiceBuilder.ts
@@ -1,12 +1,13 @@
 import { ChoiceBuilder } from "./choiceBuilder";
 import type IMacroChoice from "../../types/choices/IMacroChoice";
-import { App, ButtonComponent } from "obsidian";
+import type { App } from "obsidian";
+import { ButtonComponent } from "obsidian";
 import { DropdownComponent } from "obsidian";
 import type { IMacro } from "../../types/macros/IMacro";
 import { MacroBuilder } from "../MacroGUIs/MacroBuilder";
 import QuickAdd from "src/main";
 import { settingsStore } from "src/settingsStore";
-import IChoice from "src/types/choices/IChoice";
+import type IChoice from "src/types/choices/IChoice";
 import { log } from "src/logger/logManager";
 
 export class MacroChoiceBuilder extends ChoiceBuilder {
@@ -71,13 +72,13 @@ export class MacroChoiceBuilder extends ChoiceBuilder {
 			.setIcon("plus")
 			.setCta()
 			.setTooltip("Create Macro")
-			.onClick(async () => {
+			.onClick(() => {
 				try {
 					const macro = settingsStore.createMacro(this.choice.name);
 					this.choice.macroId = macro.id;
 					this.reload();
 				} catch (error) {
-					log.logError(error);
+					log.logError(error as string);
 				}
 			});
 	}

diff --git a/src/gui/ChoiceBuilder/templateChoiceBuilder.ts b/src/gui/ChoiceBuilder/templateChoiceBuilder.ts
@@ -1,6 +1,6 @@
 import { ChoiceBuilder } from "./choiceBuilder";
+import type { App } from "obsidian";
 import {
-	App,
 	ButtonComponent,
 	Setting,
 	TextComponent,
@@ -17,10 +17,10 @@ import type { FileViewMode } from "../../types/fileViewMode";
 import { GenericTextSuggester } from "../suggesters/genericTextSuggester";
 import { FormatSyntaxSuggester } from "../suggesters/formatSyntaxSuggester";
 import { ExclusiveSuggester } from "../suggesters/exclusiveSuggester";
+import type { fileExistsChoices } from "src/constants";
 import {
 	fileExistsAppendToBottom,
 	fileExistsAppendToTop,
-	fileExistsChoices,
 	fileExistsDoNothing,
 	fileExistsIncrement,
 	fileExistsOverwriteFile,
@@ -86,7 +86,7 @@ export class TemplateChoiceBuilder extends ChoiceBuilder {
 		const formatDisplay: HTMLSpanElement = this.contentEl.createEl("span");
 		const displayFormatter: FileNameDisplayFormatter =
 			new FileNameDisplayFormatter(this.app);
-		(async () =>
+		void (async () =>
 			(formatDisplay.textContent = await displayFormatter.format(
 				this.choice.fileNameFormat.format
 			)))();
@@ -208,6 +208,7 @@ export class TemplateChoiceBuilder extends ChoiceBuilder {
 				deleteFolder: (folder: string) => {
 					this.choice.folder.folders =
 						this.choice.folder.folders.filter((f) => f !== folder);
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-call
 					folderListEl.updateFolders(this.choice.folder.folders);
 					suggester.updateCurrentItems(this.choice.folder.folders);
 				},
@@ -240,6 +241,7 @@ export class TemplateChoiceBuilder extends ChoiceBuilder {
 			}
 
 			this.choice.folder.folders.push(input);
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-call
 			folderListEl.updateFolders(this.choice.folder.folders);
 			folderInput.inputEl.value = "";
 

diff --git a/src/gui/GenericCheckboxPrompt/genericCheckboxPrompt.ts b/src/gui/GenericCheckboxPrompt/genericCheckboxPrompt.ts
@@ -1,4 +1,5 @@
-import { App, ButtonComponent, Modal, ToggleComponent } from "obsidian";
+import type { App } from "obsidian";
+import { ButtonComponent, Modal, ToggleComponent } from "obsidian";
 
 export default class GenericCheckboxPrompt extends Modal {
 	private resolvePromise: (value: string[]) => void;
-Original file line number
+Diff line change
@@ Expand Up / @@ -156,7 +156,7 @@ export class TemplateChoiceEngine extends TemplateEngine { @@
     				});
     			}
     		} catch (error) {
-    			log.logError(error);
+    			log.logError(error as string);
     		}
     	}
@@ Expand Down @@