Merge pull request #142 from golyshevd/fix-sort-obj

Fix _sortObj
bem · Aug 8, 2016 · 6d56b25 · 6d56b25
2 parents 5cd1af9 + a504cff
commit 6d56b25
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 13 deletions.
diff --git a/lib/utils/utils.js b/lib/utils/utils.js
@@ -80,20 +80,23 @@ function sortAttrsValues(attrs, compareAttributesAsJSON) {
      * @returns {Object}
      */
     function _sortObj(obj) {
-        var keys = _.keys(obj).sort(),
-            sortedObj = {};
-
-        _.forEach(keys, function (key) {
-            var objValue = obj[key];
-
-            if (_.isPlainObject(objValue)) {
-                objValue = _sortObj(objValue);
-            }
+        if (!_.isObject(obj)) {
+            return JSON.stringify(obj);
+        }
 
-            sortedObj[key] = objValue;
-        });
+        if (_.isArray(obj)) {
+            return '[' + _(obj).map(_sortObj).join(',') + ']';
+        }
 
-        return sortedObj;
+        return '{' +
+            _(obj)
+                .keys()
+                .sort()
+                .map(function (key) {
+                    return JSON.stringify(key) + ':' + _sortObj(obj[key]);
+                })
+                .join(',') +
+            '}';
     }
 
     /**
@@ -132,7 +135,7 @@ function sortAttrsValues(attrs, compareAttributesAsJSON) {
         _.forEach(attrIndexes, function (index) {
             attrValue = _parseAttr(attrs[index].value, isFunction);
 
-            attrValue && (attrValue = JSON.stringify(_sortObj(attrValue)));
+            attrValue = _sortObj(attrValue);
 
             attrs[index].value = (isFunction && attrValue ? 'return ' : '') + attrValue;
         });

diff --git a/test/unit/utils.js b/test/unit/utils.js
@@ -65,6 +65,23 @@ describe('\'utils\'', function () {
         utils.sortAttrsValues(input, options).must.be.eql(output);
     });
 
+    it('must correctly sort attributes\' values which are objects inside arrays', function () {
+        var options = [
+                'a',
+                { name: 'onclick', isFunction: true }
+            ],
+            input = [
+                { name: 'a', value: '{"a":[{"b":"b","a":"a"}]}' },
+                { name: 'onclick', value: 'return {"a":[{"b":"b","a":"a"}]}' }
+            ],
+            output = [
+                { name: 'a', value: '{"a":[{"a":"a","b":"b"}]}' },
+                { name: 'onclick', value: 'return {"a":[{"a":"a","b":"b"}]}' }
+            ];
+
+        utils.sortAttrsValues(input, options).must.be.eql(output);
+    });
+
     it('must remove attributes\' values', function () {
         var input = [
                 { name: 'a', value: 'a' },