@ditojs/server 2.32.3 → 2.32.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.32.3",
+  "version": "2.32.5",
   "type": "module",
   "description": "Dito.js Server – Dito.js is a declarative and modern web framework, based on Objection.js, Koa.js and Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/server",
@@ -93,5 +93,5 @@
     "typescript": "^5.6.2"
   },
   "types": "types",
-  "gitHead": "18442b45101f469e53efd91e93854ef954dfb785"
+  "gitHead": "71e24797ccf5259b588c3fdfc8674167cf75db98"
 }

package/src/controllers/ControllerAction.js

@@ -96,18 +96,15 @@ export default class ControllerAction {
   }
 
   async callAction(ctx) {
-    const params = await this.validateParameters(ctx)
-    const { args, member } = await this.collectArguments(
-      ctx,
-      params
-    )
+    const { params, wrapped } = await this.validateParameters(ctx)
+    const { args, member } = await this.collectArguments(ctx, params)
     let filteredQuery = null
     Object.defineProperty(ctx, 'filteredQuery', {
       get: () => {
         filteredQuery ??=
-          params && this.paramsName === 'query'
+          params && !wrapped && this.paramsName === 'query'
             ? this.filterParameters(params)
-            : params
+            : ctx.query
         return filteredQuery
       },
       enumerable: false,
@@ -132,13 +129,13 @@ export default class ControllerAction {
 
   async validateParameters(ctx) {
     if (!this.parameters.validate) {
-      return null
+      return { params: null, wrapped: false }
     }
-    // Since validation also performs coercion, create a shallow clone  of the
-    // params so that this doesn't modify the data on `ctx`.Actually used values
-    // themselves are deep cloned below.
+    // Since validation also performs coercion, create a shallow clone of the
+    // params so that this doesn't modify the data on `ctx`. Actually used
+    // values themselves are deep cloned below.
     // NOTE: The data can be either an object or an array.
-    const data = { ...this.getParams(ctx) }
+    const data = clone(this.getParams(ctx), { shallow: true })
     let params = {}
     const { dataName } = this.parameters
     let unwrapRoot = false
@@ -206,7 +203,8 @@ export default class ControllerAction {
     const getData = () => (unwrapRoot ? params[dataName] : params)
     try {
       await this.parameters.validate(params)
-      return getData()
+      const data = getData()
+      return { params: data, wrapped: data !== params }
     } catch (error) {
       if (error.errors) {
         errors.push(...error.errors)