@xrystal/core 3.19.1 → 3.19.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "author": "Yusuf Yasir KAYGUSUZ",
   "name": "@xrystal/core",
-  "version": "3.19.1",
+  "version": "3.19.3",
   "description": "Project core for xrystal",
   "publishConfig": {
     "access": "public",
@@ -37,17 +37,21 @@
     "start": "bun --env-file=../infrastructer/x/environments/.global.env --env-file=../infrastructer/x/environments/.dev.env source/index.js"
   },
   "dependencies": {
+    "@types/lodash": "^4.17.23",
     "@types/yaml": "^1.9.7",
     "awilix": "^12.0.5",
     "chalk": "^5.6.2",
     "commander": "^13.0.0",
     "ejs": "^3.1.9",
     "handlebars": "^4.7.8",
+    "i": "^0.3.7",
     "i18next": "^25.6.3",
     "i18next-fs-backend": "^2.6.1",
     "i18next-http-middleware": "^3.8.2",
     "kafkajs": "^2.2.4",
+    "lodash": "^4.17.23",
     "moment-timezone": "^0.6.0",
+    "npm": "^11.7.0",
     "ora": "^9.0.0",
     "picocolors": "^1.1.1",
     "qs": "^6.14.1",

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

@@ -25,9 +25,10 @@ export interface IConfig {
     cwd: string;
     env: string;
 }
+export interface IConfigsService extends IConfig {
+}
 export default class ConfigsService implements IService {
     #private;
-    private config;
     readonly publicFolderName: string;
     readonly kafkaLogsTopic: string;
     constructor({ systemService }: {

package/source/loader/configs/index.js

@@ -1,20 +1,20 @@
 import path from 'node:path';
+import { merge } from 'lodash';
 import { Constants } from '../../utils';
 import { pathToFileURL } from 'node:url';
 export default class ConfigsService {
-    config;
     publicFolderName = Constants.publicFolderName;
     kafkaLogsTopic = Constants.kafkaLogsTopic;
     #systemService;
+    #config;
     constructor({ systemService }) {
         this.#systemService = systemService;
-        return new Proxy(this, {
+        const proxy = new Proxy(this, {
             get: (target, prop) => {
-                if (prop in target)
-                    return target[prop];
-                return target.config[prop];
+                return target[prop] || target.config?.[prop];
             }
         });
+        return proxy;
     }
     load = async ({}) => {
         const cwd = process.cwd();
@@ -25,7 +25,7 @@ export default class ConfigsService {
             : path.resolve(tmp.configs.rootFolderPath, extendConfigs);
         const fileUrl = pathToFileURL(fullPath).href;
         const modulePromise = import(fileUrl);
-        this.config = {
+        this.#config = {
             worker: process.env.WORKER === 'true' ? true : false || false,
             nodeEnv: process.env.NODE_ENV,
             debug: process.env.SYSTEM_LOGGER_LAYER,
@@ -53,26 +53,21 @@ export default class ConfigsService {
         try {
             const moduleData = await modulePromise;
             const importedConfigs = moduleData?.default || moduleData?.configs || moduleData || {};
-            this.config = {
-                ...this.config,
-                ...(typeof importedConfigs === 'object' ? importedConfigs : {})
-            };
+            const merged = merge({}, this.#config, importedConfigs || {});
+            this.#config = Object.freeze(merged);
         }
         catch (e) {
             // error
         }
     };
     setConfig(newConfigs) {
-        const mergedData = {
-            ...this.config,
-            ...newConfigs
-        };
-        this.config = Object.freeze(mergedData);
+        const mergedDObj = Object.assign(this.#config, newConfigs);
+        this.#config = Object.freeze(mergedDObj);
     }
     _(key) {
-        return this.config[key];
+        return this.#config[key];
     }
     get all() {
-        return this.config;
+        return this.#config;
     }
 }

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

@@ -60,7 +60,6 @@ declare abstract class Controller {
     };
     protected get req(): CustomRequest;
     protected get res(): CustomResponse;
-    protected parsedQuerys: (url: string) => Record<string, any>;
 }
 export declare abstract class ControllerService extends Controller {
     load(props?: {

package/source/loader/controller/index.js

@@ -1,4 +1,3 @@
-import qs from 'qs';
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { LoggerLayerEnum, ProtocolEnum, responseMessageHelper, ResponseSchema, x } from '../../utils/index';
 import LoggerService from '../logger';
@@ -16,22 +15,18 @@ class Controller {
     get req() {
         const store = this.currentStore;
         const identityT = (k) => k;
-        if (!store)
+        if (!store?.ctx)
             return { url: '', method: '', headers: {}, params: {}, query: {}, lang: 'en', t: identityT };
-        const { ctx, req: nativeReq } = store;
-        const source = nativeReq || ctx?.request || ctx;
         return {
-            url: source?.url || '',
-            method: source?.method || 'GET',
-            headers: source?.headers && typeof source.headers.entries === 'function'
-                ? Object.fromEntries(source.headers.entries())
-                : (source?.headers || {}),
-            body: ctx?.body || nativeReq?.body || source?.body,
-            params: ctx?.params || nativeReq?.params || source?.params || {},
-            query: ctx?.query || nativeReq?.query || source?.query || {},
-            accounts: ctx?.user || nativeReq?.accounts || source?.accounts,
-            lang: ctx?.lang || nativeReq?.lang || source?.lang || 'en',
-            t: ctx?.t || nativeReq?.t || source?.t || identityT
+            url: store.ctx.url,
+            method: store.ctx.method,
+            headers: store.ctx.headers,
+            body: store.ctx.body,
+            query: store.ctx.query,
+            params: store.ctx.params,
+            lang: store.ctx.lang,
+            t: store.ctx.t || identityT,
+            accounts: store.ctx.accounts || store.req?.accounts
         };
     }
     get res() {
@@ -76,15 +71,6 @@ class Controller {
             json(data) { return this.send(data); }
         };
     }
-    parsedQuerys = (url) => {
-        try {
-            const queryPart = url.split('?')[1];
-            return queryPart ? qs.parse(queryPart, { decoder: decodeURIComponent }) : {};
-        }
-        catch {
-            return {};
-        }
-    };
 }
 export class ControllerService extends Controller {
     async load(props = {}) {
@@ -93,14 +79,19 @@ export class ControllerService extends Controller {
     }
     async schema({ checks, logic, response }) {
         try {
-            const req = this.req;
-            const res = this.res;
-            const payload = { req, res };
-            const convertedPayload = { ...payload, query: this.parsedQuerys(req.url) };
+            const currentReq = this.req;
+            const currentRes = this.res;
+            const payload = { req: currentReq, res: currentRes };
+            const convertedPayload = {
+                ...payload,
+                query: currentReq.query,
+                body: currentReq.body,
+                params: currentReq.params
+            };
             if (checks) {
                 const checkResult = await checks({ payload, convertedPayload });
-                if (checkResult === false || (checkResult && !Array.isArray(checkResult) && typeof checkResult === 'object')) {
-                    return res.status(checkResult?.code || 400).send(new ResponseSchema({
+                if (checkResult === false || (checkResult && typeof checkResult === 'object' && !Array.isArray(checkResult))) {
+                    return currentRes.status(checkResult?.code || 400).send(new ResponseSchema({
                         status: false,
                         message: checkResult?.message || '',
                         code: checkResult?.code || 400
@@ -109,34 +100,31 @@ export class ControllerService extends Controller {
             }
             const logicResult = await logic({ payload, convertedPayload });
             if (logicResult?.status === false) {
-                return res.status(logicResult.code || 400).send(new ResponseSchema({
+                return currentRes.status(logicResult.code || 400).send(new ResponseSchema({
                     status: false,
                     message: logicResult.message,
                     code: logicResult.code || 400
                 }).getResponse);
             }
-            if (logicResult?.response instanceof Function)
-                return logicResult.response(logicResult.payload);
             if (logicResult instanceof Response)
                 return logicResult;
             if (response) {
                 const resResult = await response({ payload, convertedPayload, logicResult });
                 const messageData = Array.isArray(resResult) ? resResult : resResult?.message;
-                const successObj = {
+                return currentRes.status(200).send(new ResponseSchema({
                     status: true,
                     message: Array.isArray(messageData)
-                        ? responseMessageHelper.successFully(messageData[0], messageData[1], req.t)
+                        ? responseMessageHelper.successFully(messageData[0], messageData[1], currentReq.t)
                         : (messageData || ''),
                     payload: logicResult?.payload !== undefined ? logicResult.payload : logicResult
-                };
-                return res.status(200).send(new ResponseSchema(successObj).getResponse);
+                }).getResponse);
             }
-            return res.send(logicResult?.payload !== undefined ? logicResult.payload : logicResult);
+            return currentRes.send(logicResult?.payload !== undefined ? logicResult.payload : logicResult);
         }
         catch (error) {
             this.logger.winston.log({
                 level: LoggerLayerEnum[LoggerLayerEnum.CRITICAL].toLowerCase(),
-                message: `Controller Error: ${error}`,
+                message: `Controller Error: ${error}`
             });
             return this.res.status(500).send(new ResponseSchema({
                 status: false,

package/source/utils/models/index.d.ts

@@ -1,9 +1,10 @@
+import _ from 'lodash';
 import x from './classes/class.x';
-import locator, { Locator } from './classes/class.service-locator';
+import locator from './classes/class.service-locator';
 export * from './classes/class.tmp-file-loader';
 export * from './classes/class.response';
 export * from './classes/class.services';
 export * from './classes/class.interfaces';
 export * from './types';
 export * from './enums';
-export { x, locator, Locator };
+export { x, locator, _ };

package/source/utils/models/index.js

@@ -1,9 +1,10 @@
+import _ from 'lodash';
 import x from './classes/class.x';
-import locator, { Locator } from './classes/class.service-locator';
+import locator from './classes/class.service-locator';
 export * from './classes/class.tmp-file-loader';
 export * from './classes/class.response';
 export * from './classes/class.services';
 export * from './classes/class.interfaces';
 export * from './types';
 export * from './enums';
-export { x, locator, Locator };
+export { x, locator, _ };