goodbye magic strings + fixes

Author: joetannenbaum

packages/core/src/history.ts

@@ -4,6 +4,9 @@ import { Page } from './types'
 const isServer = typeof window === 'undefined'
 
 export class History {
+  public static rememberedState = 'rememberedState'
+  public static scrollRegions = 'scrollRegions'
+
   public static remember(data: unknown, key: string): void {
     History.replaceState({
       ...currentPage.get(),
@@ -16,16 +19,16 @@ export class History {
 
   public static restore(key: string): unknown {
     if (!isServer) {
-      return this.getState<{ [key: string]: any }>('rememberedState', {})?.[key]
+      return History.getState<{ [key: string]: any }>(History.rememberedState, {})?.[key]
     }
   }
 
   public static pushState(page: Page): void {
-    window.history.pushState(this.pageData(page), '', page.url)
+    window.history.pushState(History.pageData(page), '', page.url)
   }
 
   public static replaceState(page: Page): void {
-    window.history.replaceState(this.pageData(page), '', page.url)
+    window.history.replaceState(History.pageData(page), '', page.url)
   }
 
   protected static pageData(page: Page): Omit<Page, 'meta'> {
@@ -39,7 +42,7 @@ export class History {
   }
 
   public static getState<T>(key: string, defaultValue?: T): T {
-    return window.history.state[key] ?? defaultValue
+    return window.history.state?.[key] ?? defaultValue
   }
 
   public static deleteState(key: string) {
@@ -49,7 +52,7 @@ export class History {
   }
 
   public static hasAnyState(): boolean {
-    return !!this.getAllState()
+    return !!History.getAllState()
   }
 
   public static getAllState(): any {

packages/core/src/response.ts

@@ -147,10 +147,10 @@ export class Response {
   protected setRememberedState(pageResponse: Page): void {
     if (
       this.requestParams.params.preserveState &&
-      History.getState('rememberedState') &&
+      History.getState(History.rememberedState) &&
       pageResponse.component === currentPage.get().component
     ) {
-      pageResponse.rememberedState = History.getState('rememberedState')
+      pageResponse.rememberedState = History.getState(History.rememberedState)
     }
   }
 

packages/core/src/router.ts

@@ -265,7 +265,7 @@ export class Router {
 
   protected clearRememberedStateOnReload(): void {
     if (navigationType.isReload()) {
-      History.deleteState('rememberedState')
+      History.deleteState(History.rememberedState)
     }
   }
 
@@ -307,8 +307,8 @@ export class Router {
     SessionStorage.remove()
 
     currentPage.setUrlHash(window.location.hash)
-    currentPage.remember(History.getState<Page['rememberedState']>('rememberedState', {}))
-    currentPage.scrollRegions(History.getState<Page['scrollRegions']>('scrollRegions', []))
+    currentPage.remember(History.getState<Page['rememberedState']>(History.rememberedState, {}))
+    currentPage.scrollRegions(History.getState<Page['scrollRegions']>(History.scrollRegions, []))
 
     currentPage
       .set(currentPage.get(), {