@adaas/a-concept 0.1.35 → 0.1.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaas/a-concept",
-  "version": "0.1.35",
+  "version": "0.1.37",
   "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-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-Fragment/A-Fragment.class.ts

@@ -153,7 +153,7 @@ export class A_Fragment<
      * }
      * ```
      */
-    get<K extends keyof _MetaItems>(param: K): _MetaItems[K] | undefined {
+    get(param: keyof _MetaItems): _MetaItems[typeof param] | undefined {
         return this._meta.get(param);
     }
 
@@ -169,7 +169,7 @@ export class A_Fragment<
      * fragment.set('role', 'admin');
      * ```
      */
-    set<K extends keyof _MetaItems>(param: K, value: _MetaItems[K]): void {
+    set(param: keyof _MetaItems, value: _MetaItems[typeof param]): void {
         this._meta.set(param, value);
     }
 
@@ -268,15 +268,15 @@ export class A_Fragment<
      * ```
      */
     clone(newName?: string): A_Fragment<_MetaItems, _SerializedType> {
-        const cloned = new (this.constructor as any)({ 
-            name: newName || `${this._name}_copy` 
+        const cloned = new (this.constructor as any)({
+            name: newName || `${this._name}_copy`
         });
-        
+
         // Copy all meta data
         this._meta.toArray().forEach(([key, value]) => {
             cloned.set(key, value);
         });
-        
+
         return cloned;
     }
 

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']);
+    });
+
+    
 });

package/tests/A-Fragment.test.ts

@@ -1,4 +1,5 @@
 import { A_Fragment } from "@adaas/a-concept/global/A-Fragment/A-Fragment.class";
+import { A_Scope } from "../src";
 
 jest.retryTimes(0);
 
@@ -182,7 +183,7 @@ describe('A-Fragment Tests', () => {
     });
 
     it('It Should be possible to create an inherited A_Fragment instance', async () => {
-        
+
         class CustomFragment extends A_Fragment<{ sessionId: string; timestamp: number }> {
             constructor() {
                 super({ name: 'CustomFragment' });
@@ -209,7 +210,7 @@ describe('A-Fragment Tests', () => {
     });
 
     it('It Should be possible to create a fragment with custom serialization', async () => {
-        
+
         class SessionFragment extends A_Fragment<
             { sessionId: string; timestamp: number },
             { name: string; sessionData: string }
@@ -286,5 +287,42 @@ describe('A-Fragment Tests', () => {
         expect(fragment.has('c')).toBe(true);
         expect(fragment.size()).toBe(2);
     });
+    it('It Should allow override get method correctly', async () => {
+
+        const scope = new A_Scope();
+
+        class CustomFragment<T extends string[]> extends A_Fragment<{
+            [key in T[number]]: any
+        }> {
+
+            constructor(properties: T) {
+                super({ name: 'CustomFragment' });
+                properties.forEach((prop) => {
+                    this.set(prop, `value_of_${prop}`);
+                });
+            }
+            get<K extends T[number]>(param: K): { [key in T[number]]: any; }[K] | undefined {
+                const originalValue = super.get(param);
+                if (originalValue !== undefined) {
+                    return `custom_${originalValue}`;
+                }
+                return undefined;
+            }
+
 
+        }
+
+
+        const fragment = new CustomFragment<['key1', 'key2']>(['key1', 'key2']);
+
+        scope.register(fragment);
+
+
+        expect(fragment.get('key1')).toBe('custom_value_of_key1');
+        expect(fragment.get('key2')).toBe('custom_value_of_key2');
+        expect(fragment.get('key3' as any)).toBeUndefined();
+
+        scope.destroy();
+
+    });
 });