@adaas/a-concept 0.0.49 → 0.0.50

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

@@ -30,3 +30,4 @@ export declare function A_Feature_Extend(config: Partial<A_TYPES__A_ExtendDecora
  * [!] AND it will be applicable for ANY element where the name is the same as the name of the function
  */
 export declare function A_Feature_Extend(): any;
+export declare function buildTargetRegexp(param1: any, include: any[], exclude: any[], propertyKey: string): RegExp;

package/dist/src/decorators/A-Feature/A-Feature-Extend.decorator.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.A_Feature_Extend = A_Feature_Extend;
+exports.buildTargetRegexp = buildTargetRegexp;
 const A_Component_types_1 = require("../../global/A-Component/A-Component.types");
 const A_Context_class_1 = require("../../global/A-Context/A-Context.class");
 const A_Meta_class_1 = require("../../global/A-Meta/A-Meta.class");
@@ -10,16 +11,22 @@ function A_Feature_Extend(param1) {
         let behavior = 'sync';
         let before = [];
         let after = [];
+        let include = [];
+        let exclude = [];
         // Check if the config is a RegExp
         if (param1 instanceof RegExp) {
             targetRegexp = param1;
         }
-        else if (!!param1) {
-            targetRegexp = new RegExp(`^${param1.scope
-                ? `(${param1.scope
-                    .map(el => el.name)
-                    .join('|')})`
-                : '.*'}\\.${param1.name || propertyKey}$`);
+        else if (!!param1 && typeof param1 === 'object') {
+            if (Array.isArray(param1.scope))
+                include = param1.scope;
+            else if (!!param1.scope && typeof param1.scope === 'object') {
+                if (Array.isArray(param1.scope.include))
+                    include = param1.scope.include;
+                if (Array.isArray(param1.scope.exclude))
+                    exclude = param1.scope.exclude;
+            }
+            targetRegexp = buildTargetRegexp(param1, include, exclude, propertyKey);
             behavior = param1.behavior || behavior;
             before = param1.before || before;
             after = param1.after || after;
@@ -59,4 +66,16 @@ function A_Feature_Extend(param1) {
             .set(A_Component_types_1.A_TYPES__ComponentMetaKey.EXTENSIONS, existedMeta);
     };
 }
+function buildTargetRegexp(param1, include, exclude, propertyKey) {
+    const includePart = include.length
+        ? `(${include.map(el => el.name).join('|')})`
+        : `.*`;
+    const excludePart = exclude.length
+        ? `(?!${exclude.map(el => el.name).join('|')})`
+        : ``;
+    const pattern = param1.scope
+        ? `^${excludePart}${includePart}\\.${param1.name || propertyKey}$`
+        : `.*\\.${param1.name || propertyKey}$`;
+    return new RegExp(pattern);
+}
 //# sourceMappingURL=A-Feature-Extend.decorator.js.map

package/dist/src/decorators/A-Feature/A-Feature-Extend.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"A-Feature-Extend.decorator.js","sourceRoot":"","sources":["../../../../src/decorators/A-Feature/A-Feature-Extend.decorator.ts"],"names":[],"mappings":";;AA+CA,4CA8EC;AAxHD,6FAAkG;AAClG,uFAA8E;AAC9E,8EAAqE;AAwCrE,SAAgB,gBAAgB,CAC5B,MAA2D;IAE3D,OAAO,UACH,MAAmB,EACnB,WAAmB,EACnB,UAAgD;QAGhD,IAAI,YAAoB,CAAC;QACzB,IAAI,QAAQ,GAAqB,MAAM,CAAC;QACxC,IAAI,MAAM,GAAa,EAAE,CAAC;QAC1B,IAAI,KAAK,GAAa,EAAE,CAAC;QAGzB,kCAAkC;QAClC,IAAI,MAAM,YAAY,MAAM,EAAE,CAAC;YAC3B,YAAY,GAAG,MAAM,CAAC;QAC1B,CAAC;aACI,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;YAChB,YAAY,GAAG,IAAI,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK;gBACtC,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK;qBACb,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;qBAClB,IAAI,CAAC,GAAG,CAAC,GAAG;gBACjB,CAAC,CAAC,IACF,MAAM,MAAM,CAAC,IAAI,IAAI,WAAW,GAAG,CAAC,CAAC;YAEzC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,QAAQ,CAAC;YACvC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;YACjC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC;QAClC,CAAC;aACI,CAAC;YACF,YAAY,GAAG,IAAI,MAAM,CAAC,SAAS,WAAW,GAAG,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,kBAAkB,GAAG,2BAAS;aAC/B,IAAI,CAAC,MAAM,CAAC;aACZ,GAAG,CAAC,6CAAyB,CAAC,QAAQ,CAAC,CAAC;QAI7C,+CAA+C;QAC/C,MAAM,WAAW,GAAG,2BAAS;aACxB,IAAI,CAAC,MAAM,CAAC;aACZ,GAAG,CAAC,6CAAyB,CAAC,UAAU,CAAC;eACvC,IAAI,qBAAM,EAAE,CAAC;QAGpB,IAAI,kBAAkB;eACf,kBAAkB,CAAC,IAAI,EAAE;eACzB,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC;eACnC,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,MAAM,EAChD,CAAC;YAEC,MAAM,IAAI,KAAK,CAAC,kDAAkD,WAAW;8GACqB,CAAC,CAAC;QACxG,CAAC;QAGD,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAEpE,qCAAqC;QACrC,gBAAgB,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,YAAY,CAAC,MAAM;YACzB,OAAO,EAAE,WAAW;YACpB,QAAQ;YACR,MAAM;YACN,KAAK;SACR,CAAC,CAAC;QAEH,sEAAsE;QACtE,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;QAEvD,wEAAwE;QACxE,2BAAS;aACJ,IAAI,CAAC,MAAM,CAAC;aACZ,GAAG,CAAC,6CAAyB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"A-Feature-Extend.decorator.js","sourceRoot":"","sources":["../../../../src/decorators/A-Feature/A-Feature-Extend.decorator.ts"],"names":[],"mappings":"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"}

package/dist/src/decorators/A-Feature/A-Feature.decorator.types.d.ts

@@ -38,15 +38,34 @@ export type A_TYPES__A_ExtendDecoratorConfig = {
      *
      * [!] If not provided will be applied to all containers with the same name.
      * [!!] By default uses OR to join all provided items. If you need more complex Logic, please use Regexp instead
+     *
+     * [!!!] In case if you need to exclude some containers, entities or components, please use "exclude" property
+     *
+     * Example:
+     *
+     * ```ts
+     *  @A_Feature.Extend({
+     *      name: 'load',
+     *      scope: {
+     *          include: [A_Container1, A_Entity1],
+     *          exclude: [A_Component1]
+     *      }
+     *  })
+     * ```
      */
-    scope: Array<{
-        new (...args: any[]): A_Container;
-    } | {
-        new (...args: any[]): A_Entity;
-    } | {
-        new (...args: any[]): A_Component;
-    }>;
+    scope: Array<A_TYPES__A_ExtendDecorator_ScopeItem> | Partial<A_TYPES__A_ExtendDecorator_ScopeConfig>;
 } & A_TYPES__A_ExtendDecorator_BehaviorConfig;
+export type A_TYPES__A_ExtendDecorator_ScopeItem = {
+    new (...args: any[]): A_Container;
+} | {
+    new (...args: any[]): A_Entity;
+} | {
+    new (...args: any[]): A_Component;
+};
+export type A_TYPES__A_ExtendDecorator_ScopeConfig = {
+    include?: Array<A_TYPES__A_ExtendDecorator_ScopeItem>;
+    exclude?: Array<A_TYPES__A_ExtendDecorator_ScopeItem>;
+};
 export type A_TYPES__A_ExtendDecorator_BehaviorConfig = {
     /**
      * The behavior of the method.

package/examples/simple/components/A.component.ts

@@ -4,6 +4,7 @@ import { ContextFragmentB } from "../context/Fragment_B.context";
 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";
 import { A_Logger } from "@adaas/a-concept/base/A-Logger/A-Logger.component";
+import { SecondaryContainer } from "../containers/Secondary.container";
 
 export class ComponentA extends A_Component {
 
@@ -13,7 +14,7 @@ export class ComponentA extends A_Component {
 
 
 
-    @A_Feature.Define() 
+    @A_Feature.Define()
     async method_A(
         @A_Inject(ContextFragmentA) fragmentA: ContextFragmentA,
         @A_Inject(A_Logger) logger: A_Logger,
@@ -45,7 +46,9 @@ export class ComponentA extends A_Component {
     }
 
 
-    @A_Feature.Extend()
+    @A_Feature.Extend({
+        scope: [SecondaryContainer]
+    })
     async method_C(
         @A_Inject(A_Logger) logger: A_Logger
     ) {

package/examples/simple/concept.ts

@@ -10,6 +10,7 @@ import { ENVConfigReader } from "@adaas/a-concept/base/A-Config/components/ENVCo
 import { A_Concept } from "@adaas/a-concept/global/A-Concept/A_Concept.class";
 import { A_Entity } from "@adaas/a-concept/global/A-Entity/A-Entity.class";
 import { A_Feature } from "@adaas/a-concept/global/A-Feature/A-Feature.class";
+import { SecondaryContainer } from "./containers/Secondary.container";
 
 console.log('Simple concept loaded', A_Concept);
 
@@ -28,6 +29,19 @@ console.log('Simple concept loaded', A_Concept);
         ]
     })
 
+    const second = new SecondaryContainer({
+        name: 'SecondaryContainer',
+        components: [
+            A_Logger,
+            ComponentA,
+            ComponentB
+        ],
+        fragments: [
+            new ContextFragmentA(),
+            new ContextFragmentB()
+        ]
+    })
+
     const concept = new A_Concept({
         name: 'test-simple',
         fragments: [
@@ -44,7 +58,8 @@ console.log('Simple concept loaded', A_Concept);
                     ENVConfigReader
                 ]
             }),
-            main
+            main,
+            second
         ]
     });
 
@@ -58,7 +73,8 @@ console.log('Simple concept loaded', A_Concept);
     // await main.method_C();
 
     try {
-        await main.call('method_A')
+        await main.call('method_C')
+        await second.call('method_C')
 
     } catch (error) {
         console.error('Error occurred:', error);

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

@@ -0,0 +1,26 @@
+import { A_Logger } from "@adaas/a-concept/base/A-Logger/A-Logger.component";
+import { A_Inject } from "@adaas/a-concept/decorators/A-Inject/A-Inject.decorator";
+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_Scope } from "@adaas/a-concept/global/A-Scope/A-Scope.class";
+
+
+
+export class SecondaryContainer extends A_Container {
+
+    @A_Concept.Load()
+    async load(
+        @A_Inject(A_Logger) logger: A_Logger
+
+    ) {
+        logger.log('Secondary container loaded');
+    }
+
+    @A_Concept.Start()
+    async start(
+        @A_Inject(A_Scope) scope: A_Scope,
+        @A_Inject(A_Logger) logger: A_Logger
+    ) {
+        await this.call('method_C');
+    }
+} 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaas/a-concept",
-  "version": "0.0.49",
+  "version": "0.0.50",
   "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/decorators/A-Feature/A-Feature-Extend.decorator.ts

@@ -1,5 +1,6 @@
 import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
 import {
+    A_TYPES__A_ExtendDecorator_ScopeItem,
     A_TYPES__A_ExtendDecoratorConfig,
     A_TYPES__A_ExtendDecoratorDescriptor,
 } from "./A-Feature.decorator.types";
@@ -58,25 +59,31 @@ export function A_Feature_Extend(
         let behavior: 'sync' | 'async' = 'sync';
         let before: string[] = [];
         let after: string[] = [];
-
+        let include: Array<A_TYPES__A_ExtendDecorator_ScopeItem> = [];
+        let exclude: Array<A_TYPES__A_ExtendDecorator_ScopeItem> = [];
 
         // Check if the config is a RegExp
         if (param1 instanceof RegExp) {
             targetRegexp = param1;
         }
-        else if (!!param1) {
-            targetRegexp = new RegExp(`^${param1.scope
-                ? `(${param1.scope
-                    .map(el => el.name)
-                    .join('|')})`
-                : '.*'
-                }\\.${param1.name || propertyKey}$`);
+        else if (!!param1 && typeof param1 === 'object') {
+
+            if (Array.isArray(param1.scope))
+                include = param1.scope;
+            else if (!!param1.scope && typeof param1.scope === 'object') {
+                if (Array.isArray(param1.scope.include))
+                    include = param1.scope.include;
+                if (Array.isArray(param1.scope.exclude))
+                    exclude = param1.scope.exclude;
+            }
+
+
+            targetRegexp = buildTargetRegexp(param1, include, exclude, propertyKey);
 
             behavior = param1.behavior || behavior;
             before = param1.before || before;
             after = param1.after || after;
-        }
-        else {
+        } else {
             targetRegexp = new RegExp(`^.*\\.${propertyKey}$`);
         }
 
@@ -93,8 +100,8 @@ export function A_Feature_Extend(
             || new A_Meta();
 
 
-        if (existedDefinitions 
-            && existedDefinitions.size() 
+        if (existedDefinitions
+            && existedDefinitions.size()
             && existedDefinitions.has(propertyKey)
             && existedDefinitions.get(propertyKey)!.invoke
         ) {
@@ -125,3 +132,20 @@ export function A_Feature_Extend(
     };
 }
 
+
+
+export function buildTargetRegexp(param1: any, include: any[], exclude: any[], propertyKey: string) {
+    const includePart = include.length
+        ? `(${include.map(el => el.name).join('|')})`
+        : `.*`;
+
+    const excludePart = exclude.length
+        ? `(?!${exclude.map(el => el.name).join('|')})`
+        : ``;
+
+    const pattern = param1.scope
+        ? `^${excludePart}${includePart}\\.${param1.name || propertyKey}$`
+        : `.*\\.${param1.name || propertyKey}$`;
+
+    return new RegExp(pattern);
+}

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

@@ -73,14 +73,33 @@ export type A_TYPES__A_ExtendDecoratorConfig = {
      * 
      * [!] If not provided will be applied to all containers with the same name.
      * [!!] By default uses OR to join all provided items. If you need more complex Logic, please use Regexp instead
+     * 
+     * [!!!] In case if you need to exclude some containers, entities or components, please use "exclude" property
+     * 
+     * Example:
+     * 
+     * ```ts
+     *  @A_Feature.Extend({
+     *      name: 'load',
+     *      scope: {
+     *          include: [A_Container1, A_Entity1],
+     *          exclude: [A_Component1]
+     *      }
+     *  })
+     * ```
      */
-    scope: Array<
-        { new(...args: any[]): A_Container }
-        | { new(...args: any[]): A_Entity }
-        | { new(...args: any[]): A_Component }
-    >
+    scope: Array<A_TYPES__A_ExtendDecorator_ScopeItem> | Partial<A_TYPES__A_ExtendDecorator_ScopeConfig>,
 } & A_TYPES__A_ExtendDecorator_BehaviorConfig
 
+export type A_TYPES__A_ExtendDecorator_ScopeItem = { new(...args: any[]): A_Container }
+    | { new(...args: any[]): A_Entity }
+    | { new(...args: any[]): A_Component }
+
+
+export type A_TYPES__A_ExtendDecorator_ScopeConfig = {
+    include?: Array<A_TYPES__A_ExtendDecorator_ScopeItem>,
+    exclude?: Array<A_TYPES__A_ExtendDecorator_ScopeItem>
+}
 
 export type A_TYPES__A_ExtendDecorator_BehaviorConfig = {
     /**