@ditojs/server 2.51.1 → 2.51.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.51.1",
+  "version": "2.51.2",
   "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",
@@ -26,10 +26,10 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^2.51.0",
-    "@ditojs/build": "^2.51.0",
-    "@ditojs/router": "^2.51.0",
-    "@ditojs/utils": "^2.51.0",
+    "@ditojs/admin": "^2.51.2",
+    "@ditojs/build": "^2.51.2",
+    "@ditojs/router": "^2.51.2",
+    "@ditojs/utils": "^2.51.2",
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -90,5 +90,5 @@
     "objection": "^3.1.5",
     "typescript": "^5.8.3"
   },
-  "gitHead": "b9faeb3c676bb792da67a028fa7de3bbdbc85de4"
+  "gitHead": "6df9c1bdbf04e6d4e58f53cab7ad2475fbb08161"
 }

package/src/controllers/ControllerAction.js

@@ -1,11 +1,5 @@
-import {
-  isString,
-  isObject,
-  asArray,
-  clone,
-  convertToJson,
-  deprecate
-} from '@ditojs/utils'
+import { isString, isObject, asArray, clone, deprecate } from '@ditojs/utils'
+import { convertModelsToJson } from '../utils/model.js'
 
 export default class ControllerAction {
   constructor(
@@ -126,11 +120,11 @@ export default class ControllerAction {
     await this.controller.emitHook(`before:${identifier}`, false, ctx, ...args)
     const response = await this.callHandler(ctx, ...args)
     const result =
-      // Don't convert response to JSON if it isn't being validated (e.g. useful
-      // for streams or buffers), or if the response contains model references.
+      // Don't convert response to JSON if it isn't being validated, or if the
+      // response validation schema contains model references.
       !this.response.validate || this.response.hasModelRefs
         ? response
-        : convertToJson(response)
+        : convertModelsToJson(response)
     return this.validateResponse(
       await this.controller.emitHook(`after:${identifier}`, true, ctx, result)
     )

package/src/utils/model.js

@@ -0,0 +1,35 @@
+import { isArray, isPlainObject } from '@ditojs/utils'
+
+/**
+ * Converts Models to their external representation by calling the `$toJson()`
+ * method. It does not create a JSON string, but a plain object. It is necessary
+ * to do this before the validation is performed, otherwise different properties
+ * might end up in the Json response. This is done recursively, so that nested
+ * models are also converted. Streams, Buffers and other non plain objects are
+ * left as-is, so this can directly be used on any results.
+ */
+export function convertModelsToJson(value) {
+  return value?.$isObjectionModel
+    ? value.$toJson()
+    : isPlainObject(value)
+      ? convertToJsonObject(value)
+      : isArray(value)
+        ? convertToJsonArray(value)
+        : value
+}
+
+function convertToJsonObject(value) {
+  const object = {}
+  for (const key of Object.keys(value)) {
+    object[key] = convertModelsToJson(value[key])
+  }
+  return object
+}
+
+function convertToJsonArray(value) {
+  const array = new Array(value.length)
+  for (let i = 0, l = value.length; i < l; ++i) {
+    array[i] = convertModelsToJson(value[i])
+  }
+  return array
+}