@xrystal/core 3.26.1 → 3.26.3

package/package.json

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

package/source/loader/controller/index.js

@@ -20,14 +20,15 @@ export class BaseController {
         const ctx = store?.ctx || {};
         const req = store?.req || {};
         const identityT = (k) => k;
-        // Önce store içindeki parse edilmiş veriye bak, yoksa orijinaline git
         const body = store?.metadata?._parsedBody || ctx.body || req.body || ctx.request?.body || {};
         let query = store?.metadata?._parsedQuery || ctx.query || req.query || ctx.request?.query || {};
-        const urlStr = ctx.url || req.url || ctx.request?.url || '';
-        if ((!query || Object.keys(query).length === 0) && typeof urlStr === 'string' && urlStr.includes('?')) {
-            const parts = urlStr.split('?');
-            if (parts[1])
-                query = qs.parse(parts[1]);
+        const urlStr = ctx.request?.url || req.url || ctx.url || '';
+        if ((!query || Object.keys(query).length === 0) && urlStr && typeof urlStr === 'string') {
+            if (urlStr.includes('?')) {
+                const queryString = urlStr.split('?')[1];
+                if (queryString)
+                    query = qs.parse(queryString);
+            }
         }
         const params = {
             ...(req.params || {}),
@@ -41,7 +42,7 @@ export class BaseController {
             headers: ctx.headers || req.headers || ctx.request?.headers || {},
             body,
             query: query || {},
-            params,
+            params: params || {},
             lang: ctx.lang || req.lang || 'en',
             t: ctx.t || req.t || identityT,
             accounts: ctx.accounts || req.accounts || ctx.user
@@ -112,7 +113,6 @@ export default class Controller extends BaseController {
         try {
             const rawReq = store?.req || store?.ctx?.request || store?.ctx?.req;
             let parsedBody = this.req.body;
-            let parsedQuery = this.req.query;
             const contentType = (this.req.headers['content-type'] || '').toLowerCase();
             const consumeBody = async (bodySource) => {
                 let text = '';
@@ -189,17 +189,21 @@ export default class Controller extends BaseController {
             if (parsedBody && typeof parsedBody === 'object' && parsedBody.constructor?.name === 'FormData') {
                 parsedBody = Object.fromEntries(parsedBody.entries());
             }
-            const finalBody = parsedBody || {};
-            const finalQuery = parsedQuery || {};
-            // readonly hatasını önlemek için asıl objeyi değil metadata'yı güncelliyoruz
             if (store) {
                 if (!store.metadata)
                     store.metadata = { locals: {} };
-                store.metadata._parsedBody = finalBody;
-                store.metadata._parsedQuery = finalQuery;
+                store.metadata._parsedBody = parsedBody || {};
+                store.metadata._parsedQuery = this.req.query;
             }
             const currentReq = this.req;
-            const p = { req: currentReq, res: currentRes, body: currentReq.body, query: currentReq.query, params: currentReq.params, t: currentReq.t, accounts: currentReq.accounts };
+            const p = {
+                req: currentReq,
+                res: currentRes,
+                body: currentReq.body,
+                queries: currentReq.query,
+                params: currentReq.params,
+                t: currentReq.t,
+            };
             const extractMeta = (obj) => {
                 if (!obj || typeof obj !== 'object')
                     return;