@adaas/a-concept 0.2.14 → 0.3.2

package/tests/A-Container.test.ts

@@ -1,6 +1,7 @@
-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';
-import { A_Concept, A_Feature } from '../src';
+import { A_Concept } from '@adaas/a-concept/a-concept';
+import { A_Container } from '@adaas/a-concept/a-container';
+import { A_Feature } from '@adaas/a-concept/a-feature';
+import { A_Scope } from '@adaas/a-concept/a-scope';
 
 
 describe('A-Container tests', () => {

package/tests/A-Dependency.test.ts

@@ -1,4 +1,9 @@
-import { A_Component, A_Dependency, A_Entity, A_Error, A_Feature, A_FeatureError, A_Inject, A_Scope, A_ScopeError } from "../src";
+import { A_Component } from "@adaas/a-concept/a-component";
+import { A_Dependency } from "@adaas/a-concept/a-dependency";
+import { A_Entity } from "@adaas/a-concept/a-entity";
+import { A_Feature, A_FeatureError } from "@adaas/a-concept/a-feature";
+import { A_Inject } from "@adaas/a-concept/a-inject";
+import { A_Scope, A_ScopeError } from "@adaas/a-concept/a-scope";
 
 
 
@@ -450,4 +455,71 @@ describe('A-Dependency tests', () => {
 
     });
 
+    it('Should be possible to use query decorator for A_Entities in scope', async () => {
+
+        class MyEntity_A extends A_Entity<{ name: string, group: string }> {
+            name!: string;
+            group!: string;
+
+            fromNew(newEntity: { name: string; group: string }): void {
+                super.fromNew(newEntity);
+                this.name = newEntity.name;
+                this.group = newEntity.group;
+            }
+        }
+
+        class MyComponent extends A_Component {
+            @A_Feature.Extend()
+            async simpleQuery(
+                @A_Dependency.Query<MyEntity_A>({ name: 'Entity 1' })
+                @A_Inject(MyEntity_A) entity: MyEntity_A,
+            ) {
+                expect(entity.name).toBe('Entity 1');
+            }
+
+            @A_Feature.Extend()
+            async andQuery(
+                @A_Dependency.Query<MyEntity_A>({ name: 'Entity 1', group: 'Group 1' })
+                @A_Inject(MyEntity_A) entity: MyEntity_A,
+            ) {
+                expect(entity.name).toBe('Entity 1');
+                expect(entity.group).toBe('Group 1');
+            }
+
+            @A_Feature.Extend()
+            async paginationQuery(
+                @A_Dependency.Query<MyEntity_A>({ name: 'Entity 1' }, { count: 2 })
+                @A_Inject(MyEntity_A) entities: MyEntity_A[],
+            ) {
+
+                expect(entities.length).toBe(2);
+                expect(entities[0].name).toBe('Entity 1');
+                expect(entities[0].group).toBe('Group 1');
+                expect(entities[1].name).toBe('Entity 1');
+                expect(entities[1].group).toBe('Group 2');
+            }
+        }
+
+        const scope = new A_Scope({
+            name: 'Test Scope',
+            components: [MyComponent],
+            entities: [
+                new MyEntity_A({ name: 'Entity 1', group: 'Group 1' }),
+                new MyEntity_A({ name: 'Entity 2', group: 'Group 1' }),
+                new MyEntity_A({ name: 'Entity 1', group: 'Group 2' }),
+                new MyEntity_A({ name: 'Entity 2', group: 'Group 2' }),
+                new MyEntity_A({ name: 'Entity 3', group: 'Group 2' }),
+                new MyEntity_A({ name: 'Entity 1', group: 'Group 3' }),
+                new MyEntity_A({ name: 'Entity 2', group: 'Group 3' }),
+            ]
+        });
+
+        const componentInstance = scope.resolve(MyComponent);
+
+        await componentInstance?.call('simpleQuery');
+        await componentInstance?.call('andQuery');
+        await componentInstance?.call('paginationQuery');
+
+    });
+
 });

package/tests/A-Entity.test.ts

