@adaas/a-server 0.0.22 → 0.0.24

package/examples/simple-server/commands/SignIn.command.ts

@@ -1,4 +1,5 @@
-import { A_Command } from "@adaas/a-utils";
+import { A_Feature } from "@adaas/a-concept";
+import { A_Command, A_CommandFeatures } from "@adaas/a-utils/a-command";
 
 
 
@@ -7,4 +8,19 @@ export class SignInCommand extends A_Command<{ email: string, password: string }
     static get entity(): string {
         return 'sign-in';
     }
+
+
+    @A_Feature.Extend({
+        name: A_CommandFeatures.onExecute
+    })
+    async logSomething() {
+        console.log('SignInCommand logSomething called');
+
+
+        await new Promise(resolve => {
+            setTimeout(() => {
+                resolve(void 0);
+            }, 10000);
+        })
+    }
 }

package/examples/simple-server/components/Test.controller.ts

@@ -1,9 +1,10 @@
 import { A_Component, A_Feature, A_Inject } from "@adaas/a-concept";
-import { A_Router } from "@adaas/a-server/components/A-Router/A-Router.component";
-import { A_Request } from "@adaas/a-server/entities/A-Request/A-Request.entity";
-import { A_Response } from "@adaas/a-server/entities/A-Response/A-Response.entity";
-import { A_CONSTANTS_A_Command_Features, A_Logger } from "@adaas/a-utils";
+import { A_Request } from "src/lib/A-Request/A-Request.entity";
 import { SignInCommand } from "../commands/SignIn.command";
