@xrystal/core 3.23.6 → 3.23.8

package/package.json

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

package/source/loader/controller/index.js

@@ -20,20 +20,24 @@ export class BaseController {
         const ctx = store?.ctx || {};
         const req = store?.req || {};
         const identityT = (k) => k;
-        const body = ctx.body || req.body || {};
-        const query = ctx.query || req.query || (typeof req.url === 'string' && req.url.includes('?') ? qs.parse(req.url.split('?')[1]) : {});
+        const body = ctx.body || req.body || ctx.request?.body || {};
+        let query = ctx.query || req.query || {};
+        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 || {};
+        const headers = ctx.headers || req.headers || ctx.request?.headers || {};
         return {
-            url: ctx.url || req.url || '',
-            method: ctx.method || req.method || '',
+            url: urlStr,
+            method: ctx.method || req.method || ctx.request?.method || '',
             headers,
             body,
             query,
             params,
             lang: ctx.lang || req.lang || 'en',
             t: ctx.t || req.t || identityT,
-            accounts: ctx.accounts || req.accounts
+            accounts: ctx.accounts || req.accounts || ctx.user
         };
     }
     get res() {
@@ -122,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);
                 }
             }
@@ -152,29 +164,33 @@ export default class Controller extends BaseController {
             let finalExtraData = undefined;
             let messageSource = 'success_process';
             let successCode = this.currentStore?.metadata?._code || 200;
-            const source = resResult !== undefined ? resResult : logicResult;
-            if (source !== null && typeof source === 'object') {
-                if (source.payload && typeof source.payload === 'object') {
-                    finalData = source.payload.data !== undefined ? source.payload.data : source.payload;
-                    finalExtraData = source.payload.extraData;
+            const extract = (obj) => {
+                if (!obj || typeof obj !== 'object')
+                    return;
+                if (obj.payload && typeof obj.payload === 'object') {
+                    finalData = obj.payload.data !== undefined ? obj.payload.data : obj.payload;
+                    finalExtraData = obj.payload.extraData;
                 }
-                else if (source.data !== undefined || source.extraData !== undefined) {
-                    finalData = source.data;
-                    finalExtraData = source.extraData;
+                else if (obj.data !== undefined || obj.extraData !== undefined) {
+                    finalData = obj.data;
+                    finalExtraData = obj.extraData;
                 }
                 else {
-                    const hasMetadata = source.status !== undefined || source.message !== undefined || source.code !== undefined;
-                    if (!hasMetadata && Object.keys(source).length > 0) {
-                        finalData = source;
-                    }
+                    const hasMeta = obj.status !== undefined || obj.message !== undefined || obj.code !== undefined;
+                    if (!hasMeta && Object.keys(obj).length > 0)
+                        finalData = obj;
                 }
-                if (source.message)
-                    messageSource = source.message;
-                if (source.code !== undefined)
-                    successCode = source.code;
+                if (obj.message)
+                    messageSource = obj.message;
+                if (obj.code !== undefined)
+                    successCode = obj.code;
+            };
+            if (typeof resResult === 'string') {
+                messageSource = resResult;
+                extract(logicResult);
             }
-            else if (source !== undefined) {
-                messageSource = source;
+            else {
+                extract(resResult !== undefined ? resResult : logicResult);
             }
             let payload = undefined;
             if (finalData !== undefined || finalExtraData !== undefined) {