@xrystal/core 3.19.4 → 3.19.7

package/package.json

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

package/source/loader/controller/index.js

@@ -93,11 +93,11 @@ export class ControllerService extends Controller {
                     }).getResponse);
                 }
             }
-            const logicResult = logic ? await logic({ payload, convertedPayload }) : {};
+            const logicResult = logic ? await logic({ payload, convertedPayload }) : null;
             if (logicResult?.status === false) {
                 return currentRes.status(logicResult.code || 400).send(new ResponseSchema({
                     status: false,
-                    message: logicResult.message,
+                    message: logicResult.message || '',
                     code: logicResult.code || 400
                 }).getResponse);
             }
@@ -105,21 +105,35 @@ export class ControllerService extends Controller {
                 return logicResult;
             const resResult = response ? await response({ payload, convertedPayload, logicResult }) : logicResult;
             let finalMessage = '';
-            if (Array.isArray(resResult)) {
-                finalMessage = responseMessageHelper.successFully(resResult[0], resResult[1], currentReq.t);
+            let rawMessageValue = '';
+            const messageSource = resResult?.message || (typeof resResult === 'string' || Array.isArray(resResult) ? resResult : '');
+            if (Array.isArray(messageSource)) {
+                finalMessage = responseMessageHelper.successFully(messageSource[0], messageSource[1], currentReq.t);
+                rawMessageValue = messageSource[0];
             }
-            else if (typeof resResult === 'string') {
-                finalMessage = resResult;
+            else if (typeof messageSource === 'string' && messageSource !== '') {
+                if (messageSource.startsWith('@')) {
+                    const cleanMsg = messageSource.substring(1);
+                    finalMessage = currentReq.t(cleanMsg, {});
+                    rawMessageValue = cleanMsg;
+                }
+                else {
+                    finalMessage = responseMessageHelper.successFully(messageSource, '', currentReq.t);
+                    rawMessageValue = messageSource;
+                }
             }
-            else if (resResult?.message) {
-                finalMessage = Array.isArray(resResult.message)
-                    ? responseMessageHelper.successFully(resResult.message[0], resResult.message[1], currentReq.t)
-                    : resResult.message;
+            let finalPayload = undefined;
+            if (logic) {
+                finalPayload = logicResult?.payload !== undefined ? logicResult.payload : logicResult;
+                // Eğer payload sadece bir mesajdan ibaretse temizle
+                if (finalPayload === messageSource || (finalPayload && typeof finalPayload === 'object' && finalPayload.message === rawMessageValue)) {
+                    finalPayload = undefined;
+                }
             }
             return currentRes.status(200).send(new ResponseSchema({
                 status: true,
                 message: finalMessage,
-                payload: logicResult?.payload !== undefined ? logicResult.payload : logicResult
+                payload: finalPayload
             }).getResponse);
         }
         catch (error) {