@xrystal/core 3.18.7 → 3.19.1

package/package.json

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

package/source/loader/configs/index.d.ts

@@ -35,5 +35,6 @@ export default class ConfigsService implements IService {
     });
     load: ({}: {}) => Promise<void>;
     setConfig(newConfigs: any): void;
+    _<K extends keyof IConfig>(key: K): IConfig[K];
     get all(): IConfig;
 }

package/source/loader/configs/index.js

@@ -8,20 +8,23 @@ export default class ConfigsService {
     #systemService;
     constructor({ systemService }) {
         this.#systemService = systemService;
+        return new Proxy(this, {
+            get: (target, prop) => {
+                if (prop in target)
+                    return target[prop];
+                return target.config[prop];
+            }
+        });
     }
     load = async ({}) => {
+        const cwd = process.cwd();
         const tmp = this.#systemService.tmp;
         const extendConfigs = tmp.configs.loaders.configs.loadPath;
-        let importedModule;
-        const cwd = process.cwd();
-        if (extendConfigs.startsWith('@/')) {
-            const fullPath = path.join(cwd, extendConfigs.slice(2));
-            importedModule = await import(pathToFileURL(fullPath).href);
-        }
-        else {
-            const fullPath = path.resolve(tmp.configs.rootFolderPath, extendConfigs);
-            importedModule = await import(pathToFileURL(fullPath).href);
-        }
+        const fullPath = extendConfigs.startsWith('@/')
+            ? path.join(process.cwd(), extendConfigs.slice(2))
+            : path.resolve(tmp.configs.rootFolderPath, extendConfigs);
+        const fileUrl = pathToFileURL(fullPath).href;
+        const modulePromise = import(fileUrl);
         this.config = {
             worker: process.env.WORKER === 'true' ? true : false || false,
             nodeEnv: process.env.NODE_ENV,
@@ -46,8 +49,18 @@ export default class ConfigsService {
             secret: process.env.SECRET,
             cwd,
             env: process.env.NODE_ENV,
-            ...importedModule.configs,
         };
+        try {
+            const moduleData = await modulePromise;
+            const importedConfigs = moduleData?.default || moduleData?.configs || moduleData || {};
+            this.config = {
+                ...this.config,
+                ...(typeof importedConfigs === 'object' ? importedConfigs : {})
+            };
+        }
+        catch (e) {
+            // error
+        }
     };
     setConfig(newConfigs) {
         const mergedData = {
@@ -56,6 +69,9 @@ export default class ConfigsService {
         };
         this.config = Object.freeze(mergedData);
     }
+    _(key) {
+        return this.config[key];
+    }
     get all() {
         return this.config;
     }

package/source/loader/logger/index.js

@@ -155,8 +155,8 @@ export default class LoggerService {
                 topic: this.kafkaLogsTopic,
                 messages: [{
                         value: JSON.stringify({
-                            service: this.serviceName,
                             level,
+                            service: this.serviceName,
                             message,
                             payload,
                             code,

package/source/loader/system/index.d.ts

@@ -1,6 +1,7 @@
 import { IService } from "../../utils";
 export default class SystemService implements IService {
     _tmp: Record<string, any>;
+    cwd: string;
     load: ({ tmp, }: {
         tmp: any;
     }) => Promise<void>;

package/source/loader/system/index.js

@@ -1,5 +1,6 @@
 export default class SystemService {
     _tmp = {};
+    cwd = process.cwd();
     load = async ({ tmp, }) => {
         this._tmp = tmp;
         await this._systemLoader({});

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

@@ -1,5 +1,5 @@
 import { LifetimeType } from 'awilix';
-declare class X {
+declare class X<T = {}> {
     private container;
     private initializedNames;
     constructor();
@@ -23,5 +23,5 @@ declare class X {
     get cradle(): any;
     private isRegistered;
 }
-declare const _default: X;
+declare const _default: X<{}>;
 export default _default;

package/x/tmp.yml

@@ -7,7 +7,7 @@ configs:
 
   loaders:
     configs:
-      loadPath: '@/source/utils/models/classes/configs.project.ts'
+      loadPath: '@/source/utils/helpers/configs/index'
 
     loggers:
       loadPath: logs