fragment-ts 1.0.19 → 1.0.20

package/src/testing/runner.ts

@@ -36,6 +36,12 @@ export class TestRunner {
   private suites: TestSuite[] = [];
   private passed = 0;
   private failed = 0;
+  private errors: Array<{
+    suite: string;
+    test: string;
+    error: string;
+    stack?: string;
+  }> = [];
 
   describe(name: string, fn: () => void): void {
     const suite: TestSuite = {
@@ -71,56 +77,144 @@ export class TestRunner {
   }
 
   async run(): Promise<void> {
-    console.log("\nRunning Fragment Tests\n");
+    console.log("\n🧪 Running Fragment Tests\n");
+
+    if (this.suites.length === 0) {
+      console.log("No test suites found");
+      return;
+    }
 
     for (const suite of this.suites) {
-      console.log(`\nSuite: ${suite.name}`);
+      console.log(`\n📦 ${suite.name}`);
+
+      if (suite.tests.length === 0) {
+        console.log("  (no tests)");
+        continue;
+      }
 
       for (const test of suite.tests) {
         try {
+          // Run beforeEach hooks
           for (const hook of suite.beforeEachHooks) {
             await hook();
           }
 
+          // Run the test
           await test.fn();
 
+          // Run afterEach hooks
           for (const hook of suite.afterEachHooks) {
             await hook();
           }
 
-          console.log(`  PASS ${test.name}`);
+          console.log(`  ✓ ${test.name}`);
           this.passed++;
         } catch (error: any) {
-          console.log(`  FAIL ${test.name}`);
+          console.log(`  ✗ ${test.name}`);
           console.error(`    ${error?.message ?? error}`);
           this.failed++;
+          this.errors.push({
+            suite: suite.name,
+            test: test.name,
+            error: error?.message ?? String(error),
+            stack: error?.stack,
+          });
         }
       }
     }
 
-    console.log(`\nResults: ${this.passed} passed, ${this.failed} failed\n`);
+    // Print summary
+    console.log(
+      `\n\n📊 Results: ${this.passed} passed, ${this.failed} failed\n`,
+    );
 
     if (this.failed > 0) {
+      console.log("❌ Failed Tests:\n");
+      this.errors.forEach((err) => {
+        console.log(`  ${err.suite} > ${err.test}`);
+        console.log(`    ${err.error}\n`);
+      });
       process.exit(1);
+    } else {
+      console.log("✅ All tests passed!\n");
+      process.exit(0);
     }
   }
 
   async loadTestFiles(pattern: string): Promise<void> {
-    const files = await glob(pattern);
+    const files = await glob(pattern, { cwd: process.cwd() });
+
+    if (files.length === 0) {
+      console.log(`No test files found matching pattern: ${pattern}`);
+      return;
+    }
+
+    console.log(`Found ${files.length} test file(s)\n`);
+
+    // Set the global runner before loading any files
+    G.__testRunner = this;
 
     for (const file of files) {
-      require(path.resolve(file));
+      const fullPath = path.resolve(file);
+
+      // Clear require cache for this file to allow hot reloading
+      delete require.cache[fullPath];
+
+      try {
+        require(fullPath);
+      } catch (error: any) {
+        console.error(`Error loading test file ${file}:`, error.message);
+        throw error;
+      }
     }
   }
 }
 
+/* ======================================================
+ * Singleton instance
+ * ====================================================== */
+let runnerInstance: TestRunner | null = null;
+
+export function getTestRunner(): TestRunner {
+  if (!runnerInstance) {
+    runnerInstance = new TestRunner();
+    G.__testRunner = runnerInstance;
+  }
+  return runnerInstance;
+}
+
+export function initTestRunner(): TestRunner {
+  return getTestRunner();
+}
+
+/* ======================================================
+ * Auto-initialization for test environment
+ * ====================================================== */
+// Auto-initialize when in test environment
+if (
+  process.env.NODE_ENV === "test" ||
+  process.argv.some((arg) => arg.includes("test"))
+) {
+  if (!G.__testRunner) {
+    getTestRunner();
+  }
+}
+
 /* ======================================================
  * Global test helpers
  * ====================================================== */
 export function describe(name: string, fn: () => void): void {
   if (!G.__testRunner) {
-    throw new Error("TestRunner not initialized");
+    // Try to auto-initialize
+    getTestRunner();
   }
+
+  if (!G.__testRunner) {
+    throw new Error(
+      "TestRunner not initialized. Make sure to call initTestRunner() or run tests via 'fragment test' command",
+    );
+  }
+
   G.__testRunner.describe(name, fn);
 }
 
@@ -176,21 +270,29 @@ export function expect(actual: any) {
       }
     },
 
-    toThrow() {
+    toThrow(expectedError?: string) {
       if (typeof actual !== "function") {
         throw new Error("toThrow expects a function");
       }
 
       let threw = false;
+      let error = null;
       try {
         actual();
-      } catch {
+      } catch (e: any) {
         threw = true;
+        error = e;
       }
 
       if (!threw) {
         throw new Error("Expected function to throw an error");
       }
+
+      if (expectedError && error?.message !== expectedError) {
+        throw new Error(
+          `Expected error message "${expectedError}" but got "${error?.message}"`,
+        );
+      }
     },
 
     toBeInstanceOf(expected: any) {
@@ -209,9 +311,15 @@ export function expect(actual: any) {
       }
     },
 
-    toHaveProperty(prop: string) {
-      if (actual == null || !(prop in actual)) {
-        throw new Error(`Expected object to have property "${prop}"`);
+    toHaveProperty(property: string, value?: any) {
+      if (actual == null || !(property in actual)) {
+        throw new Error(`Expected object to have property "${property}"`);
+      }
+
+      if (value !== undefined && actual[property] !== value) {
+        throw new Error(
+          `Expected property "${property}" to be ${value} but got ${actual[property]}`,
+        );
       }
     },
 
@@ -240,17 +348,24 @@ export function expect(actual: any) {
 }
 
 /* ======================================================
- * CLI entry
+ * CLI entry (when this file is run directly)
  * ====================================================== */
 if (require.main === module) {
-  const runner = new TestRunner();
-  G.__testRunner = runner;
-
-  runner
-    .loadTestFiles("dist/**/*.spec.js")
-    .then(() => runner.run())
-    .catch((err) => {
-      console.error("Failed to run tests:", err);
+  (async () => {
+    try {
+      const runner = getTestRunner();
+
+      // Auto-detect TypeScript based on arguments
+      const isTsNode = process.argv.some(
+        (arg) => arg.includes("ts-node") || arg.includes("ts-node/register"),
+      );
+      const pattern = isTsNode ? "src/**/*.spec.ts" : "dist/**/*.spec.js";
+
+      await runner.loadTestFiles(pattern);
+      await runner.run();
+    } catch (err: any) {
+      console.error("Failed to run tests:", err.message);
       process.exit(1);
-    });
+    }
+  })();
 }

package/src/web/application.ts

@@ -20,6 +20,7 @@ export class FragmentWebApplication {
     this.container = DIContainer.getInstance();
     this.metadataStorage = MetadataStorage.getInstance();
     this.setupMiddleware();
+    this
   }
 
   private setupMiddleware(): void {