@asenajs/asena 0.1.19 → 0.2.0

package/README.md

@@ -1,7 +1,7 @@
 # Asena
 
 Asena is a NestJS-like IoC web framework built on top of Hono and Bun. It combines the power of dependency injection
-with the performance of Bun runtime and the flexibility of Hono web framework.
+with the performance of Bun runtime and the flexibility of Adapter design system.
 
 ## Documentation
 
@@ -15,16 +15,48 @@ For detailed documentation, please visit [not ready yet](https://asena.sh). Docu
 - **WebSocket Support**: Built-in WebSocket handling capabilities
 - **Middleware System**: Flexible middleware architecture
 - **HTTP Adapters**: Extensible adapter system with Hono as default
+- **Zero Dependencies**: Only uses reflect-metadata for dependency injection
+- **TypeScript Support**: Full TypeScript support with strict mode
+- **Modular Architecture**: Easy to extend and customize
+
+## Installation
+
+```bash
+bun add @asenajs/asena
+```
 
 ## Quick Start
 
+The easiest way to create a new Asena project is using the CLI:
+
+```bash
+# Create a new project
+bun add -D @asenajs/asena-cli
+asena create
+```
+
+This will create a new project with the following structure:
+```
+├── src/
+│ ├── controllers/
+│ │ └── AsenaController.ts
+│ └── index.ts
+├── package.json
+├── tsconfig.json
+├── .eslintrc.js
+├── .eslintignore
+└── .prettierrc.js
+```
+
+Alternatively, you can create a project manually:
+
 First, create a new project using Bun:
 
 ```bash
 bun init
 ```
 
-For decorators working properly, you need to add some settings to your tsconfig. Here is an recommended file:
+For decorators working properly, you need to add some settings to your tsconfig. Here is a recommended file:
 
 ```json
 {
@@ -46,7 +78,7 @@ For decorators working properly, you need to add some settings to your tsconfig.
     "noEmit": true,
 
     // Best practices
-    "strict": false,
+    "strict": true,
     "skipLibCheck": true,
     "noFallthroughCasesInSwitch": true,
 
@@ -61,8 +93,7 @@ For decorators working properly, you need to add some settings to your tsconfig.
 Then, install the required packages:
 
 ```bash
-
-bun add @asenajs/asena hono winston
+bun add @asenajs/asena @asenajs/hono-adapter 
 ```
 
 Add @asenajs/asena-cli to your package. This package provides a CLI for creating and managing Asena projects.
@@ -74,8 +105,6 @@ bun add -D @asenajs/asena-cli
 Then, create a new asena-config.ts file using the CLI:
 
 ```bash
-
-## Creates a asena-config.ts file with default values (requires manual updates). Source folder is 'src'.
 asena init
 ```
 
@@ -86,33 +115,37 @@ Create index.ts file under your src folder:
 
 ```typescript
 // src/index.ts
-const [adapter, serverLogger] = createHonoAdapter(new DefaultLogger());
-await new AsenaServer(adapter, serverLogger).port(3000).start(true);
+import { AsenaServer } from '@asenajs/asena';
+import { DefaultLogger } from "@asenajs/asena/logger";
+import { createHonoAdapter } from '@asenajs/hono-adapter';
+
+const [adapter, logger] = createHonoAdapter(new DefaultLogger());
+await new AsenaServer(adapter)
+  .logger(logger)
+  .port(3000)
+  .start(true);
 ```
 
 To run asena you need at least one controller. Create a new controller:
 
 ```typescript
 // src/controllers/TestController.ts
-import type { Context } from '@asenajs/asena/adapter/hono';
+import type { Context } from '@asenajs/hono-adapter';
 import { Controller } from '@asenajs/asena/server';
 import { Get } from '@asenajs/asena/web';
 
 @Controller('/hello')
 export class TestController {
-
     @Get('/world')
     public async getHello(context: Context) {
         return context.send('Hello World');
     }
-
 }
 ```
 
 Finally, run the project:
 
 ```bash
-
 ## only for fast developing purposes
 asena dev start
 ```
@@ -120,159 +153,46 @@ asena dev start
 ```bash
 ## or you can simply build then run your bundled project
 asena build
-## then go to dist folder and run the project this way it will consume less memory
+## then go to dist folder and run the project this way it will consume less memory and it will be faster.
 bun index.asena.js
 ```
 
-## Example
+## CLI Commands
 
-Here is a simple example of a controller with service and middleware:
+For more information about CLI commands and usage, please visit:
+[Asena CLI Documentation](https://github.com/AsenaJs/Asena-cli/blob/master/README.md)
 
-### Middleware
 
-This middleware sets a value to the context object.
+## Project Structure
 
-```typescript
-// src/middleware/TestMiddleware.ts
-import type { AsenaNextHandler } from '@asenajs/asena/adapter';
-import type { Context, MiddlewareService } from '@asenajs/asena/adapter/hono';
-import { Middleware } from '@asenajs/asena/server';
-
-@Middleware()
-export class TestMiddleware implements MiddlewareService {
-  public handle(context: Context, next: AsenaNextHandler) {
-    context.setValue('testValue', 'test');
-
-    next();
-  }
-}
 ```
-
-### Service
-
-Basic service with a getter and setter.
-
-```typescript
-import { Service } from '@asenajs/asena/server';
-
-@Service()
-export class HelloService {
-  private _foo = 'bar';
-
-  public get foo(): string {
-    return this._foo;
-  }
-
-  public set foo(value: string) {
-    this._foo = value;
-  }
-}
+lib/
+├── adapter/     # HTTP adapter implementations
+├── server/      # Core server functionality
+├── ioc/         # Dependency injection container
+├── utils/       # Utility functions
+├── test/        # Test utilities
+└── logger/      # Logging system
 ```
 
-### Controller
-
-Controller with a GET route that uses the middleware and service.
-
-```typescript
-// src/controller/TestController.ts
-import { type Context, Controller, Get, Inject } from '@asenajs/asena';
-import { HelloService } from '../service/HelloService.ts';
-import { TestMiddleware } from '../middleware/TestMiddleware.ts';
-
-@Controller('/v1')
-export class TestController {
-  @Inject(HelloService)
-  private helloService: HelloService;
-
-  @Get('foo')
-  public async getFoo(context: Context) {
-    return context.send(this.helloService.foo);
-  }
-
-  @Get({ path: 'world', middlewares: [TestMiddleware] })
-  public async getHello(context: Context) {
-    const testValue: string = context.getValue('testValue');
-
-    return context.send(testValue);
-  }
-}
-```
-
-### Index
-
-The main file that starts the server.
-
-```typescript
-// src/index.ts
-import { AsenaServer, createHonoAdapter } from '@asenajs/asena';
-import { DefaultLogger } from '@asenajs/asena/logger';
-
-const [adapter, serverLogger] = createHonoAdapter(new DefaultLogger());
-await new AsenaServer(adapter, serverLogger).port(3000).start(true);
-```
-
-then run
-
-```bash
-asena dev start
-```
-
-You should see the following output:
-
-```text
-
-Build completed successfully.
-2024-11-19 17:58:35 [info]:
-    ___    _____  ______ _   __ ___
-   /   |  / ___/ / ____// | / //   |
-  / /| |  \__ \ / __/  /  |/ // /| |
- / ___ | ___/ // /___ / /|  // ___ |
-/_/  |_|/____//_____//_/ |_//_/  |_|
-
-2024-11-19 17:58:35 [info]:     IoC initialized
-2024-11-19 17:58:35 [info]:     No server services found
-2024-11-19 17:58:35 [info]:     Controller: V1 found
-2024-11-19 17:58:35 [info]:     Successfully registered GET route for PATH: /v1/foo
-2024-11-19 17:58:35 [info]:     Successfully registered GET route for PATH: /v1/world
-2024-11-19 17:58:35 [info]:     No websockets found
-2024-11-19 17:58:35 [info]:     Server started on port 3000
-```
-
-and you see the result on your browser [http://localhost:3000/v1/foo](http://localhost:3000/v1/foo) with "bar" message.
-
-`Note`: For more example, you can check this project [Example](https://github.com/LibirSoft/AsenaExample).
-
 ## Core Concepts
 
 - **Controllers**: Handle incoming requests using decorators
 - **Services**: Business logic containers that can be injected
-- **ServerSrvices**: Server-wide services that can be injected (e.g. Database)
 - **Middleware**: Request/Response interceptors
-- **Adapters**: Framework adapters (default: Hono)
-- **WebSocket**: Real-time communication support
-- **Validators**: Request validation system
-
-## Architecture
-
-Asena follows a modular architecture with:
-
-- IoC Container for dependency management
-- Adapter pattern for framework integration
-- Decorator-based routing system
-- Middleware pipeline
-- WebSocket integration
-- Context management
+- **WebSocket**: Built-in WebSocket support
+- **HTTP Status**: Standard HTTP status codes and utilities
 
 ## Performance
 
-Built on Bun runtime and Hono, Asena provides:
+Built on Bun runtime, Asena provides:
 
 - Fast startup time
 - Low memory footprint
 - Quick request processing
 - Efficient WebSocket handling
 
-and here is the benchmark result of Asena with Hono adapter(Basic hello world example) in every test we used bun to run
+Here is the benchmark result of Asena with Hono adapter (Basic hello world example) in every test we used bun to run
 the project:
 
 ### Performance Comparison (Fastest to Slowest)
@@ -280,7 +200,7 @@ the project:
 | Framework                            | Requests/sec | Latency (avg) | Transfer/sec |
 | ------------------------------------ | ------------ | ------------- | ------------ |
 | Hono                                 | 147,031.08   | 2.69ms        | 18.09MB      |
-| Asena                                | 137,148.80   | 2.89ms        | 16.74MB      |
+| Asena + Hono-adapter                 | 137,148.80   | 2.89ms        | 16.74MB      |
 | NestJS (Bun + Fastify)               | 81,652.05    | 6.01ms        | 13.78MB      |
 | NestJS (Bun)                         | 64,435.83    | 6.14ms        | 11.80MB      |
 | NestJS (Bun + kiyasov/platform-hono) | 45,082.27    | 8.79ms        | 5.55MB       |
@@ -295,3 +215,15 @@ the project:
 > - Running on same hardware
 
 _Note: Lower latency and higher requests/sec indicate better performance_
+
+## Contributing
+
+Contributions are welcome! Please feel free to submit a Pull Request.
+
+## License
+
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+
+## Support
+
+If you encounter any issues or have questions, please open an issue on the [GitHub repository](https://github.com/AsenaJs/Asena/issues).

package/dist/index.d.ts

@@ -1 +1 @@
-export { AsenaServer, createHonoAdapter } from './lib/server';
+export { AsenaServer } from './lib/server';

package/dist/index.js

@@ -1,2 +1,2 @@
-export { AsenaServer, createHonoAdapter } from './lib/server';
+export { AsenaServer } from './lib/server';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC"}

package/dist/lib/adapter/AsenaAdapter.d.ts

@@ -1,5 +1,4 @@
-import type { AsenaServeOptions, ErrorHandler, RouteParams } from './types';
-import type { BaseMiddleware } from '../server/web/types';
+import type { AsenaServeOptions, BaseMiddleware, ErrorHandler, RouteParams } from './types';
 import type { Server } from 'bun';
 import type { AsenaWebsocketAdapter } from './AsenaWebsocketAdapter';
 import type { ServerLogger } from '../logger';

package/dist/lib/adapter/AsenaAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"AsenaAdapter.js","sourceRoot":"","sources":["../../../lib/adapter/AsenaAdapter.ts"],"names":[],"mappings":"AAOA;;;;;;;;;GASG;AACH,MAAM,OAAgB,YAAY;IAEhC;;OAEG;IACa,IAAI,CAAS;IAE7B;;OAEG;IACI,GAAG,CAAI;IAEd;;OAEG;IACI,gBAAgB,CAAM;IAE7B;;OAEG;IACO,IAAI,CAAS;IAEvB;;OAEG;IACO,MAAM,GAAiB,OAAO,CAAC;IAEzC;;;;OAIG;IACH,YAAsB,gBAAqB,EAAE,MAAqB;QAChE,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YAErB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;gBAClC,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,MAAM,CAAC;YACxC,CAAC;QACH,CAAC;IACH,CAAC;CA6CF"}
+{"version":3,"file":"AsenaAdapter.js","sourceRoot":"","sources":["../../../lib/adapter/AsenaAdapter.ts"],"names":[],"mappings":"AAMA;;;;;;;;;GASG;AACH,MAAM,OAAgB,YAAY;IAEhC;;OAEG;IACa,IAAI,CAAS;IAE7B;;OAEG;IACI,GAAG,CAAI;IAEd;;OAEG;IACI,gBAAgB,CAAM;IAE7B;;OAEG;IACO,IAAI,CAAS;IAEvB;;OAEG;IACO,MAAM,GAAiB,OAAO,CAAC;IAEzC;;;;OAIG;IACH,YAAsB,gBAAqB,EAAE,MAAqB;QAChE,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YAErB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;gBAClC,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,MAAM,CAAC;YACxC,CAAC;QACH,CAAC;IACH,CAAC;CA6CF"}

package/dist/lib/adapter/AsenaWebsocketAdapter.d.ts

@@ -1,8 +1,7 @@
 import type { AsenaWebSocketService, WSOptions } from '../server/web/websocket';
 import type { WebSocketHandler } from 'bun';
-import type { WebsocketAdapterParams, WebSocketRegistry } from './types';
+import type { BaseMiddleware, WebsocketAdapterParams, WebSocketRegistry } from './types';
 import type { ServerLogger } from '../logger';
-import type { BaseMiddleware } from '../server/web/types';
 import type { AsenaContext } from './AsenaContext';
 /**
  * Abstract class that provides a base implementation for WebSocket adapters.

package/dist/lib/adapter/AsenaWebsocketAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"AsenaWebsocketAdapter.js","sourceRoot":"","sources":["../../../lib/adapter/AsenaWebsocketAdapter.ts"],"names":[],"mappings":"AAOA;;;;;;;GAOG;AACH,MAAM,OAAgB,qBAAqB;IAEzB,IAAI,CAAS;IAE7B;;;;;;;;OAQG;IACO,WAAW,CAAuB;IAE5C;;;OAGG;IACK,IAAI,CAAI;IAEhB;;;OAGG;IACK,UAAU,CAAmB;IAErC;;;OAGG;IACK,OAAO,GAAiB,OAAO,CAAC;IAExC;;;OAGG;IACH,YAAsB,MAAkC;QACtD,IAAI,CAAC,IAAI,GAAG,MAAM,EAAE,GAAG,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,MAAM,CAAC;IAChC,CAAC;IAwBD,kDAAkD;IAElD;;OAEG;IACH,IAAW,GAAG;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,IAAW,GAAG,CAAC,KAAQ;QACrB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,IAAc,UAAU;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,IAAc,UAAU,CAAC,KAA2B;QAClD,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,IAAW,SAAS,CAAC,KAAuB;QAC1C,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,IAAW,MAAM;QACf,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,IAAW,MAAM,CAAC,KAAmB;QACnC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;CAEF"}
+{"version":3,"file":"AsenaWebsocketAdapter.js","sourceRoot":"","sources":["../../../lib/adapter/AsenaWebsocketAdapter.ts"],"names":[],"mappings":"AAMA;;;;;;;GAOG;AACH,MAAM,OAAgB,qBAAqB;IAEzB,IAAI,CAAS;IAE7B;;;;;;;;OAQG;IACO,WAAW,CAAuB;IAE5C;;;OAGG;IACK,IAAI,CAAI;IAEhB;;;OAGG;IACK,UAAU,CAAmB;IAErC;;;OAGG;IACK,OAAO,GAAiB,OAAO,CAAC;IAExC;;;OAGG;IACH,YAAsB,MAAkC;QACtD,IAAI,CAAC,IAAI,GAAG,MAAM,EAAE,GAAG,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,MAAM,CAAC;IAChC,CAAC;IAwBD,kDAAkD;IAElD;;OAEG;IACH,IAAW,GAAG;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,IAAW,GAAG,CAAC,KAAQ;QACrB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,IAAc,UAAU;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,IAAc,UAAU,CAAC,KAA2B;QAClD,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,IAAW,SAAS,CAAC,KAAuB;QAC1C,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,IAAW,MAAM;QACf,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,IAAW,MAAM,CAAC,KAAmB;QACnC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;CAEF"}

package/dist/lib/{server/web → adapter}/types/ApiParams.d.ts

@@ -1,6 +1,6 @@
-import type { HttpMethod } from '../http';
-import type { AsenaContext } from '../../../adapter';
-import type { MiddlewareClass, ValidatorClass } from "../middleware";
+import type { HttpMethod } from '../../server/web/types';
+import type { AsenaContext } from '../index';
+import type { MiddlewareClass, ValidatorClass } from "../../server/web/middleware";
 /**
  * Interface representing a route configuration.
  *

package/dist/lib/adapter/types/ApiParams.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ApiParams.js","sourceRoot":"","sources":["../../../../lib/adapter/types/ApiParams.ts"],"names":[],"mappings":""}

package/dist/lib/{server/web → adapter}/types/BaseMiddleware.d.ts

@@ -1,6 +1,6 @@
-import type { Class } from '../../types';
+import type { Class } from '../../server/types';
 import type { ApiParams } from './ApiParams';
-import type { AsenaContext, AsenaMiddlewareHandler } from '../../../adapter';
+import type { AsenaContext, AsenaMiddlewareHandler } from '../index';
 /**
  * Interface representing a base middleware.
  *

package/dist/lib/adapter/types/BaseMiddleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BaseMiddleware.js","sourceRoot":"","sources":["../../../../lib/adapter/types/BaseMiddleware.ts"],"names":[],"mappings":"AAiEA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC"}

package/dist/lib/adapter/types/RouteParams.d.ts

@@ -1,7 +1,7 @@
-import type { HttpMethod } from '../../server/web/http';
-import type { BaseMiddleware, BaseValidator } from '../../server/web/types';
+import type { HttpMethod } from '../../server/web/types';
 import type { AsenaHandler } from './AsenaHandler';
 import type { AsenaContext } from '../AsenaContext';
+import type { BaseMiddleware, BaseValidator } from "./BaseMiddleware";
 export interface RouteParams<C extends AsenaContext<any, any>, VS> {
     method: HttpMethod;
     path: string;

package/dist/lib/adapter/types/WebSocketRegistry.d.ts

@@ -1,6 +1,6 @@
 import type { AsenaWebSocketService } from '../../server/web/websocket';
-import type { BaseMiddleware } from '../../server/web/types';
 import type { AsenaContext } from '../AsenaContext';
+import type { BaseMiddleware } from "./BaseMiddleware";
 export interface WebsocketServiceRegistry<C extends AsenaContext<any, any>> {
     socket: AsenaWebSocketService<any>;
     middlewares: BaseMiddleware<C>[];

package/dist/lib/adapter/types/index.d.ts

@@ -6,3 +6,6 @@ export * from './SendOptions';
 export * from './WebsocketAdapterParams';
 export * from './WebSocketRegistry';
 export * from './ServeOptions';
+export * from "./BaseMiddleware";
+export * from "./ApiParams";
+export * from "./AsenaHandler";

package/dist/lib/adapter/types/index.js

@@ -6,4 +6,7 @@ export * from './SendOptions';
 export * from './WebsocketAdapterParams';
 export * from './WebSocketRegistry';
 export * from './ServeOptions';
+export * from "./BaseMiddleware";
+export * from "./ApiParams";
+export * from "./AsenaHandler";
 //# sourceMappingURL=index.js.map

package/dist/lib/adapter/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/adapter/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/adapter/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA"}

package/dist/lib/ioc/Container.d.ts

@@ -20,6 +20,7 @@ export declare class Container {
     private executePostConstructs;
     private injectStrategies;
     private injectDependencies;
+    private getPrototypeChain;
     get services(): {
         [p: string]: ContainerService | ContainerService[];
     };

package/dist/lib/ioc/Container.js

@@ -1,5 +1,5 @@
 import { ComponentConstants } from './constants';
-import { getTypedMetadata } from '../utils/typedMetadata';
+import { getOwnTypedMetadata, getTypedMetadata } from '../utils/typedMetadata';
 export class Container {
     _services = {};
     constructor(services) {
@@ -85,54 +85,82 @@ export class Container {
         return newInstance;
     }
     async executePostConstructs(newInstance, Class) {
-        const postConstructs = getTypedMetadata(ComponentConstants.PostConstructKey, Class);
-        if (!postConstructs) {
-            return;
-        }
-        for (const postConstruct of postConstructs) {
-            await newInstance[postConstruct]();
+        const prototypeChain = this.getPrototypeChain(Class);
+        for (const classInChain of prototypeChain.reverse()) {
+            const postConstructs = getOwnTypedMetadata(ComponentConstants.PostConstructKey, classInChain);
+            if (!postConstructs) {
+                continue;
+            }
+            for (const postConstruct of postConstructs) {
+                await newInstance[postConstruct]();
+            }
         }
     }
     async injectStrategies(newInstance, Class) {
-        const strategyList = getTypedMetadata(ComponentConstants.StrategyKey, Class);
-        for (const [propertyKey, interfaceName] of Object.entries(strategyList)) {
-            if (!interfaceName) {
+        const prototypeChain = this.getPrototypeChain(Class);
+        for (const classInChain of prototypeChain.reverse()) {
+            const strategyList = getOwnTypedMetadata(ComponentConstants.StrategyKey, classInChain);
+            if (!strategyList)
                 continue;
+            for (const [propertyKey, interfaceName] of Object.entries(strategyList)) {
+                if (!interfaceName) {
+                    continue;
+                }
+                if (typeof interfaceName !== 'string') {
+                    throw new Error('interfaceName must be a string');
+                }
+                if (Object.getOwnPropertyDescriptor(newInstance, propertyKey))
+                    continue;
+                const strategy = await this.resolveStrategy(interfaceName);
+                const expression = getOwnTypedMetadata(ComponentConstants.ExpressionKey, classInChain);
+                Object.defineProperty(newInstance, propertyKey, {
+                    get() {
+                        return expression && expression[propertyKey] ? strategy.map((s) => expression[propertyKey](s)) : strategy;
+                    },
+                    enumerable: true,
+                    configurable: true,
+                });
             }
-            if (typeof interfaceName !== 'string') {
-                throw new Error('interfaceName must be a string');
-            }
-            const strategy = await this.resolveStrategy(interfaceName);
-            const expression = getTypedMetadata(ComponentConstants.ExpressionKey, Class);
-            Object.defineProperty(newInstance, propertyKey, {
-                get() {
-                    return expression && expression[propertyKey] ? strategy.map((s) => expression[propertyKey](s)) : strategy;
-                },
-                enumerable: true,
-                configurable: true,
-            });
         }
     }
     async injectDependencies(newInstance, Class) {
-        const deps = getTypedMetadata(ComponentConstants.DependencyKey, Class);
-        for (const [k, name] of Object.entries(deps)) {
-            const instance = await this.resolve(name);
-            if (instance === null) {
-                throw new Error('Instance cant be null ' + name);
-            }
-            if (Array.isArray(instance) && instance.length < 1) {
-                throw new Error('instance error cannot be null');
+        const prototypeChain = this.getPrototypeChain(Class);
+        for (const classInChain of prototypeChain.reverse()) {
+            const deps = getOwnTypedMetadata(ComponentConstants.DependencyKey, classInChain);
+            if (!deps)
+                continue;
+            for (const [k, name] of Object.entries(deps)) {
+                if (Object.getOwnPropertyDescriptor(newInstance, k))
+                    continue;
+                const instance = await this.resolve(name);
+                if (instance === null) {
+                    throw new Error('Instance cant be null ' + name);
+                }
+                if (Array.isArray(instance) && instance.length < 1) {
+                    throw new Error('instance error cannot be null');
+                }
+                const expression = getOwnTypedMetadata(ComponentConstants.ExpressionKey, classInChain);
+                Object.defineProperty(newInstance, k, {
+                    get: () => {
+                        return expression && expression[k] ? expression[k](instance) : instance;
+                    },
+                    enumerable: true,
+                    configurable: true,
+                });
             }
-            const expression = getTypedMetadata(ComponentConstants.ExpressionKey, Class);
-            Object.defineProperty(newInstance, k, {
-                get: () => {
-                    return expression && expression[k] ? expression[k](instance) : instance;
-                },
-                enumerable: true,
-                configurable: true,
-            });
         }
     }
+    getPrototypeChain(Class) {
+        const chain = [];
+        let currentClass = Class;
+        while (currentClass &&
+            currentClass !== Object.prototype &&
+            !currentClass.toString().includes('[native code]')) {
+            chain.push(currentClass);
+            currentClass = Object.getPrototypeOf(currentClass);
+        }
+        return chain;
+    }
     get services() {
         return this._services;
     }

package/dist/lib/ioc/Container.js.map

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