From bba710b495db0f0f9e1e3501274f38a6b5a50fe7 Mon Sep 17 00:00:00 2001 From: DecafDev <40307803+decaf-dev@users.noreply.github.com> Date: Sat, 11 Jan 2025 18:45:57 -0700 Subject: [PATCH] refactor: change to type-only import --- src/constants.ts | 2 +- src/event/event-manager.ts | 2 +- src/logger/index.ts | 29 +- src/main.ts | 21 +- src/migrations/index.ts | 18 +- src/migrations/migrate_0_4_0.ts | 12 +- src/migrations/migrate_1_0_0.ts | 22 +- src/migrations/migrate_1_10_0.ts | 27 +- src/migrations/migrate_1_13_0.ts | 22 +- src/migrations/migrate_1_14_0.ts | 18 +- src/migrations/migrate_1_15_0.ts | 13 +- src/migrations/migrate_1_17_0.ts | 4 +- src/migrations/migrate_1_1_0.ts | 15 +- src/migrations/migrate_1_21_0.ts | 4 +- src/migrations/migrate_1_22_0.ts | 4 +- src/migrations/migrate_1_23_0.ts | 4 +- src/migrations/migrate_1_23_1.ts | 4 +- src/migrations/migrate_1_24_0.ts | 4 +- src/migrations/migrate_1_25_0.ts | 4 +- src/migrations/migrate_1_26_0.ts | 4 +- src/migrations/migrate_1_27_0.ts | 4 +- src/migrations/migrate_1_29_0.ts | 5 +- src/migrations/migrate_1_2_1.ts | 12 +- src/migrations/migrate_1_30_5.ts | 4 +- src/migrations/migrate_1_31_0.ts | 4 +- src/migrations/migrate_1_33_0.ts | 4 +- src/migrations/migrate_1_37_0.ts | 4 +- src/migrations/migrate_1_38_0.ts | 4 +- src/migrations/migrate_1_39_0.ts | 6 +- src/migrations/migrate_1_3_0.ts | 41 +- src/migrations/migrate_1_40_0.ts | 4 +- src/migrations/migrate_1_41_0.ts | 4 +- src/migrations/migrate_1_42_0.ts | 4 +- src/migrations/migrate_1_45_0.ts | 6 +- src/migrations/migrate_1_46_0.ts | 4 +- src/migrations/migrate_1_6_0.ts | 12 +- src/migrations/migrate_1_6_1.ts | 12 +- src/migrations/migrate_1_9_0.ts | 29 +- src/obsidian/utils.ts | 2 +- src/obsidian/vault-explorer-settings-tab.ts | 29 +- src/svelte/app/components/feed-card.svelte | 24 +- src/svelte/app/components/feed-view.svelte | 2 +- .../app/components/filter-group-list.svelte | 7 +- src/svelte/app/components/grid-card.svelte | 30 +- src/svelte/app/components/grid-view.svelte | 2 +- src/svelte/app/components/list-view.svelte | 2 +- src/svelte/app/components/sort-filter.svelte | 2 +- src/svelte/app/components/table-view.svelte | 22 +- src/svelte/app/index.svelte | 87 +- src/svelte/app/services/context-menu.ts | 2 +- src/svelte/app/services/favorites-store.ts | 4 +- .../filters/custom/filter-by-groups.ts | 32 +- .../app/services/filters/search-filter.ts | 2 +- .../app/services/random-file-sort-store.ts | 2 +- src/svelte/app/services/render-data.ts | 34 +- src/svelte/app/services/smi-cache.ts | 2 +- src/svelte/app/types.ts | 2 +- .../components/content-filter.svelte | 8 +- .../components/file-name-filter.svelte | 2 +- .../components/filter-rule-list.svelte | 6 +- .../components/filter-rule.svelte | 32 +- .../components/folder-filter.svelte | 10 +- .../components/group-list.svelte | 4 +- .../components/property-filter.svelte | 18 +- src/svelte/custom-filter-app/index.svelte | 31 +- .../services/display-name-utils.ts | 22 +- .../custom-filter-app/services/utils.ts | 2 +- src/svelte/image-source-app/display-name.ts | 2 +- src/svelte/image-source-app/index.svelte | 12 +- src/svelte/shared/components/tab.svelte | 6 +- .../shared/services/load-property-value.ts | 4 +- src/types/index.guard.ts | 1572 ++++++++++------- tests/integration/preform-migration.test.ts | 4 +- tests/unit/load-property-value.test.ts | 4 +- 74 files changed, 1388 insertions(+), 1036 deletions(-) diff --git a/src/constants.ts b/src/constants.ts index 3a0efdc..9792323 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -1,5 +1,5 @@ import { LOG_LEVEL_WARN } from "./logger/constants"; -import { VaultExplorerPluginSettings, TExplorerView } from "./types"; +import { type VaultExplorerPluginSettings, TExplorerView } from "./types"; export const VAULT_EXPLORER_VIEW = "vault-explorer"; diff --git a/src/event/event-manager.ts b/src/event/event-manager.ts index 1123197..ae9db78 100644 --- a/src/event/event-manager.ts +++ b/src/event/event-manager.ts @@ -1,5 +1,5 @@ import Logger from "js-logger"; -import { PluginEvent, EventCallback } from "./types"; +import { PluginEvent, type EventCallback } from "./types"; export default class EventManager { private static instance: EventManager; diff --git a/src/logger/index.ts b/src/logger/index.ts index f821c1a..d9320d2 100644 --- a/src/logger/index.ts +++ b/src/logger/index.ts @@ -1,7 +1,13 @@ -import Logger, { ILogLevel } from "js-logger"; -import { LOG_LEVEL_OFF, LOG_LEVEL_ERROR, LOG_LEVEL_WARN, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_TRACE } from "./constants"; -import { FormattedLogMessage, LogMessageHeader } from "./types"; - +import Logger, { type ILogLevel } from "js-logger"; +import { + LOG_LEVEL_DEBUG, + LOG_LEVEL_ERROR, + LOG_LEVEL_INFO, + LOG_LEVEL_OFF, + LOG_LEVEL_TRACE, + LOG_LEVEL_WARN, +} from "./constants"; +import type { FormattedLogMessage, LogMessageHeader } from "./types"; export const logLevelToString = (level: ILogLevel) => { switch (level) { @@ -20,7 +26,7 @@ export const logLevelToString = (level: ILogLevel) => { default: throw new Error("Unhandled log level"); } -} +}; export const stringToLogLevel = (value: string) => { switch (value) { @@ -39,16 +45,21 @@ export const stringToLogLevel = (value: string) => { default: throw new Error(`Unhandled log level: ${value}`); } -} +}; -export const formatMessageForLogger = (...args: unknown[]): FormattedLogMessage => { +export const formatMessageForLogger = ( + ...args: unknown[] +): FormattedLogMessage => { const head: unknown = args[0]; const body = args[1] as unknown as Record; if (typeof args[0] == "object") { const headers = head as LogMessageHeader; const { fileName, functionName, message } = headers; - return { message: `[${fileName}:${functionName}] ${message}`, data: body }; + return { + message: `[${fileName}:${functionName}] ${message}`, + data: body, + }; } else { return { message: String(head), data: body }; } -} +}; diff --git a/src/main.ts b/src/main.ts index b4c6034..9443970 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,26 +1,25 @@ import { Plugin, TAbstractFile, TFile, TFolder } from "obsidian"; -import VaultExplorerView from "./obsidian/vault-explorer-view"; import VaultExplorerSettingsTab from "./obsidian/vault-explorer-settings-tab"; +import VaultExplorerView from "./obsidian/vault-explorer-view"; -import { VaultExplorerPluginSettings } from "./types"; +import Logger from "js-logger"; import { DEFAULT_SETTINGS, HOVER_LINK_SOURCE_ID, VAULT_EXPLORER_VIEW, } from "./constants"; -import _ from "lodash"; import EventManager from "./event/event-manager"; -import { preformMigrations } from "./migrations"; -import Logger from "js-logger"; -import { formatMessageForLogger, stringToLogLevel } from "./logger"; -import { moveFocus } from "./focus-utils"; import { PluginEvent } from "./event/types"; -import { isVersionLessThan } from "./utils"; -import License from "./svelte/shared/services/license"; -import { clearSMICache } from "./svelte/app/services/smi-cache"; -import store from "./svelte/shared/services/store"; +import { moveFocus } from "./focus-utils"; +import { formatMessageForLogger, stringToLogLevel } from "./logger"; +import { preformMigrations } from "./migrations"; import "./styles.css"; +import { clearSMICache } from "./svelte/app/services/smi-cache"; +import License from "./svelte/shared/services/license"; +import store from "./svelte/shared/services/store"; +import type { VaultExplorerPluginSettings } from "./types"; +import { isVersionLessThan } from "./utils"; export default class VaultExplorerPlugin extends Plugin { settings: VaultExplorerPluginSettings = DEFAULT_SETTINGS; diff --git a/src/migrations/index.ts b/src/migrations/index.ts index f830627..848a4f0 100644 --- a/src/migrations/index.ts +++ b/src/migrations/index.ts @@ -1,16 +1,11 @@ import Migrate_0_4_0 from "./migrate_0_4_0"; -import Migrate_1_1_0 from "./migrate_1_1_0"; import Migrate_1_0_0 from "./migrate_1_0_0"; -import Migrate_1_2_1 from "./migrate_1_2_1"; -import Migrate_1_3_0 from "./migrate_1_3_0"; -import Migrate_1_6_0 from "./migrate_1_6_0"; -import Migrate_1_6_1 from "./migrate_1_6_1"; -import Migrate_1_9_0 from "./migrate_1_9_0"; +import Migrate_1_10_0 from "./migrate_1_10_0"; +import Migrate_1_13_0 from "./migrate_1_13_0"; import Migrate_1_14_0 from "./migrate_1_14_0"; import Migrate_1_15_0 from "./migrate_1_15_0"; import Migrate_1_17_0 from "./migrate_1_17_0"; -import Migrate_1_13_0 from "./migrate_1_13_0"; -import Migrate_1_10_0 from "./migrate_1_10_0"; +import Migrate_1_1_0 from "./migrate_1_1_0"; import Migrate_1_21_0 from "./migrate_1_21_0"; import Migrate_1_22_0 from "./migrate_1_22_0"; import Migrate_1_23_0 from "./migrate_1_23_0"; @@ -18,8 +13,12 @@ import Migrate_1_23_1 from "./migrate_1_23_1"; import Migrate_1_24_0 from "./migrate_1_24_0"; import Migrate_1_25_0 from "./migrate_1_25_0"; import Migrate_1_26_0 from "./migrate_1_26_0"; +import Migrate_1_2_1 from "./migrate_1_2_1"; +import Migrate_1_3_0 from "./migrate_1_3_0"; +import Migrate_1_6_0 from "./migrate_1_6_0"; +import Migrate_1_6_1 from "./migrate_1_6_1"; +import Migrate_1_9_0 from "./migrate_1_9_0"; -import { TMigration } from "./types"; import { isVersionLessThan } from "src/utils"; import Migrate_1_27_0 from "./migrate_1_27_0"; import Migrate_1_29_0 from "./migrate_1_29_0"; @@ -34,6 +33,7 @@ import Migrate_1_41_0 from "./migrate_1_41_0"; import Migrate_1_42_0 from "./migrate_1_42_0"; import Migrate_1_45_0 from "./migrate_1_45_0"; import Migrate_1_46_0 from "./migrate_1_46_0"; +import type { TMigration } from "./types"; const migrations: TMigration[] = [ { diff --git a/src/migrations/migrate_0_4_0.ts b/src/migrations/migrate_0_4_0.ts index 81960af..f653920 100644 --- a/src/migrations/migrate_0_4_0.ts +++ b/src/migrations/migrate_0_4_0.ts @@ -1,20 +1,20 @@ -import { VaultExplorerPluginSettings_0_5_5 } from "src/types/types-0.5.5"; -import { VaultExplorerPluginSettings_0_3_3 } from "src/types/types-0.3.3"; +import type { VaultExplorerPluginSettings_0_3_3 } from "src/types/types-0.3.3"; +import type { VaultExplorerPluginSettings_0_5_5 } from "src/types/types-0.5.5"; import MigrationInterface from "./migration_interface"; export default class Migrate_0_4_0 implements MigrationInterface { migrate(data: Record) { - const typedData = (data as unknown) as VaultExplorerPluginSettings_0_3_3; + const typedData = data as unknown as VaultExplorerPluginSettings_0_3_3; const newData: VaultExplorerPluginSettings_0_5_5 = { ...typedData, filters: { ...typedData.filters, properties: { ...typedData.filters.properties, - groups: [] - } + groups: [], + }, }, - } + }; return newData as unknown as Record; } } diff --git a/src/migrations/migrate_1_0_0.ts b/src/migrations/migrate_1_0_0.ts index 94b7b2e..6719244 100644 --- a/src/migrations/migrate_1_0_0.ts +++ b/src/migrations/migrate_1_0_0.ts @@ -1,11 +1,11 @@ -import { VaultExplorerPluginSettings_0_5_5 } from "src/types/types-0.5.5"; -import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_0_1 } from "src/types/types-1.0.1"; import { LOG_LEVEL_WARN } from "src/logger/constants"; +import type { VaultExplorerPluginSettings_0_5_5 } from "src/types/types-0.5.5"; +import type { VaultExplorerPluginSettings_1_0_1 } from "src/types/types-1.0.1"; +import MigrationInterface from "./migration_interface"; export default class Migrate_1_0_0 implements MigrationInterface { migrate(data: Record) { - const typedData = (data as unknown) as VaultExplorerPluginSettings_0_5_5; + const typedData = data as unknown as VaultExplorerPluginSettings_0_5_5; const newData: VaultExplorerPluginSettings_1_0_1 = { ...typedData, logLevel: LOG_LEVEL_WARN, @@ -13,18 +13,18 @@ export default class Migrate_1_0_0 implements MigrationInterface { ...typedData.filters, properties: { ...typedData.filters.properties, - groups: typedData.filters.properties.groups.map(group => { + groups: typedData.filters.properties.groups.map((group) => { const { id, name, filters, isEnabled } = group; return { id, name, filters, - isEnabled - } - }) - } - } - } + isEnabled, + }; + }), + }, + }, + }; return newData as unknown as Record; } } diff --git a/src/migrations/migrate_1_10_0.ts b/src/migrations/migrate_1_10_0.ts index 3c33707..944324f 100644 --- a/src/migrations/migrate_1_10_0.ts +++ b/src/migrations/migrate_1_10_0.ts @@ -1,32 +1,35 @@ -import { FilterRuleType_1_12_1, VaultExplorerPluginSettings_1_12_1 } from "src/types/types-1.12.1"; +import { + FilterRuleType_1_12_1, + type VaultExplorerPluginSettings_1_12_1, +} from "src/types/types-1.12.1"; +import type { VaultExplorerPluginSettings_1_9_1 } from "src/types/types-1.9.1"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_9_1 } from "src/types/types-1.9.1"; export default class Migrate_1_10_0 implements MigrationInterface { migrate(data: Record) { - const typedData = (data as unknown) as VaultExplorerPluginSettings_1_9_1; + const typedData = data as unknown as VaultExplorerPluginSettings_1_9_1; const newData: VaultExplorerPluginSettings_1_12_1 = { ...typedData, filters: { ...typedData.filters, custom: { ...typedData.filters.custom, - groups: typedData.filters.custom.groups.map(group => { - const rules = group.rules.map(rule => { + groups: typedData.filters.custom.groups.map((group) => { + const rules = group.rules.map((rule) => { return { ...rule, type: FilterRuleType_1_12_1.PROPERTY as any, propertyType: rule.type as any, - } + }; }); return { ...group, - rules - } - }) - } - } - } + rules, + }; + }), + }, + }, + }; delete (newData.filters as any).folder; delete (newData.filters as any).properties; for (const group of newData.filters.custom.groups as any) { diff --git a/src/migrations/migrate_1_13_0.ts b/src/migrations/migrate_1_13_0.ts index 80d503a..98fce64 100644 --- a/src/migrations/migrate_1_13_0.ts +++ b/src/migrations/migrate_1_13_0.ts @@ -1,29 +1,29 @@ -import { VaultExplorerPluginSettings_1_13_1 } from "src/types/types-1.13.1"; +import type { VaultExplorerPluginSettings_1_12_1 } from "src/types/types-1.12.1"; +import type { VaultExplorerPluginSettings_1_13_1 } from "src/types/types-1.13.1"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_12_1 } from "src/types/types-1.12.1"; export default class Migrate_1_13_0 implements MigrationInterface { migrate(data: Record) { - const typedData = (data as unknown) as VaultExplorerPluginSettings_1_12_1; + const typedData = data as unknown as VaultExplorerPluginSettings_1_12_1; const newData: VaultExplorerPluginSettings_1_13_1 = { ...typedData, views: { ...typedData.views, - enableClockUpdates: true + enableClockUpdates: true, }, filters: { ...typedData.filters, custom: { ...typedData.filters.custom, - groups: typedData.filters.custom.groups.map(group => { + groups: typedData.filters.custom.groups.map((group) => { return { ...group, - isSticky: false - } - }) - } - } - } + isSticky: false, + }; + }), + }, + }, + }; return newData as unknown as Record; } } diff --git a/src/migrations/migrate_1_14_0.ts b/src/migrations/migrate_1_14_0.ts index b5f313f..8645c82 100644 --- a/src/migrations/migrate_1_14_0.ts +++ b/src/migrations/migrate_1_14_0.ts @@ -1,37 +1,37 @@ -import { VaultExplorerPluginSettings_1_14_2 } from "src/types/types-1.14.2"; +import type { VaultExplorerPluginSettings_1_13_1 } from "src/types/types-1.13.1"; +import type { VaultExplorerPluginSettings_1_14_2 } from "src/types/types-1.14.2"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_13_1 } from "src/types/types-1.13.1"; export default class Migrate_1_14_0 implements MigrationInterface { migrate(data: Record) { - const typedData = (data as unknown) as VaultExplorerPluginSettings_1_13_1; + const typedData = data as unknown as VaultExplorerPluginSettings_1_13_1; const newData: VaultExplorerPluginSettings_1_14_2 = { ...typedData, filters: { ...typedData.filters, search: { isEnabled: true, - value: typedData.filters.search + value: typedData.filters.search, }, favorites: { isEnabled: true, - value: typedData.filters.onlyFavorites + value: typedData.filters.onlyFavorites, }, timestamp: { isEnabled: true, - value: typedData.filters.timestamp + value: typedData.filters.timestamp, }, sort: { isEnabled: true, - value: typedData.filters.sort + value: typedData.filters.sort, }, custom: { isEnabled: true, - ...typedData.filters.custom + ...typedData.filters.custom, }, }, enableScrollButtons: true, - } + }; delete (newData.filters as any).onlyFavorites; return newData as unknown as Record; } diff --git a/src/migrations/migrate_1_15_0.ts b/src/migrations/migrate_1_15_0.ts index 6af05e0..6b7bb2b 100644 --- a/src/migrations/migrate_1_15_0.ts +++ b/src/migrations/migrate_1_15_0.ts @@ -1,17 +1,20 @@ -import { VaultExplorerPluginSettings_1_16_0, ViewType_1_16_0 } from "src/types/types-1.16.0"; +import type { VaultExplorerPluginSettings_1_14_2 } from "src/types/types-1.14.2"; +import { + type VaultExplorerPluginSettings_1_16_0, + ViewType_1_16_0, +} from "src/types/types-1.16.0"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_14_2 } from "src/types/types-1.14.2"; export default class Migrate_1_15_0 implements MigrationInterface { migrate(data: Record) { - const typedData = (data as unknown) as VaultExplorerPluginSettings_1_14_2; + const typedData = data as unknown as VaultExplorerPluginSettings_1_14_2; const newData: VaultExplorerPluginSettings_1_16_0 = { ...typedData, views: { ...typedData.views, order: [...typedData.views.order, ViewType_1_16_0.FEED], - } - } + }, + }; return newData as unknown as Record; } } diff --git a/src/migrations/migrate_1_17_0.ts b/src/migrations/migrate_1_17_0.ts index d11fa7a..e1a18a7 100644 --- a/src/migrations/migrate_1_17_0.ts +++ b/src/migrations/migrate_1_17_0.ts @@ -1,7 +1,7 @@ import { TExplorerView } from "src/types"; +import type { VaultExplorerPluginSettings_1_16_0 } from "src/types/types-1.16.0"; +import type { VaultExplorerPluginSettings_1_20_0 } from "src/types/types-1.20.0"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_16_0 } from "src/types/types-1.16.0"; -import { VaultExplorerPluginSettings_1_20_0 } from "src/types/types-1.20.0"; export default class Migrate_1_17_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_1_0.ts b/src/migrations/migrate_1_1_0.ts index e8c541d..a9270ca 100644 --- a/src/migrations/migrate_1_1_0.ts +++ b/src/migrations/migrate_1_1_0.ts @@ -1,17 +1,20 @@ +import type { VaultExplorerPluginSettings_1_0_1 } from "src/types/types-1.0.1"; +import { + type VaultExplorerPluginSettings_1_2_0, + ViewType_1_2_0, +} from "src/types/types-1.2.0"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_0_1 } from "src/types/types-1.0.1"; -import { VaultExplorerPluginSettings_1_2_0, ViewType_1_2_0 } from "src/types/types-1.2.0"; export default class Migrate_1_1_0 implements MigrationInterface { migrate(data: Record) { - const typedData = (data as unknown) as VaultExplorerPluginSettings_1_0_1; + const typedData = data as unknown as VaultExplorerPluginSettings_1_0_1; const newData: VaultExplorerPluginSettings_1_2_0 = { ...typedData, views: { currentView: typedData.currentView as unknown as ViewType_1_2_0, - order: [ViewType_1_2_0.GRID, ViewType_1_2_0.LIST] - } - } + order: [ViewType_1_2_0.GRID, ViewType_1_2_0.LIST], + }, + }; return newData as unknown as Record; } } diff --git a/src/migrations/migrate_1_21_0.ts b/src/migrations/migrate_1_21_0.ts index a040093..d1d82a3 100644 --- a/src/migrations/migrate_1_21_0.ts +++ b/src/migrations/migrate_1_21_0.ts @@ -1,6 +1,6 @@ +import type { VaultExplorerPluginSettings_1_20_0 } from "src/types/types-1.20.0"; +import type { VaultExplorerPluginSettings_1_21_2 } from "src/types/types-1.21.2"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_20_0 } from "src/types/types-1.20.0"; -import { VaultExplorerPluginSettings_1_21_2 } from "src/types/types-1.21.2"; export default class Migrate_1_21_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_22_0.ts b/src/migrations/migrate_1_22_0.ts index 26a36eb..0b55214 100644 --- a/src/migrations/migrate_1_22_0.ts +++ b/src/migrations/migrate_1_22_0.ts @@ -1,6 +1,6 @@ +import type { VaultExplorerPluginSettings_1_21_2 } from "src/types/types-1.21.2"; +import type { VaultExplorerPluginSettings_1_22_0 } from "src/types/types-1.22.0"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_21_2 } from "src/types/types-1.21.2"; -import { VaultExplorerPluginSettings_1_22_0 } from "src/types/types-1.22.0"; export default class Migrate_1_22_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_23_0.ts b/src/migrations/migrate_1_23_0.ts index 37378b9..2c59417 100644 --- a/src/migrations/migrate_1_23_0.ts +++ b/src/migrations/migrate_1_23_0.ts @@ -1,6 +1,6 @@ +import type { VaultExplorerPluginSettings_1_22_0 } from "src/types/types-1.22.0"; +import type { VaultExplorerPluginSettings_1_23_0 } from "src/types/types-1.23.0"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_22_0 } from "src/types/types-1.22.0"; -import { VaultExplorerPluginSettings_1_23_0 } from "src/types/types-1.23.0"; export default class Migrate_1_23_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_23_1.ts b/src/migrations/migrate_1_23_1.ts index 5f37405..23416bd 100644 --- a/src/migrations/migrate_1_23_1.ts +++ b/src/migrations/migrate_1_23_1.ts @@ -1,6 +1,6 @@ +import type { VaultExplorerPluginSettings_1_23_0 } from "src/types/types-1.23.0"; +import type { VaultExplorerPluginSettings_1_23_2 } from "src/types/types-1.23.2"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_23_0 } from "src/types/types-1.23.0"; -import { VaultExplorerPluginSettings_1_23_2 } from "src/types/types-1.23.2"; export default class Migrate_1_23_1 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_24_0.ts b/src/migrations/migrate_1_24_0.ts index 8c0f929..7457463 100644 --- a/src/migrations/migrate_1_24_0.ts +++ b/src/migrations/migrate_1_24_0.ts @@ -1,6 +1,6 @@ +import type { VaultExplorerPluginSettings_1_23_2 } from "src/types/types-1.23.2"; +import type { VaultExplorerPluginSettings_1_24_2 } from "src/types/types-1.24.2"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_23_2 } from "src/types/types-1.23.2"; -import { VaultExplorerPluginSettings_1_24_2 } from "src/types/types-1.24.2"; export default class Migrate_1_24_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_25_0.ts b/src/migrations/migrate_1_25_0.ts index 8bf7c23..139ca6d 100644 --- a/src/migrations/migrate_1_25_0.ts +++ b/src/migrations/migrate_1_25_0.ts @@ -1,6 +1,6 @@ +import type { VaultExplorerPluginSettings_1_24_2 } from "src/types/types-1.24.2"; +import type { VaultExplorerPluginSettings_1_25_2 } from "src/types/types-1.25.2"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_24_2 } from "src/types/types-1.24.2"; -import { VaultExplorerPluginSettings_1_25_2 } from "src/types/types-1.25.2"; export default class Migrate_1_25_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_26_0.ts b/src/migrations/migrate_1_26_0.ts index 3e6250e..e57f95c 100644 --- a/src/migrations/migrate_1_26_0.ts +++ b/src/migrations/migrate_1_26_0.ts @@ -1,6 +1,6 @@ +import type { VaultExplorerPluginSettings_1_25_2 } from "src/types/types-1.25.2"; +import type { VaultExplorerPluginSettings_1_26_3 } from "src/types/types-1.26.3"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_25_2 } from "src/types/types-1.25.2"; -import { VaultExplorerPluginSettings_1_26_3 } from "src/types/types-1.26.3"; export default class Migrate_1_26_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_27_0.ts b/src/migrations/migrate_1_27_0.ts index 830a76d..29dafc8 100644 --- a/src/migrations/migrate_1_27_0.ts +++ b/src/migrations/migrate_1_27_0.ts @@ -1,6 +1,6 @@ +import type { VaultExplorerPluginSettings_1_26_3 } from "src/types/types-1.26.3"; +import type { VaultExplorerPluginSettings_1_28_0 } from "src/types/types-1.28.0"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_26_3 } from "src/types/types-1.26.3"; -import { VaultExplorerPluginSettings_1_28_0 } from "src/types/types-1.28.0"; export default class Migrate_1_27_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_29_0.ts b/src/migrations/migrate_1_29_0.ts index 7859e18..039304e 100644 --- a/src/migrations/migrate_1_29_0.ts +++ b/src/migrations/migrate_1_29_0.ts @@ -1,7 +1,6 @@ -import { VaultExplorerPluginSettings } from "src/types"; +import type { VaultExplorerPluginSettings_1_28_0 } from "src/types/types-1.28.0"; +import type { VaultExplorerPluginSettings_1_29_0 } from "src/types/types-1.29.0"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_28_0 } from "src/types/types-1.28.0"; -import { VaultExplorerPluginSettings_1_29_0 } from "src/types/types-1.29.0"; export default class Migrate_1_29_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_2_1.ts b/src/migrations/migrate_1_2_1.ts index a4c5aa2..590940e 100644 --- a/src/migrations/migrate_1_2_1.ts +++ b/src/migrations/migrate_1_2_1.ts @@ -1,17 +1,17 @@ +import type { VaultExplorerPluginSettings_1_2_0 } from "src/types/types-1.2.0"; +import type { VaultExplorerPluginSettings_1_2_1 } from "src/types/types-1.2.1"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_2_0 } from "src/types/types-1.2.0"; -import { VaultExplorerPluginSettings_1_2_1 } from "src/types/types-1.2.1"; export default class Migrate_1_2_1 implements MigrationInterface { migrate(data: Record) { - const typedData = (data as unknown) as VaultExplorerPluginSettings_1_2_0; + const typedData = data as unknown as VaultExplorerPluginSettings_1_2_0; const newData: VaultExplorerPluginSettings_1_2_1 = { ...typedData, views: { ...typedData.views, - titleWrapping: "normal" - } - } + titleWrapping: "normal", + }, + }; return newData as unknown as Record; } } diff --git a/src/migrations/migrate_1_30_5.ts b/src/migrations/migrate_1_30_5.ts index 455c9e0..0cd16b2 100644 --- a/src/migrations/migrate_1_30_5.ts +++ b/src/migrations/migrate_1_30_5.ts @@ -1,6 +1,6 @@ -import { VaultExplorerPluginSettings_1_30_5 } from "src/types/types-1.30.5"; +import type { VaultExplorerPluginSettings_1_29_0 } from "src/types/types-1.29.0"; +import type { VaultExplorerPluginSettings_1_30_5 } from "src/types/types-1.30.5"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_29_0 } from "src/types/types-1.29.0"; export default class Migrate_1_30_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_31_0.ts b/src/migrations/migrate_1_31_0.ts index 01e1f9f..cf564bc 100644 --- a/src/migrations/migrate_1_31_0.ts +++ b/src/migrations/migrate_1_31_0.ts @@ -1,6 +1,6 @@ +import type { VaultExplorerPluginSettings_1_30_5 } from "src/types/types-1.30.5"; +import type { VaultExplorerPluginSettings_1_32_2 } from "src/types/types-1.32.2"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_30_5 } from "src/types/types-1.30.5"; -import { VaultExplorerPluginSettings_1_32_2 } from "src/types/types-1.32.2"; export default class Migrate_1_31_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_33_0.ts b/src/migrations/migrate_1_33_0.ts index 9d26f04..617050b 100644 --- a/src/migrations/migrate_1_33_0.ts +++ b/src/migrations/migrate_1_33_0.ts @@ -1,6 +1,6 @@ +import type { VaultExplorerPluginSettings_1_32_2 } from "src/types/types-1.32.2"; +import type { VaultExplorerPluginSettings_1_36_3 } from "src/types/types-1.36.3"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_32_2 } from "src/types/types-1.32.2"; -import { VaultExplorerPluginSettings_1_36_3 } from "src/types/types-1.36.3"; export default class Migrate_1_33_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_37_0.ts b/src/migrations/migrate_1_37_0.ts index 9106c6d..0d7bc9d 100644 --- a/src/migrations/migrate_1_37_0.ts +++ b/src/migrations/migrate_1_37_0.ts @@ -1,6 +1,6 @@ +import type { VaultExplorerPluginSettings_1_37_2 } from "src/types/types-1-37-0"; +import type { VaultExplorerPluginSettings_1_36_3 } from "src/types/types-1.36.3"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_36_3 } from "src/types/types-1.36.3"; -import { VaultExplorerPluginSettings_1_37_2 } from "src/types/types-1-37-0"; export default class Migrate_1_37_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_38_0.ts b/src/migrations/migrate_1_38_0.ts index aded8fe..20b04ff 100644 --- a/src/migrations/migrate_1_38_0.ts +++ b/src/migrations/migrate_1_38_0.ts @@ -1,6 +1,6 @@ -import { VaultExplorerPluginSettings_1_37_2 } from "src/types/types-1-37-0"; +import type { VaultExplorerPluginSettings_1_37_2 } from "src/types/types-1-37-0"; +import type { VaultExplorerPluginSettings_1_38_0 } from "src/types/types-1.38.0"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_38_0 } from "src/types/types-1.38.0"; export default class Migrate_1_38_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_39_0.ts b/src/migrations/migrate_1_39_0.ts index 63b76e1..f5cd491 100644 --- a/src/migrations/migrate_1_39_0.ts +++ b/src/migrations/migrate_1_39_0.ts @@ -1,9 +1,9 @@ -import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_38_0 } from "src/types/types-1.38.0"; +import type { VaultExplorerPluginSettings_1_38_0 } from "src/types/types-1.38.0"; import { TExplorerView_1_39_0, - VaultExplorerPluginSettings_1_39_0, + type VaultExplorerPluginSettings_1_39_0, } from "src/types/types-1.39.0"; +import MigrationInterface from "./migration_interface"; export default class Migrate_1_39_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_3_0.ts b/src/migrations/migrate_1_3_0.ts index c1c4b23..8fc3ab8 100644 --- a/src/migrations/migrate_1_3_0.ts +++ b/src/migrations/migrate_1_3_0.ts @@ -1,25 +1,32 @@ +import type { VaultExplorerPluginSettings_1_2_1 } from "src/types/types-1.2.1"; +import type { + PropertyFilterGroup_1_5_0, + PropertyFilter_1_5_0, + VaultExplorerPluginSettings_1_5_0, +} from "src/types/types-1.5.0"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_2_1 } from "src/types/types-1.2.1"; -import { PropertyFilterGroup_1_5_0, PropertyFilter_1_5_0, VaultExplorerPluginSettings_1_5_0 } from "src/types/types-1.5.0"; export default class Migrate_1_3_0 implements MigrationInterface { migrate(data: Record) { - const typedData = (data as unknown) as VaultExplorerPluginSettings_1_2_1; + const typedData = data as unknown as VaultExplorerPluginSettings_1_2_1; const groups = typedData.filters.properties.groups; - const updatedGroups: PropertyFilterGroup_1_5_0[] = groups.map(group => { - const updatedFilters: PropertyFilter_1_5_0[] = group.filters.map(filter => { + const updatedGroups: PropertyFilterGroup_1_5_0[] = groups.map( + (group) => { + const updatedFilters: PropertyFilter_1_5_0[] = + group.filters.map((filter) => { + return { + ...filter, + type: filter.type as any, + matchWhenPropertyDNE: false, + }; + }); return { - ...filter, - type: filter.type as any, - matchWhenPropertyDNE: false - } - }); - return { - ...group, - filters: updatedFilters + ...group, + filters: updatedFilters, + }; } - }); + ); const newData: VaultExplorerPluginSettings_1_5_0 = { ...typedData, @@ -28,9 +35,9 @@ export default class Migrate_1_3_0 implements MigrationInterface { properties: { ...typedData.filters.properties, groups: updatedGroups, - } - } - } + }, + }, + }; return newData as unknown as Record; } } diff --git a/src/migrations/migrate_1_40_0.ts b/src/migrations/migrate_1_40_0.ts index 1c4c26e..2d01bd5 100644 --- a/src/migrations/migrate_1_40_0.ts +++ b/src/migrations/migrate_1_40_0.ts @@ -1,6 +1,6 @@ +import type { VaultExplorerPluginSettings_1_39_0 } from "src/types/types-1.39.0"; +import type { VaultExplorerPluginSettings_1_40_2 } from "src/types/types-1.40.2"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_39_0 } from "src/types/types-1.39.0"; -import { VaultExplorerPluginSettings_1_40_2 } from "src/types/types-1.40.2"; export default class Migrate_1_40_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_41_0.ts b/src/migrations/migrate_1_41_0.ts index 6fd0cc0..c6ded59 100644 --- a/src/migrations/migrate_1_41_0.ts +++ b/src/migrations/migrate_1_41_0.ts @@ -1,6 +1,6 @@ +import type { VaultExplorerPluginSettings_1_40_2 } from "src/types/types-1.40.2"; +import type { VaultExplorerPluginSettings_1_41_1 } from "src/types/types-1.41.1"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_40_2 } from "src/types/types-1.40.2"; -import { VaultExplorerPluginSettings_1_41_1 } from "src/types/types-1.41.1"; export default class Migrate_1_41_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_42_0.ts b/src/migrations/migrate_1_42_0.ts index c013eaa..3abc3ad 100644 --- a/src/migrations/migrate_1_42_0.ts +++ b/src/migrations/migrate_1_42_0.ts @@ -1,6 +1,6 @@ +import type { VaultExplorerPluginSettings_1_41_1 } from "src/types/types-1.41.1"; +import type { VaultExplorerPluginSettings_1_44_6 } from "src/types/types-1.44.6"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_41_1 } from "src/types/types-1.41.1"; -import { VaultExplorerPluginSettings_1_44_6 } from "src/types/types-1.44.6"; export default class Migrate_1_42_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_45_0.ts b/src/migrations/migrate_1_45_0.ts index 03977a9..da2b95f 100644 --- a/src/migrations/migrate_1_45_0.ts +++ b/src/migrations/migrate_1_45_0.ts @@ -1,7 +1,7 @@ -import { VaultExplorerPluginSettings_1_44_6 } from "src/types/types-1.44.6"; -import MigrationInterface from "./migration_interface"; import { TExplorerView } from "src/types"; -import { VaultExplorerPluginSettings_1_45_0 } from "src/types/types-1.45.0"; +import type { VaultExplorerPluginSettings_1_44_6 } from "src/types/types-1.44.6"; +import type { VaultExplorerPluginSettings_1_45_0 } from "src/types/types-1.45.0"; +import MigrationInterface from "./migration_interface"; export default class Migrate_1_45_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_46_0.ts b/src/migrations/migrate_1_46_0.ts index 823e6d4..7023dd4 100644 --- a/src/migrations/migrate_1_46_0.ts +++ b/src/migrations/migrate_1_46_0.ts @@ -1,6 +1,6 @@ +import { TExplorerView, type VaultExplorerPluginSettings } from "src/types"; +import type { VaultExplorerPluginSettings_1_45_0 } from "src/types/types-1.45.0"; import MigrationInterface from "./migration_interface"; -import { TExplorerView, VaultExplorerPluginSettings } from "src/types"; -import { VaultExplorerPluginSettings_1_45_0 } from "src/types/types-1.45.0"; export default class Migrate_1_46_0 implements MigrationInterface { migrate(data: Record) { diff --git a/src/migrations/migrate_1_6_0.ts b/src/migrations/migrate_1_6_0.ts index ff59330..08201bb 100644 --- a/src/migrations/migrate_1_6_0.ts +++ b/src/migrations/migrate_1_6_0.ts @@ -1,18 +1,18 @@ +import type { VaultExplorerPluginSettings_1_5_0 } from "src/types/types-1.5.0"; +import type { VaultExplorerPluginSettings_1_6_0 } from "src/types/types-1.6.0"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_5_0 } from "src/types/types-1.5.0"; -import { VaultExplorerPluginSettings_1_6_0 } from "src/types/types-1.6.0"; export default class Migrate_1_6_0 implements MigrationInterface { migrate(data: Record) { - const typedData = (data as unknown) as VaultExplorerPluginSettings_1_5_0; + const typedData = data as unknown as VaultExplorerPluginSettings_1_5_0; const newData: VaultExplorerPluginSettings_1_6_0 = { ...typedData, properties: { ...typedData.properties, creationDate: "", - modifiedDate: "" - } - } + modifiedDate: "", + }, + }; return newData as unknown as Record; } } diff --git a/src/migrations/migrate_1_6_1.ts b/src/migrations/migrate_1_6_1.ts index e97092a..5a4f4d3 100644 --- a/src/migrations/migrate_1_6_1.ts +++ b/src/migrations/migrate_1_6_1.ts @@ -1,18 +1,18 @@ +import type { VaultExplorerPluginSettings_1_6_0 } from "src/types/types-1.6.0"; +import type { VaultExplorerPluginSettings_1_8_1 } from "src/types/types-1.8.1"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_6_0 } from "src/types/types-1.6.0"; -import { VaultExplorerPluginSettings_1_8_1 } from "src/types/types-1.8.1"; export default class Migrate_1_6_1 implements MigrationInterface { migrate(data: Record) { - const typedData = (data as unknown) as VaultExplorerPluginSettings_1_6_0; + const typedData = data as unknown as VaultExplorerPluginSettings_1_6_0; const newData: VaultExplorerPluginSettings_1_8_1 = { ...typedData, properties: { ...typedData.properties, createdDate: "", - modifiedDate: "" - } - } + modifiedDate: "", + }, + }; delete (newData.properties as any).creationDate; return newData as unknown as Record; } diff --git a/src/migrations/migrate_1_9_0.ts b/src/migrations/migrate_1_9_0.ts index 55f5baa..2be3b8b 100644 --- a/src/migrations/migrate_1_9_0.ts +++ b/src/migrations/migrate_1_9_0.ts @@ -1,32 +1,33 @@ +import type { VaultExplorerPluginSettings_1_8_1 } from "src/types/types-1.8.1"; +import type { VaultExplorerPluginSettings_1_9_1 } from "src/types/types-1.9.1"; import MigrationInterface from "./migration_interface"; -import { VaultExplorerPluginSettings_1_8_1 } from "src/types/types-1.8.1"; -import { VaultExplorerPluginSettings_1_9_1 } from "src/types/types-1.9.1"; export default class Migrate_1_9_0 implements MigrationInterface { migrate(data: Record) { - const typedData = (data as unknown) as VaultExplorerPluginSettings_1_8_1; + const typedData = data as unknown as VaultExplorerPluginSettings_1_8_1; const newData: VaultExplorerPluginSettings_1_9_1 = { ...typedData, filters: { ...typedData.filters, custom: { - selectedGroupId: typedData.filters.properties.selectedGroupId, - groups: typedData.filters.properties.groups.map(group => { - const rules = group.filters.map(filter => { + selectedGroupId: + typedData.filters.properties.selectedGroupId, + groups: typedData.filters.properties.groups.map((group) => { + const rules = group.filters.map((filter) => { return { ...filter, valueData: "", - type: filter.type as any - } + type: filter.type as any, + }; }); return { ...group, - rules - } - }) - } - } - } + rules, + }; + }), + }, + }, + }; delete (newData.filters as any).properties; for (const group of newData.filters.custom.groups as any) { delete group.filters; diff --git a/src/obsidian/utils.ts b/src/obsidian/utils.ts index 07f1dfc..3794653 100644 --- a/src/obsidian/utils.ts +++ b/src/obsidian/utils.ts @@ -1,5 +1,5 @@ import { App } from "obsidian"; -import { ObsidianProperty, ObsidianPropertyType } from "./types"; +import type { ObsidianProperty, ObsidianPropertyType } from "./types"; /** * Gets all Obsidian properties diff --git a/src/obsidian/vault-explorer-settings-tab.ts b/src/obsidian/vault-explorer-settings-tab.ts index db62ab2..fcadee1 100644 --- a/src/obsidian/vault-explorer-settings-tab.ts +++ b/src/obsidian/vault-explorer-settings-tab.ts @@ -1,9 +1,6 @@ +import Logger from "js-logger"; import { App, PluginSettingTab, Setting, SliderComponent } from "obsidian"; -import VaultExplorerPlugin from "src/main"; -import { - getDropdownOptionsForProperties, - getObsidianPropertiesByType, -} from "./utils"; +import { stringToLogLevel } from "src/logger"; import { LOG_LEVEL_DEBUG, LOG_LEVEL_ERROR, @@ -12,21 +9,25 @@ import { LOG_LEVEL_TRACE, LOG_LEVEL_WARN, } from "src/logger/constants"; -import Logger from "js-logger"; -import { stringToLogLevel } from "src/logger"; -import { +import VaultExplorerPlugin from "src/main"; +import type { CollapseStyle, CoverImageFit, - TExplorerView, VaultExplorerPluginSettings, } from "src/types"; -import EventManager from "src/event/event-manager"; -import LicenseKeyApp from "../svelte/license-key-app/index.svelte"; -import ImageSourceApp from "../svelte/image-source-app/index.svelte"; -import { PluginEvent } from "src/event/types"; +import { + getDropdownOptionsForProperties, + getObsidianPropertiesByType, +} from "./utils"; + +import EventManager from "src/event/event-manager"; +import { PluginEvent } from "src/event/types"; +import { TExplorerView } from "src/types"; +import ImageSourceApp from "../svelte/image-source-app/index.svelte"; +import LicenseKeyApp from "../svelte/license-key-app/index.svelte"; -import "./styles.css"; import { clearSMICache } from "src/svelte/app/services/smi-cache"; +import "./styles.css"; export default class VaultExplorerSettingsTab extends PluginSettingTab { plugin: VaultExplorerPlugin; diff --git a/src/svelte/app/components/feed-card.svelte b/src/svelte/app/components/feed-card.svelte index d496e55..1009e2f 100644 --- a/src/svelte/app/components/feed-card.svelte +++ b/src/svelte/app/components/feed-card.svelte @@ -1,11 +1,19 @@ diff --git a/src/svelte/custom-filter-app/components/filter-rule.svelte b/src/svelte/custom-filter-app/components/filter-rule.svelte index 74b3041..dad0684 100644 --- a/src/svelte/custom-filter-app/components/filter-rule.svelte +++ b/src/svelte/custom-filter-app/components/filter-rule.svelte @@ -1,25 +1,25 @@