Add toJSON() method to structures

talyssonoc · Dec 30, 2016 · 068426a · 068426a
1 parent 477a553
commit 068426a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/src/attributesDecorator.js b/src/attributesDecorator.js
@@ -1,7 +1,11 @@
 const { normalizeSchema } = require('./schemaNormalization');
 const { getInitialValues } = require('./initialValueCreation');
 const { SCHEMA } = require('./symbols');
-const { attributesDescriptor, validationDescriptor } = require('./propertyDescriptors');
+const {
+  attributesDescriptor,
+  validationDescriptor,
+  serializationDescriptor
+} = require('./propertyDescriptors');
 
 const define = Object.defineProperty;
 
@@ -55,6 +59,8 @@ function attributesDecorator(declaredSchema, ErroneousPassedClass) {
 
     define(WrapperClass.prototype, 'validate', validationDescriptor);
 
+    define(WrapperClass.prototype, 'toJSON', serializationDescriptor);
+
     return WrapperClass;
   };
 }

diff --git a/src/propertyDescriptors.js b/src/propertyDescriptors.js
@@ -33,7 +33,7 @@ exports.attributesDescriptor = {
 exports.validationDescriptor = {
   value: function validate() {
     const validation = this[SCHEMA][VALIDATE];
-    const serializedStructure = serialize(this);
+    const serializedStructure = this.toJSON();
 
     const errors = validation.validate(serializedStructure);
 
@@ -47,3 +47,9 @@ exports.validationDescriptor = {
     return { valid: true };
   }
 };
+
+exports.serializationDescriptor = {
+  value: function toJSON() {
+    return serialize(this);
+  }
+};
diff --git a/test/unit/serialization/array.spec.js b/test/unit/serialization/array.spec.js
@@ -1,6 +1,5 @@
 const { expect } = require('chai');
 const { attributes } = require('../../../src');
-const { serialize } = require('../../../src/serialization');
 
 describe('serialization', () => {
   describe('Array', () => {
@@ -25,7 +24,7 @@ describe('serialization', () => {
           ]
         });
 
-        expect(serialize(user)).to.eql({
+        expect(user.toJSON()).to.eql({
           name: 'Something',
           books: [
             { name: 'The Hobbit' }
@@ -45,7 +44,7 @@ describe('serialization', () => {
           ]
         });
 
-        const serializedUser = serialize(user);
+        const serializedUser = user.toJSON();
 
         expect(serializedUser).to.eql({
           name: 'Some name',

diff --git a/test/unit/serialization/nestedStructure.spec.js b/test/unit/serialization/nestedStructure.spec.js
@@ -1,6 +1,5 @@
 const { expect } = require('chai');
 const { attributes } = require('../../../src');
-const { serialize } = require('../../../src/serialization');
 
 describe('serialization', () => {
   describe('Nested structure', () => {
@@ -26,7 +25,7 @@ describe('serialization', () => {
           location
         });
 
-        expect(serialize(user)).to.eql({
+        expect(user.toJSON()).to.eql({
           name: 'Something',
           location: {
             longitude: 123,
@@ -42,7 +41,7 @@ describe('serialization', () => {
           name: 'Some name'
         });
 
-        const serializedUser = serialize(user);
+        const serializedUser = user.toJSON();
 
         expect(serializedUser).to.eql({
           name: 'Some name',
@@ -63,7 +62,7 @@ describe('serialization', () => {
           location
         });
 
-        const serializedUser = serialize(user);
+        const serializedUser = user.toJSON();
 
         expect(serializedUser).to.eql({
           name: 'Name',

diff --git a/test/unit/serialization/structure.spec.js b/test/unit/serialization/structure.spec.js
@@ -1,6 +1,5 @@
 const { expect } = require('chai');
 const { attributes } = require('../../../src');
-const { serialize } = require('../../../src/serialization');
 
 describe('serialization', () => {
   describe('Structure', () => {
@@ -16,7 +15,7 @@ describe('serialization', () => {
           age: 42
         });
 
-        expect(serialize(user)).to.eql({
+        expect(user.toJSON()).to.eql({
           name: 'Something',
           age: 42
         });
@@ -30,7 +29,7 @@ describe('serialization', () => {
           age: undefined
         });
 
-        const serializedUser = serialize(user);
+        const serializedUser = user.toJSON();
 
         expect(serializedUser).to.eql({
           name: 'Some name',