@adaas/a-concept 0.1.36 → 0.1.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaas/a-concept",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "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.",
   "license": "Apache-2.0",
   "main": "./dist/index.cjs",

package/src/global/A-Entity/A-Entity.meta.ts

@@ -2,6 +2,7 @@ import { A_Meta } from "../A-Meta/A-Meta.class";
 import { A_TYPES__EntityMeta } from "./A-Entity.types";
 import { A_TYPES__EntityMetaKey } from "./A-Entity.constants";
 import { A_TYPES__FeatureDefineDecoratorMeta } from "../A-Feature/A-Feature.types";
+import { A_TYPES__A_InjectDecorator_Meta } from "../A-Inject/A-Inject.types";
 
 
 export class A_EntityMeta extends A_Meta<A_TYPES__EntityMeta> {
@@ -20,4 +21,21 @@ export class A_EntityMeta extends A_Meta<A_TYPES__EntityMeta> {
             .map(([, feature]) => feature) || [];
     }
 
+
+    /**
+     * Allows to get all the injections for a given handler
+     * 
+     * @param handler 
+     * @returns 
+     */
+    injections(
+        handler: string
+    ): A_TYPES__A_InjectDecorator_Meta {
+        const injections = this.get(A_TYPES__EntityMetaKey.INJECTIONS);
+
+        const args = injections?.get(handler) || [];
+
+        return args;
+    }
+
 }

package/src/global/A-Entity/A-Entity.types.ts

@@ -3,6 +3,7 @@ import { A_Entity } from "./A-Entity.class";
 import { ASEID } from "../ASEID/ASEID.class";
 import { A_TYPES__EntityMetaKey } from "./A-Entity.constants";
 import { A_TYPES__FeatureDefineDecoratorMeta, A_TYPES__FeatureExtendDecoratorMeta } from "../A-Feature/A-Feature.types";
+import { A_TYPES__A_InjectDecorator_Meta } from "../A-Inject/A-Inject.types";
 
 
 /**
@@ -67,6 +68,18 @@ export type A_TYPES__EntityMeta = {
          */
         [Key: string]: A_TYPES__FeatureDefineDecoratorMeta
     }>
+
+    /**
+     * Injections defined on the component per handler
+     */
+    [A_TYPES__EntityMetaKey.INJECTIONS]: A_Meta<{
+        /**
+         * Where Key is the name of the injection
+         * 
+         * Where value is the list of injections
+         */
+        [Key: string]: A_TYPES__A_InjectDecorator_Meta
+    }>
 }
 
 

package/src/global/A-Feature/A-Feature.class.ts

@@ -248,9 +248,22 @@ export class A_Feature<T extends A_TYPES__FeatureAvailableComponents = A_TYPES__
         this._name = params.name;
 
         // 2) get scope from where feature is called
-        const componentScope = params.component
-            ? A_Context.scope(params.component)
-            : params.scope as A_Scope;
+        // 2) get scope from where feature is called
+        let componentScope: A_Scope | undefined;
+        //  uses to extend a component scope if component is not registered in the context
+        let externalScope: A_Scope | undefined = params.scope;
+
+        try {
+            if (params.component)
+                componentScope = A_Context.scope(params.component);
+        } catch (error) {
+            if (!externalScope)
+                throw error;
+        }
+
+        if (componentScope && externalScope && !externalScope.isInheritedFrom(componentScope)) {
+            externalScope.inherit(componentScope);
+        }
 
         // 3) create caller wrapper for the simple injection of the caller component
         //   - Just to prevent issues with undefined caller in features without component
@@ -261,7 +274,7 @@ export class A_Feature<T extends A_TYPES__FeatureAvailableComponents = A_TYPES__
         const scope = A_Context.allocate(this);
 
         // 5) ensure that the scope of the caller component is inherited by the feature scope
-        scope.inherit(componentScope);
+        scope.inherit(componentScope || externalScope!);
 
         // 6) create steps manager to organize steps into stages
         this._SM = new A_StepsManager(params.template);
