@adaas/a-concept 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaas/a-concept",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "A-Concept is a framework of the new generation that is tailored to use AI, enabling developers to create AI-powered applications with ease. It provides a structured approach to building, managing, and deploying AI-driven solutions.",
   "license": "Apache-2.0",
   "main": "./dist/index.cjs",

package/src/global/A-Dependency/A-Dependency-All.decorator.ts

@@ -10,6 +10,7 @@ import { A_DependencyError } from "./A-Dependency.error";
 import { A_CommonHelper } from "@adaas/a-concept/helpers/A_Common.helper";
 import { A_Entity } from "../A-Entity/A-Entity.class";
 import { A_TYPES__Entity_Constructor } from "../A-Entity/A-Entity.types";
+import { A_TYPES__EntityMetaKey } from "../A-Entity/A-Entity.constants";
 
 
 /**
@@ -49,6 +50,10 @@ export function A_Dependency_All<T extends A_Entity>(
             case A_TypeGuards.isContainerInstance(target):
                 metaKey = A_TYPES__ContainerMetaKey.INJECTIONS;
                 break;
+
+            case A_TypeGuards.isEntityInstance(target):
+                metaKey = A_TYPES__EntityMetaKey.INJECTIONS;
+                break;
         }
 
         // get existing meta or create a new one

package/src/global/A-Dependency/A-Dependency-Default.decorator.ts

@@ -8,6 +8,7 @@ import { A_TYPES__A_InjectDecorator_Meta, A_TYPES__InjectableTargets } from "../
 import { A_TYPES__A_Dependency_DefaultDecoratorReturn } from "./A-Dependency.types";
 import { A_DependencyError } from "./A-Dependency.error";
 import { A_CommonHelper } from "@adaas/a-concept/helpers/A_Common.helper";
+import { A_TYPES__EntityMetaKey } from "../A-Entity/A-Entity.constants";
 
 
 /**
@@ -48,6 +49,10 @@ export function A_Dependency_Default(
             case A_TypeGuards.isContainerInstance(target):
                 metaKey = A_TYPES__ContainerMetaKey.INJECTIONS;
                 break;
+
+            case A_TypeGuards.isEntityInstance(target):
+                metaKey = A_TYPES__EntityMetaKey.INJECTIONS;
+                break;
         }
 
         // get existing meta or create a new one

package/src/global/A-Dependency/A-Dependency-Flat.decorator.ts

@@ -8,6 +8,7 @@ import { A_TYPES__A_InjectDecorator_Meta, A_TYPES__InjectableTargets } from "../
 import { A_TYPES__A_Dependency_FlatDecoratorReturn } from "./A-Dependency.types";
 import { A_DependencyError } from "./A-Dependency.error";
 import { A_CommonHelper } from "@adaas/a-concept/helpers/A_Common.helper";
+import { A_TYPES__EntityMetaKey } from "../A-Entity/A-Entity.constants";
 
 
 /**
@@ -42,6 +43,10 @@ export function A_Dependency_Flat(): A_TYPES__A_Dependency_FlatDecoratorReturn {
             case A_TypeGuards.isContainerInstance(target):
                 metaKey = A_TYPES__ContainerMetaKey.INJECTIONS;
                 break;
+
+            case A_TypeGuards.isEntityInstance(target):
+                metaKey = A_TYPES__EntityMetaKey.INJECTIONS;
+                break;
         }
 
         // get existing meta or create a new one

package/src/global/A-Dependency/A-Dependency-Load.decorator.ts

@@ -8,6 +8,7 @@ import { A_TYPES__A_InjectDecorator_Meta, A_TYPES__InjectableTargets } from "../
 import { A_TYPES__A_Dependency_LoadDecoratorReturn } from "./A-Dependency.types";
 import { A_DependencyError } from "./A-Dependency.error";
 import { A_CommonHelper } from "@adaas/a-concept/helpers/A_Common.helper";
+import { A_TYPES__EntityMetaKey } from "../A-Entity/A-Entity.constants";
 
 
 /**
@@ -51,6 +52,10 @@ export function A_Dependency_Load(
             case A_TypeGuards.isContainerInstance(target):
                 metaKey = A_TYPES__ContainerMetaKey.INJECTIONS;
                 break;
+
+            case A_TypeGuards.isEntityInstance(target):
+                metaKey = A_TYPES__EntityMetaKey.INJECTIONS;
+                break;
         }
 
         // get existing meta or create a new one

package/src/global/A-Dependency/A-Dependency-Parent.decorator.ts

@@ -8,6 +8,7 @@ import { A_TYPES__A_InjectDecorator_Meta, A_TYPES__InjectableTargets } from "../
 import { A_TYPES__A_Dependency_ParentDecoratorReturn } from "./A-Dependency.types";
 import { A_DependencyError } from "./A-Dependency.error";
 import { A_CommonHelper } from "@adaas/a-concept/helpers/A_Common.helper";
+import { A_TYPES__EntityMetaKey } from "../A-Entity/A-Entity.constants";
 
 
 /**
@@ -49,6 +50,10 @@ export function A_Dependency_Parent(
             case A_TypeGuards.isContainerInstance(target):
                 metaKey = A_TYPES__ContainerMetaKey.INJECTIONS;
                 break;
+                
+            case A_TypeGuards.isEntityInstance(target):
+                metaKey = A_TYPES__EntityMetaKey.INJECTIONS;
+                break;
         }
 
         // get existing meta or create a new one

package/src/global/A-Dependency/A-Dependency-Require.decorator.ts

@@ -8,6 +8,7 @@ import { A_TYPES__A_InjectDecorator_Meta, A_TYPES__InjectableTargets } from "../
 import { A_TYPES__A_Dependency_RequireDecoratorReturn } from "./A-Dependency.types";
 import { A_DependencyError } from "./A-Dependency.error";
 import { A_CommonHelper } from "@adaas/a-concept/helpers/A_Common.helper";
+import { A_TYPES__EntityMetaKey } from "../A-Entity/A-Entity.constants";
 
 
 /**
@@ -42,6 +43,10 @@ export function A_Dependency_Require(): A_TYPES__A_Dependency_RequireDecoratorRe
             case A_TypeGuards.isContainerInstance(target):
                 metaKey = A_TYPES__ContainerMetaKey.INJECTIONS;
                 break;
+
+            case A_TypeGuards.isEntityInstance(target):
+                metaKey = A_TYPES__EntityMetaKey.INJECTIONS;
+                break;
         }
 
         // get existing meta or create a new one

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

@@ -5,8 +5,7 @@ import { A_Dependency_Load } from "./A-Dependency-Load.decorator";
 import { A_Dependency_Parent } from "./A-Dependency-Parent.decorator";
 import { A_Dependency_Require } from "./A-Dependency-Require.decorator";
 import { A_DependencyError } from "./A-Dependency.error";
-import { A_TYPES__A_Dependency_EntityInjectionPagination, A_TYPES__A_Dependency_EntityInjectionQuery, A_TYPES__A_Dependency_Serialized, A_TYPES__A_DependencyInjectable, A_TYPES__A_DependencyResolutionStrategy, A_TYPES__A_DependencyResolutionType } from "./A-Dependency.types";
-import { A_Entity } from "../A-Entity/A-Entity.class";
+import { A_TYPES__A_Dependency_EntityInjectionPagination, A_TYPES__A_Dependency_EntityInjectionQuery, A_TYPES__A_Dependency_Serialized, A_TYPES__A_DependencyInjectable, A_TYPES__A_DependencyResolutionStrategy } from "./A-Dependency.types";
 import { A_TYPES__Ctor } from "@adaas/a-concept/types/A_Common.types";
 
 
@@ -62,7 +61,7 @@ export class A_Dependency<
     protected _name: string;
     protected _target?: A_TYPES__Ctor<T>;
     protected _resolutionStrategy!: A_TYPES__A_DependencyResolutionStrategy;
-    
+
     protected _defaultPagination: A_TYPES__A_DependencyResolutionStrategy['pagination'] = {
         count: 1,
         from: 'start',
@@ -102,8 +101,8 @@ export class A_Dependency<
     get args(): any[] {
         return this._resolutionStrategy.args;
     }
-    get query(): Partial<A_TYPES__A_Dependency_EntityInjectionQuery<T extends A_Entity ? T : A_Entity>> {
-        return this._resolutionStrategy.query;
+    get query(): Partial<A_TYPES__A_Dependency_EntityInjectionQuery<T>> {
+        return this._resolutionStrategy.query as Partial<A_TYPES__A_Dependency_EntityInjectionQuery<T>>;
     }
     get pagination(): A_TYPES__A_Dependency_EntityInjectionPagination {
         return this._resolutionStrategy.pagination;
@@ -119,7 +118,7 @@ export class A_Dependency<
      */
     constructor(
         name: string | A_TYPES__Ctor<T>,
-        resolutionStrategy?: Partial<Omit<A_TYPES__A_DependencyResolutionStrategy<T extends A_Entity ? T : A_Entity>, 'pagination'> & { pagination: Partial<A_TYPES__A_Dependency_EntityInjectionPagination> }>
+        resolutionStrategy?: Partial<Omit<A_TYPES__A_DependencyResolutionStrategy<T>, 'pagination'> & { pagination: Partial<A_TYPES__A_Dependency_EntityInjectionPagination> }>
     ) {
         this._name = typeof name === 'string' ? name : A_CommonHelper.getComponentName(name);
 
@@ -152,14 +151,14 @@ export class A_Dependency<
     /**
      * Gets the dependency resolution strategy
      */
-    get resolutionStrategy(): A_TYPES__A_DependencyResolutionStrategy<T extends A_Entity ? T : A_Entity> {
+    get resolutionStrategy(): A_TYPES__A_DependencyResolutionStrategy<T> {
         return this._resolutionStrategy!;
     }
 
     /**
      * Sets the dependency resolution strategy
      */
-    set resolutionStrategy(strategy: Partial<Omit<A_TYPES__A_DependencyResolutionStrategy<T extends A_Entity ? T : A_Entity>, 'pagination'> & { pagination: Partial<A_TYPES__A_Dependency_EntityInjectionPagination> }>) {
+    set resolutionStrategy(strategy: Partial<Omit<A_TYPES__A_DependencyResolutionStrategy<T>, 'pagination'> & { pagination: Partial<A_TYPES__A_Dependency_EntityInjectionPagination> }>) {
         this._resolutionStrategy = {
             ...this._defaultResolutionStrategy,
             ...this._resolutionStrategy,
@@ -177,8 +176,7 @@ export class A_Dependency<
      * 
      * @returns 
      */
-    private initCheck(
-    ): this {
+    private initCheck(): this {
         if (!this._resolutionStrategy) {
             throw new A_DependencyError(
                 A_DependencyError.ResolutionParametersError,
@@ -186,8 +184,6 @@ export class A_Dependency<
             );
         }
 
-
-
         return this;
     }
 
@@ -197,7 +193,7 @@ export class A_Dependency<
      * 
      * @returns 
      */
-    toJSON(): A_TYPES__A_Dependency_Serialized {
+    toJSON(): A_TYPES__A_Dependency_Serialized<T> {
         return {
             name: this._name,
             all: this.all,

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

@@ -64,7 +64,7 @@ export type A_TYPES__A_DependencyResolutionStrategy<T extends A_TYPES__A_Depende
     /**
      * Allows to query by specific entity properties e.g. ASEID, name, type, custom properties, etc.
      */
-    query: Partial<A_TYPES__A_Dependency_EntityInjectionQuery<T extends A_Entity ? T : A_Entity>>,
+    query: Partial<A_TYPES__A_Dependency_EntityInjectionQuery<T>>,
     /**
      * Pagination settings for the entity search
      */
@@ -72,7 +72,7 @@ export type A_TYPES__A_DependencyResolutionStrategy<T extends A_TYPES__A_Depende
 }
 
 
-export type A_TYPES__A_Dependency_Serialized = {
+export type A_TYPES__A_Dependency_Serialized<T extends A_TYPES__A_DependencyInjectable = A_TYPES__A_DependencyInjectable> = {
     name: string,
     all: boolean,
     require: boolean,
@@ -81,7 +81,7 @@ export type A_TYPES__A_Dependency_Serialized = {
     flat: boolean,
     create: any,
     args: any[],
-    query: Partial<A_TYPES__A_Dependency_EntityInjectionQuery>,
+    query: Partial<A_TYPES__A_Dependency_EntityInjectionQuery<T>>,
     pagination: A_TYPES__A_Dependency_EntityInjectionPagination
 }
 
@@ -90,17 +90,20 @@ export type A_TYPES__A_Dependency_Serialized = {
 // =--------------------------------------------------------------------------------------------
 
 
-export type A_TYPES__A_Dependency_EntityResolutionConfig<T extends A_Entity = A_Entity> = {
+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_Entity = A_Entity> = {
-    aseid: string,
-} & {
-    [key in keyof T]?: any
-};
+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 = {

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

@@ -145,7 +145,7 @@ export function A_Inject<T extends A_TYPES__A_DependencyInjectable>(
 ): 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 extends A_Entity ? T : A_Entity>>
+    param2?: Partial<A_TYPES__A_DependencyResolutionStrategy<T>>
 ): A_TYPES__A_InjectDecoratorReturn {
 
     //  pre call checks
@@ -197,7 +197,7 @@ export function A_Inject<T extends A_TYPES__A_DependencyInjectable>(
 
         // set the parameter injection info
         paramsArray[parameterIndex] = param1 instanceof A_Dependency ? param1 : new A_Dependency(param1, param2);
-      
+
         // save back the updated injections array
         existedMeta.set(method, paramsArray);
 

package/tests/A-Dependency.test.ts

@@ -1,4 +1,4 @@
-import { A_Component, A_Dependency, A_Entity, A_Error, A_Inject, A_Scope, A_ScopeError } from "../src";
+import { A_Component, A_Dependency, A_Entity, A_Error, A_Feature, A_FeatureError, A_Inject, A_Scope, A_ScopeError } from "../src";
 
 
 
@@ -45,9 +45,23 @@ describe('A-Dependency tests', () => {
             ) {
                 super();
             }
+
         }
 
-        const scope = new A_Scope({ components: [Test] });
+        class testEntity extends A_Entity {
+            
+            @A_Feature.Extend({
+                name: 'test'
+            })
+            async test(
+                @A_Dependency.Required()
+                @A_Inject(DependencyRequiredComponent) component: DependencyRequiredComponent,
+            ) {
+
+            }
+        }
+
+        const scope = new A_Scope({ components: [Test], entities: [new testEntity()] });
 
         try {
             scope.resolve(Test);
@@ -59,6 +73,18 @@ describe('A-Dependency tests', () => {
         const dependency = scope.resolve(DependencyRequiredComponent);
 
         expect(dependency).toBeUndefined();
+
+
+        const entityInstance = scope.resolve(testEntity);
+
+        try {
+            await entityInstance?.call('test');
+        } catch (error) {
+            expect(error).toBeInstanceOf(A_FeatureError);
+            expect((error as A_FeatureError).originalError).toBeInstanceOf(A_ScopeError);
+            expect((error as A_FeatureError).originalError.title).toBe(A_ScopeError.ResolutionError);
+        }
+
     });
     it('Should resolve a component if it has default constructor for dependency', async () => {
         class MyCustomEntity extends A_Entity<{ foo: string }> {