@git.zone/tstest 3.1.8 → 3.3.0

package/ts/tstest.classes.tstest.ts

@@ -19,6 +19,14 @@ import { DenoRuntimeAdapter } from './tstest.classes.runtime.deno.js';
 import { BunRuntimeAdapter } from './tstest.classes.runtime.bun.js';
 import { DockerRuntimeAdapter } from './tstest.classes.runtime.docker.js';
 
+// Test file directives
+import {
+  parseDirectivesFromFile,
+  mergeDirectives,
+  directivesToRuntimeOptions,
+  hasDirectives,
+} from './tstest.classes.testfile.directives.js';
+
 export class TsTest {
   public testDir: TestDirectory;
   public executionMode: TestExecutionMode;
@@ -132,7 +140,7 @@ export class TsTest {
   }
   
   public async runWatch(ignorePatterns: string[] = []) {
-    const smartchokInstance = new plugins.smartchok.Smartchok([this.testDir.cwd]);
+    const smartwatchInstance = new plugins.smartwatch.Smartwatch([this.testDir.cwd]);
     
     console.clear();
     this.logger.watchModeStart();
@@ -155,12 +163,12 @@ export class TsTest {
     };
     
     // Start watching before subscribing to events
-    await smartchokInstance.start();
-    
+    await smartwatchInstance.start();
+
     // Subscribe to file change events
-    const changeObservable = await smartchokInstance.getObservableFor('change');
-    const addObservable = await smartchokInstance.getObservableFor('add');
-    const unlinkObservable = await smartchokInstance.getObservableFor('unlink');
+    const changeObservable = await smartwatchInstance.getObservableFor('change');
+    const addObservable = await smartwatchInstance.getObservableFor('add');
+    const unlinkObservable = await smartwatchInstance.getObservableFor('unlink');
     
     const handleFileChange = (changedPath: string) => {
       // Skip if path matches ignore patterns
@@ -194,7 +202,7 @@ export class TsTest {
     // Handle Ctrl+C to exit gracefully
     process.on('SIGINT', async () => {
       this.logger.watchModeStop();
-      await smartchokInstance.stop();
+      await smartwatchInstance.stop();
       process.exit(0);
     });
     
@@ -256,18 +264,32 @@ export class TsTest {
       return;
     }
 
+    // Parse directives from the test file (e.g., // tstest:deno:allowAll)
+    let directives = await parseDirectivesFromFile(fileNameArg);
+
+    // Also check for directives in 00init.ts
+    const testDir = plugins.path.dirname(fileNameArg);
+    const initFile = plugins.path.join(testDir, '00init.ts');
+    const initFileExists = await plugins.smartfsInstance.file(initFile).exists();
+    if (initFileExists) {
+      const initDirectives = await parseDirectivesFromFile(initFile);
+      directives = mergeDirectives(initDirectives, directives);
+    }
+
     // 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);
+      const options = hasDirectives(directives) ? directivesToRuntimeOptions(directives, adapter.id) : undefined;
+      const tapParser = await adapter.run(fileNameArg, fileIndex, totalFiles, options);
       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);
+        const options = hasDirectives(directives) ? directivesToRuntimeOptions(directives, adapter.id) : undefined;
+        const tapParser = await adapter.run(fileNameArg, fileIndex, totalFiles, options);
         tapCombinator.addTapParser(tapParser);
         this.logger.sectionEnd();
       }
@@ -316,8 +338,8 @@ export class TsTest {
     const initFile = plugins.path.join(testDir, '00init.ts');
     let runCommand = `tsrun ${fileNameArg}${tsrunOptions}`;
     
-    const initFileExists = await plugins.smartfile.fs.fileExists(initFile);
-    
+    const initFileExists = await plugins.smartfsInstance.file(initFile).exists();
+
     // If 00init.ts exists, run it first
     if (initFileExists) {
       // Create a temporary loader file that imports both 00init.ts and the test file
@@ -328,7 +350,7 @@ import '${absoluteInitFile.replace(/\\/g, '/')}';
 import '${absoluteTestFile.replace(/\\/g, '/')}';
 `;
       const loaderPath = plugins.path.join(testDir, `.loader_${plugins.path.basename(fileNameArg)}`);
-      await plugins.smartfile.memory.toFs(loaderContent, loaderPath);
+      await plugins.smartfsInstance.file(loaderPath).write(loaderContent);
       runCommand = `tsrun ${loaderPath}${tsrunOptions}`;
     }
 
@@ -339,14 +361,14 @@ import '${absoluteTestFile.replace(/\\/g, '/')}';
       const loaderPath = plugins.path.join(testDir, `.loader_${plugins.path.basename(fileNameArg)}`);
       const cleanup = () => {
         try {
-          if (plugins.smartfile.fs.fileExistsSync(loaderPath)) {
-            plugins.smartfile.fs.removeSync(loaderPath);
+          if (plugins.fs.existsSync(loaderPath)) {
+            plugins.fs.rmSync(loaderPath, { force: true });
           }
         } catch (e) {
           // Ignore cleanup errors
         }
       };
-      
+
       execResultStreaming.childProcess.on('exit', cleanup);
       execResultStreaming.childProcess.on('error', cleanup);
     }
@@ -445,7 +467,8 @@ import '${absoluteTestFile.replace(/\\/g, '/')}';
     const bundleFilePath = plugins.path.join(tsbundleCacheDirPath, bundleFileName);
 
     // lets bundle the test
-    await plugins.smartfile.fs.ensureEmptyDir(tsbundleCacheDirPath);
+    try { await plugins.smartfsInstance.directory(tsbundleCacheDirPath).recursive().delete(); } catch (e) { /* may not exist */ }
+    await plugins.smartfsInstance.directory(tsbundleCacheDirPath).recursive().create();
     await this.tsbundleInstance.build(process.cwd(), fileNameArg, bundleFilePath, {
       bundler: 'esbuild',
     });
@@ -454,15 +477,13 @@ import '${absoluteTestFile.replace(/\\/g, '/')}';
     const { httpPort, wsPort } = await this.findFreePorts();
 
     // lets create a server
-    const server = new plugins.typedserver.servertools.Server({
+    const server = new plugins.typedserver.TypedServer({
       cors: true,
       port: httpPort,
+      serveDir: tsbundleCacheDirPath,
     });
-    server.addRoute(
-      '/test',
-      new plugins.typedserver.servertools.Handler('GET', async (_req, res) => {
-        res.type('.html');
-        res.write(`
+    server.addRoute('/test', 'GET', async () => {
+      return new Response(`
         <html>
           <head>
             <script>
@@ -472,11 +493,8 @@ import '${absoluteTestFile.replace(/\\/g, '/')}';
           </head>
           <body></body>
         </html>
-      `);
-        res.end();
-      })
-    );
-    server.addRoute('/*splat', new plugins.typedserver.servertools.HandlerStatic(tsbundleCacheDirPath));
+      `, { headers: { 'Content-Type': 'text/html' } });
+    });
     await server.start();
 
     // lets handle realtime comms
@@ -640,34 +658,33 @@ import '${absoluteTestFile.replace(/\\/g, '/')}';
     
     try {
       // Delete 00err and 00diff directories if they exist
-      if (plugins.smartfile.fs.isDirectorySync(errDir)) {
-        plugins.smartfile.fs.removeSync(errDir);
+      if (plugins.fs.existsSync(errDir) && plugins.fs.statSync(errDir).isDirectory()) {
+        plugins.fs.rmSync(errDir, { recursive: true, force: true });
       }
-      if (plugins.smartfile.fs.isDirectorySync(diffDir)) {
-        plugins.smartfile.fs.removeSync(diffDir);
+      if (plugins.fs.existsSync(diffDir) && plugins.fs.statSync(diffDir).isDirectory()) {
+        plugins.fs.rmSync(diffDir, { recursive: true, force: true });
       }
-      
+
       // Get all .log files in log directory (not in subdirectories)
-      const files = await plugins.smartfile.fs.listFileTree(logDir, '*.log');
-      const logFiles = files.filter((file: string) => !file.includes('/'));
-      
+      const entries = await plugins.smartfsInstance.directory(logDir).filter('*.log').list();
+      const logFiles = entries.filter((entry) => entry.isFile).map((entry) => entry.name);
+
       if (logFiles.length === 0) {
         return;
       }
-      
+
       // Ensure previous directory exists
-      await plugins.smartfile.fs.ensureDir(previousDir);
-      
+      await plugins.smartfsInstance.directory(previousDir).recursive().create();
+
       // Move each log file to previous directory
-      for (const file of logFiles) {
-        const filename = plugins.path.basename(file);
+      for (const filename of logFiles) {
         const sourcePath = plugins.path.join(logDir, filename);
         const destPath = plugins.path.join(previousDir, filename);
-        
+
         try {
           // Copy file to new location and remove original
-          await plugins.smartfile.fs.copy(sourcePath, destPath);
-          await plugins.smartfile.fs.remove(sourcePath);
+          await plugins.smartfsInstance.file(sourcePath).copy(destPath);
+          await plugins.smartfsInstance.file(sourcePath).delete();
         } catch (error) {
           // Silently continue if a file can't be moved
         }

package/ts/tstest.plugins.ts

@@ -1,7 +1,8 @@
 // node native
+import * as fs from 'fs';
 import * as path from 'path';
 
-export { path };
+export { fs, path };
 
 // @apiglobal scope
 import * as typedserver from '@api.global/typedserver';
@@ -13,25 +14,29 @@ export {
 // @push.rocks scope
 import * as consolecolor from '@push.rocks/consolecolor';
 import * as smartbrowser from '@push.rocks/smartbrowser';
-import * as smartchok from '@push.rocks/smartchok';
 import * as smartdelay from '@push.rocks/smartdelay';
 import * as smartfile from '@push.rocks/smartfile';
+import * as smartfs from '@push.rocks/smartfs';
+const smartfsInstance = new smartfs.SmartFs(new smartfs.SmartFsProviderNode());
 import * as smartlog from '@push.rocks/smartlog';
 import * as smartnetwork from '@push.rocks/smartnetwork';
 import * as smartpromise from '@push.rocks/smartpromise';
 import * as smartshell from '@push.rocks/smartshell';
+import * as smartwatch from '@push.rocks/smartwatch';
 import * as tapbundle from '../dist_ts_tapbundle/index.js';
 
 export {
   consolecolor,
   smartbrowser,
-  smartchok,
   smartdelay,
   smartfile,
+  smartfs,
+  smartfsInstance,
   smartlog,
   smartnetwork,
   smartpromise,
   smartshell,
+  smartwatch,
   tapbundle,
 };