@adaas/a-concept 0.1.54 → 0.1.55

package/package.json

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

@@ -703,10 +703,9 @@ export class A_Scope<
 
             case A_TypeGuards.isEntityConstructor(param1): {
                 // 3) Check entities
-                this.allowedEntities.forEach(ctor => {
-                    if (A_CommonHelper.isInheritedFrom(ctor, param1)) {
-                        const instance = this.resolve<T>(ctor);
-                        if (instance) results.push(instance as T);
+                this.entities.forEach(entity => {
+                    if (A_CommonHelper.isInheritedFrom(entity.constructor, param1)) {
+                        results.push(entity as T);
                     }
                 });
                 break;
@@ -740,13 +739,13 @@ export class A_Scope<
 
 
         const parentScope = this._parent;
-        
+
         while (parentScope && parentScope.has(param1 as any)) {
             const parentResults = parentScope.resolveAll<T>(param1 as any);
             results.push(...parentResults);
             break;
         }
-        
+
 
         return results;
     }

package/tests/A-Scope.test.ts

@@ -433,5 +433,23 @@ describe('A-Scope tests', () => {
         //  the first element should be instance of ComponentC as it is registered in child scope
         expect(resolvedComponents[0] instanceof ComponentC).toBe(true);
     });
+    it('Should resolve all entities registered in the scope', async () => {
 
+        class MyEntity extends A_Entity { }
+
+
+        const scope = new A_Scope({ name: 'TestScope' });
+
+        scope.register(new MyEntity());
+        scope.register(new MyEntity());
+        scope.register(new MyEntity());
+
+        const resolvedEntities = scope.resolveAll<MyEntity>(MyEntity);
+
+        expect(resolvedEntities.length).toBe(3);
+        resolvedEntities.forEach(entity => {
+            expect(entity).toBeInstanceOf(MyEntity);
+        });
+
+    });
 });