Combine routes and namespaces

Author: razor-x

codegen/layouts/route.hbs

@@ -3,11 +3,6 @@
 class {{className}} {
   {{> route-class-methods }}
 
-  {{#each namespaces}}
-    {{> route-class-subroute }}
-
-  {{/each}}
-
   {{#each subroutes}}
     {{> route-class-subroute }}
 

codegen/lib/connect.ts

@@ -111,16 +111,13 @@ const setRouteLayoutContext = (
 
   file.endpoints = [] // TODO
 
-  file.namespaces = blueprint.namespaces
+  file.subroutes = [...blueprint.routes, ...blueprint.namespaces]
+    .sort((n1, n2) => n1.name.localeCompare(n2.name))
     .filter(({ parentPath }) => parentPath === (node?.path ?? null))
-    .map((r) => getSubrouteLayoutContextFromNamespace(r))
-
-  file.subroutes = blueprint.routes
-    .filter(({ parentPath }) => parentPath === (node?.path ?? null))
-    .map((r) => getSubrouteLayoutContextFromRoute(r))
+    .map((r) => getSubrouteLayoutContext(r))
 }
 
-const getSubrouteLayoutContextFromRoute = (
+const getSubrouteLayoutContext = (
   route: Pick<Route, 'path' | 'name'>,
 ): SubrouteLayoutContext => {
   return {
@@ -129,12 +126,3 @@ const getSubrouteLayoutContextFromRoute = (
     className: getClassName(route.path),
   }
 }
-
-const getSubrouteLayoutContextFromNamespace = (
-  namespace: Namespace,
-): SubrouteLayoutContext => {
-  return {
-    ...getSubrouteLayoutContextFromRoute(namespace),
-    fileName: `${kebabCase(namespace.name)}/index.js`,
-  }
-}