Separate pathname and search query for history driver sink input

Required as of @cycle/history v7.2.0, see cyclejs/cyclejs#909

client/src/app.js

@@ -339,10 +339,11 @@ export default function main({ DOM, HTTP, route, storage, scanner: scan$, search
 
   // Route navigation sink
   , navto$ = O.merge(
-      searchResult$.filter(Boolean).map(path => ({ type: 'push', pathname: path }))
+      searchResult$.filter(Boolean).map(result => ({ type: 'push', ...result }))
     , byHeight$.map(hash => ({ type: 'replace', pathname: `/block/${hash}` }))
-    , updateQuery$.map(([ pathname, qs ]) => ({ type: 'replace', pathname: pathname+qs, state: { noRouting: true } }))
     , pushedtx$.map(txid => ({ type: 'push', pathname: `/tx/${txid}` }))
+    // XXX: replace still uses a single string with the search query (https://github.com/cyclejs/cyclejs/pull/890#issuecomment-542413707)
+    , updateQuery$.map(([ pathname, qs ]) => ({ type: 'replace', pathname: pathname+qs, state: { noRouting: true } }))
   )
 
   dbg({ goHome$, goBlock$, goTx$, togTx$, page$, lang$, vdom$

client/src/driver/search.js

@@ -41,12 +41,14 @@ export default apiBase => {
         .then(r => r.ok ? r.text : Promise.reject('invalid reply for block height'))
         .then(blockhash => request(`${apiBase}/block/${blockhash}/txid/${matches[3]}`))
         .then(r => r.ok ? r.text : Promise.reject('invalid reply for block txid'))
-        .then(txid => `/tx/${txid}?output:${matches[4]}`)
+        .then(txid => ({ pathname: `/tx/${txid}`, search: `?output:${matches[4]}` }))
         .catch(_ => null)
 
     // @XXX the tx/block/addr resource will be fetched again later for display,
     // which is somewhat wasteful but not terribly so due to browser caching.
 
     : null
-    ).share()
+    )
+    .map(result => typeof result == 'string' ? { pathname: result } : result)
+    .share()
 }