fix: fix api routing (#218)

Author: ije

framework/core/routing.ts

@@ -260,17 +260,12 @@ export function rewriteURL(reqUrl: string, baseURL: string, rewrites: Record<str
     const to = rewrites[path]
     const [params, ok] = matchPath(path, decodeURI(url.pathname))
     if (ok) {
-      const { searchParams } = url
-      url.href = 'http://localhost' + util.cleanPath(to.replace(/:(.+)(\/|&|$)/g, (s, k, e) => {
+      url.pathname = util.cleanPath(to.replace(/:(.+)(\/|&|$)/g, (s, k, e) => {
         if (k in params) {
           return params[k] + e
         }
         return s
       }))
-      for (const [key, value] of url.searchParams.entries()) {
-        searchParams.append(key, value)
-      }
-      url.search = searchParams.toString()
       break
     }
   }

framework/react/router.ts

@@ -129,8 +129,8 @@ export default function Router({
       }
     }
     const onFetchPageModule = async ({ href }: { href: string }) => {
-      const [pathname, search] = href.split('?')
-      const [url, nestedModules] = routing.createRouter({ pathname, search })
+      const [pathname] = href.split('?')
+      const [url, nestedModules] = routing.createRouter({ pathname })
       if (url.pagePath !== '') {
         nestedModules.map(mod => {
           importModule(baseURL, mod.url)

server/app.ts

@@ -31,11 +31,8 @@ import log from '../shared/log.ts'
 import util from '../shared/util.ts'
 import type {
   Config,
-  LoaderPlugin,
-  LoaderTransformOutput,
   RouterURL,
   ServerApplication,
-  TransformFn
 } from '../types.ts'
 import { VERSION } from '../version.ts'
 import { Bundler, bundlerRuntimeCode } from './bundler.ts'
@@ -68,6 +65,8 @@ export type DependencyDescriptor = {
   isDynamic?: boolean
 }
 
+type TransformFn = (url: string, code: string) => string
+
 /** The application class for aleph server. */
 export class Application implements ServerApplication {
   readonly workingDir: string
@@ -345,10 +344,12 @@ export class Application implements ServerApplication {
               if (trimModuleExt(url) === '/app') {
                 this.#renderer.clearCache()
               } else if (url.startsWith('/pages/')) {
-                this.#renderer.clearCache(toPagePath(url))
-                this.#pageRouting.removeRoute(toPagePath(url))
+                const [pagePath] = this.createRouteUpdate(url)
+                this.#renderer.clearCache(pagePath)
+                this.#pageRouting.removeRoute(pagePath)
               } else if (url.startsWith('/api/')) {
-                this.#apiRouting.removeRoute(toPagePath(url))
+                const [pagePath] = this.createRouteUpdate(url)
+                this.#apiRouting.removeRoute(pagePath)
               }
               this.#modules.delete(url)
               if (this.isHMRable(url)) {
@@ -435,7 +436,9 @@ export class Application implements ServerApplication {
       const [url, nestedModules] = router
       if (url.pagePath !== '') {
         const { url: moduleUrl } = nestedModules.pop()!
-        return [url, this.#modules.get(moduleUrl)!]
+        if (this.#modules.has(moduleUrl)) {
+          return [url, this.#modules.get(moduleUrl)!]
+        }
       }
     }
     return null
@@ -473,8 +476,8 @@ export class Application implements ServerApplication {
       return null
     }
 
-    const cacheKey = loc.pathname + (loc.search || '')
-    const [_, data] = await this.#renderer.useCache(pagePath, cacheKey, async () => {
+    const path = loc.pathname + (loc.search || '')
+    const [_, data] = await this.#renderer.useCache(pagePath, path, async () => {
       return await this.#renderer.renderPage(router, nestedModules)
     })
     return data

server/server.ts

@@ -149,7 +149,10 @@ export class Server {
 
       // serve APIs
       if (pathname.startsWith('/api/')) {
-        const route = app.getAPIRoute({ pathname, search: url.searchParams.toString() })
+        const route = app.getAPIRoute({
+          pathname,
+          search: Array.from(url.searchParams.keys()).length > 0 ? '?' + url.searchParams.toString() : ''
+        })
         if (route !== null) {
           try {
             const [{ params }, { jsFile, hash }] = route
@@ -170,7 +173,10 @@ export class Server {
       }
 
       // ssr
-      const [status, html] = await app.getPageHTML({ pathname, search: url.searchParams.toString() })
+      const [status, html] = await app.getPageHTML({
+        pathname,
+        search: Array.from(url.searchParams.keys()).length > 0 ? '?' + url.searchParams.toString() : ''
+      })
       req.status(status).send(html, 'text/html; charset=utf-8')
     } catch (err) {
       req.status(500).send(