style: 1）调整实现逻辑及代码缩进；2）添加单测

ystarlongzi · Gcaufy · commit fe91a8552d33 · 2018-05-16T18:00:05.000+08:00
diff --git a/packages/wepy/src/util.js b/packages/wepy/src/util.js
@@ -1,27 +1,27 @@
 /**
  * Tencent is pleased to support the open source community by making WePY available.
  * Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
- * 
+ *
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
 function isImmutable (maybeImmutable) {
-	// https://github.com/facebook/immutable-js/blob/master/src/Predicates.js
-	if (!maybeImmutable || typeof maybeImmutable !== 'object') {
-		return false;
-	}
+    // https://github.com/facebook/immutable-js/blob/master/src/Predicates.js
+    if (!maybeImmutable || typeof maybeImmutable !== 'object') {
+        return false;
+    }
 
 	const IMMUTABLE_KEYS = [
-		'@@__IMMUTABLE_ITERABLE__@@',
-		'@@__IMMUTABLE_KEYED__@@',
-		'@@__IMMUTABLE_INDEXED__@@',
-		'@@__IMMUTABLE_ORDERED__@@',
-		'@@__IMMUTABLE_RECORD__@@'
-	]
-
-	return !!IMMUTABLE_KEYS.filter(key => maybeImmutable[key]).length;
+	    '@@__IMMUTABLE_ITERABLE__@@',
+        '@@__IMMUTABLE_KEYED__@@',
+        '@@__IMMUTABLE_INDEXED__@@',
+        '@@__IMMUTABLE_ORDERED__@@',
+        '@@__IMMUTABLE_RECORD__@@'
+    ]
+
+    return !!IMMUTABLE_KEYS.filter(key => maybeImmutable[key]).length;
 }
 
 export default {
@@ -30,7 +30,9 @@ export default {
     },
 
     $isEqual (a, b, aStack, bStack) {
-        if (isImmutable(a) || isImmutable(b)) return a === b
+        if (isImmutable(a)) return a.equals(b)
+        if (isImmutable(b)) return b.equals(a)
+
         // Identical objects are equal. `0 === -0`, but they aren't identical.
         // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal).
         if (a === b) return a !== 0 || 1 / a === 1 / b;
@@ -45,7 +47,9 @@ export default {
     },
 
     $isDeepEqual (a, b, aStack, bStack) {
-        if (isImmutable(a) || isImmutable(b)) return a === b
+        if (isImmutable(a)) a = a.toJS()
+
+        if (isImmutable(b)) b = b.toJS()
 
         let self = this;
         // Compare `[[Class]]` names.
@@ -309,7 +313,7 @@ export default {
        return rst;
     },
 
-	isImmutable,
+    isImmutable,
 
     /**
     * Hyphenate a camelCase string.
diff --git a/packages/wepy/test/index.js b/packages/wepy/test/index.js
@@ -1,13 +1,13 @@
 /**
  * Tencent is pleased to support the open source community by making WePY available.
  * Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
- * 
+ *
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
- 
+var Immutable = require('immutable')
 var assert = require('assert');
 var wepy = require('../lib/wepy.js').default;
 
@@ -22,8 +22,19 @@ describe('index.js', () => {
     it('wepy.$isDeepEqual', () => {
         let a = {a:{b:{c:{d:1}}}};
         let b = {a:{b:{c:{d:2}}}};
+        let a$ = Immutable.fromJS(a);
+        let a1$ = Immutable.fromJS(a);
+        let a2$ = a$.setIn(['a', 'b', 'c', 'd'], 2222)
+
         assert.strictEqual(wepy.$isDeepEqual(a, b), false);
 
+        assert.equal(wepy.$isDeepEqual(a, a$), true, 'compare with a immutable variable that has same values');
+
+        assert.equal(wepy.$isDeepEqual(b, a$), false, 'compare with a immutable variable that has different values');
+
+        assert.equal(wepy.$isDeepEqual(a$, a1$), true, 'compare two immutable variable that has same values');
+
+        assert.equal(wepy.$isDeepEqual(a1$, a2$), false, 'compare two immutable variable that has different values');
 
         let c = {a:{b:[1,2,3,{e:[12,3,{a:'1'}]}]}};
         let d = {a:{b:[1,2,3,{e:[12,3,{a:'1'}]}]}};
@@ -60,11 +71,14 @@ describe('index.js', () => {
         assert.strictEqual(wepy.$isDeepEqual(function () {return this}, function () {return this}), false, 'compare function');
 
         assert.strictEqual(wepy.$isDeepEqual(new function () {return this}, new function () {return this}), false, 'compare new instance');
-
     });
     it('wepy.$isEqual', () => {
         let a = {a:{b:[1,2,3,{e:[12,3,{a:'1'}]}]}};
         let b = {a:{b:[1,2,3,{e:[12,3,{a:'1'}]}]}};
+        let a$ = Immutable.fromJS(a);
+        let a1$ = Immutable.fromJS(a);
+        let a2$ = a$.setIn(['a', 'b', 0], 2);
+
         assert.equal(wepy.$isEqual(a, b), true, 'wepy.$isEqual({a:{b:[1,2,3,{e:[12,3,{a:\'1\'}]}]}}, {a:{b:[1,2,3,{e:[12,3,{a:\'1\'}]}]}})');
 
 
@@ -83,6 +97,12 @@ describe('index.js', () => {
 
         assert.equal(wepy.$isEqual('a', 'a'), true, 'wepy.$isEqual(\'a\', \'a\')');
 
+        assert.equal(wepy.$isEqual(a, a$), false, 'compare with a immutable variable that has same values');
+
+        assert.equal(wepy.$isEqual(a$, a1$), true, 'compare two immutable variable that has same values');
+
+        assert.equal(wepy.$isEqual(a$, a2$), false, 'compare two immutable variable that has different values');
+
     });
     it('wepy.$has', () => {
         let a = {a: 1};
@@ -175,4 +195,4 @@ describe('index.js', () => {
 
 
 
-})
+})
diff --git a/packages/wepy/test/util.js b/packages/wepy/test/util.js
@@ -1,13 +1,12 @@
 /**
  * Tencent is pleased to support the open source community by making WePY available.
  * Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
- * 
+ *
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
-
-
+var Immutable = require('immutable')
 var assert = require('assert');
 var util = require('../lib/util.js').default;
 
@@ -58,9 +57,6 @@ describe('util.js', () => {
 
     });
 
-
-
-
     it('$getParams', () => {
 
         let p;
@@ -80,4 +76,13 @@ describe('util.js', () => {
 
     });
 
-});
+    it('isImmutable', () => {
+        let a$ = Immutable.fromJS({ a: 1111 });
+        let b = 'a string';
+
+        assert.strictEqual(util.isImmutable(a$), true, 'is a immutable variable');
+
+        assert.strictEqual(util.isImmutable(b), false, 'is not a immutable variable');
+    })
+
+});
