@adaas/a-server 0.0.5 → 0.0.6

package/dist/src/entities/A_EntityList/A_EntityList.entity.d.ts

@@ -1,26 +1,22 @@
-import { A_Entity, A_TYPES__Entity_JSON } from "@adaas/a-concept";
+import { A_Entity } from "@adaas/a-concept";
 import { A_SERVER_TYPES__A_EntityListConstructor, A_SERVER_TYPES__A_EntityListPagination, A_SERVER_TYPES__A_EntityListSerialized } from "./A_EntityList.entity.types";
 /**
  * A-EntityList
  *
  * Entity that represents a list of entities with pagination of particular type
  */
-export declare class A_EntityList<SerializedEntityType extends A_TYPES__Entity_JSON = A_TYPES__Entity_JSON> extends A_Entity<A_SERVER_TYPES__A_EntityListConstructor, A_SERVER_TYPES__A_EntityListSerialized> {
-    protected _entityConstructor: {
-        new (...args: any[]): A_Entity<any, SerializedEntityType>;
-    };
-    protected _items: Array<A_Entity>;
+export declare class A_EntityList<EntityType extends A_Entity = A_Entity> extends A_Entity<A_SERVER_TYPES__A_EntityListConstructor, A_SERVER_TYPES__A_EntityListSerialized> {
+    protected _entityConstructor: new (...args: any[]) => EntityType;
+    protected _items: Array<EntityType>;
     protected _pagination: A_SERVER_TYPES__A_EntityListPagination;
     /**
      * Returns the entity constructor used for the list
      */
-    get entityConstructor(): {
-        new (...args: any[]): A_Entity<any, SerializedEntityType>;
-    };
+    get entityConstructor(): new (...args: any[]) => EntityType;
     /**
      * Returns the list of items contained in the entity list
      */
-    get items(): Array<A_Entity>;
+    get items(): Array<EntityType>;
     /**
      * Returns pagination information about the entity list
      */
@@ -39,11 +35,11 @@ export declare class A_EntityList<SerializedEntityType extends A_TYPES__Entity_J
      * @param items
      * @param pagination
      */
-    fromList(items: Array<A_Entity> | Array<SerializedEntityType>, pagination?: A_SERVER_TYPES__A_EntityListPagination): void;
+    fromList(items: Array<EntityType> | Array<ReturnType<EntityType['toJSON']>>, pagination?: A_SERVER_TYPES__A_EntityListPagination): void;
     /**
      * Serializes the EntityList to a JSON object
      *
      * @returns
      */
-    toJSON(): A_SERVER_TYPES__A_EntityListSerialized;
+    toJSON(): A_SERVER_TYPES__A_EntityListSerialized<EntityType>;
 }

package/dist/src/entities/A_EntityList/A_EntityList.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"A_EntityList.entity.js","sourceRoot":"","sources":["../../../../src/entities/A_EntityList/A_EntityList.entity.ts"],"names":[],"mappings":";;;AAAA,gDAG0B;AAM1B,4CAAuC;AAIvC;;;;GAIG;AACH,MAAa,YAAuF,SAAQ,oBAG3G;IAHD;;QAMc,WAAM,GAAoB,EAAE,CAAC;QAC7B,gBAAW,GAA2C;YAC5D,KAAK,EAAE,CAAC;YACR,IAAI,EAAE,CAAC;YACP,QAAQ,EAAE,EAAE;SACf,CAAC;IAyFN,CAAC;IAtFG;;OAEG;IACH,IAAI,iBAAiB;QACjB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAKD;;;;OAIG;IACH,OAAO,CAAC,SAAkD;QACtD,IAAI,CAAC,KAAK,GAAG,IAAI,eAAK,CAAC;YACnB,SAAS,EAAE,qBAAS,CAAC,IAAI,CAAC,IAAI;YAC9B,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,QAAQ,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/D,EAAE,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;SACxC,CAAC,CAAC;QAEH,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC,WAA2E,CAAC;IACpH,CAAC;IAID;;;;;;;OAOG;IACH,QAAQ,CACJ,KAAoD,EACpD,UAAmD;QAEnD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC3B,IAAI,IAAI,YAAY,oBAAQ,EAAE,CAAC;gBAC3B,OAAO,IAAI,CAAC;YAChB,CAAC;iBAAM,CAAC;gBACJ,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBACjD,OAAO,MAAM,CAAC;YAClB,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,UAAU,EAAE,CAAC;YACb,IAAI,CAAC,WAAW,GAAG;gBACf,KAAK,EAAE,UAAU,CAAC,KAAK;gBACvB,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,QAAQ,EAAE,UAAU,CAAC,QAAQ;aAChC,CAAA;QACL,CAAC;IACL,CAAC;IAID;;;;OAIG;IACH,MAAM;QACF,uCACO,KAAK,CAAC,MAAM,EAAE,KACjB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EACvC,UAAU,EAAE,IAAI,CAAC,WAAW,IAC/B;IACL,CAAC;CACJ;AApGD,oCAoGC"}
+{"version":3,"file":"A_EntityList.entity.js","sourceRoot":"","sources":["../../../../src/entities/A_EntityList/A_EntityList.entity.ts"],"names":[],"mappings":";;;AAAA,gDAG0B;AAM1B,4CAAuC;AAIvC;;;;GAIG;AACH,MAAa,YAEX,SAAQ,oBAGT;IALD;;QAOc,WAAM,GAAsB,EAAE,CAAC;QAC/B,gBAAW,GAA2C;YAC5D,KAAK,EAAE,CAAC;YACR,IAAI,EAAE,CAAC;YACP,QAAQ,EAAE,EAAE;SACf,CAAC;IAyFN,CAAC;IAtFG;;OAEG;IACH,IAAI,iBAAiB;QACjB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAKD;;;;OAIG;IACH,OAAO,CAAC,SAAkD;QACtD,IAAI,CAAC,KAAK,GAAG,IAAI,eAAK,CAAC;YACnB,SAAS,EAAE,qBAAS,CAAC,IAAI,CAAC,IAAI;YAC9B,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,QAAQ,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/D,EAAE,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;SACxC,CAAC,CAAC;QAEH,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC,WAAiD,CAAC;IAC1F,CAAC;IAID;;;;;;;OAOG;IACH,QAAQ,CACJ,KAAkE,EAClE,UAAmD;QAEnD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC3B,IAAI,IAAI,YAAY,oBAAQ,EAAE,CAAC;gBAC3B,OAAO,IAAkB,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACJ,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBACjD,OAAO,MAAM,CAAC;YAClB,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,UAAU,EAAE,CAAC;YACb,IAAI,CAAC,WAAW,GAAG;gBACf,KAAK,EAAE,UAAU,CAAC,KAAK;gBACvB,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,QAAQ,EAAE,UAAU,CAAC,QAAQ;aAChC,CAAA;QACL,CAAC;IACL,CAAC;IAID;;;;OAIG;IACH,MAAM;QACF,uCACO,KAAK,CAAC,MAAM,EAAE,KACjB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAuC,EAC7E,UAAU,EAAE,IAAI,CAAC,WAAW,IAC/B;IACL,CAAC;CACJ;AArGD,oCAqGC"}

