Fix view engine parsing (problem with VUE.js markup).

petersirka · petersirka · commit e4b574da541f · 2016-12-12T20:25:30.000+01:00
diff --git a/internal.js b/internal.js
@@ -2265,18 +2265,22 @@ function view_find_command(content, index) {
 
 		if (c !== '}')
 			continue;
-		else {
-			if (count > 0) {
-				count--;
-				continue;
-			}
+		else if (count > 0) {
+			count--;
+			continue;
 		}
 
+		var command = content.substring(index + 2, i).trim();
+
+		// @{{ SKIP }}
+		if (command[0] === '{')
+			return view_find_command(content, index + 1);
+
 		return {
 			beg: index,
 			end: i,
 			line: view_line_counter(content.substr(0, index)),
-			command: content.substring(index + 2, i).trim()
+			command: command
 		};
 	}
 
diff --git a/test/controllers/default.js b/test/controllers/default.js
@@ -525,6 +525,7 @@ function viewViews() {
 	//self.framework.stop();
 	//return;
 
+	assert.ok(output.contains('#<div>@{{ vue_command }}</div>#'), name + 'VUE command');
 	assert.ok(output.contains('#mobilefalse#'), name + 'mobile');
 	assert.ok(output.contains('<count>10</count>'), name + 'inline helper');
 	assert.ok(output.contains('<count>40</count><next>40</next>'), name + 'inline helper + condition');
diff --git a/test/test-framework-debug.js b/test/test-framework-debug.js
@@ -479,7 +479,7 @@ function test_routing(next) {
 		utils.request(url + 'schema-filter/', ['post'], 'EMPTY', function(error, data, code, headers) {
 			if (error)
 				throw error;
-			assert(data === '[{"name":"age","error":"The field \\"age\\" is required.","path":"filter.age"}]', 'schema filter');
+			assert(data === '[{"name":"age","error":"The field \\"age\\" is invalid.","path":"filter.age"}]', 'schema filter');
 			complete();
 		});
 	});
diff --git a/test/test-framework-release.js b/test/test-framework-release.js
@@ -479,7 +479,7 @@ function test_routing(next) {
 		utils.request(url + 'schema-filter/', ['post'], 'EMPTY', function(error, data, code, headers) {
 			if (error)
 				throw error;
-			assert(data === '[{"name":"age","error":"The field \\"age\\" is required.","path":"filter.age"}]', 'schema filter');
+			assert(data === '[{"name":"age","error":"The field \\"age\\" is invalid.","path":"filter.age"}]', 'schema filter');
 			complete();
 		});
 	});
diff --git a/test/views/a.html b/test/views/a.html
@@ -9,6 +9,7 @@
     @{endif}
 @{end}
 
+#<div>@{{ vue_command }}</div>#
 @{name(10)}
 @{meta('TITLE')}
 @{dns('//fonts.googleapis.com')}
