Merge pull request #7 from OsomePteLtd/failing-anyOf-test

Failing-anyOf-test

Author: nikitarui92

lib/index.js

@@ -34,28 +34,18 @@ function serialize(resource, schema, options = {}) {
 }
 
 function findObjectDef(propertyDef) {
-  const { type, anyOf, properties } = propertyDef;
+  const { type, anyOf } = propertyDef;
 
-  if (type === 'object' && properties) {
+  if (type === 'object') {
     return propertyDef;
   }
 
   if (type === 'array') {
     return findObjectDef(propertyDef.items);
   }
 
-  if (anyOf) {
-    const props = anyOf
-      .map(findObjectDef)
-      .filter(Boolean)
-      .map(item => item.properties)
-      .reduce((acc, curr) => ({ ...acc, ...curr }), {});
-    if (Object.keys(props).length > 0) {
-      return {
-        type: 'object',
-        properties: props,
-      };
-    }
+  if (anyOf && isNullableType(propertyDef)) {
+    return anyOf.map(findObjectDef).find(def => def && def.type === 'object');
   }
 
   return null;
@@ -66,7 +56,19 @@ function isObjectLike(value) {
 }
 
 function toJSON(value) {
+  if (Array.isArray(value)) {
+    return value.map(toJSON);
+  }
   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

@@ -1,4 +1,6 @@
+const Sequelize = require('sequelize');
 const { createModel, DUMMY_VALUES } = require('./init');
+
 const serialize = require('../lib/index');
 
 describe('Serializers', () => {
@@ -67,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',
+            },
+          ],
         },
       },
     };
@@ -130,7 +139,9 @@ describe('Serializers', () => {
 
     expect(serialize(instanceB, schema)).toEqual({
       a: 'x',
-      modelA: { b: 777, c: true },
+      modelA: {
+        a: 'x', b: 777, c: true, id: null,
+      },
     });
   });
 
@@ -180,21 +191,25 @@ describe('Serializers', () => {
     };
 
     const instanceA = new ModelA(DUMMY_VALUES);
-    const instanceB1 = new ModelB(DUMMY_VALUES);
+    const instanceB1 = new ModelB({ a: 'x' });
     const instanceB2 = new ModelB(DUMMY_VALUES);
     instanceA.modelsB = [instanceB1, instanceB2];
 
     expect(serialize(instanceA, schema)).toEqual({
       a: 'x',
       modelsB: [
-        { b: 777, c: true },
-        { b: 777, c: true },
+        {
+          a: 'x', id: null,
+        },
+        {
+          a: 'x', b: 777, c: true, id: null,
+        },
       ],
     });
   });
 
   it('Object schema without properties', () => {
-    const TestModel = createModel();
+    const TestModel = createModel('TestModel', { a: Sequelize.DataTypes.JSONB });
 
     const schema = {
       type: 'object',
@@ -213,8 +228,14 @@ describe('Serializers', () => {
       additionalProperties: false,
     };
 
-    const instance = new TestModel({ ...DUMMY_VALUES, a: {} });
-    expect(serialize(instance, schema)).toEqual({ a: {} });
+    const instance = new TestModel({ ...DUMMY_VALUES, a: DUMMY_VALUES });
+    expect(serialize(instance, schema)).toEqual({
+      a: {
+        a: 'x',
+        b: 777,
+        c: true,
+      },
+    });
   });
 
   it('Resource as empty array', () => {
@@ -238,4 +259,62 @@ describe('Serializers', () => {
       id: null,
     });
   });
+
+  it('anyOf with conflicting nested properties', () => {
+    const ModelA = createModel('ModelA', { a: Sequelize.DataTypes.JSONB });
+
+    const schema = {
+      type: 'object',
+      properties: {
+        a: {
+          anyOf: [
+            {
+              type: 'object',
+              properties: {
+                arr: {
+                  type: 'array',
+                  items: {
+                    type: 'object',
+                    properties: {
+                      foo: {
+                        type: 'boolean',
+                      },
+                    },
+                  },
+                },
+              },
+            },
+            {
+              type: 'object',
+              properties: {
+                arr: {
+                  type: 'array',
+                  items: {
+                    type: 'object',
+                    properties: {
+                      bar: {
+                        type: 'boolean',
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          ],
+        },
+      },
+    };
+
+    const instanceA = new ModelA({
+      a: {
+        arr: [{ foo: true }],
+      },
+    });
+
+    expect(serialize(instanceA, schema)).toEqual({
+      a: {
+        arr: [{ foo: true }],
+      },
+    });
+  });
 });

tests/init.js

@@ -1,26 +1,21 @@
 const Sequelize = require('sequelize');
 
-const sequelize = new Sequelize('sqlite::memory:');
+const sequelize = new Sequelize('sqlite::memory:', { logging: false });
 
 const DUMMY_VALUES = {
   a: 'x',
   b: 777,
   c: true,
 };
 
-function createModel() {
-  class TestModel extends Sequelize.Model {}
-
-  TestModel.init(
+function createModel(modelName = 'TestModel', props = {}) {
+  return sequelize.define(modelName,
     {
       a: Sequelize.DataTypes.STRING,
       b: Sequelize.DataTypes.INTEGER,
       c: Sequelize.DataTypes.BOOLEAN,
-    },
-    { sequelize },
-  );
-
-  return TestModel;
+      ...props,
+    });
 }
 
 module.exports = {