@adaas/a-concept 0.1.61 → 0.2.2

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

@@ -1,3 +1,115 @@
+//  ==================================== A-Dependency types ====================================  //
+
+import { A_TYPES__Ctor } from "@adaas/a-concept/types/A_Common.types";
+import { A_Caller } from "../A-Caller/A_Caller.class";
+import { A_Component } from "../A-Component/A-Component.class";
+import { A_Container } from "../A-Container/A-Container.class";
+import { A_Entity } from "../A-Entity/A-Entity.class"
+import { A_Error } from "../A-Error/A_Error.class";
+import { A_Feature } from "../A-Feature/A-Feature.class";
+import { A_Fragment } from "../A-Fragment/A-Fragment.class";
+import { A_Dependency } from "./A-Dependency.class";
+import { A_Scope } from "../A-Scope/A-Scope.class";
+
+
+// ===========================================================================================
+// ============================= A-Dependency Resolution Options =============================
+// ===========================================================================================
+export type A_TYPES__A_DependencyConstructor<T extends A_Dependency> = A_TYPES__Ctor<T>;
+
+export type A_TYPES__A_DependencyInjectable = A_Entity
+    | A_Container
+    | A_Component
+    | A_Fragment
+    | A_Feature
+    | A_Caller
+    | A_Error
+    | A_Scope
+
+
+export type A_TYPES__A_DependencyResolutionType<T> =
+    T extends string
+    ? string
+    : T extends A_TYPES__Ctor<infer R>
+    ? R
+    : never
+
+
+export type A_TYPES__A_DependencyResolutionStrategy<T extends A_TYPES__A_DependencyInjectable = A_TYPES__A_DependencyInjectable> = {
+    /**
+     * If tru will throw an error if the dependency is not found
+     */
+    require: boolean
+    /**
+     * Indicates that dependency should be loaded from a specific path before resolution
+     */
+    load: boolean
+    /**
+     * Number of levels to go up in the parent chain when resolving the dependency
+     */
+    parent: number
+    /**
+     * If true, will only resolve the dependency in the current scope without going up to parent scopes
+     */
+    flat: boolean
+    /**
+     * If has any value indicates that entity should be created with default parameters provided 
+     */
+    create: boolean
+    /**
+     * Default constructor arguments to use when creating the dependency
+     */
+    args: any[]
+
+    /**
+     * Allows to query by specific entity properties e.g. ASEID, name, type, custom properties, etc.
+     */
+    query: Partial<A_TYPES__A_Dependency_EntityInjectionQuery<T>>,
+    /**
+     * Pagination settings for the entity search
+     */
+    pagination: A_TYPES__A_Dependency_EntityInjectionPagination
+}
+
+
+export type A_TYPES__A_Dependency_Serialized<T extends A_TYPES__A_DependencyInjectable = A_TYPES__A_DependencyInjectable> = {
+    name: string,
+    all: boolean,
+    require: boolean,
+    load: boolean,
+    parent: number,
+    flat: boolean,
+    create: any,
+    args: any[],
+    query: Partial<A_TYPES__A_Dependency_EntityInjectionQuery<T>>,
+    pagination: A_TYPES__A_Dependency_EntityInjectionPagination
+}
+
+// =--------------------------------------------------------------------------------------------
+// =========================== A-Dependency Possible Configurations ============================
+// =--------------------------------------------------------------------------------------------
+
+
+export type A_TYPES__A_Dependency_EntityResolutionConfig<T extends A_TYPES__A_DependencyInjectable = A_TYPES__A_DependencyInjectable> = {
+    query: Partial<A_TYPES__A_Dependency_EntityInjectionQuery<T>>,
+    pagination: Partial<A_TYPES__A_Dependency_EntityInjectionPagination>
+}
+
+
+export type A_TYPES__A_Dependency_EntityInjectionQuery<T extends A_TYPES__A_DependencyInjectable = A_TYPES__A_DependencyInjectable> =
+    T extends A_Entity
+    ? {
+        aseid: string,
+    } & {
+        [key in keyof T]?: any
+    }
+    : never;
+
+
+export type A_TYPES__A_Dependency_EntityInjectionPagination = {
+    count: number,
+    from: 'start' | 'end'
+}
 
 
 /**
@@ -27,15 +139,27 @@ export type A_TYPES__A_Dependency_DefaultDecoratorReturn<T = any> = (
     parameterIndex: number
 ) => void
 
-
+/**
+ * A-Dependency parent decorator return type
+ */
 export type A_TYPES__A_Dependency_ParentDecoratorReturn<T = any> = (
     target: T,
     propertyKey: string | symbol | undefined,
     parameterIndex: number
 ) => void
