total5 0.0.10 → 0.0.11

package/api.js

@@ -140,7 +140,7 @@ APICallProto.error = APICallProto.err = function(err, reverse) {
 	return this;
 };
 
-APICallProto.callback = function($) {
+APICallProto.callback = APICallProto.pipe = function($) {
 	var t = this;
 	t.$callback = typeof($) === 'function' ? $ : $.callback();
 	return t;

package/builders.js

@@ -117,7 +117,17 @@ Options.prototype.transform = function(name, value, callback) {
 };
 
 Options.prototype.action = function(schema, payload) {
-	return F.action(schema, payload, this.controller);
+	let t = this;
+	let action = F.action(schema, payload, this.controller);
+	if (!t.controller) {
+		if (t.user)
+			action.options.user = t.user;
+		if (t.query)
+			action.options.query = t.query;
+		if (t.params)
+			action.options.params = t.params;
+	}
+	return action;
 };
 
 Options.prototype.promisify = function(fn, a, b, c) {
@@ -231,7 +241,7 @@ Options.prototype.successful = function(callback) {
 	};
 };
 
-Options.prototype.callback = function(value) {
+Options.prototype.callback = Options.prototype.pipe = function(value) {
 
 	var self = this;
 
@@ -1489,7 +1499,7 @@ ActionCaller.prototype.done = function($, fn) {
 	return this;
 };
 
-ActionCaller.prototype.callback = function(value) {
+ActionCaller.prototype.callback = ActionCaller.prototype.pipe = function(value) {
 	this.options.callback = value;
 	return this;
 };

package/changelog.txt

@@ -1,3 +1,17 @@
+========================
+0.0.11
+========================
+
+- fixed `controller` and `user` argument in the `TRANSFORM()` method
+- fixed assigning `user`, `query` and `params` properties in the `$.action()` method
+- fixed nullable `value` argument in the `querybuilder.permit()`
+- fixed parsing `CONF.version`
+- added `QueryBuilder.pipe()` method as alias to `QueryBuilder.callback()`
+- added `API.pipe()` method as alias to `API.callback()`
+- added `Action.pipe()` method as alias to `Action.callback()`
+- added `RESTBuilder.pipe()` method as alias to `RESTBuilder.callback()`
+- added support for localization in the `TEMPLATE()` method
+
 ========================
 0.0.10
 ========================

package/index.js

@@ -36,7 +36,7 @@ global.DEF = {};
 
 	F.id = '';
 	F.clusterid = '';
-	F.is5 = F.version = 5010;
+	F.is5 = F.version = 5011;
 	F.isBundle = false;
 	F.isLoaded = false;
 	F.version_header = '5';
@@ -608,7 +608,7 @@ F.loadconfig = function(value) {
 		F.Http.globalAgent.maxSockets = 9999;
 
 	if (!F.config.$httpetag)
-		F.config.$httpetag = F.config.version.replace(/\.|\s/g, '');
+		F.config.$httpetag = (F.config.version || '').toString().replace(/\.|\s/g, '');
 
 	if (smtp)
 		F.config.smtp = smtp;
@@ -1976,11 +1976,15 @@ function transform(items, opt, index) {
 F.transform = function(name, value, callback, controller) {
 
 	if (typeof(callback) !== 'function')
-		return new Promise((resolve, reject) => F.transform(name, value, (err, response) => err ? reject(err) : resolve(response), controller));
+		return new Promise((resolve, reject) => F.transform(name, value, (err, response) => err ? reject(err) : resolve(response), callback || controller));
 
 	var items = F.transformations[name];
 	if (items) {
 		let opt = new F.TBuilders.Options(controller, new F.TBuilders.ErrorBuilder());
+
+		if (controller)
+			opt.user = controller.user;
+
 		opt.value = value;
 		opt.$callback = callback;
 		transform(items, opt, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "total5",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "Total.js framework v5",
   "main": "index.js",
   "directories": {

package/querybuilder.js

@@ -153,7 +153,7 @@ CTP.next = function(t) {
 
 };
 
-CTP.callback = function($) {
+CTP.callback = CTP.pipe = function($) {
 	var t = this;
 	t.$callback = typeof($) === 'function' ? $ : $.callback();
 	return t;
@@ -499,7 +499,7 @@ QBP.set = function(name) {
 	return this;
 };
 
-QBP.callback = function($) {
+QBP.callback = QBP.pipe = function($) {
 	var t = this;
 	t.main.callback = typeof($) === 'function' ? $ : $.callback();
 	return t;
@@ -1192,9 +1192,11 @@ QBP.permit = function(name, type, value, userid, required) {
 	var types = type.split('');
 	var arr = [];
 
-	for (let m of value) {
-		for (let n of types)
-			arr.push(n + m);
+	if (value && value.length) {
+		for (let m of value) {
+			for (let n of types)
+				arr.push(n + m);
+		}
 	}
 
 	t.options.checksum += (t.options.checksum ? ' ' : '') + 'permit' + type + arr.join('');

package/templates.js

@@ -6,7 +6,7 @@ exports.render = function(body, model, $) {
 	return new Promise(function(resolve, reject) {
 
 		var cache = F.temporary.templates;
-		var id = 'Ttemplate' + HASH(body);
+		var id = 'Ttemplate' + HASH(body) + ($ ? $.language : '');
 		var data = cache[id];
 
 		if (data) {
@@ -45,7 +45,7 @@ exports.render = function(body, model, $) {
 						return;
 					}
 
-					data = parse(response.body);
+					data = parse(response.body, $);
 					cache[id] = data;
 
 					try {
@@ -83,7 +83,7 @@ exports.render = function(body, model, $) {
 						return;
 					}
 
-					data = parse(response.toString('utf8'));
+					data = parse(response.toString('utf8'), $);
 
 					if (!DEBUG)
 						cache[id] = data;
@@ -102,7 +102,7 @@ exports.render = function(body, model, $) {
 			}
 		}
 
-		data = cache[id] = parse(body);
+		data = cache[id] = parse(body, $);
 
 		try {
 			resolve(data.template({ value: model || data.model }, null, data.helpers));
@@ -115,7 +115,10 @@ exports.render = function(body, model, $) {
 	});
 };
 
-function parse(body) {
+function parse(body, $) {
+
+	if ($ && $.language)
+		body = F.translate($.language, body);
 
 	var helpers = {};
 	var model = EMPTYOBJECT;