@adaas/a-concept 0.0.4 → 0.0.6

package/examples/simple/containers/Main.container.ts

@@ -3,6 +3,9 @@ import { A_Feature } from "@adaas/a-concept/global/A-Feature/A-Feature.class";
 import { ContextFragmentA } from "../context/Fragment_A.context";
 import { ContextFragmentB } from "../context/Fragment_B.context";
 import { A_Concept } from "@adaas/a-concept/global/A-Concept/A_Concept.class";
+import { A_Inject } from "@adaas/a-concept/decorators/A-Inject/A-Inject.decorator";
+import { A_Context } from "@adaas/a-concept/global/A-Context/A-Context.class";
+import { A_Logger } from "@adaas/a-concept/base/A-Logger/A-Logger.component";
 
 
 
@@ -16,26 +19,50 @@ export class MainContainer extends A_Container<
     }
 
     @A_Concept.Start()
-    async start () {
-        console.log('Start');
+    async start(
+        @A_Inject(MainContainer) params?: any
+    ) {
+        if (params) {
+            console.log('Start');
+
+        }
+
+        A_Context.feature(this, 'method_A');
     }
 
 
-    
+
 
     @A_Feature.Define()
     async method_A() {
         console.log('Method A');
-        const feature = this.call('method_A', {
-            fragments: [new ContextFragmentA(), new ContextFragmentB()]
+        await this.call('method_A', {
+            fragments: [
+                new ContextFragmentA(),
+                new ContextFragmentB()
+            ]
         });
-
-        await feature.process();
     }
 
+
+
+
     @A_Feature.Define()
     async method_B() {
-        console.log('Method B');
-        return this.call('method_B');
+        console.log('Method B', A_Context.root);
+
+        const logger = this.Scope.resolve(A_Logger);
+
+        // or  you can manually call the feature
+
+        const feature = A_Context.feature(this, 'method_B', {
+            fragments: [new ContextFragmentA(), new ContextFragmentB()]
+        });
+
+        for (const step of feature) {
+            logger.log('Manual Loop Execution Step', feature.current);
+
+            await step();
+        }
     }
 }

package/examples/simple-http-server/components/http-error-handler.component.ts

@@ -3,13 +3,16 @@ import { HTTPRequest } from "../contexts/http-request.context";
 import { A_Logger } from "@adaas/a-concept/base/A-Logger/A-Logger.component";
 import { HttpServer } from "../containers/http-server.container";
 import { A_Feature } from "@adaas/a-concept/global/A-Feature/A-Feature.class";
+import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
 
 
-export class HTTPErrorHandler {
+export class HTTPErrorHandler extends A_Component {
 
     constructor(
         @A_Inject(A_Logger) private logger: A_Logger
-    ) { }
+    ) { 
+        super();
+    }
 
 
 

package/examples/simple-http-server/components/http-request-handler.component.ts

@@ -1,4 +1,6 @@
-export class HTTPRequestHandler  {
+import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
+
+export class HTTPRequestHandler  extends A_Component {
 
 
 

package/index.ts

@@ -4,7 +4,7 @@
 // =================================================================================================
 // ---------------------- Major Components ----------------------
 export { A_Context } from './src/global/A-Context/A-Context.class';
-export * from './src/global/A-Context/A-Context.types';
+// export * from './src/global/A-Context/A-Context.types';
 
 export { A_Concept } from './src/global/A-Concept/A_Concept.class';
 export { A_ConceptMeta } from './src/global/A-Concept/A_Concept.meta';
@@ -18,6 +18,9 @@ export { A_Component } from './src/global/A-Component/A-Component.class';
 export { A_ComponentMeta } from './src/global/A-Component/A-Component.meta';
 export * from './src/global/A-Component/A-Component.types';
 
+export { A_Entity } from './src/global/A-Entity/A-Entity.class';
+export * from './src/global/A-Entity/A-Entity.types';
+
 
 // ---------------------- Common Components ----------------------
 export { A_Feature } from './src/global/A-Feature/A-Feature.class';
@@ -40,7 +43,12 @@ export * from './src/global/A-Fragment/A-Fragment.types';
 export { A_Inject } from './src/decorators/A-Inject/A-Inject.decorator';
 export * from './src/decorators/A-Inject/A-Inject.decorator.types';
 
+export { A_Feature_Define } from './src/decorators/A-Feature/A-Feature-Define.decorator';
+export { A_Feature_Extend } from './src/decorators/A-Feature/A-Feature-Extend.decorator';
+export * from './src/decorators/A-Feature/A-Feature.decorator.types';
 
+export { A_Stage } from './src/decorators/A-Stage/A-Stage.decorator';
+export * from './src/decorators/A-Stage/A-Stage.decorator.types';
 
 
 // =================================================================================================

package/jest.config.ts

@@ -13,10 +13,6 @@ const config: Config.InitialOptions = {
         "@adaas/a-concept/types/(.*)": ["<rootDir>/src/types/$1"],
         "@adaas/a-concept/helpers/(.*)": ["<rootDir>/src/helpers/$1"],
         "@adaas/a-concept/decorators/(.*)": ["<rootDir>/src/decorators/$1"],
-        "@adaas/a-concept/managers/(.*)": ["<rootDir>/src/managers/$1"],
-        "@adaas/a-concept/providers/(.*)": ["<rootDir>/src/providers/$1"],
-        "@adaas/a-concept/modules/(.*)": ["<rootDir>/src/modules/$1"],
-        "@adaas/a-concept/storage/(.*)": ["<rootDir>/src/storage/$1"],
         "@adaas/a-concept/base/(.*)": ["<rootDir>/src/base/$1"],
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaas/a-concept",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "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/base/A-Config/A-Config.container.ts

@@ -19,10 +19,7 @@ export class A_ConfigLoader extends A_Container<['load', 'read']> {
 
 
     async identifyReader(
-        @A_Inject(A_Scope) scope: A_Scope,
-        @A_Inject(A_Logger) logger: A_Logger
     ) {
-
         // OR Inject the logger by calling Context Provider
         // const logger2 = await this.CP.resolve(A_LoggerContext);
 
@@ -30,17 +27,17 @@ export class A_ConfigLoader extends A_Container<['load', 'read']> {
 
         switch (true) {
 
-            case A_Context.environment === 'server' && !!fs.existsSync(`${scope.name}.conf.json`):
-                this.reader = scope.resolve(FileConfigReader);
+            case A_Context.environment === 'server' && !!fs.existsSync(`${this.Scope.name}.conf.json`):
+                this.reader = this.Scope.resolve(FileConfigReader);
                 break;
 
 
-            case A_Context.environment === 'server': !fs.existsSync(`${scope.name}.conf.json`)
-                this.reader = scope.resolve(ENVConfigReader);
+            case A_Context.environment === 'server': !fs.existsSync(`${this.Scope.name}.conf.json`)
+                this.reader = this.Scope.resolve(ENVConfigReader);
                 break;
 
             case A_Context.environment === 'browser':
-                this.reader = scope.resolve(ENVConfigReader);
+                this.reader = this.Scope.resolve(ENVConfigReader);
                 break;
 
             default:

package/src/base/A-Config/A-Config.context.ts

@@ -28,12 +28,19 @@ export class A_Config<
 
         this.config = A_CommonHelper.deepCloneAndMerge<A_TYPES__ConfigContainerConstructor<T>>(config as any, {
             name: this.name,
-            defaults: {} as Record<T, any>
+            defaults: {} as Record<T, any>,
+            variables: [] as T[]
         });
 
         this.CONFIG_PROPERTIES = this.config.variables ? this.config.variables : [];
     }
 
+    protected async onInit(): Promise<void> {
+        this.config.variables.forEach((variable) => {
+            this.VARIABLES.set(variable, this.config.defaults[variable]);
+        });
+    }
+
 
     /** 
      * This method is used to get the configuration property by name
@@ -44,7 +51,8 @@ export class A_Config<
     get<_OutType = any>(
         property: T | typeof this.DEFAULT_ALLOWED_TO_READ_PROPERTIES[number]
     ): _OutType {
-        if (this.CONFIG_PROPERTIES.includes(property as any))
+        if (this.CONFIG_PROPERTIES.includes(property as any)
+            || this.DEFAULT_ALLOWED_TO_READ_PROPERTIES.includes(property as any))
             return this.VARIABLES.get(property as string) as _OutType;
 
         throw new Error('Property not exists or not allowed to read') as never;

package/src/base/A-Config/A-Config.types.ts

@@ -1,17 +1,22 @@
 import { A_TYPES__FragmentConstructor } from "@adaas/a-concept/global/A-Fragment/A-Fragment.types";
-import { A_TYPES__Dictionary } from "@adaas/a-utils";
+
+
+export enum A_TYPES__ConfigFeature {
+    
+}
+
 
 export type A_TYPES__ConfigContainerConstructor<T extends string> = {
 
     /**
      * Allows to define the names of variable to be loaded
      */
-    variables?: Array<T>
+    variables: Array<T>
 
     /**
      * Allows to set the default values for the variables
      */
-    defaults?: {
+    defaults: {
         [key in T]?: any
     }
 

package/src/base/A-Config/components/ConfigReader.component.ts

@@ -1,16 +1,19 @@
 import { A_Scope } from "@adaas/a-concept/global/A-Scope/A-Scope.class";
 import { A_Inject } from "@adaas/a-concept/decorators/A-Inject/A-Inject.decorator";
+import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
 
 
 
 /**
  * Config Reader
  */
-export class ConfigReader {
+export class ConfigReader extends A_Component {
 
     constructor(
         @A_Inject(A_Scope) protected scope: A_Scope
-    ) { }
+    ) {
+        super();
+    }
 
 
     /**

package/src/base/A-Errors/A-Errors.component.ts

@@ -3,14 +3,15 @@ import { A_Inject } from "@adaas/a-concept/decorators/A-Inject/A-Inject.decorato
 import { A_Errors } from "./A-Errors.context";
 import { A_CONSTANTS__ERROR_CODES, A_Error, A_ServerError, ASEID } from "@adaas/a-utils";
 import { A_Context } from "@adaas/a-concept/global/A-Context/A-Context.class";
+import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
 
-export class A_ErrorsManager {
+export class A_ErrorsManager extends A_Component {
 
     constructor(
         @A_Inject(A_Scope) protected scope: A_Scope,
         @A_Inject(A_Errors) protected errors: A_Errors
     ) {
-
+        super();
     }
 
 

package/src/base/A-Logger/A-Logger.component.ts

@@ -2,15 +2,17 @@ import { A_Inject } from "@adaas/a-concept/decorators/A-Inject/A-Inject.decorato
 import { A_Error } from "@adaas/a-utils";
 import { A_Config } from "../A-Config/A-Config.context";
 import { A_Scope } from "@adaas/a-concept/global/A-Scope/A-Scope.class";
+import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
 
 
 
-export class A_Logger {
+export class A_Logger extends A_Component {
 
     constructor(
         @A_Inject(A_Scope) protected scope: A_Scope,
         @A_Inject(A_Config) protected config: A_Config
     ) {
+        super();
     }
 
     readonly colors = {
@@ -75,11 +77,27 @@ export class A_Logger {
     }
 
 
-    log(...args) {
+    log(
+        color: keyof typeof this.colors,
+        ...args: any[]
+    )
+    log(
+        ...args: any[]
+    )
+    log(
+        param1: any,
+        ...args: any[]
+    ) {
         if (!this.config.get('CONFIG_VERBOSE'))
             return;
 
-        console.log(...this.compile('blue', ...args));
+        if (typeof param1 === 'string' && this.colors[param1]) {
+            console.log(...this.compile(param1 as keyof typeof this.colors, ...args));
+            return;
+        }
+        else {
+            console.log(...this.compile('blue', param1, ...args));
+        }
     }
 
     warning(...args) {

package/src/decorators/A-Feature/A-Feature-Define.decorator.ts

@@ -36,7 +36,6 @@ export function A_Feature_Define(
             || new Map();
 
 
-
         // Set the metadata of the method to define a custom Feature with name 
         existedMeta.set(propertyKey, {
             handler: propertyKey,

package/src/decorators/A-Feature/A-Feature-Extend.decorator.ts

@@ -5,6 +5,9 @@ import {
 } from "./A-Feature.decorator.types";
 import { A_TYPES__ComponentMetaKey } from "@adaas/a-concept/global/A-Component/A-Component.types";
 import { A_Context } from "@adaas/a-concept/global/A-Context/A-Context.class";
+import { A_Container } from "@adaas/a-concept/global/A-Container/A-Container.class";
+import { A_Entity } from "@adaas/a-concept/global/A-Entity/A-Entity.class";
+import { A_Meta } from "@adaas/a-concept/global/A-Meta/A-Meta.class";
 
 
 
@@ -31,27 +34,29 @@ export function A_Feature_Extend(
         descriptor: A_TYPES__A_ExtendDecoratorDescriptor
     ) {
 
+        const extensionName = config.name || propertyKey
+
         // Get the existed metadata or create a new one
         const existedMeta = A_Context
             .meta(target)
             .get(A_TYPES__ComponentMetaKey.EXTENSIONS)
-            || new Map();
+            || new A_Meta();
 
-        // Set the metadata of the method to define a custom Feature with name
-        existedMeta.set(propertyKey, {
-            name: config.name || propertyKey,
+
+        const existedMetaValue = existedMeta.get(extensionName) || [];
+
+        // Add the new method to the metadata
+        existedMetaValue.push({
+            name: extensionName,
             handler: propertyKey,
-            container: config.container
-                ? typeof config.container === 'string'
-                    ? config.container
-                    : config.container.name
-                : '*',
         });
 
+        // Set the metadata of the method to define a custom Feature with name
+        existedMeta.set(extensionName, existedMetaValue);
+
         //  Update the metadata of the container with the new Feature definition
         A_Context
             .meta(target)
             .set(A_TYPES__ComponentMetaKey.EXTENSIONS, existedMeta);
-
     };
 }

package/src/decorators/A-Inject/A-Inject.decorator.ts

@@ -1,11 +1,11 @@
 import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
-import { A_Container } from "@adaas/a-concept/global/A-Container/A-Container.class";
-import { A_TYPES__A_InjectDecoratorReturn, A_TYPES__A_InjectDecoratorStorageInstruction } from "./A-Inject.decorator.types";
-import { A_STORAGE__A_Inject_Instructions } from "@adaas/a-concept/storage/A_Inject.storage";
+import { A_TYPES__A_InjectDecoratorReturn } from "./A-Inject.decorator.types";
 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 { A_Context } from "@adaas/a-concept/global/A-Context/A-Context.class";
 import { A_TYPES__ComponentMetaKey } from "@adaas/a-concept/global/A-Component/A-Component.types";
+import { A_Meta } from "@adaas/a-concept/global/A-Meta/A-Meta.class";
+import { A_Feature } from "@adaas/a-concept/global/A-Feature/A-Feature.class";
 
 
 
@@ -34,9 +34,9 @@ export function A_Inject(
 ): A_TYPES__A_InjectDecoratorReturn
 
 //  Allows to inject just one container
-export function A_Inject(
-    container: typeof A_Container
-): A_TYPES__A_InjectDecoratorReturn
+// export function A_Inject(
+//     container: typeof A_Container
+// ): A_TYPES__A_InjectDecoratorReturn
 
 // Allows to inject just one Context Fragment
 export function A_Inject(
@@ -51,10 +51,9 @@ export function A_Inject<
 ): A_TYPES__A_InjectDecoratorReturn
 
 // ====================== BASE FUNCTION ======================
-export function A_Inject<
-    T extends Array<typeof A_Fragment>
->(
-    param1: T | typeof A_Fragment | typeof A_Component | typeof A_Container | typeof A_Fragment,
+export function A_Inject(
+    param1: typeof A_Fragment | typeof A_Component | typeof A_Scope | typeof A_Feature,
+
 ): A_TYPES__A_InjectDecoratorReturn {
     return function (
         target: A_Component,
@@ -62,13 +61,15 @@ export function A_Inject<
         parameterIndex: number
     ) {
 
-        const method = methodName ? methodName : 'constructor';
+        const method = methodName ? String(methodName) : 'constructor';
 
+        console.log('target: ', target);
 
         const existedMeta = A_Context
             .meta(target)
             .get(A_TYPES__ComponentMetaKey.INJECTIONS)
-            || new Map();
+            || new A_Meta();
+
 
         const paramsArray = existedMeta.get(method) || [];
 

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

@@ -1,5 +1,60 @@
+import { A_TYPES__Required } from "@adaas/a-utils";
+import { A_Context } from "../A-Context/A-Context.class";
+import { A_TYPES__ComponentCallParams } from "./A-Component.types";
+
 /**
  * This element only contains the specific code
  * 
  */
-export class A_Component { }
+export class A_Component<
+    _FeatureNames extends Array<string> = any,
+> {
+
+
+    /**
+     * Call a feature of the component
+     * 
+     * @param lifecycleMethod 
+     * @param args 
+     */
+    async call(
+        /**
+         * A-Feature method name to be called
+         */
+        feature: _FeatureNames[number],
+    ): Promise<any>
+    async call(
+        /**
+         * A-Feature name to be called
+         */
+        params: A_TYPES__Required<Partial<A_TYPES__ComponentCallParams<_FeatureNames[number]>>, ['name']>,
+    ): Promise<any>
+
+    async call(
+        /**
+        * A-Feature method name to be called
+        */
+        feature: string,
+        /**
+         * Parameters to provide additional data to the feature
+         */
+        params: Partial<A_TYPES__ComponentCallParams<_FeatureNames[number]>>,
+    ): Promise<any>
+
+    async call(
+        param1: _FeatureNames[number] | A_TYPES__Required<Partial<A_TYPES__ComponentCallParams<_FeatureNames[number]>>, ['name']>,
+        param2?: Partial<A_TYPES__ComponentCallParams<_FeatureNames[number]>>
+    ): Promise<any> {
+
+        const feature: string = typeof param1 === 'string'
+            ? param1
+            : param1.name;
+        const params: Partial<A_TYPES__ComponentCallParams<_FeatureNames[number]>> = typeof param1 === 'string'
+            ? param2 || {}
+            : param1;
+
+        const newFeature = A_Context.feature(this, feature, params);
+
+        return await newFeature.process();
+    }
+}

package/src/global/A-Component/A-Component.meta.ts

@@ -1,9 +1,48 @@
 import { A_Meta } from "../A-Meta/A-Meta.class";
-import { A_TYPES__ComponentMeta } from "./A-Component.types";
+import { A_TYPES__ComponentMeta, A_TYPES__ComponentMetaExtension, A_TYPES__ComponentMetaKey } from "./A-Component.types";
 
 
 export class A_ComponentMeta extends A_Meta<A_TYPES__ComponentMeta> {
 
 
 
+
+    /**
+     * Allows to get all the extensions for a given feature
+     * 
+     * @param feature 
+     * @returns 
+     */
+    extensions(
+        feature: string
+    ): A_TYPES__ComponentMetaExtension[] {
+        const steps: A_TYPES__ComponentMetaExtension[] = [];
+
+        const extensions = this.get(A_TYPES__ComponentMetaKey.EXTENSIONS);
+        const injections = this.get(A_TYPES__ComponentMetaKey.INJECTIONS);
+
+        // const constructor = A_Context.component(this);
+
+
+        extensions
+            // returns all extensions that match the feature
+            ?.find(feature)
+            .forEach(([handler, extensions]) => {
+                extensions.forEach(extension => {
+
+                    const args = injections?.get(extension.handler) || [];
+
+                    steps.push({
+                        // component: constructor,
+                        handler: extension.handler,
+                        args
+                    });
+
+                });
+            });
+
+
+        return steps;
+    }
+
 }

package/src/global/A-Component/A-Component.types.ts

@@ -1,15 +1,42 @@
+import { A_Feature } from "../A-Feature/A-Feature.class"
+import { A_Fragment } from "../A-Fragment/A-Fragment.class"
+import { A_Meta } from "../A-Meta/A-Meta.class"
+import { A_Scope } from "../A-Scope/A-Scope.class"
+import { A_Component } from "./A-Component.class"
+
+
+export type A_TYPES__ComponentCallParams<T extends string> = {
+    name: T,
+    fragments: Array<A_Fragment>,
+    components: Array<{ new(...args: any[]): any }>
+}
 
 
 export type A_TYPES__ComponentMeta = {
-    [A_TYPES__ComponentMetaKey.EXTENSIONS]: Map<string, A_TYPES__ComponentMeta_ExtensionItem>,
+    [A_TYPES__ComponentMetaKey.EXTENSIONS]: A_Meta<{
+
+        /**
+         * Where Key the regexp for what to apply the extension
+         * A set of container names or a wildcard, or a regexp
+         * 
+         *
+         * Where value is the extension instructions
+         */
+        [Key: string]: A_TYPES__ComponentMeta_ExtensionItem[]
+    }>,
+
+
     [A_TYPES__ComponentMetaKey.FEATURES]: any[],
-    [A_TYPES__ComponentMetaKey.INJECTIONS]: Map<
-        // Where key is method name
-        Symbol | string,
-        // And value is Injection instructions
-        A_TYPES__ComponentMeta_InjectionParams
-    >
 
+
+    [A_TYPES__ComponentMetaKey.INJECTIONS]: A_Meta<{
+        /**
+         * Where Key is the name of the injection
+         * 
+         * Where value is the list of injections
+         */
+        [Key: string]: Array<A_TYPES__ComponentMeta_InjectionParam>
+    }>
 }
 
 export enum A_TYPES__ComponentMetaKey {
@@ -18,23 +45,28 @@ export enum A_TYPES__ComponentMetaKey {
     INJECTIONS = 'a-component-injections',
 }
 
+export type A_TYPES__ComponentMetaExtension = {
+    handler: string,
+    args: A_TYPES__ComponentMeta_InjectionParam[]
+}
+
 
 export type A_TYPES__ComponentMeta_ExtensionItem = {
     name: string,
-    container: string,
     handler: string,
 }
 
 
-export type A_TYPES__ComponentMeta_InjectionParams = Array<
-    // typeof A_Namespace
-    // | typeof A_Component
-    // | typeof A_Container
-    // | typeof A_ContextFragment
-    // | Array<typeof A_Namespace>
-    // | Array<typeof A_Component>
-    // | Array<typeof A_Container>
-    // | Array<typeof A_ContextFragment>
-    | { new(...args: any[]): any }
->
+
+export type A_TYPES__ComponentMeta_InjectionParam =
+    { new(...args: any[]): A_Fragment }
+    | { new(...args: any[]): A_Component }
+    // | { new(...args: any[]): any }
+    | { new(...args: any[]): A_Scope }
+    | { new(...args: any[]): A_Feature };
+// typeof A_Fragment
+// | typeof A_Component
+// // | { new(...args: any[]): any }
+// | typeof A_Scope
+// | typeof A_Feature;