total5 0.0.10 → 0.0.12-1

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;
 
@@ -1405,7 +1415,8 @@ ActionCaller.prototype.exec = function() {
 	} else
 		$.payload = payload;
 
-	$.status = self.options.status;
+	if (self.options.status)
+		$.status = self.options.status;
 
 	if (action.middleware) {
 		action.middleware.wait(function(name, next) {
@@ -1489,7 +1500,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,24 @@
+========================
+0.0.12
+========================
+
+- fixed `$.status()` calling
+- added support for schemas in the `QueryBuilder.autoquery(..., '@schema_name')` method
+
+========================
+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 = 5012;
 	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.12-1",
   "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;
@@ -1095,23 +1095,36 @@ QBP.schema = function(value) {
 
 QBP.autoquery = function(query, schema, defsort, maxlimit) {
 
-	var t = this;
-	var skipped;
-	var key = 'QBF' + schema;
-	var allowed = F.temporary.querybuilders[key];
-	var tmp;
+	let t = this;
+	let skipped;
+	let key = 'QBF' + schema;
+	let allowed = F.temporary.querybuilders[key];
+	let tmp;
 
 	if (!allowed) {
-		var obj = {};
-		var arr = [];
-		var filter = [];
-		var localized = {};
+
+		let obj = {};
+		let arr = [];
+		let filter = [];
+		let localized = {};
+
+		if (schema.charAt(0) === '@') {
+			let jschema = F.jsonschemas[schema.substring(1)];
+			if (jschema) {
+				schema = '';
+				for (let key in jschema.properties) {
+					let prop = jschema.properties[key];
+					schema = (schema ? schema + ',' : '') + key + ':' + (prop.type === 'array' ? '[string]' : prop.type);
+				}
+			}
+		}
+
 		tmp = schema.split(',').trim();
 
-		for (var i = 0; i < tmp.length; i++) {
-			var k = tmp[i].split(':').trim();
+		for (let field of tmp) {
+			let k = field.split(':').trim();
 			arr.push(k[0]);
-			var cleaned = k[0].replace(/§/g, '');
+			let cleaned = k[0].replace(/§/g, '');
 			obj[cleaned] = 1;
 			localized[cleaned] = k[0];
 			filter.push({ name: cleaned, type: (k[1] || 'string').toLowerCase() });
@@ -1120,15 +1133,15 @@ QBP.autoquery = function(query, schema, defsort, maxlimit) {
 		allowed = F.temporary.querybuilders[key] = { keys: arr, meta: obj, filter: filter, fields: localized };
 	}
 
-	var fields = query.fields;
-	var fieldscount = 0;
+	let fields = query.fields;
+	let fieldscount = 0;
 
 	if (!t.options.fields)
 		t.options.fields = [];
 
 	if (fields) {
 		fields = fields.replace(REG_FIELDS_CLEANER, '').split(',');
-		for (var field of fields) {
+		for (let field of fields) {
 			if (allowed && allowed.meta[field]) {
 				t.options.fields.push(field);
 				fieldscount++;
@@ -1137,23 +1150,23 @@ QBP.autoquery = function(query, schema, defsort, maxlimit) {
 	}
 
 	if (!fieldscount) {
-		for (var field of allowed.keys)
+		for (let field of allowed.keys)
 			t.options.fields.push(field);
 	}
 
 	if (allowed && allowed.filter) {
-		for (var item of allowed.filter)
+		for (let item of allowed.filter)
 			t.gridfilter(item.name, query, item.type, allowed.fields[item.name]);
 	}
 
 	if (query.sort) {
 
 		tmp = query.sort.split(',');
-		var count = 0;
+		let count = 0;
 
-		for (var item of tmp) {
-			var index = item.lastIndexOf('_');
-			var name = index === - 1 ? item : item.substring(0, index);
+		for (let item of tmp) {
+			let index = item.lastIndexOf('_');
+			let name = index === - 1 ? item : item.substring(0, index);
 
 			if ((skipped && skipped[name]) || (!allowed.meta[name]))
 				continue;
@@ -1192,9 +1205,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;