refactor: reorganize app and preferences store keys (#706)

Author: antonreshetov

src/main/api/index.ts

@@ -18,7 +18,7 @@ export async function initApi() {
   const { node } = await importEsm('@elysiajs/node')
 
   const app = new Elysia({ adapter: node() })
-  const port = store.preferences.get('apiPort')
+  const port = store.preferences.get('api.port')
 
   app
     .use(cors({ origin: '*' }))

src/main/db/index.ts

@@ -13,7 +13,7 @@ let currentDbPath: string | null = null
 
 export function useDB(customDbPath?: string) {
   const dbPath
-    = customDbPath || `${store.preferences.get('storagePath')}/${DB_NAME}`
+    = customDbPath || `${store.preferences.get('storage.rootPath')}/${DB_NAME}`
 
   if (db && currentDbPath === dbPath)
     return db

src/main/i18n/index.ts

@@ -5,7 +5,7 @@ import Backend from 'i18next-fs-backend'
 import { store } from '../store'
 import { language } from './language'
 
-const storedLng = store.preferences.get('language')
+const storedLng = store.preferences.get('localization.locale')
 
 const lng
   = storedLng && Object.keys(language).includes(storedLng) ? storedLng : 'en_US'

src/main/index.ts

@@ -41,7 +41,7 @@ else {
 }
 
 function createWindow() {
-  const bounds = store.app.get('bounds')
+  const bounds = store.app.get('window.bounds')
 
   mainWindow = new BrowserWindow({
     width: 1200,
@@ -79,7 +79,7 @@ function createWindow() {
   })
 
   mainWindow.on('close', (event) => {
-    store.app.set('bounds', mainWindow.getBounds())
+    store.app.set('window.bounds', mainWindow.getBounds())
 
     if (process.platform === 'darwin' && !isQuitting) {
       event.preventDefault()
@@ -104,7 +104,7 @@ else {
         const vaultPath
           = (store.preferences.get('storage.vaultPath') as string | null)
             || path.join(
-              store.preferences.get('storagePath') as string,
+              store.preferences.get('storage.rootPath') as string,
               'markdown-vault',
             )
         ensureFlatSpacesLayout(vaultPath)
@@ -137,7 +137,7 @@ else {
     })
 
     try {
-      const storagePath = store.preferences.get('storagePath')
+      const storagePath = store.preferences.get('storage.rootPath')
       const dbPath = `${storagePath}/massCode.db`
 
       if (isSqliteFile(dbPath)) {

src/main/ipc/handlers/fs.ts

@@ -11,7 +11,7 @@ const ASSETS_DIR = 'assets'
 
 export function registerFsHandlers() {
   ipcMain.handle('fs:assets', (event, { buffer, fileName }) => {
-    const storagePath = store.preferences.get('storagePath')
+    const storagePath = store.preferences.get('storage.rootPath')
 
     return new Promise((resolve, reject) => {
       try {
@@ -35,7 +35,10 @@ export function registerFsHandlers() {
   ipcMain.handle('fs:notes-asset', (event, { buffer, ext }) => {
     const vaultPath
       = (store.preferences.get('storage.vaultPath') as string | null)
-        || join(store.preferences.get('storagePath') as string, 'markdown-vault')
+        || join(
+          store.preferences.get('storage.rootPath') as string,
+          'markdown-vault',
+        )
 
     return new Promise((resolve, reject) => {
       try {

src/main/ipc/handlers/prettier.ts

@@ -4,7 +4,7 @@ import prettier from 'prettier'
 import { store } from '../../store'
 
 export async function format(source: string, parser: string) {
-  const editor = store.preferences.get('editor')
+  const editor = store.preferences.get('editor.code')
 
   return prettier.format(source, {
     parser,

src/main/ipc/index.ts

@@ -31,7 +31,7 @@ export function registerIPC() {
   })
 
   ipcMain.handle('db:migrate-to-markdown', async (_, sqliteDbPath?: string) => {
-    const storagePath = store.preferences.get('storagePath') as string
+    const storagePath = store.preferences.get('storage.rootPath') as string
     const dbPath
       = typeof sqliteDbPath === 'string' && sqliteDbPath.trim()
         ? sqliteDbPath

src/main/preload.ts

@@ -1,8 +1,3 @@
-import type {
-  AppStore,
-  MathNotebookStore,
-  PreferencesStore,
-} from './store/types'
 import type { EventCallback } from './types'
 import type { Channel } from './types/ipc'
 import { contextBridge, ipcRenderer } from 'electron'
@@ -26,27 +21,20 @@ contextBridge.exposeInMainWorld('electron', {
   },
   store: {
     app: {
-      get: (name: keyof AppStore) => store.app.get(name),
-      set: <T extends keyof AppStore>(name: T, value: AppStore[T]) =>
-        store.app.set(name, value),
-      delete: (name: keyof AppStore) => store.app.delete(name),
+      get: <T = unknown>(name: string) => store.app.get(name) as T,
+      set: (name: string, value: unknown) => store.app.set(name, value),
+      delete: (name: string) => store.app.delete(name),
     },
     preferences: {
-      get: (name: keyof PreferencesStore) => store.preferences.get(name),
-      set: <T extends keyof PreferencesStore>(
-        name: T,
-        value: PreferencesStore[T],
-      ) => store.preferences.set(name, value),
-      delete: (name: keyof PreferencesStore) => store.preferences.delete(name),
+      get: <T = unknown>(name: string) => store.preferences.get(name) as T,
+      set: (name: string, value: unknown) => store.preferences.set(name, value),
+      delete: (name: string) => store.preferences.delete(name),
     },
     mathNotebook: {
-      get: (name: keyof MathNotebookStore) => store.mathNotebook.get(name),
-      set: <T extends keyof MathNotebookStore>(
-        name: T,
-        value: MathNotebookStore[T],
-      ) => store.mathNotebook.set(name, value),
-      delete: (name: keyof MathNotebookStore) =>
-        store.mathNotebook.delete(name),
+      get: <T = unknown>(name: string) => store.mathNotebook.get(name) as T,
+      set: (name: string, value: unknown) =>
+        store.mathNotebook.set(name, value),
+      delete: (name: string) => store.mathNotebook.delete(name),
     },
   },
   i18n: {

src/main/storage/providers/markdown/runtime/paths.ts

@@ -30,7 +30,7 @@ export function getVaultPath(): string {
     return configuredVaultPath
   }
 
-  const storagePath = store.preferences.get('storagePath') as string
+  const storagePath = store.preferences.get('storage.rootPath') as string
   return path.join(storagePath, 'markdown-vault')
 }