@@ -291,7 +304,20 @@ export class A_Feature<T extends A_TYPES__FeatureAvailableComponents = A_TYPES__
         this._name = params.name;
 
         // 2) get scope from where feature is called
-        const componentScope = params.scope ? params.scope : A_Context.scope(params.component);
+        let componentScope: A_Scope | undefined;
+        //  uses to extend a component scope if component is not registered in the context
+        let externalScope: A_Scope | undefined = params.scope;
+
+        try {
+            componentScope = A_Context.scope(params.component);
+        } catch (error) {
+            if (!externalScope)
+                throw error;
+        }
+
+        if (componentScope && externalScope && !externalScope.isInheritedFrom(componentScope)) {
+            externalScope.inherit(componentScope);
+        }
 
         // 3) create caller wrapper for the simple injection of the caller component
         this._caller = new A_Caller<T>(params.component);
@@ -300,7 +326,7 @@ export class A_Feature<T extends A_TYPES__FeatureAvailableComponents = A_TYPES__
         const scope = A_Context.allocate(this);
 
         // 5) ensure that the scope of the caller component is inherited by the feature scope
-        scope.inherit(componentScope);
+        scope.inherit(componentScope || externalScope!);
 
         // 6) retrieve the template from the context
         const template = A_Context.featureTemplate(this._name, this._caller.component, scope);

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

@@ -25,6 +25,7 @@ import { A_Feature } from "@adaas/a-concept/global/A-Feature/A-Feature.class";
 import { A_CommonHelper } from "@adaas/a-concept/helpers/A_Common.helper";
 import { A_TYPES__Error_Constructor } from "../A-Error/A_Error.types";
 import { A_Error } from "../A-Error/A_Error.class";
+import { A_TYPES__EntityMetaKey } from "../A-Entity/A-Entity.constants";
 
 
 /**
@@ -153,6 +154,10 @@ export function A_Inject(
             case A_TypeGuards.isContainerInstance(target):
                 metaKey = A_TYPES__ContainerMetaKey.INJECTIONS;
                 break;
+
+            case A_TypeGuards.isEntityInstance(target):
+                metaKey = A_TYPES__EntityMetaKey.INJECTIONS;
+                break;
         }
 
         // get existing meta or create a new one

package/tests/A-Feature.test.ts

@@ -362,4 +362,61 @@ describe('A-Feature tests', () => {
 
         expect(executionOrder).toEqual(['stepOne', 'stepThree']);
     });
+
+    it('Should allow proceed with external scope', async () => {
+        const executionOrder: string[] = [];
+
+        class CustomComponent extends A_Component {
+
+            doSomething() {
+                executionOrder.push('customComponentAction');
+            }
+
+        }
+
+        // 1) create a base component with some feature
+        class ComponentA extends A_Component {
+
+            @A_Feature.Define({ invoke: false })
+            async feature1() {
+                const scope = new A_Scope({ name: 'ExternalScopeCaller', components: [CustomComponent] });
+
+                executionOrder.push('stepOne');
+
+                await this.call('feature1', scope);
+            }
+        }
+
+
+        class ComponentB extends A_Component {
+
+            @A_Feature.Extend({
+                name: 'feature1',
+            })
+            async feature1Extension(
+                @A_Inject(A_Scope) scope: A_Scope,
+                @A_Inject(CustomComponent) customComponent: CustomComponent
+            ) {
+                expect(customComponent).toBeInstanceOf(CustomComponent);
+                expect(customComponent.doSomething).toBeInstanceOf(Function);
+
+                executionOrder.push('stepThree');
+            }
+        }
+
+
+        // 2) create a running scope 
+        const scope = new A_Scope({ name: 'TestScope' , components: [ComponentA, ComponentB] });
+
+
+        // 3) create an instance of the component from the scope
+        const myComponent = scope.resolve(ComponentA)!;
+        expect(myComponent).toBeInstanceOf(ComponentA);
+
+        await myComponent.feature1();
+
+        expect(executionOrder).toEqual(['stepOne', 'stepThree']);
+    });
+
+    
 });