Imporve useDeno hook (#262)

Author: ije

framework/react/hooks.ts

@@ -34,10 +34,11 @@ export function useRouter(): RouterURL {
  */
 export function useDeno<T = any>(callback: () => (T | Promise<T>), revalidate?: number): T {
   const id = arguments[2] // generated by compiler
-  const { pathname } = useRouter()
+  const { pathname, query } = useRouter()
   return useMemo(() => {
     const global = globalThis as any
-    const dataUrl = 'pagedata://' + pathname
+    const qs = query.toString()
+    const dataUrl = 'pagedata://' + pathname + (qs ? '?' + qs : '')
     const eventName = 'useDeno-' + dataUrl
     const key = dataUrl + '#' + id
     const expires = typeof revalidate === 'number' && !isNaN(revalidate) ? Date.now() + revalidate * 1000 : 0

framework/react/renderer.ts

@@ -33,20 +33,21 @@ export async function render(
     scripts: new Map(),
     inlineStyles: new Map(),
   }
-  const pagedataUrl = 'pagedata://' + url.pathname
+  const qs = url.query.toString()
+  const dataUrl = 'pagedata://' + url.pathname + (qs ? '?' + qs : '')
   const asyncCalls: Array<Promise<any>> = []
   const data: Record<string, any> = {}
   const pageProps = createPageProps(nestedPageComponents)
   const defer = () => {
-    delete global['rendering-' + pagedataUrl]
-    events.removeAllListeners('useDeno-' + pagedataUrl)
+    delete global['rendering-' + dataUrl]
+    events.removeAllListeners('useDeno-' + dataUrl)
   }
 
   // rendering data cache
-  global['rendering-' + pagedataUrl] = {}
+  global['rendering-' + dataUrl] = {}
 
   // listen `useDeno-*` events to get hooks callback result.
-  events.on('useDeno-' + pagedataUrl, (id: string, v: any) => {
+  events.on('useDeno-' + dataUrl, (id: string, v: any) => {
     if (v instanceof Promise) {
       asyncCalls.push(v)
     } else {