revert back to use comma as exp splitter - wrap exp with () to escape

Author: yyx990803

examples/todomvc/index.html

@@ -29,7 +29,10 @@ <h1>todos</h1>
                         class="todo"
                         sd-repeat="todo:todos"
                         sd-if="todoFilter(todo.completed)"
-                        sd-class="completed:todo.completed & editing:todo == editedTodo"
+                        sd-class="
+                            completed : todo.completed,
+                            editing   : todo == editedTodo
+                        "
                     >
                         <div class="view">
                             <input
@@ -44,9 +47,13 @@ <h1>todos</h1>
                         <input
                             class="edit"
                             type="text"
-                            sd-on="blur:doneEdit & keyup:doneEdit | key enter & keyup:cancelEdit | key esc"
                             sd-model="todo.title"
                             sd-todo-focus="todo == editedTodo"
+                            sd-on="
+                                blur  : doneEdit,
+                                keyup : doneEdit | key enter,
+                                keyup : cancelEdit | key esc
+                            "
                         >
                     </li>
                 </ul>

src/directive.js

@@ -4,9 +4,14 @@ var config     = require('./config'),
     filters    = require('./filters'),
 
     // Regexes!
+
     // regex to split multiple directive expressions
-    SPLIT_RE        = /(?:['"](?:\\.|[^'"])*['"]|\\.|[^&]|&&)+/g,
+    // split by commas, but ignore commas within quotes, parens and escapes.
+    SPLIT_RE        = /(?:['"](?:\\.|[^'"])*['"]|\((?:\\.|[^\)])*\)|\\.|[^,])+/g,
+
+    // match up to the first single pipe, ignore those within quotes.
     KEY_RE          = /^(?:['"](?:\\.|[^'"])*['"]|\\.|[^\|]|\|\|)+/,
+
     ARG_RE          = /^([\w- ]+):(.+)$/,
     FILTERS_RE      = /\|[^\|]+/g,
     FILTER_TOKEN_RE = /[^\s']+|'[^']+'/g,

test/unit/specs/directive.js

@@ -21,10 +21,11 @@ describe('UNIT: Directive', function () {
 
         it('should return array with the string if it\'s a single clause', function () {
             var e,
-                test1 = 'fsef',
-                test2 = 'ffsef + "fse&fsef"',
+                test1 = 'fsef(a, b, c)',
+                test2 = 'ffsef + "fse,fsef"',
                 test3 = 'fsef + \'fesfsfe\'',
-                test4 = '\"fsefsf&fsef&fsef\"'
+                test4 = '\"fsefsf,fsef,fsef\"',
+                test5 = '(a, b)'
 
             e = Directive.split(test1)
             assert.strictEqual(e.length, 1)
@@ -41,31 +42,35 @@ describe('UNIT: Directive', function () {
             e = Directive.split(test4)
             assert.strictEqual(e.length, 1)
             assert.strictEqual(e[0], test4)
+
+            e = Directive.split(test5)
+            assert.strictEqual(e.length, 1)
+            assert.strictEqual(e[0], test5)
         })
 
         it('should return split multiple clauses correctly', function () {
             var e,
-                test1 = ['fsef && ggg', 'fsf:fsefsef'],
-                test2 = ['asf-fsef:fsf', '"efs&sefsf"'],
-                test3 = ['\'fsef&sef\'', 'fse:fsf'],
-                test4 = ['\"fsef&fsef\"', 'sefsef\'fesfsf']
+                test1 = ['(fse,fggg)', 'fsf:({a:1,b:2}, [1,2,3])'],
+                test2 = ['asf-fsef:fsf', '"efs,s(e,f)sf"'],
+                test3 = ['\'fsef,sef\'', 'fse:fsf(a,b,c)'],
+                test4 = ['\"fsef,fsef\"', 'sefsef\'fesfsf']
 
-            e = Directive.split(test1.join('&'))
-            assert.strictEqual(e.length, 2, 'expression with &&')
+            e = Directive.split(test1.join(','))
+            assert.strictEqual(e.length, 2, 'expression with {}, [] inside ()')
             assert.strictEqual(e[0], test1[0])
             assert.strictEqual(e[1], test1[1])
 
-            e = Directive.split(test2.join('&'))
+            e = Directive.split(test2.join(','))
             assert.strictEqual(e.length, 2, 'expression with double quotes')
             assert.strictEqual(e[0], test2[0])
             assert.strictEqual(e[1], test2[1])
 
-            e = Directive.split(test3.join('&'))
+            e = Directive.split(test3.join(','))
             assert.strictEqual(e.length, 2, 'expression with single quotes')
             assert.strictEqual(e[0], test3[0])
             assert.strictEqual(e[1], test3[1])
 
-            e = Directive.split(test4.join('&'))
+            e = Directive.split(test4.join(','))
             assert.strictEqual(e.length, 2, 'expression with escaped quotes')
             assert.strictEqual(e[0], test4[0])
             assert.strictEqual(e[1], test4[1])