fix

Author: nikitarui92

lib/index.js

@@ -34,16 +34,20 @@ function serialize(resource, schema, options = {}) {
 }
 
 function findObjectDef(propertyDef) {
-  const { type, properties } = propertyDef;
+  const { type, anyOf } = propertyDef;
 
-  if (type === 'object' && properties) {
+  if (type === 'object') {
     return propertyDef;
   }
 
   if (type === 'array') {
     return findObjectDef(propertyDef.items);
   }
 
+  if (anyOf && isNullableType(propertyDef)) {
+    return anyOf.map(findObjectDef).find(def => def && def.type === 'object');
+  }
+
   return null;
 }
 
@@ -58,4 +62,13 @@ function toJSON(value) {
   return value && typeof value.toJSON === 'function' ? value.toJSON() : value;
 }
 
+function isNullType(schema = {}) {
+  return schema.type === 'null';
+}
+
+function isNullableType(schema = {}) {
+  const { anyOf = [] } = schema;
+  return Boolean(anyOf.length === 2 && anyOf.find(isNullType) && anyOf.find(item => !isNullType(item)));
+}
+
 module.exports = serialize;

tests/all.test.js

@@ -69,18 +69,25 @@ describe('Serializers', () => {
           type: 'string',
         },
         modelsB: {
-          type: 'array',
-          items: {
-            type: 'object',
-            properties: {
-              b: {
-                type: 'integer',
-              },
-              c: {
-                type: 'boolean',
+          anyOf: [
+            {
+              type: 'array',
+              items: {
+                type: 'object',
+                properties: {
+                  b: {
+                    type: 'integer',
+                  },
+                  c: {
+                    type: 'boolean',
+                  },
+                },
               },
             },
-          },
+            {
+              type: 'null',
+            },
+          ],
         },
       },
     };