@ditojs/server 2.50.0 → 2.51.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.50.0",
+  "version": "2.51.1",
   "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.50.0",
-    "@ditojs/build": "^2.50.0",
-    "@ditojs/router": "^2.50.0",
-    "@ditojs/utils": "^2.50.0",
+    "@ditojs/admin": "^2.51.0",
+    "@ditojs/build": "^2.51.0",
+    "@ditojs/router": "^2.51.0",
+    "@ditojs/utils": "^2.51.0",
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -41,7 +41,6 @@
     "eventemitter2": "^6.4.9",
     "file-type": "^20.5.0",
     "helmet": "^8.1.0",
-    "is-stream": "^4.0.1",
     "koa": "^3.0.0",
     "koa-bodyparser": "^4.4.1",
     "koa-compose": "^4.1.0",
@@ -86,10 +85,10 @@
     "@types/koa-session": "^6.4.5",
     "@types/koa-static": "^4.0.4",
     "@types/koa__cors": "^5.0.0",
-    "@types/node": "^22.15.17",
+    "@types/node": "^22.15.18",
     "knex": "^3.1.0",
     "objection": "^3.1.5",
     "typescript": "^5.8.3"
   },
-  "gitHead": "24ab390e75addc046571ffa7161c75569b11e4f5"
+  "gitHead": "b9faeb3c676bb792da67a028fa7de3bbdbc85de4"
 }

package/src/app/Application.js

@@ -534,6 +534,15 @@ export class Application extends Koa {
     const schema = properties
       ? convertSchema({ type: 'object', properties }, options)
       : null
+
+    // Method to recursively check the compiled JSON schema and its sub-schemas
+    // to see if it has any `$ref` references to model schemas:
+    const hasModelRefs = schema => (
+      !!this.models[schema?.$ref] ||
+      (isArray(schema) || isPlainObject(schema)) &&
+      Object.values(schema).some(hasModelRefs)
+    )
+
     const validate = this.compileValidator(schema, {
       // For parameters, always coerce types, including arrays.
       coerceTypes: 'array',
@@ -552,7 +561,10 @@ export class Application extends Koa {
       validate: validate
         ? // Use `call()` to pass ctx as context to Ajv, see passContext:
           data => validate.call(ctx, data)
-        : null
+        : null,
+      get hasModelRefs() {
+        return hasModelRefs(schema)
+      }
     }
   }
 
@@ -776,6 +788,9 @@ export class Application extends Koa {
     if (this.config.log.errors?.stack === false) {
       delete copy.stack
       delete copy.cause
+    } else {
+      // Explicitly copy the stack trace, as clone() might not copy it.
+      copy.stack = error.stack
     }
     // Use `util.inspect()` instead of Pino's internal error logging for better
     // stack traces and logging of error data.

package/src/app/Validator.js

@@ -96,20 +96,18 @@ export class Validator extends objection.Validator {
   getAjv(options = {}) {
     // Cache Ajv instances by keys that represent their options. For improved
     // matching, convert options to a version with all default values missing:
-    const opts = Object.entries(options).reduce((opts, [key, value]) => {
-      if (key in validatorOptions && value !== validatorOptions[key]) {
-        opts[key] = value
-      }
-      return opts
-    }, {})
-    const cacheKey = formatJson(opts, false)
-    const { ajv } = (
-      this.ajvCache[cacheKey] ||
-      (this.ajvCache[cacheKey] = {
-        ajv: this.createAjv(opts),
-        options
-      })
+    const filteredOptions = Object.fromEntries(
+      Object.entries(options).filter(
+        ([key, value]) => (
+          key in validatorOptions && value !== validatorOptions[key]
+        )
+      )
     )
+    const cacheKey = formatJson(filteredOptions, false)
+    const { ajv } = (this.ajvCache[cacheKey] ??= {
+      ajv: this.createAjv(filteredOptions),
+      options: filteredOptions
+    })
     return ajv
   }
 
@@ -205,6 +203,9 @@ export class Validator extends objection.Validator {
     })
     if (async) {
       schema.$async = true
+      for (const definition of Object.values(schema.definitions || {})) {
+        definition.$async = true
+      }
     }
     return schema
   }

package/src/controllers/ControllerAction.js

@@ -1,4 +1,11 @@
-import { isString, isObject, asArray, clone, deprecate } from '@ditojs/utils'
+import {
+  isString,
+  isObject,
+  asArray,
+  clone,
+  convertToJson,
+  deprecate
+} from '@ditojs/utils'
 
 export default class ControllerAction {
   constructor(
@@ -118,8 +125,14 @@ export default class ControllerAction {
     const { identifier } = this
     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.
+      !this.response.validate || this.response.hasModelRefs
+        ? response
+        : convertToJson(response)
     return this.validateResponse(
-      await this.controller.emitHook(`after:${identifier}`, true, ctx, response)
+      await this.controller.emitHook(`after:${identifier}`, true, ctx, result)
     )
   }
 

package/src/schema/schema.test.js

@@ -147,7 +147,7 @@ describe('convertSchema()', () => {
     })
   })
 
-  it(`expands 'object' schemas with properties to JSON schemas allowing no additional properties`, () => {
+  it(`expands 'object' schemas with properties to JSON schemas allowing no unevaluated properties`, () => {
     expect(
       convertSchema({
         type: 'object',
@@ -171,7 +171,7 @@ describe('convertSchema()', () => {
     })
   })
 
-  it('preserves pre-existing settings for no additional properties', () => {
+  it('preserves pre-existing settings for no unevaluated properties', () => {
     expect(
       convertSchema({
         type: 'object',

package/src/schema/types/_color.js

@@ -0,0 +1,4 @@
+export const color = {
+  type: 'string',
+  format: 'hexcolor'
+}

package/src/schema/types/index.js

@@ -1 +1,2 @@
 export * from './_asset.js'
+export * from './_color.js'

package/src/utils/koa.js

@@ -1,12 +0,0 @@
-import { isString } from '@ditojs/utils'
-import { isStream } from 'is-stream'
-
-export function isSupportedKoaBody(body) {
-  return (
-    Buffer.isBuffer(body) ||
-    isString(body) ||
-    body instanceof Blob ||
-    body instanceof Response ||
-    isStream(body)
-  )
-}