From d81dacf1695ded7b2afe28abb97f981ba34fb1bf Mon Sep 17 00:00:00 2001
From: Lucas Bruck <lucas.bruck@kroo.com>
Date: Thu, 2 Mar 2023 08:43:24 +0000
Subject: [PATCH] [Navigator] Return new navigators such that they can be
 reused

---
 src/Navigator.js | 87 ++++++++++++++++++++++--------------------------
 1 file changed, 39 insertions(+), 48 deletions(-)

diff --git a/src/Navigator.js b/src/Navigator.js
index 2ec6d8d..4deb355 100644
--- a/src/Navigator.js
+++ b/src/Navigator.js
@@ -18,9 +18,19 @@ class Navigator {
   }
 
   static resume (location, resource, options = {}) {
-    return new Navigator(options)
-      ._setLocation(location)
-      ._setResource(resource)
+    return new Navigator(options, { resource, location })
+  }
+
+  constructor (options, { status, location, response, resource } = {}) {
+    this.options = {
+      ...Navigator.defaultOptions,
+      ...options
+    }
+
+    this._status = status
+    this._response = response
+    this._resource = resource
+    this._location = location
   }
 
   _setResource (resource) {
@@ -33,13 +43,6 @@ class Navigator {
     return this
   }
 
-  constructor (options) {
-    this.options = {
-      ...Navigator.defaultOptions,
-      ...options
-    }
-  }
-
   location () {
     return this._location
   }
@@ -57,7 +60,7 @@ class Navigator {
   }
 
   resolveLink (rel, params) {
-    const relativeHref = this._resource.getHref(rel)
+    const relativeHref = this.resource().getHref(rel)
 
     if (!relativeHref) {
       throw new Error(`Attempting to follow the link '${rel}', which does not exist`)
@@ -66,7 +69,7 @@ class Navigator {
     const { href, params: queryParams } = resolveLink(relativeHref, params)
 
     return {
-      href: makeAbsolute(this._location, href),
+      href: makeAbsolute(this.location(), href),
       queryParams
     }
   }
@@ -104,12 +107,7 @@ class Navigator {
       response
     } = await this.options.get(url, params, config)
 
-    this._status = status
-    this._location = location
-    this._response = response
-    this._resource = Resource.fromObject(body)
-
-    return this
+    return new Navigator(this.options, { status, location, response, resource: Resource.fromObject(body) })
   }
 
   async postUrl (url, body, config) {
@@ -120,16 +118,16 @@ class Navigator {
       response
     } = await this.options.post(url, body, config)
 
-    this._status = status
-    this._location = location
-    this._response = response
-    this._resource = Resource.fromObject(responseBody)
-
     if (this.options.followRedirects && status === 201) {
-      return this.followRedirect(config)
+      return new Navigator(this.options, {
+        status,
+        location,
+        response,
+        resource: Resource.fromObject(responseBody)
+      }).followRedirect(config)
     }
 
-    return this
+    return new Navigator(this.options, { status, location, response, resource: Resource.fromObject(responseBody) })
   }
 
   async putUrl (url, body, config) {
@@ -140,16 +138,16 @@ class Navigator {
       response
     } = await this.options.put(url, body, config)
 
-    this._status = status
-    this._location = location
-    this._response = response
-    this._resource = Resource.fromObject(responseBody)
-
     if (this.options.followRedirects && status === 201) {
-      return this.followRedirect(config)
+      return new Navigator(this.options, {
+        status,
+        location,
+        response,
+        resource: Resource.fromObject(responseBody)
+      }).followRedirect(config)
     }
 
-    return this
+    return new Navigator(this.options, { status, location, response, resource: Resource.fromObject(responseBody) })
   }
 
   async patchUrl (url, body, config) {
@@ -160,16 +158,16 @@ class Navigator {
       response
     } = await this.options.patch(url, body, config)
 
-    this._status = status
-    this._location = location
-    this._response = response
-    this._resource = Resource.fromObject(responseBody)
-
     if (this.options.followRedirects && status === 204) {
-      return this.followRedirect(config)
+      return new Navigator(this.options, {
+        status,
+        location,
+        response,
+        resource: Resource.fromObject(responseBody)
+      }).followRedirect(config)
     }
 
-    return this
+    return new Navigator(this.options, { status, location, response, resource: Resource.fromObject(responseBody) })
   }
 
   async deleteUrl (url, body, config) {
@@ -180,18 +178,11 @@ class Navigator {
       response
     } = await this.options.delete(url, body, config)
 
-    this._status = status
-    this._location = location
-    this._response = response
-    this._resource = Resource.fromObject(responseBody)
-
-    return this
+    return new Navigator(this.options, { status, location, response, resource: Resource.fromObject(responseBody) })
   }
 
   async followRedirect (config) {
-    const fullLocation = makeAbsolute(
-      this._location, this.getHeader('location'))
-    return this.getUrl(fullLocation, {}, config)
+    return this.getUrl(makeAbsolute(this.location(), this.getHeader('location')), {}, config)
   }
 }