@adaas/a-utils 0.1.14 → 0.1.16

package/src/lib/A-Command/A-Command.entity.ts

@@ -4,10 +4,11 @@ import {
     A_TYPES__Command_Serialized
 } from "./A-Command.types";
 import {
+    A_CommandFeatures,
     A_CONSTANTS__A_Command_Event,
     A_CONSTANTS__A_Command_Status
 } from "./A-Command.constants";
-import { A_Context, A_Entity, A_Error, A_Scope } from "@adaas/a-concept";
+import { A_Component, A_Context, A_Entity, A_Error, A_Feature, A_Scope } from "@adaas/a-concept";
 import { A_Memory } from "../A-Memory/A-Memory.context";
 import { A_CommandError } from "./A-Command.error";
 
@@ -157,10 +158,9 @@ export class A_Command<
         this._status = A_CONSTANTS__A_Command_Status.INITIALIZATION;
         this._startTime = new Date();
 
-        this.checkScopeInheritance();
 
-        this.emit('init');
-        await this.call('init', this.scope);
+        this.emit(A_CommandFeatures.onInit);
+        await this.call(A_CommandFeatures.onInit, this.scope);
         this._status = A_CONSTANTS__A_Command_Status.INITIALIZED;
     }
 
@@ -173,8 +173,8 @@ export class A_Command<
         this.checkScopeInheritance();
 
         this._status = A_CONSTANTS__A_Command_Status.COMPILATION;
-        this.emit('compile');
-        await this.call('compile', this.scope);
+        this.emit(A_CommandFeatures.onCompile);
+        await this.call(A_CommandFeatures.onCompile, this.scope);
         this._status = A_CONSTANTS__A_Command_Status.COMPILED;
     }
 
@@ -191,9 +191,9 @@ export class A_Command<
 
         this.checkScopeInheritance();
 
-        this.emit('execute');
+        this.emit(A_CommandFeatures.onExecute);
 
-        await this.call('execute', this.scope);
+        await this.call(A_CommandFeatures.onExecute, this.scope);
     }
 
     /**
@@ -204,13 +204,19 @@ export class A_Command<
 
         try {
             await this.init();
+
             await this.compile();
+
             await this.process();
+
             await this.complete();
 
+
         } catch (error) {
             await this.fail();
         }
+
+        this._executionScope.destroy();
     }
 
     /**
@@ -221,10 +227,11 @@ export class A_Command<
 
         this._status = A_CONSTANTS__A_Command_Status.COMPLETED;
         this._endTime = new Date();
-        this._result = this.scope.resolve(A_Memory).toJSON() as ResultType;
+        this._result = this.scope.resolve(A_Memory)!.toJSON() as ResultType;
+
+        this.emit(A_CommandFeatures.onComplete);
+        await this.call(A_CommandFeatures.onComplete, this.scope);
 
-        this.emit('complete');
-        return await this.call('complete', this.scope);
     }
 
 
@@ -236,10 +243,10 @@ export class A_Command<
 
         this._status = A_CONSTANTS__A_Command_Status.FAILED;
         this._endTime = new Date();
-        this._errors = this.scope.resolve(A_Memory).Errors;
+        this._errors = this.scope.resolve(A_Memory)!.Errors;
 
-        this.emit('fail');
-        return await this.call('fail', this.scope);
+        this.emit(A_CommandFeatures.onFail);
+        await this.call(A_CommandFeatures.onFail, this.scope);
     }
 
 
@@ -382,5 +389,4 @@ export class A_Command<
             this.scope.inherit(A_Context.scope(this));
         }
     }
-
 }

package/src/lib/A-Command/A-Command.types.ts

@@ -1,6 +1,6 @@
 import { A_Command } from "./A-Command.entity";
-import { A_CONSTANTS__A_Command_Event, A_CONSTANTS__A_Command_Status, A_TYPES__CommandMetaKey } from "./A-Command.constants";
-import { A_Meta, A_TYPES__Entity_Serialized, A_TYPES__Error_Serialized, A_TYPES__FeatureDefineDecoratorMeta, A_TYPES__FeatureExtendDecoratorMeta } from "@adaas/a-concept";
+import { A_CONSTANTS__A_Command_Event, A_CONSTANTS__A_Command_Status, } from "./A-Command.constants";
+import { A_TYPES__Entity_Serialized, A_TYPES__Error_Serialized } from "@adaas/a-concept";
 
 
 
@@ -70,36 +70,3 @@ export type A_TYPES__Command_Listener<
     ResultType extends Record<string, any> = Record<string, any>,
     LifecycleEvents extends string = A_CONSTANTS__A_Command_Event
 > = (command?: A_Command<InvokeType, ResultType, LifecycleEvents>) => void;
-
-
-// ============================================================================
-// --------------------------- Meta Types -------------------------------------
-// ============================================================================
-/**
- * Command meta type
- */
-export type A_TYPES__CommandMeta = {
-    [A_TYPES__CommandMetaKey.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__FeatureExtendDecoratorMeta[]
-
-    }>, case
-
-
-    [A_TYPES__CommandMetaKey.FEATURES]: A_Meta<{
-        /**
-         * Where Key is the name of the feature
-         * 
-         * Where value is the list of features
-         */
-        [Key: string]: A_TYPES__FeatureDefineDecoratorMeta
-    }>
-}
-

package/src/lib/A-Config/A-Config.container.ts

@@ -38,15 +38,15 @@ export class A_ConfigLoader extends A_Container {
             switch (true) {
 
                 case A_Context.environment === 'server' && !!fs.existsSync(`${A_Context.concept}.conf.json`):
-                    this.reader = this.scope.resolve<ConfigReader>(FileConfigReader);
+                    this.reader = this.scope.resolve<ConfigReader>(FileConfigReader)!;
                     break;
 
                 case A_Context.environment === 'server' && !fs.existsSync(`${A_Context.concept}.conf.json`):
-                    this.reader = this.scope.resolve<ConfigReader>(ENVConfigReader);
+                    this.reader = this.scope.resolve<ConfigReader>(ENVConfigReader)!;
                     break;
 
                 case A_Context.environment === 'browser':
-                    this.reader = this.scope.resolve<ConfigReader>(ENVConfigReader);
+                    this.reader = this.scope.resolve<ConfigReader>(ENVConfigReader)!;
                     break;
 
                 default:

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

@@ -18,9 +18,10 @@ export class ConfigReader extends A_Component {
     async attachContext(
         @A_Inject(A_Container) container: A_Container,
         @A_Inject(A_Feature) feature: A_Feature,
+        @A_Inject(A_Config) config?: A_Config,
     ) {
-        if (!container.scope.has(A_Config)) {
-            const newConfig = new A_Config({
+        if (!config) {
+            config= new A_Config({
                 variables: [
                     ...A_CONSTANTS__DEFAULT_ENV_VARIABLES_ARRAY,
                     ...A_CONSTANTS__CONFIG_ENV_VARIABLES_ARRAY
@@ -28,12 +29,9 @@ export class ConfigReader extends A_Component {
                 defaults: {}
             });
 
-            container.scope.register(newConfig);
+            container.scope.register(config);
         }
 
-
-        const config = container.scope.resolve<A_Config>(A_Config);
-
         const rootDir = await this.getProjectRoot();
 
         config.set('A_CONCEPT_ROOT_FOLDER', rootDir);