@xrystal/core 3.22.7 → 3.22.9

package/package.json

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

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

@@ -49,6 +49,7 @@ 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>;

package/source/loader/controller/index.js

@@ -26,31 +26,22 @@ export class BaseController {
     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)
             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;
                 if (data instanceof Response)
                     return data;
-                const isRaw = store.metadata?._isRaw || (data instanceof Blob || data instanceof Uint8Array || data instanceof ArrayBuffer);
                 const status = store.metadata?._code || 200;
-                const body = isRaw || typeof data === 'string' ? data : JSON.stringify(data?.getResponse ? data.getResponse : data);
-                return new Response(body, { status, headers: { 'content-type': isRaw ? 'application/octet-stream' : 'application/json' } });
+                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); }
         };
@@ -62,6 +53,14 @@ 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;
@@ -70,10 +69,7 @@ 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 => {
-            const res = t(`keywords.${arg}`);
-            return res !== `keywords.${arg}` ? res : (t(arg) !== arg ? t(arg) : arg);
-        });
+        const translatedArgs = rawArgs.map(arg => this.smartTranslate(arg, t));
         return responseMessageHelper[methodName](translatedArgs[0] || '', translatedArgs.slice(1).join(' '), t);
     }
     async schema({ checks, logic, response }) {
@@ -90,11 +86,16 @@ 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 || payload;
+                    const finalCoreData = data !== undefined ? data : payload;
+                    const finalPayload = {};
+                    if (finalCoreData !== undefined)
+                        finalPayload.data = finalCoreData;
+                    if (Object.keys(extras).length > 0)
+                        finalPayload.extraData = extras;
                     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,
+                        payload: Object.keys(finalPayload).length > 0 ? finalPayload : undefined,
                         code
                     }).getResponse);
                 }
@@ -107,25 +108,38 @@ export default class Controller extends BaseController {
             if (typeof finalRes === 'function')
                 finalRes = await finalRes(p);
             if (Array.isArray(finalRes)) {
-                finalRes = { message: `@successfully ${finalRes.join(' ')}` };
+                finalRes = { message: `@successfully ${finalRes.join(' ')}`, data: logicRes };
             }
             else if (typeof finalRes === 'string' && !finalRes.startsWith('@')) {
-                finalRes = { message: `@successfully ${finalRes}` };
+                finalRes = { message: `@successfully ${finalRes}`, data: logicRes };
             }
             if (finalRes instanceof Response || finalRes?.constructor?.name === 'Response')
                 return finalRes;
             const isSuccess = finalRes?.status !== false;
             const finalCode = finalRes?.code || store?.metadata?._code || 200;
             let msgSource = finalRes?.message || (typeof finalRes === 'string' ? finalRes : '@successfully');
-            const rawOutput = (finalRes && typeof finalRes === 'object' && !Array.isArray(finalRes)) ? finalRes : { data: finalRes };
+            const rawOutput = (finalRes && typeof finalRes === 'object' && !Array.isArray(finalRes))
+                ? finalRes
+                : { data: finalRes || logicRes };
             const { message, status, code, data, payload, ...extraData } = rawOutput;
-            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)
             };
-            if (coreData !== undefined || Object.keys(extraData).length > 0) {
-                responseData.payload = { data: coreData, extraData: Object.keys(extraData).length > 0 ? extraData : undefined };
+            const finalPayload = {};
+            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) {
+                responseData.payload = finalPayload;
             }
             responseData.code = finalCode;
             return currentRes.status(finalCode).send(new ResponseSchema(responseData).getResponse);