@xrystal/core 3.22.8 → 3.23.0

package/package.json

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

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

@@ -64,7 +64,7 @@ export interface CustomRequest {
     headers: Record<string, any>;
     body?: any;
     params: Record<string, any>;
-    query: Record<string, any>;
+    query: any;
     lang: string;
     t: (k: string, args?: any) => string;
 }

package/source/loader/controller/index.js

@@ -13,13 +13,19 @@ 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),
-            accounts: ctx.accounts || store?.req?.accounts
+            url: ctx.url || '',
+            method: ctx.method || '',
+            headers: ctx.headers || {},
+            body: ctx.body || {},
+            query: query,
+            params: ctx.params || {},
+            lang: ctx.lang || 'en',
+            t: ctx.t || identityT,
+            accounts: ctx.accounts || {}
         };
     }
     get res() {
@@ -32,7 +38,10 @@ export class BaseController {
             store.metadata = { locals: {} };
         return {
             get locals() { return store.metadata.locals; },
-            status(code) { store.metadata._code = code; return this; },
+            status(code) {
+                store.metadata._code = code;
+                return this;
+            },
             send(data) {
                 if (self.protocol === ProtocolEnum.WEBSOCKET)
                     return data;
@@ -74,42 +83,55 @@ export default class Controller extends BaseController {
     async schema({ checks, logic, response }) {
         try {
             const currentReq = this.req;
-            const currentRes = this.res;
             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
+            const p = {
+                req: currentReq,
+                res: this.res,
+                body: currentReq.body,
+                query: currentReq.query,
+                params: currentReq.params,
+                locals: store?.metadata?.locals || {},
+                t
+            };
             if (checks) {
                 const checkRes = await checks(p);
                 if (checkRes !== true) {
                     const isObj = checkRes && typeof checkRes === 'object';
                     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;
-                    if (Object.keys(extras).length > 0)
-                        errPayload.extraData = extras;
-                    return currentRes.status(code).send(new ResponseSchema({
+                    const { message, status, code: _c, ...rest } = isObj ? checkRes : {};
+                    let errCoreData = rest.data !== undefined ? rest.data : rest.payload;
+                    let errExtras = { ...rest };
+                    if (rest.data !== undefined || rest.payload !== undefined) {
+                        delete errExtras.data;
+                        delete errExtras.payload;
+                    }
+                    else {
+                        errCoreData = Object.keys(rest).length > 0 ? rest : undefined;
+                        errExtras = {};
+                    }
+                    const errRes = {
                         status: false,
                         message: this.parseMessage(rawMsg, t),
-                        payload: Object.keys(errPayload).length > 0 ? errPayload : undefined,
                         code
-                    }).getResponse);
+                    };
+                    if (errCoreData !== undefined || Object.keys(errExtras).length > 0) {
+                        errRes.payload = {
+                            ...(errCoreData !== undefined && { data: errCoreData }),
+                            ...(Object.keys(errExtras).length > 0 && { extraData: errExtras })
+                        };
+                    }
+                    return this.res.status(code).send(new ResponseSchema(errRes).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);
+                return this.res.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,31 +140,36 @@ 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 { message, status, code, data, payload, ...extraData } = rawOutput;
-            // Data veya Payload'dan gelen asıl veriyi belirle
-            const coreData = data !== undefined ? data : payload;
+            const msgSource = finalRes?.message || (typeof finalRes === 'string' ? finalRes : '@successfully');
+            const rawOutput = (finalRes && typeof finalRes === 'object' && !Array.isArray(finalRes))
+                ? finalRes
+                : { data: finalRes || logicRes };
+            const { message: _m, status: _s, code: _co, data, payload, ...restExtras } = rawOutput;
+            let coreData;
+            let extraData;
+            if (data !== undefined || payload !== undefined) {
+                coreData = data !== undefined ? data : payload;
+                extraData = restExtras;
+            }
+            else {
+                coreData = Object.keys(restExtras).length > 0 ? restExtras : (finalRes || logicRes);
+                extraData = {};
+            }
             const responseData = {
                 status: isSuccess,
                 message: this.parseMessage(msgSource, t)
             };
-            // Payload oluşturma mantığı
             const finalPayload = {};
-            if (coreData !== undefined)
+            if (coreData !== undefined && coreData !== null)
                 finalPayload.data = coreData;
             if (Object.keys(extraData).length > 0)
                 finalPayload.extraData = extraData;
-            if (Object.keys(finalPayload).length > 0) {
+            if (Object.keys(finalPayload).length > 0)
                 responseData.payload = finalPayload;
-            }
             responseData.code = finalCode;
-            return currentRes.status(finalCode).send(new ResponseSchema(responseData).getResponse);
+            return this.res.status(finalCode).send(new ResponseSchema(responseData).getResponse);
         }
         catch (error) {
             this.logger?.log(LoggerLayerEnum.ERROR, `Controller Error: ${error.message}`);