Tentative Vitest

packages/svelte2tsx/package.json

@@ -25,22 +25,21 @@
         "@rollup/plugin-node-resolve": "^15.0.0",
         "@rollup/plugin-typescript": "^10.0.0",
         "@types/estree": "^0.0.42",
-        "@types/mocha": "^9.1.0",
         "@types/node": "^18.0.0",
         "@types/unist": "^2.0.3",
         "@types/vfile": "^3.0.2",
         "builtin-modules": "^3.3.0",
         "estree-walker": "^2.0.1",
         "magic-string": "^0.30.11",
-        "mocha": "^9.2.0",
         "periscopic": "^2.0.2",
         "rollup": "3.7.5",
         "rollup-plugin-delete": "^2.0.0",
         "source-map-support": "^0.5.16",
         "svelte": "~4.2.19",
         "tiny-glob": "^0.2.6",
         "tslib": "^2.4.0",
-        "typescript": "^5.8.2"
+        "typescript": "^5.8.2",
+        "vitest": "^3.0.8"
     },
     "peerDependencies": {
         "svelte": "^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0",
@@ -50,7 +49,8 @@
         "build": "rollup -c",
         "prepublishOnly": "npm run build",
         "dev": "rollup -c -w",
-        "test": "mocha test/test.ts"
+        "test": "vitest run",
+        "test:watch": "vitest"
     },
     "files": [
         "index.mjs",
@@ -65,7 +65,7 @@
         "svelte-shims-v4.d.ts"
     ],
     "dependencies": {
-        "dedent-js": "^1.0.1",
-        "pascal-case": "^3.1.1"
+        "change-case": "^5.4.4",
+        "dedent-js": "^1.0.1"
     }
 }

packages/svelte2tsx/rollup.config.mjs

@@ -107,7 +107,7 @@ export default [
             'svelte',
             'svelte/compiler',
             'dedent-js',
-            'pascal-case'
+            'change-case'
         ]
     }
 ];

packages/svelte2tsx/src/svelte2tsx/addComponentExport.ts

@@ -1,4 +1,4 @@
-import { pascalCase } from 'pascal-case';
+import { pascalCase } from 'change-case';
 import path from 'path';
 import MagicString from 'magic-string';
 import { ExportedNames } from './nodes/ExportedNames';
@@ -356,7 +356,7 @@ function classNameFromFilename(filename: string, appendSuffix: boolean): string
         const withoutExtensions = path.parse(filename).name?.split('.')[0];
         const withoutInvalidCharacters = withoutExtensions
             .split('')
-            // Although "-" is invalid, we leave it in, pascal-case-handling will throw it out later
+            // Although "-" is invalid, we leave it in, change-case-handling will throw it out later
             .filter((char) => /[A-Za-z$_\d-]/.test(char))
             .join('');
         const firstValidCharIdx = withoutInvalidCharacters

packages/svelte2tsx/test/emitDts/index.ts → packages/svelte2tsx/test/emitDts/index.test.ts

@@ -3,6 +3,7 @@ import * as fs from 'fs';
 import { join } from 'path';
 import { emitDts } from '../../src';
 import { VERSION } from 'svelte/compiler';
