@ditojs/server 2.32.4 → 2.33.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.32.4",
+  "version": "2.33.0",
   "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",
@@ -25,10 +25,10 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^2.32.2",
-    "@ditojs/build": "^2.32.2",
-    "@ditojs/router": "^2.32.2",
-    "@ditojs/utils": "^2.32.2",
+    "@ditojs/admin": "^2.33.0",
+    "@ditojs/build": "^2.33.0",
+    "@ditojs/router": "^2.33.0",
+    "@ditojs/utils": "^2.33.0",
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -93,5 +93,5 @@
     "typescript": "^5.6.2"
   },
   "types": "types",
-  "gitHead": "03eb23669c49ac537812d8508ad8966d19855838"
+  "gitHead": "be8095460cbe9c035d10c994a1e1f89d9d5fbefe"
 }

package/src/controllers/ControllerAction.js

@@ -96,13 +96,13 @@ export default class ControllerAction {
   }
 
   async callAction(ctx) {
-    const params = await this.validateParameters(ctx)
+    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)
             : ctx.query
         return filteredQuery
@@ -129,13 +129,10 @@ 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.
     // NOTE: The data can be either an object or an array.
-    const data = { ...this.getParams(ctx) }
+    const data = this.getParams(ctx)
     let params = {}
     const { dataName } = this.parameters
     let unwrapRoot = false
@@ -143,12 +140,11 @@ export default class ControllerAction {
     for (const {
       name, // String: Property name to fetch from data. Overridable by `root`
       type, // String: What type should this validated against / coerced to.
-      from, // String: Allow parameters to be 'borrowed' from other objects.
-      root, // Boolean: Use full root object, instead of data at given property.
-      member // Boolean: Fetch member instance instead of data from request.
+      from // String: Allow parameters to be 'borrowed' from other objects.
     } of this.parameters.list) {
       // Don't validate member parameters as they get resolved separately after.
-      if (member) continue
+      if (from === 'member') continue
+      const root = from === 'root'
       let wrapRoot = root
       let paramName = name
       // If no name is provided, wrap the full root object as value and unwrap
@@ -158,22 +154,23 @@ export default class ControllerAction {
         wrapRoot = true
         unwrapRoot = true
       }
-      if (wrapRoot) {
+      // Since validation also performs coercion, always create clones of the
+      // params so that this doesn't modify the data on `ctx`.
+      if (from && !root) {
+        // Allow parameters to be 'borrowed' from other objects.
+        const source = this.getParams(ctx, from)
+        // See above for an explanation of `clone()`:
+        params[paramName] = clone(wrapRoot ? source : source?.[paramName])
+      } else if (wrapRoot) {
         // If root is to be used, replace `params` with a new object on which
         // to set the root object to validate under `parameters.paramName`
         if (params === data) {
           params = {}
         }
-        params[paramName] = data
+        params[paramName] = clone(data)
       } else {
         params[paramName] = clone(data[paramName])
       }
-      if (from) {
-        // Allow parameters to be 'borrowed' from other objects.
-        const source = this.getParams(ctx, from)
-        // See above for an explanation of `clone()`:
-        params[paramName] = clone(wrapRoot ? source : source?.[paramName])
-      }
       try {
         const value = params[paramName]
         // `parameters.validate(params)` coerces data in the query to the
@@ -203,7 +200,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)
@@ -264,10 +262,10 @@ export default class ControllerAction {
     // If we have parameters, add them to the arguments now,
     // while also keeping track of consumed parameters:
     for (const param of list) {
-      const { name } = param
-      // Handle `{ member: true }` parameters separately, by delegating to
+      const { name, from } = param
+      // Handle `{ from: 'member' }` parameters separately, by delegating to
       // `getMember()` to resolve to the given member.
-      if (param.member) {
+      if (from === 'member') {
         member = await this.getMember(ctx, param)
         addArgument(name, member)
       } else {

package/src/controllers/MemberAction.js

@@ -12,14 +12,14 @@ export default class MemberAction extends ControllerAction {
     // member parameters can provide special query parameters as well,
     // and they can even control `forUpdate()` behavior:
     // {
-    //   member: true,
+    //   from: 'member',
     //   query: { ... },
     //   forUpdate: true,
     //   modify: query => query.debug()
     // }
     // These are passed on to and handled in `CollectionController#getMember()`.
-    // For handling of `member: true` and calling of `MemberAction.getMember()`,
-    // see `ControllerAction#collectArguments()`.
+    // For handling of `from: 'member'` and calling of
+    // `MemberAction.getMember()`, see `ControllerAction#collectArguments()`.
     // Pass on `this.handler` as `base` for `setupQuery()`,
     // to handle the setting of `handler.scope` & co. on the query.
     return this.controller.getMember(ctx, this.handler, param)

package/types/index.d.ts

@@ -1010,7 +1010,7 @@ export type ModelControllerActionOptions<
 export type MemberActionParameter<$Model extends Model = Model> =
   | Schema
   | {
-      member: true
+      from: 'member'
 
       /** Sets ctx.query. */
       query?: Record<string, any>