refactor(test/e2e): reshape GetFixture return to { fixture, users }

Move the fixture fields behind a `fixture` property and derive both
public-facing types (`FixtureUsers`, `Omit<Fixture, "cleanup">`) from
their cleanup-bearing sources via `Omit`. Cleanup remains managed
internally by `createGetFixture`'s beforeAll/afterAll/afterEach hooks.

Author: wyattjoh

test/e2e/lib/fixture-test.ts

@@ -41,25 +41,19 @@ async function hasTypecheckScript(projectDir: string): Promise<boolean> {
   }
 }
 
-type FixtureUsers = {
+type Users = {
   create: () => Promise<TestUser>;
   delete: (userId: string) => Promise<void>;
+  cleanup: () => Promise<void>;
 };
 
+type FixtureUsers = Omit<Users, "cleanup">;
+
 type GetFixture = () => {
-  projectDir: string;
-  configDir: string;
-  publishableKey: string;
-  secretKey: string;
+  fixture: Omit<Fixture, "cleanup">;
   users: FixtureUsers;
 };
 
-type Users = {
-  create: () => Promise<TestUser>;
-  delete: (userId: string) => Promise<void>;
-  cleanup: () => Promise<void>;
-};
-
 function createUsers(fixture: Fixture, description: string): Users {
   const createdUserIDs = new Set<string>();
 
@@ -111,20 +105,14 @@ export function createGetFixture(fixtureDir: string, config: FixtureConfig): Get
   // Skip when imported by the refresh script
   if (process.env.CLERK_REFRESH_FIXTURES) {
     return () => ({
-      projectDir: "",
-      configDir: "",
-      publishableKey: "",
-      secretKey: "",
+      fixture: { projectDir: "", configDir: "", publishableKey: "", secretKey: "" },
       users: {
         create: () => {
           throw new Error("users.create unavailable in refresh-fixtures mode");
         },
         delete: () => {
           throw new Error("users.delete unavailable in refresh-fixtures mode");
         },
-        cleanup: () => {
-          throw new Error("users.cleanup unavailable in refresh-fixtures mode");
-        },
       },
     });
   }
@@ -153,7 +141,12 @@ export function createGetFixture(fixtureDir: string, config: FixtureConfig): Get
     if (!fixture || !users)
       throw new Error("Fixture not initialized - createGetFixture() beforeAll has not run yet");
     return {
-      ...fixture,
+      fixture: {
+        projectDir: fixture.projectDir,
+        configDir: fixture.configDir,
+        publishableKey: fixture.publishableKey,
+        secretKey: fixture.secretKey,
+      },
       users,
     };
   };
@@ -176,7 +169,8 @@ export function runFixtureTest(getFixture: GetFixture, config: FixtureConfig): v
     test(
       "project builds with no errors",
       async () => {
-        const { projectDir } = getFixture();
+        const { fixture } = getFixture();
+        const { projectDir } = fixture;
 
         // Build first so type generation artifacts are available for tsc.
         log(config.description, "build started");
@@ -194,7 +188,8 @@ export function runFixtureTest(getFixture: GetFixture, config: FixtureConfig): v
     test(
       "typecheck passes with no errors",
       async () => {
-        const { projectDir } = getFixture();
+        const { fixture } = getFixture();
+        const { projectDir } = fixture;
 
         // Use the project's typecheck script if available (handles
         // framework-specific type generation), otherwise plain tsc.
@@ -231,7 +226,8 @@ export function runFileExistsTest(
 
   const label = expectedFiles.join(" or ");
   test(`clerk init [${config.description}]: creates ${label}`, async () => {
-    const { projectDir } = getFixture();
+    const { fixture } = getFixture();
+    const { projectDir } = fixture;
     const found = await Promise.all(
       expectedFiles.map(async (f) => {
         const file = Bun.file(join(projectDir, f));
@@ -255,7 +251,8 @@ export function runBrowserTest(getFixture: GetFixture, config: FixtureConfig): v
     test(
       "app loads and auth flow works",
       async () => {
-        const { projectDir, publishableKey, secretKey, users } = getFixture();
+        const { fixture, users } = getFixture();
+        const { projectDir, publishableKey, secretKey } = fixture;
         const fixtureName = config.description;
 
         let port: number | undefined;