@xrystal/core 3.23.5 → 3.23.6

package/package.json

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

package/source/loader/controller/index.js

@@ -154,28 +154,35 @@ export default class Controller extends BaseController {
             let successCode = this.currentStore?.metadata?._code || 200;
             const source = resResult !== undefined ? resResult : logicResult;
             if (source !== null && typeof source === 'object') {
-                if (source.payload) {
-                    finalData = source.payload.data;
+                if (source.payload && typeof source.payload === 'object') {
+                    finalData = source.payload.data !== undefined ? source.payload.data : source.payload;
                     finalExtraData = source.payload.extraData;
                 }
                 else if (source.data !== undefined || source.extraData !== undefined) {
                     finalData = source.data;
                     finalExtraData = source.extraData;
                 }
-                else if (!source.status && !source.message && !source.code) {
-                    finalData = source;
+                else {
+                    const hasMetadata = source.status !== undefined || source.message !== undefined || source.code !== undefined;
+                    if (!hasMetadata && Object.keys(source).length > 0) {
+                        finalData = source;
+                    }
                 }
                 if (source.message)
                     messageSource = source.message;
-                if (source.code)
+                if (source.code !== undefined)
                     successCode = source.code;
             }
             else if (source !== undefined) {
                 messageSource = source;
             }
-            const payload = (finalData !== undefined || finalExtraData !== undefined)
-                ? { data: finalData, extraData: finalExtraData || {} }
-                : undefined;
+            let payload = undefined;
+            if (finalData !== undefined || finalExtraData !== undefined) {
+                payload = {
+                    data: finalData ?? {},
+                    extraData: finalExtraData ?? {}
+                };
+            }
             return currentRes.status(successCode).send(new ResponseSchema({
                 status: true,
                 message: this.parseMessage(messageSource, currentReq.t, false),