Add new aliases @{R.something} and @{M.something}.

petersirka · petersirka · commit 7faa4cc5decf · 2017-11-23T15:24:38.000+01:00
diff --git a/changes.txt b/changes.txt
@@ -1,6 +1,7 @@
 ======= 2.9.1
 
 - added: `controller.throw409()`, `req.throw409()`
+- added: new view aliases: `@{R.something}` for `repository` and `@{M.something}` for `model`
 
 - updated: `ErrorBuilder.push()` supports `.push(name, status_code)` or `.push(name, error, status_code)`
 
diff --git a/internal.js b/internal.js
@@ -1951,7 +1951,7 @@ function view_parse(content, minify, filename, controller) {
 	if (RELEASE)
 		builder = builder.replace(/(\+\$EMPTY\+)/g, '+').replace(/(\$output=\$EMPTY\+)/g, '$output=').replace(/(\$output\+=\$EMPTY\+)/g, '$output+=').replace(/(\}\$output\+=\$EMPTY)/g, '}').replace(/(\{\$output\+=\$EMPTY;)/g, '{').replace(/(\+\$EMPTY\+)/g, '+').replace(/(>'\+'<)/g, '><').replace(/'\+'/g, '');
 
-	var fn = '(function(self,repository,model,session,query,body,url,global,helpers,user,config,functions,index,output,cookie,files,mobile,settings){var get=query;var post=body;var theme=this.themeName;var language=this.language;var sitemap=this.repository.$sitemap;var cookie=function(name){return controller.req.cookie(name);};' + (functions.length ? functions.join('') + ';' : '') + 'var controller=self;' + builder + ';return $output;})';
+	var fn = '(function(self,repository,model,session,query,body,url,global,helpers,user,config,functions,index,output,cookie,files,mobile,settings){var get=query;var post=body;var R=this.repository;var M=model;var theme=this.themeName;var language=this.language;var sitemap=this.repository.$sitemap;var cookie=function(name){return self.req.cookie(name)};' + (functions.length ? functions.join('') + ';' : '') + 'var controller=self;' + builder + ';return $output;})';
 	try {
 		fn = eval(fn);
 	} catch (e) {
@@ -2029,6 +2029,8 @@ function view_prepare(command, dynamicCommand, functions, controller) {
 		case '!isomorphic':
 			return '$STRING(' + command + ')';
 
+		case 'M':
+		case 'R':
 		case 'model':
 		case 'repository':
 		case 'get':
@@ -2039,12 +2041,10 @@ function view_prepare(command, dynamicCommand, functions, controller) {
 		case 'user':
 		case 'config':
 		case 'controller':
-			return view_is_assign(command) ? 'self.$set(' + command + ')' : '$STRING(' + command + ').encode()';
+			return view_is_assign(command) ? ('self.$set(' + command + ')') : ('$STRING(' + command + ').encode()');
 
 		case 'body':
-			if (view_is_assign(command))
-				return 'self.$set(' + command + ')';
-			return command.lastIndexOf('.') === -1 ? 'output' : '$STRING(' + command + ').encode()';
+			return view_is_assign(command) ? ('self.$set(' + command + ')') : command.lastIndexOf('.') === -1 ? 'output' : ('$STRING(' + command + ').encode()');
 
 		case 'files':
 		case 'mobile':
diff --git a/test/views/a.html b/test/views/a.html
@@ -20,7 +20,7 @@
 @{prev('/a/1/')}
 @{canonical('/a/a-b-c/')}
 @{head('//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js')}
-#tag-encode@{repository.tag}#
+#tag-encode@{R.tag}#
 #tag-raw@{!repository.tag}#
 #helper-fn-@{helper('fn', 'A')}#
 #readonly@{readonly(true)}#
@@ -29,7 +29,7 @@
 #disabled@{disabled(true)}#
 #resource@{resource('name')}#
 #options-empty@{options(repository.optionsEmpty, 'B')}#
-#options@{options(repository.options, 'C', 'k', 'v')}#
+#options@{options(R.options, 'C', 'k', 'v')}#
 #view-toggle@{viewToggle(false, 'b')}#
 #view@{view('current/b', 'model')}#
 #routejs-@{routeScript('p.js')}#
