Slightly improve persistent option validation

Author: jpenilla

web/src/lib/global-options.svelte.ts

@@ -98,8 +98,20 @@ export class GlobalOptions {
     }
 
     private deserialize(serialized: string) {
-        const jsonObject = JSON.parse(serialized);
-        if (jsonObject.syntaxHighlighting !== undefined) {
+        try {
+            const jsonObject = JSON.parse(serialized);
+            this.loadFrom(jsonObject);
+        } catch {
+            // Ignore invalid options
+        }
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    private loadFrom(jsonObject: any) {
+        if (jsonObject === undefined || jsonObject === null) {
+            return;
+        }
+        if (typeof jsonObject.syntaxHighlighting === "boolean") {
             this.syntaxHighlighting = jsonObject.syntaxHighlighting;
         }
         if (jsonObject.syntaxHighlightingThemeLight !== undefined) {
@@ -112,13 +124,13 @@ export class GlobalOptions {
         } else {
             this.syntaxHighlightingThemeDark = DEFAULT_THEME_DARK;
         }
-        if (jsonObject.omitPatchHeaderOnlyHunks !== undefined) {
+        if (typeof jsonObject.omitPatchHeaderOnlyHunks === "boolean") {
             this.omitPatchHeaderOnlyHunks = jsonObject.omitPatchHeaderOnlyHunks;
         }
-        if (jsonObject.wordDiff !== undefined) {
+        if (typeof jsonObject.wordDiff === "boolean") {
             this.wordDiffs = jsonObject.wordDiff;
         }
-        if (jsonObject.lineWrap !== undefined) {
+        if (typeof jsonObject.lineWrap === "boolean") {
             this.lineWrap = jsonObject.lineWrap;
         }
         if (jsonObject.sidebarLocation !== undefined) {

web/src/lib/layout.svelte.ts

@@ -31,8 +31,8 @@ export class LayoutState {
         return undefined;
     });
 
-    constructor(state: PersistentLayoutState | null) {
-        this.lastSidebarWidth = state?.sidebarWidth;
+    constructor(persistentState: PersistentLayoutState | null) {
+        this.loadFrom(persistentState);
 
         // Maintain sidebar size when resizing window
         watch.pre(
@@ -47,6 +47,17 @@ export class LayoutState {
         );
     }
 
+    private loadFrom(persistentState: PersistentLayoutState | null) {
+        if (persistentState === null) {
+            return;
+        }
+
+        const sidebarWidth = persistentState.sidebarWidth;
+        if (Number.isFinite(sidebarWidth) && sidebarWidth >= 0 && sidebarWidth <= 100) {
+            this.lastSidebarWidth = sidebarWidth;
+        }
+    }
+
     toggleSidebar() {
         this.sidebarCollapsed = !this.sidebarCollapsed;
     }
@@ -85,7 +96,7 @@ export class LayoutState {
         a way to preset a size in px (it generally works in proportions only)
 
         this means there may be a shift on hydration when a new window uses an old cookie
-        
+
         see GH:svecosystem/paneforge/issues/91
         */
         this.lastSidebarWidth = size;

web/src/routes/+page.server.ts

@@ -3,7 +3,14 @@ import type { PageServerLoad } from "./$types";
 
 export const load: PageServerLoad = async ({ cookies }) => {
     const cookie = cookies.get(ROOT_LAYOUT_KEY);
-    const parsed: PersistentLayoutState | null = cookie ? JSON.parse(cookie) : null;
+    let parsed: PersistentLayoutState | null = null;
+    if (cookie) {
+        try {
+            parsed = JSON.parse(cookie);
+        } catch {
+            // Ignore invalid cookie
+        }
+    }
     return {
         rootLayout: parsed,
     };