@xrystal/core 3.19.3 → 3.19.5

package/package.json

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

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

@@ -67,7 +67,7 @@ export declare abstract class ControllerService extends Controller {
     }): Promise<void>;
     schema({ checks, logic, response }: {
         checks?: (args: any) => Promise<any>;
-        logic: (args: any) => Promise<any>;
+        logic?: (args: any) => Promise<any>;
         response?: (args: any) => Promise<any>;
     }): Promise<any>;
 }

package/source/loader/controller/index.js

@@ -82,12 +82,7 @@ export class ControllerService extends Controller {
             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
-            };
+            const convertedPayload = { ...payload, query: currentReq.query, body: currentReq.body, params: currentReq.params };
             if (checks) {
                 const checkResult = await checks({ payload, convertedPayload });
                 if (checkResult === false || (checkResult && typeof checkResult === 'object' && !Array.isArray(checkResult))) {
@@ -98,28 +93,42 @@ export class ControllerService extends Controller {
                     }).getResponse);
                 }
             }
-            const logicResult = 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);
             }
             if (logicResult instanceof Response)
                 return logicResult;
-            if (response) {
-                const resResult = await response({ payload, convertedPayload, logicResult });
-                const messageData = Array.isArray(resResult) ? resResult : resResult?.message;
-                return currentRes.status(200).send(new ResponseSchema({
-                    status: true,
-                    message: Array.isArray(messageData)
-                        ? responseMessageHelper.successFully(messageData[0], messageData[1], currentReq.t)
-                        : (messageData || ''),
-                    payload: logicResult?.payload !== undefined ? logicResult.payload : logicResult
-                }).getResponse);
+            const resResult = response ? await response({ payload, convertedPayload, logicResult }) : logicResult;
+            let finalMessage = '';
+            const messageSource = resResult?.message || (typeof resResult === 'string' || Array.isArray(resResult) ? resResult : '');
+            if (Array.isArray(messageSource)) {
+                finalMessage = responseMessageHelper.successFully(messageSource[0], messageSource[1], currentReq.t);
+            }
+            else if (typeof messageSource === 'string' && messageSource !== '') {
+                if (messageSource.startsWith('@')) {
+                    finalMessage = responseMessageHelper.successFully(messageSource.substring(1), '', currentReq.t);
+                }
+                else {
+                    finalMessage = currentReq.t(messageSource);
+                }
             }
-            return currentRes.send(logicResult?.payload !== undefined ? logicResult.payload : logicResult);
+            let finalPayload = undefined;
+            if (logic) {
+                finalPayload = logicResult?.payload !== undefined ? logicResult.payload : logicResult;
+                if (finalPayload === messageSource || (typeof finalPayload === 'object' && finalPayload?.message === messageSource)) {
+                    finalPayload = undefined;
+                }
+            }
+            return currentRes.status(200).send(new ResponseSchema({
+                status: true,
+                message: finalMessage,
+                payload: finalPayload
+            }).getResponse);
         }
         catch (error) {
             this.logger.winston.log({