migrate vars test

.prettierignore

@@ -11,3 +11,4 @@ src/compiler/compile/internal_exports.ts
 /test/**/_actual*
 /test/**/expected*
 /types
+!/vitest

test/vars/index.js

@@ -1,52 +0,0 @@
-import * as fs from 'fs';
-import * as assert from 'assert';
-import { svelte, loadConfig, tryToLoadJson } from '../helpers';
-
-describe('vars', () => {
-	fs.readdirSync(`${__dirname}/samples`).forEach((dir) => {
-		if (dir[0] === '.') return;
-
-		// add .solo to a sample directory name to only run that test
-		const solo = /\.solo/.test(dir);
-		const skip = /\.skip/.test(dir);
-
-		if (solo && process.env.CI) {
-			throw new Error('Forgot to remove `solo: true` from test');
-		}
-
-		for (const generate of ['dom', 'ssr', false]) {
-			(solo ? it.only : skip ? it.skip : it)(`${dir}, generate: ${generate}`, () => {
-				const config = loadConfig(`${__dirname}/samples/${dir}/_config.js`);
-				const filename = `${__dirname}/samples/${dir}/input.svelte`;
-				const input = fs.readFileSync(filename, 'utf-8').replace(/\s+$/, '');
-
-				const expectedError = tryToLoadJson(`${__dirname}/samples/${dir}/error.json`);
-
-				let result;
-				let error;
-
-				try {
-					result = svelte.compile(input, { ...config.options, generate });
-					config.test(assert, result.vars);
-				} catch (e) {
-					error = e;
-				}
-
-				if (error || expectedError) {
-					if (error && !expectedError) {
-						throw error;
-					}
-
-					if (expectedError && !error) {
-						throw new Error(`Expected an error: ${expectedError.message}`);
-					}
-
-					assert.equal(error.message, expectedError.message);
-					assert.deepEqual(error.start, expectedError.start);
-					assert.deepEqual(error.end, expectedError.end);
-					assert.equal(error.pos, expectedError.pos);
-				}
-			});
-		}
-	});
-});

vitest/compile-time/vars/vars.spec.js

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
-import {describe, test, assert, expect} from "vitest";
+import { assert, describe, test } from 'vitest';
+import { compile } from '../../../compiler.mjs';
 import { tryToLoadJson } from '../../helpers.js';
-import * as svelte from "../../../compiler.mjs"
 
 describe('vars', () => {
 	fs.readdirSync(`${__dirname}/samples`).forEach((dir) => {
@@ -11,44 +11,37 @@ describe('vars', () => {
 		const solo = /\.solo/.test(dir);
 		const skip = /\.skip/.test(dir);
 
-		if (solo && process.env.CI) {
-			throw new Error('Forgot to remove `solo: true` from test');
-		}
-
-		const test_fn = solo ? test.only : skip ? test.skip : test;
+		const desc = solo ? describe.only : skip ? describe.skip : describe;
 
-		for (const generate of ['dom', 'ssr', false]) {
-			test_fn(`${dir}, generate: ${generate}`, async () => {
+		desc(dir, () => {
+			test.each(['dom', 'ssr', false])(`generate: %s`, async (generate) => {
 				const filename = `${__dirname}/samples/${dir}/input.svelte`;
 				const input = fs.readFileSync(filename, 'utf-8').replace(/\s+$/, '');
+				const expectedError = tryToLoadJson(`${__dirname}/samples/${dir}/error.json`);
 
-				let result;
-				let error;
-
+				/**
+				 * @type {{ options: any, test: (assert: typeof assert, vars: any[]) => void }}}
+				 */
 				const { options, test } = (await import(`./samples/${dir}/_config.mjs`)).default;
 
 				try {
-					result = svelte.compile(input, { ...options, generate });
-					test(assert, result.vars)
-				} catch (e) {
-					error = e;
-				}
-
-				if (error || expectedError) {
-					if (error && !expectedError) {
-						throw error;
-					}
-
-					if (expectedError && !error) {
-						throw new Error(`Expected an error: ${expectedError.message}`);
-					}
-
+					const { vars } = compile(input, { ...options, generate });
+					test(assert, vars);
+				} catch (error) {
+					if (expectedError) {
 						assert.equal(error.message, expectedError.message);
 						assert.deepEqual(error.start, expectedError.start);
 						assert.deepEqual(error.end, expectedError.end);
 						assert.equal(error.pos, expectedError.pos);
+					} else {
+						throw error;
 					}
-			});
 				}
+
+				if (expectedError) {
+					assert.fail(`Expected an error: ${JSON.stringify(expectedError)}`);
+				}
+			});
+		});
 	});
 });