@xrystal/core 3.19.5 → 3.19.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/source/loader/controller/index.js +9 -3
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "author": "Yusuf Yasir KAYGUSUZ",
3
3
  "name": "@xrystal/core",
4
- "version": "3.19.5",
4
+ "version": "3.19.7",
5
5
  "description": "Project core for xrystal",
6
6
  "publishConfig": {
7
7
  "access": "public",
package/source/loader/controller/index.js CHANGED
@@ -105,22 +105,28 @@ export class ControllerService extends Controller {
105
105
  return logicResult;
106
106
  const resResult = response ? await response({ payload, convertedPayload, logicResult }) : logicResult;
107
107
  let finalMessage = '';
108
+ let rawMessageValue = '';
108
109
  const messageSource = resResult?.message || (typeof resResult === 'string' || Array.isArray(resResult) ? resResult : '');
109
110
  if (Array.isArray(messageSource)) {
110
111
  finalMessage = responseMessageHelper.successFully(messageSource[0], messageSource[1], currentReq.t);
112
+ rawMessageValue = messageSource[0];
111
113
  }
112
114
  else if (typeof messageSource === 'string' && messageSource !== '') {
113
115
  if (messageSource.startsWith('@')) {
114
- finalMessage = responseMessageHelper.successFully(messageSource.substring(1), '', currentReq.t);
116
+ const cleanMsg = messageSource.substring(1);
117
+ finalMessage = currentReq.t(cleanMsg, {});
118
+ rawMessageValue = cleanMsg;
115
119
  }
116
120
  else {
117
- finalMessage = currentReq.t(messageSource);
121
+ finalMessage = responseMessageHelper.successFully(messageSource, '', currentReq.t);
122
+ rawMessageValue = messageSource;
118
123
  }
119
124
  }
120
125
  let finalPayload = undefined;
121
126
  if (logic) {
122
127
  finalPayload = logicResult?.payload !== undefined ? logicResult.payload : logicResult;
123
- if (finalPayload === messageSource || (typeof finalPayload === 'object' && finalPayload?.message === messageSource)) {
128
+ // Eğer payload sadece bir mesajdan ibaretse temizle
129
+ if (finalPayload === messageSource || (finalPayload && typeof finalPayload === 'object' && finalPayload.message === rawMessageValue)) {
124
130
  finalPayload = undefined;
125
131
  }
126
132
  }