@xrystal/core 3.18.6 → 3.18.8

package/package.json

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

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

@@ -33,7 +33,7 @@ export default class ConfigsService implements IService {
     constructor({ systemService }: {
         systemService: SystemService;
     });
-    load: ({}: {}) => void;
+    load: ({}: {}) => Promise<void>;
     setConfig(newConfigs: any): void;
     get all(): IConfig;
 }

package/source/loader/configs/index.js

@@ -1,5 +1,6 @@
 import path from 'node:path';
 import { Constants } from '../../utils';
+import { pathToFileURL } from 'node:url';
 export default class ConfigsService {
     config;
     publicFolderName = Constants.publicFolderName;
@@ -8,9 +9,15 @@ export default class ConfigsService {
     constructor({ systemService }) {
         this.#systemService = systemService;
     }
-    load = ({}) => {
+    load = async ({}) => {
+        const cwd = process.cwd();
         const tmp = this.#systemService.tmp;
-        const rawConfigs = tmp?.configs || tmp?.configs || {};
+        const extendConfigs = tmp.configs.loaders.configs.loadPath;
+        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,
@@ -19,23 +26,34 @@ export default class ConfigsService {
             httpsfileEncoding: process.env.ENCODING || 'utf8',
             httpsCertfile: process.env.HTTPS_CERT_FILE,
             httpsKeyfile: process.env.HTTPS_KEY_FILE,
-            rootFolderPath: rawConfigs.rootFolderPath || 'x',
+            rootFolderPath: tmp.configs.rootFolderPath || 'x',
             projectName: tmp.project.name,
-            serviceName: rawConfigs.service,
+            serviceName: tmp.configs.service,
             projectNamePrefixEnv: process.env.PROJECT_NAME_PREFIX || '',
             projectNameEnv: process.env.PROJECT_NAME || '',
             projectNameSuffixEnv: process.env.PROJECT_NAME_SUFFIX || '',
-            systemStaticFolderPath: path.resolve(rawConfigs.rootFolderPath, this.publicFolderName),
+            systemStaticFolderPath: path.resolve(tmp.configs.rootFolderPath, this.publicFolderName),
             systemLoggerLayer: process.env.SYSTEM_LOGGER_LAYER,
             kafkaBrokers: process.env?.KAFKA_BROKERS,
             kafkaLogsTopic: this.kafkaLogsTopic,
             baseApiUri: process.env.HTTPS === 'true' ? process.env.SYSTEM_HTTPS_BASE_API_URI : process.env.SYSTEM_BASE_API_URI,
-            port: process.env.PORT || rawConfigs.port || 3000,
+            port: Number(process.env.PORT),
             internalSecret: process.env.INTERNAL_SECRET,
             secret: process.env.SECRET,
-            cwd: process.cwd(),
-            env: process.env.NODE_ENV
+            cwd,
+            env: process.env.NODE_ENV,
         };
+        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 = {

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/helpers/configs/index.d.ts

@@ -0,0 +1 @@
+export declare const configs: {};

package/source/utils/helpers/configs/index.js

@@ -0,0 +1 @@
+export const configs = {};

package/x/tmp.yml

@@ -7,7 +7,7 @@ configs:
 
   loaders:
     configs:
-      envLoadPath: environments
+      loadPath: '@/source/utils/helpers/configs/index'
 
     loggers:
       loadPath: logs