-
+/**
+ * A-Dependency flat decorator return type
+ */
 export type A_TYPES__A_Dependency_FlatDecoratorReturn<T = any> = (
     target: T,
     propertyKey: string | symbol | undefined,
     parameterIndex: number
-) => void
+) => void
+/**
+ * A-Dependency All decorator return type
+ */
+export type A_TYPES__A_Dependency_AllDecoratorReturn<T = any> = (
+    target: T,
+    propertyKey: string | symbol | undefined,
+    parameterIndex: number
+) => void

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

@@ -4,6 +4,7 @@ import { ASEID } from "../ASEID/ASEID.class";
 import { A_TYPES__EntityMetaKey } from "./A-Entity.constants";
 import { A_TYPES__FeatureDefineDecoratorMeta, A_TYPES__FeatureExtendDecoratorMeta } from "../A-Feature/A-Feature.types";
 import { A_TYPES__A_InjectDecorator_Meta } from "../A-Inject/A-Inject.types";
+import { A_TYPES__Ctor } from "@adaas/a-concept/types/A_Common.types";
 
 
 /**
@@ -23,7 +24,7 @@ export interface A_TYPES__IEntity {
  * Entity constructor type
  * Uses the generic type T to specify the type of the entity
  */
-export type A_TYPES__Entity_Constructor<T = A_Entity> = new (...args: any[]) => T;
+export type A_TYPES__Entity_Constructor<T = A_Entity> = A_TYPES__Ctor<T>;
 /**
  * Entity initialization type
  */

package/src/global/A-Error/A_Error.types.ts

@@ -1,3 +1,4 @@
+import { A_TYPES__Ctor } from "@adaas/a-concept/types/A_Common.types";
 import { A_Scope } from "../A-Scope/A-Scope.class";
 import { A_Error } from "./A_Error.class";
 
@@ -9,7 +10,7 @@ import { A_Error } from "./A_Error.class";
  * Entity constructor type
  * Uses the generic type T to specify the type of the entity
  */
-export type A_TYPES__Error_Constructor<T = A_Error> = new (...args: any[]) => T;
+export type A_TYPES__Error_Constructor<T = A_Error> = A_TYPES__Ctor<T>;
 /**
  * Error initialization type
  */

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

@@ -93,7 +93,6 @@ export function A_Feature_Define(
                     behavior: item.behavior || 'sync',
                     throwOnError: true,
                     override: item.override || ''
-
                 })
             ) : [],
         });

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

@@ -146,16 +146,12 @@ export function A_Feature_Extend(
         }
 
 
-
-
-
         const existedDefinitions = A_Context
             .meta(target)
             .get(metaKey);
 
         // Get the existed metadata or create a new one
-        const meta = A_Context
-            .meta(target)
+        const meta = A_Context.meta(target)
 
         const existedMeta = meta.get(metaKey)
             ? new A_Meta().from(meta.get(metaKey)!)

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

@@ -7,7 +7,7 @@ import { A_TYPES__Component_Constructor } from "../A-Component/A-Component.types
 import { A_TYPES__Container_Constructor } from "../A-Container/A-Container.types"
 import { A_TYPES__Entity_Constructor } from "../A-Entity/A-Entity.types"
 import { A_Feature } from "./A-Feature.class"
-import { A_TYPES__Required } from "@adaas/a-concept/types/A_Common.types"
+import { A_TYPES__Ctor, A_TYPES__Required } from "@adaas/a-concept/types/A_Common.types"
 import { A_Scope } from "../A-Scope/A-Scope.class"
 import { A_Stage } from "../A-Stage/A-Stage.class"
 import { A_TYPES__Error_Init } from "../A-Error/A_Error.types"
@@ -20,7 +20,7 @@ import { A_TYPES__Error_Init } from "../A-Error/A_Error.types"
  * Feature constructor type
  * Uses the generic type T to specify the type of the feature
  */
-export type A_TYPES__Feature_Constructor<T = A_Feature> = new (...args: any[]) => T;
+export type A_TYPES__Feature_Constructor<T = A_Feature> = A_TYPES__Ctor<T>;
 /**
  * Feature initialization type
  */
