type tests

lubieowoce · lubieowoce · commit 41da25501cef · 2025-06-19T13:28:08.000+02:00
diff --git a/test/e2e/app-dir/app-root-params-getters/fixtures/multiple-roots/expect-type.ts b/test/e2e/app-dir/app-root-params-getters/fixtures/multiple-roots/expect-type.ts
@@ -0,0 +1,5 @@
+export type Expect<T extends true> = T
+export type Equals<A, B> =
+  (<G>() => G extends A ? 1 : 2) extends <G>() => G extends B ? 1 : 2
+    ? true
+    : false
diff --git a/test/e2e/app-dir/app-root-params-getters/fixtures/multiple-roots/type-tests.ts b/test/e2e/app-dir/app-root-params-getters/fixtures/multiple-roots/type-tests.ts
@@ -0,0 +1,11 @@
+import type { Expect, Equals } from './expect-type'
+
+type _ = Expect<
+  Equals<
+    typeof import('next/root-params'),
+    {
+      id: () => Promise<string | undefined>
+      // new types will be patched in here when a test adds new root params
+    }
+  >
+>
diff --git a/test/e2e/app-dir/app-root-params-getters/fixtures/simple/expect-type.ts b/test/e2e/app-dir/app-root-params-getters/fixtures/simple/expect-type.ts
@@ -0,0 +1,5 @@
+export type Expect<T extends true> = T
+export type Equals<A, B> =
+  (<G>() => G extends A ? 1 : 2) extends <G>() => G extends B ? 1 : 2
+    ? true
+    : false
diff --git a/test/e2e/app-dir/app-root-params-getters/fixtures/simple/type-tests.ts b/test/e2e/app-dir/app-root-params-getters/fixtures/simple/type-tests.ts
@@ -0,0 +1,12 @@
+import type { Expect, Equals } from './expect-type'
+
+type _ = Expect<
+  Equals<
+    typeof import('next/root-params'),
+    {
+      lang: () => Promise<string | undefined>
+      locale: () => Promise<string | undefined>
+      path: () => Promise<string[] | undefined>
+    }
+  >
+>
diff --git a/test/e2e/app-dir/app-root-params-getters/multiple-roots.test.ts b/test/e2e/app-dir/app-root-params-getters/multiple-roots.test.ts
@@ -2,11 +2,15 @@ import { nextTestSetup } from 'e2e-utils'
 import { join } from 'path'
 import { createSandbox } from 'development-sandbox'
 import { outdent } from 'outdent'
