total5 0.0.11 → 0.0.12

package/builders.js

@@ -1110,11 +1110,12 @@ RESTBuilderResponse.prototype.cookie = function(name) {
 
 function parseactioncache(obj, meta) {
 
-	var query = meta.query;
-	var user = meta.user;
-	var params = meta.params;
-	var language = meta.language;
-	var search = meta.id || meta.key;
+	let query = meta.query;
+	let user = meta.user;
+	let params = meta.params;
+	let input = meta.input;
+	let language = meta.language;
+	let search = meta.id || meta.key;
 
 	if (typeof(user) === 'string')
 		user = user.split(',').trim();
@@ -1128,19 +1129,31 @@ function parseactioncache(obj, meta) {
 	else if (params === true) {
 		if (obj.jsparams) {
 			params = [];
-			for (var key in obj.jsparams.properties)
+			for (let key in obj.jsparams.properties)
 				params.push(key);
 		} else
 			params = null;
 	} else
 		params = null;
 
+	if (typeof(input) === 'string')
+		input = input.split(',').trim();
+	else if (input === true) {
+		if (obj.jsinput) {
+			input = [];
+			for (let key in obj.jsinput.properties)
+				input.push(key);
+		} else
+			input = null;
+	} else
+		input = null;
+
 	if (typeof(query) === 'string')
 		query = query.split(',').trim();
 	else if (query === true) {
 		if (obj.jsquery) {
 			query = [];
-			for (var key in obj.jsquery.properties)
+			for (let key in obj.jsquery.properties)
 				query.push(key);
 		} else
 			query = null;
@@ -1150,9 +1163,9 @@ function parseactioncache(obj, meta) {
 	return function($, value) {
 		if (value === undefined) {
 
-			var key = 'action|' + (search ? (search + '|') : '') + $.ID;
-			var sum = '';
-			var tmp;
+			let key = 'action|' + (search ? (search + '|') : '') + $.ID;
+			let sum = '';
+			let tmp;
 
 			if (language)
 				sum += ($.language || '');
@@ -1173,6 +1186,14 @@ function parseactioncache(obj, meta) {
 				}
 			}
 
+			if (input) {
+				for (let key of input) {
+					tmp = $.model[key];
+					if (tmp)
+						sum += '|' + tmp;
+				}
+			}
+
 			if (user && $.user) {
 				for (let key of user) {
 					tmp = $.user[key];
@@ -1415,7 +1436,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) {

package/changelog.txt

@@ -1,3 +1,12 @@
+========================
+0.0.12
+========================
+
+- fixed `$.status()` calling
+- added support for schemas in the `QueryBuilder.autoquery(..., '@schema_name')` method
+- extended `NEWACTION` cache with additional `input` key
+- updated download procedure in the `COMPONENTANTOR()` method
+
 ========================
 0.0.11
 ========================

package/index.js

@@ -36,7 +36,7 @@ global.DEF = {};
 
 	F.id = '';
 	F.clusterid = '';
-	F.is5 = F.version = 5011;
+	F.is5 = F.version = 5012;
 	F.isBundle = false;
 	F.isLoaded = false;
 	F.version_header = '5';
@@ -1402,18 +1402,18 @@ F.componentator = function(name, components, removeprev = true, attrs = '') {
 
 	F.$events.componentator && F.emit('componentator', meta);
 
-	var url = 'https://componentator.com/download.js?id=' + meta.components + (attrs ? ('&' + attrs) : '');
-	var nameid = meta.name.slug();
-	var relative = 'ui-' + (removeprev ? (nameid + '-') : '') + url.makeid() + '.min.js';
-	var filename = F.path.public(relative);
+	let url = 'https://componentator.com/download/';
+	let nameid = meta.name.slug();
+	let relative = 'ui-' + (removeprev ? (nameid + '-') : '') + meta.components.makeid() + '.min.js';
+	let filename = F.path.public(relative);
 
 	F.repo[meta.name] = '/' + relative;
 
 	if (removeprev) {
 		F.Fs.readdir(F.path.public(), function(err, files) {
 
-			var rem = [];
-			for (var m of files) {
+			let rem = [];
+			for (let m of files) {
 				if (m !== relative && m.indexOf('ui-' + nameid + '-') !== -1)
 					rem.push(F.path.public(m));
 			}
@@ -1425,8 +1425,22 @@ F.componentator = function(name, components, removeprev = true, attrs = '') {
 	}
 
 	F.Fs.lstat(filename, function(err) {
-		if (err)
-			F.download(url, filename, err => err ? F.error(err, 'COMPONENTATOR') : null);
+		if (err) {
+
+			let opt = {};
+			opt.method = 'POST';
+			opt.body = 'id=' + meta.components + (attrs ? ('&' + attrs) : '');
+			opt.type = 'urlencoded';
+			opt.url = url;
+			opt.callback = function(err, response) {
+				if (err)
+					Total.error(err, 'COMPONENTATOR()');
+				else
+					Total.Fs.writeFile(filename, response.body, 'utf8', ERROR('COMPONENTATOR()'))
+			};
+
+			REQUEST(opt);
+		}
 	});
 
 };
@@ -1446,7 +1460,7 @@ F.errorcallback = function(err) {
 
 F.merge = function(url) {
 
-	var arr = [];
+	let arr = [];
 
 	for (let i = 1; i < arguments.length; i++) {
 		let links = arguments[i];

package/package.json

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

package/querybuilder.js

@@ -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;