Merge pull request #437 from aui/v4.12.1

fix filter bug
goofychris · Jun 29, 2017 · de0f67d · de0f67d
2 parents a2ae37a + 6562b80
commit de0f67d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,13 @@
 # CHANGELOG
 
+## v4.12.1
+
+1. 修复过滤器不能使用包含空的格字符串参数的问题
+
 ## v4.12.0
 
 1. `bail` 默认为 `true`
-2. 修复 filter 不支持 javascript 表达式的问题 [#430](https://github.com/aui/art-template/issues/430)
+2. 修复过滤器不支持 javascript 表达式的问题 [#430](https://github.com/aui/art-template/issues/430)
 
 ## v4.11.0
 

diff --git a/lib/compile/adapter/rule.art.js b/lib/compile/adapter/rule.art.js
@@ -119,11 +119,12 @@ var artRule = {
 
                     // 将过滤器解析成二维数组
                     var _group = esTokens.reduce(function (group, token) {
-                        var value = token.value;
+                        var value = token.value,
+                            type = token.type;
 
                         if (value === '|') {
                             group.push([]);
-                        } else if (/^\S+$/.test(value)) {
+                        } else if (type !== 'whitespace' && type !== 'comment') {
                             if (!group.length) {
                                 group.push([]);
                             }
@@ -142,6 +143,7 @@ var artRule = {
                     code = _group.reduce(function (accumulator, filter) {
                         var name = filter.shift();
                         filter.unshift(accumulator);
+
                         return '$imports.' + name + '(' + filter.join(',') + ')';
                     }, _group.shift().join(' ').trim());
                 }

diff --git a/lib/template-web.js b/lib/template-web.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "art-template",
   "description": "JavaScript Template Engine",
   "homepage": "http://aui.github.com/art-template/",
-  "version": "4.12.0",
+  "version": "4.12.1",
   "keywords": [
     "template"
   ],

diff --git a/src/compile/adapter/rule.art.js b/src/compile/adapter/rule.art.js
@@ -122,10 +122,10 @@ const artRule = {
 
                     // 将过滤器解析成二维数组
                     const group = esTokens.reduce((group, token) => {
-                        const {value} = token;
+                        const {value, type} = token;
                         if (value === '|') {
                             group.push([]);
-                        } else if (/^\S+$/.test(value)) {
+                        } else if (type !== `whitespace` && type !== `comment`) {
                             if (!group.length) {
                                 group.push([]);
                             }
@@ -138,14 +138,15 @@ const artRule = {
                         return group;
                     }, []).map(g => artRule._split(g));
 
+
                     // 将过滤器管道化
                     code = group.reduce((accumulator, filter) => {
                         const name = filter.shift();
                         filter.unshift(accumulator);
+
                         return `$imports.${name}(${filter.join(',')})`;
                     }, group.shift().join(` `).trim());
 
-
                 }
 
                 output = output || 'escape';

diff --git a/test/compile/adapter/rule.art.js b/test/compile/adapter/rule.art.js
@@ -14,6 +14,7 @@ const callRule = code => {
     return ruleArt.use.apply(compiler, list);
 }
 
+
 module.exports = {
     syntax: {
         'set': () => {
@@ -303,7 +304,14 @@ module.exports = {
                 code: `$imports.dateFormat(time||Date.now(),'yyyy-MM-dd')`,
                 output: 'escape'
             }, callRule(`{{time || Date.now() | dateFormat 'yyyy-MM-dd'}}`));
-        }
+
+            assert.deepEqual({
+                code: `$imports.dateFormat(item.add_time*1000,'yyyy-MM-dd hh:mm:ss')`,
+                output: 'escape'
+            }, callRule(`{{item.add_time*1000 | dateFormat 'yyyy-MM-dd hh:mm:ss'}}`));
+        },
+
+
     },
 
     'rule.art': {
@@ -437,6 +445,10 @@ module.exports = {
             result = ruleArt._split(esTokens);
             assert.deepEqual(['++a', 'c'], result);
 
+            code = `dateFormat 'yyyy-MM-dd hh:mm:ss'`;
+            esTokens = esTokenizer(code);
+            result = ruleArt._split(esTokens);
+            assert.deepEqual(['dateFormat', `'yyyy-MM-dd hh:mm:ss'`], result);
         }
     }
 };