@xrystal/core 3.22.8 → 3.22.9

package/package.json

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

package/source/loader/controller/index.js

@@ -13,12 +13,13 @@ export class BaseController {
     get currentStore() { return getControllerCtx(); }
     get req() {
         const store = this.currentStore;
+        const identityT = (k) => k;
         const ctx = store?.ctx || {};
         const query = typeof ctx.query === 'string' ? qs.parse(ctx.query) : (ctx.query || {});
         return {
             url: ctx.url || '', method: ctx.method || '', headers: ctx.headers || {},
             body: ctx.body || {}, query: query, params: ctx.params || {},
-            lang: ctx.lang || 'en', t: ctx.t || ((k) => k),
+            lang: ctx.lang || 'en', t: ctx.t || identityT,
             accounts: ctx.accounts || store?.req?.accounts
         };
     }
@@ -78,7 +79,6 @@ export default class Controller extends BaseController {
             const store = this.currentStore;
             const t = currentReq.t;
             const p = { req: currentReq, res: currentRes, body: currentReq.body, query: currentReq.query, params: currentReq.params, locals: store?.metadata?.locals || {}, t };
-            // 1. CHECKS
             if (checks) {
                 const checkRes = await checks(p);
                 if (checkRes !== true) {
@@ -86,30 +86,27 @@ export default class Controller extends BaseController {
                     const code = isObj ? checkRes.code || 400 : 400;
                     const rawMsg = isObj ? checkRes.message : (typeof checkRes === 'string' ? checkRes : '@schemaMissingDataChecks');
                     const { message, status, code: _c, data, payload, ...extras } = isObj ? checkRes : {};
-                    const coreData = data !== undefined ? data : payload;
-                    const errPayload = {};
-                    if (coreData !== undefined)
-                        errPayload.data = coreData;
+                    const finalCoreData = data !== undefined ? data : payload;
+                    const finalPayload = {};
+                    if (finalCoreData !== undefined)
+                        finalPayload.data = finalCoreData;
                     if (Object.keys(extras).length > 0)
-                        errPayload.extraData = extras;
+                        finalPayload.extraData = extras;
                     return currentRes.status(code).send(new ResponseSchema({
                         status: false,
                         message: this.parseMessage(rawMsg, t),
-                        payload: Object.keys(errPayload).length > 0 ? errPayload : undefined,
+                        payload: Object.keys(finalPayload).length > 0 ? finalPayload : undefined,
                         code
                     }).getResponse);
                 }
             }
-            // 2. LOGIC
             let logicRes = logic ? await logic(p) : null;
             if (logic && logicRes === false) {
                 return currentRes.status(400).send(new ResponseSchema({ status: false, message: this.parseMessage('@unsuccessful logic', t), code: 400 }).getResponse);
             }
-            // 3. RESPONSE
             let finalRes = response ? await response({ ...p, logicResult: logicRes }) : logicRes;
             if (typeof finalRes === 'function')
                 finalRes = await finalRes(p);
-            // Auto-success conversion
             if (Array.isArray(finalRes)) {
                 finalRes = { message: `@successfully ${finalRes.join(' ')}`, data: logicRes };
             }
@@ -118,24 +115,27 @@ export default class Controller extends BaseController {
             }
             if (finalRes instanceof Response || finalRes?.constructor?.name === 'Response')
                 return finalRes;
-            // 4. FINAL PACKAGING (BU BÖLÜMÜ DÜZELTTİK)
             const isSuccess = finalRes?.status !== false;
             const finalCode = finalRes?.code || store?.metadata?._code || 200;
             let msgSource = finalRes?.message || (typeof finalRes === 'string' ? finalRes : '@successfully');
-            // Eğer finalRes bir obje değilse onu data olarak sarmala
-            const rawOutput = (finalRes && typeof finalRes === 'object' && !Array.isArray(finalRes)) ? finalRes : { data: finalRes };
-            // Destructuring ile alanları ayır
+            const rawOutput = (finalRes && typeof finalRes === 'object' && !Array.isArray(finalRes))
+                ? finalRes
+                : { data: finalRes || logicRes };
             const { message, status, code, data, payload, ...extraData } = rawOutput;
-            // Data veya Payload'dan gelen asıl veriyi belirle
-            const coreData = data !== undefined ? data : payload;
+            let coreData = data !== undefined ? data : payload;
+            if (coreData === undefined && logicRes !== null && logicRes !== undefined) {
+                coreData = logicRes;
+            }
             const responseData = {
                 status: isSuccess,
                 message: this.parseMessage(msgSource, t)
             };
-            // Payload oluşturma mantığı
             const finalPayload = {};
-            if (coreData !== undefined)
-                finalPayload.data = coreData;
+            if (coreData !== undefined) {
+                finalPayload.data = (coreData && typeof coreData === 'object' && 'data' in coreData && Object.keys(coreData).length === 1)
+                    ? coreData.data
+                    : coreData;
+            }
             if (Object.keys(extraData).length > 0)
                 finalPayload.extraData = extraData;
             if (Object.keys(finalPayload).length > 0) {