@adaas/a-server 0.0.29 → 0.0.31

package/jest.config.ts

@@ -3,6 +3,7 @@ import type { Config } from '@jest/types';
 // Sync object
 const config: Config.InitialOptions = {
     verbose: true,
+    testTimeout: 30_000,
 
     transform: {
         '^.+\\.tsx?$': 'ts-jest'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaas/a-server",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "description": "A-Server is a powerful server framework designed to work seamlessly with the A-Concept framework. This library provides a robust and flexible server implementation of A-Server, enabling developers to create scalable and efficient server-side applications using the A-Concept architecture.",
   "keywords": [
     "adaas",
@@ -290,14 +290,14 @@
     "build": "tsup --config tsup.config.ts"
   },
   "peerDependencies": {
-    "@adaas/a-concept": "^0.3.16",
+    "@adaas/a-concept": "^0.3.17",
     "@adaas/a-frame": "^0.1.2",
-    "@adaas/a-utils": "^0.3.20"
+    "@adaas/a-utils": "^0.3.23"
   },
   "devDependencies": {
-    "@adaas/a-concept": "^0.3.16",
+    "@adaas/a-concept": "^0.3.17",
     "@adaas/a-frame": "^0.1.2",
-    "@adaas/a-utils": "^0.3.20",
+    "@adaas/a-utils": "^0.3.23",
     "@types/chai": "^4.3.14",
     "@types/jest": "^29.5.12",
     "@types/mocha": "^10.0.6",

package/src/controllers/A-EntityController/A-EntityController.component.ts

@@ -1,11 +1,8 @@
-import { A_Component, A_Context, A_Feature, A_Inject, A_Scope, A_TYPES__Entity_Constructor, ASEID } from "@adaas/a-concept";
+import { A_Component, A_Context, A_Feature, A_Inject, A_Scope, ASEID } from "@adaas/a-concept";
 import { A_Request } from "@adaas/a-server/request/A-Request.entity";
 import { A_ServerRouter } from "@adaas/a-server/router/A-ServerRouter.component";
 import { A_Response } from "@adaas/a-server/response/A-Response.entity";
-import { A_ServerError } from "../../lib/A-Server/A-Server.error";
-import { A_ServerListQueryFilter } from "@adaas/a-server/list-query/A-ServerListQueryFilter.context";
-import { A_ServerEntityList } from "@adaas/a-server/entity-list/A-EntityList.entity";
-import { A_Config } from "@adaas/a-utils/a-config";
+import { A_HttpServerError } from "../../lib/A-Server/A-HttpServer.error";
 
 
 
@@ -14,46 +11,6 @@ export class A_EntityController extends A_Component {
     // =======================================================
     // ================ Method Definition=====================
     // =======================================================
-    @A_ServerRouter.Get({
-        path: '/:type',
-        version: 'v1',
-        prefix: 'a-list'
-    })
-    async list(
-        @A_Inject(A_Request) request: A_Request<any, any, { type: string }>,
-        @A_Inject(A_Response) response: A_Response,
-        @A_Inject(A_Scope) scope: A_Scope,
-        @A_Inject(A_Config) config: A_Config<['A_LIST_ITEMS_PER_PAGE', 'A_LIST_PAGE']>
-    ) {
-
-        const constructor = scope.resolveConstructor(request.params.type);
-
-        if (constructor) {
-
-            const entityList = new A_ServerEntityList({
-                name: request.params.type,
-                scope: scope.name,
-                constructor
-            });
-
-            scope.register(entityList);
-
-            const queryFilter = new A_ServerListQueryFilter(request.query, {
-                itemsPerPage: String(config.get('A_LIST_ITEMS_PER_PAGE') || '10'),
-                page: String(config.get('A_LIST_PAGE') || '1')
-            });
-
-            const queryScope = new A_Scope({
-                fragments: [queryFilter]
-            }).inherit(scope);
-
-            await entityList.load(queryScope);
-
-            response.add('items', entityList.items);
-            response.add('pagination', entityList.pagination);
-        }
-    }
-
 
     @A_Feature.Define({
         name: 'getEntity',
@@ -69,44 +26,29 @@ export class A_EntityController extends A_Component {
         @A_Inject(A_Response) response: A_Response,
         @A_Inject(A_Scope) scope: A_Scope
     ) {
-        // Check if the scope has a manifest and if the entity is allowed to save
-        // if (
-        //     scope.has(A_Manifest) && !scope.resolve(A_Manifest)
-        //         .isAllowed(entity.constructor, 'save')
-        //         .for(entity.constructor as A_TYPES__Entity_Constructor)
-        // )
-        //     return;
-
-
-        console.log('Request params:', request.params);
-
-
-        if (!ASEID.isASEID(request.params.aseid)) {
-            response.add('A_EntityController.load', 'Invalid ASEID');
-            return;
-        }
-
+        if (!ASEID.isASEID(request.params.aseid))
+            throw new A_HttpServerError({
+                status: 400,
+                description: `Invalid ASEID: "${request.params.aseid}"`,
+            });
 
         const aseid = new ASEID(request.params.aseid);
 
         const constructor = scope.resolveConstructor(aseid.entity);
 
+        if (!constructor)
+            throw new A_HttpServerError({
+                status: 404,
+                description: `Entity constructor for ASEID ${request.params.aseid} not found`,
+            });
 
-        if (constructor) {
-            const entity = new constructor(request.params.aseid);
+        const entity = new constructor(request.params.aseid);
 
-            scope.register(entity);
+        scope.register(entity);
 
-            await entity.load();
+        await entity.load();
 
-            return response.status(200).send(entity.toJSON());
-        }
-        else
-            throw new A_ServerError({
-                title: 'Entity Not Found',
-                description: `Entity constructor for ASEID ${request.params.aseid} not found`,
-                status: 404,
-            });
+        return response.status(200).send(entity.toJSON());
     }
 
 
@@ -118,17 +60,22 @@ export class A_EntityController extends A_Component {
     })
     async create(
         @A_Inject(A_Request) request: A_Request<any, any, { aseid: string }>,
+        @A_Inject(A_Response) response: A_Response,
         @A_Inject(A_Scope) scope: A_Scope
     ) {
         const constructor = scope.resolveConstructor(request.params.aseid);
 
-        if (constructor) {
-            const entity = new constructor(request.body);
+        if (!constructor)
+            throw new A_HttpServerError({
+                status: 404,
+                description: `Entity type "${request.params.aseid}" not registered`,
+            });
+
+        const entity = new constructor(request.body);
 
-            scope.register(entity);
+        scope.register(entity);
 
-            await entity.save();
-        }
+        await entity.save();
     }
 
 
@@ -143,20 +90,25 @@ export class A_EntityController extends A_Component {
         @A_Inject(A_Response) response: A_Response,
         @A_Inject(A_Scope) scope: A_Scope
     ) {
-        if (!ASEID.isASEID(request.params.aseid)) {
-            response.add('A_EntityController.update', 'Invalid ASEID');
-            return;
-        }
+        if (!ASEID.isASEID(request.params.aseid))
+            throw new A_HttpServerError({
+                status: 400,
+                description: `Invalid ASEID: "${request.params.aseid}"`,
+            });
 
         const constructor = scope.resolveConstructor(request.params.aseid);
 
-        if (constructor) {
-            const entity = new constructor(request.body);
+        if (!constructor)
+            throw new A_HttpServerError({
+                status: 404,
+                description: `Entity constructor for ASEID ${request.params.aseid} not found`,
+            });
+
+        const entity = new constructor(request.body);
 
-            scope.register(entity);
+        scope.register(entity);
 
-            await entity.save();
-        }
+        await entity.save();
     }
 
 
@@ -170,20 +122,25 @@ export class A_EntityController extends A_Component {
         @A_Inject(A_Response) response: A_Response,
         @A_Inject(A_Scope) scope: A_Scope
     ) {
-        if (!ASEID.isASEID(request.params.aseid)) {
-            response.add('A_EntityController.delete', 'Invalid ASEID');
-            return;
-        }
+        if (!ASEID.isASEID(request.params.aseid))
+            throw new A_HttpServerError({
+                status: 400,
+                description: `Invalid ASEID: "${request.params.aseid}"`,
+            });
 
         const constructor = scope.resolveConstructor(request.params.aseid);
 
-        if (constructor) {
-            const entity = new constructor(request.params.aseid);
+        if (!constructor)
+            throw new A_HttpServerError({
+                status: 404,
+                description: `Entity constructor for ASEID ${request.params.aseid} not found`,
+            });
 
-            scope.register(entity);
+        const entity = new constructor(request.params.aseid);
+
+        scope.register(entity);
 
-            await entity.destroy();
-        }
+        await entity.destroy();
     }
 
 
@@ -202,26 +159,29 @@ export class A_EntityController extends A_Component {
         @A_Inject(A_Response) response: A_Response,
         @A_Inject(A_Scope) scope: A_Scope
     ) {
-        if (!ASEID.isASEID(request.params.aseid)) {
-            response.add('A_EntityController.callEntity', 'Invalid ASEID');
-            return;
-        }
+        if (!ASEID.isASEID(request.params.aseid))
+            throw new A_HttpServerError({
+                status: 400,
+                description: `Invalid ASEID: "${request.params.aseid}"`,
+            });
 
         const constructor = scope.resolveConstructor(request.params.aseid);
 
-        if (!constructor) {
-            response.add('A_EntityController.callEntity', 'Entity not found');
-            return;
-        }
+        if (!constructor)
+            throw new A_HttpServerError({
+                status: 404,
+                description: `Entity constructor for ASEID ${request.params.aseid} not found`,
+            });
 
         const meta = A_Context.meta(constructor);
 
         const targetFeature = meta.features().find(f => f.name === `${constructor.name}.${request.params.action}`);
 
-        if (!targetFeature) {
-            response.add('A_EntityController.callEntity', 'Feature not found');
-            return;
-        }
+        if (!targetFeature)
+            throw new A_HttpServerError({
+                status: 404,
+                description: `Feature "${request.params.action}" not found on entity`,
+            });
 
         const entity = new constructor(request.params.aseid);
 

package/src/controllers/A-ListingController/A-ListingController.component.ts

@@ -1,10 +1,11 @@
-import { A_Component,  A_Feature, A_Inject, A_Scope } from "@adaas/a-concept"
+import { A_Component, A_Feature, A_Inject, A_Scope } from "@adaas/a-concept"
 import { A_Config } from "@adaas/a-utils/a-config";
 import { A_Request } from "@adaas/a-server/request/A-Request.entity";
 import { A_Response } from "@adaas/a-server/response/A-Response.entity";
 import { A_ServerRouter } from "@adaas/a-server/router/A-ServerRouter.component";
 import { A_ServerEntityList } from "@adaas/a-server/entity-list/A-EntityList.entity";
 import { A_ServerListQueryFilter } from "@adaas/a-server/list-query/A-ServerListQueryFilter.context";
+import { A_HttpServerError } from "../../lib/A-Server/A-HttpServer.error";
 
 
 
@@ -26,31 +27,32 @@ export class A_ListingController extends A_Component {
         @A_Inject(A_Config) config: A_Config<['A_LIST_ITEMS_PER_PAGE', 'A_LIST_PAGE']>
     ) {
 
-        const constructor = scope.resolveConstructor(request.params.type);
+        const ctor = scope.resolveConstructor(request.params.type);
 
-        if (constructor) {
-
-            const entityList = new A_ServerEntityList({
-                name: request.params.type,
-                scope: scope.name,
-                constructor
+        if (!ctor)
+            throw new A_HttpServerError({
+                status: 404,
+                description: `Entity type "${request.params.type}" not registered`,
             });
 
-            scope.register(entityList);
+        const entityList = new A_ServerEntityList({
+            entity: ctor,
+        });
 
-            const queryFilter = new A_ServerListQueryFilter(request.query, {
-                itemsPerPage: String(config.get('A_LIST_ITEMS_PER_PAGE') || '10'),
-                page: String(config.get('A_LIST_PAGE') || '1')
-            });
+        scope.register(entityList);
+
+        const queryFilter = new A_ServerListQueryFilter(request.query, {
+            itemsPerPage: String(config.get('A_LIST_ITEMS_PER_PAGE') || '10'),
+            page: String(config.get('A_LIST_PAGE') || '1'),
+        });
 
-            const queryScope = new A_Scope({
-                fragments: [queryFilter]
-            }).inherit(scope);
+        const queryScope = new A_Scope({
+            fragments: [queryFilter],
+        }).inherit(scope);
 
-            await entityList.load(queryScope);
+        await entityList.load(queryScope);
 
-            response.add('items', entityList.items);
-            response.add('pagination', entityList.pagination);
-        }
+        response.add('items', entityList.items);
+        response.add('pagination', entityList.pagination);
     }
 }

package/src/controllers/A-ServerHealthMonitor/A-ServerHealthMonitor.component.ts

@@ -4,6 +4,7 @@ import { A_Request } from "@adaas/a-server/request/A-Request.entity";
 import { A_Response } from "@adaas/a-server/response/A-Response.entity";
 import { A_Config } from "@adaas/a-utils/a-config";
 import { A_ServerLogger } from "@adaas/a-server/logger/A-ServerLogger.component";
+import { A_HttpServerError } from "../../lib/A-Server/A-HttpServer.error";
 import fs from "fs";
 import path from "path";
 
@@ -29,8 +30,17 @@ export class A_ServerHealthMonitor extends A_Component {
     ): Promise<any> {
         const rootFolder = config.get('A_CONCEPT_ROOT_FOLDER') || A_CONCEPT_ENV.A_CONCEPT_ROOT_FOLDER || process.cwd();
         const pkgPath = path.join(rootFolder, 'package.json');
-        const packageJSON = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
 
+        let packageJSON: Record<string, unknown>;
+
+        try {
+            packageJSON = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+        } catch {
+            throw new A_HttpServerError({
+                status: 500,
+                description: `Could not read package.json at "${pkgPath}"`,
+            });
+        }
 
         const exposedProperties: Array<string> = config.get('EXPOSED_PROPERTIES')?.split(',') || [
             'name',

package/src/index.ts

@@ -31,6 +31,8 @@ export * from './lib/A-ServerController/A-ServerController.types';
 // ── lib/A-ServerEntityList ────────────────────────────────────────────────────
 export * from './lib/A-ServerEntityList/A-EntityList.entity';
 export * from './lib/A-ServerEntityList/A-EntityList.types';
+export * from './lib/A-ServerEntityList/A-EntityListPagination.context';
+export * from './lib/A-ServerEntityList/A-EntityListCacheState.context';
 
 // ── lib/A-ServerListQuery ─────────────────────────────────────────────────────
 export * from './lib/A-ServerListQuery/A-ServerListQueryFilter.context';

package/src/lib/A-ServerController/A-ServerController.component.ts

@@ -2,6 +2,7 @@ import { A_Component, A_Container, A_Context, A_Feature, A_Inject, A_Scope } fro
 import { A_ServerRouter } from "@adaas/a-server/router/A-ServerRouter.component";
 import { A_Response } from "@adaas/a-server/response/A-Response.entity";
 import { A_Request } from "@adaas/a-server/request/A-Request.entity";
+import { A_HttpServerError } from "../A-Server/A-HttpServer.error";
 
 
 
@@ -22,14 +23,17 @@ export class A_ServerController extends A_Component {
         @A_Inject(A_Scope) scope: A_Scope
     ) {
 
-        //  check step by step each parameter to ensure they are valid
-
         if (!scope.has(request.params.component))
-            return
+            throw new A_HttpServerError({
+                status: 404,
+                description: `Component "${request.params.component}" not found`,
+            });
 
         if (!request.params.operation || typeof request.params.operation !== 'string')
-            return;
-
+            throw new A_HttpServerError({
+                status: 400,
+                description: 'Missing or invalid "operation" parameter',
+            });
 
         const possibleComponent = scope.resolve(request.params.component);
 
@@ -39,7 +43,10 @@ export class A_ServerController extends A_Component {
             ![A_Component, A_Container]
                 .some(c => possibleComponent instanceof c)
         )
-            return;
+            throw new A_HttpServerError({
+                status: 404,
+                description: `"${request.params.component}" is not a valid component`,
+            });
 
         const component = possibleComponent as A_Component | A_Container;
 
@@ -48,8 +55,10 @@ export class A_ServerController extends A_Component {
         const targetFeature = meta.features().find(f => f.name === `${component.constructor.name}.${request.params.operation}`);
 
         if (!targetFeature)
-            return;
-
+            throw new A_HttpServerError({
+                status: 404,
+                description: `Operation "${request.params.operation}" not found on component "${request.params.component}"`,
+            });
 
         await component.call(request.params.operation, scope);
     }