@adaas/a-concept 0.1.12 → 0.1.13

package/dist/src/global/A-Abstraction/A-Abstraction-Extend.decorator.js

@@ -46,11 +46,11 @@ config = {}) {
                 metaKey = A_Component_constants_1.A_TYPES__ComponentMetaKey.ABSTRACTIONS;
                 break;
         }
+        const setName = `CONCEPT_ABSTRACTION::${name}`;
         // Get the existed metadata or create a new one
         const existedMeta = meta.get(metaKey) || new A_Meta_class_1.A_Meta();
         // Set the metadata of the method to define a custom Stage with name
-        const existedMetaValue = existedMeta.get(name) || [];
-        const setName = `CONCEPT_ABSTRACTION::${name}`;
+        const existedMetaValue = existedMeta.get(setName) || [];
         // Add the new method to the metadata
         existedMetaValue.push({
             name: setName,

package/dist/src/global/A-Abstraction/A-Abstraction-Extend.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"A-Abstraction-Extend.decorator.js","sourceRoot":"","sources":["../../../../src/global/A-Abstraction/A-Abstraction-Extend.decorator.ts"],"names":[],"mappings":";;AA2BA,oDA4EC;AAlGD,uFAA8E;AAI9E,8EAAqE;AAErE,qGAAsG;AACtG,qGAAsG;AAEtG,+DAA2D;AAC3D,sFAA4E;AAG5E;;;;;;;;GAQG;AACH,SAAgB,oBAAoB;AAChC;;GAEG;AACH,IAAkC;AAClC;;;GAGG;AACH,SAAuD,EAAE;IAEzD,OAAO,UACH,MAAiC,EACjC,WAAmB,EACnB,UAAmD;;QAEnD,qBAAqB;QACrB,MAAM,aAAa,GAAG,CAAA,MAAC,MAAc,aAAd,MAAM,uBAAN,MAAM,CAAU,WAAW,0CAAE,IAAI,KAAI,MAAM,CAAC,MAAM,CAAC,IAAI,kBAAkB,CAAC;QAEjG,IAAI,CAAC,IAAI;YACL,MAAM,IAAI,wCAAkB,CACxB,wCAAkB,CAAC,yBAAyB,EAC5C,gEAAgE,aAAa,IAAI,CACpF,CAAC;QAEN,kEAAkE;QAClE,IAAI,CAAC,kCAAY,CAAC,oCAAoC,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7D,MAAM,IAAI,wCAAkB,CACxB,wCAAkB,CAAC,yBAAyB,EAC5C,iCAAiC,IAAI,UAAU,aAAa,gEAAgE,CAC/H,CAAC;QACN,CAAC;QAED,IAAI,OAAO,CAAC;QACZ,MAAM,IAAI,GAAsC,2BAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEvE,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,kCAAY,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAI,kCAAY,CAAC,mBAAmB,CAAC,MAAM,CAAC;gBACxF,OAAO,GAAG,iDAAyB,CAAC,YAAY,CAAA;gBAChD,MAAM;YACV,KAAK,kCAAY,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAI,kCAAY,CAAC,mBAAmB,CAAC,MAAM,CAAC;gBACxF,OAAO,GAAG,iDAAyB,CAAC,YAAY,CAAA;gBAChD,MAAM;QACd,CAAC;QAED,+CAA+C;QAC/C,MAAM,WAAW,GAEZ,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,qBAAM,EAAE,CAAC;QAEvC,oEAAoE;QACpE,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAErD,MAAM,OAAO,GAAG,wBAAwB,IAAI,EAAE,CAAC;QAE/C,qCAAqC;QACrC,gBAAgB,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;YAC3B,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE;YACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,MAAM;SACtC,CAAC,CAAC;QAEH,sEAAsE;QACtE,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAG3C,sEAAsE;QACtE,2BAAS;aACJ,IAAI,CAAC,MAAM,CAAC;aACZ,GAAG,CACA,OAAO,EACP,WAAW,CACd,CAAC;IACV,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"A-Abstraction-Extend.decorator.js","sourceRoot":"","sources":["../../../../src/global/A-Abstraction/A-Abstraction-Extend.decorator.ts"],"names":[],"mappings":";;AA2BA,oDA2EC;AAjGD,uFAA8E;AAI9E,8EAAqE;AAErE,qGAAsG;AACtG,qGAAsG;AAEtG,+DAA2D;AAC3D,sFAA4E;AAG5E;;;;;;;;GAQG;AACH,SAAgB,oBAAoB;AAChC;;GAEG;AACH,IAAkC;AAClC;;;GAGG;AACH,SAAuD,EAAE;IAEzD,OAAO,UACH,MAAiC,EACjC,WAAmB,EACnB,UAAmD;;QAEnD,qBAAqB;QACrB,MAAM,aAAa,GAAG,CAAA,MAAC,MAAc,aAAd,MAAM,uBAAN,MAAM,CAAU,WAAW,0CAAE,IAAI,KAAI,MAAM,CAAC,MAAM,CAAC,IAAI,kBAAkB,CAAC;QAEjG,IAAI,CAAC,IAAI;YACL,MAAM,IAAI,wCAAkB,CACxB,wCAAkB,CAAC,yBAAyB,EAC5C,gEAAgE,aAAa,IAAI,CACpF,CAAC;QAEN,kEAAkE;QAClE,IAAI,CAAC,kCAAY,CAAC,oCAAoC,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7D,MAAM,IAAI,wCAAkB,CACxB,wCAAkB,CAAC,yBAAyB,EAC5C,iCAAiC,IAAI,UAAU,aAAa,gEAAgE,CAC/H,CAAC;QACN,CAAC;QAED,IAAI,OAAO,CAAC;QACZ,MAAM,IAAI,GAAsC,2BAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEvE,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,kCAAY,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAI,kCAAY,CAAC,mBAAmB,CAAC,MAAM,CAAC;gBACxF,OAAO,GAAG,iDAAyB,CAAC,YAAY,CAAA;gBAChD,MAAM;YACV,KAAK,kCAAY,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAI,kCAAY,CAAC,mBAAmB,CAAC,MAAM,CAAC;gBACxF,OAAO,GAAG,iDAAyB,CAAC,YAAY,CAAA;gBAChD,MAAM;QACd,CAAC;QACD,MAAM,OAAO,GAAG,wBAAwB,IAAI,EAAE,CAAC;QAE/C,+CAA+C;QAC/C,MAAM,WAAW,GAEZ,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,qBAAM,EAAE,CAAC;QAEvC,oEAAoE;QACpE,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAExD,qCAAqC;QACrC,gBAAgB,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;YAC3B,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE;YACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,MAAM;SACtC,CAAC,CAAC;QAEH,sEAAsE;QACtE,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAG3C,sEAAsE;QACtE,2BAAS;aACJ,IAAI,CAAC,MAAM,CAAC;aACZ,GAAG,CACA,OAAO,EACP,WAAW,CACd,CAAC;IACV,CAAC,CAAC;AACN,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaas/a-concept",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "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.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/global/A-Abstraction/A-Abstraction-Extend.decorator.ts

@@ -69,6 +69,7 @@ export function A_Abstraction_Extend(
                 metaKey = A_TYPES__ComponentMetaKey.ABSTRACTIONS
                 break;
         }
+        const setName = `CONCEPT_ABSTRACTION::${name}`;
 
         // Get the existed metadata or create a new one
         const existedMeta: A_Meta<{
@@ -76,9 +77,7 @@ export function A_Abstraction_Extend(
         }> = meta.get(metaKey) || new A_Meta();
 
         // Set the metadata of the method to define a custom Stage with name
-        const existedMetaValue = existedMeta.get(name) || [];
-
-        const setName = `CONCEPT_ABSTRACTION::${name}`;
+        const existedMetaValue = existedMeta.get(setName) || [];
 
         // Add the new method to the metadata
         existedMetaValue.push({

package/tests/A-Abstraction.test.ts

@@ -3,7 +3,6 @@ import './test.setup'
 import { A_Concept } from '@adaas/a-concept/global/A-Concept/A-Concept.class';
 import { A_Container } from '@adaas/a-concept/global/A-Container/A-Container.class';
 import { A_Context } from '@adaas/a-concept/global/A-Context/A-Context.class';
-import { A_ScopeError } from '@adaas/a-concept/global/A-Scope/A-Scope.error';
 
 jest.retryTimes(0);
 
@@ -150,5 +149,110 @@ describe('A-Abstraction Tests', () => {
         expect(containerA._test).toBe(5);
         expect(containerB._test).toBe(1);
     })
-    
+    it('Should execute abstraction in a proper order', async () => {
+        A_Context.reset();
+
+        const order: string[] = [];
+
+        class MyContainerA extends A_Container {
+
+            @A_Concept.Load()
+            async step1() {
+                order.push('step1');
+            }
+
+            @A_Concept.Load()
+            async step2() {
+                order.push('step2');
+            }
+        }
+        class MyContainerB extends A_Container {
+
+            @A_Concept.Load()
+            async step3() {
+                order.push('step3');
+            }
+
+            @A_Concept.Load()
+            async step4() {
+                order.push('step4');
+            }
+        }
+
+
+        const containerA = new MyContainerA({ name: 'ContainerA' });
+        const containerB = new MyContainerB({ name: 'ContainerB' });
+
+        const concept = new A_Concept({
+            name: 'TestConcept',
+            containers: [
+                containerA,
+                containerB
+            ]
+        });
+
+        await concept.load();
+
+        expect(order).toEqual(['step1', 'step2', 'step3', 'step4']);
+    })
+    it('Should execute abstraction in order with dependencies', async () => {
+        A_Context.reset();
+
+        const order: string[] = [];
+
+        class MyContainerA extends A_Container {
+
+            @A_Concept.Load()
+            async step1() {
+                order.push('step1');
+            }
+
+            @A_Concept.Load({
+                after: ['MyComponentA.step3']
+            })
+            async step2() {
+                order.push('step2');
+            }
+        }
+
+        class MyComponentA extends A_Component {
+
+            @A_Concept.Load()
+            async step3() {
+                order.push('step3');
+            }
+        }
+
+
+        class MyContainerB extends A_Container {
+
+            @A_Concept.Load()
+            async step4() {
+                order.push('step4');
+            }
+
+            @A_Concept.Load({
+                before: ['MyContainerB.step4']
+            })
+            async step5() {
+                order.push('step5');
+            }
+        }
+
+
+        const containerA = new MyContainerA({ name: 'ContainerA', components: [MyComponentA] });
+        const containerB = new MyContainerB({ name: 'ContainerB' });
+
+        const concept = new A_Concept({
+            name: 'TestConcept',
+            containers: [
+                containerA,
+                containerB
+            ]
+        });
+
+        await concept.load();
+
+        expect(order).toEqual(['step1', 'step3', 'step2', 'step5', 'step4']);
+    })
 });