@@ -1,9 +1,12 @@
 import { A_CONSTANTS__DEFAULT_ENV_VARIABLES } from "@adaas/a-concept/constants/env.constants";
-import { A_Context } from "@adaas/a-concept/global/A-Context/A-Context.class";
-import { A_Entity } from "@adaas/a-concept/global/A-Entity/A-Entity.class";
-import { A_TYPES__Entity_Serialized } from '@adaas/a-concept/global/A-Entity/A-Entity.types';
-import { A_Feature } from "@adaas/a-concept/global/A-Feature/A-Feature.class";
-import { ASEID } from '@adaas/a-concept/global/ASEID/ASEID.class';
+import { A_Context } from "@adaas/a-concept/a-context";
+import {
+    A_Entity,
+    A_TYPES__Entity_Serialized
+} from "@adaas/a-concept/a-entity";
+import { A_Feature } from "@adaas/a-concept/a-feature";
+import { ASEID } from '@adaas/a-concept/aseid';
+import { A_Scope } from "@adaas/a-concept/a-scope";
 
 jest.retryTimes(0);
 
@@ -19,6 +22,106 @@ describe('A-Entity tests', () => {
         expect(entity.aseid.concept).toBe('a-concept');
 
     });
+    it('Should handle proper types declaration', async () => {
+        type MyInitType = {
+            name: string;
+            customId: number;
+        }
+
+        type mySerializedType = {
+            name: string;
+            serializedFlag: boolean;
+            customId: number;
+        } & A_TYPES__Entity_Serialized;
+
+        class MyEntity extends A_Entity<MyInitType, mySerializedType> {
+            public name!: string;
+            public customId!: number;
+
+            fromNew(newEntity: MyInitType): void {
+                super.fromNew(newEntity);
+                this.name = newEntity.name;
+                this.customId = newEntity.customId;
+            }
+
+            fromJSON(serialized: mySerializedType): void {
+                this.aseid = new ASEID(serialized.aseid);
+                this.name = serialized.name;
+                this.customId = serialized.customId;
+                return;
+            }
+
+
+            toJSON(): mySerializedType {
+                return {
+                    ...super.toJSON(),
+                    name: this.name,
+                    customId: this.customId,
+                    serializedFlag: true,
+                };
+            }
+        }
+
+
+        const entityInstance = new MyEntity({
+            name: 'Test Entity',
+            customId: 42,
+        });
+
+        expect(entityInstance.name).toBe('Test Entity');
+        expect(entityInstance.customId).toBe(42);
+
+        const serialized = entityInstance.toJSON();
+        expect(serialized.name).toBe('Test Entity');
+        expect(serialized.customId).toBe(42);
+        expect(serialized.serializedFlag).toBe(true);
+
+        const deserializedEntity = new MyEntity(serialized);
+        expect(deserializedEntity.name).toBe('Test Entity');
+        expect(deserializedEntity.customId).toBe(42);
+        expect(deserializedEntity.aseid.toString()).toBe(entityInstance.aseid.toString());
+    });
+    it('Should be possible to allocate a scope for entity', async () => {
+
+        let resultScope: A_Scope | undefined = undefined;
+
+
+        class MyEntity extends A_Entity {
+
+            scope!: A_Scope;
+
+            fromNew(newEntity: any): void {
+                super.fromNew(newEntity);
+
+                resultScope = new A_Scope({ name: 'entity-scope' });
+
+                this.scope = A_Context.allocate(this, resultScope);
+            }
+
+            fromUndefined(): void {
+                super.fromUndefined();
+
+                resultScope = new A_Scope({ name: 'entity-scope' });
+
+                this.scope = A_Context.allocate(this, resultScope);
+            }
+
+        }
+
+
+        const entityInstance = new MyEntity();
+
+
+        const ParentScope = new A_Scope({
+            name: 'parent-scope',
+            entities: [entityInstance]
+        });
+
+        expect(resultScope).toBeInstanceOf(A_Scope);
+        expect(entityInstance.scope).toBe(resultScope);
+        expect(resultScope!.issuer()).toBe(entityInstance);
+        expect(A_Context.scope(entityInstance)).toBe(ParentScope);
+    });
     it('Should Allow to create an entity with overridden ASEID Scope or Concept', async () => {
         class MyEntity extends A_Entity {
             static get entity(): string {

package/tests/A-Error.test.ts

@@ -1,8 +1,11 @@
 import { A_CONSTANTS__DEFAULT_ENV_VARIABLES } from "@adaas/a-concept/constants/env.constants";
-import { A_Context } from "@adaas/a-concept/global/A-Context/A-Context.class";
-import { A_Error } from "@adaas/a-concept/global/A-Error/A_Error.class";
-import { A_CONSTANTS__ERROR_CODES, A_CONSTANTS__ERROR_DESCRIPTION } from "@adaas/a-concept/global/A-Error/A_Error.constants";
-import { A_FormatterHelper } from "@adaas/a-concept/helpers/A_Formatter.helper";
+import { A_Context } from "@adaas/a-concept/a-context";
+import {
+    A_Error,
+    A_CONSTANTS__ERROR_CODES, 
+    A_CONSTANTS__ERROR_DESCRIPTION
+} from "@adaas/a-concept/a-error";
+import { A_FormatterHelper} from "@adaas/a-concept/helpers/A_Formatter.helper";
 
 jest.retryTimes(0);
 

package/tests/A-Feature.test.ts

@@ -1,11 +1,15 @@
-import { A_Inject } from "@adaas/a-concept/global/A-Inject/A-Inject.decorator";
-import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
-import { A_Feature } from "@adaas/a-concept/global/A-Feature/A-Feature.class";
-import { A_Scope } from "@adaas/a-concept/global/A-Scope/A-Scope.class";
-import { A_Caller } from '@adaas/a-concept/global/A-Caller/A_Caller.class';
-import { A_Context } from '@adaas/a-concept/global/A-Context/A-Context.class';
-import { A_TYPES__ComponentMetaKey } from '@adaas/a-concept/global/A-Component/A-Component.constants';
-import { A_Dependency, A_Entity, A_Error, A_TYPES__FeatureState } from "../src";
+import { A_Inject } from "@adaas/a-concept/a-inject";
+import {
+    A_Component,
+    A_TYPES__ComponentMetaKey
+} from "@adaas/a-concept/a-component";
+import { A_Feature, A_TYPES__FeatureState } from "@adaas/a-concept/a-feature";
+import { A_Scope } from "@adaas/a-concept/a-scope";
+import { A_Caller } from '@adaas/a-concept/a-caller';
+import { A_Context } from '@adaas/a-concept/a-context';
+import { A_Dependency } from "@adaas/a-concept/a-dependency";
+import { A_Error } from "@adaas/a-concept/a-error";
+import { A_Entity } from "@adaas/a-concept/a-entity";
 
 jest.retryTimes(0);
 

package/tests/A-Fragment.test.ts

@@ -1,5 +1,4 @@
-import { A_Fragment } from "@adaas/a-concept/global/A-Fragment/A-Fragment.class";
-import { A_Scope } from "../src";
+import { A_Fragment } from "@adaas/a-concept/a-fragment";
 
 jest.retryTimes(0);
 

package/tests/A-Inject.test.ts

@@ -1,4 +1,7 @@
-import { A_Component, A_Error, A_Inject, A_Scope } from "../src";
+import { A_Component } from "@adaas/a-concept/a-component";
+import { A_Error } from "@adaas/a-concept/a-error";
+import { A_Inject } from "@adaas/a-concept/a-inject";
+import { A_Scope } from "@adaas/a-concept/a-scope";
 
 jest.retryTimes(0);
 

package/tests/A-Meta.test.ts

@@ -1,12 +1,14 @@
-import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
-import { A_TYPES__ComponentMetaKey } from "@adaas/a-concept/global/A-Component/A-Component.constants";
-import { A_ComponentMeta } from "@adaas/a-concept/global/A-Component/A-Component.meta";
-import { A_Concept } from "@adaas/a-concept/global/A-Concept/A-Concept.class";
-import { A_Context } from "@adaas/a-concept/global/A-Context/A-Context.class";
-import { A_Feature } from "@adaas/a-concept/global/A-Feature/A-Feature.class";
-import { A_Meta } from "@adaas/a-concept/global/A-Meta/A-Meta.class";
-import { A_Inject } from "@adaas/a-concept/global/A-Inject/A-Inject.decorator";
-import { A_TYPES__ComponentMeta } from "@adaas/a-concept/global/A-Component/A-Component.types";
+import {
+    A_Component,
+    A_ComponentMeta,
+    A_TYPES__ComponentMeta,
+    A_TYPES__ComponentMetaKey
+} from "@adaas/a-concept/a-component";
+import { A_Concept } from "@adaas/a-concept/a-concept";
+import { A_Context } from "@adaas/a-concept/a-context";
+import { A_Feature } from "@adaas/a-concept/a-feature";
+import { A_Meta } from "@adaas/a-concept/a-meta";
+import { A_Inject } from "@adaas/a-concept/a-inject";
 
 jest.retryTimes(0);
 
@@ -144,7 +146,7 @@ describe('A-Meta tests', () => {
         @A_Meta.Define(CustomComponentMeta)
         class CustomComponent extends A_Component {
 
-            static Test(){
+            static Test() {
 
             }
 

package/tests/A-Scope.test.ts

@@ -1,13 +1,14 @@
-import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
-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_Context } from '@adaas/a-concept/global/A-Context/A-Context.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 { A_Fragment } from '@adaas/a-concept/global/A-Fragment/A-Fragment.class';
-import { A_Scope } from "@adaas/a-concept/global/A-Scope/A-Scope.class";
-import { ASEID } from '@adaas/a-concept/global/ASEID/ASEID.class';
-import { A_Dependency, A_Error } from '../src';
+import { A_Component } from "@adaas/a-concept/a-component";
+import { A_Concept } from '@adaas/a-concept/a-concept';
+import { A_Container } from '@adaas/a-concept/a-container';
+import { A_Context } from '@adaas/a-concept/a-context';
+import { A_Entity } from "@adaas/a-concept/a-entity";
+import { A_Feature } from '@adaas/a-concept/a-feature';
+import { A_Fragment } from '@adaas/a-concept/a-fragment'
+import { A_Scope } from "@adaas/a-concept/a-scope";
+import { ASEID } from '@adaas/a-concept/aseid';
+import { A_Dependency } from "@adaas/a-concept/a-dependency";
+import { A_Error } from "@adaas/a-concept/a-error";
 
 jest.retryTimes(0);
 

package/tests/A-StepManager.test.ts

@@ -1,6 +1,6 @@
-import { A_Component } from "@adaas/a-concept/global/A-Component/A-Component.class";
-import { A_Dependency } from "@adaas/a-concept/global/A-Dependency/A-Dependency.class";
-import { A_StepsManager } from "@adaas/a-concept/global/A-StepManager/A-StepManager.class";
+import { A_Component } from "@adaas/a-concept/a-component";
+import { A_Dependency } from "@adaas/a-concept/a-dependency";
+import { A_StepsManager } from "@adaas/a-concept/a-step-manager";
 
 describe('A-StepManager tests', () => {
     it('Should Allow to create a step manager', async () => {

package/tests/ASEID.test.ts

@@ -1,6 +1,6 @@
 import { A_CONSTANTS__DEFAULT_ENV_VARIABLES } from "@adaas/a-concept/constants/env.constants";
-import { A_Context } from '@adaas/a-concept/global/A-Context/A-Context.class';
-import { ASEID } from "@adaas/a-concept/global/ASEID/ASEID.class";
+import { A_Context } from '@adaas/a-concept/a-context';
+import { ASEID } from "@adaas/a-concept/aseid";
 
 jest.retryTimes(0);
 

package/tests/jest.setup.ts

@@ -1,30 +1,30 @@
-import { A_Context } from '@adaas/a-concept/global/A-Context/A-Context.class';
-import fs from 'fs';
+// import { A_Context } from '@adaas/a-concept/a-context';
+// import fs from 'fs';
 
-/**
- * Base hooks for tests
- */
-beforeAll(async () => {
+// /**
+//  * Base hooks for tests
+//  */
+// beforeAll(async () => {
 
-    return Promise.resolve();
-});
+//     return Promise.resolve();
+// });
 
-afterAll(async () => {
-    try {
-        fs.unlinkSync('a-concept.conf.json');
+// afterAll(async () => {
+//     try {
+//         fs.unlinkSync('a-concept.conf.json');
 
-    } catch (error) {
+//     } catch (error) {
 
-    }
-    return Promise.resolve();
-});
+//     }
+//     return Promise.resolve();
+// });
 
-beforeEach(async () => {
-    A_Context.reset();
-    return Promise.resolve();
-});
+// beforeEach(async () => {
+//     A_Context.reset();
+//     return Promise.resolve();
+// });
 
-afterEach(async () => {
-    A_Context.reset();
-    return Promise.resolve();
-});
+// afterEach(async () => {
+//     A_Context.reset();
+//     return Promise.resolve();
+// });

package/tsconfig.json

@@ -1,99 +1,61 @@
 {
-  "$schema": "https://json.schemastore.org/tsconfig",
-
-  "compileOnSave": false,
-
-  "compilerOptions": {
-    "useDefineForClassFields": false,
-
-    /* ===============================
-       Output (tsup controls formats)
-       =============================== */
-    "outDir": "dist",
-    "declaration": true,
-    "declarationMap": true,
-    "sourceMap": true,
-
-    /* ===============================
-       Language & runtime
-       =============================== */
-    "target": "ES2022",
-    "lib": ["ES2022", "DOM"],
-
-    /* ===============================
-       Module system (CRITICAL)
-       =============================== */
-    "module": "nodenext",
-    "moduleResolution": "NodeNext",
-
-    /* ===============================
-       Interop
-       =============================== */
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "resolveJsonModule": true,
-
-    /* ===============================
-       Type safety
-       =============================== */
-    "strict": true,
-    "noImplicitAny": false,
-    "strictNullChecks": true,
-    "strictFunctionTypes": true,
-    "strictPropertyInitialization": true,
-    "noFallthroughCasesInSwitch": true,
-
-    /* ===============================
-       Developer experience
-       =============================== */
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "noErrorTruncation": true,
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-
-    /* ===============================
-       Decorators (if used)
-       =============================== */
-    "experimentalDecorators": true,
-
-    /* ===============================
-       Internal aliases (DEV ONLY)
-       =============================== */
-    "baseUrl": ".",
-    "paths": {
-      "@adaas/a-concept/constants/*": ["src/constants/*"],
-      "@adaas/a-concept/global/*": ["src/global/*"],
-      "@adaas/a-concept/types/*": ["src/types/*"],
-      "@adaas/a-concept/helpers/*": ["src/helpers/*"],
-      "@adaas/a-concept/decorators/*": ["src/decorators/*"],
-      "@adaas/a-concept/utils/*": ["src/utils/*"],
-
-      /* DEV-only override to utils source */
-      "@adaas/a-concept/env": ["src/env/index.node.ts"],
-    },
-
-    /* ===============================
-       Types
-       =============================== */
-    "types": [
-      "node",
-      "jest",
-      "mocha",
-    ],
-    "typeRoots": ["node_modules/@types"]
-  },
-
-  "include": [
-    "src/**/*",
-    "tests/**/*",
-    "examples/**/*.ts",
-    "src/index.ts",
-    "src/env/global.browser.d.ts"
-  ],
-
-  "exclude": [
-    "node_modules",
-    "dist",
-  ]
+   "extends": "./.conf/tsconfig.base.json",
+
+   "compilerOptions": {
+      "rootDir": "./",
+      "baseUrl": ".",
+      /* ===============================
+         Internal aliases (DEV ONLY)
+         =============================== */
+      "paths": {
+         "@adaas/a-concept/constants/*": ["src/constants/*"],
+         "@adaas/a-concept/utils/*": ["src/utils/*"],
+         "@adaas/a-concept/helpers/*": ["src/helpers/*"],
+         "@adaas/a-concept/types": ["src/types"],
+         "@adaas/a-concept/env": ["src/env/index.node.ts"],
+         
+
+         "@adaas/a-concept/a-abstraction": ["src/lib/A-Abstraction"],
+         "@adaas/a-concept/a-caller": ["src/lib/A-Caller"],
+         "@adaas/a-concept/a-component": ["src/lib/A-Component"],
+         "@adaas/a-concept/a-concept": ["src/lib/A-Concept"],
+         "@adaas/a-concept/a-container": ["src/lib/A-Container"],
+         "@adaas/a-concept/a-context": ["src/lib/A-Context"],
+         "@adaas/a-concept/a-dependency": ["src/lib/A-Dependency"],
+         "@adaas/a-concept/a-entity": ["src/lib/A-Entity"],
+         "@adaas/a-concept/a-error": ["src/lib/A-Error"],
+         "@adaas/a-concept/a-feature": ["src/lib/A-Feature"],
+         "@adaas/a-concept/a-fragment": ["src/lib/A-Fragment"],
+         "@adaas/a-concept/a-inject": ["src/lib/A-Inject"],
+         "@adaas/a-concept/a-meta": ["src/lib/A-Meta"],
+         "@adaas/a-concept/a-scope": ["src/lib/A-Scope"],
+         "@adaas/a-concept/a-stage": ["src/lib/A-Stage"],
+         "@adaas/a-concept/a-step-manager": ["src/lib/A-StepManager"],
+         "@adaas/a-concept/aseid": ["src/lib/ASEID"],
+
+      },
+
+      /* ===============================
+         Types
+         =============================== */
+      "types": [
+         "node",
+         "jest",
+         "mocha",
+      ],
+      "typeRoots": ["node_modules/@types"]
+   },
+
+   "include": [
+      "src/**/*",
+      "tests/**/*",
+      "examples/**/*.ts",
+      "src/index.ts",
+      "src/env/global.browser.d.ts"
+   ],
+
+   "exclude": [
+      "node_modules",
+      "dist",
+   ]
 }

package/tsup.config.ts

@@ -18,15 +18,14 @@ export default defineConfig([
     entry: {
       // Public library entry
       index: "src/index.ts",
-
-      // Public env entry (browser implementation)
-      env: "src/env/index.browser.ts",
     },
 
+    tsconfig: "./.conf/tsconfig.browser.json", // Separate tsconfig for browser build
+
     // Output directory for browser bundle
     outDir: "dist/browser",
 
-    bundle: false, // Bundle for browser consumption
+    bundle: true, // Bundle for browser consumption
 
     // Browser consumers expect ESM
     format: ["esm"],
@@ -46,11 +45,14 @@ export default defineConfig([
     // Emit .d.ts files
     dts: true,
 
-    /**
-     * IMPORTANT:
-     * We do NOT define process.env here.
-     * Browser env must never reference process at all.
-     */
+    minify: true, // Minify browser build for smaller size
+
+    // Ensure .mjs extension for ESM output
+    outExtension({ format }) {
+      return {
+        js: ".mjs"
+      };
+    }
   },
 
   /**
@@ -71,15 +73,16 @@ export default defineConfig([
     entry: {
       // Same public API as browser
       index: "src/index.ts",
-
-      // Node-specific env implementation
-      env: "src/env/index.node.ts",
     },
 
+    tsconfig: "./.conf/tsconfig.node.json", // Separate tsconfig for node build
+
+    splitting: true, // Disable code splitting for Node build
+
     // Output directory for node bundle
     outDir: "dist/node",
 
-    bundle: false, // Don't bundle node build, keep imports as-is
+    bundle: true, // Don't bundle node build, keep imports as-is
 
     // Support both module systems
     format: ["esm", "cjs"],
@@ -96,6 +99,8 @@ export default defineConfig([
     // Emit .d.ts files (shared shape)
     dts: true,
 
+    minify: false, // Don't minify Node build for better readability
+
     // Ensure .cjs extension for CommonJS output
     outExtension({ format }) {
       return {