fixed bug with toJSON not being considdered

examples/example.js

@@ -5,17 +5,17 @@
 JSON.canonicalize = require('../');
 
 const json = {
-  '1': {'f': {'f': 'hi', 'F': 5}, '\n': 56.0},
-  '10': {},
+  1: { f: { f: 'hi', F: 5 }, '\n': 56.0 },
+  10: {},
   '': 'empty',
-  'a': {},
-  '111': [
+  a: {},
+  111: [
     {
-      'e': 'yes',
-      'E': 'no'
+      e: 'yes',
+      E: 'no'
     }
   ],
-  'A': {}
+  A: {}
 };
 
 console.log(JSON.canonicalize(json));

lib/canonicalize.js

@@ -3,10 +3,14 @@
 'use strict';
 
 module.exports = function serialize (object) {
-  if (object === null || typeof object !== 'object' || object.toJSON != null) {
+  if (object === null || typeof object !== 'object') {
     return JSON.stringify(object);
   }
 
+  if (typeof object.toJSON === 'function') {
+    return serialize(object.toJSON());
+  }
+
   if (Array.isArray(object)) {
     return '[' + object.reduce((t, cv, ci) => {
       const comma = ci === 0 ? '' : ',';
@@ -16,8 +20,7 @@ module.exports = function serialize (object) {
   }
 
   return '{' + Object.keys(object).sort().reduce((t, cv, ci) => {
-    if (object[cv] === undefined ||
-        typeof object[cv] === 'symbol') {
+    if (object[cv] === undefined || typeof object[cv] === 'symbol' || cv === 'toJSON') {
       return t;
     }
     const comma = t.length === 0 ? '' : ',';

test/simpletests.js

@@ -33,6 +33,13 @@ test('null and undefined values in array', t => {
   t.is(actual, expected);
 });
 
+test('object in array', t => {
+  const input = [{ b: 123, a: 'string' }];
+  const expected = '[{"a":"string","b":123}]';
+  const actual = JSON.canonicalize(input);
+  t.is(actual, expected);
+});
+
 test('empty object', t => {
   const input = {};
   const expected = '{}';
@@ -109,3 +116,19 @@ test('object with symbol key', t => {
   const actual = JSON.canonicalize(input);
   t.is(actual, expected);
 });
+
+test('object with toJSON', t => {
+  const input = {
+    a: 123,
+    b: 456,
+    toJSON: function () {
+      return {
+        b: this.b,
+        a: this.a
+      };
+    }
+  };
+  const expected = '{"a":123,"b":456}';
+  const actual = JSON.canonicalize(input);
+  t.is(actual, expected);
+});