@git.zone/tstest 2.3.7 → 2.4.0

package/ts/tstest.classes.runtime.node.ts

@@ -0,0 +1,222 @@
+import * as plugins from './tstest.plugins.js';
+import { coloredString as cs } from '@push.rocks/consolecolor';
+import {
+  RuntimeAdapter,
+  type RuntimeOptions,
+  type RuntimeCommand,
+  type RuntimeAvailability,
+} from './tstest.classes.runtime.adapter.js';
+import { TapParser } from './tstest.classes.tap.parser.js';
+import { TsTestLogger } from './tstest.logging.js';
+import type { Runtime } from './tstest.classes.runtime.parser.js';
+
+/**
+ * Node.js runtime adapter
+ * Executes tests using tsrun (TypeScript runner for Node.js)
+ */
+export class NodeRuntimeAdapter extends RuntimeAdapter {
+  readonly id: Runtime = 'node';
+  readonly displayName: string = 'Node.js';
+
+  constructor(
+    private logger: TsTestLogger,
+    private smartshellInstance: any, // SmartShell instance from @push.rocks/smartshell
+    private timeoutSeconds: number | null,
+    private filterTags: string[]
+  ) {
+    super();
+  }
+
+  /**
+   * Check if Node.js and tsrun are available
+   */
+  async checkAvailable(): Promise<RuntimeAvailability> {
+    try {
+      // Check Node.js version
+      const nodeVersion = process.version;
+
+      // Check if tsrun is available
+      const result = await this.smartshellInstance.exec('tsrun --version', {
+        cwd: process.cwd(),
+        onError: () => {
+          // Ignore error
+        }
+      });
+
+      if (result.exitCode !== 0) {
+        return {
+          available: false,
+          error: 'tsrun not found. Install with: pnpm install --save-dev @git.zone/tsrun',
+        };
+      }
+
+      return {
+        available: true,
+        version: nodeVersion,
+      };
+    } catch (error) {
+      return {
+        available: false,
+        error: error.message,
+      };
+    }
+  }
+
+  /**
+   * Create command configuration for Node.js test execution
+   */
+  createCommand(testFile: string, options?: RuntimeOptions): RuntimeCommand {
+    const mergedOptions = this.mergeOptions(options);
+
+    // Build tsrun options
+    const args: string[] = [];
+
+    if (process.argv.includes('--web')) {
+      args.push('--web');
+    }
+
+    // Add any extra args
+    if (mergedOptions.extraArgs) {
+      args.push(...mergedOptions.extraArgs);
+    }
+
+    // Set environment variables
+    const env = { ...mergedOptions.env };
+
+    if (this.filterTags.length > 0) {
+      env.TSTEST_FILTER_TAGS = this.filterTags.join(',');
+    }
+
+    return {
+      command: 'tsrun',
+      args: [testFile, ...args],
+      env,
+      cwd: mergedOptions.cwd,
+    };
+  }
+
+  /**
+   * Execute a test file in Node.js
+   */
+  async run(
+    testFile: string,
+    index: number,
+    total: number,
+    options?: RuntimeOptions
+  ): Promise<TapParser> {
+    this.logger.testFileStart(testFile, this.displayName, index, total);
+    const tapParser = new TapParser(testFile + ':node', this.logger);
+
+    const mergedOptions = this.mergeOptions(options);
+
+    // Build tsrun command
+    let tsrunOptions = '';
+    if (process.argv.includes('--web')) {
+      tsrunOptions += ' --web';
+    }
+
+    // Set filter tags as environment variable
+    if (this.filterTags.length > 0) {
+      process.env.TSTEST_FILTER_TAGS = this.filterTags.join(',');
+    }
+
+    // Check for 00init.ts file in test directory
+    const testDir = plugins.path.dirname(testFile);
+    const initFile = plugins.path.join(testDir, '00init.ts');
+    let runCommand = `tsrun ${testFile}${tsrunOptions}`;
+
+    const initFileExists = await plugins.smartfile.fs.fileExists(initFile);
+
+    // If 00init.ts exists, run it first
+    let loaderPath: string | null = null;
+    if (initFileExists) {
+      // Create a temporary loader file that imports both 00init.ts and the test file
+      const absoluteInitFile = plugins.path.resolve(initFile);
+      const absoluteTestFile = plugins.path.resolve(testFile);
+      const loaderContent = `
+import '${absoluteInitFile.replace(/\\/g, '/')}';
+import '${absoluteTestFile.replace(/\\/g, '/')}';
+`;
+      loaderPath = plugins.path.join(testDir, `.loader_${plugins.path.basename(testFile)}`);
+      await plugins.smartfile.memory.toFs(loaderContent, loaderPath);
+      runCommand = `tsrun ${loaderPath}${tsrunOptions}`;
+    }
+
+    const execResultStreaming = await this.smartshellInstance.execStreamingSilent(runCommand);
+
+    // If we created a loader file, clean it up after test execution
+    if (loaderPath) {
+      const cleanup = () => {
+        try {
+          if (plugins.smartfile.fs.fileExistsSync(loaderPath)) {
+            plugins.smartfile.fs.removeSync(loaderPath);
+          }
+        } catch (e) {
+          // Ignore cleanup errors
+        }
+      };
+
+      execResultStreaming.childProcess.on('exit', cleanup);
+      execResultStreaming.childProcess.on('error', cleanup);
+    }
+
+    // Start warning timer if no timeout was specified
+    let warningTimer: NodeJS.Timeout | null = null;
+    if (this.timeoutSeconds === null) {
+      warningTimer = setTimeout(() => {
+        console.error('');
+        console.error(cs('⚠️  WARNING: Test file is running for more than 1 minute', 'orange'));
+        console.error(cs(`   File: ${testFile}`, 'orange'));
+        console.error(cs('   Consider using --timeout option to set a timeout for test files.', 'orange'));
+        console.error(cs('   Example: tstest test --timeout=300 (for 5 minutes)', 'orange'));
+        console.error('');
+      }, 60000); // 1 minute
+    }
+
+    // Handle timeout if specified
+    if (this.timeoutSeconds !== null) {
+      const timeoutMs = this.timeoutSeconds * 1000;
+      let timeoutId: NodeJS.Timeout;
+
+      const timeoutPromise = new Promise<void>((_resolve, reject) => {
+        timeoutId = setTimeout(async () => {
+          // Use smartshell's terminate() to kill entire process tree
+          await execResultStreaming.terminate();
+          reject(new Error(`Test file timed out after ${this.timeoutSeconds} seconds`));
+        }, timeoutMs);
+      });
+
+      try {
+        await Promise.race([
+          tapParser.handleTapProcess(execResultStreaming.childProcess),
+          timeoutPromise
+        ]);
+        // Clear timeout if test completed successfully
+        clearTimeout(timeoutId);
+      } catch (error) {
+        // Clear warning timer if it was set
+        if (warningTimer) {
+          clearTimeout(warningTimer);
+        }
+        // Handle timeout error
+        tapParser.handleTimeout(this.timeoutSeconds);
+        // Ensure entire process tree is killed if still running
+        try {
+          await execResultStreaming.kill(); // This kills the entire process tree with SIGKILL
+        } catch (killError) {
+          // Process tree might already be dead
+        }
+        await tapParser.evaluateFinalResult();
+      }
+    } else {
+      await tapParser.handleTapProcess(execResultStreaming.childProcess);
+    }
+
+    // Clear warning timer if it was set
+    if (warningTimer) {
+      clearTimeout(warningTimer);
+    }
+
+    return tapParser;
+  }
+}

