@adaas/a-concept 0.3.5 → 0.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaas/a-concept",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "A-Concept is a framework of the new generation that is tailored to use AI, enabling developers to create AI-powered applications with ease. It provides a structured approach to building, managing, and deploying AI-driven solutions.",
   "license": "Apache-2.0",
   "author": {

package/src/lib/A-Feature/A-Feature-Extend.decorator.ts

@@ -177,18 +177,34 @@ export function A_Feature_Extend(
         ];
 
         //  ensure that other regexps are preserved
+        //  Only remove the handler from another regexp if that regexp targets
+        //  the SAME feature name (i.e., same feature, different scope — inheritance case).
+        //  If the other regexp targets a DIFFERENT feature, leave it alone so that
+        //  the same method can serve multiple features.
+        const currentFeatureName = (param1 && typeof param1 === 'object' && !A_TypeGuards.isRegExp(param1) && (param1 as Partial<A_TYPES__FeatureExtendDecoratorConfig>).name)
+            || propertyKey;
+
         for (const [key, handlers] of existedMeta.entries()) {
 
             const indexInAnother = handlers.findIndex(item => item.handler === propertyKey);
 
-            //  if the same handler exists in another regexp, remove it
+            //  if the same handler exists in another regexp, check if it's the same feature
             if (key !== targetRegexp.source && indexInAnother !== -1) {
-                handlers.splice(indexInAnother, 1);
-                //  if no handlers left for this regexp, remove the regexp entry
-                if (handlers.length === 0) {
-                    existedMeta.delete(key);
-                } else {
-                    existedMeta.set(key, handlers);
+                //  Extract the feature name from the other regexp key
+                //  Regexp keys are built as: ^...\.featureName$ or .*\.featureName$
+                const keyStr = String(key);
+                const featureNameMatch = keyStr.match(/\\\.\s*([^\\.$]+)\$$/);
+                const otherFeatureName = featureNameMatch ? featureNameMatch[1] : null;
+
+                //  Only clean up if the other regexp targets the same feature name
+                if (otherFeatureName === currentFeatureName) {
+                    handlers.splice(indexInAnother, 1);
+                    //  if no handlers left for this regexp, remove the regexp entry
+                    if (handlers.length === 0) {
+                        existedMeta.delete(key);
+                    } else {
+                        existedMeta.set(key, handlers);
+                    }
                 }
             }
         }

package/tests/A-Feature.test.ts

@@ -1075,13 +1075,16 @@ describe('A-Feature tests', () => {
         ]);
     })
 
-    it('Should allow to run feature with the same steps', async () => {
+    it('Should allow to define 2 extension under the same method', async () => {
 
         const resultChain: string[] = [];
 
         class ComponentA extends A_Component {
             @A_Feature.Extend({
-                name: 'testFeature',
+                name: 'testFeature1',
+            })
+            @A_Feature.Extend({
+                name: 'testFeature2',
             })
             async feature1() {
                 resultChain.push('ComponentA.feature1');
@@ -1090,28 +1093,16 @@ describe('A-Feature tests', () => {
 
         const testScope = new A_Scope({ name: 'TestScope', components: [ComponentA] });
 
-        const feature = new A_Feature({
-            name: 'testFeature',
-            scope: testScope,
-            template: [
-                {
-                    name: 'ComponentA.feature1',
-                    dependency: new A_Dependency('ComponentA'),
-                    handler: 'feature1',
-                },
-                {
-                    name: 'ComponentA.feature1',
-                    dependency: new A_Dependency('ComponentA'),
-                    handler: 'feature1',
-                },
-            ]
-        });
+        const component = testScope.resolve(ComponentA)!;
 
-        await feature.process();
+        component.call('testFeature1');
+        component.call('testFeature2');
 
         expect(resultChain).toEqual([
             'ComponentA.feature1',
             'ComponentA.feature1'
         ]);
     })
+
+
 });