refactor

Author: pascalbaljet

packages/core/src/page.ts

@@ -87,7 +87,7 @@ class CurrentPage {
         this.page = page
         this.cleared = false
 
-        prefetchedRequests.updateCachedResponsesWithOnceProps()
+        prefetchedRequests.syncCachedOnceProps()
 
         if (isNewComponent) {
           this.fireEventsFor('newComponent')
@@ -219,6 +219,23 @@ class CurrentPage {
   public fireEventsFor(event: PageEvent): void {
     this.listeners.filter((listener) => listener.event === event).forEach((listener) => listener.callback())
   }
+
+  public passOncePropsTo(toPage: Page, { overwrite = false }: { overwrite?: boolean } = {}): void {
+    const onceProps = toPage.onceProps ?? {}
+
+    Object.entries(onceProps).forEach(([key, onceProp]) => {
+      const existingOnceProp = this.page.onceProps?.[key]
+
+      if (existingOnceProp === undefined) {
+        return
+      }
+
+      if (overwrite || toPage.props[onceProp.prop] === undefined) {
+        toPage.props[onceProp.prop] = this.page.props[existingOnceProp.prop]
+        toPage.onceProps![key].expiresAt = existingOnceProp.expiresAt
+      }
+    })
+  }
 }
 
 export const page = new CurrentPage()

packages/core/src/prefetched.ts

@@ -68,7 +68,7 @@ class PrefetchedRequests {
     }).then((response) => {
       this.remove(params)
 
-      this.preserveOncePropsInResponse(response)
+      currentPage.passOncePropsTo(response.getPageResponse())
 
       this.cached.push({
         params: { ...params },
@@ -264,27 +264,14 @@ class PrefetchedRequests {
     )
   }
 
-  public updateCachedResponsesWithOnceProps(): void {
-    const current = currentPage.get()
-
-    if (Object.keys(current.onceProps ?? {}).length === 0) {
+  public syncCachedOnceProps(): void {
+    if (Object.keys(currentPage.get().onceProps ?? {}).length === 0) {
       return
     }
 
     this.cached.forEach((prefetched) => {
       prefetched.response.then((response) => {
-        const page = response.getPageResponse()
-
-        Object.entries(page.onceProps ?? {}).forEach(([key, onceProp]) => {
-          const existingOnceProp = current.onceProps?.[key]
-
-          if (existingOnceProp === undefined) {
-            return
-          }
-
-          page.props[onceProp.prop] = current.props[existingOnceProp.prop]
-          page.onceProps![key].expiresAt = existingOnceProp.expiresAt
-        })
+        currentPage.passOncePropsTo(response.getPageResponse(), { overwrite: true })
 
         const oncePropsExpiresIn = this.getOncePropsExpiresIn(response)
 
@@ -302,24 +289,6 @@ class PrefetchedRequests {
     })
   }
 
-  protected preserveOncePropsInResponse(response: Response): void {
-    const current = currentPage.get()
-    const page = response.getPageResponse()
-
-    Object.entries(page.onceProps ?? {}).forEach(([key, onceProp]) => {
-      const existingOnceProp = current.onceProps?.[key]
-
-      if (existingOnceProp === undefined) {
-        return
-      }
-
-      if (page.props[onceProp.prop] === undefined) {
-        page.props[onceProp.prop] = current.props[existingOnceProp.prop]
-        page.onceProps![key].expiresAt = existingOnceProp.expiresAt
-      }
-    })
-  }
-
   protected getOncePropsExpiresIn(response: Response): number | null {
     const page = response.getPageResponse()
     const expiryTimes = Object.values(page.onceProps ?? {})

packages/core/src/response.ts

@@ -169,7 +169,7 @@ export class Response {
     }
 
     this.mergeProps(pageResponse)
-    this.preserveOnceProps(pageResponse)
+    currentPage.passOncePropsTo(pageResponse)
     this.preserveEqualProps(pageResponse)
 
     await this.setRememberedState(pageResponse)
@@ -235,27 +235,6 @@ export class Response {
     return responseUrl.pathname + responseUrl.search + responseUrl.hash
   }
 
-  protected preserveOnceProps(pageResponse: Page): void {
-    const onceProps = pageResponse.onceProps || {}
-
-    Object.entries(onceProps).forEach(([key, onceProp]) => {
-      // Check if the current page has the same onceProp key
-      const existingOnceProp = currentPage.get().onceProps?.[key]
-
-      if (existingOnceProp === undefined) {
-        return
-      }
-
-      const currentValue = currentPage.get().props[existingOnceProp.prop]
-
-      if (pageResponse.props[onceProp.prop] === undefined) {
-        // Only preserve if no new value was provided for this prop
-        pageResponse.props[onceProp.prop] = currentValue
-        onceProps[key].expiresAt = existingOnceProp.expiresAt
-      }
-    })
-  }
-
   protected preserveEqualProps(pageResponse: Page): void {
     if (pageResponse.component !== currentPage.get().component || config.get('future.preserveEqualProps') !== true) {
       return