Optimized imports

Developer-Mike · Developer-Mike · commit b74893da2ba9 · 2025-02-03T17:39:41.000+01:00
diff --git a/src/canvas-extensions/advanced-styles/edge-pathfinding-methods/pathfinding-a-star.ts b/src/canvas-extensions/advanced-styles/edge-pathfinding-methods/pathfinding-a-star.ts
@@ -1,8 +1,8 @@
 import { BBox, Canvas, Position, Side } from "src/@types/Canvas"
-import EdgePathfindingMethod, { EdgePath } from "./edge-pathfinding-method"
-import SvgPathHelper from "src/utils/svg-path-helper"
 import AdvancedCanvasPlugin from "src/main"
 import BBoxHelper from "src/utils/bbox-helper"
+import SvgPathHelper from "src/utils/svg-path-helper"
+import EdgePathfindingMethod, { EdgePath } from "./edge-pathfinding-method"
 
 const MAX_MS_CALCULATION = 100
 const DIRECTIONS = [
diff --git a/src/canvas-extensions/advanced-styles/edge-pathfinding-methods/pathfinding-direct.ts b/src/canvas-extensions/advanced-styles/edge-pathfinding-methods/pathfinding-direct.ts
@@ -1,7 +1,7 @@
 import { Canvas, Position, Side } from "src/@types/Canvas"
-import EdgePathfindingMethod, { EdgePath } from "./edge-pathfinding-method"
-import SvgPathHelper from "src/utils/svg-path-helper"
 import AdvancedCanvasPlugin from "src/main"
+import SvgPathHelper from "src/utils/svg-path-helper"
+import EdgePathfindingMethod, { EdgePath } from "./edge-pathfinding-method"
 
 export default class EdgePathfindingDirect extends EdgePathfindingMethod {
   getPath(_plugin: AdvancedCanvasPlugin, _canvas: Canvas, fromPos: Position, _fromBBoxSidePos: Position, _fromSide: Side, toPos: Position, _toBBoxSidePos: Position, _toSide: Side): EdgePath {
diff --git a/src/canvas-extensions/advanced-styles/edge-pathfinding-methods/pathfinding-square.ts b/src/canvas-extensions/advanced-styles/edge-pathfinding-methods/pathfinding-square.ts
@@ -1,9 +1,9 @@
 import { Canvas, Position, Side } from "src/@types/Canvas"
-import EdgePathfindingMethod, { EdgePath } from "./edge-pathfinding-method"
-import SvgPathHelper from "src/utils/svg-path-helper"
 import AdvancedCanvasPlugin from "src/main"
 import BBoxHelper from "src/utils/bbox-helper"
 import CanvasHelper from "src/utils/canvas-helper"
+import SvgPathHelper from "src/utils/svg-path-helper"
+import EdgePathfindingMethod, { EdgePath } from "./edge-pathfinding-method"
 
 export default class EdgePathfindingSquare extends EdgePathfindingMethod {
   getPath(_plugin: AdvancedCanvasPlugin, _canvas: Canvas, fromPos: Position, fromBBoxSidePos: Position, fromSide: Side, toPos: Position, toBBoxSidePos: Position, toSide: Side): EdgePath {
diff --git a/src/canvas-extensions/advanced-styles/edge-styles.ts b/src/canvas-extensions/advanced-styles/edge-styles.ts
@@ -1,13 +1,13 @@
-import { BBox, Canvas, CanvasEdge, CanvasElement, CanvasNode, Position, Side } from "src/@types/Canvas"
-import CanvasHelper from "src/utils/canvas-helper"
+import { BBox, Canvas, CanvasEdge, CanvasNode, Position, Side } from "src/@types/Canvas"
 import { CanvasEvent, PluginEvent } from "src/events"
 import BBoxHelper from "src/utils/bbox-helper"
+import CanvasHelper from "src/utils/canvas-helper"
 import CanvasExtension from "../canvas-extension"
-import { BUILTIN_EDGE_STYLE_ATTRIBUTES, StyleAttribute } from "./style-config"
 import EdgePathfindingMethod from "./edge-pathfinding-methods/edge-pathfinding-method"
+import EdgePathfindingAStar from "./edge-pathfinding-methods/pathfinding-a-star"
 import EdgePathfindingDirect from "./edge-pathfinding-methods/pathfinding-direct"
 import EdgePathfindingSquare from "./edge-pathfinding-methods/pathfinding-square"
-import EdgePathfindingAStar from "./edge-pathfinding-methods/pathfinding-a-star"
+import { BUILTIN_EDGE_STYLE_ATTRIBUTES, StyleAttribute } from "./style-config"
 
 const EDGE_PATHFINDING_METHODS: { [key: string]: new() => EdgePathfindingMethod } = {
   'direct': EdgePathfindingDirect,
diff --git a/src/canvas-extensions/advanced-styles/node-styles.ts b/src/canvas-extensions/advanced-styles/node-styles.ts
@@ -1,6 +1,6 @@
 import { Canvas } from "src/@types/Canvas"
-import CanvasHelper from "src/utils/canvas-helper"
 import { CanvasEvent, PluginEvent } from "src/events"
+import CanvasHelper from "src/utils/canvas-helper"
 import CanvasExtension from "../canvas-extension"
 import { BUILTIN_NODE_STYLE_ATTRIBUTES, StyleAttribute } from "./style-config"
 
diff --git a/src/canvas-extensions/auto-resize-node-canvas-extension.ts b/src/canvas-extensions/auto-resize-node-canvas-extension.ts
@@ -1,8 +1,8 @@
+import { ViewUpdate } from "@codemirror/view"
 import { Canvas, CanvasNode, CanvasNodeData } from "src/@types/Canvas"
 import { CanvasEvent } from "src/events"
-import CanvasExtension from "./canvas-extension"
 import CanvasHelper from "src/utils/canvas-helper"
-import { ViewUpdate } from "@codemirror/view"
+import CanvasExtension from "./canvas-extension"
 
 export default class AutoResizeNodeCanvasExtension  extends CanvasExtension {
   isEnabled() { return 'autoResizeNodeFeatureEnabled' as const }
diff --git a/src/canvas-extensions/better-default-settings-canvas-extension.ts b/src/canvas-extensions/better-default-settings-canvas-extension.ts
@@ -1,8 +1,8 @@
 import { Canvas, CanvasEdge, CanvasNode } from "src/@types/Canvas"
 import { CanvasEvent, PluginEvent } from "src/events"
+import CanvasHelper from "src/utils/canvas-helper"
 import { FileSelectModal } from "src/utils/modal-helper"
 import CanvasExtension from "./canvas-extension"
-import CanvasHelper from "src/utils/canvas-helper"
 
 export default class BetterDefaultSettingsCanvasExtension  extends CanvasExtension {
   isEnabled() { return true }
diff --git a/src/canvas-extensions/better-readonly-canvas-extension.ts b/src/canvas-extensions/better-readonly-canvas-extension.ts
@@ -1,7 +1,7 @@
 import { Canvas } from "src/@types/Canvas"
-import CanvasHelper, { MenuOption } from "src/utils/canvas-helper"
 import { CanvasEvent } from "src/events"
 import { AdvancedCanvasPluginSettingsValues } from "src/settings"
+import CanvasHelper, { MenuOption } from "src/utils/canvas-helper"
 import CanvasExtension from "./canvas-extension"
 
 export default class BetterReadonlyCanvasExtension extends CanvasExtension {
diff --git a/src/canvas-extensions/collapsible-groups-canvas-extension.ts b/src/canvas-extensions/collapsible-groups-canvas-extension.ts
@@ -2,8 +2,8 @@ import { setIcon } from "obsidian"
 import { BBox, Canvas, CanvasData, CanvasNode, SelectionData } from "src/@types/Canvas"
 import { CanvasEvent } from "src/events"
 import BBoxHelper from "src/utils/bbox-helper"
-import CanvasExtension from "./canvas-extension"
 import CanvasHelper from "src/utils/canvas-helper"
+import CanvasExtension from "./canvas-extension"
 
 const COLLAPSE_BUTTON_ID = 'group-collapse-button'
 
diff --git a/src/canvas-extensions/commands-canvas-extension.ts b/src/canvas-extensions/commands-canvas-extension.ts
@@ -1,8 +1,8 @@
-import { Canvas, CanvasEdge, CanvasEdgeData, CanvasNodeData } from "src/@types/Canvas"
+import { Canvas, CanvasEdgeData } from "src/@types/Canvas"
+import BBoxHelper from "src/utils/bbox-helper"
 import CanvasHelper from "src/utils/canvas-helper"
 import { FileSelectModal } from "src/utils/modal-helper"
 import CanvasExtension from "./canvas-extension"
-import BBoxHelper from "src/utils/bbox-helper"
 
 type Direction = 'up' | 'down' | 'left' | 'right'
 const DIRECTIONS = ['up', 'down', 'left', 'right'] as Direction[]
diff --git a/src/canvas-extensions/dataset-exposers/node-exposer.ts b/src/canvas-extensions/dataset-exposers/node-exposer.ts
@@ -29,7 +29,7 @@ export default class NodeExposerExtension extends CanvasExtension {
             ? Object.entries(nodeData[exposedDataKey])
             : [[exposedDataKey, nodeData[exposedDataKey]]]
 
-          for (const [key, value] of datasetPairs) {
+          for (const [key, value] of datasetPairs as [string, string][]) {
             if (!value) delete node.nodeEl.dataset[key]
             else node.nodeEl.dataset[key] = value
           }
diff --git a/src/canvas-extensions/dataset-exposers/node-interaction-exposer.ts b/src/canvas-extensions/dataset-exposers/node-interaction-exposer.ts
@@ -1,7 +1,7 @@
 import { Canvas, CanvasNode } from "src/@types/Canvas"
-import { getExposedNodeData } from "./node-exposer"
 import { CanvasEvent } from "src/events"
 import CanvasExtension from "../canvas-extension"
+import { getExposedNodeData } from "./node-exposer"
 
 export const TARGET_NODE_DATASET_PREFIX = "target"
 
@@ -23,7 +23,7 @@ export default class NodeInteractionExposerExtension extends CanvasExtension {
             ? Object.entries(nodeData[exposedDataKey])
             : [[exposedDataKey, nodeData[exposedDataKey]]]
 
-          for (const [key, value] of datasetPairs) {
+          for (const [key, value] of datasetPairs as [string, string][]) {
             const modifiedKey = TARGET_NODE_DATASET_PREFIX + key.toString().charAt(0).toUpperCase() + key.toString().slice(1)
             
             if (!value) delete interactionEl.dataset[modifiedKey]
diff --git a/src/canvas-extensions/encapsulate-canvas-extension.ts b/src/canvas-extensions/encapsulate-canvas-extension.ts
@@ -1,9 +1,9 @@
 import { Menu } from "obsidian"
 import { Canvas } from "src/@types/Canvas"
-import { FileNameModal } from "src/utils/modal-helper"
+import { CanvasEvent } from "src/events"
 import CanvasHelper from "src/utils/canvas-helper"
+import { FileNameModal } from "src/utils/modal-helper"
 import CanvasExtension from "./canvas-extension"
-import { CanvasEvent } from "src/events"
 
 const ENCAPSULATED_FILE_NODE_SIZE = { width: 300, height: 300 }
 
diff --git a/src/canvas-extensions/export-canvas-extension.ts b/src/canvas-extensions/export-canvas-extension.ts
@@ -1,11 +1,9 @@
+import * as HtmlToImage from 'html-to-image'
+import { Modal, Notice, Setting } from "obsidian"
 import { BBox, Canvas, CanvasNode } from "src/@types/Canvas"
+import BBoxHelper from "src/utils/bbox-helper"
 import CanvasHelper from "src/utils/canvas-helper"
-import * as HtmlToImage from 'html-to-image'
 import CanvasExtension from "./canvas-extension"
-import { Modal, Notice, ProgressBarComponent, Setting } from "obsidian"
-import BBoxHelper from "src/utils/bbox-helper"
-import AdvancedCanvasPlugin from "src/main"
-import DebugHelper from "src/utils/debug-helper"
 
 const MAX_ALLOWED_LOADING_TIME = 10_000
 const MAX_PIXEL_RATIO = 20
diff --git a/src/canvas-extensions/flip-edge-canvas-extension.ts b/src/canvas-extensions/flip-edge-canvas-extension.ts
@@ -1,7 +1,7 @@
 import { Canvas, CanvasEdge } from "src/@types/Canvas"
 import { CanvasEvent } from "src/events"
-import CanvasExtension from "./canvas-extension"
 import CanvasHelper from "src/utils/canvas-helper"
+import CanvasExtension from "./canvas-extension"
 
 export default class FlipEdgeCanvasExtension extends CanvasExtension {
   isEnabled() { return 'flipEdgeFeatureEnabled' as const }
diff --git a/src/canvas-extensions/focus-mode-canvas-extension.ts b/src/canvas-extensions/focus-mode-canvas-extension.ts
@@ -1,6 +1,6 @@
 import { Canvas } from "src/@types/Canvas"
-import CanvasHelper from "src/utils/canvas-helper"
 import { CanvasEvent } from "src/events"
+import CanvasHelper from "src/utils/canvas-helper"
 import CanvasExtension from "./canvas-extension"
 
 const CONTROL_MENU_FOCUS_TOGGLE_ID = 'focus-mode-toggle'
diff --git a/src/canvas-extensions/group-canvas-extension.ts b/src/canvas-extensions/group-canvas-extension.ts
@@ -1,6 +1,6 @@
 import { Canvas, Position } from "src/@types/Canvas"
-import CanvasHelper from "src/utils/canvas-helper"
 import { CanvasEvent } from "src/events"
+import CanvasHelper from "src/utils/canvas-helper"
 import CanvasExtension from "./canvas-extension"
 
 const GROUP_NODE_SIZE = { width: 300, height: 300 }
diff --git a/src/canvas-extensions/portals-canvas-extension.ts b/src/canvas-extensions/portals-canvas-extension.ts
@@ -1,5 +1,5 @@
 import { TFile } from "obsidian"
-import { BBox, Canvas, CanvasData, CanvasEdge, CanvasElement, CanvasNode, CanvasNodeData, CanvasView } from "src/@types/Canvas"
+import { BBox, Canvas, CanvasData, CanvasElement, CanvasNode, CanvasNodeData, CanvasView } from "src/@types/Canvas"
 import { CanvasEvent } from "src/events"
 import CanvasHelper from "src/utils/canvas-helper"
 import CanvasExtension from "./canvas-extension"
diff --git a/src/canvas-extensions/presentation-canvas-extension.ts b/src/canvas-extensions/presentation-canvas-extension.ts
@@ -1,8 +1,8 @@
 import { Menu, Notice } from 'obsidian'
 import { BBox, Canvas, CanvasEdge, CanvasElement, CanvasNode, Position, Size } from 'src/@types/Canvas'
 import { CanvasEvent } from 'src/events'
-import CanvasHelper from "src/utils/canvas-helper"
 import BBoxHelper from "src/utils/bbox-helper"
+import CanvasHelper from "src/utils/canvas-helper"
 import CanvasExtension from './canvas-extension'
 
 const START_SLIDE_NAME = 'Start Slide'
diff --git a/src/canvas-extensions/z-ordering-canvas-extension.ts b/src/canvas-extensions/z-ordering-canvas-extension.ts
@@ -1,8 +1,8 @@
+import { Menu } from "obsidian"
 import { Canvas, CanvasNode } from "src/@types/Canvas"
 import { CanvasEvent } from "src/events"
-import CanvasExtension from "./canvas-extension"
-import { Menu } from "obsidian"
 import BBoxHelper from "src/utils/bbox-helper"
+import CanvasExtension from "./canvas-extension"
 
 export default class ZOrderingCanvasExtension  extends CanvasExtension {
   isEnabled() { return 'zOrderingFeatureEnabled' as const }
diff --git a/src/patchers/backlinks-patcher.ts b/src/patchers/backlinks-patcher.ts
@@ -1,6 +1,6 @@
+import { TAbstractFile, TFile, TFolder } from "obsidian"
 import PatchHelper from "src/utils/patch-helper"
 import Patcher from "./patcher"
-import { TAbstractFile, TFile, TFolder } from "obsidian"
 
 export default class BacklinksPatcher extends Patcher {
   private isRecomputingBacklinks: boolean = false
diff --git a/src/patchers/canvas-patcher.ts b/src/patchers/canvas-patcher.ts
@@ -1,11 +1,11 @@
-import { BBox, Canvas, CanvasData, CanvasEdge, CanvasEdgeData, CanvasElement, CanvasNode, CanvasNodeData, CanvasView } from "src/@types/Canvas"
-import PatchHelper from "src/utils/patch-helper"
-import { CanvasEvent } from "../events"
-import { requireApiVersion, WorkspaceLeaf, editorInfoField } from "obsidian"
 import { EditorView, ViewUpdate } from "@codemirror/view"
+import JSONSS from "json-stable-stringify"
 import { around } from "monkey-around"
+import { editorInfoField, requireApiVersion, WorkspaceLeaf } from "obsidian"
+import { BBox, CanvasData, CanvasEdge, CanvasEdgeData, CanvasElement, CanvasNode, CanvasNodeData, CanvasView } from "src/@types/Canvas"
+import PatchHelper from "src/utils/patch-helper"
 import JSONC from "tiny-jsonc"
-import JSONSS from "json-stable-stringify"
+import { CanvasEvent } from "../events"
 import Patcher from "./patcher"
 
 export default class CanvasPatcher extends Patcher {
diff --git a/src/patchers/metadata-cache-patcher.ts b/src/patchers/metadata-cache-patcher.ts
@@ -1,6 +1,6 @@
 import { TFile } from "obsidian"
 import { CanvasData, CanvasNodeData } from "src/@types/Canvas"
-import { NodesCache, ExtendedCachedMetadata, MetadataCacheMap } from "src/@types/Obsidian"
+import { ExtendedCachedMetadata, MetadataCacheMap } from "src/@types/Obsidian"
 import HashHelper from "src/utils/hash-helper"
 import PatchHelper from "src/utils/patch-helper"
 import PathHelper from "src/utils/path-helper"
diff --git a/src/quicksettings.ts b/src/quicksettings.ts
@@ -1,8 +1,8 @@
 import App, { SuggestModal } from "obsidian"
-import AdvancedCanvasPlugin from "./main"
-import SettingsManager, { SETTINGS, AdvancedCanvasPluginSettingsValues, DEFAULT_SETTINGS_VALUES } from "./settings"
 import { DropdownSetting, Setting, StyleAttributesSetting } from "./@types/Settings"
 import { StyleAttribute } from "./canvas-extensions/advanced-styles/style-config"
+import AdvancedCanvasPlugin from "./main"
+import SettingsManager, { AdvancedCanvasPluginSettingsValues, DEFAULT_SETTINGS_VALUES, SETTINGS } from "./settings"
 
 export default class Quicksettings {
   plugin: AdvancedCanvasPlugin
diff --git a/src/settings.ts b/src/settings.ts
@@ -1,9 +1,9 @@
 import { Notice, PluginSettingTab, Setting as SettingEl } from "obsidian"
-import AdvancedCanvasPlugin from "./main"
+import { BooleanSetting, ButtonSetting, DropdownSetting, NumberSetting, Setting, SettingsHeading, StyleAttributesSetting, TextSetting } from "./@types/Settings"
 import { BUILTIN_EDGE_STYLE_ATTRIBUTES, BUILTIN_NODE_STYLE_ATTRIBUTES, StyleAttribute } from "./canvas-extensions/advanced-styles/style-config"
-import { ButtonSetting, DropdownSetting, StyleAttributesSetting, SettingsHeading, Setting, TextSetting, BooleanSetting, NumberSetting } from "./@types/Settings"
 import { VARIABLE_BREAKPOINT_CSS_VAR } from "./canvas-extensions/variable-breakpoint-canvas-extension"
 import { PluginEvent } from "./events"
+import AdvancedCanvasPlugin from "./main"
 
 const README_URL = 'https://github.com/Developer-Mike/obsidian-advanced-canvas?tab=readme-ov-file'
 const ASK_FOR_DONATION_DELAY = 1000 * 60 * 60 * 24 * 7 // 1 week
diff --git a/src/utils/bbox-helper.ts b/src/utils/bbox-helper.ts
@@ -1,4 +1,4 @@
-import { BBox, CanvasNodeData, Position, Side } from "src/@types/Canvas"
+import { BBox, Position, Side } from "src/@types/Canvas"
 
 export default class BBoxHelper {
   static combineBBoxes(bboxes: BBox[]): BBox {
diff --git a/src/utils/canvas-helper.ts b/src/utils/canvas-helper.ts
@@ -1,5 +1,5 @@
 import { setIcon, setTooltip } from "obsidian"
-import { BBox, Canvas, CanvasEdge, CanvasEdgeData, CanvasNode, CanvasNodeData, Position, Size } from "src/@types/Canvas"
+import { BBox, Canvas, CanvasEdge, CanvasNode, CanvasNodeData, Position, Size } from "src/@types/Canvas"
 import { StyleAttribute } from "src/canvas-extensions/advanced-styles/style-config"
 import AdvancedCanvasPlugin from "src/main"
 import BBoxHelper from "./bbox-helper"
diff --git a/src/utils/debug-helper.ts b/src/utils/debug-helper.ts
@@ -1,6 +1,6 @@
+import { BBox, Canvas, CanvasNode } from "src/@types/Canvas"
 import AdvancedCanvasPlugin from "src/main"
 import { CanvasEvent } from "../events"
-import { BBox, Canvas, CanvasNode } from "src/@types/Canvas"
 
 export default class DebugHelper {
   plugin: AdvancedCanvasPlugin
diff --git a/src/utils/migration-helper.ts b/src/utils/migration-helper.ts
@@ -18,7 +18,7 @@ export default class MigrationHelper {
       CanvasEvent.CanvasChanged,
       (canvas: Canvas) => {
         for (const node of canvas.nodes.values()) {
-          const nodeData = node.getData()
+          const nodeData = node.getData() as any
 
           const newStyleAttributes: { [key: string]: string | null } = {}
 
