Restructure test files

Author: savannahostrowski

esbuild.js

@@ -45,6 +45,7 @@ async function main() {
     logLevel: "info",
     define: {
       "process.env.NODE_ENV": production ? '"production"' : '"development"',
+      __DIST_ROOT__: JSON.stringify(path.join(import.meta.dirname, "dist")),
     },
   })
 

src/test/analyzer.test.ts src/test/core/analyzer.test.tssrc/test/analyzer.test.ts renamed to src/test/core/analyzer.test.ts

@@ -1,17 +1,14 @@
 import * as assert from "node:assert"
-import { analyzeFile, analyzeTree } from "../core/analyzer"
-import { Parser } from "../core/parser"
-import { fixtures, wasmPaths } from "./testUtils"
+import { analyzeFile, analyzeTree } from "../../core/analyzer"
+import { Parser } from "../../core/parser"
+import { fixtures, wasmPaths } from "../testUtils"
 
 suite("analyzer", () => {
   let parser: Parser
 
-  // Helper to parse code and assert tree is not null
   const parse = (code: string) => {
     const tree = parser.parse(code)
-    if (!tree) {
-      throw new Error("Failed to parse code")
-    }
+    assert.ok(tree, "Failed to parse code")
     return tree
   }
 

src/test/extractors.test.ts src/test/core/extractors.test.tssrc/test/extractors.test.ts renamed to src/test/core/extractors.test.ts

@@ -6,9 +6,9 @@ import {
   includeRouterExtractor,
   mountExtractor,
   routerExtractor,
-} from "../core/extractors"
-import { Parser } from "../core/parser"
-import { wasmPaths } from "./testUtils"
+} from "../../core/extractors"
+import { Parser } from "../../core/parser"
+import { wasmPaths } from "../testUtils"
 
 suite("Extractors", () => {
   let parser: Parser

src/test/importResolver.test.ts src/test/core/importResolver.test.tssrc/test/importResolver.test.ts renamed to src/test/core/importResolver.test.ts

@@ -1,8 +1,8 @@
 import * as assert from "node:assert"
 import { join } from "node:path"
-import { resolveImport, resolveNamedImport } from "../core/importResolver"
-import { Parser } from "../core/parser"
-import { fixtures, wasmPaths } from "./testUtils"
+import { resolveImport, resolveNamedImport } from "../../core/importResolver"
+import { Parser } from "../../core/parser"
+import { fixtures, wasmPaths } from "../testUtils"
 
 const standardRoot = fixtures.standard.root
 

src/test/parser.test.ts src/test/core/parser.test.tssrc/test/parser.test.ts renamed to src/test/core/parser.test.ts

@@ -1,6 +1,6 @@
 import * as assert from "node:assert"
-import { Parser } from "../core/parser"
-import { wasmPaths } from "./testUtils"
+import { Parser } from "../../core/parser"
+import { wasmPaths } from "../testUtils"
 
 suite("parser", () => {
   test("throws error if parse called before init", () => {

src/test/pathUtils.test.ts src/test/core/pathUtils.test.tssrc/test/pathUtils.test.ts renamed to src/test/core/pathUtils.test.ts

@@ -6,8 +6,8 @@ import {
   getPathSegments,
   isWithinDirectory,
   stripLeadingDynamicSegments,
-} from "../core/pathUtils"
-import { fixtures } from "./testUtils"
+} from "../../core/pathUtils"
+import { fixtures } from "../testUtils"
 
 const standardRoot = fixtures.standard.root
 

src/test/routerResolver.test.ts src/test/core/routerResolver.test.tssrc/test/routerResolver.test.ts renamed to src/test/core/routerResolver.test.ts

@@ -1,7 +1,7 @@
 import * as assert from "node:assert"
-import { Parser } from "../core/parser"
-import { buildRouterGraph } from "../core/routerResolver"
-import { fixtures, fixturesPath, wasmPaths } from "./testUtils"
+import { Parser } from "../../core/parser"
+import { buildRouterGraph } from "../../core/routerResolver"
+import { fixtures, fixturesPath, wasmPaths } from "../testUtils"
 
 suite("routerResolver", () => {
   let parser: Parser

src/test/transformer.test.ts src/test/core/transformer.test.tssrc/test/transformer.test.ts renamed to src/test/core/transformer.test.ts

@@ -1,8 +1,8 @@
 import * as assert from "node:assert"
-import { Parser } from "../core/parser"
-import { buildRouterGraph } from "../core/routerResolver"
-import { routerNodeToAppDefinition } from "../core/transformer"
-import { fixtures, wasmPaths } from "./testUtils"
+import { Parser } from "../../core/parser"
+import { buildRouterGraph } from "../../core/routerResolver"
+import { routerNodeToAppDefinition } from "../../core/transformer"
+import { fixtures, wasmPaths } from "../testUtils"
 
 suite("transformer", () => {
   let parser: Parser

src/test/layouts.test.ts

@@ -12,20 +12,12 @@ import { fixtures, wasmPaths } from "./testUtils"
 
 /** Collects all routes from an AppDefinition (direct routes + routes from all routers) */
 function collectAllRoutes(appDef: AppDefinition): RouteDefinition[] {
-  const routes: RouteDefinition[] = [...appDef.routes]
+  const collectFromRouter = (router: RouterDefinition): RouteDefinition[] => [
+    ...router.routes,
+    ...router.children.flatMap(collectFromRouter),
+  ]
 
-  function collectFromRouter(router: RouterDefinition): void {
-    routes.push(...router.routes)
-    for (const child of router.children) {
-      collectFromRouter(child)
-    }
-  }
-
-  for (const router of appDef.routers) {
-    collectFromRouter(router)
-  }
-
-  return routes
+  return [...appDef.routes, ...appDef.routers.flatMap(collectFromRouter)]
 }
 
 suite("Project Layouts", () => {

src/test/EndpointTreeProvider.test.ts …t/providers/EndpointTreeProvider.test.tssrc/test/EndpointTreeProvider.test.ts renamed to src/test/providers/EndpointTreeProvider.test.ts src/test/EndpointTreeProvider.test.ts renamed to src/test/providers/EndpointTreeProvider.test.ts

@@ -1,6 +1,6 @@
 import * as assert from "node:assert"
-import { EndpointTreeProvider } from "../providers/EndpointTreeProvider"
-import { mockApps } from "./fixtures/mockEndpointData"
+import { EndpointTreeProvider } from "../../providers/EndpointTreeProvider"
+import { mockApps } from "../fixtures/mockEndpointData"
 
 suite("EndpointTreeProvider", () => {
   let provider: EndpointTreeProvider