Merge pull request #2169 from zsviczian/2.7.2-casing

2.7.2 file and folder name casing + empty line before ## Text Elements

docs/API/ExcalidrawAutomate.d.ts

@@ -1,16 +1,16 @@
 /// <reference types="react" />
-import ExcalidrawPlugin from "src/main";
+import ExcalidrawPlugin from "src/core/main";
 import { FillStyle, StrokeStyle, ExcalidrawElement, ExcalidrawBindableElement, FileId, NonDeletedExcalidrawElement, ExcalidrawImageElement, StrokeRoundness, RoundnessType } from "@zsviczian/excalidraw/types/excalidraw/element/types";
 import { Editor, OpenViewState, TFile, WorkspaceLeaf } from "obsidian";
 import * as obsidian_module from "obsidian";
-import ExcalidrawView, { ExportSettings } from "src/ExcalidrawView";
+import ExcalidrawView, { ExportSettings } from "src/view/ExcalidrawView";
 import { AppState, BinaryFileData, DataURL, ExcalidrawImperativeAPI, Point } from "@zsviczian/excalidraw/types/excalidraw/types";
 import { EmbeddedFilesLoader } from "src/EmbeddedFileLoader";
 import { ConnectionPoint, DeviceType } from "src/types/types";
 import { ColorMaster } from "colormaster";
 import { TInput } from "colormaster/types";
 import { ClipboardData } from "@zsviczian/excalidraw/types/excalidraw/clipboard";
-import { PaneTarget } from "src/utils/ModifierkeyHelper";
+import { PaneTarget } from "src/utils/modifierkeyHelper";
 export declare class ExcalidrawAutomate {
     /**
      * Utility function that returns the Obsidian Module object.

docs/API/attributes_functions_overview.md

@@ -17,7 +17,7 @@ import { ConnectionPoint, DeviceType } from "src/types";
 import { ColorMaster } from "colormaster";
 import { TInput } from "colormaster/types";
 import { ClipboardData } from "@zsviczian/excalidraw/types/clipboard";
-import { PaneTarget } from "src/utils/ModifierkeyHelper";
+import { PaneTarget } from "src/utils/modifierkeyHelper";
 export declare class ExcalidrawAutomate {
     /**
      * Utility function that returns the Obsidian Module object.

rollup.config.js

@@ -102,7 +102,7 @@ const packageString = isLib
   'const PLUGIN_VERSION="' + manifest.version + '";';
 
 const BASE_CONFIG = {
-  input: 'src/main.ts',
+  input: 'src/core/main.ts',
   external: [
     '@codemirror/autocomplete',
     '@codemirror/collab',
@@ -141,7 +141,12 @@ const BUILD_CONFIG = {
     exports: 'default',
   },
   plugins: getRollupPlugins(
-    {tsconfig: isProd ? "tsconfig.json" : "tsconfig.dev.json"},
+    {
+      tsconfig: isProd ? "tsconfig.json" : "tsconfig.dev.json",
+      sourcemap: !isProd,
+      clean: true,
+      verbosity: isProd ? 1 : 2,
+    },
     ...(isProd ? [
       terser({
         toplevel: false,
@@ -166,10 +171,10 @@ const BUILD_CONFIG = {
 
 const LIB_CONFIG = {
   ...BASE_CONFIG,
-  input: "src/index.ts",
+  input: "src/core/index.ts",
   output: {
     dir: "lib",
-    sourcemap: true,
+    sourcemap: false,
     format: "cjs",
     name: "Excalidraw (Library)",
   },

src/OneOffs.ts

@@ -1,368 +0,0 @@
-import ExcalidrawPlugin from "./main";
-
-export class OneOffs {
-  private plugin: ExcalidrawPlugin;
-
-  constructor(plugin: ExcalidrawPlugin) {
-    this.plugin = plugin;
-  }
-
-  /*
-  public patchCommentBlock() {
-    //This is a once off cleanup process to remediate incorrectly placed comment %% before # Text Elements
-    if (!this.plugin.settings.patchCommentBlock) {
-      return;
-    }
-    const plugin = this.plugin;
-
-    log(
-      `${window
-        .moment()
-        .format("HH:mm:ss")}: Excalidraw will patch drawings in 5 minutes`,
-    );
-    setTimeout(async () => {
-      await plugin.loadSettings();
-      if (!plugin.settings.patchCommentBlock) {
-        log(
-          `${window
-            .moment()
-            .format(
-              "HH:mm:ss",
-            )}: Excalidraw patching aborted because synched data.json is already patched`,
-        );
-        return;
-      }
-      log(
-        `${window
-          .moment()
-          .format("HH:mm:ss")}: Excalidraw is starting the patching process`,
-      );
-      let i = 0;
-      const excalidrawFiles = plugin.app.vault.getFiles();
-      for (const f of (excalidrawFiles || []).filter((f: TFile) =>
-        plugin.isExcalidrawFile(f),
-      )) {
-        if (
-          f.extension !== "excalidraw" && //legacy files do not need to be touched
-          plugin.app.workspace.getActiveFile() !== f
-        ) {
-          //file is currently being edited
-          let drawing = await plugin.app.vault.read(f);
-          const orig_drawing = drawing;
-          drawing = drawing.replaceAll("\r\n", "\n").replaceAll("\r", "\n"); //Win, Mac, Linux compatibility
-          drawing = drawing.replace(
-            "\n%%\n# Text Elements\n",
-            "\n# Text Elements\n",
-          );
-          if (drawing.search("\n%%\n# Drawing\n") === -1) {
-            const sceneJSONandPOS = getJSON(drawing);
-            drawing = `${drawing.substr(
-              0,
-              sceneJSONandPOS.pos,
-            )}\n%%\n# Drawing\n\`\`\`json\n${sceneJSONandPOS.scene}\n\`\`\`%%`;
-          }
-          if (drawing !== orig_drawing) {
-            i++;
-            log(`Excalidraw patched: ${f.path}`);
-            await plugin.app.vault.modify(f, drawing);
-          }
-        }
-      }
-      plugin.settings.patchCommentBlock = false;
-      plugin.saveSettings();
-      log(
-        `${window
-          .moment()
-          .format("HH:mm:ss")}: Excalidraw patched in total ${i} files`,
-      );
-    }, 300000); //5 minutes
-  }
-
-  public migrationNotice() {
-    if (this.plugin.settings.loadCount > 0) {
-      return;
-    }
-    const plugin = this.plugin;
-
-    plugin.app.workspace.onLayoutReady(async () => {
-      plugin.settings.loadCount++;
-      plugin.saveSettings();
-      const files = plugin.app.vault
-        .getFiles()
-        .filter((f) => f.extension === "excalidraw");
-      if (files.length > 0) {
-        const prompt = new MigrationPrompt(plugin.app, plugin);
-        prompt.open();
-      }
-    });
-  }
-
-  public imageElementLaunchNotice() {
-    if (!this.plugin.settings.imageElementNotice) {
-      return;
-    }
-    const plugin = this.plugin;
-
-    plugin.app.workspace.onLayoutReady(async () => {
-      const prompt = new ImageElementNotice(plugin.app, plugin);
-      prompt.open();
-    });
-  }
-
-  public wysiwygPatch() {
-    if (this.plugin.settings.patchCommentBlock) {
-      return;
-    } //the comment block patch needs to happen first (unlikely that someone has waited this long with the update...)
-    //This is a once off process to patch excalidraw files remediate incorrectly placed comment %% before # Text Elements
-    if (
-      !(
-        this.plugin.settings.runWYSIWYGpatch ||
-        this.plugin.settings.fixInfinitePreviewLoop
-      )
-    ) {
-      return;
-    }
-    const plugin = this.plugin;
-
-    log(
-      `${window
-        .moment()
-        .format(
-          "HH:mm:ss",
-        )}: Excalidraw will patch drawings to support WYSIWYG in 7 minutes`,
-    );
-    setTimeout(async () => {
-      await plugin.loadSettings();
-      if (
-        !(
-          this.plugin.settings.runWYSIWYGpatch ||
-          this.plugin.settings.fixInfinitePreviewLoop
-        )
-      ) {
-        log(
-          `${window
-            .moment()
-            .format(
-              "HH:mm:ss",
-            )}: Excalidraw patching aborted because synched data.json is already patched`,
-        );
-        return;
-      }
-      log(
-        `${window
-          .moment()
-          .format("HH:mm:ss")}: Excalidraw is starting the patching process`,
-      );
-      let i = 0;
-      const excalidrawFiles = plugin.app.vault.getFiles();
-      for (const f of (excalidrawFiles || []).filter((f: TFile) =>
-        plugin.isExcalidrawFile(f),
-      )) {
-        if (
-          f.extension !== "excalidraw" && //legacy files do not need to be touched
-          plugin.app.workspace.getActiveFile() !== f
-        ) {
-          //file is currently being edited
-          try {
-            const excalidrawData = new ExcalidrawData(plugin);
-            const data = await plugin.app.vault.read(f);
-            const textMode = getTextMode(data);
-            await excalidrawData.loadData(data, f, textMode);
-
-            let trimLocation = data.search(/(^%%\n)?# Text Elements\n/m);
-            if (trimLocation == -1) {
-              trimLocation = data.search(/(%%\n)?# Drawing\n/);
-            }
-            if (trimLocation > -1) {
-              let header = data
-                .substring(0, trimLocation)
-                .replace(
-                  /excalidraw-plugin:\s.*\n/,
-                  `${FRONTMATTER_KEY}: ${
-                    textMode == TextMode.raw ? "raw\n" : "parsed\n"
-                  }`,
-                );
-
-              header = header.replace(
-                /cssclass:[\s]*excalidraw-hide-preview-text[\s]*\n/,
-                "",
-              );
-
-              const REG_IMG = /(^---[\w\W]*?---\n)(!\[\[.*?]]\n(%%\n)?)/m; //(%%\n)? because of 1.4.8-beta... to be backward compatible with anyone who installed that version
-              if (header.match(REG_IMG)) {
-                header = header.replace(REG_IMG, "$1");
-              }
-              const newData = header + excalidrawData.generateMD();
-
-              if (data !== newData) {
-                i++;
-                log(`Excalidraw patched: ${f.path}`);
-                await plugin.app.vault.modify(f, newData);
-              }
-            }
-          } catch (e) {
-            errorlog({
-              where: "OneOffs.wysiwygPatch",
-              message: `Unable to process: ${f.path}`,
-              error: e,
-            });
-          }
-        }
-      }
-      plugin.settings.runWYSIWYGpatch = false;
-      plugin.settings.fixInfinitePreviewLoop = false;
-      plugin.saveSettings();
-      log(
-        `${window
-          .moment()
-          .format("HH:mm:ss")}: Excalidraw patched in total ${i} files`,
-      );
-    }, 420000); //7 minutes
-  }
-}
-
-class MigrationPrompt extends Modal {
-  private plugin: ExcalidrawPlugin;
-
-  constructor(app: App, plugin: ExcalidrawPlugin) {
-    super(app);
-    this.plugin = plugin;
-  }
-
-  onOpen(): void {
-    this.titleEl.setText("Welcome to Excalidraw 1.2");
-    this.createForm();
-  }
-
-  onClose(): void {
-    this.contentEl.empty();
-  }
-
-  createForm(): void {
-    const div = this.contentEl.createDiv();
-    //    div.addClass("excalidraw-prompt-div");
-    //    div.style.maxWidth = "600px";
-    div.createEl("p", {
-      text: "This version comes with tons of new features and possibilities. Please read the description in Community Plugins to find out more.",
-    });
-    div.createEl("p", { text: "" }, (el) => {
-      el.innerHTML =
-        "Drawings you've created with version 1.1.x need to be converted to take advantage of the new features. You can also continue to use them in compatibility mode. " +
-        "During conversion your old *.excalidraw files will be replaced with new *.excalidraw.md files.";
-    });
-    div.createEl("p", { text: "" }, (el) => {
-      //files manually follow one of two options:
-      el.innerHTML =
-        "To convert your drawings you have the following options:<br><ul>" +
-        "<li>Click <code>CONVERT FILES</code> now to convert all of your *.excalidraw files, or if you prefer to make a backup first, then click <code>CANCEL</code>.</li>" +
-        "<li>In the Command Palette select <code>Excalidraw: Convert *.excalidraw files to *.excalidraw.md files</code></li>" +
-        "<li>Right click an <code>*.excalidraw</code> file in File Explorer and select one of the following options to convert files one by one: <ul>" +
-        "<li><code>*.excalidraw => *.excalidraw.md</code></li>" +
-        "<li><code>*.excalidraw => *.md (Logseq compatibility)</code>. This option will retain the original *.excalidraw file next to the new Obsidian format. " +
-        "Make sure you also enable <code>Compatibility features</code> in Settings for a full solution.</li></ul></li>" +
-        "<li>Open a drawing in compatibility mode and select <code>Convert to new format</code> from the <code>Options Menu</code></li></ul>";
-    });
-    div.createEl("p", {
-      text: "This message will only appear maximum 3 times in case you have *.excalidraw files in your Vault.",
-    });
-    const bConvert = div.createEl("button", { text: "CONVERT FILES" });
-    bConvert.onclick = () => {
-      this.plugin.convertExcalidrawToMD();
-      this.close();
-    };
-    const bCancel = div.createEl("button", { text: "CANCEL" });
-    bCancel.onclick = () => {
-      this.close();
-    };
-  }
-}
-
-class ImageElementNotice extends Modal {
-  private plugin: ExcalidrawPlugin;
-  private saveChanges: boolean = false;
-
-  constructor(app: App, plugin: ExcalidrawPlugin) {
-    super(app);
-    this.plugin = plugin;
-  }
-
-  onOpen(): void {
-    this.titleEl.setText("Image Elements have arrived!");
-    this.createForm();
-  }
-
-  async onClose() {
-    this.contentEl.empty();
-    if (!this.saveChanges) {
-      return;
-    }
-    await this.plugin.loadSettings();
-    this.plugin.settings.imageElementNotice = false;
-    this.plugin.saveSettings();
-  }
-
-  createForm(): void {
-    const div = this.contentEl.createDiv();
-    //div.addClass("excalidraw-prompt-div");
-    //div.style.maxWidth = "600px";
-
-    div.createEl("p", { text: "" }, (el) => {
-      el.innerHTML =
-        "Welcome to Obsidian-Excalidraw 1.4! I've added Image Elements. " +
-        "Please watch the video below to learn how to use this new feature.";
-    });
-
-    div.createEl("p", { text: "" }, (el) => {
-      el.innerHTML =
-        "<u>⚠ WARNING:</u> Opening new drawings with an older version of the plugin will lead to loss of images. " +
-        "Update the plugin on all your devices.";
-    });
-
-    div.createEl("p", { text: "" }, (el) => {
-      el.innerHTML =
-        "Since March, I have spent most of my free time building this plugin. Close to 75 workdays worth of my time (assuming 8-hour days).  " +
-        "Some of you have already bought me a coffee. THANK YOU! Your support really means a lot to me! If you have not yet done so, please consider clicking the button below.";
-    });
-
-    const coffeeDiv = div.createDiv("coffee");
-    coffeeDiv.addClass("ex-coffee-div");
-    const coffeeLink = coffeeDiv.createEl("a", {
-      href: "https://ko-fi.com/zsolt",
-    });
-    const coffeeImg = coffeeLink.createEl("img", {
-      attr: {
-        src: "https://cdn.ko-fi.com/cdn/kofi3.png?v=3",
-      },
-    });
-    coffeeImg.height = 45;
-
-    div.createEl("p", { text: "" }, (el) => {
-      //files manually follow one of two options:
-      el.style.textAlign = "center";
-      el.innerHTML =
-        '<iframe width="560" height="315" src="https://www.youtube.com/embed/_c_0zpBJ4Xc?start=20" title="YouTube video player" ' +
-        'frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" ' +
-        "allowfullscreen></iframe>";
-    });
-
-    div.createEl("p", { text: "" }, (el) => {
-      //files manually follow one of two options:
-      el.style.textAlign = "right";
-
-      const bOk = el.createEl("button", { text: "OK - Don't show this again" });
-      bOk.onclick = () => {
-        this.saveChanges = true;
-        this.close();
-      };
-
-      const bCancel = el.createEl("button", {
-        text: "CANCEL - Read next time",
-      });
-      bCancel.onclick = () => {
-        this.saveChanges = false;
-        this.close();
-      };
-    });
-  }
-  */
-}

