Improve routing

Author: ije

framework/core/routing.ts

@@ -1,6 +1,5 @@
 import util from '../../shared/util.ts'
 import type { RouterURL } from '../../types.d.ts'
-import { redirect } from './redirect.ts'
 
 const ghostRoute: Route = { path: '', module: '' }
 
@@ -16,6 +15,7 @@ export type RoutingOptions = {
   locales?: string[]
   routes?: Route[]
   rewrites?: Record<string, string>
+  redirect?: (url: string, replace?: boolean) => void
 }
 
 export class Routing {
@@ -24,19 +24,22 @@ export class Routing {
   private _locales: string[]
   private _routes: Route[]
   private _rewrites?: Record<string, string>
+  private _redirect?: (url: string, replace?: boolean) => void
 
   constructor({
     basePath = '/',
     defaultLocale = 'en',
     locales = [],
     routes = [],
-    rewrites
+    rewrites,
+    redirect
   }: RoutingOptions = {}) {
     this._basePath = basePath
     this._defaultLocale = defaultLocale
     this._locales = locales
     this._routes = routes
     this._rewrites = rewrites
+    this._redirect = redirect
   }
 
   get basePath() {
@@ -179,8 +182,8 @@ export class Routing {
           const qs = this.query.toString()
           return [this.pathname, qs].filter(Boolean).join('?')
         },
-        push: (url: string) => redirect(url),
-        replace: (url: string) => redirect(url, true),
+        push: (url: string) => this._redirect && this._redirect(url),
+        replace: (url: string) => this._redirect && this._redirect(url, true),
       },
       nestedModules
     ]

framework/react/bootstrap.ts

@@ -1,6 +1,7 @@
 import { createElement } from 'https://esm.sh/[email protected]'
 import { hydrate, render } from 'https://esm.sh/[email protected]'
 import { importModule } from '../core/module.ts'
+import { redirect } from '../core/redirect.ts'
 import { Routing, RoutingOptions } from '../core/routing.ts'
 import Router, { createPageRoute, importPageModules } from './components/Router.ts'
 import { loadSSRDataFromTag, setStaticDataRoutes } from './pagedata.ts'
@@ -15,7 +16,7 @@ export default async function bootstrap(options: BootstrapOptions) {
   const { basePath, defaultLocale, locales, appModule: appModuleSpcifier, routes, dataRoutes, rewrites, renderMode } = options
   const { document } = window as any
   const appModule = appModuleSpcifier ? await importModule(basePath, appModuleSpcifier) : {}
-  const routing = new Routing({ routes, rewrites, basePath, defaultLocale, locales })
+  const routing = new Routing({ routes, rewrites, basePath, defaultLocale, locales, redirect })
   const [url, nestedModules] = routing.createRouter()
   const components = await importPageModules(url, nestedModules)
   const pageRoute = createPageRoute(url, components)