@xrystal/core 3.23.7 → 3.23.8

package/package.json

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

package/source/loader/controller/index.js

@@ -20,18 +20,16 @@ export class BaseController {
         const ctx = store?.ctx || {};
         const req = store?.req || {};
         const identityT = (k) => k;
-        const body = ctx.body || req.body || {};
+        const body = ctx.body || req.body || ctx.request?.body || {};
         let query = ctx.query || req.query || {};
-        if (Object.keys(query).length === 0) {
-            const urlStr = ctx.url || req.url || ctx.request?.url || '';
-            if (typeof urlStr === 'string' && urlStr.includes('?')) {
-                query = qs.parse(urlStr.split('?')[1]);
-            }
+        const urlStr = ctx.url || req.url || ctx.request?.url || '';
+        if (Object.keys(query).length === 0 && typeof urlStr === 'string' && urlStr.includes('?')) {
+            query = qs.parse(urlStr.split('?')[1]);
         }
         const params = ctx.params || req.params || {};
         const headers = ctx.headers || req.headers || ctx.request?.headers || {};
         return {
-            url: ctx.url || req.url || ctx.request?.url || '',
+            url: urlStr,
             method: ctx.method || req.method || ctx.request?.method || '',
             headers,
             body,
@@ -128,10 +126,18 @@ export default class Controller extends BaseController {
                 if (checkResult !== true) {
                     const code = checkResult?.code || 400;
                     const msg = checkResult?.message || (typeof checkResult === 'string' ? checkResult : 'error_validation');
+                    let errorPayload = undefined;
+                    if (checkResult?.payload) {
+                        errorPayload = {
+                            data: checkResult.payload.data ?? checkResult.payload,
+                            extraData: checkResult.payload.extraData ?? {}
+                        };
+                    }
                     return currentRes.status(code).send(new ResponseSchema({
                         status: false,
                         message: this.parseMessage(msg, currentReq.t, true),
-                        code
+                        code,
+                        payload: errorPayload
                     }).getResponse);
                 }
             }
@@ -170,10 +176,9 @@ export default class Controller extends BaseController {
                     finalExtraData = obj.extraData;
                 }
                 else {
-                    const hasMetadata = obj.status !== undefined || obj.message !== undefined || obj.code !== undefined;
-                    if (!hasMetadata && Object.keys(obj).length > 0) {
+                    const hasMeta = obj.status !== undefined || obj.message !== undefined || obj.code !== undefined;
+                    if (!hasMeta && Object.keys(obj).length > 0)
                         finalData = obj;
-                    }
                 }
                 if (obj.message)
                     messageSource = obj.message;