Fix folder icon type guards

Author: adibhanna

apps/desktop/src/main/vault.ts

@@ -97,6 +97,10 @@ const VALID_FOLDER_ICON_IDS = new Set<FolderIconId>([
   'home'
 ])
 
+function isFolderIconId(value: unknown): value is FolderIconId {
+  return typeof value === 'string' && VALID_FOLDER_ICON_IDS.has(value as FolderIconId)
+}
+
 const DEFAULT_VAULT_SETTINGS: VaultSettings = {
   primaryNotesLocation: 'inbox',
   dailyNotes: {
@@ -356,8 +360,7 @@ function normalizeVaultSettings(
   const folderIcons: Record<string, FolderIconId> = {}
   if (candidate.folderIcons && typeof candidate.folderIcons === 'object') {
     for (const [key, iconId] of Object.entries(candidate.folderIcons)) {
-      if (!key || typeof iconId !== 'string') continue
-      if (!VALID_FOLDER_ICON_IDS.has(iconId as FolderIconId)) continue
+      if (!key || !isFolderIconId(iconId)) continue
       folderIcons[key] = iconId
     }
   }

packages/app-core/src/lib/vault-layout.ts

@@ -50,6 +50,10 @@ const VALID_FOLDER_ICON_IDS = new Set<FolderIconId>([
   'home'
 ])
 
+function isFolderIconId(value: unknown): value is FolderIconId {
+  return typeof value === 'string' && VALID_FOLDER_ICON_IDS.has(value as FolderIconId)
+}
+
 function pad(n: number): string {
   return n.toString().padStart(2, '0')
 }
@@ -66,10 +70,8 @@ export function normalizeVaultSettings(
   const normalizedFolderIcons: Record<string, FolderIconId> = {}
   if (folderIcons && typeof folderIcons === 'object') {
     for (const [key, value] of Object.entries(folderIcons)) {
-      if (!key || typeof value !== 'string') continue
-      if (VALID_FOLDER_ICON_IDS.has(value as FolderIconId)) {
-        normalizedFolderIcons[key] = value
-      }
+      if (!key || !isFolderIconId(value)) continue
+      normalizedFolderIcons[key] = value
     }
   }
   return {