+import { A_Logger } from "@adaas/a-utils/a-logger";
+import { A_CommandFeatures } from "@adaas/a-utils/a-command";
+import { A_ServerRouter } from "@adaas/a-server/router/A-ServerRouter.component";
+import { A_Response } from "@adaas/a-server/response/A-Response.entity";
 
 
 export class TestController extends A_Component {
@@ -14,7 +15,7 @@ export class TestController extends A_Component {
     //     name: 'test',
     //     invoke: false,
     // })
-    @A_Router.Get({
+    @A_ServerRouter.Get({
         path: '/test',
         version: 'v1',
         prefix: 'test'
@@ -34,7 +35,7 @@ export class TestController extends A_Component {
     @A_Feature.Extend({
         name: 'test',
     })
-    @A_Router.Get('/test')
+    @A_ServerRouter.Get('/test')
     async test2(
         @A_Inject(A_Request) request: A_Request,
         @A_Inject(A_Response) response: A_Response,
@@ -50,7 +51,7 @@ export class TestController extends A_Component {
 
 
     @A_Feature.Extend({
-        name: A_CONSTANTS_A_Command_Features.EXECUTE,
+        name: A_CommandFeatures.onExecute,
         scope: [SignInCommand]
     })
     signIn() {

package/examples/simple-server/components/Users.repository.ts

@@ -1,11 +1,11 @@
-import { A_Component, A_Entity, A_Feature, A_Inject,  A_Scope,  } from "@adaas/a-concept";
+import { A_Component, A_Entity, A_Feature, A_Inject,  A_Scope, A_TYPES__EntityFeatures,  } from "@adaas/a-concept";
 import { User } from "../entities/User/User.entity";
 import { UserJSON } from "../entities/User/User.entity.types";
-import { A_EntityList } from "@adaas/a-server/entities/A_EntityList/A_EntityList.entity";
-import { A_ListQueryFilter } from "@adaas/a-server/context/A-ListQueryFilter/A_ListQueryFilter.context";
-import { A_Command, A_Logger } from "@adaas/a-utils";
-import { A_TYPES__EntityFeatures } from "@adaas/a-concept/dist/src/global/A-Entity/A-Entity.constants";
 import { SignInCommand } from "../commands/SignIn.command";
+import { A_Command } from "@adaas/a-utils/a-command";
+import { A_Logger } from "@adaas/a-utils/a-logger";
+import { A_ServerEntityList } from "@adaas/a-server/entity-list/A-EntityList.entity";
+import { A_ServerListQueryFilter } from "@adaas/a-server/list-query/A-ServerListQueryFilter.context";
 
 
 export class UsersRepository extends A_Component {
@@ -18,16 +18,16 @@ export class UsersRepository extends A_Component {
         }).toJSON(),
         new User({
             id: 2,
-            name: 'John Doe',
-            email: 'joe@doe.com'
+            name: 'mr Smith',
+            email: 'mr.smith@doe.com'
         }).toJSON(),
     ];
 
 
     @A_Feature.Extend({
-        name: 'load',
+        name: A_TYPES__EntityFeatures.LOAD,
         scope: {
-            exclude: [A_EntityList, A_Command, SignInCommand]
+            exclude: [A_ServerEntityList, A_Command, SignInCommand]
         }
     })
     load(
@@ -35,6 +35,8 @@ export class UsersRepository extends A_Component {
         @A_Inject(A_Scope) scope: A_Scope
     ) {
 
+        console.log('Loading user with ASEID:', user.aseid);
+
         const existedUser = this.mockedUsers.find((u) => u.id === user.id);
 
         if (!existedUser) {
@@ -47,13 +49,13 @@ export class UsersRepository extends A_Component {
 
 
     @A_Feature.Extend({
-        name: A_TYPES__EntityFeatures.LOAD,
-        scope: [A_EntityList]
+        name:'load',
+        scope: [A_ServerEntityList]
     })
     list(
-        @A_Inject(A_ListQueryFilter) query: A_ListQueryFilter<['page', 'itemsPerPage']>,
+        @A_Inject(A_ServerListQueryFilter<['page', 'itemsPerPage']>) query: A_ServerListQueryFilter<['page', 'itemsPerPage']>,
         @A_Inject(A_Logger) logger: A_Logger,
-        @A_Inject(A_EntityList<User>) list: A_EntityList<User>
+        @A_Inject(A_ServerEntityList<User>) list: A_ServerEntityList<User>
     ) {
         console.log('Listing users with query:', query);
         console.log('Listing users with query:', list);
@@ -79,7 +81,7 @@ export class UsersRepository extends A_Component {
 
 
     @A_Feature.Extend({
-        name: A_TYPES__EntityFeatures.SAVE
+        name: 'save'
     })
     create(
         @A_Inject(User) user: User
@@ -89,19 +91,19 @@ export class UsersRepository extends A_Component {
 
 
 
-    @A_Feature.Extend({
-        name: A_TYPES__EntityFeatures.DESTROY
-    })
-    delete(
-        @A_Inject(User) user: User
-    ) {
-        const existedUser = this.mockedUsers.find((u) => u.id === user.id);
+    // @A_Feature.Extend({
+    //     name: 'destroy'
+    // })
+    // delete(
+    //     @A_Inject(User) user: User
+    // ) {
+    //     const existedUser = this.mockedUsers.find((u) => u.id === user.id);
 
-        if (!existedUser) {
-            throw new Error('User not found');
-        }
+    //     if (!existedUser) {
+    //         throw new Error('User not found');
+    //     }
 
-        this.mockedUsers = this.mockedUsers.filter((u) => u.id !== user.id);
-    }
+    //     this.mockedUsers = this.mockedUsers.filter((u) => u.id !== user.id);
+    // }
 
 }

package/examples/simple-server/concept.ts

@@ -1,57 +1,38 @@
-import { A_EntityController } from "@adaas/a-server/components/A-EntityController/A-EntityController.component"
-import { A_Router } from "@adaas/a-server/components/A-Router/A-Router.component"
-import { A_Service } from "@adaas/a-server/containers/A-Service/A-Service.container"
-import { User } from "./entities/User/User.entity"
-import { A_ServerLogger } from "@adaas/a-server/components/A-ServerLogger/A_ServerLogger.component"
-import {
-    A_Concept,
-    A_CONSTANTS__DEFAULT_ENV_VARIABLES,
-    A_CONSTANTS__DEFAULT_ENV_VARIABLES_ARRAY,
-} from "@adaas/a-concept"
-import { UsersRepository } from "./components/Users.repository"
-import { TestController } from "./components/Test.controller"
-import { A_ServerHealthMonitor } from "@adaas/a-server/components/A-ServerHealthMonitor/A-ServerHealthMonitor.component"
-import { A_ProxyConfig } from "@adaas/a-server/context/A-ProxyConfig/A_ProxyConfig.context"
-import { A_ServerProxy } from "@adaas/a-server/components/A-ServerProxy/A-ServerProxy.component"
-import { A_ServerCORS } from "@adaas/a-server/components/A-ServerCORS/A_ServerCORS.component"
-import { A_StaticLoader } from "@adaas/a-server/components/A-StaticLoader/A-StaticLoader.component"
-import { A_StaticConfig } from "@adaas/a-server/context/A-StaticConfig/A-StaticConfig.context"
-import { UserDoingComponent } from "./components/UserDoing.component"
-import { A_Controller } from "@adaas/a-server/components/A-Controller/A-Controller.component"
-import { A_ListingController } from "@adaas/a-server/components/A-ListingController/A-ListingController.component"
-import { A_CommandController } from "@adaas/a-server/components/A-CommandController/A-CommandController.component"
-import { SignInCommand } from "./commands/SignIn.command"
-import { A_Config, A_ConfigLoader, A_Polyfill, ConfigReader, ENVConfigReader, FileConfigReader } from "@adaas/a-utils"
+// import { A_CommandController, A_Controller, A_EntityController, A_ListingController, A_ProxyConfig, A_Router, A_ServerCORS, A_ServerHealthMonitor, A_ServerLogger, A_ServerProxy, A_Service, A_StaticConfig, A_StaticLoader } from "../../src"
+import { A_Concept, A_CONSTANTS__DEFAULT_ENV_VARIABLES_ARRAY } from "@adaas/a-concept";
+import { A_EntityController } from "@adaas/a-server/controllers/A-EntityController/A-EntityController.component";
+import { A_ServerLogger } from "@adaas/a-server/logger/A-ServerLogger.component";
+import { A_Config, ENVConfigReader } from "@adaas/a-utils/a-config";
+import { A_Polyfill } from "@adaas/a-utils/a-polyfill";
+import { UsersRepository } from "./components/Users.repository";
+import { TestController } from "./components/Test.controller";
+import { A_ServerHealthMonitor } from "@adaas/a-server/controllers/A-ServerHealthMonitor/A-ServerHealthMonitor.component";
+import { UserDoingComponent } from "./components/UserDoing.component";
+import { A_ServerProxy } from "@adaas/a-server/proxy/A-ServerProxy.component";
+import { A_ProxyConfig } from "@adaas/a-server/proxy/A-ServerProxy.context";
+import { A_StaticLoader } from "@adaas/a-server/static/A-ServerStatic.component";
+import { A_StaticConfig } from "@adaas/a-server/static/A-ServerStatic.context";
+import { A_ServerController } from "@adaas/a-server/controller/A-ServerController.component";
+import { A_ServerCORS } from "@adaas/a-server/middlewares/A-ServerCORS/A_ServerCORS.component";
+import { A_ListingController } from "@adaas/a-server/controllers/A-ListingController/A-ListingController.component";
+import { A_CommandController } from "@adaas/a-server/controllers/A-CommandController/A-CommandController.component";
+import { A_HttpServer } from "@adaas/a-server/server/A-HttpServer.container";
+import { SignInCommand } from "./commands/SignIn.command";
+import { A_ServerRouter } from "@adaas/a-server/router/A-ServerRouter.component";
+import { User } from "./entities/User/User.entity";
 
 
 
-(async () => {
-    const config = new A_Config({
-        variables: [
-            ...A_CONSTANTS__DEFAULT_ENV_VARIABLES_ARRAY,
-            'A_SERVER_PORT', 'A_ROUTER__PARSE_PARAMS_AUTOMATICALLY', 'CONFIG_VERBOSE', 'DEV_MODE'
-        ] as const,
-        defaults: {
-            A_SERVER_PORT: 3000,
-            A_ROUTER__PARSE_PARAMS_AUTOMATICALLY: true,
-            CONFIG_VERBOSE: true,
-            DEV_MODE: true
-        }
-    });
-
-    const SharedConfig = new A_ConfigLoader({
-        components: [
-            ENVConfigReader
-        ],
-        fragments: [config]
-    });
 
+(async () => {
 
-    const Server = new A_Service({
+    const Server = new A_HttpServer({
+        name:'simple-server',
         components: [
             A_Polyfill,
             A_ServerLogger,
-            A_Router,
+            ENVConfigReader,
+            A_ServerRouter,
             A_EntityController,
             UsersRepository,
             TestController,
@@ -59,7 +40,7 @@ import { A_Config, A_ConfigLoader, A_Polyfill, ConfigReader, ENVConfigReader, Fi
             UserDoingComponent,
             A_ServerProxy,
             A_StaticLoader,
-            A_Controller,
+            A_ServerController,
             A_ServerCORS,
             A_ListingController,
             A_CommandController,
@@ -71,7 +52,31 @@ import { A_Config, A_ConfigLoader, A_Polyfill, ConfigReader, ENVConfigReader, Fi
             User
         ],
         fragments: [
-            config
+            new A_Config({
+                variables: [
+                    ...A_CONSTANTS__DEFAULT_ENV_VARIABLES_ARRAY,
+                    'A_SERVER_PORT', 'A_ROUTER__PARSE_PARAMS_AUTOMATICALLY', 'CONFIG_VERBOSE', 'DEV_MODE'
+                ] as const,
+                defaults: {
+                    A_SERVER_PORT: 3000,
+                    A_ROUTER__PARSE_PARAMS_AUTOMATICALLY: true,
+                    CONFIG_VERBOSE: true,
+                    DEV_MODE: true
+                }
+            }),
+            new A_ProxyConfig({
+                '/paths': 'https://adaas.org/index.html',
+                '/assets/.*': 'https://test.com',
+                '/style.css': 'https://test.com'
+            }),
+            new A_StaticConfig(
+                ['./public', './assets'], // Simple directories
+                [ // Custom aliases
+                    { path: '/api-docs', directory: './docs', alias: '/documentation' },
+                    { path: '/assets', directory: './static/assets' },
+                    { path: '/uploads', directory: './user-uploads' }
+                ]
+            )
         ]
     });
 
@@ -91,24 +96,9 @@ import { A_Config, A_ConfigLoader, A_Polyfill, ConfigReader, ENVConfigReader, Fi
 
     const concept = new A_Concept({
         name: 'simple-server-concept',
-        containers: [SharedConfig, Server],
-        components: [A_Polyfill],
-        fragments: [
-            config,
-            new A_ProxyConfig({
-                '/paths': 'https://test.com',
-                '/assets/.*': 'https://test.com',
-                '/style.css': 'https://test.com'
-            }),
-            new A_StaticConfig(
-                ['./public', './assets'], // Simple directories
-                [ // Custom aliases
-                    { path: '/api-docs', directory: './docs', alias: '/documentation' },
-                    { path: '/assets', directory: './static/assets' },
-                    { path: '/uploads', directory: './user-uploads' }
-                ]
-            )
-        ],
+        containers: [Server],
+        components: [],
+        fragments: [],
         entities: []
     });
 

package/examples/simple-server/entities/User/User.entity.ts

@@ -1,4 +1,4 @@
-import { A_Entity, A_Feature, A_Scope, ASEID,  } from "@adaas/a-concept";
+import { A_Entity, A_Feature, A_FormatterHelper, A_IdentityHelper, A_Scope, ASEID, } from "@adaas/a-concept";
 import { NewUser, UserJSON } from "./User.entity.types";
 import { UserDoing } from "examples/simple-server/context/UserDoing.context";
 
@@ -9,6 +9,14 @@ export class User extends A_Entity<NewUser, UserJSON> {
         return 'user';
     }
 
+    static get concept(): string {
+        return 'a-server'
+    }
+
+    static get scope(): string {
+        return 'simple-server';
+    }
+
     email!: string;
     name!: string;
 
@@ -32,7 +40,7 @@ export class User extends A_Entity<NewUser, UserJSON> {
     // })
     async do(scope: A_Scope) {
         console.log('Doing something with user:', this.name);
-        
+
         const doingFragment = new UserDoing();
 
         scope.register(doingFragment);
@@ -42,12 +50,14 @@ export class User extends A_Entity<NewUser, UserJSON> {
 
 
     fromNew(newEntity: NewUser): void {
+
         this.aseid = new ASEID({
-            id: newEntity.id,
-            concept: 'users1',
-            scope: 'users2',
-            entity: 'user3'
-        });
+            concept: User.concept,
+            scope: User.scope,
+            entity: User.entity,
+            id: newEntity.id
+        })
+
 
         this.email = newEntity.email;
         this.name = newEntity.name

package/jest.config.ts

@@ -7,18 +7,32 @@ const config: Config.InitialOptions = {
     transform: {
         '^.+\\.tsx?$': 'ts-jest'
     },
+
+    // Resolve baseUrl-style absolute imports (e.g. "src/lib/A-Server/...")
+    modulePaths: ['<rootDir>'],
+
     moduleNameMapper: {
-        "@adaas/a-server/constants/(.*)": ["<rootDir>/src/constants/$1"],
-        "@adaas/a-server/decorators/(.*)": ["<rootDir>/src/decorators/$1"],
-        "@adaas/a-server/types/(.*)": ["<rootDir>/src/types/$1"],
-        "@adaas/a-server/helpers/(.*)": ["<rootDir>/src/helpers/$1"],
-        "@adaas/a-server/defaults/(.*)": ["<rootDir>/src/defaults/$1"],
+        // Wildcard subpath aliases (match tsconfig paths)
+        "^@adaas/a-server/channels/(.*)$": ["<rootDir>/src/channels/$1"],
+        "^@adaas/a-server/constants/(.*)$": ["<rootDir>/src/constants/$1"],
+        "^@adaas/a-server/controllers/(.*)$": ["<rootDir>/src/controllers/$1"],
+        "^@adaas/a-server/helpers/(.*)$": ["<rootDir>/src/helpers/$1"],
+        "^@adaas/a-server/middlewares/(.*)$": ["<rootDir>/src/middlewares/$1"],
+        "^@adaas/a-server/repositories/(.*)$": ["<rootDir>/src/repositories/$1"],
 
-        "@adaas/a-server/context/(.*)": ["<rootDir>/src/context/$1"],
-        "@adaas/a-server/components/(.*)": ["<rootDir>/src/components/$1"],
-        "@adaas/a-server/containers/(.*)": ["<rootDir>/src/containers/$1"],
-        "@adaas/a-server/entities/(.*)": ["<rootDir>/src/entities/$1"],
-        "@adaas/a-server/channels/(.*)": ["<rootDir>/src/channels/$1"],
+        // Direct lib subpath wildcard aliases (match tsconfig paths)
+        "^@adaas/a-server/request/(.*)$": ["<rootDir>/src/lib/A-Request/$1"],
+        "^@adaas/a-server/response/(.*)$": ["<rootDir>/src/lib/A-Response/$1"],
+        "^@adaas/a-server/server/(.*)$": ["<rootDir>/src/lib/A-Server/$1"],
+        "^@adaas/a-server/controller/(.*)$": ["<rootDir>/src/lib/A-ServerController/$1"],
+        "^@adaas/a-server/entity-list/(.*)$": ["<rootDir>/src/lib/A-ServerEntityList/$1"],
+        "^@adaas/a-server/list-query/(.*)$": ["<rootDir>/src/lib/A-ServerListQuery/$1"],
+        "^@adaas/a-server/logger/(.*)$": ["<rootDir>/src/lib/A-ServerLogger/$1"],
+        "^@adaas/a-server/middleware/(.*)$": ["<rootDir>/src/lib/A-ServerMiddleware/$1"],
+        "^@adaas/a-server/proxy/(.*)$": ["<rootDir>/src/lib/A-ServerProxy/$1"],
+        "^@adaas/a-server/route/(.*)$": ["<rootDir>/src/lib/A-ServerRoute/$1"],
+        "^@adaas/a-server/router/(.*)$": ["<rootDir>/src/lib/A-ServerRouter/$1"],
+        "^@adaas/a-server/static/(.*)$": ["<rootDir>/src/lib/A-ServerStatic/$1"],
     }
 
 };