@xrystal/core 3.26.0 → 3.26.2

package/package.json

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

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

@@ -30,6 +30,8 @@ export declare const controllerContextStorage: AsyncLocalStorage<{
         _statusCode?: number;
         _contentType?: string;
         _isRaw?: boolean;
+        _parsedBody?: any;
+        _parsedQuery?: any;
     };
 }>;
 export declare const getControllerCtx: () => {
@@ -43,6 +45,8 @@ export declare const getControllerCtx: () => {
         _statusCode?: number;
         _contentType?: string;
         _isRaw?: boolean;
+        _parsedBody?: any;
+        _parsedQuery?: any;
     };
 };
 export declare abstract class BaseController {
@@ -61,6 +65,8 @@ export declare abstract class BaseController {
             _statusCode?: number;
             _contentType?: string;
             _isRaw?: boolean;
+            _parsedBody?: any;
+            _parsedQuery?: any;
         };
     };
     protected get req(): CustomRequest;

package/source/loader/controller/index.js

@@ -20,13 +20,15 @@ export class BaseController {
         const ctx = store?.ctx || {};
         const req = store?.req || {};
         const identityT = (k) => k;
-        const body = ctx.body || req.body || ctx.request?.body || {};
-        let query = 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 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.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 || {}),
@@ -188,21 +190,11 @@ 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 || {};
             if (store) {
-                if (store.ctx) {
-                    store.ctx.body = finalBody;
-                    store.ctx.query = finalQuery;
-                }
-                if (store.req) {
-                    store.req.body = finalBody;
-                    store.req.query = finalQuery;
-                }
-                if (store.ctx?.request) {
-                    store.ctx.request.body = finalBody;
-                    store.ctx.request.query = finalQuery;
-                }
+                if (!store.metadata)
+                    store.metadata = { locals: {} };
+                store.metadata._parsedBody = parsedBody || {};
+                store.metadata._parsedQuery = parsedQuery || {};
             }
             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 };