code smells

RafaelGB · RafaelGB · commit 52dd34e937e7 · 2023-01-04T11:40:47.000+01:00
diff --git a/src/DatabaseView.tsx b/src/DatabaseView.tsx
@@ -64,12 +64,12 @@ export class DatabaseView extends TextFileView implements HoverParent {
     if (file) {
       this.file = file;
       this.plugin.removeView(this);
-      this.plugin.addView(this, this.data);
+      this.plugin.addView(this);
     } else {
       this.register(
         this.containerEl.onWindowMigrated(() => {
           this.plugin.removeView(this);
-          this.plugin.addView(this, this.data);
+          this.plugin.addView(this);
         })
       );
     }
@@ -93,7 +93,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
       return;
     }
 
-    this.plugin.addView(this, data);
+    this.plugin.addView(this);
   }
 
   getIcon() {
diff --git a/src/commands/addDatabaseHelper/databaseHelperCreationModal.ts b/src/commands/addDatabaseHelper/databaseHelperCreationModal.ts
@@ -62,7 +62,7 @@ export class DatabaseHelperCreationModalManager {
                     });
             });
         const sourceOptions: Record<string, string> = {};
-        Object.entries(SourceDataTypes).forEach(([key, value]) => {
+        Object.entries(SourceDataTypes).forEach(([, value]) => {
             sourceOptions[value] = t(value);
         });
 
@@ -149,7 +149,7 @@ export class DatabaseHelperCreationModalManager {
     }
 
     tagHandler(containerEl: HTMLElement) {
-        const tagArray: Record<string, number> = (app.metadataCache as unknown as any).getTags();
+        const tagArray: Record<string, number> = app.metadataCache.getTags();
         if (tagArray) {
             const tagRecords: Record<string, string> = {};
             // Order tagRecord by key (tag name)
diff --git a/src/components/cellTypes/Editor/filepicker.ts b/src/components/cellTypes/Editor/filepicker.ts
@@ -310,12 +310,14 @@ async function getBlocks(
   }
 
   try {
+    const cachedMetadata = app.metadataCache.getFileCache(file);
+
     const blockCache = await (app.metadataCache as any).blockCache.getForFile(
       new MockRunnable(),
       file
     );
 
-    if (!blockCache?.blocks) {
+    if (!cachedMetadata?.blocks) {
       return callback([]);
     }
 
diff --git a/src/components/styles/RowTemplateStyles.ts b/src/components/styles/RowTemplateStyles.ts
@@ -1,7 +1,7 @@
 import { StyleVariables } from "helpers/Constants";
 import { GroupBase, StylesConfig } from "react-select";
 
-const CustomTemplateSelectorStyles: StylesConfig<any, true, GroupBase<any>> = {
+const CustomTemplateSelectorStyles: StylesConfig<any, true, GroupBase<unknown>> = {
     singleValue: (styles) => ({
         ...styles,
         color: StyleVariables.TEXT_NORMAL,
@@ -10,7 +10,7 @@ const CustomTemplateSelectorStyles: StylesConfig<any, true, GroupBase<any>> = {
         border: 0
     }),
 
-    option: (styles, { data, isDisabled, isFocused, isSelected }) => {
+    option: (styles) => {
         return {
             ...styles,
             color: StyleVariables.TEXT_NORMAL,
diff --git a/src/components/styles/TagsStyles.ts b/src/components/styles/TagsStyles.ts
@@ -5,7 +5,7 @@ import {
     GroupBase,
 } from "react-select";
 
-const CustomTagsStyles: StylesConfig<any, true, GroupBase<any>> = {
+const CustomTagsStyles: StylesConfig<any, true, GroupBase<unknown>> = {
     container: () => ({
         position: "static",
         boxSizing: "border-box",
diff --git a/src/main.ts b/src/main.ts
@@ -74,13 +74,13 @@ export default class DBFolderPlugin extends Plugin {
 		await this.loadServices();
 		addIcon(DB_ICONS.NAME, DB_ICONS.ICON);
 		this.registerEvent(
-			app.workspace.on('window-open', (_: any, win: Window) => {
+			app.workspace.on('window-open', (_: unknown, win: Window) => {
 				this.mount(win);
 			})
 		);
 
 		this.registerEvent(
-			app.workspace.on('window-close', (_: any, win: Window) => {
+			app.workspace.on('window-close', (_: unknown, win: Window) => {
 				this.unmount(win);
 			})
 		);
@@ -112,7 +112,7 @@ export default class DBFolderPlugin extends Plugin {
 	unload(): void {
 		Promise.all(
 			app.workspace.getLeavesOfType(DatabaseCore.FRONTMATTER_KEY).map((leaf) => {
-				this.databaseFileModes[(leaf as any).id] = 'markdown';
+				this.databaseFileModes[leaf.id] = 'markdown';
 				return this.setMarkdownView(leaf);
 			})
 		).then(() => {
@@ -134,7 +134,7 @@ export default class DBFolderPlugin extends Plugin {
 		this.windowRegistry.clear();
 		this.databaseFileModes = {};
 
-		(app.workspace as any).unregisterHoverLinkSource(DatabaseCore.FRONTMATTER_KEY);
+		app.workspace.unregisterHoverLinkSource(DatabaseCore.FRONTMATTER_KEY);
 	}
 
 	/** Update plugin settings. */
@@ -179,7 +179,7 @@ export default class DBFolderPlugin extends Plugin {
 
 	viewStateReceivers: Array<(views: DatabaseView[]) => void> = [];
 
-	addView(view: DatabaseView, data: string) {
+	addView(view: DatabaseView) {
 		const win = view.getWindow();
 		const reg = this.windowRegistry.get(win);
 
@@ -371,7 +371,7 @@ export default class DBFolderPlugin extends Plugin {
 								.setIcon(DB_ICONS.NAME)
 								.setSection('pane')
 								.onClick(() => {
-									this.databaseFileModes[(leaf as any).id || file.path] =
+									this.databaseFileModes[leaf.id || file.path] =
 										DatabaseCore.FRONTMATTER_KEY;
 									this.setDatabaseView(leaf);
 								});
@@ -392,7 +392,7 @@ export default class DBFolderPlugin extends Plugin {
 							.setIcon(DB_ICONS.NAME)
 							.setSection('pane')
 							.onClick(() => {
-								this.databaseFileModes[(leaf as any).id || file.path] =
+								this.databaseFileModes[leaf.id || file.path] =
 									DatabaseCore.FRONTMATTER_KEY;
 								this.setDatabaseView(leaf);
 							});
@@ -406,7 +406,7 @@ export default class DBFolderPlugin extends Plugin {
 		 */
 		this.registerEvent(
 			app.metadataCache.on("dataview:index-ready", async () => {
-				for (const [win, { viewMap }] of Array.from(this.windowRegistry.entries())) {
+				for (const [, { viewMap }] of Array.from(this.windowRegistry.entries())) {
 					// Refresh all database views
 					for (const view of viewMap.values()) {
 						await view.reloadDatabase();
@@ -537,7 +537,7 @@ export default class DBFolderPlugin extends Plugin {
 	}
 
 	showRibbonIcon() {
-		this.ribbonIcon = this.addRibbonIcon(DB_ICONS.NAME, t("ribbon_icon_title"), async (e) => {
+		this.ribbonIcon = this.addRibbonIcon(DB_ICONS.NAME, t("ribbon_icon_title"), async () => {
 			new DatabaseHelperCreationModal(this.settings.local_settings).open()
 		});
 	}
@@ -607,7 +607,7 @@ export default class DBFolderPlugin extends Plugin {
 							self.databaseFileModes[this.id || state.state.file] !== 'markdown'
 						) {
 							// Then check for the database frontMatterKey
-							const cache = self.app.metadataCache.getCache(state.state.file);
+							const cache = app.metadataCache.getCache(state.state.file);
 
 							if (cache?.frontmatter && cache.frontmatter[DatabaseCore.FRONTMATTER_KEY]) {
 								// If we have it, force the view type to database
diff --git a/src/parsers/handlers/marshall/AbstractYamlPropertyHandler.ts b/src/parsers/handlers/marshall/AbstractYamlPropertyHandler.ts
@@ -1,4 +1,3 @@
-import { DatabaseYaml } from "cdm/DatabaseModel";
 import { YamlHandler, YamlHandlerResponse } from "cdm/MashallModel";
 
 
diff --git a/src/parsers/handlers/marshall/MarshallConfigHandler.ts b/src/parsers/handlers/marshall/MarshallConfigHandler.ts
@@ -39,7 +39,7 @@ export class MarshallConfigHandler extends AbstractYamlHandler {
         if (wrappedLiteral.type === "string") {
             unEscapedValue = unEscapeSpecialCharacters(wrappedLiteral.value)
         }
-        localSettings[key] = unEscapedValue as any;
+        localSettings[key] = unEscapedValue as LocalSettings[K];
         return localSettings;
     }
 
@@ -49,7 +49,7 @@ export class MarshallConfigHandler extends AbstractYamlHandler {
 
     parseBoolean<K extends keyof LocalSettings>(key: K, localSettings: LocalSettings): LocalSettings {
         const parsedValue = localSettings[key].toString().toLowerCase() === 'true';
-        localSettings[key] = parsedValue as any;
+        localSettings[key] = parsedValue as LocalSettings[K];
         return localSettings;
     }
 }
diff --git a/src/parsers/handlers/unmarshall/UnmarshallFiltersHandler.ts b/src/parsers/handlers/unmarshall/UnmarshallFiltersHandler.ts
@@ -23,7 +23,7 @@ export class UnmarshallFiltersHandler extends AbstractDiskHandler {
 
         return this.goNext(handlerResponse);
     }
-    striginifyFilter(filter: FilterGroup, indentLevel: number, isList = false): void {
+    striginifyFilter(filter: FilterGroup, indentLevel: number): void {
         if ((filter as FilterGroupCondition).condition) {
             // Is a filter group
             const condition = (filter as FilterGroupCondition).condition;
@@ -45,7 +45,7 @@ export class UnmarshallFiltersHandler extends AbstractDiskHandler {
                 this.localDisk.push(`${YAML_INDENT.repeat(indentLevel)}  filters:`);
                 indentLevel++;
                 for (const group of (filter as FilterGroupCondition).filters) {
-                    this.striginifyFilter(group, indentLevel, true);
+                    this.striginifyFilter(group, indentLevel);
                 }
             }
         } else {
diff --git a/src/stateManagement/automations/handlers/DispatchRollupHandlerAction.ts b/src/stateManagement/automations/handlers/DispatchRollupHandlerAction.ts
@@ -1,6 +1,5 @@
 import Rollup from "lib/Rollup";
 import { ConfigColumn } from "cdm/FolderModel";
-import { LocalSettings } from "cdm/SettingsModel";
 import { AutomationState, TableActionResponse } from "cdm/TableStateInterface";
 import { Link, Literal } from "obsidian-dataview";
 import { DataviewService } from "services/DataviewService";
diff --git a/src/stateManagement/columns/handlers/AlterColumnLabelAction.ts b/src/stateManagement/columns/handlers/AlterColumnLabelAction.ts
@@ -1,6 +1,5 @@
 import { TableColumn } from "cdm/FolderModel";
 import { ColumnsState, TableActionResponse } from "cdm/TableStateInterface";
-import { dbTrim } from "helpers/StylesHelper";
 import { AbstractTableAction } from "stateManagement/AbstractTableAction";
 
 export default class AlterColumnLabelHandlerAction extends AbstractTableAction<ColumnsState> {
diff --git a/src/stateManagement/data/handlers/DataviewRefreshHandlerAction.ts b/src/stateManagement/data/handlers/DataviewRefreshHandlerAction.ts
@@ -14,7 +14,7 @@ export default class DataviewRefreshHandlerAction extends AbstractTableAction<Da
                 ddbbConfig,
                 filterConfig
             );
-            set((updater) => {
+            set(() => {
                 return { rows: [...refreshedRows] };
             });
         }
diff --git a/src/stateManagement/data/handlers/EditOptionForAllRowsHandlerAction.ts b/src/stateManagement/data/handlers/EditOptionForAllRowsHandlerAction.ts
@@ -42,7 +42,7 @@ export default class EditOptionForAllRowsHandlerAction extends AbstractTableActi
                     }
                     break;
                 case InputType.SELECT:
-                    lambdaUpdate = (cellValue: Literal) => {
+                    lambdaUpdate = () => {
                         return newLabel;
                     };
                     break;
diff --git a/src/stateManagement/data/handlers/RemoveOptionForAllRowsAction.ts b/src/stateManagement/data/handlers/RemoveOptionForAllRowsAction.ts
@@ -1,10 +1,9 @@
 import { TableColumn } from "cdm/FolderModel";
 import { LocalSettings } from "cdm/SettingsModel";
 import { DataState, TableActionResponse } from "cdm/TableStateInterface";
-import { InputType, UpdateRowOptions } from "helpers/Constants";
+import { InputType } from "helpers/Constants";
 import { Literal } from "obsidian-dataview";
 import { EditEngineService } from "services/EditEngineService";
-import { ParseService } from "services/ParseService";
 import { AbstractTableAction } from "stateManagement/AbstractTableAction";
 
 export default class RemoveOptionForAllRowsAction extends AbstractTableAction<DataState> {
@@ -43,7 +42,7 @@ export default class RemoveOptionForAllRowsAction extends AbstractTableAction<Da
                     }
                     break;
                 case InputType.SELECT:
-                    lambdaUpdate = (cellValue: Literal) => {
+                    lambdaUpdate = () => {
                         return "";
                     };
                     break;
diff --git a/src/typings/obsidian.d.ts b/src/typings/obsidian.d.ts
@@ -36,4 +36,24 @@ declare module "obsidian" {
      */
     getTags(): Record<string, number>;
   }
+
+  interface WorkspaceLeaf {
+    /**
+     * Get the id of the leaf.
+     * 
+     * WARNING! not exposed by Obsidian, may break in future.
+     */
+    id: string;
+  }
+
+  interface Workspace {
+    /**
+     * Unregister a hover link source from the workspace in order to prevent it from being displayed.
+     *
+     * WARNING! not exposed by Obsidian, may break in future.
+     * @param id 
+     * @returns 
+     */
+    unregisterHoverLinkSource: (id: string) => void;
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -310,12 +310,14 @@ async function getBlocks(`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`try {`
	`313`	`+ const cachedMetadata = app.metadataCache.getFileCache(file);`
	`314`	`+`
`313`	`315`	`const blockCache = await (app.metadataCache as any).blockCache.getForFile(`
`314`	`316`	`new MockRunnable(),`
`315`	`317`	`file`
`316`	`318`	`);`
`317`	`319`
`318`		`- if (!blockCache?.blocks) {`
	`320`	`+ if (!cachedMetadata?.blocks) {`
`319`	`321`	`return callback([]);`
`320`	`322`	`}`
`321`	`323`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import { DatabaseYaml } from "cdm/DatabaseModel";`
`2`	`1`	`import { YamlHandler, YamlHandlerResponse } from "cdm/MashallModel";`
`3`	`2`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export class MarshallConfigHandler extends AbstractYamlHandler {`
`39`	`39`	`if (wrappedLiteral.type === "string") {`
`40`	`40`	`unEscapedValue = unEscapeSpecialCharacters(wrappedLiteral.value)`
`41`	`41`	`}`
`42`		`- localSettings[key] = unEscapedValue as any;`
	`42`	`+ localSettings[key] = unEscapedValue as LocalSettings[K];`
`43`	`43`	`return localSettings;`
`44`	`44`	`}`
`45`	`45`
`@@ -49,7 +49,7 @@ export class MarshallConfigHandler extends AbstractYamlHandler {`
`49`	`49`
`50`	`50`	`parseBoolean<K extends keyof LocalSettings>(key: K, localSettings: LocalSettings): LocalSettings {`
`51`	`51`	`const parsedValue = localSettings[key].toString().toLowerCase() === 'true';`
`52`		`- localSettings[key] = parsedValue as any;`
	`52`	`+ localSettings[key] = parsedValue as LocalSettings[K];`
`53`	`53`	`return localSettings;`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export class UnmarshallFiltersHandler extends AbstractDiskHandler {`
`23`	`23`
`24`	`24`	`return this.goNext(handlerResponse);`
`25`	`25`	`}`
`26`		`- striginifyFilter(filter: FilterGroup, indentLevel: number, isList = false): void {`
	`26`	`+ striginifyFilter(filter: FilterGroup, indentLevel: number): void {`
`27`	`27`	`if ((filter as FilterGroupCondition).condition) {`
`28`	`28`	`// Is a filter group`
`29`	`29`	`const condition = (filter as FilterGroupCondition).condition;`
`@@ -45,7 +45,7 @@ export class UnmarshallFiltersHandler extends AbstractDiskHandler {`
`45`	`45`	this.localDisk.push(`${YAML_INDENT.repeat(indentLevel)} filters:`);
`46`	`46`	`indentLevel++;`
`47`	`47`	`for (const group of (filter as FilterGroupCondition).filters) {`
`48`		`- this.striginifyFilter(group, indentLevel, true);`
	`48`	`+ this.striginifyFilter(group, indentLevel);`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`} else {`