improvements

Author: manuel3108

packages/adder-tests/common.ts

@@ -0,0 +1,12 @@
+import { getAdderDetails, officialAdders } from '@sveltejs/adders';
+
+export async function getAdderTestDetails() {
+	return Promise.all(
+		officialAdders.map(async (x) => {
+			return {
+				config: getAdderDetails(x.id),
+				tests: (await import(`../adders/${x.id}/tests.ts`)).tests
+			};
+		})
+	);
+}

packages/adder-tests/tests/official/end2end.ts

@@ -1,15 +1,7 @@
 import { test, describe, beforeAll, afterAll } from 'vitest';
-import { getAdderDetails, getAdderTestDetails, officialAdders } from '@sveltejs/adders';
+import { getAdderTestDetails } from '../../common.ts';
 import { runEndToEndTests } from '@sveltejs/adder-testing-library';
 
-// todo: I'm sure there is a better way to do this
-const adders = await Promise.all(
-	officialAdders.map(async (x) => {
-		return {
-			config: getAdderDetails(x.id),
-			tests: await getAdderTestDetails(x.id)
-		};
-	})
-);
+const adders = await getAdderTestDetails();
 
 runEndToEndTests('.outputs-e2e', adders, describe, test.concurrent, beforeAll, afterAll);

packages/adder-tests/tests/official/snapshots.ts

@@ -1,16 +1,8 @@
 import { test, describe, beforeAll, afterAll } from 'vitest';
-import { getAdderTestDetails, getAdderDetails, officialAdders } from '@sveltejs/adders';
 import { runSnapshotTests } from '@sveltejs/adder-testing-library';
+import { getAdderTestDetails } from '../../common.ts';
 
-// todo: I'm sure there is a better way to do this
-const adders = await Promise.all(
-	officialAdders.map(async (x) => {
-		return {
-			config: getAdderDetails(x.id),
-			tests: await getAdderTestDetails(x.id)
-		};
-	})
-);
+const adders = await getAdderTestDetails();
 
 runSnapshotTests(
 	'.outputs-snapshots',

packages/adders/_config/official.ts

@@ -1,4 +1,4 @@
-import type { AdderTestConfig, AdderWithoutExplicitArgs } from '@sveltejs/cli-core';
+import type { AdderWithoutExplicitArgs } from '@sveltejs/cli-core';
 
 import drizzle from '../drizzle/index.ts';
 import eslint from '../eslint/index.ts';
@@ -36,8 +36,3 @@ export function getAdderDetails(id: string): AdderWithoutExplicitArgs {
 
 	return details as AdderWithoutExplicitArgs;
 }
-
-export async function getAdderTestDetails(id: string) {
-	const defaultAA = await import(`../${id}/tests.ts`);
-	return defaultAA.tests as AdderTestConfig<Record<string, any>>;
-}