Merge pull request #13 from medishen/dev/v2

feat: Refactor module and context handling with new redirect method a…
medishen · Jan 16, 2025 · 7191af7 · 7191af7
2 parents c32557b + ddb19a0
commit 7191af7
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 47 deletions.
diff --git a/lib/common/interfaces/context.interface.ts b/lib/common/interfaces/context.interface.ts
@@ -1,12 +1,11 @@
 import { Stream } from 'stream';
 import { IncomingMessage, ServerResponse } from 'http';
-import { Context } from 'mocha';
 import { HttpStatus } from '../enums';
 import { GlobalCache, ParsedBody } from '../types';
 import { AppConfig } from './app-settings.interface';
 import { RouteDefinition } from './router.interface';
 import { Application } from '../../core/Application';
-export type ServerRequest = Context & {
+export type ServerRequest = {
   req: IncomingMessage;
   res: ServerResponse;
   status: HttpStatus;

diff --git a/lib/context/context.ts b/lib/context/context.ts
@@ -13,6 +13,7 @@ export class Context {
     this.ctx.send = this.send.bind(this);
     this.ctx.status = this.status;
     this.ctx.language = this.lang;
+    this.ctx.redirect = this.redirect.bind(this);
   }
   get status() {
     return this.ctx.res.statusCode;
@@ -106,4 +107,9 @@ export class Context {
       );
     }
   }
+  redirect(url: string, status: HttpStatus = HttpStatus.MOVED_PERMANENTLY): void {
+    this.status = status;
+    this.res.setHeader('Location', url);
+    this.res.end();
+  }
 }
diff --git a/lib/core/Application.ts b/lib/core/Application.ts
@@ -205,51 +205,11 @@ export class Application {
     return this.settings[key];
   }
 
-  // Create the application instance
   static create(rootModule: Constructor<any>, config?: AppConfig) {
-    const moduleMetadata = Reflector.get(ModuleMetadataKeys.MODULE, rootModule);
-    if (!moduleMetadata) {
-      throw new Error(`The provided class is not a valid module. Ensure it is decorated with @Module.`);
-    }
     const app = new Application(config);
-    // Initialize the injector
-    const injector = Application.injector;
-    // Register all providers from the root module
-    this.registerModuleProviders(rootModule, injector);
 
-    // Resolve and instantiate controllers
-    const controllers = moduleMetadata.controllers || [];
-    controllers.forEach((controller: Constructor<any>) => {
-      const controllerPrefix = Reflector.get(RouterMetadataKeys.CONTROLLER_PREFIX, controller);
-      const routes = Reflector.get(RouterMetadataKeys.ROUTES, controller) || [];
-      const controllerInstance = Application.instantiateController(controller, injector);
-      routes.forEach((route: RouteDefinition) => {
-        route.path = `${controllerPrefix}${route.path}`;
-        route.action = route.action.bind(controllerInstance);
-      });
-    });
+    const injector = Application.injector;
+    injector.initializeModule(rootModule);
     return app;
   }
-  /**
-   * Recursively register providers from the module and its imports.
-   */
-  private static registerModuleProviders(module: Constructor<any>, injector: Injector) {
-    const moduleMetadata = Reflector.get(ModuleMetadataKeys.MODULE, module);
-    if (!moduleMetadata) return;
-
-    // Register module's own providers
-    (moduleMetadata.providers ?? []).forEach((provider: Provider) => {
-      injector.register(provider);
-    });
-
-    // Recursively register imported modules
-    (moduleMetadata.imports ?? []).forEach((importedModule: Constructor<any>) => {
-      this.registerModuleProviders(importedModule, injector);
-    });
-  }
-  private static instantiateController(controller: Constructor<any>, injector: Injector) {
-    const dependencies = Reflector.get(ModuleMetadataKeys.PARAM_DEPENDENCIES, controller) || [];
-    const resolvedDeps = dependencies.map((dep: any) => injector.resolve(dep.param));
-    return new controller(...resolvedDeps);
-  }
 }
diff --git a/lib/decorator/module/Injector.ts b/lib/decorator/module/Injector.ts
@@ -1,5 +1,5 @@
-import { ModuleMetadataKeys } from '../../common/enums';
-import { ClassProvider, ValueProvider, FactoryProvider, ExistingProvider, Constructor } from '../../common/interfaces';
+import { ModuleMetadataKeys, RouterMetadataKeys } from '../../common/enums';
+import { ClassProvider, ValueProvider, FactoryProvider, ExistingProvider, Constructor, RouteDefinition } from '../../common/interfaces';
 import { InjectionToken, Provider } from '../../common/types';
 import Reflector from '../../metadata';
 
@@ -79,4 +79,39 @@ export class Injector {
   private isExistingProvider(provider: Provider): provider is ExistingProvider {
     return (provider as ExistingProvider).useExisting !== undefined;
   }
+  private registerModuleDependencies(module: Constructor<any>) {
+    const moduleMetadata = Reflector.get(ModuleMetadataKeys.MODULE, module);
+    if (!moduleMetadata) return;
+
+    (moduleMetadata.providers ?? []).forEach((provider: Provider) => {
+      this.register(provider);
+    });
+
+    (moduleMetadata.imports ?? []).forEach((importedModule: Constructor<any>) => {
+      this.registerModuleDependencies(importedModule);
+    });
+  }
+  private createControllerInstance(controller: Constructor<any>) {
+    const dependencies = Reflector.get(ModuleMetadataKeys.PARAM_DEPENDENCIES, controller) || [];
+    const resolvedDeps = dependencies.map((dep: any) => this.resolve(dep.param));
+    return new controller(...resolvedDeps);
+  }
+  public initializeModule(rootModule: Constructor<any>) {
+    const moduleMetadata = Reflector.get(ModuleMetadataKeys.MODULE, rootModule);
+    if (!moduleMetadata) {
+      throw new Error(`The provided class is not a valid module. Ensure it is decorated with @Module.`);
+    }
+    this.registerModuleDependencies(rootModule);
+
+    const controllers = moduleMetadata.controllers || [];
+    controllers.forEach((controller: Constructor<any>) => {
+      const controllerPrefix = Reflector.get(RouterMetadataKeys.CONTROLLER_PREFIX, controller);
+      const routes = Reflector.get(RouterMetadataKeys.ROUTES, controller) || [];
+      const controllerInstance = this.createControllerInstance(controller);
+      routes.forEach((route: RouteDefinition) => {
+        route.path = `${controllerPrefix}${route.path}`;
+        route.action = route.action.bind(controllerInstance);
+      });
+    });
+  }
 }
diff --git a/lib/decorator/module/Module.ts b/lib/decorator/module/Module.ts
@@ -25,7 +25,6 @@ export function Inject(token?: InjectionToken): PropertyDecorator & ParameterDec
   const injectCallHasArguments = arguments.length > 0;
   return (target: object, key: string | symbol | undefined, index?: number) => {
     let type = token || Reflector.get(ModuleMetadataKeys.PARAM_DEPENDENCIES, target, key!);
-    console.log('type', type);
 
     if (!type && !injectCallHasArguments) {
       type = Reflector.get(ModuleMetadataKeys.PARAM_DEPENDENCIES, target, key!)?.[index!];