@ditojs/server 0.271.0 → 0.274.0

package/src/models/Model.js

@@ -3,9 +3,13 @@ import { QueryBuilder } from '@/query'
 import { EventEmitter, KnexHelper } from '@/lib'
 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,
@@ -222,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)
     })
@@ -279,9 +283,9 @@ export class Model extends objection.Model {
         throw new ModelError(
           this,
           `Invalid amount of id values provided for reference: Unable to map ${
-            JSON.stringify(modelOrId)
+            formatJson(modelOrId, false)
           } to ${
-            JSON.stringify(idProperties)
+            formatJson(idProperties, false)
           }.`
         )
       }
@@ -729,10 +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: ${JSON.stringify(json)}`,
+        message:
+          message || `The provided data for the ${this.name} model is not valid`,
         errors,
-        options
+        options,
+        json
       })
     case 'RelationExpression':
     case 'UnallowedRelation':

package/src/utils/index.js

@@ -2,5 +2,6 @@ export * from './decorator'
 export * from './deprecate'
 export * from './emitter'
 export * from './function'
+export * from './json'
 export * from './object'
 export * from './scope'

package/src/utils/json.js

@@ -0,0 +1,3 @@
+export function formatJson(json, indented = true) {
+  return JSON.stringify(json, null, indented ? 2 : 0)
+}