deep clone

goofychris · Apr 25, 2017 · a9f856e · a9f856e
1 parent 4b568ca
commit a9f856e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## v4.4.3
 
 1. 支持对 `options.imports` 的深拷贝 [#1](https://github.com/aui/express-art-template/issues/1)
+2. 支持对 `options.rules` 的覆盖
 
 ## v4.4.2
 

diff --git a/lib/template-node.js b/lib/template-node.js
@@ -236,8 +236,8 @@ var htmlMinifier = __webpack_require__(7);
 var resolveFilename = __webpack_require__(11);
 
 var toString = Object.prototype.toString;
-var isObject = function isObject(value) {
-    return value !== null && toString.call(value).slice(8, -1) === 'Object';
+var toType = function toType(value) {
+    return value === null ? 'Null' : toString.call(value).slice(8, -1);
 };
 
 /**
@@ -250,7 +250,9 @@ function extend(options) {
 
     for (var name in options) {
         var value = options[name];
-        if (isObject(value)) {
+        var type = toType(value);
+
+        if (type === 'Array' || type === 'Object') {
             copy[name] = extend.call(copy[name], value);
         } else {
             copy[name] = value;

diff --git a/lib/template-web.js b/lib/template-web.js
diff --git a/src/compile/defaults.js b/src/compile/defaults.js
@@ -12,8 +12,8 @@ const resolveFilename = require('./adapter/resolve-filename');
 
 
 const toString = Object.prototype.toString;
-const isObject = value => {
-    return value !== null && toString.call(value).slice(8, -1) === 'Object';
+const toType = value => {
+    return value === null ? 'Null' : toString.call(value).slice(8, -1);
 };
 
 
@@ -26,8 +26,10 @@ function extend(options) {
     const copy = Object.create(this);
 
     for (let name in options) {
-        let value = options[name];
-        if (isObject(value)) {
+        const value = options[name];
+        const type = toType(value);
+
+        if (type === 'Array' || type === 'Object') {
             copy[name] = extend.call(copy[name], value);
         } else {
             copy[name] = value;

diff --git a/test/compile/defaults.js b/test/compile/defaults.js
@@ -21,24 +21,24 @@ module.exports = {
         },
 
         'rules': () => {
-            // const rules = defaults.rules;
-            // const length = rules.length;
-            // const options = defaults.$extend({
-            //     rules: [null]
-            // });
-
-            // assert.deepEqual(null, options.rules[2]);
-            // assert.deepEqual(rules[0], options.rules[0]);
-            // assert.deepEqual(length, rules.length);
-
             const rules = defaults.rules;
             const length = rules.length;
             const options = defaults.$extend({
-                rules: []
+                rules: [null]
             });
 
-            assert.deepEqual(0, options.rules.length);
+            assert.deepEqual(null, options.rules[0]);
+            assert.deepEqual(rules[1], options.rules[1]);
             assert.deepEqual(length, rules.length);
+
+            // const rules = defaults.rules;
+            // const length = rules.length;
+            // const options = defaults.$extend({
+            //     rules: []
+            // });
+
+            // assert.deepEqual(0, options.rules.length);
+            // assert.deepEqual(length, rules.length);
         }
     }
 };