Fix additionalProperties can handle true as value #41 (#43)

fastify · Aug 26, 2019 · c0b2a95 · c0b2a95
1 parent ba1b9be
commit c0b2a95
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/src/ObjectSchema.js b/src/ObjectSchema.js
@@ -47,21 +47,23 @@ const ObjectSchema = ({ schema = initialState, ...options } = {}) => {
      */
 
     additionalProperties: value => {
-      if (typeof value !== 'boolean' && !isFluentSchema(value))
-        throw new Error("'additionalProperties' must be a boolean or a S")
-      if (value === false) {
+      if (typeof value === 'boolean') {
         return setAttribute({ schema, ...options }, [
           'additionalProperties',
-          false,
+          value,
           'object',
         ])
       }
-      const { $schema, ...rest } = value.valueOf()
-      return setAttribute({ schema, ...options }, [
-        'additionalProperties',
-        { ...rest },
-        'array',
-      ])
+      if (isFluentSchema(value)) {
+        const { $schema, ...rest } = value.valueOf()
+        return setAttribute({ schema, ...options }, [
+          'additionalProperties',
+          { ...rest },
+          'array',
+        ])
+      }
+
+      throw new Error("'additionalProperties' must be a boolean or a S")
     },
 
     /**

diff --git a/src/ObjectSchema.test.js b/src/ObjectSchema.test.js
@@ -292,6 +292,16 @@ describe('ObjectSchema', () => {
     })
 
     describe('additionalProperties', () => {
+      it('true', () => {
+        const value = true
+        expect(
+          ObjectSchema()
+            .additionalProperties(value)
+            .prop('prop')
+            .valueOf().additionalProperties
+        ).toEqual(value)
+      })
+
       it('false', () => {
         const value = false
         expect(