@xrystal/core 3.23.4 → 3.23.6

package/package.json

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

package/source/loader/controller/index.js

@@ -90,24 +90,19 @@ export default class Controller extends BaseController {
     parseMessage(msg, t, isError = false) {
         if (!msg)
             return '';
-        if (typeof msg !== 'string' && !Array.isArray(msg))
-            return '';
-        let cleanMsg = msg;
+        let content = String(msg);
         let useDirect = isError;
-        if (typeof cleanMsg === 'string' && cleanMsg.startsWith('@')) {
-            cleanMsg = cleanMsg.substring(1);
+        if (content.startsWith('@')) {
+            content = content.substring(1);
             useDirect = true;
         }
-        const parts = Array.isArray(cleanMsg) ? cleanMsg : cleanMsg.split(' ');
+        const parts = content.split(' ');
         const key = parts[0];
-        const rawParams = parts.slice(1);
-        const translatedParams = rawParams.map((p) => t(p));
+        const params = parts.slice(1).map(p => t(p));
         if (useDirect) {
-            return t(key, translatedParams);
-        }
-        else {
-            return responseMessageHelper.successFully(key, translatedParams.join(' '), t);
+            return t(key, params);
         }
+        return responseMessageHelper.successfully(t(key), params.join(' '), t);
     }
     async schema({ checks, logic, response }) {
         try {
@@ -125,13 +120,12 @@ export default class Controller extends BaseController {
             if (checks) {
                 const checkResult = await checks(p);
                 if (checkResult !== true) {
-                    const checkCode = checkResult?.code || 400;
-                    const rawMsg = checkResult?.message || checkResult || 'error_validation';
-                    const finalMsg = this.parseMessage(rawMsg, currentReq.t, true);
-                    return currentRes.status(checkCode).send(new ResponseSchema({
+                    const code = checkResult?.code || 400;
+                    const msg = checkResult?.message || (typeof checkResult === 'string' ? checkResult : 'error_validation');
+                    return currentRes.status(code).send(new ResponseSchema({
                         status: false,
-                        message: finalMsg,
-                        code: checkCode
+                        message: this.parseMessage(msg, currentReq.t, true),
+                        code
                     }).getResponse);
                 }
             }
@@ -143,57 +137,56 @@ export default class Controller extends BaseController {
                 logicResult = await logicResult.response();
             }
             if (logicResult?.status === false) {
-                const errorCode = logicResult.code || 400;
-                const finalMsg = this.parseMessage(logicResult.message, currentReq.t, true);
-                return currentRes.status(errorCode).send(new ResponseSchema({
+                const code = logicResult.code || 400;
+                return currentRes.status(code).send(new ResponseSchema({
                     status: false,
-                    message: finalMsg,
-                    code: errorCode
+                    message: this.parseMessage(logicResult.message || 'error_process', currentReq.t, true),
+                    code
                 }).getResponse);
             }
             const resResult = response ? await response({ ...p, logicResult }) : logicResult;
             if (resResult instanceof Response || resResult instanceof Blob || resResult instanceof Uint8Array || resResult instanceof ArrayBuffer) {
                 return currentRes.status(200).send(resResult);
             }
-            let source = resResult;
-            if (source === undefined || source === null)
-                source = logicResult || {};
-            let messageSource = source?.message;
-            if (!messageSource) {
-                if (typeof source === 'string')
-                    messageSource = source;
-                else if (Array.isArray(source))
-                    messageSource = source;
-                else
-                    messageSource = 'success_process';
-            }
-            if (messageSource === source) {
-                source = {};
+            let finalData = undefined;
+            let finalExtraData = undefined;
+            let messageSource = 'success_process';
+            let successCode = this.currentStore?.metadata?._code || 200;
+            const source = resResult !== undefined ? resResult : logicResult;
+            if (source !== null && typeof source === 'object') {
+                if (source.payload && typeof source.payload === 'object') {
+                    finalData = source.payload.data !== undefined ? source.payload.data : source.payload;
+                    finalExtraData = source.payload.extraData;
+                }
+                else if (source.data !== undefined || source.extraData !== undefined) {
+                    finalData = source.data;
+                    finalExtraData = source.extraData;
+                }
+                else {
+                    const hasMetadata = source.status !== undefined || source.message !== undefined || source.code !== undefined;
+                    if (!hasMetadata && Object.keys(source).length > 0) {
+                        finalData = source;
+                    }
+                }
+                if (source.message)
+                    messageSource = source.message;
+                if (source.code !== undefined)
+                    successCode = source.code;
             }
-            let dataVal = source.data;
-            let extraDataVal = source.extraData;
-            if (source.payload) {
-                if (source.payload.data !== undefined)
-                    dataVal = source.payload.data;
-                else if (!source.payload.extraData && !source.data)
-                    dataVal = source.payload;
-                if (source.payload.extraData !== undefined)
-                    extraDataVal = source.payload.extraData;
+            else if (source !== undefined) {
+                messageSource = source;
             }
-            else {
-                if (dataVal === undefined && Object.keys(source).length > 0 && !source.status && !source.message && !source.code) {
-                    dataVal = source;
-                }
+            let payload = undefined;
+            if (finalData !== undefined || finalExtraData !== undefined) {
+                payload = {
+                    data: finalData ?? {},
+                    extraData: finalExtraData ?? {}
+                };
             }
-            const finalPayload = (dataVal !== undefined || extraDataVal !== undefined)
-                ? { data: dataVal, extraData: extraDataVal }
-                : undefined;
-            const finalMessage = this.parseMessage(messageSource, currentReq.t, false);
-            const successCode = this.currentStore?.metadata?._code || source?.code || 200;
             return currentRes.status(successCode).send(new ResponseSchema({
                 status: true,
-                message: finalMessage,
-                ...(finalPayload && { payload: finalPayload }),
+                message: this.parseMessage(messageSource, currentReq.t, false),
+                payload,
                 code: successCode
             }).getResponse);
         }