@ditojs/server 1.14.3 → 1.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.14.3",
+  "version": "1.15.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": "^1.14.1",
+    "@ditojs/admin": "^1.15.0",
     "@ditojs/build": "^1.14.0",
-    "@ditojs/router": "^1.14.0",
-    "@ditojs/utils": "^1.14.0",
+    "@ditojs/router": "^1.15.0",
+    "@ditojs/utils": "^1.15.0",
     "@koa/cors": "^4.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -78,7 +78,7 @@
     "objection": "^3.0.1"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.200.0",
+    "@aws-sdk/client-s3": "^3.223.0",
     "@types/koa-bodyparser": "^4.3.10",
     "@types/koa-compress": "^4.0.3",
     "@types/koa-logger": "^3.1.2",
@@ -87,12 +87,12 @@
     "@types/koa-session": "^5.10.6",
     "@types/koa-static": "^4.0.2",
     "@types/koa__cors": "^3.3.0",
-    "@types/node": "^18.11.9",
+    "@types/node": "^18.11.10",
     "knex": "^2.3.0",
     "objection": "^3.0.1",
-    "type-fest": "^3.2.0",
+    "type-fest": "^3.3.0",
     "typescript": "^4.9.3"
   },
   "types": "types",
-  "gitHead": "cedf7eb2a28bb051ef194fc9b29205681e390ef9"
+  "gitHead": "848aed21b94e81ac68f089c4a6bd335b1a97073d"
 }

package/src/app/Application.js

@@ -289,12 +289,11 @@ export class Application extends Koa {
           data.schema = modelClass.getJsonSchema()
         }
         if (shouldLog(log.relations)) {
-          data.relations = clone(
-            modelClass.getRelationMappings(),
-            value => Model.isPrototypeOf(value)
+          data.relations = clone(modelClass.getRelationMappings(), {
+            processValue: value => Model.isPrototypeOf(value)
               ? `[Model: ${value.name}]`
               : value
-          )
+          })
         }
         if (Object.keys(data).length > 0) {
           console.info(
@@ -690,21 +689,13 @@ export class Application extends Koa {
   }
 
   formatError(error) {
-    // Clone the error to be able to delete hidden properties.
-    const copy = clone(error)
+    // Shallow-clone the error to be able to delete hidden properties.
+    const copy = clone(error, { shallow: true })
     // Remove headers added by the CORS middleware.
     delete copy.headers
     if (this.config.log.errors?.stack === false) {
       delete copy.stack
       delete copy.cause
-    } else {
-      // These aren't enumerable and thus couldn't be cloned above.
-      if (error.stack !== undefined) {
-        copy.stack = error.stack
-      }
-      if (error.cause !== undefined) {
-        copy.cause = error.cause
-      }
     }
     // Use `util.inspect()` instead of Pino's internal error logging for better
     // stack traces and logging of error data.

package/src/app/Validator.js

@@ -153,27 +153,29 @@ export class Validator extends objection.Validator {
 
   processSchema(jsonSchema, options = {}) {
     const { patch, async } = options
-    const schema = clone(jsonSchema, value => {
-      if (isObject(value)) {
-        if (patch) {
-          // Remove all required keywords and formats from schema for patch
-          // validation.
-          delete value.required
-          if (value.format === 'required') {
-            delete value.format
+    const schema = clone(jsonSchema, {
+      processValue: value => {
+        if (isObject(value)) {
+          if (patch) {
+            // Remove all required keywords and formats from schema for patch
+            // validation.
+            delete value.required
+            if (value.format === 'required') {
+              delete value.format
+            }
           }
-        }
-        // Convert async `validate()` keywords to `validateAsync()`:
-        if (isAsync(value.validate)) {
-          value.validateAsync = value.validate
-          delete value.validate
-        }
-        if (!async) {
-          // Remove all async keywords for synchronous validation.
-          for (const key in value) {
-            const keyword = this.getKeyword(key)
-            if (keyword?.async) {
-              delete value[key]
+          // Convert async `validate()` keywords to `validateAsync()`:
+          if (isAsync(value.validate)) {
+            value.validateAsync = value.validate
+            delete value.validate
+          }
+          if (!async) {
+            // Remove all async keywords for synchronous validation.
+            for (const key in value) {
+              const keyword = this.getKeyword(key)
+              if (keyword?.async) {
+                delete value[key]
+              }
             }
           }
         }

package/src/errors/RelationError.js

@@ -5,17 +5,17 @@ export class RelationError extends ResponseError {
     super(
       error,
       { message: 'Relation error', status: 400 },
-      error instanceof Error ? getParsedOverrides(error) : null
+      error instanceof Error ? getFormattedOverrides(error) : null
     )
   }
 }
 
-function getParsedOverrides(error) {
+function getFormattedOverrides(error) {
   // Adjust Objection.js error messages to point to the right property.
-  const parse = str => str?.replace(/\brelationMappings\b/g, 'relations')
+  const format = str => str?.replace(/\brelationMappings\b/g, 'relations')
   const { message, stack } = error
   return {
-    message: parse(message),
-    stack: parse(stack)
+    message: format(message),
+    stack: format(stack)
   }
 }

package/src/errors/ResponseError.js

@@ -21,6 +21,7 @@ export class ResponseError extends Error {
     super(message, cause ? { cause } : {})
     this.status = status
     this.data = data
+    // Allow `stack` overrides, e.g. for `RelationError`.
     if (stack != null) {
       this.stack = stack
     }
@@ -36,8 +37,11 @@ export class ResponseError extends Error {
 }
 
 function getErrorObject(error) {
-  // For generic errors, explicitly copy message.
-  const object = error.toJSON?.() ?? { message: error.message }
+  const object = {
+    // For generic errors, explicitly copy message.
+    message: error.message,
+    ...error.toJSON?.()
+  }
   // Additionally copy status and code if present.
   if (error.status != null) {
     object.status = error.status
@@ -45,8 +49,6 @@ function getErrorObject(error) {
   if (error.code != null) {
     object.code = error.code
   }
-  // Preserve the cause if already set in the original error, and set it to the
-  // error itself otherwise.
-  object.cause = error.cause ?? error
+  object.cause = error
   return object
 }

package/src/models/Model.js

@@ -180,7 +180,7 @@ export class Model extends objection.Model {
     const shallow = json.$isObjectionModel && !options.graph
     if (shallow) {
       // Strip away relations and other internal stuff.
-      json = json.clone({ shallow: true })
+      json = json.$clone({ shallow: true })
       // We can mutate `json` now that we took a copy of it.
       options = { ...options, mutable: true }
     }