@ditojs/server 0.272.0 → 0.273.0

package/src/errors/DatabaseError.js

@@ -8,7 +8,7 @@ import {
 } from 'objection'
 
 export class DatabaseError extends WrappedError {
-  constructor(error) {
+  constructor(error, overrides) {
     const status =
       error instanceof CheckViolationError ? 400
       : error instanceof NotNullViolationError ? 400
@@ -16,28 +16,7 @@ export class DatabaseError extends WrappedError {
       : error instanceof DataError ? 400
       : error instanceof DBError ? 500
       : 400
-    // Remove knex SQL query and move to separate `query` property.
-    // TODO: Fix this properly in Knex / Objection instead, see:
-    // https://gitter.im/Vincit/objection.js?at=5a68728f5a9ebe4f75ca40b0
-    const [, sql, message] = error.message.match(/^([\s\S]*) - ([\s\S]*?)$/) ||
-      [null, null, error.message]
-    const overrides = {
-      type: error.constructor.name,
-      message,
-      sql,
-      status
-    }
+    overrides = { type: error.constructor.name, status, ...overrides }
     super(error, overrides, { message: 'Database error', status })
   }
-
-  toJSON() {
-    // Remove SQL query from displayed data in front-end when not in development
-    // or test.
-    if (process.env.NODE_ENV !== 'development' ||
-    process.env.NODE_ENV !== 'test') {
-      const { sql, ...data } = this.data
-      return data
-    }
-    return this.data
-  }
 }

package/src/errors/ResponseError.js

@@ -1,5 +1,4 @@
 import { isPlainObject, isString } from '@ditojs/utils'
-import { formatJson } from '@/utils'
 
 export class ResponseError extends Error {
   constructor(error, defaults = { message: 'Response error', status: 400 }) {
@@ -22,14 +21,7 @@ export class ResponseError extends Error {
           ? { message: error }
           : error || {}
     const { status, ...data } = { ...defaults, ...object }
-    let { message, code } = data
-    if (process.env.NODE_ENV === 'test' && error === object) {
-      // Include full JSON error in message during tests, for better reporting.
-      const { message: _, ...rest } = data
-      if (Object.keys(rest).length > 0) {
-        message = `${message}\nError Data:\n${formatJson(rest)}`
-      }
-    }
+    const { message, code } = data
     super(message)
     this.name = this.constructor.name
     this.status = status

package/src/models/Model.js

@@ -5,8 +5,11 @@ import { convertSchema, addRelationSchemas, convertRelations } from '@/schema'
 import { populateGraph, filterGraph } from '@/graph'
 import { formatJson } from '@/utils'
 import {
-  ResponseError, DatabaseError, GraphError, ModelError, NotFoundError,
-  RelationError, WrappedError
+  ResponseError,
+  GraphError, ModelError,
+  NotFoundError,
+  RelationError,
+  WrappedError
 } from '@/errors'
 import {
   isString, isObject, isArray, isFunction, isPromise, asArray, merge, flatten,
@@ -223,7 +226,7 @@ export class Model extends objection.Model {
     return super.query(trx).onError(err => {
       // TODO: Shouldn't this wrapping happen on the Controller level?
       err = err instanceof ResponseError ? err
-        : err instanceof objection.DBError ? new DatabaseError(err)
+        : err instanceof objection.DBError ? this.app.createDatabaseError(err)
         : new WrappedError(err)
       return Promise.reject(err)
     })
@@ -730,12 +733,11 @@ export class Model extends objection.Model {
     case 'ModelValidation':
       return this.app.createValidationError({
         type,
-        message: message ||
-          `The provided data for the ${this.name} model is not valid: ${
-            formatJson(json)
-          }`,
+        message:
+          message || `The provided data for the ${this.name} model is not valid`,
         errors,
-        options
+        options,
+        json
       })
     case 'RelationExpression':
     case 'UnallowedRelation':