@xrystal/core 3.23.0 → 3.23.2

package/package.json

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

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

@@ -49,7 +49,6 @@ export declare abstract class BaseController {
 export default abstract class Controller extends BaseController implements IProvide<any> {
     constructor();
     onInit(): Promise<void>;
-    private smartTranslate;
     private parseMessage;
     schema<T = any>({ checks, logic, response }: {
         checks?: (args: any) => Promise<any>;
@@ -64,7 +63,7 @@ export interface CustomRequest {
     headers: Record<string, any>;
     body?: any;
     params: Record<string, any>;
-    query: any;
+    query: Record<string, any>;
     lang: string;
     t: (k: string, args?: any) => string;
 }

package/source/loader/controller/index.js

@@ -13,25 +13,24 @@ 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 || identityT,
-            accounts: ctx.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 || ((k) => k),
+            accounts: ctx.accounts || store?.req?.accounts
         };
     }
     get res() {
         const store = this.currentStore;
         const self = this;
-        const fallbackRes = { status: function () { return this; }, send: (d) => d, json: function (d) { return this.send(d); }, locals: {} };
+        const fallbackRes = {
+            status: function () { return this; },
+            send: (d) => d,
+            json: function (d) { return this.send(d); },
+            locals: {}
+        };
         if (!store)
             return fallbackRes;
         if (!store.metadata)
@@ -45,13 +44,10 @@ export class BaseController {
             send(data) {
                 if (self.protocol === ProtocolEnum.WEBSOCKET)
                     return data;
-                if (data instanceof Response)
-                    return data;
                 const status = store.metadata?._code || 200;
                 const body = (store.metadata?._isRaw) ? data : JSON.stringify(data?.getResponse ? data.getResponse : data);
                 return new Response(body, { status, headers: { 'content-type': 'application/json' } });
-            },
-            json(data) { return this.send(data); }
+            }
         };
     }
 }
@@ -61,14 +57,6 @@ export default class Controller extends BaseController {
         const protocols = this.system?.tmp?.configs?.loaders?.controller?.protocols;
         this.supportedProtocols = Array.isArray(protocols) ? protocols : [protocols || ProtocolEnum.HTTP];
     }
-    smartTranslate(word, t) {
-        const keyPath = `keywords.${word}`;
-        const translated = t(keyPath);
-        if (translated !== keyPath)
-            return translated;
-        const direct = t(word);
-        return direct !== word ? direct : word;
-    }
     parseMessage(input, t) {
         if (!input || typeof input !== 'string' || !input.startsWith('@'))
             return input;
@@ -77,99 +65,65 @@ export default class Controller extends BaseController {
         const hasMethod = typeof responseMessageHelper[maybeMethod] === 'function';
         const methodName = hasMethod ? maybeMethod : 'successfully';
         const rawArgs = hasMethod ? parts.slice(1) : parts;
-        const translatedArgs = rawArgs.map(arg => this.smartTranslate(arg, t));
+        const translatedArgs = rawArgs.map(arg => {
+            const res = t(`keywords.${arg}`);
+            return res !== `keywords.${arg}` ? res : (t(arg) !== arg ? t(arg) : arg);
+        });
         return responseMessageHelper[methodName](translatedArgs[0] || '', translatedArgs.slice(1).join(' '), t);
     }
     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: this.res,
-                body: currentReq.body,
-                query: currentReq.query,
-                params: currentReq.params,
-                locals: store?.metadata?.locals || {},
-                t
-            };
+            const p = { req: currentReq, res: currentRes, 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, ...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 = {
+                    let rawMsg = isObj ? checkRes.message : (typeof checkRes === 'string' ? checkRes : '@schemaMissingDataChecks');
+                    if (typeof rawMsg === 'string' && !rawMsg.startsWith('@'))
+                        rawMsg = '@' + rawMsg;
+                    const { message, status, code: _c, data, payload, ...extras } = isObj ? checkRes : {};
+                    const coreData = data || payload;
+                    return currentRes.status(code).send(new ResponseSchema({
                         status: false,
                         message: this.parseMessage(rawMsg, t),
+                        payload: (coreData !== undefined || Object.keys(extras).length > 0) ? { data: coreData, extraData: extras } : undefined,
                         code
-                    };
-                    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);
+                    }).getResponse);
                 }
             }
             let logicRes = logic ? await logic(p) : null;
             if (logic && logicRes === false) {
-                return this.res.status(400).send(new ResponseSchema({ status: false, message: this.parseMessage('@unsuccessful logic', t), code: 400 }).getResponse);
+                return currentRes.status(400).send(new ResponseSchema({ status: false, message: this.parseMessage('@unsuccessful logic', t), code: 400 }).getResponse);
             }
             let finalRes = response ? await response({ ...p, logicResult: logicRes }) : logicRes;
             if (typeof finalRes === 'function')
                 finalRes = await finalRes(p);
-            if (Array.isArray(finalRes)) {
-                finalRes = { message: `@successfully ${finalRes.join(' ')}`, data: logicRes };
-            }
-            else if (typeof finalRes === 'string' && !finalRes.startsWith('@')) {
-                finalRes = { message: `@successfully ${finalRes}`, data: logicRes };
-            }
+            if (Array.isArray(finalRes))
+                finalRes = { message: `@successfully ${finalRes.join(' ')}` };
             if (finalRes instanceof Response || finalRes?.constructor?.name === 'Response')
                 return finalRes;
             const isSuccess = finalRes?.status !== false;
             const finalCode = finalRes?.code || store?.metadata?._code || 200;
-            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 = {};
-            }
+            let msgSource = finalRes?.message || (typeof finalRes === 'string' ? finalRes : '@successfully');
+            if (typeof msgSource === 'string' && !msgSource.startsWith('@'))
+                msgSource = '@' + msgSource;
+            const rawOutput = (finalRes && typeof finalRes === 'object' && !Array.isArray(finalRes)) ? finalRes : { data: finalRes };
+            const { message, status, code, data, payload, ...extraData } = rawOutput;
+            const coreData = data !== undefined ? data : payload;
             const responseData = {
                 status: isSuccess,
                 message: this.parseMessage(msgSource, t)
             };
-            const finalPayload = {};
-            if (coreData !== undefined && coreData !== null)
-                finalPayload.data = coreData;
-            if (Object.keys(extraData).length > 0)
-                finalPayload.extraData = extraData;
-            if (Object.keys(finalPayload).length > 0)
-                responseData.payload = finalPayload;
+            if (coreData !== undefined || Object.keys(extraData).length > 0) {
+                responseData.payload = { data: coreData, extraData: Object.keys(extraData).length > 0 ? extraData : undefined };
+            }
             responseData.code = finalCode;
-            return this.res.status(finalCode).send(new ResponseSchema(responseData).getResponse);
+            return currentRes.status(finalCode).send(new ResponseSchema(responseData).getResponse);
         }
         catch (error) {
             this.logger?.log(LoggerLayerEnum.ERROR, `Controller Error: ${error.message}`);