BridgeJS: Re-organize snapshot test structure

Author: kateinoigakukun

.gitignore

@@ -10,7 +10,7 @@ xcuserdata/
 Examples/*/Bundle
 Examples/*/package-lock.json
 Package.resolved
-Plugins/BridgeJS/Sources/JavaScript/package-lock.json
+Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package-lock.json
 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/**/*.actual
 bridge-js.config.local.json
 _site/

CONTRIBUTING.md

@@ -60,12 +60,24 @@ Tests for `BridgeJS` plugin:
 swift test --package-path ./Plugins/BridgeJS
 ```
 
+This runs both the TS2Swift Vitest suite (TypeScript `.d.ts` -> Swift macro output) and the Swift codegen/link tests. For fast iteration on the ts2swift tool only, run Vitest directly:
+
+```bash
+cd Plugins/BridgeJS/Sources/TS2Swift/JavaScript && npm test
+```
+
 To update snapshot test files when expected output changes:
 
 ```bash
 UPDATE_SNAPSHOTS=1 swift test --package-path ./Plugins/BridgeJS
 ```
 
+When you change ts2swift behavior, update Vitest snapshots (e.g. `npx vitest run --update` in `Sources/TS2Swift/JavaScript`) and regenerate the macro Swift fixtures used by Swift tests (writes `Tests/BridgeJSToolTests/Inputs/MacroSwift/` from `Inputs/TypeScript/*.d.ts`):
+
+```bash
+cd Plugins/BridgeJS/Sources/TS2Swift/JavaScript && npm run generate-macro-fixtures
+```
+
 ### Editing `./Runtime` directory
 
 The `./Runtime` directory contains the JavaScript runtime that interacts with the JavaScript environment and Swift code.

Plugins/BridgeJS/Package.swift

@@ -59,7 +59,7 @@ let package = Package(
                 "BridgeJSLink",
                 "TS2Swift",
             ],
-            exclude: ["__Snapshots__", "Inputs", "MultifileInputs", "ImportMacroInputs"]
+            exclude: ["__Snapshots__", "Inputs"]
         ),
         .macro(
             name: "BridgeJSMacros",

Plugins/BridgeJS/README.md

@@ -100,7 +100,7 @@ graph LR
 | `Foundation.URL` | `string` | - | [#496](https://github.com/swiftwasm/JavaScriptKit/issues/496) |
 | Generics | - | - | [#398](https://github.com/swiftwasm/JavaScriptKit/issues/398) |
 
-### Import-specific (TypeScript → Swift)
+### Import-specific (TypeScript -> Swift)
 
 | TypeScript Type | Swift Type | Status |
 |:----------------|:-----------|:-------|
@@ -163,6 +163,12 @@ Return values use direct Wasm returns for primitives, and imported intrinsic fun
 
 For detailed semantics, see the [How It Works sections](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/exporting-swift-class#How-It-Works) in the user documentation.
 
+## Testing
+
+- **Full BridgeJS tests** (Swift + TS2Swift Vitest): `swift test --package-path ./Plugins/BridgeJS`
+- **TS2Swift only** (fast iteration on `.d.ts` -> Swift): `npm -C Sources/TS2Swift/JavaScript test`
+- **Regenerate snapshot artifacts**: `UPDATE_SNAPSHOTS=1 swift test --package-path ./Plugins/BridgeJS`
+
 ## Debug utilities
 
 `BridgeJSToolInternal` exposes pipeline stages for debugging:

Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package.json

@@ -3,7 +3,13 @@
     "dependencies": {
         "typescript": "5.8.2"
     },
+    "devDependencies": {
+        "vitest": "^2.0.0"
+    },
     "bin": {
         "ts2swift": "./bin/ts2swift.js"
+    },
+    "scripts": {
+        "test": "vitest run"
     }
 }

Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js

@@ -76,13 +76,80 @@ function printUsage() {
     console.error('Usage: ts2swift <d.ts file path> -p <tsconfig.json path> [--global <d.ts>]... [-o output.swift]');
 }
 
+/**
+ * Run ts2swift for a single input file (programmatic API, no process I/O).
+ * @param {string} filePath - Path to the .d.ts file
+ * @param {{ tsconfigPath: string, logLevel?: string, globalFiles?: string[] }} options
+ * @returns {string} Generated Swift source
+ * @throws {Error} on parse/type-check errors (diagnostics are included in the message)
+ */
+export function run(filePath, options) {
+    const { tsconfigPath, logLevel = 'info', globalFiles: globalFilesOpt = [] } = options;
+    const globalFiles = Array.isArray(globalFilesOpt) ? globalFilesOpt : (globalFilesOpt ? [globalFilesOpt] : []);
+
+    const diagnosticEngine = new DiagnosticEngine(logLevel);
+
+    const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
+    const configParseResult = ts.parseJsonConfigFileContent(
+        configFile.config,
+        ts.sys,
+        path.dirname(path.resolve(tsconfigPath))
+    );
+
+    if (configParseResult.errors.length > 0) {
+        const message = ts.formatDiagnosticsWithColorAndContext(configParseResult.errors, {
+            getCanonicalFileName: (fileName) => fileName,
+            getNewLine: () => ts.sys.newLine,
+            getCurrentDirectory: () => ts.sys.getCurrentDirectory(),
+        });
+        throw new Error(`TypeScript config/parse errors:\n${message}`);
+    }
+
+    const program = TypeProcessor.createProgram([filePath, ...globalFiles], configParseResult.options);
+    const diagnostics = program.getSemanticDiagnostics();
+    if (diagnostics.length > 0) {
+        const message = ts.formatDiagnosticsWithColorAndContext(diagnostics, {
+            getCanonicalFileName: (fileName) => fileName,
+            getNewLine: () => ts.sys.newLine,
+            getCurrentDirectory: () => ts.sys.getCurrentDirectory(),
+        });
+        throw new Error(`TypeScript semantic errors:\n${message}`);
+    }
+
+    const prelude = [
+        "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,",
+        "// DO NOT EDIT.",
+        "//",
+        "// To update this file, just rebuild your project or run",
+        "// `swift package bridge-js`.",
+        "",
+        "@_spi(Experimental) import JavaScriptKit",
+        "",
+        "",
+    ].join("\n");
+
+    /** @type {string[]} */
+    const bodies = [];
+    const globalFileSet = new Set(globalFiles);
+    for (const inputPath of [filePath, ...globalFiles]) {
+        const processor = new TypeProcessor(program.getTypeChecker(), diagnosticEngine, {
+            defaultImportFromGlobal: globalFileSet.has(inputPath),
+        });
+        const result = processor.processTypeDeclarations(program, inputPath);
+        const body = result.content.trim();
+        if (body.length > 0) bodies.push(body);
+    }
+
+    const hasAny = bodies.length > 0;
+    return hasAny ? prelude + bodies.join("\n\n") + "\n" : "";
+}
+
 /**
  * Main function to run the CLI
  * @param {string[]} args - Command-line arguments
  * @returns {void}
  */
 export function main(args) {
-    // Parse command line arguments
     const options = parseArgs({
         args,
         options: {
@@ -118,64 +185,25 @@ export function main(args) {
     }
 
     const filePath = options.positionals[0];
-    const diagnosticEngine = new DiagnosticEngine(options.values["log-level"] || "info");
-
-    diagnosticEngine.print("verbose", `Processing ${filePath}...`);
-
-    // Create TypeScript program and process declarations
-    const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
-    const configParseResult = ts.parseJsonConfigFileContent(
-        configFile.config,
-        ts.sys,
-        path.dirname(path.resolve(tsconfigPath))
-    );
-
-    if (configParseResult.errors.length > 0) {
-        diagnosticEngine.tsDiagnose(configParseResult.errors);
-        process.exit(1);
-    }
-
+    const logLevel = options.values["log-level"] || "info";
     /** @type {string[]} */
     const globalFiles = Array.isArray(options.values.global)
         ? options.values.global
         : (options.values.global ? [options.values.global] : []);
 
-    const program = TypeProcessor.createProgram([filePath, ...globalFiles], configParseResult.options);
-    const diagnostics = program.getSemanticDiagnostics();
-    if (diagnostics.length > 0) {
-        diagnosticEngine.tsDiagnose(diagnostics);
-        process.exit(1);
-    }
-
-    const prelude = [
-        "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,",
-        "// DO NOT EDIT.",
-        "//",
-        "// To update this file, just rebuild your project or run",
-        "// `swift package bridge-js`.",
-        "",
-        "@_spi(Experimental) import JavaScriptKit",
-        "",
-        "",
-    ].join("\n");
+    const diagnosticEngine = new DiagnosticEngine(logLevel);
+    diagnosticEngine.print("verbose", `Processing ${filePath}...`);
 
-    /** @type {string[]} */
-    const bodies = [];
-    const globalFileSet = new Set(globalFiles);
-    for (const inputPath of [filePath, ...globalFiles]) {
-        const processor = new TypeProcessor(program.getTypeChecker(), diagnosticEngine, {
-            defaultImportFromGlobal: globalFileSet.has(inputPath),
-        });
-        const result = processor.processTypeDeclarations(program, inputPath);
-        const body = result.content.trim();
-        if (body.length > 0) bodies.push(body);
+    let swiftOutput;
+    try {
+        swiftOutput = run(filePath, { tsconfigPath, logLevel, globalFiles });
+    } catch (err) {
+        console.error(err.message);
+        process.exit(1);
     }
 
-    const hasAny = bodies.length > 0;
-    const swiftOutput = hasAny ? prelude + bodies.join("\n\n") + "\n" : "";
-
     if (options.values.output) {
-        if (hasAny) {
+        if (swiftOutput.length > 0) {
             fs.mkdirSync(path.dirname(options.values.output), { recursive: true });
             fs.writeFileSync(options.values.output, swiftOutput);
         }