Merge pull request #10 from asyncink/pass-location-search

feat: pass location.search to context on server

src/common/types.ts

@@ -8,7 +8,7 @@ export interface Context extends Record<string, any> {
   req?: Request
   /** Express [response](https://expressjs.com/en/4x/api.html#res) object (server-only) */
   res?: Response
-  /** Location object (client-only, you can only use `location.pathname` on server) */
+  /** Location object (client-only, you can only use `location.pathname` and `location.search` on server) */
   location?: Location
   /** React Router navigate function (client-only) */
   navigate?: NavigateFunction

src/server/stream.test.tsx

@@ -65,12 +65,15 @@ test('get page with assets', async () => {
 
 test('get page with location object in context', async () => {
   req.path = '/location'
+  req.originalUrl = '/location?foo=bar'
   await renderToStream({req, res, routes})
 
   expect(res.status).toBeCalledWith(200)
   expect(res.data).toContain('<title>Location: /location</title>')
   expect(res.data).toContain('<h1>Location</h1>')
-  expect(res.data).toContain(JSON.stringify({pathname: '/location'}))
+  expect(res.data).toContain(
+    JSON.stringify({pathname: '/location', search: '?foo=bar'})
+  )
 })
 
 test('get page with custom layout', async () => {

src/server/stream.tsx

@@ -68,14 +68,19 @@ export const renderToStream = async (
     Document = BaseDocument,
     ...rest
   } = options
-  const {path: pathname} = req
+  const {path: pathname, originalUrl} = req
+
+  const index = originalUrl?.indexOf('?')
+  const search = index >= 0 ? originalUrl.slice(index) : ''
 
   const context = {
     req,
     res,
     location: {
-      pathname
+      pathname,
+      search
     } as Location,
+
     ...rest
   }
 

src/test/components/location.tsx

@@ -8,7 +8,8 @@ Location.getMetaData = async ({data}) => ({
 })
 
 Location.getInitialData = async ({location}) => ({
-  pathname: location.pathname
+  pathname: location.pathname,
+  search: location.search
 })
 
 export default Location