@xrystal/core 3.14.3 → 3.14.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "author": "Yusuf Yasir KAYGUSUZ",
   "name": "@xrystal/core",
-  "version": "3.14.3",
+  "version": "3.14.7",
   "description": "Project core for xrystal",
   "publishConfig": {
     "access": "public",

package/source/project/index.js

@@ -16,14 +16,11 @@ const coreLoader = async ({}) => {
     try {
         const { configs } = core._;
         const rootFolderPath = configs.rootFolderPath;
-        x
-            .load([
+        await (await x.load([
             path.join(__dirname, '..', 'loader', '**/*.{ts,js}'),
         ], {
-            exclude: [
-                path.join(__dirname, '..', 'utils', '**/class.x.{ts,js}'),
-            ]
-        })
+            exclude: [path.join(__dirname, '..', 'utils', '**/class.x.{ts,js}')]
+        }))
             .initialize([
             {
                 service: SystemService,

package/source/utils/models/classes/class.x.d.ts

@@ -1,4 +1,4 @@
-import { AwilixContainer, LifetimeType } from 'awilix';
+import { LifetimeType } from 'awilix';
 export declare class X {
     private container;
     private initializedNames;
@@ -8,7 +8,7 @@ export declare class X {
         verbose?: boolean;
         exclude?: string | Function | (string | Function)[];
         lifetime?: LifetimeType;
-    }): this;
+    }): Promise<this>;
     register(Dependency: any, lifetime?: LifetimeType): this;
     registerAll(dependencies: any[], lifetime?: LifetimeType): this;
     registerInstance(name: string, instance: any): this;
@@ -20,10 +20,8 @@ export declare class X {
         props?: any;
     }[], verbose?: boolean): Promise<this>;
     get<T>(target: string | any): T;
-    createScope(): AwilixContainer<any>;
     get cradle(): any;
     private isRegistered;
-    private getSourceByInstance;
 }
 declare const _default: X;
 export default _default;

package/source/utils/models/classes/class.x.js

@@ -1,5 +1,6 @@
 import { createContainer, asClass, asValue, InjectionMode, listModules, Lifetime } from 'awilix';
 import path from 'node:path';
+import { pathToFileURL } from 'node:url';
 export class X {
     container;
     initializedNames = new Set();
@@ -14,7 +15,7 @@ export class X {
         const normalizedPath = filePath.replace(/\\/g, '/');
         return normalizedPath.includes('node_modules') || !normalizedPath.startsWith(projectRoot) ? 'LIB' : 'APP';
     }
-    load(patterns, options = {}) {
+    async load(patterns, options = {}) {
         const { verbose = false, exclude = [], lifetime = Lifetime.SINGLETON } = options;
         const cwd = process.cwd();
         const excludeList = Array.isArray(exclude) ? exclude : [exclude];
@@ -32,26 +33,31 @@ export class X {
         }
         for (const m of modules) {
             const source = this.getSource(m.path);
-            if (m.path === __filename || m.path.endsWith('.d.ts') || m.path.endsWith('.map'))
+            const normalizedMPath = m.path.replace(/\\/g, '/');
+            if (normalizedMPath === __filename.replace(/\\/g, '/') || normalizedMPath.endsWith('.d.ts'))
                 continue;
+            const isPathExcluded = excludeList.some(ex => {
+                if (typeof ex === 'string') {
+                    const normalizedEx = ex.replace(/\\/g, '/');
+                    return normalizedMPath.includes(normalizedEx) || m.name === ex;
+                }
+                return false;
+            });
+            if (isPathExcluded) {
+                if (verbose)
+                    console.log(`[DI][${source}] Excluded: ${m.name}`);
+                continue;
+            }
             try {
-                const loaded = require(m.path);
+                const fileUrl = pathToFileURL(m.path).href;
+                const loaded = await import(fileUrl);
                 let dependency = loaded.default;
                 if (!dependency) {
                     dependency = Object.values(loaded).find(val => typeof val === 'function' && !!val.prototype && !!val.name);
                 }
-                const isExcluded = excludeList.some(ex => {
-                    if (typeof ex === 'string')
-                        return m.path.includes(ex) || m.name === ex;
-                    if (typeof ex === 'function')
-                        return dependency === ex;
-                    return false;
-                });
-                if (isExcluded) {
-                    if (verbose)
-                        console.log(`[DI][${source}] Excluded: ${m.name}`);
+                const isClassExcluded = excludeList.some(ex => typeof ex === 'function' && dependency === ex);
+                if (isClassExcluded)
                     continue;
-                }
                 const isClass = typeof dependency === 'function' && !!dependency.prototype && !!dependency.name;
                 if (isClass) {
                     const className = dependency.name;
@@ -61,12 +67,13 @@ export class X {
                             [name]: asClass(dependency).setLifetime(lifetime)
                         });
                         if (verbose)
-                            console.log(`[DI][${source}] Registered (${lifetime}): ${name}`);
+                            console.log(`[DI][${source}] Registered: ${name}`);
                     }
                 }
             }
             catch (err) {
-                console.error(`[DI][${source}] Load Error in ${m.name}:`, err.message);
+                if (verbose)
+                    console.error(`[DI][${source}] Load Error in ${m.name}:`, err.message);
             }
         }
         return this;
@@ -77,9 +84,7 @@ export class X {
         const name = Dependency.name.charAt(0).toLowerCase() + Dependency.name.slice(1);
         if (this.isRegistered(name))
             return this;
-        this.container.register({
-            [name]: asClass(Dependency).setLifetime(lifetime)
-        });
+        this.container.register({ [name]: asClass(Dependency).setLifetime(lifetime) });
         return this;
     }
     registerAll(dependencies, lifetime = Lifetime.SINGLETON) {
@@ -117,16 +122,15 @@ export class X {
                 continue;
             const instance = cradle[key];
             if (instance && typeof instance.load === 'function') {
-                const source = this.getSourceByInstance(instance);
                 try {
                     const props = propsMap.get(key) || {};
                     await instance.load(props);
                     this.initializedNames.add(key);
                     if (verbose)
-                        console.log(`[DI][${source}] Initialized: ${key}`);
+                        console.log(`[DI] Initialized: ${key}`);
                 }
                 catch (err) {
-                    console.error(`[DI][${source}] Initialization Failed: ${key} ->`, err.message);
+                    console.error(`[DI] Initialization Failed: ${key} ->`, err.message);
                 }
             }
         }
@@ -134,28 +138,19 @@ export class X {
     }
     get(target) {
         try {
-            const resolveName = typeof target === 'function'
-                ? target.name.charAt(0).toLowerCase() + target.name.slice(1)
-                : target;
+            const resolveName = typeof target === 'function' ? target.name.charAt(0).toLowerCase() + target.name.slice(1) : target;
             return this.container.resolve(resolveName);
         }
         catch (err) {
             if (err.message.includes('Cyclic dependencies')) {
-                console.error('\n❌ [DI][CRITICAL] Cyclic dependency detected!');
-                console.error(`🔍 Resolution Path: ${err.resolutionStack}`);
+                console.error(`\n❌ [DI][CRITICAL] Cyclic dependency detected!\n🔍 Path: ${err.resolutionStack}`);
             }
             throw err;
         }
     }
-    createScope() {
-        return this.container.createScope();
-    }
     get cradle() { return this.container.cradle; }
     isRegistered(name) {
         return !!this.container.registrations[name] && this.container.registrations[name].resolve !== undefined;
     }
-    getSourceByInstance(instance) {
-        return instance.constructor?.name?.includes('Service') || instance.constructor?.name?.includes('Controller') ? 'APP' : 'LIB';
-    }
 }
 export default new X();