@@ -181,7 +181,7 @@ export type A_TYPES__FeatureDefineDecoratorConfig = {
 /**
  * Describes a single template item used in Feature Define decorator
  */
-export type A_TYPES__FeatureDefineDecoratorTemplateItem = A_TYPES__Required<Partial<A_TYPES__A_StageStep>, ['name', 'handler', 'component']>
+export type A_TYPES__FeatureDefineDecoratorTemplateItem = A_TYPES__Required<Partial<A_TYPES__A_StageStep>, ['name', 'handler', 'dependency']>
 /**
  * Describes a target where Feature Define decorator can be applied
  * 

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

@@ -2,13 +2,14 @@
 // --------------------------- Primary Types ----------------------------------
 // ============================================================================
 
+import { A_TYPES__Ctor } from "@adaas/a-concept/types/A_Common.types";
 import { A_Fragment } from "./A-Fragment.class";
 
 /**
  * Fragment constructor type
  * Uses the generic type T to specify the type of the fragment
  */
-export type A_TYPES__Fragment_Constructor<T = A_Fragment> = new (...args: any[]) => T;
+export type A_TYPES__Fragment_Constructor<T = A_Fragment> = A_TYPES__Ctor<T>;
 /**
  * Fragment initialization type
  */

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

@@ -1,8 +1,6 @@
 import {
-    A_TYPES__A_InjectDecorator_EntityInjectionInstructions,
     A_TYPES__A_InjectDecorator_Meta,
     A_TYPES__A_InjectDecoratorReturn,
-    A_TYPES__InjectableConstructors,
     A_TYPES__InjectableTargets
 } from "./A-Inject.types";
 import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
@@ -26,6 +24,10 @@ import { A_CommonHelper } from "@adaas/a-concept/helpers/A_Common.helper";
 import { A_TYPES__Error_Constructor } from "../A-Error/A_Error.types";
 import { A_Error } from "../A-Error/A_Error.class";
 import { A_TYPES__EntityMetaKey } from "../A-Entity/A-Entity.constants";
+import { A_Dependency } from "../A-Dependency/A-Dependency.class";
+import { A_TYPES__Ctor } from "@adaas/a-concept/types/A_Common.types";
+import { A_TYPES__A_DependencyInjectable, A_TYPES__A_DependencyResolutionStrategy } from "../A-Dependency/A-Dependency.types";
+import { A_TYPES__Caller_Constructor } from "../A-Caller/A_Caller.types";
 
 
 /**
@@ -39,46 +41,19 @@ import { A_TYPES__EntityMetaKey } from "../A-Entity/A-Entity.constants";
  * @param params - see overloads
  * @returns - decorator function
  */
-export function A_Inject<T extends A_Scope>(
-    /***
-     * Provide the Scope constructor that will be associated with the injection.
-     *
-     * [!] It returns an instance of the Scope where the Entity/Component/Container is defined.
-     */
-    scope: A_TYPES__Scope_Constructor<T>
-): A_TYPES__A_InjectDecoratorReturn
-export function A_Inject<T extends A_Error>(
-    /***
-     * Provide the Error constructor that will be associated with the injection.
-     *
-     * [!] It returns an Instance of the Error what is executed.
-     */
-    error: A_TYPES__Error_Constructor<T>
-): A_TYPES__A_InjectDecoratorReturn
-export function A_Inject<T extends A_Feature>(
-    /**
-     * Provide the Feature constructor that will be associated with the injection.
-     * 
-     * [!] It returns an Instance of the Feature what is executed. 
-     */
-    feature: A_TYPES__Feature_Constructor<T>
-): A_TYPES__A_InjectDecoratorReturn
 export function A_Inject<T extends A_Component>(
     /**
      * Provide the Component constructor that will be associated with the injection.
      * 
      * [!] It returns an Instance of the Component from current Scope or from Parent Scopes.
      */
-    component: A_TYPES__Component_Constructor<T>
-): A_TYPES__A_InjectDecoratorReturn
-//  Allows to inject just one A_FeatureCaller
-export function A_Inject(
+    component: A_TYPES__Component_Constructor<T>,
     /**
-     * Provide the A_Caller constructor to inject the Caller instance
+     * Provide additional instructions on how to perform the injection
      *
-     * [!] It returns initiator of the call, e.g. Container/Component/Command who called Feature 
+     * [!] Default Pagination is 1 if it's necessary to get multiple Fragments please customize it in the instructions
      */
-    caller: typeof A_Caller
+    config?: Omit<Partial<A_TYPES__A_DependencyResolutionStrategy<T>>, 'query' | 'pagination'>
 ): A_TYPES__A_InjectDecoratorReturn
 // Allows to inject just one Context Fragment
 export function A_Inject<T extends A_Fragment>(
@@ -87,7 +62,13 @@ export function A_Inject<T extends A_Fragment>(
      *
      * [!] It returns the Fragment instance from current Scope or from Parent Scopes.
      */
-    fragment: A_TYPES__Fragment_Constructor<T>
+    fragment: A_TYPES__Fragment_Constructor<T>,
+    /**
+     * Provide additional instructions on how to perform the injection
+     *
+     * [!] Default Pagination is 1 if it's necessary to get multiple Fragments please customize it in the instructions
+     */
+    config?: Omit<Partial<A_TYPES__A_DependencyResolutionStrategy<T>>, 'query' | 'pagination'>
 ): A_TYPES__A_InjectDecoratorReturn
 export function A_Inject<T extends A_Entity>(
     /**
@@ -103,7 +84,7 @@ export function A_Inject<T extends A_Entity>(
      * 
      * [!] Default Pagination is 1 if it's necessary to get multiple Entities please customize it in the instructions
      */
-    config?: Partial<A_TYPES__A_InjectDecorator_EntityInjectionInstructions<T>>
+    config?: Partial<A_TYPES__A_DependencyResolutionStrategy<T>>
 ): A_TYPES__A_InjectDecoratorReturn<T>
 export function A_Inject<T extends A_Component>(
     /**
@@ -113,9 +94,58 @@ export function A_Inject<T extends A_Component>(
      */
     ctor: string
 ): A_TYPES__A_InjectDecoratorReturn
-export function A_Inject(
-    param1: A_TYPES__InjectableConstructors,
-    param2?: Partial<A_TYPES__A_InjectDecorator_EntityInjectionInstructions>
+//  Allows to inject just one A_FeatureCaller
+export function A_Inject<T extends A_Caller>(
+    /**
+     * Provide the A_Caller constructor to inject the Caller instance
+     *
+     * [!] It returns initiator of the call, e.g. Container/Component/Command who called Feature 
+     */
+    caller: A_TYPES__Caller_Constructor<T>
+): A_TYPES__A_InjectDecoratorReturn
+//  Allows to inject just one A_Error instance
+export function A_Inject<T extends A_Error>(
+    /***
+     * Provide the Error constructor that will be associated with the injection.
+     *
+     * [!] It returns an Instance of the Error what is executed.
+     */
+    error: A_TYPES__Error_Constructor<T>,
+    /**
+     * Provide additional instructions on how to perform the injection
+     *
+     * [!] Default Pagination is 1 if it's necessary to get multiple Fragments please customize it in the instructions
+     */
+    config?: Omit<Partial<A_TYPES__A_DependencyResolutionStrategy<T>>, 'query' | 'pagination'>
+): A_TYPES__A_InjectDecoratorReturn
+export function A_Inject<T extends A_Feature>(
+    /**
+     * Provide the Feature constructor that will be associated with the injection.
+     * 
+     * [!] It returns an Instance of the Feature what is executed. 
+     */
+    feature: A_TYPES__Feature_Constructor<T>
+): A_TYPES__A_InjectDecoratorReturn
+// Allows to inject just one Scope instance
+export function A_Inject<T extends A_Scope>(
+    /***
+     * Provide the Scope constructor that will be associated with the injection.
+     *
+     * [!] It returns an instance of the Scope where the Entity/Component/Container is defined.
+     */
+    scope: A_TYPES__Scope_Constructor<T>
+): A_TYPES__A_InjectDecoratorReturn
+export function A_Inject<T extends A_TYPES__A_DependencyInjectable>(
+    /***
+     * Provide the Scope constructor that will be associated with the injection.
+     *
+     * [!] It returns an instance of the Scope where the Entity/Component/Container is defined.
+     */
+    dependency: A_Dependency<T>
+): A_TYPES__A_InjectDecoratorReturn
+export function A_Inject<T extends A_TYPES__A_DependencyInjectable>(
+    param1: string | A_TYPES__Ctor<T> | A_Dependency<T>,
+    param2?: Partial<A_TYPES__A_DependencyResolutionStrategy<T>>
 ): A_TYPES__A_InjectDecoratorReturn {
 
     //  pre call checks
@@ -166,10 +196,8 @@ export function A_Inject(
         const paramsArray: A_TYPES__A_InjectDecorator_Meta = existedMeta.get(method) || [];
 
         // set the parameter injection info
-        paramsArray[parameterIndex] = {
-            target: param1,
-            instructions: param2
-        }
+        paramsArray[parameterIndex] = param1 instanceof A_Dependency ? param1 : new A_Dependency(param1, param2);
+
         // save back the updated injections array
         existedMeta.set(method, paramsArray);
 

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

@@ -6,6 +6,7 @@ import { A_TYPES__Feature_Constructor } from "@adaas/a-concept/global/A-Feature/
 import { A_TYPES__Fragment_Constructor } from "@adaas/a-concept/global/A-Fragment/A-Fragment.types";
 import { A_TYPES__Caller_Constructor } from "@adaas/a-concept/global/A-Caller/A_Caller.types";
 import { A_TYPES__Error_Constructor } from "../A-Error/A_Error.types";
+import { A_Dependency } from "../A-Dependency/A-Dependency.class";
 
 
 // ============================================================================
@@ -30,54 +31,13 @@ export type A_TYPES__A_InjectDecoratorReturn<T = any> = (
 ) => void
 
 
-
-export type A_TYPES__A_InjectDecorator_Meta = Array<{
-    target: A_TYPES__InjectableConstructors
-    require?: boolean
-    load?: string
-    defaultArgs?: any,
-    parent?: {
-        layerOffset?: number
-    },
-    flat?: boolean
-    create?: boolean
-    instructions?: Partial<A_TYPES__A_InjectDecorator_EntityInjectionInstructions>,
-}>;
+export type A_TYPES__A_InjectDecorator_Meta = Array<A_Dependency>;
 
 /**
  * Targets that can be injected into Extended functions or constructors
- * 
  */
 export type A_TYPES__InjectableTargets = A_TYPES__Component_Constructor
     | InstanceType<A_TYPES__Component_Constructor>
     | InstanceType<A_TYPES__Container_Constructor>;
 
 
-export type A_TYPES__InjectableConstructors = A_TYPES__Component_Constructor
-    | A_TYPES__Container_Constructor
-    | A_TYPES__Entity_Constructor
-    | A_TYPES__Feature_Constructor
-    | A_TYPES__Caller_Constructor
-    | A_TYPES__Fragment_Constructor
-    | A_TYPES__Error_Constructor
-    | string;
-
-
-export type A_TYPES__A_InjectDecorator_EntityInjectionInstructions<T extends A_Entity = A_Entity> = {
-    query: Partial<A_TYPES__A_InjectDecorator_EntityInjectionQuery<T>>,
-    pagination: Partial<A_TYPES__A_InjectDecorator_EntityInjectionPagination>
-}
-
-
-export type A_TYPES__A_InjectDecorator_EntityInjectionQuery<T extends A_Entity = A_Entity> = {
-    aseid: string,
-} & {
-    [key in keyof T]?: any
-};
-
-
-export type A_TYPES__A_InjectDecorator_EntityInjectionPagination = {
-    count: number,
-    from: 'start' | 'end'
-}
-

package/src/global/A-Meta/A-Meta.decorator.ts

@@ -1,3 +1,4 @@
+import { A_TYPES__Ctor } from "@adaas/a-concept/types/A_Common.types";
 import { A_Context } from "../A-Context/A-Context.class";
 import { A_Meta } from "./A-Meta.class";
 import { A_TYPES__MetaLinkedComponentConstructors } from "./A-Meta.types";
@@ -13,7 +14,7 @@ import { A_TYPES__MetaLinkedComponentConstructors } from "./A-Meta.types";
  * @returns 
  */
 export function A_MetaDecorator<T extends A_Meta>(
-    constructor: new (...args: any[]) => T
+    constructor: A_TYPES__Ctor<T>
 ) {
     return function <TTarget extends A_TYPES__MetaLinkedComponentConstructors>(
         target: TTarget

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

@@ -1,3 +1,4 @@
+import { A_TYPES__Ctor } from "@adaas/a-concept/types/A_Common.types";
 import { A_Component } from "../A-Component/A-Component.class";
 import { A_TYPES__Component_Constructor } from "../A-Component/A-Component.types";
 import { A_Container } from "../A-Container/A-Container.class";
@@ -15,7 +16,7 @@ import { A_Meta } from "./A-Meta.class";
 /**
  * Meta constructor type
  */
-export type A_TYPES__Meta_Constructor<T = A_Meta> = new (...args: any[]) => T;
+export type A_TYPES__Meta_Constructor<T = A_Meta> = A_TYPES__Ctor<T>;
 /**
  * Components that can have Meta associated with them
  */