@adaas/a-concept 0.0.56 → 0.0.57

package/src/global/A-Concept/A_Concept.class.ts

@@ -1,14 +1,10 @@
-import { A_TYPES__ConceptStage, A_TYPES__ConceptAbstractionCallParams, A_TYPES__IConceptConstructor, A_TYPES__ConceptAbstractionMeta } from "./A_Concept.types";
+import { A_TYPES__ConceptStage, A_TYPES__IConceptConstructor } from "./A_Concept.types";
 import { A_Container } from "../A-Container/A-Container.class";
 import { A_Abstraction } from "../A-Abstraction/A-Abstraction.class";
 import { A_ConceptMeta } from "./A_Concept.meta";
 import { A_Abstraction_Extend } from "@adaas/a-concept/decorators/A-Abstraction/A-Abstraction-Extend.decorator";
 import { A_Scope } from "../A-Scope/A-Scope.class";
-import { A_TYPES__A_InjectDecorator_EntityInjectionInstructions, A_TYPES__A_InjectDecorator_Injectable } from "@adaas/a-concept/decorators/A-Inject/A-Inject.decorator.types";
-
-
-// export type RunParams<T> = T extends A_Container<any, infer Params> ? Params : never;
-
+import { A_Context } from "../A-Context/A-Context.class";
 
 
 /**
@@ -24,7 +20,7 @@ import { A_TYPES__A_InjectDecorator_EntityInjectionInstructions, A_TYPES__A_Inje
  * 
  */
 export class A_Concept<
-    _Imports extends A_Container[] = any
+    _Imports extends A_Container[] = A_Container[]
 > {
 
     // ==============================================================================
@@ -85,8 +81,8 @@ export class A_Concept<
     }
 
 
-    private sharedBase!: A_Container;
     private meta!: A_ConceptMeta
+    private _name!: string;
 
 
 
@@ -99,44 +95,41 @@ export class A_Concept<
     constructor(
         protected props: A_TYPES__IConceptConstructor<_Imports>
     ) {
-        this.sharedBase = new A_Container({
-            name: `${props.name}::base`,
-            fragments: props.fragments || [],
-            entities: props.entities || [],
-            components: [
-                // A_Logger,
-            ],
-        });
+        this._name = props.name || A_Context.root.name;
 
-        this.containers = (props.containers || []).map(container => {
-            container.Scope.parent(this.Scope);
-            return container;
-        });
+        if (props.components && props.components.length)
+            props.components.forEach(component => this.Scope.register(component))
+
+        if (props.fragments && props.fragments.length)
+            props.fragments.forEach(fragment => this.Scope.register(fragment))
 
-        this.meta = new A_ConceptMeta(this.containers, this.sharedBase);
+        if (props.entities && props.entities.length)
+            props.entities.forEach(entity => this.Scope.register(entity))
+
+        this.containers = props.containers || [];
     }
 
 
     get namespace() {
-        return this.sharedBase.name;
+        return A_Context.root.name;
     }
 
     get Scope() {
-        return this.sharedBase.Scope;
+        return A_Context.root;
     }
 
     /**
      * Register a class or value in the concept scope.
      */
     get register(): A_Scope['register'] {
-        return this.sharedBase.Scope.register.bind(this.sharedBase.Scope);
+        return this.Scope.register.bind(this.Scope);
     }
 
     /**
      * Resolve a class or value from the concept scope.
      */
     get resolve(): A_Scope['resolve'] {
-        return this.sharedBase.Scope.resolve.bind(this.sharedBase.Scope);
+        return this.Scope.resolve.bind(this.Scope);
     }
 
 
@@ -153,7 +146,7 @@ export class A_Concept<
     ) {
         scope = scope ? scope.inherit(this.Scope) : this.Scope;
 
-        const abstraction = this.meta.abstraction(A_TYPES__ConceptStage.Load, scope);
+        const abstraction = this.abstraction(A_TYPES__ConceptStage.Load, scope);
 
         await abstraction.process();
     }
@@ -168,7 +161,7 @@ export class A_Concept<
     ) {
         scope = scope ? scope.inherit(this.Scope) : this.Scope;
 
-        const abstraction = this.meta.abstraction(A_TYPES__ConceptStage.Run, scope);
+        const abstraction = this.abstraction(A_TYPES__ConceptStage.Run, scope);
 
         await abstraction.process();
     }
@@ -184,7 +177,7 @@ export class A_Concept<
     ) {
         scope = scope ? scope.inherit(this.Scope) : this.Scope;
 
-        const abstraction = this.meta.abstraction(A_TYPES__ConceptStage.Start, scope);
+        const abstraction = this.abstraction(A_TYPES__ConceptStage.Start, scope);
 
         await abstraction.process();
     }
@@ -200,7 +193,7 @@ export class A_Concept<
     ) {
         scope = scope ? scope.inherit(this.Scope) : this.Scope;
 
-        const abstraction = this.meta.abstraction(A_TYPES__ConceptStage.Stop, scope);
+        const abstraction = this.abstraction(A_TYPES__ConceptStage.Stop, scope);
 
         await abstraction.process();
     }
