@adaas/a-concept 0.3.2 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaas/a-concept",
-  "version": "0.3.2",
+  "version": "0.3.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",
   "author": {

package/src/lib/A-Context/A-Context.class.ts

@@ -364,11 +364,11 @@ export class A_Context {
          */
         entity: A_TYPES__Entity_Constructor,
     ): T
-    static meta<T extends A_EntityMeta>(
+    static meta<T extends A_EntityMeta, E extends A_Entity>(
         /**
          * Get meta for the specific entity instance.
          */
-        entity: A_Entity,
+        entity: E,
     ): T
     static meta<T extends A_ComponentMeta>(
         /**
@@ -545,7 +545,7 @@ export class A_Context {
             if (!inheritedMeta)
                 inheritedMeta = new metaType();
 
-            instance._metaStorage.set(property, new metaType().from(inheritedMeta as any));
+            instance._metaStorage.set(property, inheritedMeta.clone());
         }
 
         // Return the meta for the property

package/src/lib/A-Meta/A-Meta.class.ts

@@ -56,8 +56,17 @@ export class A_Meta<
 
         return this;
     }
-
-
+    /**
+     * Allows to create a copy of the meta object with the same values, this is needed to ensure that when we inherit meta from the parent component, we create a copy of it, not a reference to the same object. This allows us to modify the meta of the child component without affecting the meta of the parent component.
+     * 
+     * @returns 
+     */
+    clone(): A_Meta<_StorageItems> {
+        const ctor = this.constructor as new () => this;
+        const copy = new ctor();
+        copy.meta = new Map(this.meta);
+        return copy;
+    }
     /**
      * Method to set values in the map
      * 
@@ -83,9 +92,6 @@ export class A_Meta<
         this.meta.set(key, value);
 
     }
-
-
-
     /**
      * Method to get values from the map
      * 
@@ -95,8 +101,6 @@ export class A_Meta<
     get<K extends keyof _StorageItems>(key: K): _StorageItems[K] | undefined {
         return this.meta.get(key) as _StorageItems[K];
     }
-
-
     /**
      * Method to delete values from the map
      * 
@@ -106,8 +110,6 @@ export class A_Meta<
     delete(key: keyof _StorageItems): boolean {
         return this.meta.delete(key);
     }
-
-
     /**
      * Method to get the size of the map
      * 
@@ -116,8 +118,6 @@ export class A_Meta<
     size(): number {
         return this.meta.size;
     }
-
-
     /**
      * This method is needed to convert the key to a regular expression and cover cases like: 
      * 
@@ -135,8 +135,6 @@ export class A_Meta<
             ? key
             : new RegExp(key);
     }
-
-
     /**
      * Method to find values in the map by name.
      * 
@@ -154,8 +152,6 @@ export class A_Meta<
         }
         return results;
     }
-
-
     /**
      * Method to find values in the map by regular expression
      * 
@@ -173,8 +169,6 @@ export class A_Meta<
         }
         return results;
     }
-
-
     /**
      * Method to check if the map has a specific key
      * 
@@ -184,8 +178,6 @@ export class A_Meta<
     has(key: keyof _StorageItems): boolean {
         return this.meta.has(key);
     }
-
-
     /**
      * Method to get the size of the map
      * 
@@ -194,21 +186,26 @@ export class A_Meta<
     entries(): IterableIterator<[keyof _StorageItems, _StorageItems[keyof _StorageItems]]> {
         return this.meta.entries();
     }
-
-
     /**
      * Method to clear the map
      */
     clear(): void {
         this.meta.clear();
     }
-
-
+    /**
+     * Method to convert the meta to an array of key-value pairs
+     * 
+     * @returns 
+     */
     toArray(): Array<[keyof _StorageItems, _StorageItems[keyof _StorageItems]]> {
         return Array.from(this.meta.entries());
     }
-
-
+    /**
+     * Helper method to recursively convert the meta object to a JSON-compatible format. It handles nested A_Meta instances, Maps, Arrays, and plain objects.
+     * 
+     * @param value 
+     * @returns 
+     */
     protected recursiveToJSON(value: any): any {
         switch (true) {
             case value instanceof A_Meta:
@@ -235,7 +232,6 @@ export class A_Meta<
                 return value;
         }
     }
-
     /**
      * Serializes the meta to a JSON object
      * Uses internal storage to convert to JSON

package/src/lib/A-Scope/A-Scope.class.ts

@@ -19,9 +19,9 @@ import {
     A_Entity,
     A_TYPES__Entity_Constructor
 } from "@adaas/a-concept/a-entity";
-import { A_TypeGuards} from "@adaas/a-concept/helpers/A_TypeGuards.helper";
-import { A_FormatterHelper} from "@adaas/a-concept/helpers/A_Formatter.helper";
-import { A_CommonHelper} from "@adaas/a-concept/helpers/A_Common.helper";
+import { A_TypeGuards } from "@adaas/a-concept/helpers/A_TypeGuards.helper";
+import { A_FormatterHelper } from "@adaas/a-concept/helpers/A_Formatter.helper";
+import { A_CommonHelper } from "@adaas/a-concept/helpers/A_Common.helper";
 import {
     A_Error,
     A_TYPES__Error_Constructor
@@ -179,7 +179,7 @@ export class A_Scope<
     get parent(): A_Scope | undefined {
         return this._parent;
     }
-    
+
     /**
      * A_Scope is a unique A-Concept Structure that allows to operate with A-Concept Primitives and Models in a specific context and with specific rules.  
      *  It refers to the visibility and accessibility of :
@@ -839,8 +839,61 @@ export class A_Scope<
          */
         name: string
     ): A_TYPES__Fragment_Constructor<T>
-    resolveConstructor<T extends A_TYPES__A_DependencyInjectable>(name: string): A_TYPES__Entity_Constructor<T> | A_TYPES__Component_Constructor<T> | A_TYPES__Fragment_Constructor<T> | undefined
-    resolveConstructor<T extends A_TYPES__A_DependencyInjectable>(name: string): A_TYPES__Entity_Constructor<T> | A_TYPES__Component_Constructor<T> | A_TYPES__Fragment_Constructor<T> | undefined {
+    resolveConstructor<T extends A_Component>(
+        /**
+         * Provide the component constructor or its name to retrieve its constructor
+         */
+        component:  A_TYPES__Ctor<T>
+    ): A_TYPES__Component_Constructor<T> | undefined
+    resolveConstructor<T extends A_Entity>(
+        /**
+         * Provide the entity constructor or its name to retrieve its constructor
+         */
+        entity: A_TYPES__Ctor<T>
+    ): A_TYPES__Entity_Constructor<T> | undefined
+    resolveConstructor<T extends A_Fragment>(
+        /**
+         * Provide the fragment constructor or its name to retrieve its constructor
+         */
+        fragment: A_TYPES__Ctor<T>
+    ): A_TYPES__Fragment_Constructor<T> | undefined
+    resolveConstructor<T extends A_Error>(
+        /**
+         * Provide the error constructor or its name to retrieve its constructor
+         */
+        error: A_TYPES__Ctor<T>
+    ): A_TYPES__Error_Constructor<T> | undefined
+    resolveConstructor<T extends A_TYPES__A_DependencyInjectable>(
+        name: string | A_TYPES__Ctor<T>
+    ): A_TYPES__Entity_Constructor<T> | A_TYPES__Component_Constructor<T> | A_TYPES__Fragment_Constructor<T> | undefined
+    resolveConstructor<T extends A_TYPES__A_DependencyInjectable>(
+        name: string | A_TYPES__Ctor<T>
+    ): A_TYPES__Entity_Constructor<T> | A_TYPES__Component_Constructor<T> | A_TYPES__Fragment_Constructor<T> | undefined {
+        // If it's a constructor, find any extension from the allowed constructors and return it
+        switch (true) {
+            case A_TypeGuards.isComponentConstructor(name):
+                return Array.from(this.allowedComponents)
+                    .find((c) => A_CommonHelper.isInheritedFrom(c, name)) as A_TYPES__Component_Constructor<T> | undefined;
+
+            case A_TypeGuards.isEntityConstructor(name):
+                return Array.from(this.allowedEntities)
+                    .find((e) => A_CommonHelper.isInheritedFrom(e, name)) as A_TYPES__Entity_Constructor<T> | undefined;
+
+            case A_TypeGuards.isFragmentConstructor(name):
+                return Array.from(this.allowedFragments)
+                    .find((f) => A_CommonHelper.isInheritedFrom(f, name)) as A_TYPES__Fragment_Constructor<T> | undefined;
+
+            case A_TypeGuards.isErrorConstructor(name):
+                return Array.from(this.allowedErrors)
+                    .find((e) => A_CommonHelper.isInheritedFrom(e, name)) as A_TYPES__Error_Constructor<T> | undefined;
+        }
+
+        if(!A_TypeGuards.isString(name))
+            throw new A_ScopeError(
+                A_ScopeError.ResolutionError,
+                `Invalid constructor name provided: ${name}`
+            );
+
         // 1) Check components
         const component = Array.from(this.allowedComponents).find(
             c => c.name === name

package/tests/A-Meta.test.ts

@@ -132,7 +132,7 @@ describe('A-Meta tests', () => {
         expect(metaE.get(A_TYPES__ComponentMetaKey.EXTENSIONS)?.get('.*\\.testFeature$')?.map(e => e.handler)).toContain('test3');
         expect(metaE.get(A_TYPES__ComponentMetaKey.EXTENSIONS)?.get('.*\\.testFeature$')?.map(e => e.handler)).not.toContain('test2');
     })
-    it('Should allow to inherit meta properly', async () => {
+    it('Should allow to define a custom meta', async () => {
 
         class InjectableComponent extends A_Component { }
 
@@ -170,6 +170,49 @@ describe('A-Meta tests', () => {
         expect(meta).toBeInstanceOf(CustomComponentMeta);
         expect(meta).toHaveProperty('customField');
 
+        expect(meta.get(A_TYPES__ComponentMetaKey.EXTENSIONS)?.size()).toBe(1);
+        expect(meta.get(A_TYPES__ComponentMetaKey.EXTENSIONS)?.has('.*\\.testFeature$')).toBe(true);
+    })
+    it('Should propagate a custom me', async () => {
+
+        class InjectableComponent extends A_Component { }
+
+        class CustomComponentMeta extends A_ComponentMeta<{ customField: string } & A_TYPES__ComponentMeta> {
+
+            get customField(): string | undefined {
+                return this.get('customField');
+            }
+        }
+
+        @A_Meta.Define(CustomComponentMeta)
+        class CustomComponent extends A_Component {
+
+            static Test() {
+
+            }
+
+            constructor(
+                @A_Inject(InjectableComponent) public injectableComponent: InjectableComponent
+            ) {
+                super();
+            }
+
+            @A_Feature.Extend({
+                name: 'testFeature'
+            })
+            async feature() {
+
+            }
+        }
+
+        class SubCustomComponent extends CustomComponent {}
+
+
+        const meta = A_Context.meta<CustomComponentMeta>(SubCustomComponent);
+
+        expect(meta).toBeInstanceOf(CustomComponentMeta);
+        expect(meta).toHaveProperty('customField');
+
         expect(meta.get(A_TYPES__ComponentMetaKey.EXTENSIONS)?.size()).toBe(1);
         expect(meta.get(A_TYPES__ComponentMetaKey.EXTENSIONS)?.has('.*\\.testFeature$')).toBe(true);
     })

package/tests/A-Scope.test.ts

@@ -106,7 +106,24 @@ describe('A-Scope tests', () => {
         const resolved = childScope.resolve(A_Component);
         expect(resolved).toBe(component);
     });
+    it('should resolve component constructor registered in scope', async () => {
+        class testComponent extends A_Component { }
 
+        const parentScope = new A_Scope({ name: 'ParentScope', components: [testComponent] });
+
+        const resolved = parentScope.resolveConstructor(testComponent);
+        expect(resolved).toBe(testComponent);
+    });
+    it('should resolve inherited component constructor in scope', async () => {
+        class testComponent extends A_Component { }
+        class inheritedComponent extends testComponent { }
+
+        const parentScope = new A_Scope({ name: 'ParentScope', components: [inheritedComponent] });
+
+        const resolved = parentScope.resolveConstructor(testComponent);
+
+        expect(resolved).toBe(inheritedComponent);
+    });
     it('Should resolve only one entity if no query is provided', async () => {
         class MyEntity extends A_Entity<{ bar: string }> {
             public bar!: string;