diff --git a/resources/ts/modules/route.ts b/resources/ts/modules/route.ts index dadad2f..16b7bca 100644 --- a/resources/ts/modules/route.ts +++ b/resources/ts/modules/route.ts @@ -1,21 +1,22 @@ -export default { +const route = { methods: { route( routeName: string, parameters: Record = {} ): string | null { - let route = - Object.keys(window.__SYSTEM._routes).indexOf(routeName) !== -1 - ? window.__SYSTEM._routes[routeName] + const routes = route.flattenProperties(window.__SYSTEM._routes); + const routeUrl = + Object.keys(routes).indexOf(routeName) !== -1 + ? routes[routeName] : null; - if (!route) { - return route; + if (!routeUrl) { + return routeUrl; } // copy parameters const iParameters = Object.assign({}, parameters), origin = window.location.origin, hash = window.location.hash; - let pathname = route.replace(origin, ""), + let pathname = routeUrl.replace(origin, ""), search = window.location.search; // Replace in path name. @@ -55,4 +56,21 @@ export default { return `${origin}${pathname}${search}${hash}`; }, }, + flattenProperties( + obj: Record, + parent: string | null = null, + res: Record = {} + ): Record { + for (const key of Object.keys(obj)) { + const propName = parent ? parent + "." + key : key; + if (typeof obj[key] === "object") { + route.flattenProperties(obj[key], propName, res); + } else { + res[propName] = obj[key]; + } + } + return res; + }, }; + +export default route;