package/dist/src/entities/A_EntityList/A_EntityList.entity.types.d.ts

@@ -9,8 +9,8 @@ export type A_SERVER_TYPES__A_EntityListConstructor = {
 export declare enum A_SERVER_TYPES__A_EntityListEvent {
     Load = "load"
 }
-export type A_SERVER_TYPES__A_EntityListSerialized = {
-    items: A_TYPES__Entity_JSON[];
+export type A_SERVER_TYPES__A_EntityListSerialized<EntityTypes extends A_Entity = A_Entity> = {
+    items: Array<ReturnType<EntityTypes['toJSON']>>;
     type: string;
     pagination: A_SERVER_TYPES__A_EntityListPagination;
 } & A_TYPES__Entity_JSON;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaas/a-server",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "SDK to create a server with ease. Build your backend server with modular structure and use it within or outside the ADAAS ecosystem.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/entities/A_EntityList/A_EntityList.entity.ts

@@ -16,13 +16,14 @@ import { ASEID } from "@adaas/a-utils";
  * 
  * Entity that represents a list of entities with pagination of particular type
  */
-export class A_EntityList<SerializedEntityType extends A_TYPES__Entity_JSON = A_TYPES__Entity_JSON> extends A_Entity<
+export class A_EntityList<
+    EntityType extends A_Entity = A_Entity,
+> extends A_Entity<
     A_SERVER_TYPES__A_EntityListConstructor,
     A_SERVER_TYPES__A_EntityListSerialized
 > {
-
-    protected _entityConstructor!: { new(...args: any[]): A_Entity<any, SerializedEntityType> };
-    protected _items: Array<A_Entity> = [];
+    protected _entityConstructor!: new (...args: any[]) => EntityType;
+    protected _items: Array<EntityType> = [];
     protected _pagination: A_SERVER_TYPES__A_EntityListPagination = {
         total: 0,
         page: 1,
@@ -33,14 +34,14 @@ export class A_EntityList<SerializedEntityType extends A_TYPES__Entity_JSON = A_
     /**
      * Returns the entity constructor used for the list
      */
-    get entityConstructor(): { new(...args: any[]): A_Entity<any, SerializedEntityType> } {
+    get entityConstructor(): new (...args: any[]) => EntityType {
         return this._entityConstructor;
     }
 
     /**
      * Returns the list of items contained in the entity list
      */
-    get items(): Array<A_Entity> {
+    get items(): Array<EntityType> {
         return this._items;
     }
 
@@ -67,7 +68,7 @@ export class A_EntityList<SerializedEntityType extends A_TYPES__Entity_JSON = A_
             id: (new Date()).getTime().toString(),
         });
 
-        this._entityConstructor = newEntity.constructor as { new(...args: any[]): A_Entity<any, SerializedEntityType> };
+        this._entityConstructor = newEntity.constructor as new (...args: any[]) => EntityType;
     }
 
 
@@ -81,12 +82,12 @@ export class A_EntityList<SerializedEntityType extends A_TYPES__Entity_JSON = A_
      * @param pagination 
      */
     fromList(
-        items: Array<A_Entity> | Array<SerializedEntityType>,
+        items: Array<EntityType> | Array<ReturnType<EntityType['toJSON']>>,
         pagination?: A_SERVER_TYPES__A_EntityListPagination
     ) {
         this._items = items.map(item => {
             if (item instanceof A_Entity) {
-                return item;
+                return item as EntityType;
             } else {
                 const entity = new this._entityConstructor(item);
                 return entity;
@@ -109,10 +110,10 @@ export class A_EntityList<SerializedEntityType extends A_TYPES__Entity_JSON = A_
      * 
      * @returns 
      */
-    toJSON(): A_SERVER_TYPES__A_EntityListSerialized {
+    toJSON(): A_SERVER_TYPES__A_EntityListSerialized<EntityType> {
         return {
             ...super.toJSON(),
-            items: this._items.map(i => i.toJSON()),
+            items: this._items.map(i => i.toJSON()) as ReturnType<EntityType['toJSON']>[],
             pagination: this._pagination
         }
     }

package/src/entities/A_EntityList/A_EntityList.entity.types.ts

@@ -11,8 +11,8 @@ export enum A_SERVER_TYPES__A_EntityListEvent {
     Load = 'load',
 }
 
-export type A_SERVER_TYPES__A_EntityListSerialized = {
-    items: A_TYPES__Entity_JSON[],
+export type A_SERVER_TYPES__A_EntityListSerialized<EntityTypes extends A_Entity = A_Entity> = {
+    items: Array<ReturnType<EntityTypes['toJSON']>>,
     type: string,
     pagination: A_SERVER_TYPES__A_EntityListPagination
 } & A_TYPES__Entity_JSON;