+import { describe, it } from 'vitest';
 
 function rimraf(path: string) {
     ((fs as any).rmSync || fs.rmdirSync)(path, { recursive: true, force: true });
@@ -69,6 +70,6 @@ describe('emitDts', async () => {
     let samplesToTest = samples.filter((s) => s.endsWith('.solo'));
     samplesToTest = samplesToTest.length ? samplesToTest : samples;
     for (const sample of samplesToTest) {
-        it(sample, async () => await testEmitDts(sample)).timeout(10000);
+        it(sample, { timeout: 10000 }, async () => await testEmitDts(sample));
     }
 });

packages/svelte2tsx/test/helpers.ts

@@ -1,9 +1,9 @@
 import fs from 'fs';
 import assert, { AssertionError } from 'assert';
-import { TestFunction } from 'mocha';
 import { htmlx2jsx, svelte2tsx } from './build';
 import path from 'path';
-import { VERSION } from 'svelte/compiler';
+import { VERSION, parse } from 'svelte/compiler';
+import { it, afterEach } from 'vitest';
 
 let update_count = 0;
 let all_tests_skipped = false;
@@ -101,32 +101,33 @@ export class Sample {
     }
 
     it(fn: () => void) {
-        let _it = it;
-
-        if (this.name.startsWith('.')) {
-            _it = it.skip as TestFunction;
-        } else if (this.name.endsWith('.solo')) {
-            _it = it.only as TestFunction;
-        }
+        let skip = this.name.startsWith('.');
+        let only = this.name.endsWith('.solo');
 
         const sample = this;
 
-        _it(this.name + (this.emitOnTemplateError ? ' (loose parser mode)' : ''), function () {
-            try {
-                fn();
-                if (sample.skipped) this.skip();
-            } catch (err) {
-                if (sample.on_error) sample.on_error(sample.generate.bind(sample), err);
-                if (sample.skipped) this.skip();
-                this.test.title = sample.cmd('');
-                throw err;
+        it(
+            this.name + (this.emitOnTemplateError ? ' (loose parser mode)' : ''),
+            { skip, only },
+            function () {
+                try {
+                    fn();
+                    if (sample.skipped) this.skip();
+                } catch (err) {
+                    if (sample.on_error) sample.on_error(sample.generate.bind(sample), err);
+                    if (sample.skipped) this.skip();
+                    if (err instanceof Error) {
+                        err.message = `${sample.cmd('')}\n${err.message}`;
+                    }
+                    throw err;
+                }
             }
-        });
+        );
     }
 
     log(...arr: string[]) {
-        after(function () {
-            after(function () {
+        afterEach(function () {
+            afterEach(function () {
                 console.log(...arr);
             });
         });
@@ -195,7 +196,7 @@ export class Sample {
                 if (action === 'updated' && !can_auto_update()) return;
                 this.skipped = true;
             }
-            after(() => {
+            afterEach(() => {
                 console.log(`\t[${action}] ${color.cyan(file)} ${color.grey(this.cmd(file))}`);
                 writeFileSync(this.at(file), content);
             });
@@ -276,11 +277,11 @@ export function test_samples(dir: string, transform: TransformSampleFn, js: 'js'
                 const { message, actual } = err;
                 switch (message) {
                     case TestError.WrongExpected: {
-                        generate(expectedFile, actual);
+                        generate(expectedFile, actual as string);
                         break;
                     }
                     case TestError.WrongError: {
-                        generate('expected.error.json', print_error(actual));
+                        generate('expected.error.json', print_error(actual as Error));
                         break;
                     }
                 }
@@ -376,7 +377,9 @@ export function get_svelte2tsx_config(base: BaseConfig, sampleName: string): Sve
         typingsNamespace: 'svelteHTML',
         mode: sampleName.endsWith('-dts') ? 'dts' : 'ts',
         accessors: sampleName.startsWith('accessors-config'),
-        version: VERSION
+        version: VERSION,
+        parse,
+        noSvelteComponentTyped: false
     };
 }
 

packages/svelte2tsx/test/helpers/index.ts → packages/svelte2tsx/test/helpers/index.test.ts

@@ -1,6 +1,7 @@
 import * as assert from 'assert';
 import ts from 'typescript';
 import { internalHelpers } from '../../src';
+import { describe, it } from 'vitest';
 
 describe('Internal Helpers - upsertKitFile', () => {
     function upsert(file: string, source: string, expected: string) {

packages/svelte2tsx/test/htmlx2jsx/index.ts → packages/svelte2tsx/test/htmlx2jsx/index.test.ts

@@ -1,6 +1,7 @@
 import { VERSION, parse } from 'svelte/compiler';
 import { htmlx2jsx } from '../build';
 import { test_samples } from '../helpers';
+import { describe } from 'vitest';
 
 describe('htmlx2jsx', () => {
     test_samples(

packages/svelte2tsx/test/htmlxparser/index.ts → packages/svelte2tsx/test/htmlxparser/index.test.ts

@@ -2,7 +2,7 @@ import { htmlx2jsx } from '../build';
 import assert from 'assert';
 import { benchmark } from '../helpers';
 import { parse } from 'svelte/compiler';
-
+import { describe, it } from 'vitest';
 describe('htmlxparser', () => {
     it('parses in a reasonable time', () => {
         let random = '';

packages/svelte2tsx/test/sourcemaps/index.ts → packages/svelte2tsx/test/sourcemaps/index.test.ts

@@ -14,6 +14,7 @@ import {
     validate_test_file
 } from './process';
 import { VERSION } from 'svelte/compiler';
+import { describe } from 'vitest';
 
 // TODO figure out what to do with those now that we have the new transformation
 const isSvelte5Plus = Number(VERSION[0]) >= 5;

packages/svelte2tsx/test/svelte2tsx/index.ts → packages/svelte2tsx/test/svelte2tsx/index.test.ts

@@ -1,5 +1,6 @@
 import { svelte2tsx } from '../build';
 import { get_svelte2tsx_config, test_samples } from '../helpers';
+import { describe } from 'vitest';
 
 describe('svelte2tsx', () => {
     test_samples(

packages/svelte2tsx/test/tsconfig.json

@@ -1,11 +1,10 @@
 {
     "compilerOptions": {
-        "types": ["@types/node", "@types/mocha"],
+        "types": ["@types/node", "vitest"],
         "target": "es6",
         "module": "commonjs",
         "moduleResolution": "node",
         "esModuleInterop": true
     },
-    "exclude": ["samples/**"],
     "include": ["*.ts"]
 }

packages/svelte2tsx/vitest.config.ts

@@ -0,0 +1,15 @@
+import { defineConfig } from 'vitest/config';
+import { resolve } from 'path';
+
+export default defineConfig({
+    test: {
+        // globals: true,
+        environment: 'node',
+        include: ['test/**/*.test.ts']
+    },
+    resolve: {
+        alias: {
+            svelte2tsx: resolve(__dirname, 'src')
+        }
+    }
+});