fragment-ts 1.0.18 → 1.0.19

package/changes/1.md

@@ -2,10 +2,12 @@
 
 ## Issues Fixed
 
-### 1. ✅ Test Command Created
+### 1. Test Command Created
+
 **Problem:** No test command existed.
 
 **Solution:** Created `TestCommand` class with full testing support:
+
 - Runs `.spec.ts` files
 - Supports watch mode
 - Auto-detects dev vs prod environment
@@ -13,6 +15,7 @@
 - Shows detailed test results with pass/fail counts
 
 **Usage:**
+
 ```bash
 fragment test                    # Run all tests
 fragment test --watch           # Watch mode
@@ -21,74 +24,84 @@ fragment test --pattern "**/*.spec.ts"  # Custom pattern
 
 ---
 
-### 2. ✅ @Autowired Decorator Fixed
+### 2. @Autowired Decorator Fixed
+
 **Problem:** @Autowired wasn't injecting dependencies properly.
 
 **Root Causes:**
+
 - Metadata wasn't being stored correctly on the prototype
 - DI container wasn't checking the prototype chain for metadata
 - Properties were being checked on instance instead of prototype
 
 **Solution:**
+
 - Fixed `Autowired()` decorator to store metadata on prototype
 - Updated DI container to traverse prototype chain with `getAllPropertyKeys()`
 - Added proper type checking from TypeScript's `design:type` metadata
 - Improved error messages for missing emitDecoratorMetadata
 
 **Now Works:**
+
 ```typescript
 @Service()
 export class UserService {
   @Autowired()
-  private userRepository!: UserRepository;  // ✅ Auto-injected
-  
+  private userRepository!: UserRepository; // Auto-injected
+
   @Autowired()
-  private emailService!: EmailService;      // ✅ Auto-injected
+  private emailService!: EmailService; // Auto-injected
 }
 ```
 
 ---
 
-### 3. ✅ Repository TypeORM Integration Fixed
+### 3. Repository TypeORM Integration Fixed
+
 **Problem:** Repositories couldn't access TypeORM repositories automatically.
 
 **Solution:** Created `@InjectRepository(Entity)` decorator:
+
 - New metadata key: `INJECT_REPOSITORY`
 - DI container resolves TypeORM repositories via `TypeORMModule.getDataSource()`
 - Automatic entity-to-repository mapping
 
 **Now Works:**
+
 ```typescript
 @Repository()
 export class UserRepository {
   @InjectRepository(User)
-  private repo!: Repository<User>;  // ✅ TypeORM repo injected
-  
+  private repo!: Repository<User>; // TypeORM repo injected
+
   async findAll() {
-    return this.repo.find();  // ✅ Direct TypeORM access
+    return this.repo.find(); // Direct TypeORM access
   }
 }
 ```
 
 ---
 
-### 4. ✅ All Injectable Decorators Working
+### 4. All Injectable Decorators Working
+
 **Previously Working:**
-- ✅ @Controller
-- ✅ @Service  
-- ✅ HTTP decorators (@Get, @Post, etc.)
+
+- @Controller
+- @Service
+- HTTP decorators (@Get, @Post, etc.)
 
 **Now Also Working:**
-- ✅ @Injectable - General purpose components
-- ✅ @Repository - Data access with TypeORM integration
-- ✅ @Autowired - Property injection by type
-- ✅ @InjectRepository - TypeORM repository injection
-- ✅ @Inject - Token-based injection
-- ✅ @Value - Environment variable injection
-- ✅ @Qualifier - Bean qualifier
-- ✅ @PostConstruct - Lifecycle hook
-- ✅ @PreDestroy - Cleanup hook
-- ✅ @AutoConfiguration - Conditional beans
+
+- @Injectable - General purpose components
+- @Repository - Data access with TypeORM integration
+- @Autowired - Property injection by type
+- @InjectRepository - TypeORM repository injection
+- @Inject - Token-based injection
+- @Value - Environment variable injection
+- @Qualifier - Bean qualifier
+- @PostConstruct - Lifecycle hook
+- @PreDestroy - Cleanup hook
+- @AutoConfiguration - Conditional beans
 
 ---
 
@@ -97,12 +110,14 @@ export class UserRepository {
 ### DI Container Enhancements
 
 1. **Circular Dependency Detection**
+
    ```typescript
    private constructing: Set<any> = new Set();
    // Detects and throws error for circular deps
    ```
 
 2. **Prototype Chain Traversal**
+
    ```typescript
    private getAllPropertyKeys(obj: any): string[] {
      // Walks entire prototype chain to find all decorated properties
@@ -110,6 +125,7 @@ export class UserRepository {
    ```
 
 3. **TypeORM Repository Resolution**
+
    ```typescript
    private resolveRepository(entity: any): any {
      const dataSource = TypeORMModule.getDataSource();
@@ -124,7 +140,7 @@ export class UserRepository {
 
 5. **Post-Construction Hooks**
    ```typescript
-   if (typeof instance.onInit === 'function') {
+   if (typeof instance.onInit === "function") {
      instance.onInit();
    }
    ```
@@ -134,12 +150,14 @@ export class UserRepository {
 ## New Decorators Added
 
 ### @InjectRepository
+
 ```typescript
 @InjectRepository(User)
 private userRepo!: Repository<User>;
 ```
 
 ### @Optional
+
 ```typescript
 @Optional()
 @Autowired()
@@ -147,6 +165,7 @@ private cache?: CacheService;  // Won't throw if not found
 ```
 
 ### @Lazy
+
 ```typescript
 @Lazy()
 @Autowired()
@@ -154,6 +173,7 @@ private heavyService!: HeavyService;  // Created on first access
 ```
 
 ### @PostConstruct
+
 ```typescript
 @PostConstruct()
 init() {
@@ -162,6 +182,7 @@ init() {
 ```
 
 ### @PreDestroy
+
 ```typescript
 @PreDestroy()
 cleanup() {
@@ -174,21 +195,23 @@ cleanup() {
 ## Testing Infrastructure
 
 ### Test Runner Features
-- ✅ Automatic test file discovery
-- ✅ TypeScript support (ts-node)
-- ✅ Watch mode
-- ✅ Detailed error reporting
-- ✅ Test isolation (fresh DI container per test)
+
+- Automatic test file discovery
+- TypeScript support (ts-node)
+- Watch mode
+- Detailed error reporting
+- Test isolation (fresh DI container per test)
 
 ### Test API
+
 ```typescript
 describe('UserService', () => {
   let service: UserService;
-  
+
   beforeEach(() => {
     // Setup
   });
-  
+
   it('should create user', async () => {
     const user = await service.createUser({...});
     expect(user.name).toBe('Test');
@@ -197,6 +220,7 @@ describe('UserService', () => {
 ```
 
 ### Assertions
+
 - `toBe()` - Strict equality
 - `toEqual()` - Deep equality
 - `toBeTruthy()` / `toBeFalsy()`
@@ -212,19 +236,26 @@ describe('UserService', () => {
 ## Complete Example
 
 ```typescript
-import 'reflect-metadata';
-import { 
-  Controller, Service, Repository, 
-  Get, Post, Body, Param,
-  Autowired, InjectRepository, Value 
-} from 'fragment-ts';
+import "reflect-metadata";
+import {
+  Controller,
+  Service,
+  Repository,
+  Get,
+  Post,
+  Body,
+  Param,
+  Autowired,
+  InjectRepository,
+  Value,
+} from "fragment-ts";
 
 // Entity
 @Entity()
 class User {
   @PrimaryGeneratedColumn()
   id!: number;
-  
+
   @Column()
   name!: string;
 }
@@ -234,7 +265,7 @@ class User {
 class UserRepository {
   @InjectRepository(User)
   private repo!: Repository<User>;
-  
+
   async findAll() {
     return this.repo.find();
   }
@@ -245,22 +276,22 @@ class UserRepository {
 class UserService {
   @Autowired()
   private userRepository!: UserRepository;
-  
-  @Value('${MAX_USERS:100}')
+
+  @Value("${MAX_USERS:100}")
   private maxUsers!: number;
-  
+
   async getUsers() {
     return this.userRepository.findAll();
   }
 }
 
 // Controller with service
-@Controller('/api/users')
+@Controller("/api/users")
 class UserController {
   @Autowired()
   private userService!: UserService;
-  
-  @Get('/')
+
+  @Get("/")
   async getAll() {
     return this.userService.getUsers();
   }
@@ -272,24 +303,27 @@ class UserController {
 ## Migration Guide
 
 ### Before (Broken)
+
 ```typescript
 @Service()
 class MyService {
   @Autowired()
-  private repo: MyRepo;  // ❌ undefined
+  private repo: MyRepo; // ❌ undefined
 }
 ```
 
 ### After (Fixed)
+
 ```typescript
 @Service()
 class MyService {
   @Autowired()
-  private repo!: MyRepo;  // ✅ Auto-injected (note the !)
+  private repo!: MyRepo; // Auto-injected (note the !)
 }
 ```
 
 ### Key Changes Required:
+
 1. Add `!` for definite assignment: `private repo!: MyRepo`
 2. Ensure `emitDecoratorMetadata: true` in tsconfig.json
 3. Import `reflect-metadata` at app entry point
@@ -303,25 +337,25 @@ class MyService {
 fragment-ts/
 ├── src/
 │   ├── cli/
-│   │   ├── cli.ts                    # ✅ Updated with test command
+│   │   ├── cli.ts                    # Updated with test command
 │   │   └── commands/
-│   │       ├── test.command.ts       # ✅ NEW
+│   │       ├── test.command.ts       # NEW
 │   │       ├── diagnostics.command.ts
 │   │       └── ...
 │   ├── core/
 │   │   ├── container/
-│   │   │   └── di-container.ts       # ✅ FIXED
+│   │   │   └── di-container.ts       # FIXED
 │   │   ├── decorators/
-│   │   │   ├── injectable.decorator.ts  # ✅ FIXED
+│   │   │   ├── injectable.decorator.ts  # FIXED
 │   │   │   ├── repository.decorator.ts
 │   │   │   └── ...
 │   │   └── metadata/
-│   │       └── metadata-keys.ts      # ✅ UPDATED
+│   │       └── metadata-keys.ts      # UPDATED
 │   └── typeorm/
 │       └── typeorm-module.ts
 └── examples/
-    ├── complete-app/                 # ✅ NEW
-    └── tests/                        # ✅ NEW
+    ├── complete-app/                 # NEW
+    └── tests/                        # NEW
 ```
 
 ---
@@ -342,40 +376,52 @@ Before running tests, ensure:
 ## Common Issues & Solutions
 
 ### Issue: "Cannot resolve dependency"
+
 **Solution:** Make sure the dependency is registered:
+
 ```typescript
 container.register(MyService);
 ```
 
 ### Issue: "@Autowired returns undefined"
+
 **Solution:** Add `!` for definite assignment and check tsconfig:
+
 ```typescript
 @Autowired()
 private service!: MyService;  // Note the !
 ```
 
 ### Issue: "TypeORM repository is undefined"
+
 **Solution:** Use @InjectRepository instead of @Autowired:
+
 ```typescript
 @InjectRepository(User)  // Not @Autowired()
 private repo!: Repository<User>;
 ```
 
 ### Issue: "Circular dependency detected"
+
 **Solution:** Refactor to break the cycle:
+
 ```typescript
 // Before (circular)
-class A { constructor(private b: B) {} }
-class B { constructor(private a: A) {} }
+class A {
+  constructor(private b: B) {}
+}
+class B {
+  constructor(private a: A) {}
+}
 
 // After (inject via property)
-class A { 
-  @Autowired() 
-  private b!: B; 
+class A {
+  @Autowired()
+  private b!: B;
 }
-class B { 
-  @Autowired() 
-  private a!: A; 
+class B {
+  @Autowired()
+  private a!: A;
 }
 ```
 
@@ -384,16 +430,19 @@ class B {
 ## Next Steps
 
 1. **Run Tests**
+
    ```bash
    fragment test
    ```
 
 2. **Check All Beans**
+
    ```bash
    fragment beans
    ```
 
 3. **Verify Routes**
+
    ```bash
    fragment routes
    ```
@@ -415,6 +464,6 @@ All requested features are now working:
 ✅ @InjectRepository provides TypeORM repository access  
 ✅ All decorators working (@Controller, @Service, @Repository, @Injectable, etc.)  
 ✅ Comprehensive examples and documentation  
-✅ Complete testing infrastructure  
+✅ Complete testing infrastructure
 
-The framework is now fully functional and ready for development!
+The framework is now fully functional and ready for development!

package/dist/cli/commands/init.command.js

@@ -177,7 +177,7 @@ class InitCommand {
                 "migrate:revert": "fragment migrate:revert",
             },
             dependencies: {
-                "fragment-ts": "^1.0.18",
+                "fragment-ts": "^1.0.19",
                 "reflect-metadata": "^0.1.13",
             },
             devDependencies: {

package/dist/testing/runner.d.ts

@@ -1,6 +1,8 @@
 export interface TestSuite {
     name: string;
     tests: Test[];
+    beforeEachHooks: Array<() => void | Promise<void>>;
+    afterEachHooks: Array<() => void | Promise<void>>;
 }
 export interface Test {
     name: string;
@@ -16,11 +18,19 @@ export declare class TestRunner {
 }
 export declare function describe(name: string, fn: () => void): void;
 export declare function it(name: string, fn: () => void | Promise<void>): void;
+export declare function beforeEach(fn: () => void | Promise<void>): void;
+export declare function afterEach(fn: () => void | Promise<void>): void;
 export declare function expect(actual: any): {
     toBe(expected: any): void;
     toEqual(expected: any): void;
     toBeTruthy(): void;
     toBeFalsy(): void;
     toThrow(): void;
+    toBeInstanceOf(expected: any): void;
+    toContain(expected: any): void;
+    toHaveProperty(prop: string): void;
+    toBeNull(): void;
+    toBeUndefined(): void;
+    toHaveLength(expected: number): void;
 };
 //# sourceMappingURL=runner.d.ts.map

package/dist/testing/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/testing/runner.ts"],"names":[],"mappings":"AAiBA,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,IAAI,EAAE,CAAC;CACf;AAED,MAAM,WAAW,IAAI;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChC;AAKD,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,MAAM,CAAK;IAEnB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI;IAgBtC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BpB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAOpD;AAKD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI,CAE3D;AAED,wBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAErE;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,GAAG;mBAEf,GAAG;sBAKA,GAAG;;;;EA0BxB"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/testing/runner.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,eAAe,EAAE,KAAK,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACnD,cAAc,EAAE,KAAK,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;CACnD;AAED,MAAM,WAAW,IAAI;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChC;AAKD,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,MAAM,CAAK;IAEnB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI;IAiCtC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCpB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAOpD;AAKD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI,CAK3D;AAED,wBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAKrE;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAK/D;AAED,wBAAgB,SAAS,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAK9D;AAKD,wBAAgB,MAAM,CAAC,MAAM,EAAE,GAAG;mBAEf,GAAG;sBAMA,GAAG;;;;6BAqCI,GAAG;wBAMR,GAAG;yBAUF,MAAM;;;2BAkBJ,MAAM;EAUhC"}

package/dist/testing/runner.js

@@ -36,6 +36,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestRunner = void 0;
 exports.describe = describe;
 exports.it = it;
+exports.beforeEach = beforeEach;
+exports.afterEach = afterEach;
 exports.expect = expect;
 const path = __importStar(require("path"));
 const glob_1 = require("glob");
@@ -50,34 +52,54 @@ class TestRunner {
         this.failed = 0;
     }
     describe(name, fn) {
-        const suite = { name, tests: [] };
+        const suite = {
+            name,
+            tests: [],
+            beforeEachHooks: [],
+            afterEachHooks: [],
+        };
         this.suites.push(suite);
-        const currentSuite = suite;
         const originalIt = G.it;
+        const originalBeforeEach = G.beforeEach;
+        const originalAfterEach = G.afterEach;
         G.it = (testName, testFn) => {
-            currentSuite.tests.push({ name: testName, fn: testFn });
+            suite.tests.push({ name: testName, fn: testFn });
+        };
+        G.beforeEach = (hook) => {
+            suite.beforeEachHooks.push(hook);
+        };
+        G.afterEach = (hook) => {
+            suite.afterEachHooks.push(hook);
         };
         fn();
         G.it = originalIt;
+        G.beforeEach = originalBeforeEach;
+        G.afterEach = originalAfterEach;
     }
     async run() {
-        console.log('\n🧪 Running Fragment Tests\n');
+        console.log("\nRunning Fragment Tests\n");
         for (const suite of this.suites) {
-            console.log(`\n📦 ${suite.name}`);
+            console.log(`\nSuite: ${suite.name}`);
             for (const test of suite.tests) {
                 try {
+                    for (const hook of suite.beforeEachHooks) {
+                        await hook();
+                    }
                     await test.fn();
-                    console.log(`  ✓ ${test.name}`);
+                    for (const hook of suite.afterEachHooks) {
+                        await hook();
+                    }
+                    console.log(`  PASS ${test.name}`);
                     this.passed++;
                 }
                 catch (error) {
-                    console.log(`  ✗ ${test.name}`);
-                    console.error(`    ${error}`);
+                    console.log(`  FAIL ${test.name}`);
+                    console.error(`    ${error?.message ?? error}`);
                     this.failed++;
                 }
             }
         }
-        console.log(`\n\n📊 Results: ${this.passed} passed, ${this.failed} failed\n`);
+        console.log(`\nResults: ${this.passed} passed, ${this.failed} failed\n`);
         if (this.failed > 0) {
             process.exit(1);
         }
@@ -94,11 +116,32 @@ exports.TestRunner = TestRunner;
  * Global test helpers
  * ====================================================== */
 function describe(name, fn) {
-    G.__testRunner?.describe(name, fn);
+    if (!G.__testRunner) {
+        throw new Error("TestRunner not initialized");
+    }
+    G.__testRunner.describe(name, fn);
 }
 function it(name, fn) {
-    // Implemented dynamically by TestRunner.describe
+    if (!G.it) {
+        throw new Error('"it" must be called inside describe()');
+    }
+    G.it(name, fn);
+}
+function beforeEach(fn) {
+    if (!G.beforeEach) {
+        throw new Error('"beforeEach" must be called inside describe()');
+    }
+    G.beforeEach(fn);
 }
+function afterEach(fn) {
+    if (!G.afterEach) {
+        throw new Error('"afterEach" must be called inside describe()');
+    }
+    G.afterEach(fn);
+}
+/* ======================================================
+ * Expect / Assertions
+ * ====================================================== */
 function expect(actual) {
     return {
         toBe(expected) {
@@ -107,8 +150,10 @@ function expect(actual) {
             }
         },
         toEqual(expected) {
-            if (JSON.stringify(actual) !== JSON.stringify(expected)) {
-                throw new Error(`Expected ${JSON.stringify(actual)} to equal ${JSON.stringify(expected)}`);
+            const a = JSON.stringify(actual);
+            const e = JSON.stringify(expected);
+            if (a !== e) {
+                throw new Error(`Expected ${a} to equal ${e}`);
             }
         },
         toBeTruthy() {
@@ -122,12 +167,54 @@ function expect(actual) {
             }
         },
         toThrow() {
+            if (typeof actual !== "function") {
+                throw new Error("toThrow expects a function");
+            }
+            let threw = false;
             try {
                 actual();
-                throw new Error('Expected function to throw');
             }
             catch {
-                /* expected */
+                threw = true;
+            }
+            if (!threw) {
+                throw new Error("Expected function to throw an error");
+            }
+        },
+        toBeInstanceOf(expected) {
+            if (!(actual instanceof expected)) {
+                throw new Error(`Expected object to be instance of ${expected?.name}`);
+            }
+        },
+        toContain(expected) {
+            if (!Array.isArray(actual) && typeof actual !== "string") {
+                throw new Error("toContain works only on arrays or strings");
+            }
+            if (!actual.includes(expected)) {
+                throw new Error(`Expected ${actual} to contain ${expected}`);
+            }
+        },
+        toHaveProperty(prop) {
+            if (actual == null || !(prop in actual)) {
+                throw new Error(`Expected object to have property "${prop}"`);
+            }
+        },
+        toBeNull() {
+            if (actual !== null) {
+                throw new Error(`Expected ${actual} to be null`);
+            }
+        },
+        toBeUndefined() {
+            if (actual !== undefined) {
+                throw new Error(`Expected ${actual} to be undefined`);
+            }
+        },
+        toHaveLength(expected) {
+            if (actual == null || typeof actual.length !== "number") {
+                throw new Error("toHaveLength works only on arrays or strings");
+            }
+            if (actual.length !== expected) {
+                throw new Error(`Expected length ${expected}, got ${actual.length}`);
             }
         },
     };
@@ -138,6 +225,12 @@ function expect(actual) {
 if (require.main === module) {
     const runner = new TestRunner();
     G.__testRunner = runner;
-    runner.loadTestFiles('dist/**/*.spec.js').then(() => runner.run());
+    runner
+        .loadTestFiles("dist/**/*.spec.js")
+        .then(() => runner.run())
+        .catch((err) => {
+        console.error("Failed to run tests:", err);
+        process.exit(1);
+    });
 }
 //# sourceMappingURL=runner.js.map

package/dist/testing/runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/testing/runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/testing/runner.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fragment-ts",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "Spring Boot-style framework for TypeScript with Express and TypeORM",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/cli/commands/init.command.ts

@@ -169,7 +169,7 @@ export class InitCommand {
         "migrate:revert": "fragment migrate:revert",
       },
       dependencies: {
-        "fragment-ts": "^1.0.18",
+        "fragment-ts": "^1.0.19",
         "reflect-metadata": "^0.1.13",
       },
       devDependencies: {

package/src/testing/runner.ts

@@ -1,6 +1,6 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import { glob } from 'glob';
+import * as fs from "fs";
+import * as path from "path";
+import { glob } from "glob";
 
 /* ======================================================
  * Global augmentation
@@ -8,6 +8,8 @@ import { glob } from 'glob';
 type GlobalWithTestRunner = typeof globalThis & {
   __testRunner?: TestRunner;
   it?: (name: string, fn: () => void | Promise<void>) => void;
+  beforeEach?: (fn: () => void | Promise<void>) => void;
+  afterEach?: (fn: () => void | Promise<void>) => void;
 };
 
 const G = global as GlobalWithTestRunner;
@@ -18,6 +20,8 @@ const G = global as GlobalWithTestRunner;
 export interface TestSuite {
   name: string;
   tests: Test[];
+  beforeEachHooks: Array<() => void | Promise<void>>;
+  afterEachHooks: Array<() => void | Promise<void>>;
 }
 
 export interface Test {
@@ -34,43 +38,67 @@ export class TestRunner {
   private failed = 0;
 
   describe(name: string, fn: () => void): void {
-    const suite: TestSuite = { name, tests: [] };
+    const suite: TestSuite = {
+      name,
+      tests: [],
+      beforeEachHooks: [],
+      afterEachHooks: [],
+    };
+
     this.suites.push(suite);
 
-    const currentSuite = suite;
     const originalIt = G.it;
+    const originalBeforeEach = G.beforeEach;
+    const originalAfterEach = G.afterEach;
 
     G.it = (testName: string, testFn: () => void | Promise<void>) => {
-      currentSuite.tests.push({ name: testName, fn: testFn });
+      suite.tests.push({ name: testName, fn: testFn });
+    };
+
+    G.beforeEach = (hook: () => void | Promise<void>) => {
+      suite.beforeEachHooks.push(hook);
+    };
+
+    G.afterEach = (hook: () => void | Promise<void>) => {
+      suite.afterEachHooks.push(hook);
     };
 
     fn();
 
     G.it = originalIt;
+    G.beforeEach = originalBeforeEach;
+    G.afterEach = originalAfterEach;
   }
 
   async run(): Promise<void> {
-    console.log('\n🧪 Running Fragment Tests\n');
+    console.log("\nRunning Fragment Tests\n");
 
     for (const suite of this.suites) {
-      console.log(`\n📦 ${suite.name}`);
+      console.log(`\nSuite: ${suite.name}`);
 
       for (const test of suite.tests) {
         try {
+          for (const hook of suite.beforeEachHooks) {
+            await hook();
+          }
+
           await test.fn();
-          console.log(`  ✓ ${test.name}`);
+
+          for (const hook of suite.afterEachHooks) {
+            await hook();
+          }
+
+          console.log(`  PASS ${test.name}`);
           this.passed++;
-        } catch (error) {
-          console.log(`  ✗ ${test.name}`);
-          console.error(`    ${error}`);
+        } catch (error: any) {
+          console.log(`  FAIL ${test.name}`);
+          console.error(`    ${error?.message ?? error}`);
           this.failed++;
         }
       }
     }
 
-    console.log(
-      `\n\n📊 Results: ${this.passed} passed, ${this.failed} failed\n`,
-    );
+    console.log(`\nResults: ${this.passed} passed, ${this.failed} failed\n`);
 
     if (this.failed > 0) {
       process.exit(1);
@@ -90,13 +118,36 @@ export class TestRunner {
  * Global test helpers
  * ====================================================== */
 export function describe(name: string, fn: () => void): void {
-  G.__testRunner?.describe(name, fn);
+  if (!G.__testRunner) {
+    throw new Error("TestRunner not initialized");
+  }
+  G.__testRunner.describe(name, fn);
 }
 
 export function it(name: string, fn: () => void | Promise<void>): void {
-  // Implemented dynamically by TestRunner.describe
+  if (!G.it) {
+    throw new Error('"it" must be called inside describe()');
+  }
+  G.it(name, fn);
 }
 
+export function beforeEach(fn: () => void | Promise<void>): void {
+  if (!G.beforeEach) {
+    throw new Error('"beforeEach" must be called inside describe()');
+  }
+  G.beforeEach(fn);
+}
+
+export function afterEach(fn: () => void | Promise<void>): void {
+  if (!G.afterEach) {
+    throw new Error('"afterEach" must be called inside describe()');
+  }
+  G.afterEach(fn);
+}
+
+/* ======================================================
+ * Expect / Assertions
+ * ====================================================== */
 export function expect(actual: any) {
   return {
     toBe(expected: any) {
@@ -104,29 +155,85 @@ export function expect(actual: any) {
         throw new Error(`Expected ${actual} to be ${expected}`);
       }
     },
+
     toEqual(expected: any) {
-      if (JSON.stringify(actual) !== JSON.stringify(expected)) {
-        throw new Error(
-          `Expected ${JSON.stringify(actual)} to equal ${JSON.stringify(expected)}`,
-        );
+      const a = JSON.stringify(actual);
+      const e = JSON.stringify(expected);
+      if (a !== e) {
+        throw new Error(`Expected ${a} to equal ${e}`);
       }
     },
+
     toBeTruthy() {
       if (!actual) {
         throw new Error(`Expected ${actual} to be truthy`);
       }
     },
+
     toBeFalsy() {
       if (actual) {
         throw new Error(`Expected ${actual} to be falsy`);
       }
     },
+
     toThrow() {
+      if (typeof actual !== "function") {
+        throw new Error("toThrow expects a function");
+      }
+
+      let threw = false;
       try {
         actual();
-        throw new Error('Expected function to throw');
       } catch {
-        /* expected */
+        threw = true;
+      }
+
+      if (!threw) {
+        throw new Error("Expected function to throw an error");
+      }
+    },
+
+    toBeInstanceOf(expected: any) {
+      if (!(actual instanceof expected)) {
+        throw new Error(`Expected object to be instance of ${expected?.name}`);
+      }
+    },
+
+    toContain(expected: any) {
+      if (!Array.isArray(actual) && typeof actual !== "string") {
+        throw new Error("toContain works only on arrays or strings");
+      }
+
+      if (!actual.includes(expected)) {
+        throw new Error(`Expected ${actual} to contain ${expected}`);
+      }
+    },
+
+    toHaveProperty(prop: string) {
+      if (actual == null || !(prop in actual)) {
+        throw new Error(`Expected object to have property "${prop}"`);
+      }
+    },
+
+    toBeNull() {
+      if (actual !== null) {
+        throw new Error(`Expected ${actual} to be null`);
+      }
+    },
+
+    toBeUndefined() {
+      if (actual !== undefined) {
+        throw new Error(`Expected ${actual} to be undefined`);
+      }
+    },
+
+    toHaveLength(expected: number) {
+      if (actual == null || typeof actual.length !== "number") {
+        throw new Error("toHaveLength works only on arrays or strings");
+      }
+
+      if (actual.length !== expected) {
+        throw new Error(`Expected length ${expected}, got ${actual.length}`);
       }
     },
   };
@@ -139,5 +246,11 @@ if (require.main === module) {
   const runner = new TestRunner();
   G.__testRunner = runner;
 
-  runner.loadTestFiles('dist/**/*.spec.js').then(() => runner.run());
+  runner
+    .loadTestFiles("dist/**/*.spec.js")
+    .then(() => runner.run())
+    .catch((err) => {
+      console.error("Failed to run tests:", err);
+      process.exit(1);
+    });
 }