refactor: organize imports and types with import aliases

electron.vite.config.ts

@@ -7,14 +7,26 @@ import solid from "vite-plugin-solid";
 export default defineConfig({
   main: {
     plugins: [externalizeDepsPlugin()],
+    resolve: {
+      alias: {
+        "@main": resolve("src/main"),
+        "@shared": resolve("src/shared"),
+      },
+    },
   },
   preload: {
     plugins: [externalizeDepsPlugin()],
+    resolve: {
+      alias: {
+        "@shared": resolve("src/shared"),
+      },
+    },
   },
   renderer: {
     resolve: {
       alias: {
         "@renderer": resolve("src/renderer/src"),
+        "@shared": resolve("src/shared"),
       },
     },
     plugins: [

src/main/index.ts

@@ -1,8 +1,8 @@
-import { Router } from "./lib/route-pass/Router";
-import createMenu from "./lib/window/menu";
-import trackBounds, { getBounds, wasMaximized } from "./lib/window/resizer";
-import { main } from "./main";
 import { electronApp, is, optimizer } from "@electron-toolkit/utils";
+import { Router } from "@main/lib/route-pass/Router";
+import createMenu from "@main/lib/window/menu";
+import trackBounds, { getBounds, wasMaximized } from "@main/lib/window/resizer";
+import { main } from "@main/main";
 import { app, BrowserWindow, dialog } from "electron";
 import { join } from "path";
 

src/main/lib/osu-file-parser/OsuFile.ts

@@ -1,8 +1,8 @@
-import { AudioSource, ImageSource, Optional, Result, Song } from "../../../@types";
-import { access, readFile, stat } from "../fs-promises";
-import { none, some } from "../rust-like-utils-backend/Optional";
-import { fail, ok } from "../rust-like-utils-backend/Result";
-import { SongBuilder } from "../song/SongBuilder";
+import { access, readFile, stat } from "@main/lib/fs-promises";
+import { SongBuilder } from "@main/lib/song/SongBuilder";
+import { none, some } from "@shared/lib/rust-types/Optional";
+import { fail, ok } from "@shared/lib/rust-types/Result";
+import { AudioSource, ImageSource, Optional, Result, Song } from "@shared/types/common.types";
 import { getAudioDurationInSeconds } from "get-audio-duration";
 import fs from "graceful-fs";
 import path from "path";

src/main/lib/osu-file-parser/OsuParser.ts

@@ -1,8 +1,8 @@
-import { AudioSource, ImageSource, ResourceID, Result, Song } from "../../../@types";
-import { access } from "../fs-promises";
-import { fail, ok } from "../rust-like-utils-backend/Result";
-import { assertNever } from "../tungsten/assertNever";
 import { OsuFile } from "./OsuFile";
+import { access } from "@main/lib/fs-promises";
+import { fail, ok } from "@shared/lib/rust-types/Result";
+import { assertNever } from "@shared/lib/tungsten/assertNever";
+import { AudioSource, ImageSource, ResourceID, Result, Song } from "@shared/types/common.types";
 import fs from "graceful-fs";
 import os from "os";
 import path from "path/posix";

src/main/lib/osu-file-parser/WatchFile.ts

@@ -1,5 +1,5 @@
-import { Result } from "../../../@types";
-import { fail, ok } from "../rust-like-utils-backend/Result";
+import { fail, ok } from "@shared/lib/rust-types/Result";
+import { Result } from "@shared/types/common.types";
 import fs from "fs";
 import path from "path";
 

src/main/lib/route-pass/Packet.ts

@@ -1,4 +1,4 @@
-import type { PacketType, Packet } from "../../../@types";
+import type { PacketType, Packet } from "@shared/types/common.types";
 
 export function cratePacket<T>(
   channel: string,

src/main/lib/route-pass/Router.ts

@@ -1,9 +1,8 @@
-import type { APIFunction, Packet } from "../../../@types";
-import { ListenAPI } from "../../../ListenAPI";
-import { RequestAPI } from "../../../RequestAPI";
-import { assertNever } from "../tungsten/assertNever";
-import { TokenNamespace } from "../tungsten/token";
 import { cratePacket } from "./Packet";
+import { assertNever } from "@shared/lib/tungsten/assertNever";
+import { TokenNamespace } from "@shared/lib/tungsten/token";
+import type { APIFunction, Packet } from "@shared/types/common.types";
+import { ListenAPI, RequestAPI } from "@shared/types/router.types";
 import { BrowserWindow, ipcMain } from "electron";
 
 type Pending = {

src/main/lib/search-parser/SearchParser.ts

@@ -1,12 +1,12 @@
+import { closestLevenDist } from "./levenshteinDistance";
 import {
   SearchPropertyValidation,
   SearchConfig,
   SearchProperty,
   SearchQuery,
   ValidationSuggestion,
   SearchQuerySuggestion,
-} from "./@search-types";
-import { closestLevenDist } from "./levenshteinDistance";
+} from "@shared/types/search-parser.types";
 
 type ComparisonExtractionTrue = {
   isPresent: true;

src/main/lib/search-parser/validators.ts

@@ -1,5 +1,8 @@
-import { SearchPropertyValidation, SearchPropertyValidator } from "./@search-types";
 import { closestLevenDist } from "./levenshteinDistance";
+import {
+  SearchPropertyValidation,
+  SearchPropertyValidator,
+} from "@shared/types/search-parser.types";
 
 export const equalsSymbols = ["=", "==", "!="];
 export const greaterThanSymbols = [">", ">="];

src/main/lib/song/SongBuilder.ts

@@ -1,4 +1,4 @@
-import { Song } from "../../../@types";
+import { Song } from "@shared/types/common.types";
 
 export class SongBuilder {
   private song: any = {};

src/main/lib/song/filter.ts

@@ -1,5 +1,10 @@
-import { OsuSearchAbleProperties, SongIndex, SongsQueryPayload, Tag } from "../../../@types";
-import { assertNever } from "../tungsten/assertNever";
+import { assertNever } from "@shared/lib/tungsten/assertNever";
+import {
+  OsuSearchAbleProperties,
+  SongIndex,
+  SongsQueryPayload,
+  Tag,
+} from "@shared/types/common.types";
 
 export function filter(indexes: SongIndex[], query: SongsQueryPayload): SongIndex[] {
   if (query.searchQuery === undefined) {

src/main/lib/song/index.ts

@@ -1,5 +1,5 @@
-import { Song, SongIndex } from "../../../@types";
 import { averageBPM, msToBPM } from "./average-bpm";
+import { Song, SongIndex } from "@shared/types/common.types";
 
 function createSongIndex(id: string, song: Song): SongIndex {
   return {

src/main/lib/song/indexMapper.ts

@@ -1,5 +1,5 @@
-import { Song, SongIndex } from "../../../@types";
-import { Storage } from "../storage/Storage";
+import { Storage } from "@main/lib/storage/Storage";
+import { Song, SongIndex } from "@shared/types/common.types";
 
 export function* indexMapper(indexes: SongIndex[]): Generator<Song> {
   for (let i = 0; i < indexes.length; i++) {

src/main/lib/song/order.ts

@@ -1,6 +1,6 @@
-import { Order, Result, Song } from "../../../@types";
-import { ok } from "../rust-like-utils-backend/Result";
 import { averageBPM, msToBPM } from "./average-bpm";
+import { ok } from "@shared/lib/rust-types/Result";
+import { Order, Result, Song } from "@shared/types/common.types";
 
 export default function order(ordering: Order): Result<(a: Song, b: Song) => number, string> {
   const { option, direction } = ordering;

src/main/lib/storage/Storage.ts

@@ -1,5 +1,5 @@
-import { BlobMap, TableMap } from "../../../@types";
 import { Table } from "./Table";
+import { BlobMap, TableMap } from "@shared/types/common.types";
 import { app } from "electron";
 import fs from "fs";
 import path from "path";

src/main/lib/storage/Table.ts

@@ -1,5 +1,5 @@
-import { Optional } from "../../../@types";
-import { none, some } from "../rust-like-utils-backend/Optional";
+import { none, some } from "@shared/lib/rust-types/Optional";
+import { Optional } from "@shared/types/common.types";
 import fs from "fs";
 
 export class Table<S> {

src/main/lib/template-parser/parser/TemplateParser.ts

@@ -2,32 +2,10 @@
 // String is converted to tokens and parser validates grammar of token sequence. From this sequence a
 // "list of instructions" is created. Using the "list of instructions" together with data source will produce a dynamic
 // string templating. Similar architecture is used to interpret search queries
-import { TemplateTokenizer, Tokens } from "../tokenizer/TemplateTokenizer";
+import { TemplateTokenizer, Tokens } from "@main/lib/template-parser/tokenizer/TemplateTokenizer";
+import { ConfigError, ConfigSuccess, ConfigItem } from "@shared/types/template-parser.types";
 import { closest } from "fastest-levenshtein";
 
-export type ConfigItem = {
-  type: "TEXT" | "IDENT";
-  literal: string;
-};
-
-export type ConfigError = {
-  type: "error";
-  error: {
-    message: string;
-    suggestion?: {
-      start: number;
-      end: number;
-      replacement: string;
-      description: string;
-    };
-  };
-};
-
-export type ConfigSuccess = {
-  type: "success";
-  config: ConfigItem[];
-};
-
 export class TemplateParser {
   private readonly identifiers: string[];
   private readonly tokenizer = new TemplateTokenizer();

src/main/lib/template-parser/template.ts

@@ -1,4 +1,4 @@
-import { ConfigItem } from "./parser/TemplateParser";
+import { ConfigItem } from "@shared/types/template-parser.types";
 
 export type IdentAccessor = (ident: string) => string;
 

src/main/lib/window/resizer.ts

@@ -1,5 +1,5 @@
-import { orDefault } from "../rust-like-utils-backend/Optional";
-import { Storage } from "../storage/Storage";
+import { Storage } from "@main/lib/storage/Storage";
+import { orDefault } from "@shared/lib/rust-types/Optional";
 import { BrowserWindow } from "electron";
 
 /**

src/main/main.ts

@@ -1,12 +1,12 @@
-import { DirParseResult, OsuParser } from "./lib/osu-file-parser/OsuParser";
-import { Router } from "./lib/route-pass/Router";
-import { orDefault } from "./lib/rust-like-utils-backend/Optional";
-import { collectTagsAndIndexSongs } from "./lib/song";
-import { Storage } from "./lib/storage/Storage";
-import { throttle } from "./lib/throttle";
-import { dirSubmit } from "./router/dir-router";
-import { showError } from "./router/error-router";
-import "./router/import";
+import { DirParseResult, OsuParser } from "@main/lib/osu-file-parser/OsuParser";
+import { Router } from "@main/lib/route-pass/Router";
+import { collectTagsAndIndexSongs } from "@main/lib/song";
+import { Storage } from "@main/lib/storage/Storage";
+import { throttle } from "@main/lib/throttle";
+import { dirSubmit } from "@main/router/dir-router";
+import { showError } from "@main/router/error-router";
+import "@main/router/import";
+import { orDefault } from "@shared/lib/rust-types/Optional";
 import { BrowserWindow } from "electron";
 
 export let mainWindow: BrowserWindow;

src/main/router/dev-router.ts

@@ -1,4 +1,4 @@
-import { Router } from "../lib/route-pass/Router";
+import { Router } from "@main/lib/route-pass/Router";
 import { app } from "electron";
 import path from "path";
 

src/main/router/dir-router.ts

@@ -1,5 +1,5 @@
-import { Router } from "../lib/route-pass/Router";
-import { none, some } from "../lib/rust-like-utils-backend/Optional";
+import { Router } from "@main/lib/route-pass/Router";
+import { none, some } from "@shared/lib/rust-types/Optional";
 import { dialog } from "electron";
 import path from "path";
 

src/main/router/discord-router.ts

@@ -1,4 +1,4 @@
-import { Router } from "../lib/route-pass/Router";
+import { Router } from "@main/lib/route-pass/Router";
 import { Client, SetActivity } from "@xhayper/discord-rpc";
 
 const client = new Client({ clientId: "1292942523425099826" });

src/main/router/error-router.ts

@@ -1,4 +1,4 @@
-import { Router } from "../lib/route-pass/Router";
+import { Router } from "@main/lib/route-pass/Router";
 import { BrowserWindow } from "electron";
 
 let pending: (() => void)[] = [];

src/main/router/local-volume-router.ts

@@ -1,7 +1,7 @@
-import { AudioSource, ResourceID } from "../../@types";
-import { delay } from "../lib/delay-backend";
-import { Router } from "../lib/route-pass/Router";
-import { Storage } from "../lib/storage/Storage";
+import { delay } from "@main/lib/delay-backend";
+import { Router } from "@main/lib/route-pass/Router";
+import { Storage } from "@main/lib/storage/Storage";
+import { AudioSource, ResourceID } from "@shared/types/common.types";
 
 const [writeAudioSource] = delay((audioID: ResourceID, audioSource: AudioSource) => {
   Storage.getTable("audio").write(audioID, audioSource);

src/main/router/parser-router.ts

@@ -1,8 +1,8 @@
-import { Router } from "../lib/route-pass/Router";
-import { SearchParser } from "../lib/search-parser/SearchParser";
-import { defaultRelationSymbols, num, set, text, time } from "../lib/search-parser/validators";
-import { TemplateParser } from "../lib/template-parser/parser/TemplateParser";
-import templateIdentifiers from "../lib/template-parser/template-identifiers";
+import { Router } from "@main/lib/route-pass/Router";
+import { SearchParser } from "@main/lib/search-parser/SearchParser";
+import { defaultRelationSymbols, num, set, text, time } from "@main/lib/search-parser/validators";
+import { TemplateParser } from "@main/lib/template-parser/parser/TemplateParser";
+import templateIdentifiers from "@main/lib/template-parser/template-identifiers";
 
 /**
  * Examples of valid search queries: