From 09d208dab414d81981c8b5401291b2cc717ac44c Mon Sep 17 00:00:00 2001 From: Michael Naumov Date: Thu, 18 Jan 2024 15:41:51 -0600 Subject: [PATCH] Refactor --- .npmrc | 2 +- src/SmartRenamePlugin.ts | 14 ++++++++------ src/SmartRenameSettings.ts | 2 +- src/SmartRenameSettingsTab.ts | 10 ++++++---- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.npmrc b/.npmrc index b973752..9555e17 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1 @@ -tag-version-prefix="" \ No newline at end of file +tag-version-prefix="" diff --git a/src/SmartRenamePlugin.ts b/src/SmartRenamePlugin.ts index 42c44fb..180bd47 100644 --- a/src/SmartRenamePlugin.ts +++ b/src/SmartRenamePlugin.ts @@ -1,11 +1,13 @@ import SmartRenameSettingsTab from "./SmartRenameSettingsTab"; import SmartRenameSettings from "./SmartRenameSettings"; -import { Notice, +import { + Notice, Plugin, TFile, LinkCache, parseFrontMatterAliases, - CachedMetadata } from "obsidian"; + CachedMetadata +} from "obsidian"; import prompt from "./prompt"; import { InvalidCharacterAction } from "./InvalidCharacterAction"; @@ -87,7 +89,7 @@ export default class SmartRenamePlugin extends Plugin { .replace(/^((---\n(.|\n)+?---\n)?(.|\n)*\n)# .+/, `$1# ${titleToStore}`)); } - this.newPath = `${this.currentNoteFile.parent.path}/${this.newTitle}.md`; + this.newPath = `${this.currentNoteFile.parent!.path}/${this.newTitle}.md`; const validationError = await this.getValidationError(); if (validationError) { @@ -191,7 +193,7 @@ export default class SmartRenamePlugin extends Plugin { } private getLinksAndEmbeds(cache: CachedMetadata): LinkCache[] { - const links = new Array(); + const links: LinkCache[] = []; if (cache.links) { links.push(...cache.links); } @@ -232,11 +234,11 @@ export default class SmartRenamePlugin extends Plugin { this.settings = Object.assign(new SmartRenameSettings(), await this.loadData()); } - private async saveSettings(): Promise { + public async saveSettings(): Promise { await this.saveData(this.settings); } - private hasInvalidCharacters(str: string): boolean { + public hasInvalidCharacters(str: string): boolean { return this.systemForbiddenCharactersRegExp.test(str) || this.obsidianForbiddenCharactersRegExp.test(str); } diff --git a/src/SmartRenameSettings.ts b/src/SmartRenameSettings.ts index e7c70cc..2f289f6 100644 --- a/src/SmartRenameSettings.ts +++ b/src/SmartRenameSettings.ts @@ -1,7 +1,7 @@ import { InvalidCharacterAction } from "./InvalidCharacterAction"; export default class SmartRenameSettings { - public invalidCharacterAction: InvalidCharacterAction = InvalidCharacterAction.Error; + public invalidCharacterAction = InvalidCharacterAction.Error; public replacementCharacter = "_"; public shouldStoreInvalidTitle = true; public shouldUpdateTitleKey = false; diff --git a/src/SmartRenameSettingsTab.ts b/src/SmartRenameSettingsTab.ts index 7fafea3..c7a389c 100644 --- a/src/SmartRenameSettingsTab.ts +++ b/src/SmartRenameSettingsTab.ts @@ -1,8 +1,10 @@ import { InvalidCharacterAction } from "./InvalidCharacterAction"; import SmartRenamePlugin from "./SmartRenamePlugin"; -import { App, +import { + App, PluginSettingTab, - Setting } from "obsidian"; + Setting +} from "obsidian"; export default class SmartRenameSettingsTab extends PluginSettingTab { public plugin: SmartRenamePlugin; @@ -108,8 +110,8 @@ export default class SmartRenameSettingsTab extends PluginSettingTab { new Setting(storeInvalidTitleSettingEl) .setName("Store invalid title") .setDesc("If enabled, stores title with invalid characters. If disabled, stores the sanitized version") - .addToggle(togleComponent => { - togleComponent + .addToggle(toggleComponent => { + toggleComponent .setValue(this.plugin.settings.shouldStoreInvalidTitle) .onChange(async (value) => { this.plugin.settings.shouldStoreInvalidTitle = value;