@@ -214,7 +207,7 @@ export class A_Concept<
     ) {
         scope = scope ? scope.inherit(this.Scope) : this.Scope;
 
-        const abstraction = this.meta.abstraction(A_TYPES__ConceptStage.Build, scope);
+        const abstraction = this.abstraction(A_TYPES__ConceptStage.Build, scope);
 
         await abstraction.process();
     }
@@ -228,7 +221,7 @@ export class A_Concept<
     ) {
         scope = scope ? scope.inherit(this.Scope) : this.Scope;
 
-        const abstraction = this.meta.abstraction(A_TYPES__ConceptStage.Deploy, scope);
+        const abstraction = this.abstraction(A_TYPES__ConceptStage.Deploy, scope);
 
         await abstraction.process();
 
@@ -243,7 +236,7 @@ export class A_Concept<
     ) {
         scope = scope ? scope.inherit(this.Scope) : this.Scope;
 
-        const abstraction = this.meta.abstraction(A_TYPES__ConceptStage.Publish, scope);
+        const abstraction = this.abstraction(A_TYPES__ConceptStage.Publish, scope);
 
         await abstraction.process();
     }
@@ -272,6 +265,30 @@ export class A_Concept<
         // await feature.process();
     }
 
+
+
+    protected abstraction(
+        method: A_TYPES__ConceptStage,
+        scope: A_Scope
+    ): A_Abstraction {
+
+        const featureDefinitions = this.containers.map(container => {
+            const definition = A_Context.abstractionDefinition(container, method, container.Scope);
+
+            return {
+                ...definition,
+                steps: definition.steps.map(step => ({ ...step, component: step.component ? step.component : container }))
+            }
+        });
+
+        const definition = {
+            name: `${this.namespace}.${method}`,
+            features: featureDefinitions,
+            scope
+        };
+
+        return new A_Abstraction(definition);
+    }
 }
 
 

package/src/global/A-Concept/A_Concept.meta.ts

@@ -10,6 +10,7 @@ import { A_TYPES__A_FeatureDecoratorConfig } from "@adaas/a-concept/decorators/A
 import { A_TYPES__A_AbstractionConstructor } from "../A-Abstraction/A-Abstraction.types";
 import { A_Abstraction } from "../A-Abstraction/A-Abstraction.class";
 import { A_Scope } from "../A-Scope/A-Scope.class";
+import { A_Concept } from "./A_Concept.class";
 // import { A_TYPES__ComponentMeta } from "./A-Component.types";
 
 
@@ -18,53 +19,14 @@ export class A_ConceptMeta extends A_Meta<any> {
 
     constructor(
         private containers: Array<A_Container>,
-        private base: A_Container
     ) {
         super();
     }
 
-    abstractionDefinition(
-        method: A_TYPES__ConceptStage,
-        scope: A_Scope
-    ): A_TYPES__A_AbstractionConstructor {
+  
 
-        const featureDefinitions = this.containers.map(container =>
-            A_Context.abstractionDefinition(container, method, scope)
-        );
 
-        const definition = {
-            name: `${this.base.name}.${method}`,
-            features: featureDefinitions,
-            scope
-        };
 
-        return definition;
-    }
-
-
-
-    abstraction(
-        method: A_TYPES__ConceptStage,
-        scope: A_Scope
-    ): A_Abstraction {
-
-        const featureDefinitions = this.containers.map(container => {
-            const definition = A_Context.abstractionDefinition(container, method, container.Scope);
-
-            return {
-                ...definition,
-                steps: definition.steps.map(step => ({ ...step, component: step.component ? step.component : container }))
-            }
-        });
-
-
-        const definition = {
-            name: `${this.base.name}.${method}`,
-            features: featureDefinitions,
-            scope
-        };
-
-        return new A_Abstraction(definition);
-    }
+  
 
 }

package/src/global/A-Concept/A_Concept.types.ts

