Return plain object from defineValidation for Joi

TRUEPIC · Aug 22, 2019 · 8fe74df · 8fe74df
1 parent 05de9b9
commit 8fe74df
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -394,10 +394,10 @@ function in your querier that returns the validation schema:
 
 ```js
 defineValidation(schema) {
-  return schema.object().keys({
+  return {
     'filter:status[=]': schema.string().valid('open', 'closed'),
     'page:size': schema.number().max(100)
-  })
+  }
 }
 ```
 

diff --git a/src/validators/querier/joi.js b/src/validators/querier/joi.js
@@ -17,7 +17,9 @@ class JoiValidator extends BaseValidator {
       return true
     }
 
-    const { error } = this.schema.validate(this.values, { allowUnknown: true })
+    const { error } = Joi.object()
+      .keys(this.schema)
+      .validate(this.values, { allowUnknown: true })
 
     if (error) {
       throw this.buildError(error)

diff --git a/test/src/index.js b/test/src/index.js
@@ -149,11 +149,9 @@ describe('run', () => {
   test('throws `ValidationError` if querier-defined schema invalid', () => {
     const defineValidation = jest
       .spyOn(TestQuerier.prototype, 'defineValidation')
-      .mockImplementation(schema =>
-        schema.object().keys({
-          'filter:test[=]': schema.string(),
-        })
-      )
+      .mockImplementation(schema => ({
+        'filter:test[=]': schema.string(),
+      }))
 
     const querier = new TestQuerier({ filter: { test: 123 } }, knex('test'))
 

diff --git a/test/src/validators/querier/joi.js b/test/src/validators/querier/joi.js
@@ -49,10 +49,9 @@ describe('validate', () => {
       knex('test')
     )
 
-    querier.defineValidation = schema =>
-      schema.object().keys({
-        'filter:test[=]': schema.number(),
-      })
+    querier.defineValidation = schema => ({
+      'filter:test[=]': schema.number(),
+    })
 
     expect(new JoiValidator(querier).validate()).toBe(true)
   })
@@ -79,10 +78,9 @@ describe('validate', () => {
       knex('test')
     )
 
-    querier.defineValidation = schema =>
-      schema.object().keys({
-        'filter:test[=]': schema.number(),
-      })
+    querier.defineValidation = schema => ({
+      'filter:test[=]': schema.number(),
+    })
 
     expect(() => new JoiValidator(querier).validate()).toThrow(
       new ValidationError('filter:test[=] must be a number')