@adaas/a-concept 0.1.60 → 0.2.1

package/tests/A-Scope.test.ts

@@ -7,7 +7,7 @@ import { A_Feature } from '@adaas/a-concept/global/A-Feature/A-Feature.class';
 import { A_Fragment } from '@adaas/a-concept/global/A-Fragment/A-Fragment.class';
 import { A_Scope } from "@adaas/a-concept/global/A-Scope/A-Scope.class";
 import { ASEID } from '@adaas/a-concept/global/ASEID/ASEID.class';
-import { A_Error } from '../src';
+import { A_Dependency, A_Error } from '../src';
 
 jest.retryTimes(0);
 
@@ -149,7 +149,7 @@ describe('A-Scope tests', () => {
         const entity2 = new MyEntity({ bar: 'baz' });
         scope.register(entity1);
         scope.register(entity2);
-        const resolved = scope.resolve(MyEntity, { query: { bar: 'baz' } });
+        const resolved = scope.resolve(new A_Dependency(MyEntity, { query: { bar: 'baz' } }));
         expect(resolved).toBe(entity2);
 
 
@@ -168,11 +168,11 @@ describe('A-Scope tests', () => {
             }
         }
         const scope = new A_Scope({ name: 'TestScope' });
-        for (let i = 0; i < 10; i++) {
+        for (let i = 0; i < 15; i++) {
             const entity = new MyEntity({ foo: 'bar' });
             scope.register(entity);
         }
-        const resolved = scope.resolve(MyEntity, { pagination: { count: 10 } });
+        const resolved = scope.resolveDependency(new A_Dependency(MyEntity, { pagination: { count: 10 } }));
         expect(Array.isArray(resolved)).toBe(true);
     });
     it('Should return array with pagination.count and provided filter', async () => {
@@ -197,7 +197,7 @@ describe('A-Scope tests', () => {
             const entity = new MyEntity({ foo: 'baz' });
             scope.register(entity);
         }
-        const resolved = scope.resolve(MyEntity, { query: { foo: 'baz' }, pagination: { count: 10 } });
+        const resolved = scope.resolve(new A_Dependency(MyEntity, { query: { foo: 'baz' }, pagination: { count: 10, from: 'start' } }));
         expect(Array.isArray(resolved)).toBe(true);
         expect((resolved as Array<MyEntity>).length).toBe(5);
         (resolved as Array<MyEntity>).forEach(r => {
@@ -369,7 +369,7 @@ describe('A-Scope tests', () => {
 
         container.scope.register(new A_Error('Test Error'));
 
-        const resolved = container.scope.resolve(A_Error);
+        const resolved = container.scope.resolve(A_Error) as A_Error;
         expect(resolved).toBeInstanceOf(A_Error);
         expect(resolved?.message).toBe('Test Error');
 
@@ -619,7 +619,7 @@ describe('A-Scope tests', () => {
             entities: [new MyEntity_A({ name: 'Entity2' })]
         }).inherit(parentScope);
 
-        const resolvedByNameA = scope.resolve<MyEntity_A>('MyEntity_A');
+        const resolvedByNameA = scope.resolve<MyEntity_A>('MyEntity_A') as MyEntity_A;
         expect(resolvedByNameA).toBeInstanceOf(MyEntity_A);
         expect(resolvedByNameA?.name).toBe('Entity2');
     });
@@ -646,9 +646,9 @@ describe('A-Scope tests', () => {
             entities: [new MyEntity_A({ name: 'Entity2' })]
         }).inherit(parentScope);
 
-        const resolvedByName = scope.resolve<MyEntity_B>('MyEntity_B');
+        const resolvedByName = scope.resolve<MyEntity_B>('MyEntity_B') as MyEntity_B;
         expect(resolvedByName).toBeInstanceOf(MyEntity_B);
-        expect(resolvedByName?.name).toBe('Entity1');
+        expect(resolvedByName?.name).toBe('Entity1')
     });
 
     it('Should not resolve entity by class name from parent scope with resolveFlat', async () => {
@@ -676,4 +676,33 @@ describe('A-Scope tests', () => {
         const resolveByNameFlat = scope.resolveFlat<MyEntity_A>('MyEntity_B');
         expect(resolveByNameFlat).toBeUndefined();
     });
+
+    it('Should allow to extend scope with imports', async () => {
+        class MyEntity_A extends A_Entity<{ name: string }> {
+            name!: string;
+
+            fromNew(newEntity: { name: string; }): void {
+                super.fromNew(newEntity);
+                this.name = newEntity.name;
+            }
+        }
+
+        class MyEntity_B extends MyEntity_A { }
+
+        const scopeA = new A_Scope({
+            name: 'ParentScope',
+            entities: [new MyEntity_B({ name: 'Entity1' })]
+        });
+
+        const scopeB = new A_Scope({
+            name: 'TestScope',
+            entities: [new MyEntity_A({ name: 'Entity2' })]
+        });
+
+        scopeB.import(scopeA);
+
+        const resolvedA = scopeB.resolve<MyEntity_B>(MyEntity_B);
+        expect(resolvedA).toBeInstanceOf(MyEntity_B);
+        expect(resolvedA?.name).toBe('Entity1');
+    });
 });

package/tests/A-StepManager.test.ts

@@ -1,4 +1,5 @@
 import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
+import { A_Dependency } from "@adaas/a-concept/global/A-Dependency/A-Dependency.class";
 import { A_StepsManager } from "@adaas/a-concept/global/A-StepManager/A-StepManager.class";
 
 describe('A-StepManager tests', () => {
@@ -20,32 +21,32 @@ describe('A-StepManager tests', () => {
         const sm = new A_StepsManager([
             {
                 name: 'step1',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step1',
             },
             {
                 name: 'step2',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step2',
             },
             {
                 name: 'step3',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step3',
             },
             {
                 name: 'step4',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step4',
             },
             {
                 name: 'step5',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step5',
             },
             {
                 name: 'step6',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step6',
             },
         ]);
@@ -76,34 +77,34 @@ describe('A-StepManager tests', () => {
         const sm = new A_StepsManager([
             {
                 name: 'step1',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step1',
             },
             {
                 name: 'step2',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step2',
             },
             {
                 name: 'step3',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step3',
             },
             {
                 name: 'step4',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step4',
             },
             {
                 name: 'step5',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step5',
                 before: /^.*\.*step2$/.source,
                 after: /^.*\.*step6$/.source
             },
             {
                 name: 'step6',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step6',
                 before: /^ComponentA\.step2$/.source
             },
@@ -135,32 +136,32 @@ describe('A-StepManager tests', () => {
         const sm = new A_StepsManager([
             {
                 name: 'step1',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step1',
             },
             {
                 name: 'step2',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step2',
             },
             {
                 name: 'step3',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step3',
             },
             {
                 name: 'step4',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step4',
             },
             {
                 name: 'step5',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step5',
             },
             {
                 name: 'step6',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step6',
                 before: /.*/.source,
             },
@@ -191,33 +192,33 @@ describe('A-StepManager tests', () => {
         const sm = new A_StepsManager([
             {
                 name: 'step1',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step1',
             },
             {
                 name: 'step2',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step2',
             },
             {
                 name: 'step3',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step3',
             },
             {
                 name: 'step4',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step4',
             },
             {
                 name: 'step5',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step5',
                 before: new RegExp('.*').source,
             },
             {
                 name: 'step6',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step6',
                 before: new RegExp('.*').source,
             },
@@ -249,32 +250,32 @@ describe('A-StepManager tests', () => {
         const sm = new A_StepsManager([
             {
                 name: 'step1',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step1',
             },
             {
                 name: 'step2',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step2',
             },
             {
                 name: 'step3',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step3',
             },
             {
                 name: 'step4',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step4',
             },
             {
                 name: 'step5',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step5',
             },
             {
                 name: 'test',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'test',
                 before: /^.*\.step(4|5)$/.source,
                 after: /^.*\.step(1|2)$/.source,
@@ -309,22 +310,22 @@ describe('A-StepManager tests', () => {
         const sm = new A_StepsManager([
             {
                 name: 'readFromEnv',
-                component: ComponentB,
+                dependency: new A_Dependency(ComponentB),
                 handler: 'readFromEnv',
             },
             {
                 name: 'readFromFile',
-                component: ComponentB,
+                dependency: new A_Dependency(ComponentB),
                 handler: 'readFromFile',
             },
             {
                 name: 'initialize',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'initialize',
             },
             {
                 name: 'inject',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'inject',
                 before: /ComponentB\.read.+/ig.source,
                 after: 'ComponentA.initialize'
@@ -356,28 +357,28 @@ describe('A-StepManager tests', () => {
         const sm = new A_StepsManager([
             {
                 name: 'step1',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step1',
             },
             {
                 name: 'step2',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step2',
             },
             {
                 name: 'step3',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step3',
                 override: /^.*\.step(4|5)$/.source
             },
             {
                 name: 'step4',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step4',
             },
             {
                 name: 'step5',
-                component: ComponentA,
+                dependency: new A_Dependency(ComponentA),
                 handler: 'step5',
             }
         ]);