@@ -37,7 +37,7 @@ export enum A_TYPES__ConceptMetaKey {
 export interface A_TYPES__IConceptConstructor<
     T extends Array<A_Container>
 > {
-    name: string,
+    name?: string,
 
     /**
      * A set of Context Fragments to register globally for the concept.
@@ -62,10 +62,12 @@ export interface A_TYPES__IConceptConstructor<
 
 
     /**
-     * A set of external Concepts that can be used in the current Concept. 
-     * To provide additional functionality or extend the current Concept.
+     * A set of Components available for all containers and fragments in the concept. 
+     * These components will be registered in the root scope of the concept.
+     * 
+     * [!] Note that these components will be available in all containers and fragments in the concept.
      */
-    // import?: Array<A_Concept>
+    components?: Array<{ new(...args: any[]): A_Component }>
 }
 
 

package/src/global/A-Container/A-Container.class.ts

@@ -18,8 +18,6 @@ import { A_TYPES__FeatureCallParams, A_TYPES__FeatureConstructor } from "../A-Fe
  * - etc.
  */
 export class A_Container {
-    // scope!: A_Scope
-
     protected readonly config!: Partial<A_TYPES__ContainerConstructor<any>>;
 
     /**
@@ -36,6 +34,11 @@ export class A_Container {
     }
 
 
+    /**
+     * Creates a new instance of A_Container
+     * 
+     * @param config 
+     */
     constructor(
         /**
          * Configuration of the container that will be used to run it.

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

@@ -1,5 +1,6 @@
 import {
     A_CommonHelper,
+    A_Error,
     A_Polyfills,
 } from "@adaas/a-utils";
 import { A_Component } from "../A-Component/A-Component.class";
@@ -147,6 +148,10 @@ export class A_Context {
 
         const newScope = param2 instanceof A_Scope ? param2 : new A_Scope(param2, param2);
 
+        if (!newScope.isInheritedFrom(A_Context.root)) {
+            newScope.inherit(A_Context.root);
+        }
+
         switch (true) {
             case param1 instanceof A_Container:
                 instance.containers.set(param1, newScope);
@@ -169,6 +174,14 @@ export class A_Context {
 
 
 
+    /**
+     * Get or Create Meta for the specific class or instance.
+     * This method will return the existing meta if it exists, or create a new one if it doesn't.
+     * 
+     * Meta object contains custom metadata based on the class type.
+     * 
+     * @param container 
+     */
     static meta(
         container: typeof A_Container,
     ): A_ContainerMeta
@@ -181,6 +194,9 @@ export class A_Context {
     static meta(
         entity: typeof A_Entity,
     ): A_ContainerMeta
+    static meta(
+        component: string,
+    ): A_ComponentMeta
     static meta(
         component: typeof A_Component,
     ): A_ComponentMeta
@@ -193,6 +209,7 @@ export class A_Context {
             | A_Entity
             | typeof A_Entity
             | { new(...args: any[]): any }
+            | string
     ): A_Meta<T>
     static meta<T extends Record<string, any>>(
         param1: typeof A_Component | typeof A_Container | A_Container
@@ -200,9 +217,9 @@ export class A_Context {
             | A_Entity
             | typeof A_Entity
             | { new(...args: any[]): any }
+            | string
     ): A_ContainerMeta | A_ComponentMeta | A_Meta<T> {
 
-
         const instance = this.getInstance();
 
         let metaStorage: WeakMap<typeof A_Container.constructor, A_Meta<any>>;
@@ -211,6 +228,7 @@ export class A_Context {
 
 
         switch (true) {
+            // 1) If param1 is instance of A_Container
             case param1 instanceof A_Container: {
 
                 metaStorage = instance.containersMeta;
@@ -219,7 +237,7 @@ export class A_Context {
 
                 break;
             }
-
+            // 2) If param1 is class of A_Container
             case A_CommonHelper.isInheritedFrom(param1, A_Container): {
                 metaStorage = instance.containersMeta;
                 property = param1 as typeof A_Container;
@@ -227,7 +245,7 @@ export class A_Context {
 
                 break;
             }
-
+            // 3) If param1 is instance of A_Component
             case param1 instanceof A_Component: {
                 metaStorage = instance.componentsMeta;
                 property = param1.constructor;
@@ -235,7 +253,7 @@ export class A_Context {
 
                 break;
             }
-
+            // 4) If param1 is class of A_Component
             case A_CommonHelper.isInheritedFrom(param1, A_Component): {
                 metaStorage = instance.componentsMeta;
                 property = param1 as typeof A_Component;
@@ -243,7 +261,7 @@ export class A_Context {
 
                 break;
             }
-
+            // 5) If param1 is instance of A_Entity
             case param1 instanceof A_Entity: {
                 metaStorage = instance.entitiesMeta;
                 property = param1.constructor;
@@ -251,15 +269,25 @@ export class A_Context {
 
                 break;
             }
-
+            // 6) If param1 is class of A_Entity
             case A_CommonHelper.isInheritedFrom(param1, A_Entity): {
                 metaStorage = instance.entitiesMeta;
                 property = param1 as typeof A_Entity;
                 metaType = A_EntityMeta;
+
                 break;
             }
+            // 7) If param1 is string then we need to find the component by its name
+            case typeof param1 === 'string': {
+                metaStorage = instance.componentsMeta;
+                const found = Array.from(instance.componentsMeta).find(([c]) => c.name === param1)!;
+                if (!(found && found.length)) throw new A_Error(`Component with name ${param1} not found`);
+                property = found[0];
+                metaType = A_ComponentMeta;
 
-
+                break;
+            }
+            // 8) If param1 is any other class or function
             default: {
                 metaStorage = instance.customMeta;
                 property = typeof (param1 as any) === 'function' ? param1 : param1.constructor;
@@ -281,6 +309,15 @@ export class A_Context {
 
 
 
+    /**
+     * Get the scope of the specific class or instance.
+     * 
+     * Every execution in Concept has its own scope.
+     * 
+     * This method will return the scope of the specific class or instance.
+     * 
+     * @param entity 
+     */
     static scope(
         entity: A_Entity
     ): A_Scope