@buzola/vite-plugin 0.0.3 → 0.0.4

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAA;AAMjD,MAAM,WAAW,mBAAmB;IACnC,oFAAoF;IACpF,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,gGAAgG;IAChG,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAA;CAC3B;AAKD;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,OAAO,GAAE,mBAAwB,GAAG,MAAM,CAuFtE"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAA;AAMjD,MAAM,WAAW,mBAAmB;IACnC;;;;;;;OAOG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,oFAAoF;IACpF,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,gGAAgG;IAChG,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAA;CAC3B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,OAAO,GAAE,mBAAwB,GAAG,MAAM,CA4FtE"}

package/dist/plugin.js

@@ -1,10 +1,8 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { generateRouteModule } from './generator/codegen';
-import { scanRouteFiles } from './generator/scanner';
-import { buildFileRouteTree } from './generator/tree-builder';
-const VIRTUAL_MODULE_ID = 'virtual:buzola/routes';
-const RESOLVED_VIRTUAL_ID = '\0' + VIRTUAL_MODULE_ID;
+import { generateRouteModule } from './generator/codegen.js';
+import { scanRouteFiles } from './generator/scanner.js';
+import { buildFileRouteTree } from './generator/tree-builder.js';
 /**
  * Vite plugin for Buzola page-centric routing.
  *
@@ -17,7 +15,10 @@ const RESOLVED_VIRTUAL_ID = '\0' + VIRTUAL_MODULE_ID;
  * Provides `virtual:buzola/routes` virtual module.
  */
 export function buzolaPlugin(options = {}) {
-    const { routesDir: routesDirOption = 'src/routes', output: outputOption = 'src/buzola.gen.ts', persistentParams: persistentParamsOption, } = options;
+    const { name: nameOption, routesDir: routesDirOption = 'src/routes', output: outputOption = 'src/buzola.gen.ts', persistentParams: persistentParamsOption, } = options;
+    const pluginName = nameOption ? `buzola:${nameOption}` : 'buzola';
+    const virtualModuleId = nameOption ? `virtual:buzola/${nameOption}/routes` : 'virtual:buzola/routes';
+    const resolvedVirtualId = '\0' + virtualModuleId;
     let root;
     let routesDir;
     let outputPath;
@@ -34,7 +35,7 @@ export function buzolaPlugin(options = {}) {
         return writeIfChanged(outputPath, code);
     }
     return {
-        name: 'buzola',
+        name: pluginName,
         enforce: 'pre',
         configResolved(config) {
             root = config.root;
@@ -68,12 +69,12 @@ export function buzolaPlugin(options = {}) {
             }
         },
         resolveId(id) {
-            if (id === VIRTUAL_MODULE_ID) {
-                return RESOLVED_VIRTUAL_ID;
+            if (id === virtualModuleId) {
+                return resolvedVirtualId;
             }
         },
         load(id) {
-            if (id === RESOLVED_VIRTUAL_ID) {
+            if (id === resolvedVirtualId) {
                 return `export { routes, pageRegistry } from '${outputPath.replace(/\.ts$/, '')}';\n`;
             }
         },
@@ -82,7 +83,7 @@ export function buzolaPlugin(options = {}) {
                 return;
             const changed = await generate((p) => server.ssrLoadModule(p));
             if (changed) {
-                const mod = server.moduleGraph.getModuleById(RESOLVED_VIRTUAL_ID);
+                const mod = server.moduleGraph.getModuleById(resolvedVirtualId);
                 if (mod) {
                     server.moduleGraph.invalidateModule(mod);
                 }

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@buzola/vite-plugin",
-	"version": "0.0.3",
+	"version": "0.0.4",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -21,7 +21,7 @@
 		"directory": "packages/vite-plugin"
 	},
 	"dependencies": {
-		"@buzola/router": "^0.0.3"
+		"@buzola/router": "^0.0.4"
 	},
 	"devDependencies": {
 		"@types/node": "^25.3.3",

package/src/__tests__/codegen.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'bun:test'
-import { generateRouteModule } from '../generator/codegen'
+import { generateRouteModule } from '../generator/codegen.js'
 
 describe('generateRouteModule', () => {
 	it('emits BuzolaPersistentParams when persistentParams is provided', () => {
@@ -95,6 +95,58 @@ describe('generateRouteModule', () => {
 		expect(output).toContain("'users/detail': '/users/detail'")
 	})
 
+	it('generates matchPath when routePattern differs from file position', () => {
+		const output = generateRouteModule({
+			tree: [{
+				segment: 'login',
+				fullPath: '/login',
+				filePath: '/tmp/routes/login/_layout.tsx',
+				isLayout: true,
+				isIndex: false,
+				isNotFound: false,
+				isPathlessGroup: false,
+				children: [{
+					segment: '',
+					fullPath: '/login',
+					filePath: '/tmp/routes/login/index.tsx',
+					exportName: 'default',
+					isLayout: false,
+					isIndex: true,
+					isNotFound: false,
+					isPathlessGroup: false,
+					pageExports: [{ pageId: 'login', exportName: 'default', routePattern: '/', params: [] }],
+					children: [],
+				}],
+			}],
+			routesDir: '/tmp/routes',
+			outputPath: '/tmp/buzola.gen.ts',
+		})
+
+		expect(output).toContain("matchPath: '/'")
+		expect(output).toContain('isIndex: true')
+	})
+
+	it('does not generate matchPath when routePattern matches file position', () => {
+		const output = generateRouteModule({
+			tree: [{
+				segment: 'users',
+				fullPath: '/users',
+				filePath: '/tmp/routes/users.tsx',
+				exportName: 'default',
+				isLayout: false,
+				isIndex: false,
+				isNotFound: false,
+				isPathlessGroup: false,
+				pageExports: [{ pageId: 'users', exportName: 'default', routePattern: '/users', params: [] }],
+				children: [],
+			}],
+			routesDir: '/tmp/routes',
+			outputPath: '/tmp/buzola.gen.ts',
+		})
+
+		expect(output).not.toContain('matchPath')
+	})
+
 	it('generates separate imports for default and named exports from same file', () => {
 		const output = generateRouteModule({
 			tree: [{

package/src/__tests__/conventions.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'bun:test'
-import { isRouteFile, parseDirName, parseFileName, parseRouteFile } from '../conventions'
+import { isRouteFile, parseDirName, parseFileName, parseRouteFile } from '../conventions.js'
 
 describe('isRouteFile', () => {
 	it('accepts .tsx files', () => {

package/src/__tests__/page-extractor.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'bun:test'
-import { extractPages } from '../generator/page-extractor'
+import { extractPages } from '../generator/page-extractor.js'
 
 describe('extractPages', () => {
 	it('extracts default page export', async () => {

package/src/__tests__/tree-builder.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'bun:test'
-import type { ModuleLoader } from '../generator/page-extractor'
-import type { ScannedFile } from '../generator/scanner'
-import { buildFileRouteTree } from '../generator/tree-builder'
+import type { ModuleLoader } from '../generator/page-extractor.js'
+import type { ScannedFile } from '../generator/scanner.js'
+import { buildFileRouteTree } from '../generator/tree-builder.js'
 
 /** Module loader that returns empty modules (no page exports). */
 const emptyLoader: ModuleLoader = async () => ({})
@@ -59,9 +59,27 @@ describe('buildFileRouteTree', () => {
 			{ absolutePath: '/app/src/routes/(auth)/login.tsx', relativePath: '(auth)/login.tsx' },
 		]
 
+		const tree = await buildFileRouteTree(files, emptyLoader)
+		// Without a pathless group layout, the file goes under root directly
+		const login = tree.find(n => n.segment === 'login')
+		expect(login).toBeDefined()
+		expect(login!.fullPath).toBe('/login')
+	})
+
+	it('handles pathless group with layout', async () => {
+		const files: ScannedFile[] = [
+			{ absolutePath: '/app/src/routes/(auth)/_layout.tsx', relativePath: '(auth)/_layout.tsx' },
+			{ absolutePath: '/app/src/routes/(auth)/login.tsx', relativePath: '(auth)/login.tsx' },
+		]
+
 		const tree = await buildFileRouteTree(files, emptyLoader)
 		const authGroup = tree.find(n => n.isPathlessGroup)
 		expect(authGroup).toBeDefined()
+		expect(authGroup!.fullPath).toBe('/')
+
+		const login = authGroup!.children.find(n => n.segment === 'login')
+		expect(login).toBeDefined()
+		expect(login!.fullPath).toBe('/login')
 	})
 
 	it('uses plain file names as segments', async () => {
@@ -70,11 +88,10 @@ describe('buildFileRouteTree', () => {
 		]
 
 		const tree = await buildFileRouteTree(files, emptyLoader)
-		const users = tree.find(n => n.segment === 'users')
-		expect(users).toBeDefined()
-		expect(users!.children).toHaveLength(1)
-		expect(users!.children[0].segment).toBe('detail')
-		expect(users!.children[0].fullPath).toBe('/users/detail')
+		// Without a users layout, the page goes under root with full segment
+		const detail = tree.find(n => n.fullPath === '/users/detail')
+		expect(detail).toBeDefined()
+		expect(detail!.segment).toBe('users/detail')
 	})
 
 	it('derives segment from page .route() via module loader', async () => {
@@ -97,16 +114,45 @@ describe('buildFileRouteTree', () => {
 		}
 
 		const tree = await buildFileRouteTree(files, loader)
-		const users = tree.find(n => n.segment === 'users')
-		expect(users).toBeDefined()
-		expect(users!.children).toHaveLength(1)
-		expect(users!.children[0].segment).toBe(':userId')
-		expect(users!.children[0].fullPath).toBe('/users/:userId')
-		expect(users!.children[0].pageExports).toEqual([
+		// Tree position is file-based (/users/detail), route pattern is in pageExports
+		const page = tree.find(n => n.fullPath === '/users/detail')
+		expect(page).toBeDefined()
+		expect(page!.segment).toBe('users/detail')
+		expect(page!.pageExports).toEqual([
 			{ pageId: 'users/detail', exportName: 'default', routePattern: '/users/:userId', params: [{ name: 'userId', optional: false, array: false }] },
 		])
 	})
 
+	it('derives segment from page .route() when under a layout', async () => {
+		const files: ScannedFile[] = [
+			{ absolutePath: '/app/src/routes/users/_layout.tsx', relativePath: 'users/_layout.tsx' },
+			{ absolutePath: '/app/src/routes/users/detail.tsx', relativePath: 'users/detail.tsx' },
+		]
+
+		const loader: ModuleLoader = async (p) => {
+			if (p === '/app/src/routes/users/detail.tsx') {
+				return {
+					default: {
+						__buzolaPage: true,
+						component: () => null,
+						route: '/users/:userId',
+						paramsMeta: [{ name: 'userId', optional: false, array: false }],
+					},
+				}
+			}
+			return {}
+		}
+
+		const tree = await buildFileRouteTree(files, loader)
+		const usersLayout = tree.find(n => n.isLayout && n.segment === 'users')
+		expect(usersLayout).toBeDefined()
+		// Tree position is file-based (detail), route pattern only affects URL matching
+		const page = usersLayout!.children.find(n => n.fullPath === '/users/detail')
+		expect(page).toBeDefined()
+		expect(page!.segment).toBe('detail')
+		expect(page!.pageExports![0].routePattern).toBe('/users/:userId')
+	})
+
 	it('derives route from file path when no .route()', async () => {
 		const files: ScannedFile[] = [
 			{ absolutePath: '/app/src/routes/users/detail.tsx', relativePath: 'users/detail.tsx' },
@@ -122,11 +168,9 @@ describe('buildFileRouteTree', () => {
 		})
 
 		const tree = await buildFileRouteTree(files, loader)
-		const users = tree.find(n => n.segment === 'users')
-		expect(users).toBeDefined()
-		expect(users!.children[0].segment).toBe('detail')
-		expect(users!.children[0].fullPath).toBe('/users/detail')
-		expect(users!.children[0].pageExports).toEqual([
+		const page = tree.find(n => n.fullPath === '/users/detail')
+		expect(page).toBeDefined()
+		expect(page!.pageExports).toEqual([
 			{ pageId: 'users/detail', exportName: 'default', routePattern: '/users/detail', params: [{ name: 'userId', optional: false, array: false }] },
 		])
 	})
@@ -145,14 +189,143 @@ describe('buildFileRouteTree', () => {
 		})
 
 		const tree = await buildFileRouteTree(files, loader)
-		const users = tree.find(n => n.segment === 'users')
-		const index = users!.children.find(n => n.isIndex)
-		expect(index).toBeDefined()
-		expect(index!.pageExports).toEqual([
+		const page = tree.find(n => n.fullPath === '/users')
+		expect(page).toBeDefined()
+		expect(page!.pageExports).toEqual([
 			{ pageId: 'users', exportName: 'default', routePattern: '/users', params: [] },
 		])
 	})
 
+	// ─── Route escaping via .route() ─────────────────────────────────────────
+
+	it('index file with .route() stays under its file-system layout', async () => {
+		const files: ScannedFile[] = [
+			{ absolutePath: '/app/src/routes/login/_layout.tsx', relativePath: 'login/_layout.tsx' },
+			{ absolutePath: '/app/src/routes/login/index.tsx', relativePath: 'login/index.tsx' },
+		]
+
+		const loader: ModuleLoader = async (p) => {
+			if (p === '/app/src/routes/login/index.tsx') {
+				return {
+					default: {
+						__buzolaPage: true,
+						component: () => null,
+						route: '/login/testtest',
+						paramsMeta: [],
+					},
+				}
+			}
+			return {}
+		}
+
+		const tree = await buildFileRouteTree(files, loader)
+		const loginLayout = tree.find(n => n.isLayout && n.segment === 'login')
+		expect(loginLayout).toBeDefined()
+
+		// Page stays under login layout as index (file-hierarchy), with custom routePattern
+		const page = loginLayout!.children.find(n => n.isIndex)
+		expect(page).toBeDefined()
+		expect(page!.fullPath).toBe('/login')
+		expect(page!.pageExports![0].routePattern).toBe('/login/testtest')
+	})
+
+	it('index file with .route("/xx") stays under its file-system layout', async () => {
+		const files: ScannedFile[] = [
+			{ absolutePath: '/app/src/routes/login/_layout.tsx', relativePath: 'login/_layout.tsx' },
+			{ absolutePath: '/app/src/routes/login/index.tsx', relativePath: 'login/index.tsx' },
+		]
+
+		const loader: ModuleLoader = async (p) => {
+			if (p === '/app/src/routes/login/index.tsx') {
+				return {
+					default: {
+						__buzolaPage: true,
+						component: () => null,
+						route: '/xx',
+						paramsMeta: [],
+					},
+				}
+			}
+			return {}
+		}
+
+		const tree = await buildFileRouteTree(files, loader)
+		const loginLayout = tree.find(n => n.isLayout && n.segment === 'login')
+		expect(loginLayout).toBeDefined()
+
+		// Page stays under login layout as index (file-hierarchy), URL is /xx
+		const page = loginLayout!.children.find(n => n.isIndex)
+		expect(page).toBeDefined()
+		expect(page!.fullPath).toBe('/login')
+		expect(page!.pageExports![0].routePattern).toBe('/xx')
+	})
+
+	it('index file with .route("/") stays under its file-system layout', async () => {
+		const files: ScannedFile[] = [
+			{ absolutePath: '/app/src/routes/login/_layout.tsx', relativePath: 'login/_layout.tsx' },
+			{ absolutePath: '/app/src/routes/login/index.tsx', relativePath: 'login/index.tsx' },
+		]
+
+		const loader: ModuleLoader = async (p) => {
+			if (p === '/app/src/routes/login/index.tsx') {
+				return {
+					default: {
+						__buzolaPage: true,
+						component: () => null,
+						route: '/',
+						paramsMeta: [],
+					},
+				}
+			}
+			return {}
+		}
+
+		const tree = await buildFileRouteTree(files, loader)
+		const loginLayout = tree.find(n => n.isLayout && n.segment === 'login')
+		expect(loginLayout).toBeDefined()
+
+		// Page stays under login layout as index, URL is /
+		const page = loginLayout!.children.find(n => n.isIndex)
+		expect(page).toBeDefined()
+		expect(page!.fullPath).toBe('/login')
+		expect(page!.pageExports![0].routePattern).toBe('/')
+	})
+
+	it('index file with .route("/") under root layout keeps file-hierarchy position', async () => {
+		const files: ScannedFile[] = [
+			{ absolutePath: '/app/src/routes/_layout.tsx', relativePath: '_layout.tsx' },
+			{ absolutePath: '/app/src/routes/login/index.tsx', relativePath: 'login/index.tsx' },
+		]
+
+		const loader: ModuleLoader = async (p) => {
+			if (p === '/app/src/routes/login/index.tsx') {
+				return {
+					default: {
+						__buzolaPage: true,
+						component: () => null,
+						route: '/',
+						paramsMeta: [],
+					},
+				}
+			}
+			return {}
+		}
+
+		const tree = await buildFileRouteTree(files, loader)
+		expect(tree).toHaveLength(1)
+		const rootLayout = tree[0]
+		expect(rootLayout.isLayout).toBe(true)
+
+		// No login layout → page is a child of root layout at file position /login
+		const page = rootLayout.children.find(n => n.fullPath === '/login')
+		expect(page).toBeDefined()
+		expect(page!.segment).toBe('login')
+		expect(page!.isIndex).toBe(false)
+		expect(page!.pageExports![0].routePattern).toBe('/')
+	})
+
+	// ─── Sorting ─────────────────────────────────────────────────────────────
+
 	it('sorts not-found routes last', async () => {
 		const files: ScannedFile[] = [
 			{ absolutePath: '/app/src/routes/about.tsx', relativePath: 'about.tsx' },
@@ -196,7 +369,7 @@ describe('buildFileRouteTree', () => {
 		})
 
 		const tree = await buildFileRouteTree(files, loader)
-		const users = tree.find(n => n.segment === 'users')
+		const users = tree.find(n => n.segment === 'users' && n.filePath)
 		expect(users).toBeDefined()
 		expect(users!.filePath).toBe('/app/src/routes/users.tsx')
 		expect(users!.exportName).toBe('default')
@@ -204,20 +377,15 @@ describe('buildFileRouteTree', () => {
 			{ pageId: 'users', exportName: 'default', routePattern: '/users', params: [] },
 		])
 
-		// Named exports become children
-		expect(users!.children).toHaveLength(2)
-		const detail = users!.children.find(n => n.segment === 'detail')
+		// Named exports: /users/detail and /users/settings are also under root
+		// (since there's no /users layout, they're siblings)
+		const detail = tree.find(n => n.fullPath === '/users/detail')
 		expect(detail).toBeDefined()
 		expect(detail!.filePath).toBe('/app/src/routes/users.tsx')
 		expect(detail!.exportName).toBe('detail')
-		expect(detail!.fullPath).toBe('/users/detail')
-		expect(detail!.pageExports).toEqual([
-			{ pageId: 'users/detail', exportName: 'detail', routePattern: '/users/detail', params: [{ name: 'id', optional: false, array: false }] },
-		])
 
-		const settings = users!.children.find(n => n.segment === 'settings')
+		const settings = tree.find(n => n.fullPath === '/users/settings')
 		expect(settings).toBeDefined()
-		expect(settings!.fullPath).toBe('/users/settings')
 	})
 
 	it('creates sibling nodes for named exports from index files', async () => {
@@ -239,20 +407,17 @@ describe('buildFileRouteTree', () => {
 		})
 
 		const tree = await buildFileRouteTree(files, loader)
-		const users = tree.find(n => n.segment === 'users')
-		expect(users).toBeDefined()
 
-		// Default export → index node
-		const index = users!.children.find(n => n.isIndex)
-		expect(index).toBeDefined()
-		expect(index!.filePath).toBe('/app/src/routes/users/index.tsx')
+		// Default export → /users (index-like, placed at root without layout)
+		const usersPage = tree.find(n => n.fullPath === '/users' && n.filePath)
+		expect(usersPage).toBeDefined()
+		expect(usersPage!.filePath).toBe('/app/src/routes/users/index.tsx')
 
-		// Named export → sibling of index (child of users)
-		const detail = users!.children.find(n => n.segment === 'detail')
+		// Named export → /users/detail
+		const detail = tree.find(n => n.fullPath === '/users/detail')
 		expect(detail).toBeDefined()
 		expect(detail!.filePath).toBe('/app/src/routes/users/index.tsx')
 		expect(detail!.exportName).toBe('detail')
-		expect(detail!.fullPath).toBe('/users/detail')
 		expect(detail!.pageExports).toEqual([
 			{ pageId: 'users/detail', exportName: 'detail', routePattern: '/users/detail', params: [{ name: 'id', optional: false, array: false }] },
 		])
@@ -277,17 +442,13 @@ describe('buildFileRouteTree', () => {
 		})
 
 		const tree = await buildFileRouteTree(files, loader)
-		const users = tree.find(n => n.segment === 'users')
-		expect(users).toBeDefined()
-		expect(users!.filePath).toBeUndefined() // No default → no component
-		expect(users!.pageExports).toBeUndefined()
-
-		expect(users!.children).toHaveLength(2)
-		expect(users!.children.find(n => n.segment === 'detail')).toBeDefined()
-		expect(users!.children.find(n => n.segment === 'list')).toBeDefined()
+		const detail = tree.find(n => n.fullPath === '/users/detail')
+		expect(detail).toBeDefined()
+		const list = tree.find(n => n.fullPath === '/users/list')
+		expect(list).toBeDefined()
 	})
 
-	it('named export with .route() uses explicit route pattern', async () => {
+	it('named export with .route() keeps file-hierarchy position with custom routePattern', async () => {
 		const files: ScannedFile[] = [
 			{ absolutePath: '/app/src/routes/users.tsx', relativePath: 'users.tsx' },
 		]
@@ -302,13 +463,13 @@ describe('buildFileRouteTree', () => {
 		})
 
 		const tree = await buildFileRouteTree(files, loader)
-		const users = tree.find(n => n.segment === 'users')
-		expect(users!.children).toHaveLength(1)
-		expect(users!.children[0].segment).toBe(':userId')
-		expect(users!.children[0].fullPath).toBe('/users/:userId')
+		// Tree position is file-based (/users/detail), route pattern in pageExports
+		const page = tree.find(n => n.fullPath === '/users/detail')
+		expect(page).toBeDefined()
+		expect(page!.pageExports![0].routePattern).toBe('/users/:userId')
 	})
 
-	it('throws on collision: named export vs file in subdirectory', async () => {
+	it('throws on collision: two pages at same path', async () => {
 		const files: ScannedFile[] = [
 			{ absolutePath: '/app/src/routes/users.tsx', relativePath: 'users.tsx' },
 			{ absolutePath: '/app/src/routes/users/detail.tsx', relativePath: 'users/detail.tsx' },
@@ -336,45 +497,48 @@ describe('buildFileRouteTree', () => {
 		expect(buildFileRouteTree(files, loader)).rejects.toThrow(/Route collision/)
 	})
 
-	it('throws on collision: named export from index vs file in same directory', async () => {
+	it('named exports from root index.tsx have correct paths (no double slashes)', async () => {
 		const files: ScannedFile[] = [
-			{ absolutePath: '/app/src/routes/users/detail.tsx', relativePath: 'users/detail.tsx' },
-			{ absolutePath: '/app/src/routes/users/index.tsx', relativePath: 'users/index.tsx' },
+			{ absolutePath: '/app/src/routes/index.tsx', relativePath: 'index.tsx' },
 		]
 
-		const loader: ModuleLoader = async (p) => {
-			if (p === '/app/src/routes/users/index.tsx') {
-				return {
-					detail: {
-						__buzolaPage: true,
-						component: () => null,
-						paramsMeta: [],
-					},
-				}
-			}
-			return {
-				default: {
-					__buzolaPage: true,
-					component: () => null,
-					paramsMeta: [],
-				},
-			}
-		}
+		const loader: ModuleLoader = async () => ({
+			default: {
+				__buzolaPage: true,
+				component: () => null,
+				paramsMeta: [],
+			},
+			dashboard: {
+				__buzolaPage: true,
+				component: () => null,
+				paramsMeta: [],
+			},
+		})
 
-		expect(buildFileRouteTree(files, loader)).rejects.toThrow(/Route collision/)
+		const tree = await buildFileRouteTree(files, loader)
+
+		const index = tree.find(n => n.isIndex)
+		expect(index).toBeDefined()
+		expect(index!.fullPath).toBe('/')
+
+		const dashboard = tree.find(n => n.segment === 'dashboard')
+		expect(dashboard).toBeDefined()
+		expect(dashboard!.fullPath).toBe('/dashboard')
+		expect(dashboard!.pageExports![0].routePattern).toBe('/dashboard')
 	})
 
 	it('handles nested _404 within a directory', async () => {
 		const files: ScannedFile[] = [
+			{ absolutePath: '/app/src/routes/users/_layout.tsx', relativePath: 'users/_layout.tsx' },
 			{ absolutePath: '/app/src/routes/users/index.tsx', relativePath: 'users/index.tsx' },
 			{ absolutePath: '/app/src/routes/users/_404.tsx', relativePath: 'users/_404.tsx' },
 		]
 
 		const tree = await buildFileRouteTree(files, emptyLoader)
-		const users = tree.find(n => n.segment === 'users')
-		expect(users).toBeDefined()
+		const usersLayout = tree.find(n => n.isLayout && n.segment === 'users')
+		expect(usersLayout).toBeDefined()
 
-		const notFound = users!.children.find(n => n.isNotFound)
+		const notFound = usersLayout!.children.find(n => n.isNotFound)
 		expect(notFound).toBeDefined()
 		expect(notFound!.segment).toBe(':__notFound+')
 		expect(notFound!.fullPath).toBe('/users/:__notFound+')