fix bug: goofychris/express-art-template#1

lib/template-node.js

@@ -1,4 +1,4 @@
-/*! [email protected].2 | https://github.com/aui/art-template */
+/*! [email protected].3 | https://github.com/aui/art-template */
 module.exports =
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
@@ -235,6 +235,31 @@ var nativeRule = __webpack_require__(13);
 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';
+};
+
+/**
+ * 继承默认配置
+ * @param   {Object}    options
+ * @return {Object}
+ */
+function extend(options) {
+    var copy = Object.create(this);
+
+    for (var name in options) {
+        var value = options[name];
+        if (isObject(value)) {
+            copy[name] = extend.call(copy[name], value);
+        } else {
+            copy[name] = value;
+        }
+    }
+
+    return copy;
+};
+
 /** 模板编译器默认配置 */
 var defaults = {
 
@@ -296,21 +321,7 @@ var defaults = {
 
 };
 
-/**
- * 继承默认配置
- * @param   {Object}    options
- * @return {Object}
- */
-defaults.$extend = function (options) {
-    var copy = Object.create(this);
-
-    for (var name in options) {
-        copy[name] = options[name];
-    }
-
-    return copy;
-};
-
+defaults.$extend = extend;
 module.exports = defaults;
 
 /***/ }),

package.json

@@ -2,7 +2,7 @@
   "name": "art-template",
   "description": "JavaScript Template Engine",
   "homepage": "http://aui.github.com/art-template/",
-  "version": "4.4.2",
+  "version": "4.4.3",
   "keywords": [
     "template"
   ],

src/compile/defaults.js

@@ -11,6 +11,33 @@ const htmlMinifier = require('./adapter/html-minifier');
 const resolveFilename = require('./adapter/resolve-filename');
 
 
+const toString = Object.prototype.toString;
+const isObject = value => {
+    return value !== null && toString.call(value).slice(8, -1) === 'Object';
+};
+
+
+/**
+ * 继承默认配置
+ * @param   {Object}    options
+ * @return {Object}
+ */
+function extend(options) {
+    const copy = Object.create(this);
+
+    for (let name in options) {
+        let value = options[name];
+        if (isObject(value)) {
+            copy[name] = extend.call(copy[name], value);
+        } else {
+            copy[name] = value;
+        }
+    }
+
+    return copy;
+};
+
+
 /** 模板编译器默认配置 */
 const defaults = {
 
@@ -73,20 +100,5 @@ const defaults = {
 };
 
 
-/**
- * 继承默认配置
- * @param   {Object}    options
- * @return {Object}
- */
-defaults.$extend = function(options) {
-    const copy = Object.create(this);
-
-    for (let name in options) {
-        copy[name] = options[name]
-    }
-
-    return copy;
-};
-
-
+defaults.$extend = extend;
 module.exports = defaults;

test/compile/defaults.js

@@ -4,5 +4,41 @@ module.exports = {
 
     before: () => {
         console.log('#compile/defaults');
+    },
+
+    'defaults': {
+        'imports': () => {
+            const imports = defaults.imports;
+            const options = defaults.$extend({
+                imports: {
+                    console
+                }
+            });
+
+            assert.deepEqual(console, options.imports.console);
+            assert.deepEqual(imports.$escape, options.imports.$escape);
+            assert.deepEqual(undefined, imports.console);
+        },
+
+        '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: []
+            });
+
+            assert.deepEqual(0, options.rules.length);
+            assert.deepEqual(length, rules.length);
+        }
     }
 };