@adaas/a-concept 0.3.4 → 0.3.6

package/dist/node/index.d.mts

@@ -1783,10 +1783,29 @@ declare class A_StepsManager {
     visited: Set<string>;
     tempMark: Set<string>;
     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;
     private _isBuilt;
     constructor(entities: Array<A_TYPES__FeatureDefineDecoratorTemplateItem>);
     private prepareSteps;
+    /**
+     * Returns the base (non-unique) ID for a step: `dependency.name.handler`
+     */
+    private baseID;
+    /**
+     * Returns the unique ID assigned to a specific step instance.
+     * Falls back to baseID if not yet assigned.
+     */
     private ID;
+    /**
+     * 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;
     private buildGraph;
     private matchEntities;
     private visit;

package/dist/node/index.d.ts

@@ -1783,10 +1783,29 @@ declare class A_StepsManager {
     visited: Set<string>;
     tempMark: Set<string>;
     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;
     private _isBuilt;
     constructor(entities: Array<A_TYPES__FeatureDefineDecoratorTemplateItem>);
     private prepareSteps;
+    /**
+     * Returns the base (non-unique) ID for a step: `dependency.name.handler`
+     */
+    private baseID;
+    /**
+     * Returns the unique ID assigned to a specific step instance.
+     * Falls back to baseID if not yet assigned.
+     */
     private ID;
+    /**
+     * 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;
     private buildGraph;
     private matchEntities;
     private visit;

package/dist/node/index.mjs

@@ -2812,14 +2812,20 @@ function A_Feature_Extend(param1) {
     const existedMetaValue = [
       ...existedMeta.get(targetRegexp.source) || []
     ];
+    const currentFeatureName = param1 && typeof param1 === "object" && !A_TypeGuards.isRegExp(param1) && param1.name || propertyKey;
     for (const [key, handlers] of existedMeta.entries()) {
       const indexInAnother = handlers.findIndex((item) => item.handler === propertyKey);
       if (key !== targetRegexp.source && indexInAnother !== -1) {
-        handlers.splice(indexInAnother, 1);
-        if (handlers.length === 0) {
-          existedMeta.delete(key);
-        } else {
-          existedMeta.set(key, handlers);
+        const keyStr = String(key);
+        const featureNameMatch = keyStr.match(/\\\.\s*([^\\.$]+)\$$/);
+        const otherFeatureName = featureNameMatch ? featureNameMatch[1] : null;
+        if (otherFeatureName === currentFeatureName) {
+          handlers.splice(indexInAnother, 1);
+          if (handlers.length === 0) {
+            existedMeta.delete(key);
+          } else {
+            existedMeta.set(key, handlers);
+          }
         }
       }
     }
@@ -3053,12 +3059,18 @@ A_StepManagerError.CircularDependencyError = "A-StepManager Circular Dependency
 // src/lib/A-StepManager/A-StepManager.class.ts
 var A_StepsManager = class {
   constructor(entities) {
+    /**
+     * Maps each step instance to a unique ID.
+     * Duplicate steps (same dependency.name + handler) get indexed suffixes (e.g., #1, #2).
+     */
+    this._uniqueIdMap = /* @__PURE__ */ new Map();
     this._isBuilt = false;
     this.entities = this.prepareSteps(entities);
     this.graph = /* @__PURE__ */ new Map();
     this.visited = /* @__PURE__ */ new Set();
     this.tempMark = /* @__PURE__ */ new Set();
     this.sortedEntities = [];
+    this.assignUniqueIds();
   }
   prepareSteps(entities) {
     return entities.map((step) => ({
@@ -3070,15 +3082,54 @@ var A_StepsManager = class {
       throwOnError: false
     }));
   }
-  ID(step) {
+  /**
+   * Returns the base (non-unique) ID for a step: `dependency.name.handler`
+   */
+  baseID(step) {
     return `${step.dependency.name}.${step.handler}`;
   }
+  /**
+   * Returns the unique ID assigned to a specific step instance.
+   * Falls back to baseID if not yet assigned.
+   */
+  ID(step) {
+    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).
+   */
+  assignUniqueIds() {
+    const counts = /* @__PURE__ */ new Map();
+    for (const step of this.entities) {
+      const base = this.baseID(step);
+      counts.set(base, (counts.get(base) || 0) + 1);
+    }
+    const indexTracker = /* @__PURE__ */ new Map();
+    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);
+      }
+    }
+  }
   buildGraph() {
     if (this._isBuilt) return;
     this._isBuilt = true;
     this.entities = this.entities.filter(
-      (step, i, self) => !self.some((s) => s.override ? new RegExp(s.override).test(this.ID(step)) : false)
+      (step, i, self) => !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);
+      })
     );
+    this._uniqueIdMap.clear();
+    this.assignUniqueIds();
     this.entities.forEach((entity) => this.graph.set(this.ID(entity), /* @__PURE__ */ new Set()));
     this.entities.forEach((entity) => {
       const entityId = this.ID(entity);
@@ -3098,10 +3149,10 @@ var A_StepsManager = class {
       }
     });
   }
-  // Match entities by name or regex
+  // Match entities by name or regex — matches against the base ID for pattern compatibility
   matchEntities(entityId, pattern) {
     const regex = new RegExp(pattern);
-    return this.entities.filter((entity) => regex.test(this.ID(entity)) && this.ID(entity) !== entityId).map((entity) => this.ID(entity));
+    return this.entities.filter((entity) => regex.test(this.baseID(entity)) && this.ID(entity) !== entityId).map((entity) => this.ID(entity));
   }
   // Topological sort with cycle detection
   visit(node) {
@@ -3591,7 +3642,7 @@ var A_ComponentMeta = class extends A_Meta {
           before: extension.before || "",
           after: extension.after || "",
           throwOnError: extension.throwOnError || true,
-          override: ""
+          override: extension.override || ""
         });
       });
     });
@@ -5168,6 +5219,14 @@ var A_Context = class _A_Context {
             if (inherited) {
               steps.delete(`${A_CommonHelper.getComponentName(inherited)}.${declaration.handler}`);
             }
+            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