@adaas/a-concept 0.0.32 → 0.0.34

package/examples/simple/entities/EntityA.entity.ts

@@ -1,15 +1,13 @@
 import { A_Entity } from "@adaas/a-concept/global/A-Entity/A-Entity.class";
 import { A_TYPES__EntityBaseMethods } from "@adaas/a-concept/global/A-Entity/A-Entity.types";
+import { A_Feature } from "index";
 
 
 
-export class EntityA extends A_Entity<any, any, [
-    ...A_TYPES__EntityBaseMethods,
-    'doSomething'
-]> {
-
+export class EntityA extends A_Entity {
 
 
+    @A_Feature.Define()
     async doSomething() {
         await this.call('doSomething');
     }

package/examples/simple-http-server/components/http-request-handler.component.ts

@@ -1,11 +1,13 @@
 import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
+import { A_Feature } from "index";
 
-export class HTTPRequestHandler  extends A_Component {
+export class HTTPRequestHandler extends A_Component {
 
 
 
-    
-
-
+    @A_Feature.Extend()
+    onRequest() {
+        console.log('HTTPRequestHandler -> onRequest()');
+    }
 
 }

package/examples/simple-http-server/concept.ts

@@ -1,31 +1,34 @@
 import { A_Concept } from "@adaas/a-concept/global/A-Concept/A_Concept.class";
 import { HttpServer } from "./containers/http-server.container";
+import { A_Config } from "@adaas/a-concept/base/A-Config/A-Config.context";
+import { HTTPErrorHandler } from "./components/http-error-handler.component";
+import { HTTPRequestHandler } from "./components/http-request-handler.component";
 
 
 (async () => {
-    // const simpleConcept = new A_Concept({
-    //     // name: 'test-server',
-    //     // // import: [
-    //     // //     server1,
-    //     // //     server2
-    //     // // ],
-    //     // containers: [
-    //     //     new DefaultHttpServer({
-    //     //         components: []
-    //     //     })
-    //     // ],
-    //     // context: [
-    //     //     new HttpServer({
-    //     //         port: 3000
-    //     //     }),
-    //     //     new HttpServer({
-    //     //         port: 3001
-    //     //     })
-    //     // ],
-    // })
+    const simpleConcept = new A_Concept({
+        name: 'test-server',
 
+        containers: [
+            new HttpServer({
+                components: [
+                    HTTPErrorHandler,
+                    HTTPRequestHandler
+                ]
+            })
+        ],
+        fragments: [
+            new A_Config({
+                variables: ['PORT'],
+                defaults: {
+                    PORT: 3030,
+                }
+            })
+        ],
+    })
 
 
-    // await simpleConcept.run();
+
+    await simpleConcept.start();
 
 })();

package/examples/simple-http-server/containers/http-server.container.ts

@@ -1,7 +1,6 @@
 import { A_Container } from "@adaas/a-concept/global/A-Container/A-Container.class";
 import { createServer, IncomingMessage, Server, ServerResponse } from "http";
 import { A_Inject } from "@adaas/a-concept/decorators/A-Inject/A-Inject.decorator";
-// import { A_Feature } from "@adaas/a-concept/decorators/A-Feature/A-Feature.decorator";
 import { A_Concept } from "@adaas/a-concept/global/A-Concept/A_Concept.class";
 import { A_Config } from "@adaas/a-concept/base/A-Config/A-Config.context";
 import { A_Feature } from "@adaas/a-concept/global/A-Feature/A-Feature.class";
@@ -11,7 +10,7 @@ import { HTTPRequest } from "../contexts/http-request.context";
 
 
 
-export class HttpServer extends A_Container<['start', 'stop', 'onRequest']> {
+export class HttpServer extends A_Container {
 
     server!: Server
     port!: number
@@ -36,7 +35,9 @@ export class HttpServer extends A_Container<['start', 'stop', 'onRequest']> {
     }
 
 
-    @A_Feature.Define()
+    @A_Feature.Define({
+       invoke: false
+    })
     async onRequest(
         req: IncomingMessage,
         res: ServerResponse

package/index.ts

@@ -6,6 +6,9 @@
 export { A_Context } from './src/global/A-Context/A-Context.class';
 // export * from './src/global/A-Context/A-Context.types';
 
+export { A_Abstraction } from './src/global/A-Abstraction/A-Abstraction.class';
+export * from './src/global/A-Abstraction/A-Abstraction.types';
+
 export { A_Concept } from './src/global/A-Concept/A_Concept.class';
 export { A_ConceptMeta } from './src/global/A-Concept/A_Concept.meta';
 export * from './src/global/A-Concept/A_Concept.types';
@@ -53,7 +56,7 @@ export { A_Feature_Define } from './src/decorators/A-Feature/A-Feature-Define.de
 export { A_Feature_Extend } from './src/decorators/A-Feature/A-Feature-Extend.decorator';
 export * from './src/decorators/A-Feature/A-Feature.decorator.types';
 
-export { A_Abstraction } from './src/decorators/A-Abstraction/A-Abstraction.decorator';
+export { A_Abstraction_Extend } from './src/decorators/A-Abstraction/A-Abstraction-Extend.decorator';
 export * from './src/decorators/A-Abstraction/A-Abstraction.decorator.types';
 
 export { A_Connect } from './src/decorators/A-Connect/A-Connect.decorator';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaas/a-concept",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "A-Concept is a framework to build new Applications within or outside the ADAAS ecosystem. This framework is designed to be modular structure regardless environment and program goal.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -22,12 +22,16 @@
   "scripts": {
     "test": "jest",
     "start": "nodemon ./tests/log.ts",
+    "example:simple": "nodemon ./examples/simple/concept.ts",
+    "example:simple:trace": "node -r tsconfig-paths/register -r ts-node/register -r ./trace-require.js ./examples/simple/concept.ts",
+    "example:http": "nodemon ./examples/simple-http-server/concept.ts",
+    "example:http:trace": "node -r tsconfig-paths/register -r ts-node/register -r ./trace-require.js ./examples/simple-http-server/concept.ts",
     "publish": "npm run build && git add . && git commit -m \"new version created :: $(cat package.json | grep version | head -1  | awk -F: '{ print $2 }'  | sed 's/[\",]//g')\" && npm version patch && npm publish --access public",
     "preversion": "echo test",
     "version": "echo git add .",
     "postversion": "git push --no-verify && git push --tags --no-verify && echo \"\n======Version Pushed Successfully=====\n\" ",
     "echo-version": "echo $npm_package_version",
-    "build": "tsc --declaration --project tsconfig.json && tscpaths -p tsconfig.json -s ./ -o ./dist && rm -r ./dist/tests",
+    "build": "rm -rf ./dist && tsc --declaration --project tsconfig.build.json && tscpaths -p tsconfig.build.json -s ./ -o ./dist",
     "test:simple": "nodemon ./examples/simple/concept.ts"
   },
   "repository": {

package/src/base/A-Config/A-Config.container.ts

@@ -1,6 +1,5 @@
 import { A_Container } from "@adaas/a-concept/global/A-Container/A-Container.class";
 import { ConfigReader } from "./components/ConfigReader.component";
-import { A_Logger } from "../A-Logger/A-Logger.component";
 import { A_Inject } from "@adaas/a-concept/decorators/A-Inject/A-Inject.decorator";
 import { A_Polyfills } from "@adaas/a-utils";
 import { A_Context } from "@adaas/a-concept/global/A-Context/A-Context.class";
@@ -9,14 +8,20 @@ import { ENVConfigReader } from "./components/ENVConfigReader.component";
 import { A_Scope } from "@adaas/a-concept/global/A-Scope/A-Scope.class";
 import { A_Concept } from "@adaas/a-concept/global/A-Concept/A_Concept.class";
 import { A_Config } from "./A-Config.context";
+import { A_TYPES__ContainerConstructor } from "@adaas/a-concept/global/A-Container/A-Container.types";
 
 
+export class A_ConfigLoader extends A_Container {
 
+    private reader!: ConfigReader
 
 
-export class A_ConfigLoader extends A_Container<['load', 'read']> {
-
-    private reader!: ConfigReader
+    constructor(params:Partial<A_TYPES__ContainerConstructor<['load', 'read']>>) {
+        super({
+            ...params,
+            name:params.name || 'a-config-loader'
+        });
+    }
 
 
     @A_Concept.Load()
@@ -50,6 +55,7 @@ export class A_ConfigLoader extends A_Container<['load', 'read']> {
     @A_Concept.Load()
     async readVariables(
         @A_Inject(A_Config) config: A_Config,
+        @A_Inject(A_Scope) scope: A_Scope,
     ) {
         await this.reader.inject(config);
     }
@@ -58,4 +64,6 @@ export class A_ConfigLoader extends A_Container<['load', 'read']> {
 
 
 
+
+
 const foo = new A_ConfigLoader({});

package/src/base/A-Config/components/ConfigReader.component.ts

@@ -1,11 +1,9 @@
+import { A_Context } from "@adaas/a-concept/global/A-Context/A-Context.class";
 import { A_Scope } from "@adaas/a-concept/global/A-Scope/A-Scope.class";
 import { A_Inject } from "@adaas/a-concept/decorators/A-Inject/A-Inject.decorator";
 import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
-import { A_Polyfills } from "@adaas/a-utils";
-import { A_Concept } from "@adaas/a-concept/global/A-Concept/A_Concept.class";
 import { A_Config } from "../A-Config.context";
-
-
+import { A_Concept } from "@adaas/a-concept/global/A-Concept/A_Concept.class";
 
 /**
  * Config Reader
@@ -21,8 +19,9 @@ export class ConfigReader extends A_Component {
 
     @A_Concept.Load()
     async inject(
-        @A_Inject(A_Config) config: A_Config
+        @A_Inject(A_Config) config: A_Config,
     ) {
+
         const data = this.read(config.CONFIG_PROPERTIES);
 
         config.set(data);

package/src/base/A-Config/components/FileConfigReader.component.ts

@@ -1,8 +1,6 @@
 import { A_CommonHelper, A_Polyfills } from "@adaas/a-utils";
 import { ConfigReader } from "./ConfigReader.component";
 
-
-
 export class FileConfigReader extends ConfigReader {
 
     private FileData: Map<string, any> = new Map<string, any>();

package/src/base/A-Errors/A-Error.entity.ts

@@ -5,6 +5,6 @@ import { A_Entity } from "@adaas/a-concept/global/A-Entity/A-Entity.class";
 export class A_Error extends A_Entity {
 
 
-    
+
 
 } 

package/src/base/A-Errors/A-Errors.component.ts

@@ -33,7 +33,7 @@ export class A_ErrorsManager extends A_Component {
             // In case of error code
             case typeof param === 'string':
                 const template = this.errors.get(param);
-                const namedCode = `${A_Context.root}@${this.scope.name}:error:${template.code}`
+                const namedCode = `${A_Context.root.name}@${this.scope.name}:error:${template.code}`
 
                 if ('serverCode' in template)
                     throw new A_ServerError({
@@ -67,13 +67,13 @@ export class A_ErrorsManager extends A_Component {
 
         switch (true) {
             case error instanceof A_Error:
-                let newCode = `${A_Context.root}@${this.scope.name}:error:${error.code}`;
+                let newCode = `${A_Context.root.name}@${this.scope.name}:error:${error.code}`;
 
                 if (ASEID.isASEID(error.code)) {
                     const aseid = new ASEID(error.code);
 
                     if (aseid.scope !== this.scope.name)
-                        newCode = `${A_Context.root}@${this.scope.name}:error:${aseid.id}`;
+                        newCode = `${A_Context.root.name}@${this.scope.name}:error:${aseid.id}`;
                 }
 
                 if ('serverCode' in error)

package/src/base/A-Errors/A-Errors.context.ts

@@ -8,6 +8,8 @@ export class A_Errors extends A_Fragment {
 
     protected registeredErrors: Map<string, A_TYPES__Error | A_TYPES__ServerError> = new Map();
 
+
+    
     constructor(
         params: Partial<A_TYPES__A_ErrorsConstructor>
     ) {
@@ -76,7 +78,6 @@ export class A_Errors extends A_Fragment {
      * 
      * This method throws an error by its code.
      * 
-     * @param code 
      */
     // throw(code: A_CONSTANTS__ERROR_CODES | string): never {
     //     const template = this.get(code);

package/src/base/A-Logger/A-Logger.component.ts

@@ -5,7 +5,6 @@ import { A_Scope } from "@adaas/a-concept/global/A-Scope/A-Scope.class";
 import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
 
 
-
 export class A_Logger extends A_Component {
 
     constructor(

package/src/decorators/A-Abstraction/{A-Abstraction.decorator.ts → A-Abstraction-Extend.decorator.ts}

@@ -12,7 +12,6 @@ import { A_ComponentMeta } from "@adaas/a-concept/global/A-Component/A-Component
 import { A_Meta } from "@adaas/a-concept/global/A-Meta/A-Meta.class";
 import { A_TYPES__A_ExtendDecoratorConfig } from "../A-Feature/A-Feature.decorator.types";
 
-
 /**
  * A_Stage Decorator uses to extend basic A-Concept Stage methods inside Containers.
  * 
@@ -21,12 +20,12 @@ import { A_TYPES__A_ExtendDecoratorConfig } from "../A-Feature/A-Feature.decorat
  * @param params 
  * @returns 
  */
-export function A_Abstraction(
+export function A_Abstraction_Extend(
     method: A_TYPES__ConceptStage,
     config: Partial<A_TYPES__A_ExtendDecoratorConfig> = {}
 ) {
     return function (
-        target: A_Container<any> | A_Component,
+        target: A_Container | A_Component,
         propertyKey: string,
         descriptor: A_TYPES__A_AbstractionDecoratorDescriptor
     ) {
@@ -35,7 +34,7 @@ export function A_Abstraction(
 
         let metaKey;
 
-        const StageKey = `CONCEPT_ABSTRACTION::${method}`;
+        const abstractionKey = `${method}`;
 
         switch (true) {
             case target instanceof A_Container:
@@ -54,7 +53,7 @@ export function A_Abstraction(
         }> = meta.get(metaKey) || new A_Meta();
 
         // Set the metadata of the method to define a custom Stage with name
-        const existedMetaValue = existedMeta.get(StageKey) || [];
+        const existedMetaValue = existedMeta.get(abstractionKey) || [];
 
 
         // Add the new method to the metadata
@@ -67,7 +66,7 @@ export function A_Abstraction(
         });
 
         // Set the metadata of the method to define a custom Feature with name
-        existedMeta.set(StageKey, existedMetaValue);
+        existedMeta.set(abstractionKey, existedMetaValue);
 
 
         //  Update the metadata of the container with the new Stage definition

package/src/decorators/A-Abstraction/A-Abstraction.decorator.types.ts

@@ -14,7 +14,7 @@ export type A_TYPES__A_AbstractionDecoratorDescriptor =
     TypedPropertyDescriptor<() => Promise<any>>
 
 
-export type A_TYPES__A_StageDecoratorConfig = {
+export type A_TYPES__A_AbstractionDecoratorConfig = {
 }
 
 

package/src/decorators/A-Connect/A-Connect.decorator.ts

@@ -31,7 +31,7 @@ export function A_Connect(
     config?: any | string
 ) {
     return function (
-        target: A_Container<any> | A_Component,
+        target: A_Container | A_Component,
         methodName: string | symbol | undefined,
         parameterIndex: number
     ) {

package/src/decorators/A-Entity/A-Entity.decorator.types.ts

@@ -6,7 +6,7 @@ import { ASEID } from "@adaas/a-utils"
 export type A_TYPES__EntityListDecoratorQuery = {
     aseid: string | ASEID,
     id: string,
-    type: { new(...args: any[]): A_Entity<any, any, any> },
+    type: { new(...args: any[]): A_Entity },
     entity: string
 }
 

package/src/decorators/A-Feature/A-Feature-Define.decorator.ts

@@ -1,21 +1,20 @@
-import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
 import {
     A_TYPES__A_DefineDecorator_Meta,
     A_TYPES__A_FeatureDecoratorConfig,
     A_TYPES__A_FeatureDecoratorDescriptor,
 } from "./A-Feature.decorator.types";
-import { A_Container } from "@adaas/a-concept/global/A-Container/A-Container.class";
-import { A_TYPES__ContainerMeta_FeatureItem, A_TYPES__ContainerMetaKey } from "@adaas/a-concept/global/A-Container/A-Container.types";
+import { A_Entity } from "@adaas/a-concept/global/A-Entity/A-Entity.class";
 import { A_Context } from "@adaas/a-concept/global/A-Context/A-Context.class";
+import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
+import { A_Container } from "@adaas/a-concept/global/A-Container/A-Container.class";
+import { A_TYPES__ContainerMetaKey } from "@adaas/a-concept/global/A-Container/A-Container.types";
 import { A_EntityMeta } from "@adaas/a-concept/global/A-Entity/A-Entity.meta";
 import { A_ContainerMeta } from "@adaas/a-concept/global/A-Container/A-Container.meta";
 import { A_ComponentMeta } from "@adaas/a-concept/global/A-Component/A-Component.meta";
 import { A_TYPES__EntityMetaKey } from "@adaas/a-concept/global/A-Entity/A-Entity.types";
 import { A_TYPES__ComponentMetaKey } from "@adaas/a-concept/global/A-Component/A-Component.types";
-import { A_Entity } from "@adaas/a-concept/global/A-Entity/A-Entity.class";
 import { A_Meta } from "@adaas/a-concept/global/A-Meta/A-Meta.class";
 
-
 /**
  * A-Feature decorator
  * 
@@ -33,12 +32,12 @@ export function A_Feature_Define(
     config: Partial<A_TYPES__A_FeatureDecoratorConfig> = {}
 ) {
     return function (
-        target: A_Container<any> | A_Entity | A_Component,
+        target: A_Container | A_Entity | A_Component,
         propertyKey: string,
         descriptor: A_TYPES__A_FeatureDecoratorDescriptor
     ) {
 
-        const meta: A_EntityMeta | A_ContainerMeta | A_ComponentMeta = A_Context.meta(target.constructor);
+        const meta: A_EntityMeta | A_ContainerMeta | A_ComponentMeta = A_Context.meta(target.constructor as any);
 
         let metaKey;
 
@@ -69,10 +68,15 @@ export function A_Feature_Define(
         }> = meta.get(metaKey) || new A_Meta();
 
 
+
+        const handlerName = config.name || propertyKey;
+        const invoke = config.invoke !== false;
+
+
         // Set the metadata of the method to define a custom Feature with name 
         existedMeta.set(propertyKey, {
-            name: `${target.constructor.name}.${propertyKey || config.name}`,
-            handler: propertyKey,
+            name: `${target.constructor.name}.${handlerName}`,
+            handler: handlerName,
             template: config.template && config.template.length ? config.template.map(
                 item => ({
                     ...item,
@@ -86,10 +90,33 @@ export function A_Feature_Define(
 
         //  Update the metadata of the container with the new Feature definition
         A_Context
-            .meta(target.constructor)
+            .meta(target.constructor as any)
             .set(
                 metaKey,
                 existedMeta
             );
+
+
+        const originalMethod = descriptor.value!;
+
+
+
+        // Wrap the original method to add the call to `call`
+        // this helps to automatically call the container/entity/component method when it's called
+        descriptor.value = function (...args: any[]) {
+
+            // Call the original method
+            if (!invoke)
+                return originalMethod.apply(this, args);
+            else
+                originalMethod.apply(this, args);
+
+            // Call your `call` with the function name
+            if (typeof (this as any).call === "function" && invoke)
+                return (this as any).call(propertyKey);
+
+        };
+
+        return descriptor;
     };
 }

package/src/decorators/A-Feature/A-Feature.decorator.types.ts

@@ -13,22 +13,22 @@ export type A_TYPES__A_Feature_Extend = {
 };
 
 export type A_TYPES__A_FeatureDecoratorDescriptor =
+    TypedPropertyDescriptor<
+        ((...args: any[]) => any)
+        |
+        ((...args: any[]) => Promise<any>)
+        |
+        (() => any)
+        |
+        (() => Promise<any>)
+    >
+
 
-    TypedPropertyDescriptor<() => any>
-    |
-    TypedPropertyDescriptor<(
-        ...args: any[]
-    ) => any>
-    |
-    TypedPropertyDescriptor<(
-        ...args: any[]
-    ) => Promise<any>>
-    |
-    TypedPropertyDescriptor<() => Promise<any>>
 
 
 export type A_TYPES__A_FeatureDecoratorConfig = {
     name: string,
+    invoke: boolean,
     channel: Array<typeof A_Channel>
     template: Array<A_TYPES__A_FeatureTemplateItem>
 }
@@ -74,7 +74,7 @@ export type A_TYPES__A_ExtendDecoratorConfig = {
      * [!!] By default uses OR to join all provided items. If you need more complex Logic, please use Regexp instead
      */
     scope: Array<
-        { new(...args: any[]): A_Container<any> }
+        { new(...args: any[]): A_Container }
         | { new(...args: any[]): A_Entity }
         | { new(...args: any[]): A_Component }
     >

package/src/decorators/A-Inject/A-Inject.decorator.ts

@@ -1,8 +1,8 @@
-import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
 import {
     A_TYPES__A_InjectDecorator_EntityInjectionInstructions,
     A_TYPES__A_InjectDecoratorReturn
 } from "./A-Inject.decorator.types";
+import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
 import { A_Fragment } from "@adaas/a-concept/global/A-Fragment/A-Fragment.class";
 import { A_Scope } from "@adaas/a-concept/global/A-Scope/A-Scope.class";
 import { A_Context } from "@adaas/a-concept/global/A-Context/A-Context.class";
@@ -10,7 +10,9 @@ import { A_TYPES__ComponentMetaKey } from "@adaas/a-concept/global/A-Component/A
 import { A_Meta } from "@adaas/a-concept/global/A-Meta/A-Meta.class";
 import { A_Feature } from "@adaas/a-concept/global/A-Feature/A-Feature.class";
 import { A_Entity } from "@adaas/a-concept/global/A-Entity/A-Entity.class";
-
+import { A_Container } from "@adaas/a-concept/global/A-Container/A-Container.class";
+import { A_TYPES__ContainerMetaKey } from "@adaas/a-concept/global/A-Container/A-Container.types";
+import { A_CommonHelper } from "@adaas/a-utils";
 
 
 
@@ -65,9 +67,34 @@ export function A_Inject(
 
         const method = methodName ? String(methodName) : 'constructor';
 
+        let metaKey;
+
+        switch (true) {
+
+            case target instanceof A_Component:
+                metaKey = A_TYPES__ComponentMetaKey.INJECTIONS;
+                break;
+
+            case A_CommonHelper.isInheritedFrom(target, A_Component):
+                metaKey = A_TYPES__ComponentMetaKey.INJECTIONS;
+                break;
+
+            case A_CommonHelper.isInheritedFrom(target, A_Container):
+                metaKey = A_TYPES__ContainerMetaKey.INJECTIONS;
+                break;
+
+            case target instanceof A_Container:
+                metaKey = A_TYPES__ContainerMetaKey.INJECTIONS;
+                break;
+
+
+            default:
+                throw new Error(`A-Inject cannot be defined on the ${target} level`);
+        }
+
         const existedMeta = A_Context
             .meta(target)
-            .get(A_TYPES__ComponentMetaKey.INJECTIONS)
+            .get(metaKey)
             || new A_Meta();
 
 
@@ -83,7 +110,7 @@ export function A_Inject(
         A_Context
             .meta(target)
             .set(
-                A_TYPES__ComponentMetaKey.INJECTIONS,
+                metaKey,
                 existedMeta
             );
     }

package/src/decorators/A-Inject/A-Inject.decorator.types.ts

@@ -6,6 +6,7 @@ import { A_Fragment } from "@adaas/a-concept/global/A-Fragment/A-Fragment.class"
 import { A_Scope } from "@adaas/a-concept/global/A-Scope/A-Scope.class";
 import { ASEID } from "@adaas/a-utils";
 
+
 export type A_TYPES__A_InjectDecoratorDescriptor = TypedPropertyDescriptor<(
     ...args: any[]
 ) => Promise<void>>
@@ -56,10 +57,10 @@ export type A_TYPES__A_InjectDecorator_Meta = Array<{
 export type A_TYPES__A_InjectDecorator_Injectable =
     { new(...args: any[]): A_Fragment }
     | { new(...args: any[]): A_Component }
-    | { new(...args: any[]): A_Container<any> }
+    | { new(...args: any[]): A_Container }
     | { new(...args: any[]): A_Scope }
     | { new(...args: any[]): A_Feature }
-    | { new(...args: any[]): A_Entity<any, any, any> };
+    | { new(...args: any[]): A_Entity };
 
 
 export type A_TYPES__A_InjectDecorator_EntityInjectionInstructions = {
@@ -71,7 +72,7 @@ export type A_TYPES__A_InjectDecorator_EntityInjectionInstructions = {
 export type A_TYPES__A_InjectDecorator_EntityInjectionQuery = {
     aseid: string | ASEID,
     id: string,
-    type: { new(...args: any[]): A_Entity<any, any, any> },
+    type: { new(...args: any[]): A_Entity },
     entity: string
 }