@xrystal/core 3.19.4 → 3.19.5

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 +19 -11
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.4",
4
+ "version": "3.19.5",
5
5
  "description": "Project core for xrystal",
6
6
  "publishConfig": {
7
7
  "access": "public",
package/source/loader/controller/index.js CHANGED
@@ -93,11 +93,11 @@ export class ControllerService extends Controller {
93
93
  }).getResponse);
94
94
  }
95
95
  }
96
- const logicResult = logic ? await logic({ payload, convertedPayload }) : {};
96
+ const logicResult = logic ? await logic({ payload, convertedPayload }) : null;
97
97
  if (logicResult?.status === false) {
98
98
  return currentRes.status(logicResult.code || 400).send(new ResponseSchema({
99
99
  status: false,
100
- message: logicResult.message,
100
+ message: logicResult.message || '',
101
101
  code: logicResult.code || 400
102
102
  }).getResponse);
103
103
  }
@@ -105,21 +105,29 @@ 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
- if (Array.isArray(resResult)) {
109
- finalMessage = responseMessageHelper.successFully(resResult[0], resResult[1], currentReq.t);
108
+ const messageSource = resResult?.message || (typeof resResult === 'string' || Array.isArray(resResult) ? resResult : '');
109
+ if (Array.isArray(messageSource)) {
110
+ finalMessage = responseMessageHelper.successFully(messageSource[0], messageSource[1], currentReq.t);
110
111
  }
111
- else if (typeof resResult === 'string') {
112
- finalMessage = resResult;
112
+ else if (typeof messageSource === 'string' && messageSource !== '') {
113
+ if (messageSource.startsWith('@')) {
114
+ finalMessage = responseMessageHelper.successFully(messageSource.substring(1), '', currentReq.t);
115
+ }
116
+ else {
117
+ finalMessage = currentReq.t(messageSource);
118
+ }
113
119
  }
114
- else if (resResult?.message) {
115
- finalMessage = Array.isArray(resResult.message)
116
- ? responseMessageHelper.successFully(resResult.message[0], resResult.message[1], currentReq.t)
117
- : resResult.message;
120
+ let finalPayload = undefined;
121
+ if (logic) {
122
+ finalPayload = logicResult?.payload !== undefined ? logicResult.payload : logicResult;
123
+ if (finalPayload === messageSource || (typeof finalPayload === 'object' && finalPayload?.message === messageSource)) {
124
+ finalPayload = undefined;
125
+ }
118
126
  }
119
127
  return currentRes.status(200).send(new ResponseSchema({
120
128
  status: true,
121
129
  message: finalMessage,
122
- payload: logicResult?.payload !== undefined ? logicResult.payload : logicResult
130
+ payload: finalPayload
123
131
  }).getResponse);
124
132
  }
125
133
  catch (error) {