@adaas/a-concept 0.3.4 → 0.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaas/a-concept",
-  "version": "0.3.4",
+  "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-Component/A-Component.meta.ts

@@ -50,7 +50,7 @@ export class A_ComponentMeta<T extends A_TYPES__ComponentMeta = A_TYPES__Compone
                         before: extension.before || '',
                         after: extension.after || '',
                         throwOnError: extension.throwOnError || true,
-                        override: ''
+                        override: extension.override || '',
                     });
 
                 });

package/src/lib/A-Context/A-Context.class.ts

@@ -834,6 +834,17 @@ export class A_Context {
                                 steps.delete(`${A_CommonHelper.getComponentName(inherited)}.${declaration.handler}`);
                             }
 
+                            // Check if the declaration has an override regexp and remove matching steps
+                            // Match against both the full step key (Component.handler) and the handler alone
+                            if (declaration.override) {
+                                const overrideRegexp = new RegExp(declaration.override);
+                                for (const [stepKey, step] of steps) {
+                                    if (overrideRegexp.test(stepKey) || overrideRegexp.test(step.handler)) {
+                                        steps.delete(stepKey);
+                                    }
+                                }
+                            }
+
                             steps.set(`${A_CommonHelper.getComponentName(cmp)}.${declaration.handler}`, {
                                 dependency: new A_Dependency(cmp),
                                 ...declaration

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/src/lib/A-StepManager/A-StepManager.class.ts

@@ -16,6 +16,11 @@ export class A_StepsManager {
     public tempMark: Set<string>;
     public sortedEntities: string[];
 
+    /**
+     * Maps each step instance to a unique ID.
+     * Duplicate steps (same dependency.name + handler) get indexed suffixes (e.g., #1, #2).
+     */
+    private _uniqueIdMap: Map<A_TYPES__A_StageStep, string> = new Map();
 
     private _isBuilt: boolean = false;
 
@@ -27,6 +32,7 @@ export class A_StepsManager {
         this.tempMark = new Set();
         this.sortedEntities = [];
 
+        this.assignUniqueIds();
     }
 
     private prepareSteps(
@@ -44,20 +50,68 @@ export class A_StepsManager {
             }));
     }
 
-    private ID(step: A_TYPES__A_StageStep) {
+    /**
+     * Returns the base (non-unique) ID for a step: `dependency.name.handler`
+     */
+    private baseID(step: A_TYPES__A_StageStep) {
         return `${step.dependency.name}.${step.handler}`;
     }
 
+    /**
+     * Returns the unique ID assigned to a specific step instance.
+     * Falls back to baseID if not yet assigned.
+     */
+    private ID(step: A_TYPES__A_StageStep) {
+        return this._uniqueIdMap.get(step) || this.baseID(step);
+    }
+
+    /**
+     * Assigns unique IDs to all steps. 
+     * Duplicate base IDs get an index suffix (#0, #1, ...).
+     * Steps with unique base IDs keep their original ID (no suffix).
+     */
+    private assignUniqueIds() {
+        // Count occurrences of each base ID
+        const counts = new Map<string, number>();
+        for (const step of this.entities) {
+            const base = this.baseID(step);
+            counts.set(base, (counts.get(base) || 0) + 1);
+        }
+
+        // Assign unique IDs with index suffix only for duplicates
+        const indexTracker = new Map<string, number>();
+        for (const step of this.entities) {
+            const base = this.baseID(step);
+            if (counts.get(base)! > 1) {
+                const idx = indexTracker.get(base) || 0;
+                this._uniqueIdMap.set(step, `${base}#${idx}`);
+                indexTracker.set(base, idx + 1);
+            } else {
+                this._uniqueIdMap.set(step, base);
+            }
+        }
+    }
+
     private buildGraph() {
         if (this._isBuilt) return;
         this._isBuilt = true;
 
-        // Filter override
+        // Filter override — match against both the full base ID and handler name
+        // so both formats work (e.g., `^.*\.step(4|5)$` and `^test1$`)
+        // A step's own override pattern should not cause it to filter itself out
         this.entities = this.entities
             .filter((step, i, self) =>
-                !self.some(s => s.override ? new RegExp(s.override).test(this.ID(step)) : false)
+                !self.some((s, j) => {
+                    if (i === j || !s.override) return false;
+                    const re = new RegExp(s.override);
+                    return re.test(this.baseID(step)) || re.test(step.handler);
+                })
             );
 
+        // Re-assign unique IDs after filtering
+        this._uniqueIdMap.clear();
+        this.assignUniqueIds();
+
         // Initialize graph nodes
         this.entities.forEach(entity => this.graph.set(this.ID(entity), new Set()));
 
@@ -90,12 +144,12 @@ export class A_StepsManager {
         });
     }
 
-    // Match entities by name or regex
+    // Match entities by name or regex — matches against the base ID for pattern compatibility
     private matchEntities(entityId: string, pattern: string): string[] {
         const regex = new RegExp(pattern);
 
         return this.entities
-            .filter(entity => regex.test(this.ID(entity)) && this.ID(entity) !== entityId)
+            .filter(entity => regex.test(this.baseID(entity)) && this.ID(entity) !== entityId)
             .map(entity => this.ID(entity));
     }
 

package/tests/A-Feature.test.ts

@@ -1038,4 +1038,71 @@ describe('A-Feature tests', () => {
             'ChildComponent_A.test'
         ]);
     })
+    it('Should keep override definition', async () => {
+
+        const resultChain: string[] = [];
+
+        class ChildComponent_A extends A_Component {
+            @A_Feature.Extend({
+                name: 'testFeature',
+            })
+            async test1() {
+                resultChain.push('ChildComponent_A.test1');
+            }
+
+            @A_Feature.Extend({
+                name: 'testFeature',
+                override: ['test1']
+            })
+            async test2() {
+                resultChain.push('ChildComponent_A.test2');
+            }
+        }
+
+        const testScope = new A_Scope({ name: 'TestScope', components: [ChildComponent_A] });
+
+        const featureDefinition = A_Context.featureTemplate('testFeature', testScope.resolve(ChildComponent_A)!, testScope);
+
+
+        expect(featureDefinition).toBeDefined();
+        expect(featureDefinition.length).toBe(1);
+        expect(featureDefinition[0].handler).toBe('test2');
+
+        await testScope.resolve(ChildComponent_A)!.call('testFeature');
+
+        expect(resultChain).toEqual([
+            'ChildComponent_A.test2'
+        ]);
+    })
+
+    it('Should allow to define 2 extension under the same method', async () => {
+
+        const resultChain: string[] = [];
+
+        class ComponentA extends A_Component {
+            @A_Feature.Extend({
+                name: 'testFeature1',
+            })
+            @A_Feature.Extend({
+                name: 'testFeature2',
+            })
+            async feature1() {
+                resultChain.push('ComponentA.feature1');
+            }
+        }
+
+        const testScope = new A_Scope({ name: 'TestScope', components: [ComponentA] });
+
+        const component = testScope.resolve(ComponentA)!;
+
+        component.call('testFeature1');
+        component.call('testFeature2');
+
+        expect(resultChain).toEqual([
+            'ComponentA.feature1',
+            'ComponentA.feature1'
+        ]);
+    })
+
+
 });