Use index file at each route

Author: razor-x

codegen/lib/connect.ts

@@ -23,30 +23,30 @@ export const connect = (
   file.layout = 'route.hbs'
   setRouteLayoutContext(file, null, blueprint)
 
-  const routeIndexes: Record<string, Set<string>> = {}
-
   const namespaces = blueprint.namespaces.filter(
     ({ isUndocumented }) => !isUndocumented,
   )
   const routes = blueprint.routes.filter(
     ({ isUndocumented }) => !isUndocumented,
   )
 
-  for (const namespace of namespaces) {
-    const k = `${rootPath}/${toFilePath(namespace.path)}.ts`
+  const routeIndexes: Record<string, Set<string>> = {}
+
+  for (const node of [...namespaces, ...routes]) {
+    const path = toFilePath(node.path)
+    const name = kebabCase(node.name)
 
+    const k = `${rootPath}/${path}/${name}.ts`
     files[k] = { contents: Buffer.from('\n') }
     const file = files[k] as unknown as File
     file.layout = 'route.hbs'
-    setRouteLayoutContext(file, namespace, blueprint)
+    setRouteLayoutContext(file, node, blueprint)
 
-    const parentPath = namespace.parentPath ?? ''
-    routeIndexes[parentPath] ??= new Set()
-    routeIndexes[parentPath]?.add(`${kebabCase(namespace.name)}.js`)
-    routeIndexes[parentPath]?.add(`${kebabCase(namespace.name)}/index.js`)
+    routeIndexes[path] ??= new Set()
+    routeIndexes[path]?.add(`${name}.js`)
 
-    const pathParts = namespace.path.split('/')
-    while (pathParts.length > 1) {
+    const pathParts = path.split('/')
+    while (pathParts.length > 0) {
       const name = pathParts.pop()
       if (name == null) throw new Error('Unexpected null')
       const path = toFilePath(`/${pathParts.join('/')}`)
@@ -55,32 +55,9 @@ export const connect = (
     }
   }
 
-  for (const route of routes) {
-    const k = `${rootPath}/${toFilePath(route.path)}.ts`
-
-    files[k] = { contents: Buffer.from('\n') }
-    const file = files[k] as unknown as File
-    file.layout = 'route.hbs'
-    setRouteLayoutContext(file, route, blueprint)
-
-    const parentPath = route.parentPath ?? ''
-    routeIndexes[parentPath] ??= new Set()
-    routeIndexes[parentPath]?.add(`${kebabCase(route.name)}.js`)
-
-    const hasChildren = routes.some(
-      ({ path }) => path.startsWith(route.path) && path !== route.path,
-    )
-    if (hasChildren) {
-      routeIndexes[parentPath] ??= new Set()
-      routeIndexes[parentPath]?.add(`${kebabCase(route.name)}/index.js`)
-    }
-  }
-
-  for (const [parentPath, routes] of Object.entries(routeIndexes)) {
+  for (const [path, routes] of Object.entries(routeIndexes)) {
     const k =
-      parentPath === ''
-        ? `${rootPath}/index.ts`
-        : `${rootPath}/${toFilePath(parentPath)}/index.ts`
+      path === '' ? `${rootPath}/index.ts` : `${rootPath}/${path}/index.ts`
     files[k] = { contents: Buffer.from('\n') }
     const file = files[k] as unknown as File
     file.layout = 'route-index.hbs'