package/ts/tstest.classes.runtime.parser.ts

@@ -0,0 +1,211 @@
+/**
+ * Runtime parser for test file naming convention
+ * Supports: test.runtime1+runtime2.modifier.ts
+ * Examples:
+ *   - test.node.ts
+ *   - test.chromium.ts
+ *   - test.node+chromium.ts
+ *   - test.deno+bun.ts
+ *   - test.chromium.nonci.ts
+ */
+
+export type Runtime = 'node' | 'chromium' | 'deno' | 'bun';
+export type Modifier = 'nonci';
+
+export interface ParsedFilename {
+  baseName: string;
+  runtimes: Runtime[];
+  modifiers: Modifier[];
+  extension: string;
+  isLegacy: boolean;
+  original: string;
+}
+
+export interface ParserConfig {
+  strictUnknownRuntime?: boolean;  // default: true
+  defaultRuntimes?: Runtime[];     // default: ['node']
+}
+
+const KNOWN_RUNTIMES: Set<string> = new Set(['node', 'chromium', 'deno', 'bun']);
+const KNOWN_MODIFIERS: Set<string> = new Set(['nonci']);
+const VALID_EXTENSIONS: Set<string> = new Set(['ts', 'tsx', 'mts', 'cts']);
+
+// Legacy mappings for backwards compatibility
+const LEGACY_RUNTIME_MAP: Record<string, Runtime[]> = {
+  browser: ['chromium'],
+  both: ['node', 'chromium'],
+};
+
+/**
+ * Parse a test filename to extract runtimes, modifiers, and detect legacy patterns
+ * Algorithm: Right-to-left token analysis from the extension
+ */
+export function parseTestFilename(
+  filePath: string,
+  config: ParserConfig = {}
+): ParsedFilename {
+  const strictUnknownRuntime = config.strictUnknownRuntime ?? true;
+  const defaultRuntimes = config.defaultRuntimes ?? ['node'];
+
+  // Extract just the filename from the path
+  const fileName = filePath.split('/').pop() || filePath;
+  const original = fileName;
+
+  // Step 1: Extract and validate extension
+  const lastDot = fileName.lastIndexOf('.');
+  if (lastDot === -1) {
+    throw new Error(`Invalid test file: no extension found in "${fileName}"`);
+  }
+
+  const extension = fileName.substring(lastDot + 1);
+  if (!VALID_EXTENSIONS.has(extension)) {
+    throw new Error(
+      `Invalid test file extension ".${extension}" in "${fileName}". ` +
+      `Valid extensions: ${Array.from(VALID_EXTENSIONS).join(', ')}`
+    );
+  }
+
+  // Step 2: Split remaining basename by dots
+  const withoutExtension = fileName.substring(0, lastDot);
+  const tokens = withoutExtension.split('.');
+
+  if (tokens.length === 0) {
+    throw new Error(`Invalid test file: empty basename in "${fileName}"`);
+  }
+
+  // Step 3: Parse from right to left
+  let isLegacy = false;
+  const modifiers: Modifier[] = [];
+  let runtimes: Runtime[] = [];
+  let runtimeTokenIndex = -1;
+
+  // Scan from right to left
+  for (let i = tokens.length - 1; i >= 0; i--) {
+    const token = tokens[i];
+
+    // Check if this is a known modifier
+    if (KNOWN_MODIFIERS.has(token)) {
+      modifiers.unshift(token as Modifier);
+      continue;
+    }
+
+    // Check if this is a legacy runtime token
+    if (LEGACY_RUNTIME_MAP[token]) {
+      isLegacy = true;
+      runtimes = LEGACY_RUNTIME_MAP[token];
+      runtimeTokenIndex = i;
+      break;
+    }
+
+    // Check if this is a runtime chain (may contain + separators)
+    if (token.includes('+')) {
+      const runtimeCandidates = token.split('+').map(r => r.trim()).filter(Boolean);
+      const validRuntimes: Runtime[] = [];
+      const invalidRuntimes: string[] = [];
+
+      for (const candidate of runtimeCandidates) {
+        if (KNOWN_RUNTIMES.has(candidate)) {
+          // Dedupe: only add if not already in list
+          if (!validRuntimes.includes(candidate as Runtime)) {
+            validRuntimes.push(candidate as Runtime);
+          }
+        } else {
+          invalidRuntimes.push(candidate);
+        }
+      }
+
+      if (invalidRuntimes.length > 0) {
+        if (strictUnknownRuntime) {
+          throw new Error(
+            `Unknown runtime(s) in "${fileName}": ${invalidRuntimes.join(', ')}. ` +
+            `Valid runtimes: ${Array.from(KNOWN_RUNTIMES).join(', ')}`
+          );
+        } else {
+          console.warn(
+            `⚠️  Warning: Unknown runtime(s) in "${fileName}": ${invalidRuntimes.join(', ')}. ` +
+            `Defaulting to: ${defaultRuntimes.join('+')}`
+          );
+          runtimes = [...defaultRuntimes];
+          runtimeTokenIndex = i;
+          break;
+        }
+      }
+
+      if (validRuntimes.length > 0) {
+        runtimes = validRuntimes;
+        runtimeTokenIndex = i;
+        break;
+      }
+    }
+
+    // Check if this is a single runtime token
+    if (KNOWN_RUNTIMES.has(token)) {
+      runtimes = [token as Runtime];
+      runtimeTokenIndex = i;
+      break;
+    }
+
+    // If we've scanned past modifiers and haven't found a runtime, stop looking
+    if (modifiers.length > 0) {
+      break;
+    }
+  }
+
+  // Step 4: Determine base name
+  // Everything before the runtime token (if found) is the base name
+  const baseNameTokens = runtimeTokenIndex >= 0 ? tokens.slice(0, runtimeTokenIndex) : tokens;
+  const baseName = baseNameTokens.join('.');
+
+  // Step 5: Apply defaults if no runtime was detected
+  if (runtimes.length === 0) {
+    runtimes = [...defaultRuntimes];
+  }
+
+  return {
+    baseName: baseName || 'test',
+    runtimes,
+    modifiers,
+    extension,
+    isLegacy,
+    original,
+  };
+}
+
+/**
+ * Check if a filename uses legacy naming convention
+ */
+export function isLegacyFilename(fileName: string): boolean {
+  const tokens = fileName.split('.');
+  for (const token of tokens) {
+    if (LEGACY_RUNTIME_MAP[token]) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * Get the suggested new filename for a legacy filename
+ */
+export function getLegacyMigrationTarget(fileName: string): string | null {
+  const parsed = parseTestFilename(fileName, { strictUnknownRuntime: false });
+
+  if (!parsed.isLegacy) {
+    return null;
+  }
+
+  // Reconstruct filename with new naming
+  const parts = [parsed.baseName];
+
+  if (parsed.runtimes.length > 0) {
+    parts.push(parsed.runtimes.join('+'));
+  }
+
+  if (parsed.modifiers.length > 0) {
+    parts.push(...parsed.modifiers);
+  }
+
+  parts.push(parsed.extension);
+
+  return parts.join('.');
+}

package/ts/tstest.classes.tstest.ts

@@ -10,6 +10,14 @@ import { TestExecutionMode } from './index.js';
 import { TsTestLogger } from './tstest.logging.js';
 import type { LogOptions } from './tstest.logging.js';
 
+// Runtime adapters
+import { parseTestFilename } from './tstest.classes.runtime.parser.js';
+import { RuntimeAdapterRegistry } from './tstest.classes.runtime.adapter.js';
+import { NodeRuntimeAdapter } from './tstest.classes.runtime.node.js';
+import { ChromiumRuntimeAdapter } from './tstest.classes.runtime.chromium.js';
+import { DenoRuntimeAdapter } from './tstest.classes.runtime.deno.js';
+import { BunRuntimeAdapter } from './tstest.classes.runtime.bun.js';
+
 export class TsTest {
   public testDir: TestDirectory;
   public executionMode: TestExecutionMode;
@@ -28,6 +36,8 @@ export class TsTest {
 
   public tsbundleInstance = new plugins.tsbundle.TsBundle();
 
+  public runtimeRegistry = new RuntimeAdapterRegistry();
+
   constructor(cwdArg: string, testPathArg: string, executionModeArg: TestExecutionMode, logOptions: LogOptions = {}, tags: string[] = [], startFromFile: number | null = null, stopAtFile: number | null = null, timeoutSeconds: number | null = null) {
     this.executionMode = executionModeArg;
     this.testDir = new TestDirectory(cwdArg, testPathArg, executionModeArg);
@@ -36,6 +46,20 @@ export class TsTest {
     this.startFromFile = startFromFile;
     this.stopAtFile = stopAtFile;
     this.timeoutSeconds = timeoutSeconds;
+
+    // Register runtime adapters
+    this.runtimeRegistry.register(
+      new NodeRuntimeAdapter(this.logger, this.smartshellInstance, this.timeoutSeconds, this.filterTags)
+    );
+    this.runtimeRegistry.register(
+      new ChromiumRuntimeAdapter(this.logger, this.tsbundleInstance, this.smartbrowserInstance, this.timeoutSeconds)
+    );
+    this.runtimeRegistry.register(
+      new DenoRuntimeAdapter(this.logger, this.smartshellInstance, this.timeoutSeconds, this.filterTags)
+    );
+    this.runtimeRegistry.register(
+      new BunRuntimeAdapter(this.logger, this.smartshellInstance, this.timeoutSeconds, this.filterTags)
+    );
   }
 
   async run() {
@@ -175,29 +199,50 @@ export class TsTest {
   }
   
   private async runSingleTest(fileNameArg: string, fileIndex: number, totalFiles: number, tapCombinator: TapCombinator) {
-    switch (true) {
-      case process.env.CI && fileNameArg.includes('.nonci.'):
-        this.logger.tapOutput(`Skipping ${fileNameArg} - marked as non-CI`);
-        break;
-      case fileNameArg.endsWith('.browser.ts') || fileNameArg.endsWith('.browser.nonci.ts'):
-        const tapParserBrowser = await this.runInChrome(fileNameArg, fileIndex, totalFiles);
-        tapCombinator.addTapParser(tapParserBrowser);
-        break;
-      case fileNameArg.endsWith('.both.ts') || fileNameArg.endsWith('.both.nonci.ts'):
-        this.logger.sectionStart('Part 1: Chrome');
-        const tapParserBothBrowser = await this.runInChrome(fileNameArg, fileIndex, totalFiles);
-        tapCombinator.addTapParser(tapParserBothBrowser);
-        this.logger.sectionEnd();
-        
-        this.logger.sectionStart('Part 2: Node');
-        const tapParserBothNode = await this.runInNode(fileNameArg, fileIndex, totalFiles);
-        tapCombinator.addTapParser(tapParserBothNode);
+    // Parse the filename to determine runtimes and modifiers
+    const fileName = plugins.path.basename(fileNameArg);
+    const parsed = parseTestFilename(fileName, { strictUnknownRuntime: false });
+
+    // Check for nonci modifier in CI environment
+    if (process.env.CI && parsed.modifiers.includes('nonci')) {
+      this.logger.tapOutput(`Skipping ${fileNameArg} - marked as non-CI`);
+      return;
+    }
+
+    // Show deprecation warning for legacy naming
+    if (parsed.isLegacy) {
+      console.warn('');
+      console.warn(cs('⚠️  DEPRECATION WARNING', 'orange'));
+      console.warn(cs(`   File: ${fileName}`, 'orange'));
+      console.warn(cs(`   Legacy naming detected. Please migrate to new naming convention.`, 'orange'));
+      console.warn(cs(`   Suggested: ${fileName.replace('.browser.', '.chromium.').replace('.both.', '.node+chromium.')}`, 'green'));
+      console.warn(cs(`   Run: tstest migrate --dry-run`, 'cyan'));
+      console.warn('');
+    }
+
+    // Get adapters for the specified runtimes
+    const adapters = this.runtimeRegistry.getAdaptersForRuntimes(parsed.runtimes);
+
+    if (adapters.length === 0) {
+      this.logger.tapOutput(`Skipping ${fileNameArg} - no runtime adapters available`);
+      return;
+    }
+
+    // Execute tests for each runtime
+    if (adapters.length === 1) {
+      // Single runtime - no sections needed
+      const adapter = adapters[0];
+      const tapParser = await adapter.run(fileNameArg, fileIndex, totalFiles);
+      tapCombinator.addTapParser(tapParser);
+    } else {
+      // Multiple runtimes - use sections
+      for (let i = 0; i < adapters.length; i++) {
+        const adapter = adapters[i];
+        this.logger.sectionStart(`Part ${i + 1}: ${adapter.displayName}`);
+        const tapParser = await adapter.run(fileNameArg, fileIndex, totalFiles);
+        tapCombinator.addTapParser(tapParser);
         this.logger.sectionEnd();
-        break;
-      default:
-        const tapParserNode = await this.runInNode(fileNameArg, fileIndex, totalFiles);
-        tapCombinator.addTapParser(tapParserNode);
-        break;
+      }
     }
   }
 
@@ -319,20 +364,19 @@ import '${absoluteTestFile.replace(/\\/g, '/')}';
   private async findFreePorts(): Promise<{ httpPort: number; wsPort: number }> {
     const smartnetwork = new plugins.smartnetwork.SmartNetwork();
     
-    // Find HTTP port in range 30000-40000
-    const httpPort = await smartnetwork.findFreePort(30000, 40000);
+    // Find random free HTTP port in range 30000-40000 to minimize collision chance
+    const httpPort = await smartnetwork.findFreePort(30000, 40000, { randomize: true });
     if (!httpPort) {
       throw new Error('Could not find a free HTTP port in range 30000-40000');
     }
     
-    // Find WebSocket port in range 30000-40000 (different from HTTP port)
-    let wsPort = await smartnetwork.findFreePort(httpPort + 1, 40000);
+    // Find random free WebSocket port, excluding the HTTP port to ensure they're different
+    const wsPort = await smartnetwork.findFreePort(30000, 40000, { 
+      randomize: true,
+      exclude: [httpPort]
+    });
     if (!wsPort) {
-      // Try again from the beginning of the range if we couldn't find one after httpPort
-      wsPort = await smartnetwork.findFreePort(30000, httpPort - 1);
-      if (!wsPort) {
-        throw new Error('Could not find a free WebSocket port in range 30000-40000');
-      }
+      throw new Error('Could not find a free WebSocket port in range 30000-40000');
     }
     
     // Log selected ports for debugging