src/constants/actionIcons.tsx

@@ -1,6 +1,6 @@
 import { Copy, Crop, Globe, RotateCcw, Scan, Settings, TextSelect } from "lucide-react";
 import * as React from "react";
-import { PenStyle } from "src/types/PenTypes";
+import { PenStyle } from "src/types/penTypes";
 
 export const ICONS = {
   ExportImage: (

src/constants/constants.ts

@@ -1,8 +1,8 @@
 import { customAlphabet } from "nanoid";
-import { DeviceType } from "../types/types";
-import { ExcalidrawLib } from "../ExcalidrawLib";
+import { ExcalidrawLib } from "../types/excalidrawLib";
 import { moment } from "obsidian";
-import ExcalidrawPlugin from "src/main";
+import ExcalidrawPlugin from "src/core/main";
+import { DeviceType } from "src/types/types";
 //This is only for backward compatibility because an early version of obsidian included an encoding to avoid fantom links from littering Obsidian graph view
 declare const PLUGIN_VERSION:string;
 export let EXCALIDRAW_PLUGIN: ExcalidrawPlugin = null;

src/core/editor/EditorHandler.ts

@@ -1,7 +1,7 @@
 import { Extension } from "@codemirror/state";
-import ExcalidrawPlugin from "src/main";
+import ExcalidrawPlugin from "src/core/main";
 import { HideTextBetweenCommentsExtension } from "./Fadeout";
-import { debug, DEBUGGING } from "src/utils/DebugHelper";
+import { debug, DEBUGGING } from "src/utils/debugHelper";
 export const EDITOR_FADEOUT = "fadeOutExcalidrawMarkup";
 
 const editorExtensions: {[key:string]:Extension}= {

src/core/index.ts

@@ -1,14 +1,14 @@
-import "obsidian";
-//import { ExcalidrawAutomate } from "./ExcalidrawAutomate";
-//export ExcalidrawAutomate from "./ExcalidrawAutomate";
-//export {ExcalidrawAutomate} from  "./ExcaildrawAutomate";
-export type { ExcalidrawBindableElement, ExcalidrawElement, FileId, FillStyle, StrokeRoundness, StrokeStyle } from "@zsviczian/excalidraw/types/excalidraw/element/types";
-export type { Point } from "src/types/types";
-export const getEA = (view?:any): any => {
-  try {
-    return window.ExcalidrawAutomate.getAPI(view);
-  } catch(e) {
-    console.log({message: "Excalidraw not available", fn: getEA});
-    return null;
-  }
+import "obsidian";
+//import { ExcalidrawAutomate } from "./ExcalidrawAutomate";
+//export ExcalidrawAutomate from "./ExcalidrawAutomate";
+//export {ExcalidrawAutomate} from  "./ExcaildrawAutomate";
+export type { ExcalidrawBindableElement, ExcalidrawElement, FileId, FillStyle, StrokeRoundness, StrokeStyle } from "@zsviczian/excalidraw/types/excalidraw/element/types";
+export type { Point } from "src/types/types";
+export const getEA = (view?:any): any => {
+  try {
+    return window.ExcalidrawAutomate.getAPI(view);
+  } catch(e) {
+    console.log({message: "Excalidraw not available", fn: getEA});
+    return null;
+  }
 }

src/core/managers/CommandManager.ts

@@ -16,25 +16,25 @@ import {
   IMAGE_TYPES,
   DEVICE,
   sceneCoordsToViewportCoords,
-} from "../constants/constants";
-import ExcalidrawView, { TextMode } from "../ExcalidrawView";
+} from "../../constants/constants";
+import ExcalidrawView, { TextMode } from "../../view/ExcalidrawView";
 import {
   REGEX_LINK,
-} from "../ExcalidrawData";
+} from "../../shared/ExcalidrawData";
 import { ExcalidrawSettings } from "../settings";
-import { openDialogAction, OpenFileDialog } from "../dialogs/OpenDrawing";
-import { InsertLinkDialog } from "../dialogs/InsertLinkDialog";
-import { InsertCommandDialog } from "../dialogs/InsertCommandDialog";
-import { InsertImageDialog } from "../dialogs/InsertImageDialog";
-import { ImportSVGDialog } from "../dialogs/ImportSVGDialog";
-import { InsertMDDialog } from "../dialogs/InsertMDDialog";
+import { openDialogAction, OpenFileDialog } from "../../shared/Dialogs/OpenDrawing";
+import { InsertLinkDialog } from "../../shared/Dialogs/InsertLinkDialog";
+import { InsertCommandDialog } from "../../shared/Dialogs/InsertCommandDialog";
+import { InsertImageDialog } from "../../shared/Dialogs/InsertImageDialog";
+import { ImportSVGDialog } from "../../shared/Dialogs/ImportSVGDialog";
+import { InsertMDDialog } from "../../shared/Dialogs/InsertMDDialog";
 import {
   ExcalidrawAutomate,
   insertLaTeXToView,
   search,
-} from "../ExcalidrawAutomate";
-import { templatePromt } from "../dialogs/Prompt";
-import { t } from "../lang/helpers";
+} from "../../shared/ExcalidrawAutomate";
+import { templatePromt } from "../../shared/Dialogs/Prompt";
+import { t } from "../../lang/helpers";
 import {
   getAliasWithSize,
   getAnnotationFileNameAndFolder,
@@ -45,32 +45,32 @@ import {
   getLink,
   getListOfTemplateFiles,
   getURLImageExtension,
-} from "../utils/FileUtils";
+} from "../../utils/fileUtils";
 import {
   setLeftHandedMode,
   sleep,
   decompress,
   getImageSize,
-} from "../utils/Utils";
-import { extractSVGPNGFileName, getActivePDFPageNumberFromPDFView, getAttachmentsFolderAndFilePath, isObsidianThemeDark, mergeMarkdownFiles, setExcalidrawView } from "../utils/ObsidianUtils";
+} from "../../utils/utils";
+import { extractSVGPNGFileName, getActivePDFPageNumberFromPDFView, getAttachmentsFolderAndFilePath, isObsidianThemeDark, mergeMarkdownFiles, setExcalidrawView } from "../../utils/obsidianUtils";
 import { ExcalidrawElement, ExcalidrawEmbeddableElement, ExcalidrawImageElement, ExcalidrawTextElement } from "@zsviczian/excalidraw/types/excalidraw/element/types";
