only set query if modified

Author: seanhess

client/dist/hyperbole.js

@@ -1,5 +1,5 @@
 
-export function setQuery(query: string = "") {
+export function setQuery(query: string) {
   if (query != currentQuery()) {
     if (query != "") query = "?" + query
     let url = location.pathname + query

client/src/browser.ts

@@ -14,7 +14,7 @@ import { setQuery } from "./browser"
 // const CONTENT_ID = "yeti-root-content"
 
 // console.log("VERSION 2", INIT_PAGE, INIT_STATE)
-console.log("Hyperbole 0.4.2")
+console.log("Hyperbole 0.4.3a")
 
 
 let rootStyles: HTMLStyleElement;
@@ -46,7 +46,9 @@ async function sendAction(msg: ActionMessage) {
       return
     }
 
-    setQuery(res.headers.get("set-query"))
+    if (res.headers.has("set-query")) {
+      setQuery(res.headers.get("set-query"))
+    }
 
     if (!res.ok) {
       let error = new Error()

client/src/index.ts

@@ -96,7 +96,9 @@ export class SocketConnection {
           return
         }
 
-        setQuery(metadata.query)
+        if (metadata.query !== undefined) {
+          setQuery(metadata.query)
+        }
 
         if (metadata.viewId != id) {
           // console.warn("Mismatched ids, ignoring", metadata.viewId, id)

client/src/sockets.ts

@@ -3,12 +3,10 @@
 
 module Web.Hyperbole.Effect.Hyperbole where
 
-import Data.ByteString qualified as BS
 import Effectful
 import Effectful.Dispatch.Dynamic
 import Effectful.Error.Static
 import Effectful.State.Static.Local
-import Web.Hyperbole.Data.QueryData (queryData)
 import Web.Hyperbole.Effect.Server
 
 
@@ -44,16 +42,10 @@ runHyperbole = fmap combine $ reinterpret runLocal $ \_ -> \case
   runLocal eff = do
     -- Load the request ONCE right when we start
     r <- send LoadRequest
-    let client = Client mempty (queryData $ queryParams r)
+    let client = Client mempty mempty
     let st = HyperState r client
     runErrorNoCallStack @Response . runState st $ eff
 
-  queryParams request =
-    filter (not . isSystemParam) request.query
-
-  isSystemParam (key, _) =
-    "hyp-" `BS.isPrefixOf` key
-
   combine :: (Server :> es) => Eff es (Either Response (Response, HyperState)) -> Eff es Response
   combine eff = do
     er <- eff

src/Web/Hyperbole/Effect/Hyperbole.hs

@@ -1,12 +1,15 @@
 module Web.Hyperbole.Effect.Query where
 
+import Data.ByteString qualified as BS
+import Data.Maybe (fromMaybe)
 import Data.String.Conversions (cs)
 import Effectful
 import Effectful.Dispatch.Dynamic (send)
-import Web.Hyperbole.Data.QueryData (FromParam (..), FromQuery (..), Param, QueryData (..), ToParam (..), ToQuery (..))
+import Web.Hyperbole.Data.QueryData (FromParam (..), FromQuery (..), Param, QueryData (..), ToParam (..), ToQuery (..), queryData)
 import Web.Hyperbole.Data.QueryData qualified as QueryData
 import Web.Hyperbole.Effect.Hyperbole (Hyperbole (..))
-import Web.Hyperbole.Effect.Server (Client (..), Response (..), ResponseError (..))
+import Web.Hyperbole.Effect.Request (request)
+import Web.Hyperbole.Effect.Server (Client (..), Request (..), Response (..), ResponseError (..))
 import Prelude
 
 
@@ -77,10 +80,23 @@ deleteParam key = do
 -- | Return the query from 'Request' as a 'QueryData'
 queryParams :: (Hyperbole :> es) => Eff es QueryData
 queryParams = do
-  (.query) <$> send GetClient
+  cq <- clientQuery
+  rq <- requestQuery
+  pure $ fromMaybe rq cq
+ where
+  clientQuery = (.query) <$> send GetClient
+
+  requestQuery :: (Hyperbole :> es) => Eff es QueryData
+  requestQuery = do
+    r <- request
+    pure $ queryData $ filter (not . isSystemParam) r.query
+
+  isSystemParam (key, _) =
+    "hyp-" `BS.isPrefixOf` key
 
 
 modifyQuery :: (Hyperbole :> es) => (QueryData -> QueryData) -> Eff es ()
-modifyQuery f =
+modifyQuery f = do
+  q <- queryParams
   send $ ModClient $ \client ->
-    Client{query = f client.query, session = client.session}
+    Client{query = Just $ f q, session = client.session}

src/Web/Hyperbole/Effect/Query.hs

@@ -89,7 +89,8 @@ runServerWai toDoc req respond =
     setCookie cookie =
       ("Set-Cookie", renderCookie (Wai.pathInfo req) cookie)
 
-    setQuery qd =
+    setQuery Nothing = []
+    setQuery (Just qd) =
       [("Set-Query", QueryData.render qd)]
 
   -- convert to document if full page request. Subsequent POST requests will only include fragments
@@ -186,8 +187,9 @@ runServerSockets conn req = reinterpret runLocal $ \_ -> \case
   cookieMeta cookie =
     Metadata [("COOKIE", cs (renderCookie req.path cookie))]
 
-  queryMeta :: QueryData -> Metadata
-  queryMeta q =
+  queryMeta :: Maybe QueryData -> Metadata
+  queryMeta Nothing = mempty
+  queryMeta (Just q) =
     Metadata [("QUERY", cs $ QueryData.render q)]
 
   viewIdMeta :: TargetViewId -> Metadata
@@ -218,7 +220,7 @@ errNotHandled ev =
 
 data Client = Client
   { session :: Cookies
-  , query :: QueryData
+  , query :: Maybe QueryData
   }