-import { retry } from '../../../lib/next-test-utils'
+import { retry } from 'next-test-utils'
+import { expectTypecheckingSuccess } from './typecheck'
 
 describe('app-root-param-getters - multiple roots', () => {
   const { next, isNextDev, isTurbopack } = nextTestSetup({
     files: join(__dirname, 'fixtures', 'multiple-roots'),
+    dependencies: {
+      typescript: '5.8.3',
+    },
   })
 
   it('should have root params on dashboard pages', async () => {
@@ -32,6 +36,10 @@ describe('app-root-param-getters - multiple roots', () => {
         `hello world ${JSON.stringify({ id: '1' })}`
       )
 
+      await expectTypecheckingSuccess(next)
+
+      const originalTypeTestsSource = await next.readFile('type-tests.ts')
+
       // Add a new root layout with a root param.
       // This should make the bundler re-generate 'next/root-params' with a new getter for `stuff`.
       const newRootLayoutFiles = new Map([
@@ -60,6 +68,13 @@ describe('app-root-param-getters - multiple roots', () => {
             }
           `,
         ],
+        [
+          'type-tests.ts',
+          originalTypeTestsSource.replace(
+            '// new types will be patched in here when a test adds new root params',
+            'stuff: () => Promise<string | undefined>'
+          ),
+        ],
       ])
       for (const [filePath, fileContent] of newRootLayoutFiles) {
         await session.write(filePath, fileContent)
@@ -74,8 +89,11 @@ describe('app-root-param-getters - multiple roots', () => {
         )
       }
 
+      await expectTypecheckingSuccess(next)
+
       // Change the name of the root param
       // This should make the bundler re-generate 'next/root-params' again, with `things` instead of `stuff`.
+
       if (isTurbopack) {
         // FIXME(turbopack): Something in our routing logic doesn't handle renaming a route param in turbopack mode.
         // I haven't found the cause for this, but `DefaultRouteMatcherManager.reload` calls
@@ -85,6 +103,7 @@ describe('app-root-param-getters - multiple roots', () => {
         // so we're skipping the rest of the test for now.
         return
       }
+
       await session.renameFolder(
         'app/new-root/[stuff]',
         'app/new-root/[things]'
@@ -99,18 +118,31 @@ describe('app-root-param-getters - multiple roots', () => {
         )
       })
 
-      // Update the page to use the new root param name
-      await session.write(
-        'app/new-root/[things]/page.tsx',
-        outdent`
+      const updatedRootLayoutFiles = new Map([
+        [
+          // Update the page to use the new root param name
+          'app/new-root/[things]/page.tsx',
+          outdent`
             import { id, things } from 'next/root-params'
             export default async function Page() {
               return (
                 <p>hello new root: {JSON.stringify({ id: await id(), things: await things() })}</p>
               )
             }
-          `
-      )
+          `,
+        ],
+        [
+          // Type declarations should have been regenerated
+          'type-tests.ts',
+          originalTypeTestsSource.replace(
+            '// new types will be patched in here when a test adds new root params',
+            'things: () => Promise<string | undefined>'
+          ),
+        ],
+      ])
+      for (const [filePath, fileContent] of updatedRootLayoutFiles) {
+        await session.write(filePath, fileContent)
+      }
 
       // The page should call the getter and get the correct param value.
       {
@@ -124,6 +156,14 @@ describe('app-root-param-getters - multiple roots', () => {
           )
         })
       }
+
+      if (!isTurbopack) {
+        // FIXME: seems like `next-types-plugin` doesn't clean up declarations for removed routes,
+        // which causes a typechecking error (because it references layout files that we renamed)
+        await next.remove('.next/types/app/new-root/[stuff]')
+      }
+
+      await expectTypecheckingSuccess(next)
     })
   }
 })
diff --git a/test/e2e/app-dir/app-root-params-getters/simple.test.ts b/test/e2e/app-dir/app-root-params-getters/simple.test.ts
@@ -4,16 +4,25 @@ import { join } from 'path'
 import { createSandbox } from 'development-sandbox'
 import { outdent } from 'outdent'
 import { createRequestTracker } from '../../../lib/e2e-utils/request-tracker'
+import { expectTypecheckingSuccess } from './typecheck'
 
 describe('app-root-param-getters - simple', () => {
   const { next, isNextDev, isTurbopack, isNextDeploy } = nextTestSetup({
     files: join(__dirname, 'fixtures', 'simple'),
+    dependencies: {
+      typescript: '5.8.3',
+    },
   })
 
   it('should allow reading root params', async () => {
     const params = { lang: 'en', locale: 'us' }
     const $ = await next.render$(`/${params.lang}/${params.locale}`)
     expect($('p').text()).toBe(`hello world ${JSON.stringify(params)}`)
+
+    if (isNextDev) {
+      // in dev, we need to typecheck manually. note that we have to compile at least one page to get the types
+      await expectTypecheckingSuccess(next)
+    }
   })
 
   it('should allow reading root params in nested pages', async () => {
diff --git a/test/e2e/app-dir/app-root-params-getters/typecheck.ts b/test/e2e/app-dir/app-root-params-getters/typecheck.ts
@@ -0,0 +1,14 @@
+import execa from 'execa'
+import type { NextInstance } from '../../../lib/e2e-utils'
+
+export async function expectTypecheckingSuccess(next: NextInstance) {
+  const result = await execa('pnpm', ['tsc', '--noEmit'], {
+    reject: false,
+    cwd: next.testDir,
+  })
+  if (result.exitCode !== 0) {
+    throw new Error(
+      `Typechecking failed with exit code ${result.exitCode}:\n` + result.all
+    )
+  }
+}
