@xrystal/core 3.13.6 → 3.14.0

package/package.json

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

package/source/project/index.js

@@ -19,7 +19,11 @@ const coreLoader = async ({}) => {
         x
             .load([
             path.join(__dirname, '..', 'loader', '**/*.{ts,js}'),
-        ], false)
+        ], {
+            exclude: [
+                path.join(__dirname, '..', 'utils', '**/class.x.{ts,js}'),
+            ]
+        })
             .initialize([
             {
                 service: SystemService,

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

@@ -2,11 +2,14 @@ export declare class X {
     private container;
     private initializedNames;
     constructor();
-    load(patterns: string | string[], verbose?: boolean): this;
+    private getSource;
+    load(patterns: string | string[], options?: {
+        verbose?: boolean;
+        exclude?: string | Function | (string | Function)[];
+    }): this;
     register(Dependency: any): this;
     registerAll(dependencies: any[]): this;
     registerInstance(name: string, instance: any): this;
-    remove(target: string | any): this;
     initialize(input?: {
         service: any;
         props?: any;

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

@@ -9,13 +9,16 @@ export class X {
             strict: true
         });
     }
-    load(patterns, verbose = false) {
-        if (!patterns || (Array.isArray(patterns) && patterns.length === 0))
-            return this;
+    getSource(filePath) {
+        const projectRoot = process.cwd().replace(/\\/g, '/');
+        const normalizedPath = filePath.replace(/\\/g, '/');
+        return normalizedPath.includes('node_modules') || !normalizedPath.startsWith(projectRoot) ? 'LIB' : 'APP';
+    }
+    load(patterns, options = {}) {
+        const { verbose = false, exclude = [] } = options;
         const cwd = process.cwd();
-        const resolvedPatterns = (Array.isArray(patterns) ? patterns : [patterns])
-            .filter(p => typeof p === 'string')
-            .map(p => {
+        const excludeList = Array.isArray(exclude) ? exclude : [exclude];
+        const resolvedPatterns = (Array.isArray(patterns) ? patterns : [patterns]).map(p => {
             const resolved = path.isAbsolute(p) ? p : path.resolve(cwd, p);
             return resolved.replace(/\\/g, '/');
         });
@@ -24,10 +27,11 @@ export class X {
             modules = listModules(resolvedPatterns);
         }
         catch (err) {
-            console.error(`[DI] Critical: Path resolution failed: ${err.message}`);
+            console.error(`[DI][CRITICAL] Path resolution failed: ${err.message}`);
             return this;
         }
         for (const m of modules) {
+            const source = this.getSource(m.path);
             if (m.path === __filename || m.path.endsWith('.d.ts') || m.path.endsWith('.map'))
                 continue;
             try {
@@ -36,6 +40,20 @@ export class X {
                 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}`);
+                    continue;
+                }
                 const isClass = typeof dependency === 'function' && !!dependency.prototype && !!dependency.name;
                 if (isClass) {
                     const className = dependency.name;
@@ -43,12 +61,12 @@ export class X {
                     if (!this.isRegistered(name)) {
                         this.container.register({ [name]: asClass(dependency).singleton() });
                         if (verbose)
-                            console.log(`[DI] Registered: ${name}`);
+                            console.log(`[DI][${source}] Registered: ${name}`);
                     }
                 }
             }
             catch (err) {
-                console.error(`[DI] Critical: Failed to load module at ${m.path}:`, err.message);
+                console.error(`[DI][${source}] Load Error in ${m.name}:`, err.message);
             }
         }
         return this;
@@ -63,9 +81,8 @@ export class X {
         return this;
     }
     registerAll(dependencies) {
-        if (!Array.isArray(dependencies))
-            return this;
-        dependencies.forEach(dep => this.register(dep));
+        if (Array.isArray(dependencies))
+            dependencies.forEach(dep => this.register(dep));
         return this;
     }
     registerInstance(name, instance) {
@@ -77,65 +94,48 @@ export class X {
         this.container.register({ [formattedName]: asValue(instance) });
         return this;
     }
-    remove(target) {
-        const name = typeof target === 'function'
-            ? target.name.charAt(0).toLowerCase() + target.name.slice(1)
-            : target;
-        this.container.register(name, asValue(undefined));
-        this.initializedNames.delete(name);
-        return this;
-    }
     async initialize(input, verbose = false) {
         const cradle = this.container.cradle;
         const inputList = input ? (Array.isArray(input) ? input : [input]) : [];
+        const propsMap = new Map();
         for (const item of inputList) {
             if (!item?.service)
                 continue;
-            const name = typeof item.service === 'function'
-                ? item.service.name.charAt(0).toLowerCase() + item.service.name.slice(1)
-                : item.service;
-            if (this.initializedNames.has(name))
-                continue;
-            const instance = cradle[name];
-            if (instance) {
-                if (typeof instance.load === 'function') {
-                    try {
-                        await instance.load(item.props || {});
-                        if (verbose)
-                            console.log(`[DI] Initialized (Priority): ${name}`);
-                    }
-                    catch (err) {
-                        console.error(`[DI] Critical: Priority service "${name}" failed:`, err.message);
-                    }
-                }
-                this.initializedNames.add(name);
-            }
+            const name = typeof item.service === 'function' ? item.service.name.charAt(0).toLowerCase() + item.service.name.slice(1) : item.service;
+            if (name)
+                propsMap.set(name, item.props);
         }
-        for (const key of Object.keys(this.container.registrations)) {
+        const registrationKeys = Object.keys(this.container.registrations);
+        const allKeys = new Set([...propsMap.keys(), ...registrationKeys]);
+        for (const key of allKeys) {
             if (this.initializedNames.has(key))
                 continue;
             const instance = cradle[key];
             if (instance && typeof instance.load === 'function') {
+                const source = instance.constructor && instance.constructor.name ? 'APP' : 'LIB';
                 try {
-                    await instance.load({});
+                    const props = propsMap.get(key) || {};
+                    await instance.load(props);
+                    this.initializedNames.add(key);
                     if (verbose)
-                        console.log(`[DI] Initialized (Auto): ${key}`);
+                        console.log(`[DI][${source}] Initialized: ${key}`);
                 }
                 catch (err) {
-                    console.error(`[DI] Critical: Auto service "${key}" failed:`, err.message);
+                    console.error(`[DI][${source}] Initialization Failed: ${key} ->`, err.message);
                 }
             }
-            this.initializedNames.add(key);
         }
         return this;
     }
     get(target) {
-        if (!target)
-            throw new Error('[DI] Target is required');
-        const resolveName = typeof target === 'function'
-            ? target.name.charAt(0).toLowerCase() + target.name.slice(1)
-            : target;
-        return this.container.resolve(resolveName);
+        try {
+            const resolveName = typeof target === 'function' ? target.name.charAt(0).toLowerCase() + target.name.slice(1) : target;
+            return this.container.resolve(resolveName);
+        }
+        catch (err) {
+            console.error(`[DI][ERROR] Resolution Failed:`, err.message);
+            throw err;
+        }
     }
     get cradle() { return this.container.cradle; }
     isRegistered(name) {