Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 37 additions & 1 deletion index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,16 @@ declare module '@lightningjs/blits' {
watch?: W & ComponentContext<P, S, M, C>
}

export interface ApplicationConfig<P extends Props, S, M, C, W> extends ComponentConfig<P, S, M, C, W> {
export interface RouterHooks {
beforeEach?: (to: Route, from: Route) => string | Route | Promise<string | Route>;
}

export interface RouterConfig {
/**
* Register hooks for the router
*/
hooks?: RouterHooks,

/**
* Routes definition
*
Expand All @@ -440,6 +449,33 @@ declare module '@lightningjs/blits' {
routes?: Route[]
}

export type ApplicationConfig<P extends Props, S, M, C, W> = ComponentConfig<P, S, M, C, W> & (
{
/**
* Router Configuration
*/
router?: RouterConfig,
routes?: never
}
|
{
router?: never
/**
* Routes definition
*
* @example
*
* ```js
* routes: [
* { path: '/', component: Home },
* { path: '/details', component: Details },
* { path: '/account', component: Account },
* ]
* ```
*/
routes?: Route[]
}
)

export interface Transition {
/**
Expand Down
7 changes: 4 additions & 3 deletions src/component/setup/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import setupMethods from './methods.js'
import setupState from './state.js'
import setupComputed from './computed.js'
import setupInput from './input.js'
import setupRoutes from './routes.js'
import setupRouter from './routes.js'
import setupWatch from './watch.js'

import { registerHooks } from '../../lib/hooks.js'
Expand Down Expand Up @@ -53,8 +53,9 @@ export default function (component, config) {
// // setup watchers
if (config.watch) setupWatch(component, config.watch)

// // setup routes
if (config.routes) setupRoutes(component, config.routes)
// // setup router
const routerConfig = config.router !== undefined ? config.router : config.routes
if (routerConfig !== undefined) setupRouter(component, routerConfig)

// // setup input
if (config.input) setupInput(component, config.input)
Expand Down
7 changes: 6 additions & 1 deletion src/component/setup/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@

import symbols from '../../lib/symbols.js'

export default (component, routes) => {
export default (component, data) => {
let routes = data
if (Array.isArray(data) === false) {
component[symbols.routerHooks] = data.hooks
routes = data.routes
}
component[symbols.routes] = []
Object.keys(routes).forEach((key) => {
// todo: validate routes[key] for expected format etc.
Expand Down
1 change: 1 addition & 0 deletions src/lib/symbols.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export default {
ready: Symbol('ready'),
renderer: Symbol('renderer'),
routes: Symbol('routes'),
routerHooks: Symbol('routerHooks'),
settings: Symbol('settings'),
state: Symbol('state'),
stateKeys: Symbol('stateKeys'),
Expand Down
16 changes: 15 additions & 1 deletion src/router/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,22 @@ export const navigate = async function () {
}

currentRoute = route
let beforeHookOutput
if (route) {
let beforeEachResult
if (this.parent[symbols.routerHooks]) {
const hooks = this.parent[symbols.routerHooks]
if (hooks.beforeAll) {
beforeEachResult = await hooks.beforeAll(route, previousRoute)
if (isString(beforeEachResult)) {
to(beforeEachResult)
return
}
}
}
// If the resolved result is an object, assign it to the target route object
route = isObject(beforeEachResult) ? beforeEachResult : route

let beforeHookOutput
if (route.hooks) {
if (route.hooks.before) {
beforeHookOutput = await route.hooks.before.call(this.parent, route, previousRoute)
Expand Down