-import { ReleaseNotes } from "../dialogs/ReleaseNotes";
-import { ScriptInstallPrompt } from "../dialogs/ScriptInstallPrompt";
-import Taskbone from "../ocr/Taskbone";
-import { emulateCTRLClickForLinks, linkClickModifierType, PaneTarget } from "../utils/ModifierkeyHelper";
-import { InsertPDFModal } from "../dialogs/InsertPDFModal";
-import { ExportDialog } from "../dialogs/ExportDialog";
-import { UniversalInsertFileModal } from "../dialogs/UniversalInsertFileModal";
-import { PublishOutOfDateFilesDialog } from "../dialogs/PublishOutOfDateFiles";
-import { EmbeddableSettings } from "../dialogs/EmbeddableSettings";
-import { processLinkText } from "../utils/CustomEmbeddableUtils";
-import { getEA } from "src";
+import { ReleaseNotes } from "../../shared/Dialogs/ReleaseNotes";
+import { ScriptInstallPrompt } from "../../shared/Dialogs/ScriptInstallPrompt";
+import Taskbone from "../../shared/OCR/Taskbone";
+import { emulateCTRLClickForLinks, linkClickModifierType, PaneTarget } from "../../utils/modifierkeyHelper";
+import { InsertPDFModal } from "../../shared/Dialogs/InsertPDFModal";
+import { ExportDialog } from "../../shared/Dialogs/ExportDialog";
+import { UniversalInsertFileModal } from "../../shared/Dialogs/UniversalInsertFileModal";
+import { PublishOutOfDateFilesDialog } from "../../shared/Dialogs/PublishOutOfDateFiles";
+import { EmbeddableSettings } from "../../shared/Dialogs/EmbeddableSettings";
+import { processLinkText } from "../../utils/customEmbeddableUtils";
+import { getEA } from "src/core";
 import { ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/excalidraw/types";
 import { Mutable } from "@zsviczian/excalidraw/types/excalidraw/utility-types";
-import { carveOutImage, carveOutPDF, createImageCropperFile } from "../utils/CarveOut";
-import { showFrameSettings } from "../dialogs/FrameSettings";
-import { insertImageToView } from "../utils/ExcalidrawViewUtils";
-import ExcalidrawPlugin from "src/main";
+import { carveOutImage, carveOutPDF, createImageCropperFile } from "../../utils/carveout";
+import { showFrameSettings } from "../../shared/Dialogs/FrameSettings";
+import { insertImageToView } from "../../utils/excalidrawViewUtils";
+import ExcalidrawPlugin from "src/core/main";
 
 declare const PLUGIN_VERSION:string;
 

src/core/managers/EventManager.ts

@@ -1,12 +1,12 @@
 import { WorkspaceLeaf, TFile, Editor, MarkdownView, MarkdownFileInfo, MetadataCache, App, EventRef, Menu, FileView } from "obsidian";
 import { ExcalidrawElement } from "@zsviczian/excalidraw/types/excalidraw/element/types";
-import { getLink } from "../utils/FileUtils";
-import { editorInsertText, getParentOfClass, setExcalidrawView } from "../utils/ObsidianUtils";
-import ExcalidrawPlugin from "src/main";
-import { DEBUGGING, debug } from "src/utils/DebugHelper";
-import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
+import { getLink } from "../../utils/fileUtils";
+import { editorInsertText, getParentOfClass, setExcalidrawView } from "../../utils/obsidianUtils";
+import ExcalidrawPlugin from "src/core/main";
+import { DEBUGGING, debug } from "src/utils/debugHelper";
+import { ExcalidrawAutomate } from "src/shared/ExcalidrawAutomate";
 import { DEVICE, FRONTMATTER_KEYS, ICON_NAME, VIEW_TYPE_EXCALIDRAW } from "src/constants/constants";
-import ExcalidrawView from "src/ExcalidrawView";
+import ExcalidrawView from "src/view/ExcalidrawView";
 import { t } from "src/lang/helpers";
 
 /**

src/core/managers/FileManager.ts

@@ -1,15 +1,15 @@
-import { debug } from "src/utils/DebugHelper";
+import { debug } from "src/utils/debugHelper";
 import { App, FrontMatterCache, MarkdownView, MetadataCache, normalizePath, Notice, TAbstractFile, TFile, WorkspaceLeaf } from "obsidian";
 import { BLANK_DRAWING, DARK_BLANK_DRAWING, DEVICE, EXPORT_TYPES, FRONTMATTER, FRONTMATTER_KEYS, JSON_parse, nanoid, VIEW_TYPE_EXCALIDRAW } from "src/constants/constants";
-import { Prompt, templatePromt } from "src/dialogs/Prompt";
-import { changeThemeOfExcalidrawMD, ExcalidrawData, getMarkdownDrawingSection } from "src/ExcalidrawData";
-import ExcalidrawView, { getTextMode } from "src/ExcalidrawView";
-import ExcalidrawPlugin from "src/main";
-import { DEBUGGING } from "src/utils/DebugHelper";
-import { checkAndCreateFolder, download, getIMGFilename, getLink, getListOfTemplateFiles, getNewUniqueFilepath } from "src/utils/FileUtils";
-import { PaneTarget } from "src/utils/ModifierkeyHelper";
-import { getExcalidrawViews, getNewOrAdjacentLeaf, isObsidianThemeDark, openLeaf } from "src/utils/ObsidianUtils";
-import { errorlog, getExportTheme } from "src/utils/Utils";
+import { Prompt, templatePromt } from "src/shared/Dialogs/Prompt";
+import { changeThemeOfExcalidrawMD, ExcalidrawData, getMarkdownDrawingSection } from "../../shared/ExcalidrawData";
+import ExcalidrawView, { getTextMode } from "src/view/ExcalidrawView";
+import ExcalidrawPlugin from "src/core/main";
+import { DEBUGGING } from "src/utils/debugHelper";
+import { checkAndCreateFolder, download, getIMGFilename, getLink, getListOfTemplateFiles, getNewUniqueFilepath } from "src/utils/fileUtils";
+import { PaneTarget } from "src/utils/modifierkeyHelper";
+import { getExcalidrawViews, getNewOrAdjacentLeaf, isObsidianThemeDark, openLeaf } from "src/utils/obsidianUtils";
+import { errorlog, getExportTheme } from "src/utils/utils";
 
 export class PluginFileManager {
   private plugin: ExcalidrawPlugin;
@@ -324,7 +324,7 @@ export class PluginFileManager {
     const textElements = excalidrawData.elements?.filter(
       (el: any) => el.type == "text",
     );
-    let outString = `# Excalidraw Data\n## Text Elements\n`;
+    let outString = `# Excalidraw Data\n\n## Text Elements\n`;
     let id: string;
     for (const te of textElements) {
       id = te.id;

src/core/managers/ObserverManager.ts

@@ -1,7 +1,7 @@
-import { debug, DEBUGGING } from "src/utils/DebugHelper";
-import ExcalidrawPlugin from "src/main";
-import { CustomMutationObserver } from "src/utils/DebugHelper";
-import { getExcalidrawViews, isObsidianThemeDark } from "src/utils/ObsidianUtils";
+import { debug, DEBUGGING } from "src/utils/debugHelper";
+import ExcalidrawPlugin from "src/core/main";
+import { CustomMutationObserver } from "src/utils/debugHelper";
+import { getExcalidrawViews, isObsidianThemeDark } from "src/utils/obsidianUtils";
 import { App, Notice, TFile } from "obsidian";
 
 export class ObserverManager {

src/core/managers/PackageManager.ts

@@ -1,9 +1,9 @@
 import { updateExcalidrawLib } from "src/constants/constants";
-import { ExcalidrawLib } from "../ExcalidrawLib";
-import { Packages } from "../types/types";
-import { debug, DEBUGGING } from "../utils/DebugHelper";
+import { ExcalidrawLib } from "../../types/excalidrawLib";
+import { Packages } from "../../types/types";
+import { debug, DEBUGGING } from "../../utils/debugHelper";
 import { Notice } from "obsidian";
-import ExcalidrawPlugin from "src/main";
+import ExcalidrawPlugin from "src/core/main";
 
 declare let REACT_PACKAGES:string;
 declare let react:any;

src/core/managers/StylesManager.ts

@@ -1,7 +1,7 @@
 import { WorkspaceWindow } from "obsidian";
-import ExcalidrawPlugin from "src/main";
-import { getAllWindowDocuments } from "./ObsidianUtils";
-import { DEBUGGING, debug } from "./DebugHelper";
+import ExcalidrawPlugin from "src/core/main";
+import { getAllWindowDocuments } from "../../utils/obsidianUtils";
+import { DEBUGGING, debug } from "../../utils/debugHelper";
 
 export let REM_VALUE = 16;
 

src/core/settings.ts

@@ -10,38 +10,37 @@ import {
   TextComponent,
   TFile,
 } from "obsidian";
-import { GITHUB_RELEASES, setRootElementSize } from "./constants/constants";
-import { t } from "./lang/helpers";
-import type ExcalidrawPlugin from "./main";
-import { PenStyle } from "./types/PenTypes";
-import { DynamicStyle, GridSettings } from "./types/types";
-import { PreviewImageType } from "./utils/UtilTypes";
-import { setDynamicStyle } from "./utils/DynamicStyling";
+import { GITHUB_RELEASES, setRootElementSize } from "src/constants/constants";
+import { t } from "src/lang/helpers";
+import type ExcalidrawPlugin from "src/core/main";
+import { PenStyle } from "src/types/penTypes";
+import { DynamicStyle, GridSettings } from "src/types/types";
+import { PreviewImageType } from "src/types/utilTypes";
+import { setDynamicStyle } from "src/utils/dynamicStyling";
 import {
   getDrawingFilename,
   getEmbedFilename,
-} from "./utils/FileUtils";
-import { PENS } from "./utils/Pens";
+} from "src/utils/fileUtils";
+import { PENS } from "src/utils/pens";
 import {
   addIframe,
   fragWithHTML,
   setLeftHandedMode,
-} from "./utils/Utils";
-import { imageCache } from "./utils/ImageCache";
-import { ConfirmationPrompt } from "./dialogs/Prompt";
-import { EmbeddableMDCustomProps } from "./dialogs/EmbeddableSettings";
-import { EmbeddalbeMDFileCustomDataSettingsComponent } from "./dialogs/EmbeddableMDFileCustomDataSettingsComponent";
-import { startupScript } from "./constants/starutpscript";
-import { ModifierKeySet, ModifierSetType } from "./utils/ModifierkeyHelper";
-import { ModifierKeySettingsComponent } from "./dialogs/ModifierKeySettings";
-import { ANNOTATED_PREFIX, CROPPED_PREFIX } from "./utils/CarveOut";
-import { EDITOR_FADEOUT } from "./CodeMirrorExtension/EditorHandler";
-import { setDebugging } from "./utils/DebugHelper";
-import { Rank } from "./menu/ActionIcons";
+} from "src/utils/utils";
+import { imageCache } from "src/shared/ImageCache";
+import { ConfirmationPrompt } from "src/shared/Dialogs/Prompt";
+import { EmbeddableMDCustomProps } from "src/shared/Dialogs/EmbeddableSettings";
+import { EmbeddalbeMDFileCustomDataSettingsComponent } from "src/shared/Dialogs/EmbeddableMDFileCustomDataSettingsComponent";
+import { startupScript } from "src/constants/starutpscript";
+import { ModifierKeySet, ModifierSetType } from "src/utils/modifierkeyHelper";
+import { ModifierKeySettingsComponent } from "src/shared/Dialogs/ModifierKeySettings";
+import { ANNOTATED_PREFIX, CROPPED_PREFIX } from "src/utils/carveout";
+import { EDITOR_FADEOUT } from "src/core/editor/EditorHandler";
+import { setDebugging } from "src/utils/debugHelper";
+import { Rank } from "src/constants/actionIcons";
 import { TAG_AUTOEXPORT, TAG_MDREADINGMODE, TAG_PDFEXPORT } from "src/constants/constSettingsTags";
-import { HotkeyEditor } from "./dialogs/HotkeyEditor";
-import { getExcalidrawViews } from "./utils/ObsidianUtils";
-import de from "./lang/locale/de";
+import { HotkeyEditor } from "src/shared/Dialogs/HotkeyEditor";
+import { getExcalidrawViews } from "src/utils/obsidianUtils";
 
 export interface ExcalidrawSettings {
   folder: string;

src/lang/locale/en.ts

@@ -4,7 +4,7 @@ import {
   CJK_FONTS,
 } from "src/constants/constants";
 import { TAG_AUTOEXPORT, TAG_MDREADINGMODE, TAG_PDFEXPORT } from "src/constants/constSettingsTags";
-import { labelALT, labelCTRL, labelMETA, labelSHIFT } from "src/utils/ModifierkeyHelper";
+import { labelALT, labelCTRL, labelMETA, labelSHIFT } from "src/utils/modifierkeyHelper";
 
 declare const PLUGIN_VERSION:string;
 
@@ -975,7 +975,7 @@ FILENAME_HEAD: "Filename",
   UPDATE_AVAILABLE: `A newer version of Excalidraw is available in Community Plugins.\n\nYou are using ${PLUGIN_VERSION}.\nThe latest is`,
   ERROR_PNG_TOO_LARGE: "Error exporting PNG - PNG too large, try a smaller resolution",
 
-  //ModifierkeyHelper.ts
+  //modifierkeyHelper.ts
   // WebBrowserDragAction
   WEB_DRAG_IMPORT_IMAGE: "Import Image to Vault",
   WEB_DRAG_IMAGE_URL: "Insert Image or YouTube Thumbnail with URL",

src/lang/locale/ru.ts

@@ -1,6 +1,6 @@
 import { DEVICE, FRONTMATTER_KEYS, CJK_FONTS } from "src/constants/constants";
 import { TAG_AUTOEXPORT, TAG_MDREADINGMODE, TAG_PDFEXPORT } from "src/constants/constSettingsTags";
-import { labelALT, labelCTRL, labelMETA, labelSHIFT } from "src/utils/ModifierkeyHelper";
+import { labelALT, labelCTRL, labelMETA, labelSHIFT } from "src/utils/modifierkeyHelper";
 
 // русский
 export default {

src/lang/locale/zh-cn.ts

@@ -1,6 +1,11 @@
-import { DEVICE, FRONTMATTER_KEYS, CJK_FONTS } from "src/constants/constants";
+import {
+  DEVICE,
+  FRONTMATTER_KEYS,
+  CJK_FONTS
+} from "src/constants/constants";
 import { TAG_AUTOEXPORT, TAG_MDREADINGMODE, TAG_PDFEXPORT } from "src/constants/constSettingsTags";
-import { labelALT, labelCTRL, labelMETA, labelSHIFT } from "src/utils/ModifierkeyHelper";
+import { labelALT, labelCTRL, labelMETA, labelSHIFT } from "src/utils/modifierkeyHelper";
+
 declare const PLUGIN_VERSION:string;
 
 // 简体中文
@@ -105,6 +110,7 @@ export default {
   SELECT_LINK_TO_OPEN: "选择要打开的链接",
 
   //ExcalidrawView.ts
+  ERROR_CANT_READ_FILEPATH : "错误，无法读取文件路径。正在改为导入文件",
   NO_SEARCH_RESULT: "在绘图中未找到匹配的元素",
   FORCE_SAVE_ABORTED: "自动保存被中止，因为文件正在保存中",
   LINKLIST_SECOND_ORDER_LINK: "二级链接",
@@ -968,4 +974,30 @@ FILENAME_HEAD: "文件名",
   //Utils.ts
   UPDATE_AVAILABLE: `Excalidraw 的新版本已在社区插件中可用。\n\n您正在使用 ${PLUGIN_VERSION}。\n最新版本是`,
   ERROR_PNG_TOO_LARGE: "导出 PNG 时出错 - PNG 文件过大，请尝试较小的分辨率",
-};
+
+  // ModifierkeyHelper.ts
+  // WebBrowserDragAction
+  WEB_DRAG_IMPORT_IMAGE : "导入图片到 Vault" ,
+  WEB_DRAG_IMAGE_URL : "通过 URL 插入图片或 YouTube 缩略图" ,
+  WEB_DRAG_LINK : "插入链接" ,
+  WEB_DRAG_EMBEDDABLE : "插入交互框架" ,
+
+  // LocalFileDragAction
+  LOCAL_DRAG_IMPORT : "导入外部文件，或在路径来自 Vault 时复用现有文件" ,
+  LOCAL_DRAG_IMAGE : "插入图片：使用本地 URI，或在路径来自 Vault 时使用内部链接" ,
+  LOCAL_DRAG_LINK : "插入链接：使用本地 URI，或在路径来自 Vault 时使用内部链接" ,
+  LOCAL_DRAG_EMBEDDABLE : "插入交互框架：使用本地 URI，或在路径来自 Vault 时使用内部链接" ,
+
+  // InternalDragAction
+  INTERNAL_DRAG_IMAGE : "插入图片" ,
+  INTERNAL_DRAG_IMAGE_FULL : "插入图片（100% 尺寸）" ,
+  INTERNAL_DRAG_LINK : "插入链接" ,
+  INTERNAL_DRAG_EMBEDDABLE : "插入交互框架" ,
+
+  // LinkClickAction
+  LINK_CLICK_ACTIVE : "在当前活动窗口中打开" ,
+  LINK_CLICK_NEW_PANE : "在相邻的新窗口中打开" ,
+  LINK_CLICK_POPOUT : "在弹出窗口中打开" ,
+  LINK_CLICK_NEW_TAB : "在新标签页中打开" ,
+  LINK_CLICK_MD_PROPS : "显示 Markdown 图片属性对话框（仅在嵌入 Markdown 文档为图片时适用）" ,
+};

src/shared/CropImage.ts

@@ -3,11 +3,11 @@ import { BinaryFileData } from "@zsviczian/excalidraw/types/excalidraw/types";
 import { Mutable } from "@zsviczian/excalidraw/types/excalidraw/utility-types";
 import { Notice } from "obsidian";
 
-import { getEA } from "src";
-import { ExcalidrawAutomate, cloneElement } from "src/ExcalidrawAutomate";
-import { ExportSettings } from "src/ExcalidrawView";
+import { getEA } from "src/core";
+import { ExcalidrawAutomate, cloneElement } from "src/shared/ExcalidrawAutomate";
+import { ExportSettings } from "src/view/ExcalidrawView";
 import { nanoid } from "src/constants/constants";
-import { svgToBase64 } from "./Utils";
+import { svgToBase64 } from "../utils/utils";
 
 export class CropImage {
   private imageEA: ExcalidrawAutomate;

src/shared/Dialogs/EmbeddableMDFileCustomDataSettingsComponent.ts

@@ -1,6 +1,6 @@
 import { Setting, ToggleComponent } from "obsidian";
 import { EmbeddableMDCustomProps } from "./EmbeddableSettings";
-import { fragWithHTML } from "src/utils/Utils";
+import { fragWithHTML } from "src/utils/utils";
 import { t } from "src/lang/helpers";
 
 export class EmbeddalbeMDFileCustomDataSettingsComponent {

src/shared/Dialogs/EmbeddableSettings.ts

@@ -1,16 +1,16 @@
 import { ExcalidrawEmbeddableElement } from "@zsviczian/excalidraw/types/excalidraw/element/types";
 import { Mutable } from "@zsviczian/excalidraw/types/excalidraw/utility-types";
 import { Modal, Notice, Setting, TFile, ToggleComponent } from "obsidian";
-import { getEA } from "src";
-import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
-import ExcalidrawView from "src/ExcalidrawView";
+import { getEA } from "src/core";
+import { ExcalidrawAutomate } from "src/shared/ExcalidrawAutomate";
+import ExcalidrawView from "src/view/ExcalidrawView";
 import { t } from "src/lang/helpers";
-import ExcalidrawPlugin from "src/main";
-import { getNewUniqueFilepath, getPathWithoutExtension, splitFolderAndFilename } from "src/utils/FileUtils";
-import { addAppendUpdateCustomData, fragWithHTML } from "src/utils/Utils";
+import ExcalidrawPlugin from "src/core/main";
+import { getNewUniqueFilepath, getPathWithoutExtension, splitFolderAndFilename } from "src/utils/fileUtils";
+import { addAppendUpdateCustomData, fragWithHTML } from "src/utils/utils";
 import { getYouTubeStartAt, isValidYouTubeStart, isYouTube, updateYouTubeStartTime } from "src/utils/YoutTubeUtils";
 import { EmbeddalbeMDFileCustomDataSettingsComponent } from "./EmbeddableMDFileCustomDataSettingsComponent";
-import { isWinCTRLorMacCMD } from "src/utils/ModifierkeyHelper";
+import { isWinCTRLorMacCMD } from "src/utils/modifierkeyHelper";
 import { ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/excalidraw/types";
 
 export type EmbeddableMDCustomProps = {

src/shared/Dialogs/ExportDialog.ts

@@ -1,11 +1,11 @@
 import { ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/excalidraw/types";
 import { Modal, Setting, TFile } from "obsidian";
-import { getEA } from "src";
+import { getEA } from "src/core";
 import { DEVICE } from "src/constants/constants";
-import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
-import ExcalidrawView from "src/ExcalidrawView";
-import ExcalidrawPlugin from "src/main";
-import { fragWithHTML, getExportPadding, getExportTheme, getPNGScale, getWithBackground, shouldEmbedScene } from "src/utils/Utils";
+import { ExcalidrawAutomate } from "src/shared/ExcalidrawAutomate";
+import ExcalidrawView from "src/view/ExcalidrawView";
+import ExcalidrawPlugin from "src/core/main";
+import { fragWithHTML, getExportPadding, getExportTheme, getPNGScale, getWithBackground, shouldEmbedScene } from "src/utils/utils";
 
 export class ExportDialog extends Modal {
   private ea: ExcalidrawAutomate;

src/shared/Dialogs/FrameSettings.ts

@@ -1,4 +1,4 @@
-import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
+import { ExcalidrawAutomate } from "src/shared/ExcalidrawAutomate";
 import { t } from "src/lang/helpers";
 
 export const showFrameSettings = (ea: ExcalidrawAutomate) => {

src/shared/Dialogs/HotkeyEditor.ts

@@ -1,9 +1,9 @@
 import { BaseComponent, Setting, Modifier } from 'obsidian';
 import { DEVICE } from 'src/constants/constants';
 import { t } from 'src/lang/helpers';
-import { ExcalidrawSettings } from 'src/settings';
-import { modifierLabel } from 'src/utils/ModifierkeyHelper';
-import { fragWithHTML } from 'src/utils/Utils';
+import { ExcalidrawSettings } from 'src/core/settings';
+import { modifierLabel } from 'src/utils/modifierkeyHelper';
+import { fragWithHTML } from 'src/utils/utils';
 
 export class HotkeyEditor extends BaseComponent {
   private settings: ExcalidrawSettings;

src/shared/Dialogs/ImportSVGDialog.ts

@@ -1,10 +1,10 @@
 import { App, FuzzySuggestModal, TFile } from "obsidian";
-import { REG_LINKINDEX_INVALIDCHARS } from "../constants/constants";
-import ExcalidrawView from "../ExcalidrawView";
-import { t } from "../lang/helpers";
-import ExcalidrawPlugin from "../main";
-import { getEA } from "src";
-import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
+import { REG_LINKINDEX_INVALIDCHARS } from "../../constants/constants";
+import ExcalidrawView from "../../view/ExcalidrawView";
+import { t } from "../../lang/helpers";
+import ExcalidrawPlugin from "../../core/main";
+import { getEA } from "src/core";
+import { ExcalidrawAutomate } from "src/shared/ExcalidrawAutomate";
 
 export class ImportSVGDialog extends FuzzySuggestModal<TFile> {
   public plugin: ExcalidrawPlugin;

src/shared/Dialogs/InsertCommandDialog.ts

@@ -1,6 +1,6 @@
 import { App, FuzzySuggestModal, TFile } from "obsidian";
-import { REG_LINKINDEX_INVALIDCHARS } from "../constants/constants";
-import { t } from "../lang/helpers";
+import { REG_LINKINDEX_INVALIDCHARS } from "../../constants/constants";
+import { t } from "../../lang/helpers";
 
 export class InsertCommandDialog extends FuzzySuggestModal<TFile> {
   private addText: Function;

src/shared/Dialogs/InsertImageDialog.ts

@@ -1,10 +1,10 @@
-import { App, FuzzySuggestModal, TFile } from "obsidian";
-import { scaleToFullsizeModifier } from "src/utils/ModifierkeyHelper";
-import { DEVICE, IMAGE_TYPES, REG_LINKINDEX_INVALIDCHARS } from "../constants/constants";
-import ExcalidrawView from "../ExcalidrawView";
-import { t } from "../lang/helpers";
-import ExcalidrawPlugin from "../main";
-import { getEA } from "src";
+import { FuzzySuggestModal, TFile } from "obsidian";
+import { scaleToFullsizeModifier } from "src/utils/modifierkeyHelper";
+import { DEVICE, IMAGE_TYPES, REG_LINKINDEX_INVALIDCHARS } from "../../constants/constants";
+import ExcalidrawView from "../../view/ExcalidrawView";
+import { t } from "../../lang/helpers";
+import ExcalidrawPlugin from "../../core/main";
+import { getEA } from "src/core";
 
 export class InsertImageDialog extends FuzzySuggestModal<TFile> {
   public plugin: ExcalidrawPlugin;

src/shared/Dialogs/InsertLinkDialog.ts

@@ -1,8 +1,8 @@
 import { FuzzyMatch, FuzzySuggestModal, setIcon } from "obsidian";
-import { AUDIO_TYPES, CODE_TYPES, ICON_NAME, IMAGE_TYPES, REG_LINKINDEX_INVALIDCHARS, VIDEO_TYPES } from "../constants/constants";
-import { t } from "../lang/helpers";
-import ExcalidrawPlugin from "src/main";
-import { getLink } from "src/utils/FileUtils";
+import { AUDIO_TYPES, CODE_TYPES, ICON_NAME, IMAGE_TYPES, REG_LINKINDEX_INVALIDCHARS, VIDEO_TYPES } from "../../constants/constants";
+import { t } from "../../lang/helpers";
+import ExcalidrawPlugin from "src/core/main";
+import { getLink } from "src/utils/fileUtils";
 import { LinkSuggestion } from "src/types/types";
 
 

src/shared/Dialogs/InsertMDDialog.ts

@@ -1,8 +1,8 @@
-import { App, FuzzySuggestModal, TFile } from "obsidian";
-import ExcalidrawView from "../ExcalidrawView";
-import { t } from "../lang/helpers";
-import ExcalidrawPlugin from "../main";
-import { getEA } from "src";
+import { FuzzySuggestModal, TFile } from "obsidian";
+import ExcalidrawView from "../../view/ExcalidrawView";
+import { t } from "../../lang/helpers";
+import ExcalidrawPlugin from "../../core/main";
+import { getEA } from "src/core";
 
 export class InsertMDDialog extends FuzzySuggestModal<TFile> {
   public plugin: ExcalidrawPlugin;

src/shared/Dialogs/InsertPDFModal.ts

@@ -1,11 +1,11 @@
 import { ButtonComponent, TFile, ToggleComponent } from "obsidian";
-import ExcalidrawView from "../ExcalidrawView";
-import ExcalidrawPlugin from "../main";
-import { getPDFDoc } from "src/utils/FileUtils";
+import ExcalidrawView from "../../view/ExcalidrawView";
+import ExcalidrawPlugin from "../../core/main";
+import { getPDFDoc } from "src/utils/fileUtils";
 import {  Modal, Setting, TextComponent } from "obsidian";
-import { FileSuggestionModal } from "../Components/Suggesters/FileSuggestionModal";
-import { getEA } from "src";
-import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
+import { FileSuggestionModal } from "../Suggesters/FileSuggestionModal";
+import { getEA } from "src/core";
+import { ExcalidrawAutomate } from "src/shared/ExcalidrawAutomate";
 import { ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/excalidraw/types";
 import { t } from "src/lang/helpers";
 

src/shared/Dialogs/ModifierKeySettings.ts

@@ -1,7 +1,7 @@
 import { Setting } from "obsidian";
 import { DEVICE } from "src/constants/constants";
 import { t } from "src/lang/helpers";
-import { ModifierKeySet, ModifierSetType, modifierKeyTooltipMessages } from "src/utils/ModifierkeyHelper";
+import { ModifierKeySet, ModifierSetType, modifierKeyTooltipMessages } from "src/utils/modifierkeyHelper";
 
 type ModifierKeyCategories = Partial<{
   [modifierSetType in ModifierSetType]: string;

src/shared/Dialogs/OpenDrawing.ts

@@ -1,7 +1,7 @@
 import { App, FuzzySuggestModal, TFile } from "obsidian";
-import ExcalidrawPlugin from "../main";
-import { EMPTY_MESSAGE } from "../constants/constants";
-import { t } from "../lang/helpers";
+import ExcalidrawPlugin from "../../core/main";
+import { EMPTY_MESSAGE } from "../../constants/constants";
+import { t } from "../../lang/helpers";
 
 export enum openDialogAction {
   openFile,

src/shared/Dialogs/PenSettingsModal.ts

@@ -1,13 +1,13 @@
 import { ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/excalidraw/types";
 import { ColorComponent, Modal, Setting, TextComponent, ToggleComponent } from "obsidian";
 import { COLOR_NAMES } from "src/constants/constants";
-import ExcalidrawView from "src/ExcalidrawView";
-import ExcalidrawPlugin from "src/main";
-import { setPen } from "src/menu/ObsidianMenu";
-import { ExtendedFillStyle, PenType } from "src/types/PenTypes";
-import { getExcalidrawViews } from "src/utils/ObsidianUtils";
-import { PENS } from "src/utils/Pens";
-import { fragWithHTML } from "src/utils/Utils";
+import ExcalidrawView from "src/view/ExcalidrawView";
+import ExcalidrawPlugin from "src/core/main";
+import { setPen } from "src/view/components/menu/ObsidianMenu";
+import { ExtendedFillStyle, PenType } from "src/types/penTypes";
+import { getExcalidrawViews } from "src/utils/obsidianUtils";
+import { PENS } from "src/utils/pens";
+import { fragWithHTML } from "src/utils/utils";
 import { __values } from "tslib";
 
 const EASINGFUNCTIONS: Record<string,string> = {

src/shared/Dialogs/Prompt.ts

@@ -8,21 +8,20 @@ import {
   TFile,
   Notice,
   TextAreaComponent,
-  TFolder,
 } from "obsidian";
-import ExcalidrawView from "../ExcalidrawView";
-import ExcalidrawPlugin from "../main";
-import { escapeRegExp, getLinkParts, sleep } from "../utils/Utils";
-import { getLeaf, openLeaf } from "../utils/ObsidianUtils";
-import { checkAndCreateFolder, splitFolderAndFilename } from "src/utils/FileUtils";
-import { KeyEvent, isWinCTRLorMacCMD } from "src/utils/ModifierkeyHelper";
+import ExcalidrawView from "../../view/ExcalidrawView";
+import ExcalidrawPlugin from "../../core/main";
+import { escapeRegExp, getLinkParts, sleep } from "../../utils/utils";
+import { getLeaf, openLeaf } from "../../utils/obsidianUtils";
+import { checkAndCreateFolder, splitFolderAndFilename } from "src/utils/fileUtils";
+import { KeyEvent, isWinCTRLorMacCMD } from "src/utils/modifierkeyHelper";
 import { t } from "src/lang/helpers";
-import { ExcalidrawElement, getEA } from "src";
-import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
+import { ExcalidrawElement, getEA } from "src/core";
+import { ExcalidrawAutomate } from "src/shared/ExcalidrawAutomate";
 import { MAX_IMAGE_SIZE, REG_LINKINDEX_INVALIDCHARS } from "src/constants/constants";
-import { REGEX_LINK, REGEX_TAGS } from "src/ExcalidrawData";
-import { ScriptEngine } from "src/Scripts";
-import { openExternalLink, openTagSearch, parseObsidianLink } from "src/utils/ExcalidrawViewUtils";
+import { REGEX_LINK, REGEX_TAGS } from "../ExcalidrawData";
+import { ScriptEngine } from "../Scripts";
+import { openExternalLink, openTagSearch, parseObsidianLink } from "src/utils/excalidrawViewUtils";
 
 export type ButtonDefinition = { caption: string; tooltip?:string; action: Function };
 

src/shared/Dialogs/PublishOutOfDateFiles.ts

@@ -1,7 +1,7 @@
 import { Modal, Setting, TFile } from "obsidian";
-import ExcalidrawPlugin from "src/main";
-import { getIMGFilename } from "src/utils/FileUtils";
-import { addIframe } from "src/utils/Utils";
+import ExcalidrawPlugin from "src/core/main";
+import { getIMGFilename } from "src/utils/fileUtils";
+import { addIframe } from "src/utils/utils";
 
 const haveLinkedFilesChanged = (depth: number, mtime: number, path: string, sourceList: Set<string>, plugin: ExcalidrawPlugin):boolean  => {
   if(depth++ > 5) return false;

src/shared/Dialogs/RankMessage.ts

@@ -1,6 +1,6 @@
 import { App, MarkdownRenderer, Modal } from "obsidian";
-import ExcalidrawPlugin from "../main";
-import { Rank, SwordColors } from "src/menu/ActionIcons";
+import ExcalidrawPlugin from "../../core/main";
+import { Rank, SwordColors } from "src/constants/actionIcons";
 
 export class RankMessage extends Modal {
 

src/shared/Dialogs/ReleaseNotes.ts

@@ -1,6 +1,6 @@
 import { App, MarkdownRenderer, Modal } from "obsidian";
-import { isVersionNewerThanOther } from "src/utils/Utils";
-import ExcalidrawPlugin from "../main";
+import { isVersionNewerThanOther } from "src/utils/utils";
+import ExcalidrawPlugin from "../../core/main";
 import { FIRST_RUN, RELEASE_NOTES } from "./Messages";
 
 declare const PLUGIN_VERSION:string;

src/shared/Dialogs/ScriptInstallPrompt.ts

@@ -1,7 +1,7 @@
 import { MarkdownRenderer, Modal, Notice, request } from "obsidian";
-import ExcalidrawPlugin from "../main";
-import { errorlog, escapeRegExp } from "../utils/Utils";
-import { log } from "src/utils/DebugHelper";
+import ExcalidrawPlugin from "../../core/main";
+import { errorlog, escapeRegExp } from "../../utils/utils";
+import { log } from "src/utils/debugHelper";
 
 const URL =
   "https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/index-new.md";

src/shared/Dialogs/SelectCard.ts

@@ -1,10 +1,10 @@
 import { App, FuzzySuggestModal, Notice, TFile } from "obsidian";
-import { t } from "../lang/helpers";
-import ExcalidrawView from "src/ExcalidrawView";
-import { getEA } from "src";
-import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
+import { t } from "../../lang/helpers";
+import ExcalidrawView from "src/view/ExcalidrawView";
+import { getEA } from "src/core";
+import { ExcalidrawAutomate } from "src/shared/ExcalidrawAutomate";
 import { MD_EX_SECTIONS } from "src/constants/constants";
-import { addBackOfTheNoteCard } from "src/utils/ExcalidrawViewUtils";
+import { addBackOfTheNoteCard } from "src/utils/excalidrawViewUtils";
 
 export class SelectCard extends FuzzySuggestModal<string> {
 

src/shared/Dialogs/UniversalInsertFileModal.ts

@@ -1,15 +1,15 @@
 import { ButtonComponent, DropdownComponent, TFile, ToggleComponent } from "obsidian";
-import ExcalidrawView from "../ExcalidrawView";
-import ExcalidrawPlugin from "../main";
+import ExcalidrawView from "../../view/ExcalidrawView";
+import ExcalidrawPlugin from "../../core/main";
 import {  Modal, Setting, TextComponent } from "obsidian";
-import { FileSuggestionModal } from "../Components/Suggesters/FileSuggestionModal";
+import { FileSuggestionModal } from "../Suggesters/FileSuggestionModal";
 import { IMAGE_TYPES, sceneCoordsToViewportCoords, viewportCoordsToSceneCoords, MAX_IMAGE_SIZE, ANIMATED_IMAGE_TYPES, MD_EX_SECTIONS } from "src/constants/constants";
-import { insertEmbeddableToView, insertImageToView } from "src/utils/ExcalidrawViewUtils";
-import { getEA } from "src";
+import { insertEmbeddableToView, insertImageToView } from "src/utils/excalidrawViewUtils";
+import { getEA } from "src/core";
 import { InsertPDFModal } from "./InsertPDFModal";
 import {  ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/excalidraw/types";
-import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
-import { cleanSectionHeading } from "src/utils/ObsidianUtils";
+import { ExcalidrawAutomate } from "src/shared/ExcalidrawAutomate";
+import { cleanSectionHeading } from "src/utils/obsidianUtils";
 
 export class UniversalInsertFileModal extends Modal {
   private center: { x: number, y: number } = { x: 0, y: 0 };

src/shared/ExcalidrawConfig.ts

@@ -1,5 +1,5 @@
 import { DEVICE } from "src/constants/constants";
-import ExcalidrawPlugin from "src/main";
+import ExcalidrawPlugin from "src/core/main";
 
 export class ExcalidrawConfig {
   public areaLimit: number = 16777216;

src/shared/ExcalidrawData.ts

@@ -18,9 +18,9 @@ import {
   refreshTextDimensions,
   getContainerElement,
   loadSceneFonts,
-} from "./constants/constants";
-import ExcalidrawPlugin from "./main";
-import { TextMode } from "./ExcalidrawView";
+} from "../constants/constants";
+import ExcalidrawPlugin from "../core/main";
+import { TextMode } from "../view/ExcalidrawView";
 import {
   addAppendUpdateCustomData,
   compress,
@@ -37,8 +37,8 @@ import {
   wrapTextAtCharLength,
   arrayToMap,
   compressAsync,
-} from "./utils/Utils";
-import { cleanBlockRef, cleanSectionHeading, getAttachmentsFolderAndFilePath, isObsidianThemeDark } from "./utils/ObsidianUtils";
+} from "../utils/utils";
+import { cleanBlockRef, cleanSectionHeading, getAttachmentsFolderAndFilePath, isObsidianThemeDark } from "../utils/obsidianUtils";
 import {
   ExcalidrawElement,
   ExcalidrawImageElement,
@@ -47,15 +47,15 @@ import {
 } from "@zsviczian/excalidraw/types/excalidraw/element/types";
 import { BinaryFiles, DataURL, SceneData } from "@zsviczian/excalidraw/types/excalidraw/types";
 import { EmbeddedFile, MimeType } from "./EmbeddedFileLoader";
-import { ConfirmationPrompt } from "./dialogs/Prompt";
-import { getMermaidImageElements, getMermaidText, shouldRenderMermaid } from "./utils/MermaidUtils";
-import { DEBUGGING, debug } from "./utils/DebugHelper";
+import { ConfirmationPrompt } from "./Dialogs/Prompt";
+import { getMermaidImageElements, getMermaidText, shouldRenderMermaid } from "../utils/mermaidUtils";
+import { DEBUGGING, debug } from "../utils/debugHelper";
 import { Mutable } from "@zsviczian/excalidraw/types/excalidraw/utility-types";
-import { updateElementIdsInScene } from "./utils/ExcalidrawSceneUtils";
-import { getNewUniqueFilepath } from "./utils/FileUtils";
-import { t } from "./lang/helpers";
-import { displayFontMessage } from "./utils/ExcalidrawViewUtils";
-import { getPDFRect } from "./utils/PDFUtils";
+import { updateElementIdsInScene } from "../utils/excalidrawSceneUtils";
+import { getNewUniqueFilepath } from "../utils/fileUtils";
+import { t } from "../lang/helpers";
+import { displayFontMessage } from "../utils/excalidrawViewUtils";
+import { getPDFRect } from "../utils/PDFUtils";
 
 type SceneDataWithFiles = SceneData & { files: BinaryFiles };
 
@@ -859,7 +859,7 @@ export class ExcalidrawData {
       return true; //Text Elements header does not exist
     }
     data = data.slice(position);
-    const normalMatch = data.match(/^((%%\n*)?# Excalidraw Data\n## Text Elements(?:\n|$))/m)
+    const normalMatch = data.match(/^((%%\n*)?# Excalidraw Data\n\n?## Text Elements(?:\n|$))/m)
       ?? data.match(/^((%%\n*)?##? Text Elements(?:\n|$))/m);
 
     const textElementsMatch = normalMatch
@@ -1427,7 +1427,7 @@ export class ExcalidrawData {
   disableCompression: boolean = false;
   generateMDBase(deletedElements: ExcalidrawElement[] = []) {
     let outString = this.textElementCommentedOut ? "%%\n" : "";
-    outString += `# Excalidraw Data\n## Text Elements\n`;
+    outString += `# Excalidraw Data\n\n## Text Elements\n`;
     if (this.plugin.settings.addDummyTextElement) {
       outString += `\n^_dummy!_\n\n`;
     }

src/shared/ImageCache.ts

@@ -1,8 +1,8 @@
 import { App, Notice, TFile } from "obsidian";
-import ExcalidrawPlugin from "src/main";
-import { convertSVGStringToElement } from "./Utils";
-import { FILENAMEPARTS, PreviewImageType } from "./UtilTypes";
-import { hasExcalidrawEmbeddedImagesTreeChanged } from "./FileUtils";
+import ExcalidrawPlugin from "src/core/main";
+import { convertSVGStringToElement } from "../utils/utils";
+import { FILENAMEPARTS, PreviewImageType } from "../types/utilTypes";
+import { hasExcalidrawEmbeddedImagesTreeChanged } from "../utils/fileUtils";
 
 //@ts-ignore
 const DB_NAME = "Excalidraw " + app.appId;

src/shared/LaTeX.ts

@@ -1,6 +1,6 @@
 // LaTeX.ts
 import { DataURL } from "@zsviczian/excalidraw/types/excalidraw/types";
-import ExcalidrawView from "./ExcalidrawView";
+import ExcalidrawView from "../view/ExcalidrawView";
 import { FileData, MimeType } from "./EmbeddedFileLoader";
 import { FileId } from "@zsviczian/excalidraw/types/excalidraw/element/types";
 import { App } from "obsidian";

src/shared/OCR/Taskbone.ts

@@ -1,13 +1,13 @@
 import { ExcalidrawAutomate } from "../ExcalidrawAutomate";
 import {Notice, requestUrl} from "obsidian"
-import ExcalidrawPlugin from "../main"
-import ExcalidrawView, { ExportSettings } from "../ExcalidrawView"
-import FrontmatterEditor from "src/utils/Frontmatter";
+import ExcalidrawPlugin from "../../core/main"
+import ExcalidrawView, { ExportSettings } from "../../view/ExcalidrawView"
+import FrontmatterEditor from "src/shared/Frontmatter";
 import { ExcalidrawElement } from "@zsviczian/excalidraw/types/excalidraw/element/types";
-import { EmbeddedFilesLoader } from "src/EmbeddedFileLoader";
-import { blobToBase64 } from "src/utils/FileUtils";
-import { getEA } from "src";
-import { log } from "src/utils/DebugHelper";
+import { EmbeddedFilesLoader } from "../EmbeddedFileLoader";
+import { blobToBase64 } from "src/utils/fileUtils";
+import { getEA } from "src/core";
+import { log } from "src/utils/debugHelper";
 
 const TASKBONE_URL = "https://api.taskbone.com/"; //"https://excalidraw-preview.onrender.com/";
 const TASKBONE_OCR_FN = "execute?id=60f394af-85f6-40bc-9613-5d26dc283cbb";

src/shared/Scripts.ts

@@ -4,18 +4,17 @@ import {
   normalizePath,
   TAbstractFile,
   TFile,
-  WorkspaceLeaf,
 } from "obsidian";
-import { PLUGIN_ID } from "./constants/constants";
-import ExcalidrawView from "./ExcalidrawView";
-import ExcalidrawPlugin from "./main";
-import { ButtonDefinition, GenericInputPrompt, GenericSuggester } from "./dialogs/Prompt";
-import { getIMGFilename } from "./utils/FileUtils";
-import { splitFolderAndFilename } from "./utils/FileUtils";
-import { getEA } from "src";
-import { ExcalidrawAutomate } from "./ExcalidrawAutomate";
-import { WeakArray } from "./utils/WeakArray";
-import { getExcalidrawViews } from "./utils/ObsidianUtils";
+import { PLUGIN_ID } from "../constants/constants";
+import ExcalidrawView from "../view/ExcalidrawView";
+import ExcalidrawPlugin from "../core/main";
+import { ButtonDefinition, GenericInputPrompt, GenericSuggester } from "./Dialogs/Prompt";
+import { getIMGFilename } from "../utils/fileUtils";
+import { splitFolderAndFilename } from "../utils/fileUtils";
+import { getEA } from "src/core";
+import { ExcalidrawAutomate } from "../shared/ExcalidrawAutomate";
+import { WeakArray } from "./WeakArray";
+import { getExcalidrawViews } from "../utils/obsidianUtils";
 
 export type ScriptIconMap = {
   [key: string]: { name: string; group: string; svgString: string };

src/shared/Suggesters/FieldSuggester.ts

@@ -6,12 +6,12 @@ import {
   EditorSuggestTriggerInfo,
   TFile,
 } from "obsidian";
-import { FRONTMATTER_KEYS_INFO } from "../../dialogs/SuggesterInfo";
+import { FRONTMATTER_KEYS_INFO } from "../Dialogs/SuggesterInfo";
 import {
   EXCALIDRAW_AUTOMATE_INFO,
   EXCALIDRAW_SCRIPTENGINE_INFO,
-} from "../../dialogs/SuggesterInfo";
-import type ExcalidrawPlugin from "../../main";
+} from "../Dialogs/SuggesterInfo";
+import type ExcalidrawPlugin from "../../core/main";
 
 /**
  * The field suggester recommends document properties in source mode, ea and utils function and attribute names.

src/shared/Suggesters/FileSuggestionModal.ts

@@ -9,7 +9,7 @@ import {
 import { SuggestionModal } from "./SuggestionModal";
 import { t } from "src/lang/helpers";
 import { LinkSuggestion } from "src/types/types";
-import ExcalidrawPlugin from "src/main";
+import ExcalidrawPlugin from "src/core/main";
 import { AUDIO_TYPES, CODE_TYPES, ICON_NAME, IMAGE_TYPES, VIDEO_TYPES } from "src/constants/constants";
 
 export class FileSuggestionModal extends SuggestionModal<LinkSuggestion> {

src/shared/svgToExcalidraw/walker.ts

@@ -25,7 +25,7 @@ import {
 import { getTransformMatrix, transformPoints } from "./transform";
 import { pointsOnPath } from "points-on-path";
 import { randomId, getWindingOrder } from "./utils";
-import { ROUNDNESS } from "../constants/constants";
+import { ROUNDNESS } from "../../constants/constants";
 
 const SUPPORTED_TAGS = [
   "svg",

src/types/excalidrawViewTypes.ts

@@ -0,0 +1,73 @@
+// src/types/ExcalidrawViewTypes.ts
+
+import { WorkspaceLeaf } from "obsidian";
+import { FileId } from "@zsviczian/excalidraw/types/excalidraw/element/types";
+import { ObsidianCanvasNode } from "../view/managers/CanvasNodeFactory";
+
+export interface DropData {
+  files?: File[];
+  text?: string;
+  html?: string;
+  uri?: string;
+}
+
+export interface DropContext {
+  event: DragEvent;
+  position: {x: number; y: number};
+  modifierAction: string;
+}
+
+export interface SelectedElementWithLink {
+  id: string | null;
+  text: string | null;
+}
+
+export interface SelectedImage {
+  id: string | null;
+  fileId: FileId | null;
+}
+
+export interface EmbeddableLeafRef {
+  leaf: WorkspaceLeaf;
+  node?: ObsidianCanvasNode;
+  editNode?: Function;
+}
+
+export interface ViewSemaphores {
+  warnAboutLinearElementLinkClick: boolean;
+  //flag to prevent overwriting the changes the user makes in an embeddable view editing the back side of the drawing
+  embeddableIsEditingSelf: boolean;
+  popoutUnload: boolean; //the unloaded Excalidraw view was the last leaf in the popout window
+  viewunload: boolean;
+  //first time initialization of the view
+  scriptsReady: boolean;
+
+  //The role of justLoaded is to capture the Excalidraw.onChange event that fires right after the canvas was loaded for the first time to
+  //- prevent the first onChange event to mark the file as dirty and to consequently cause a save right after load, causing sync issues in turn
+  //- trigger autozoom (in conjunction with preventAutozoomOnLoad)
+  justLoaded: boolean;
+
+  //the modifyEventHandler in main.ts will fire when an Excalidraw file has changed (e.g. due to sync)
+  //when a drawing that is currently open in a view receives a sync update, excalidraw reload() is triggered
+  //the preventAutozoomOnLoad flag will prevent the open drawing from autozooming when it is reloaded
+  preventAutozoom: boolean;
+
+  autosaving: boolean; //flags that autosaving is in progress. Autosave is an async timer, the flag prevents collision with force save
+  forceSaving: boolean; //flags that forcesaving is in progress. The flag prevents collision with autosaving
+  dirty: string; //null if there are no changes to be saved, the path of the file if the drawing has unsaved changes
+
+  //reload() is triggered by modifyEventHandler in main.ts. preventReload is a one time flag to abort reloading
+  //to avoid interrupting the flow of drawing by the user.
+  preventReload: boolean;
+
+  isEditingText: boolean; //https://stackoverflow.com/questions/27132796/is-there-any-javascript-event-fired-when-the-on-screen-keyboard-on-mobile-safari
+
+  //Save is triggered by multiple threads when an Excalidraw pane is terminated
+  //- by the view itself
+  //- by the activeLeafChangeEventHandler change event handler
+  //- by monkeypatches on detach(next)
+  //This semaphore helps avoid collision of saves
+  saving: boolean;
+  hoverSleep: boolean; //flag with timer to prevent hover preview from being triggered dozens of times
+  wheelTimeout:number; //used to avoid hover preview while zooming
+}

src/types/types.d.ts

@@ -1,6 +1,6 @@
 import { TFile } from "obsidian";
-import { ExcalidrawAutomate } from "../ExcalidrawAutomate";
-import { ExcalidrawLib } from "../ExcalidrawLib";
+import { ExcalidrawAutomate } from "../shared/ExcalidrawAutomate";
+import { ExcalidrawLib } from "./excalidrawLib";
 
 export type ConnectionPoint = "top" | "bottom" | "left" | "right" | null;
 

src/utils/AIUtils.ts

@@ -1,6 +1,5 @@
-import { DEVICE } from "../constants/constants";
 import { Notice, RequestUrlResponse, requestUrl } from "obsidian";
-import ExcalidrawPlugin from "src/main";
+import ExcalidrawPlugin from "src/core/main";
 
 type MessageContent =
   | string

src/utils/CJKLoader.ts

@@ -1,6 +1,6 @@
-import ExcalidrawPlugin from "src/main";
-import { PromisePool, promiseTry } from "./Utils";
-import { blobToBase64 } from "./FileUtils";
+import ExcalidrawPlugin from "src/core/main";
+import { PromisePool, promiseTry } from "./utils";
+import { blobToBase64 } from "./fileUtils";
 
 interface ExcalidrawFontFaceDescriptor {
   uri: string;

src/utils/carveout.ts

@@ -1,8 +1,8 @@
 import { ExcalidrawEmbeddableElement, ExcalidrawFrameElement, ExcalidrawImageElement } from "@zsviczian/excalidraw/types/excalidraw/element/types";
 import { Mutable } from "@zsviczian/excalidraw/types/excalidraw/utility-types";
-import { getEA } from "src";
-import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
-import { getCropFileNameAndFolder, getListOfTemplateFiles, splitFolderAndFilename } from "./FileUtils";
+import { getEA } from "src/core";
+import { ExcalidrawAutomate } from "src/shared/ExcalidrawAutomate";
+import { getCropFileNameAndFolder, getListOfTemplateFiles, splitFolderAndFilename } from "./fileUtils";
 import { Notice, TFile } from "obsidian";
 import { Radians } from "@zsviczian/excalidraw/types/math";
 

src/utils/customEmbeddableUtils.ts

@@ -1,9 +1,9 @@
 import { NonDeletedExcalidrawElement } from "@zsviczian/excalidraw/types/excalidraw/element/types";
 import { DEVICE, REG_LINKINDEX_INVALIDCHARS } from "src/constants/constants";
-import { getParentOfClass } from "./ObsidianUtils";
+import { getParentOfClass } from "./obsidianUtils";
 import { TFile, WorkspaceLeaf } from "obsidian";
-import { getLinkParts } from "./Utils";
-import ExcalidrawView from "src/ExcalidrawView";
+import { getLinkParts } from "./utils";
+import ExcalidrawView from "src/view/ExcalidrawView";
 
 export const useDefaultExcalidrawFrame = (element: NonDeletedExcalidrawElement) => {
   return !(element.link.startsWith("[") || element.link.startsWith("file:") || element.link.startsWith("data:")); // && !element.link.match(TWITTER_REG);

src/utils/dynamicStyling.ts

@@ -1,11 +1,11 @@
 import { ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/excalidraw/types";
 import { ColorMaster } from "@zsviczian/colormaster";
-import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
-import ExcalidrawView from "src/ExcalidrawView";
+import { ExcalidrawAutomate } from "src/shared/ExcalidrawAutomate";
+import ExcalidrawView from "src/view/ExcalidrawView";
 import { DynamicStyle } from "src/types/types";
-import { cloneElement } from "src/ExcalidrawAutomate";
+import { cloneElement } from "src/shared/ExcalidrawAutomate";
 import { ExcalidrawFrameElement } from "@zsviczian/excalidraw/types/excalidraw/element/types";
-import { addAppendUpdateCustomData } from "./Utils";
+import { addAppendUpdateCustomData } from "./utils";
 import { mutateElement } from "src/constants/constants";
 
 export const setDynamicStyle = (

src/utils/excalidrawViewUtils.ts

@@ -1,15 +1,15 @@
 
 import { MAX_IMAGE_SIZE, IMAGE_TYPES, ANIMATED_IMAGE_TYPES, MD_EX_SECTIONS } from "src/constants/constants";
 import { App, Modal, Notice, TFile, WorkspaceLeaf } from "obsidian";
-import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
-import { REGEX_LINK, REG_LINKINDEX_HYPERLINK, getExcalidrawMarkdownHeaderSection, REGEX_TAGS } from "src/ExcalidrawData";
-import ExcalidrawView from "src/ExcalidrawView";
+import { ExcalidrawAutomate } from "src/shared/ExcalidrawAutomate";
+import { REGEX_LINK, REG_LINKINDEX_HYPERLINK, getExcalidrawMarkdownHeaderSection, REGEX_TAGS } from "../shared/ExcalidrawData";
+import ExcalidrawView from "src/view/ExcalidrawView";
 import { ExcalidrawElement, ExcalidrawFrameElement } from "@zsviczian/excalidraw/types/excalidraw/element/types";
-import { getEmbeddedFilenameParts, getLinkParts, isImagePartRef } from "./Utils";
-import { cleanSectionHeading } from "./ObsidianUtils";
-import { getEA } from "src";
+import { getEmbeddedFilenameParts, getLinkParts, isImagePartRef } from "./utils";
+import { cleanSectionHeading } from "./obsidianUtils";
+import { getEA } from "src/core";
 import { ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/excalidraw/types";
-import { EmbeddableMDCustomProps } from "src/dialogs/EmbeddableSettings";
+import { EmbeddableMDCustomProps } from "src/shared/Dialogs/EmbeddableSettings";
 import { nanoid } from "nanoid";
 import { t } from "src/lang/helpers";
 

src/utils/fileUtils.ts

@@ -1,12 +1,12 @@
 import { DataURL } from "@zsviczian/excalidraw/types/excalidraw/types";
 import { App, loadPdfJs, normalizePath, Notice, requestUrl, RequestUrlResponse, TAbstractFile, TFile, TFolder, Vault } from "obsidian";
 import { DEVICE, EXCALIDRAW_PLUGIN, FRONTMATTER_KEYS, URLFETCHTIMEOUT } from "src/constants/constants";
-import { IMAGE_MIME_TYPES, MimeType } from "src/EmbeddedFileLoader";
-import { ExcalidrawSettings } from "src/settings";
-import { errorlog, getDataURL } from "./Utils";
-import ExcalidrawPlugin from "src/main";
-import { ANNOTATED_PREFIX, CROPPED_PREFIX } from "./CarveOut";
-import { getAttachmentsFolderAndFilePath } from "./ObsidianUtils";
+import { IMAGE_MIME_TYPES, MimeType } from "../shared/EmbeddedFileLoader";
+import { ExcalidrawSettings } from "src/core/settings";
+import { errorlog, getDataURL } from "./utils";
+import ExcalidrawPlugin from "src/core/main";
+import { ANNOTATED_PREFIX, CROPPED_PREFIX } from "./carveout";
+import { getAttachmentsFolderAndFilePath } from "./obsidianUtils";
 
 /**
  * Splits a full path including a folderpath and a filename into separate folderpath and filename components

src/utils/getElementAtPointer.ts

@@ -1,8 +1,8 @@
 import { ExcalidrawElement, ExcalidrawImageElement, ExcalidrawTextElement } from "@zsviczian/excalidraw/types/excalidraw/element/types";
-import { REGEX_LINK, REG_LINKINDEX_HYPERLINK } from "src/ExcalidrawData";
-import ExcalidrawView, { TextMode } from "src/ExcalidrawView";
-import { rotatedDimensions } from "./Utils";
-import { getBoundTextElementId } from "src/ExcalidrawAutomate";
+import { REGEX_LINK, REG_LINKINDEX_HYPERLINK } from "../shared/ExcalidrawData";
+import ExcalidrawView, { TextMode } from "src/view/ExcalidrawView";
+import { rotatedDimensions } from "./utils";
+import { getBoundTextElementId } from "src/shared/ExcalidrawAutomate";
 
 export const getElementsAtPointer = (
   pointer: any,

src/utils/modifierkeyHelper.ts

@@ -1,7 +1,7 @@
 import { Modifier } from "obsidian";
 import { DEVICE } from "src/constants/constants";
 import { t } from "src/lang/helpers";
-import { ExcalidrawSettings } from "src/settings";
+import { ExcalidrawSettings } from "src/core/settings";
 export type ModifierKeys = {shiftKey:boolean, ctrlKey: boolean, metaKey: boolean, altKey: boolean};
 export type KeyEvent = PointerEvent | MouseEvent | KeyboardEvent | React.DragEvent | React.PointerEvent | React.MouseEvent | ModifierKeys; 
 export type PaneTarget = "active-pane"|"new-pane"|"popout-window"|"new-tab"|"md-properties";
@@ -113,7 +113,7 @@ export const mdPropModifier = (ev: KeyEvent): boolean => !isSHIFT(ev) && isWinCT
 export const scaleToFullsizeModifier = (ev: KeyEvent) => {
   const settings:ExcalidrawSettings = window.ExcalidrawAutomate.plugin.settings;
   const keySet = ((DEVICE.isMacOS || DEVICE.isIOS) ? settings.modifierKeyConfig.Mac : settings.modifierKeyConfig.Win )["InternalDragAction"];
-  const rule = keySet.rules.find(r => r.result === "image-fullsize");
+  const rule:ModifierKey = keySet.rules.find((r:ModifierKey) => r.result === "image-fullsize");
   if(!rule) return false;
   const { shift, ctrl_cmd, alt_opt, meta_ctrl, result } = rule;
   return (
@@ -162,7 +162,7 @@ export const emulateKeysForLinkClick = (action: PaneTarget): ModifierKeys => {
   const config = modifierKeyConfig[platform]?.LinkClickAction;
 
   if (config) {
-    const rule = config.rules.find(rule => rule.result === action);
+    const rule:ModifierKey = config.rules.find((rule:ModifierKey) => rule.result === action);
     if (rule) {
       setCTRL(ev, rule.ctrl_cmd);
       setALT(ev, rule.alt_opt);

src/utils/obsidianUtils.ts

@@ -5,13 +5,13 @@ import {
   MarkdownView,
   normalizePath, OpenViewState, parseFrontMatterEntry, TFile, View, ViewState, Workspace, WorkspaceLeaf, WorkspaceSplit
 } from "obsidian";
-import ExcalidrawPlugin from "../main";
-import { checkAndCreateFolder, splitFolderAndFilename } from "./FileUtils";
-import { linkClickModifierType, ModifierKeys } from "./ModifierkeyHelper";
+import ExcalidrawPlugin from "../core/main";
+import { checkAndCreateFolder, splitFolderAndFilename } from "./fileUtils";
+import { linkClickModifierType, ModifierKeys } from "./modifierkeyHelper";
 import { EXCALIDRAW_PLUGIN, REG_BLOCK_REF_CLEAN, REG_SECTION_REF_CLEAN, VIEW_TYPE_EXCALIDRAW } from "src/constants/constants";
 import yaml from "js-yaml";
-import { debug, DEBUGGING } from "./DebugHelper";
-import ExcalidrawView from "src/ExcalidrawView";
+import { debug, DEBUGGING } from "./debugHelper";
+import ExcalidrawView from "src/view/ExcalidrawView";
 
 export const getParentOfClass = (element: Element, cssClass: string):HTMLElement | null => {
   let parent = element.parentElement;

src/utils/pens.ts

@@ -1,4 +1,4 @@
-import { PenStyle, PenType } from "src/types/PenTypes";
+import { PenStyle, PenType } from "src/types/penTypes";
 
 export const PENS:Record<PenType,PenStyle> = {
   "default": {

src/utils/utils.ts

@@ -17,20 +17,20 @@ import {
   DEVICE,
   getContainerElement,
 } from "../constants/constants";
-import ExcalidrawPlugin from "../main";
+import ExcalidrawPlugin from "../core/main";
 import { ExcalidrawElement, ExcalidrawTextElement, ImageCrop } from "@zsviczian/excalidraw/types/excalidraw/element/types";
-import { ExportSettings } from "../ExcalidrawView";
-import { getDataURLFromURL, getIMGFilename, getMimeType, getURLImageExtension } from "./FileUtils";
-import { generateEmbeddableLink } from "./CustomEmbeddableUtils";
-import { FILENAMEPARTS } from "./UtilTypes";
+import { ExportSettings } from "../view/ExcalidrawView";
+import { getDataURLFromURL, getIMGFilename, getMimeType, getURLImageExtension } from "./fileUtils";
+import { generateEmbeddableLink } from "./customEmbeddableUtils";
+import { FILENAMEPARTS } from "../types/utilTypes";
 import { Mutable } from "@zsviczian/excalidraw/types/excalidraw/utility-types";
-import { cleanBlockRef, cleanSectionHeading, getFileCSSClasses } from "./ObsidianUtils";
-import { updateElementLinksToObsidianLinks } from "src/ExcalidrawAutomate";
-import { CropImage } from "./CropImage";
+import { cleanBlockRef, cleanSectionHeading, getFileCSSClasses } from "./obsidianUtils";
+import { updateElementLinksToObsidianLinks } from "src/shared/ExcalidrawAutomate";
+import { CropImage } from "../shared/CropImage";
 import opentype from 'opentype.js';
-import { runCompressionWorker } from "src/workers/compression-worker";
+import { runCompressionWorker } from "src/shared/Workers/compression-worker";
 import Pool from "es6-promise-pool";
-import { FileData } from "src/EmbeddedFileLoader";
+import { FileData } from "../shared/EmbeddedFileLoader";
 import { t } from "src/lang/helpers";
 
 declare const PLUGIN_VERSION:string;

src/view/ExcalidrawLoading.ts

@@ -1,7 +1,7 @@
 import { App, FileView, WorkspaceLeaf } from "obsidian";
 import { VIEW_TYPE_EXCALIDRAW_LOADING } from "src/constants/constants";
-import ExcalidrawPlugin from "src/main";
-import { setExcalidrawView } from "src/utils/ObsidianUtils";
+import ExcalidrawPlugin from "src/core/main";
+import { setExcalidrawView } from "src/utils/obsidianUtils";
 
 export function switchToExcalidraw(app: App) {
   const leaves = app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW_LOADING).filter(l=>l.view instanceof ExcalidrawLoading);