total5 0.0.13-7 → 0.0.13-9

package/builders.js

@@ -136,7 +136,6 @@ Options.prototype.promisify = function(fn, a, b, c) {
 
 		var callback = function(err, response) {
 			if (err)
-
 				$.invalid(err);
 			else
 				resolve(response);
@@ -352,13 +351,18 @@ ErrorBuilder.prototype = {
 	}
 };
 
+ErrorBuilder.prototype.throw = function() {
+	this.$throw = true;
+	return this;
+};
+
 ErrorBuilder.prototype.reject = function(language) {
-	var self = this;
-	return new Error(self.toString(language, ''));
+	return new Error(this.toString(language, ''));
 };
 
 ErrorBuilder.prototype.push = function(err, path, index) {
-	var self = this;
+
+	let self = this;
 
 	if (!err)
 		err = 401;
@@ -368,24 +372,36 @@ ErrorBuilder.prototype.push = function(err, path, index) {
 		self.items.push({ error: F.TUtils.httpstatus(err) });
 	} else
 		self.items.push({ error: err.toString(), path: path, index: index });
+
+	if (self.$throw) {
+		let errors = self.output();
+		throw new Error(errors[0].error);
+	}
+
 	return self;
 };
 
 ErrorBuilder.prototype.push2 = function(name, path, index) {
-	var self = this;
+	let self = this;
 	self.items.push({ name: self.prefix + name, error: '@', path: path, index: index });
+
+	if (self.$throw) {
+		let errors = self.output();
+		throw new Error(errors[0].error);
+	}
+
 	return self;
 };
 
 ErrorBuilder.assign = function(arr) {
-	var builder = new ErrorBuilder();
+	let builder = new ErrorBuilder();
 	if (arr instanceof Array) {
-		for (var i = 0; i < arr.length; i++) {
+		for (let i = 0; i < arr.length; i++) {
 			if (arr[i].error)
 				builder.items.push(arr[i]);
 		}
 	} else {
-		var type = typeof(arr);
+		let type = typeof(arr);
 		if (type === 'number' || type === 'string')
 			builder.push(arr);
 		else if (arr instanceof Error)
@@ -395,7 +411,7 @@ ErrorBuilder.assign = function(arr) {
 };
 
 ErrorBuilder.prototype.replace = function(search, value) {
-	var self = this;
+	let self = this;
 	if (!self.replacer)
 		self.replacer = {};
 	self.replacer[search] = value;
@@ -404,16 +420,30 @@ ErrorBuilder.prototype.replace = function(search, value) {
 
 ErrorBuilder.prototype.output = function(language = 'default') {
 
-	var self = this;
-	var output = [];
+	let self = this;
+	let output = [];
 
 	for (let m of self.items) {
 
 		let err = m.error;
 
-		if (err == '@')
-			err = F.resource(language, 'T' + (err === '@' ? m.name : err.substring(1)).hash(true).toString(36)) || 'The field "' + m.name + '" is invalid';
-		else if (err[0] === '@')
+		if (err == '@') {
+
+			let key = err === '@' ? m.name : err.substring(1);
+			let is = false;
+
+			if (self.dictionary) {
+				let tmp = self.dictionary[key];
+				if (tmp) {
+					err = tmp[0] === '@(' ? F.translate(language, tmp) : tmp;
+					is = true;
+				}
+			}
+
+			if (!is)
+				err = F.resource(language, (err === '@' ? key : ('T' + key).hash(true).toString(36))) || 'The field "' + key + '" is invalid';
+
+		} else if (err[0] === '@')
 			err = F.translate(language, err);
 
 		if (self.replacer) {
@@ -546,6 +576,12 @@ RESTP.debug = function() {
 	return this;
 };
 
+RESTP.base64 = function() {
+	var self = this;
+	self.$base64 = true;;
+	return self;
+};
+
 RESTP.unixsocket = function(socket, path) {
 	var self = this;
 	self.options.unixsocket = { socket: socket, path: path };
@@ -624,11 +660,6 @@ RESTP.auth = function(user, password) {
 	return this;
 };
 
-RESTP.convert = function(convert) {
-	this.$convert = convert;
-	return this;
-};
-
 RESTP.nodnscache = function() {
 	this.options.resolve = false;
 	return this;
@@ -741,14 +772,11 @@ RESTP.accept = function(ext) {
 	return this;
 };
 
-RESTP.xml = function(data, replace) {
+RESTP.xml = function(data) {
 
 	if (this.options.method === 'GET')
 		this.options.method = 'POST';
 
-	if (replace)
-		this.$replace = true;
-
 	this.options.type = 'xml';
 	data && this.raw(data, this.options.type);
 	return this;
@@ -843,24 +871,6 @@ RESTP.cache = function(expire) {
 	return this;
 };
 
-RESTP.set = function(name, value) {
-	if (!this.options.body)
-		this.options.body = {};
-	if (typeof(name) !== 'object') {
-		this.options.body[name] = value;
-	} else {
-		for (var key in name)
-			this.options.body[key] = name[key];
-	}
-	return this;
-};
-
-RESTP.rem = function(name) {
-	if (this.options.body && this.options.body[name])
-		this.options.body[name] = undefined;
-	return this;
-};
-
 RESTP.progress = function(fn) {
 	this.options.onprogress = fn;
 	return this;
@@ -873,6 +883,12 @@ RESTP.stream = function(callback) {
 	return self;
 };
 
+RESTP.convert = function(schema) {
+	let self = this;
+	self.$jsonschema = schema.toJSONSchema();
+	return self;
+};
+
 function streamresponse(builder, callback) {
 	builder.exec(callback);
 }
@@ -953,7 +969,7 @@ RESTP.exec = function(callback) {
 
 function restbuilder_callback(err, response) {
 
-	var self = response.builder;
+	let self = response.builder;
 
 	if (self.options.custom) {
 		if (self.$resolve) {
@@ -972,30 +988,33 @@ function restbuilder_callback(err, response) {
 		return;
 	}
 
-	var callback = self.$callback;
-	var key = self.$cachekey;
-	var type = err ? '' : response.headers['content-type'] || '';
-	var output = new RESTBuilderResponse();
+	let callback = self.$callback;
+	let key = self.$cachekey;
+	let type = err ? '' : response.headers['content-type'] || '';
+	let output = new RESTBuilderResponse();
 
 	if (self.options.cook && self.options.cookies)
 		output.cookies = self.options.cookies;
 
 	if (type) {
-		var index = type.lastIndexOf(';');
+		let index = type.lastIndexOf(';');
 		if (index !== -1)
 			type = type.substring(0, index).trim();
 	}
 
-	var ishead = response.status === 204;
-	if (ishead) {
+	let ishead = response.status === 204;
+
+	if (ishead)
 		output.value = response.status < 400;
-	} else if (self.$plain || self.$noparse) {
+	else if (self.$plain || self.$noparse)
 		output.value = response.body;
-	} else {
+	else if (self.$base64)
+		output.value = response.body instanceof Buffer ? response.body.toString('base64') : Buffer.from(response.body, 'utf8').toString('base64');
+	else {
 		switch (type.toLowerCase()) {
 			case 'text/xml':
 			case 'application/xml':
-				output.value = response.body ? response.body.parseXML(self.$replace ? true : false) : {};
+				output.value = response.body ? response.body.parseXML2() : null;
 				break;
 			case 'application/x-www-form-urlencoded':
 				output.value = response.body ? DEF.parsers.urlencoded(response.body) : {};
@@ -1026,7 +1045,7 @@ function restbuilder_callback(err, response) {
 	if (self.$debug)
 		console.log('--DEBUG-- RESTBuilder: ' + response.status + ' ' + self.options.method + ' ' + QUERIFY(self.options.url || (self.options.unixsocket + self.options.path), self.options.query), '|', 'Error:', err, '|', 'Response:', response.body);
 
-	var val = output.value;
+	let val = output.value;
 
 	if (!err && output.status >= 400) {
 		err = output.status;
@@ -1085,22 +1104,22 @@ function RESTBuilderResponse() {}
 
 RESTBuilderResponse.prototype.cookie = function(name) {
 
-	var self = this;
+	let self = this;
 	if (self.cookies)
 		return F.TUtils.decodeURIComponent(self.cookies[name] || '');
 
 	self.cookies = {};
 
-	var cookies = self.headers['set-cookie'];
+	let cookies = self.headers['set-cookie'];
 	if (!cookies)
 		return '';
 
 	if (typeof(cookies) === 'string')
 		cookies = [cookies];
 
-	for (var i = 0; i < cookies.length; i++) {
-		var line = cookies[i].split(';', 1)[0];
-		var index = line.indexOf('=');
+	for (let i = 0; i < cookies.length; i++) {
+		let line = cookies[i].split(';', 1)[0];
+		let index = line.indexOf('=');
 		if (index !== -1)
 			self.cookies[line.substring(0, index)] = line.substring(index + 1);
 	}

package/changelog.txt

@@ -12,6 +12,18 @@
 - extended `Total.readfile(path, [type])` by adding a new type `datauri`
 - fixed returing collections from the `HTMLParser.find()` method
 - added `extend:String` option in `NEWACTION()` method
+- added `FILECACHE(id, expire, callback, maker, encoding)` method
+- fixed linking errors with the resource files
+- added `RESTBuilder.?.base64()` method which returns the response in BASE64 format
+- added support for custom errors in the Total.js Inline JSON Schemas, example: `id:UID // Invalid identifier, ...`
+- added `ErrorBuilder.throw()` method which throws an error when an error is pushed
+- fixed `HTMLParser.?.find()` method (fixed results)
+- extended `QueryBuilder.gridfilter()` by adding `=EXACT_VALUE` or `=EXACT_VALUE1,EXACT_VALUE2`
+- IMPORTANT: updated `RESTBuilder` XML response, now it returns `HTMLParser` output
+- fixed removing of multiple spaces in the `String.toName()` method
+- fixed a problem with case-sensitive characters in the route parameters
+- fixed markdown parser
+- added missing ViewEngine `@{meta(...)}` method
 
 ========================
 0.0.12

package/filestorage.js

@@ -113,7 +113,7 @@ FP.save = FP.insert = function(id, name, filename, custom, callback, expire, hea
 
 FP._save = function(id, name, filename, callback, custom, expire, headers) {
 
-	var self = this;
+	let self = this;
 
 	if (self.pause) {
 		setTimeout(self.retrysave, 500, id, name, filename, callback, custom, expire, headers);
@@ -125,17 +125,17 @@ FP._save = function(id, name, filename, callback, custom, expire, headers) {
 		name = F.TUtils.getName(name);
 	}
 
-	var directory = self.makedirectory(id);
-	var filenameto = F.Path.join(directory, id + '.file');
+	let directory = self.makedirectory(id);
+	let filenameto = F.Path.join(directory, id + '.file');
 
-	var index = name.lastIndexOf('/');
+	let index = name.lastIndexOf('/');
 	if (index !== -1)
 		name = name.substring(index + 1);
 
 	if (self.cache[directory]) {
+		// Check URL address
 		if (typeof(filename) === 'string' && filename[0] === 'h' && filename[1] === 't' && filename[7] === '/') {
-			// URL address
-			var opt = {};
+			let opt = {};
 			opt.url = filename;
 			opt.custom = true;
 			opt.headers = headers;
@@ -164,7 +164,7 @@ FP._save = function(id, name, filename, callback, custom, expire, headers) {
 				self.cache[directory] = 1;
 				if (typeof(filename) === 'string' && filename[0] === 'h' && filename[1] === 't' && filename[7] === '/') {
 					// URL address
-					var opt = {};
+					let opt = {};
 					opt.url = filename;
 					opt.custom = true;
 					opt.headers = headers;

package/global.js

@@ -322,4 +322,29 @@ global.TotalAPI = function(name, model, callback) {
 	let obj = API('TAPI', name, model);
 	callback && obj.callback(callback);
 	return obj;
+};
+
+global.FILECACHE = function(id, expire, callback, maker, encoding = 'json') {
+
+	let filename = PATH.temp('filecache_' + (id + '').hash(true).toString(36) + '.cache');
+	let isjson = encoding === 'json';
+
+	F.Fs.lstat(filename, function(err, stat) {
+		let time = stat ? stat.mtime > stat.ctime ? stat.mtime : stat.ctime : null;
+		if (err || time.add(expire) < NOW) {
+			maker(function(err, response, load) {
+				if (!err)
+					F.Fs.writeFile(filename, isjson ? response instanceof String ? response : JSON.stringify(response) : response, NOOP);
+				if (load || load == null)
+					callback(err, response);
+			}, id);
+		} else {
+			F.Fs.readFile(filename, isjson ? 'utf8' : encoding, function(err, response) {
+				if (err)
+					callback(err);
+				else
+					callback(null, isjson ? response.parseJSON(true) : response);
+			});
+		}
+	});
 };

package/htmlparser.js

@@ -19,7 +19,7 @@ HTMLElement.prototype = {
 
 function parseRule(selector, output) {
 
-	var rule = {};
+	let rule = {};
 
 	rule.attrs = [];
 	rule.output = output || [];
@@ -28,7 +28,7 @@ function parseRule(selector, output) {
 	// div div[name="Peter Sirka"]
 	// div > div[name="Peter Sirka"]
 
-	var cache = [];
+	let cache = [];
 
 	selector = selector.replace(/\[.*?\]/gi, text => '[' + (cache.push(text) - 1) + ']').replace(/(\s)?>(\s)?/, '>').replace(/\s{2}/g, '').trim();
 
@@ -37,9 +37,9 @@ function parseRule(selector, output) {
 	if (rule.notravelse)
 		selector = selector.substring(1);
 
-	var m = selector.match(/>|\s/);
+	let m = selector.match(/>|\s/);
 	if (m) {
-		var nested = selector.substring(m.index).trim().replace(/\[\d+\]/g, text => cache[+text.substring(1, text.length - 1)]);
+		let nested = selector.substring(m.index).trim().replace(/\[\d+\]/g, text => cache[+text.substring(1, text.length - 1)]);
 		rule.nested = parseRule(nested, rule.output);
 		selector = selector.substring(0, m.index).trim();
 	}
@@ -47,20 +47,20 @@ function parseRule(selector, output) {
 	selector = selector.replace(/\[\d+\]/, text => cache[+text.substring(1, text.length - 1)]);
 
 	// attribute search
-	match = selector.match(/\[.*?\]/i);
+	let match = selector.match(/\[.*?\]/i);
 	if (match) {
-		for (var m of match) {
-			var index = m.indexOf('=');
+		for (let m of match) {
+			let index = m.indexOf('=');
 			rule.attrs.push({ id: m.substring(1, index).trim(), value: m.substring(index + 2, m.length - 2).trim() });
 		}
 		selector = selector.replace(match, '');
 	}
 
 	// #id or .class
-	var match = selector.match(/[#|.][a-z-_0-9]+/i);
+	match = selector.match(/[#|.][a-z-_0-9]+/i);
 	if (match) {
-		for (var m of match) {
-			var val = m.substring(1);
+		for (let m of match) {
+			let val = m.substring(1);
 			rule.attrs.push({ id: m[0] === '#' ? 'id' : 'class', value: val });
 		}
 		selector = selector.replace(match, '');
@@ -84,12 +84,12 @@ function parseRule(selector, output) {
 
 HTMLElement.prototype.browse = function(fn, reverse) {
 
-	var self = this;
+	let self = this;
 
-	var browse = function(children) {
-		for (var node of children) {
+	let browse = function(children) {
+		for (let node of children) {
 			if (node && node.tagName) {
-				var a = fn(node);
+				let a = fn(node);
 				if (a !== true)
 					browse(reverse ? [node.parentNode] : node.children);
 			}
@@ -106,49 +106,49 @@ HTMLElement.prototype.browse = function(fn, reverse) {
 function extendarr(output) {
 
 	output.aclass = function(cls) {
-		for (var item of this)
+		for (let item of this)
 			item.aclass(cls);
 		return this;
 	};
 
 	output.rclass = function(cls) {
-		for (var item of this)
+		for (let item of this)
 			item.rclass(cls);
 		return this;
 	};
 
 	output.tclass = function(cls, value) {
-		for (var item of this)
+		for (let item of this)
 			item.tclass(cls, value);
 		return this;
 	};
 
 	output.attr = function(key, value) {
-		for (var item of this)
+		for (let item of this)
 			item.attr(key, value);
 		return this;
 	};
 
 	output.attrd = function(key, value) {
-		for (var item of this)
+		for (let item of this)
 			item.attrd(key, value);
 		return this;
 	};
 
 	output.find = function(selector) {
-		var arr = [];
-		for (var item of this) {
-			var result = item.find(selector);
+		let arr = [];
+		for (let item of this) {
+			let result = item.find(selector);
 			if (result.length)
-				arr.push(result);
+				arr.push.apply(arr, result);
 		}
 		extendarr(arr);
 		return arr;
 	};
 
 	output.toString = output.html = function(formatted) {
-		var builder = [];
-		for (var item of this)
+		let builder = [];
+		for (let item of this)
 			builder.push(item.toString(formatted));
 		return builder.join(formatted ? '\n' : '');
 	};
@@ -163,7 +163,7 @@ function extendarr(output) {
 function compare(rule, node) {
 
 	if (rule.prefix === '*') {
-		var tagName = node.tagName;
+		let tagName = node.tagName;
 		if (node.prefix)
 			tagName = tagName.substring(node.prefix.length);
 		if (tagName !== rule.tagName)
@@ -176,10 +176,10 @@ function compare(rule, node) {
 	}
 
 	if (rule.attrs.length) {
-		for (var attr of rule.attrs) {
+		for (let attr of rule.attrs) {
 			switch (attr.id) {
 				case 'class':
-					var tmp = node.attrs[attr.id];
+					let tmp = node.attrs[attr.id];
 					if (tmp) {
 						tmp = tmp.split(' ');
 						if (!tmp.includes(attr.value))
@@ -270,7 +270,7 @@ HTMLElement.prototype.attrd = function(name, value) {
 
 HTMLElement.prototype.parsecache = function() {
 
-	var self = this;
+	let self = this;
 	if (self.cache)
 		return self;
 
@@ -278,20 +278,20 @@ HTMLElement.prototype.parsecache = function() {
 	self.cache.css = {};
 	self.cache.cls = {};
 
-	var tmp = self.attrs.class;
-	var arr;
+	let tmp = self.attrs.class;
+	let arr;
 
 	if (tmp) {
 		arr = tmp.split(' ');
-		for (var c of arr)
+		for (let c of arr)
 			self.cache.cls[c] = 1;
 	}
 
-	var tmp = self.attrs.style;
+	tmp = self.attrs.style;
 	if (tmp) {
 		arr = tmp.split(';');
-		for (var c of arr) {
-			var a = c.split(':');
+		for (let c of arr) {
+			let a = c.split(':');
 			self.cache.css[a[0]] = a[1];
 		}
 	}
@@ -300,12 +300,12 @@ HTMLElement.prototype.parsecache = function() {
 };
 
 HTMLElement.prototype.stringifycache = function() {
-	var self = this;
+	let self = this;
 	self.attrs.class = Object.keys(self.cache.cls).join(' ');
 
-	var tmp = [];
+	let tmp = [];
 
-	for (var key in self.cache.css)
+	for (let key in self.cache.css)
 		self.cache.css[key] && tmp.push(key + ':' + self.cache.css[key]);
 
 	if (tmp.length)
@@ -318,7 +318,7 @@ HTMLElement.prototype.stringifycache = function() {
 
 HTMLElement.prototype.attr = function(name, value) {
 
-	var self = this;
+	let self = this;
 
 	if (value === undefined)
 		return self.attrs[name];
@@ -332,10 +332,10 @@ HTMLElement.prototype.attr = function(name, value) {
 };
 
 HTMLElement.prototype.aclass = function(cls) {
-	var self = this;
+	let self = this;
 	self.parsecache();
-	var arr = cls.split(/\s|,/);
-	for (var m of arr)
+	let arr = cls.split(/\s|,/);
+	for (let m of arr)
 		self.cache.cls[m] = 1;
 	self.stringifycache();
 	return self;
@@ -343,16 +343,16 @@ HTMLElement.prototype.aclass = function(cls) {
 };
 
 HTMLElement.prototype.hclass = function(cls) {
-	var self = this;
+	let self = this;
 	self.parsecache();
 	return self.cache.cls[cls] === 1;
 };
 
 HTMLElement.prototype.tclass = function(cls, value) {
-	var self = this;
+	let self = this;
 	self.parsecache();
-	var arr = cls.split(/\s|,/);
-	for (var m of arr) {
+	let arr = cls.split(/\s|,/);
+	for (let m of arr) {
 		if (self.cache.cls[m]) {
 			if (!value)
 				delete self.cache.cls[m];
@@ -366,11 +366,11 @@ HTMLElement.prototype.tclass = function(cls, value) {
 };
 
 HTMLElement.prototype.rclass = function(cls) {
-	var self = this;
+	let self = this;
 	self.parsecache();
 
-	var arr = cls.split(/\s|,/);
-	for (var m of arr)
+	let arr = cls.split(/\s|,/);
+	for (let m of arr)
 		delete self.cache.cls[m];
 
 	self.stringifycache();
@@ -378,10 +378,10 @@ HTMLElement.prototype.rclass = function(cls) {
 };
 
 HTMLElement.prototype.css = function(key, value) {
-	var self = this;
+	let self = this;
 	self.parsecache();
 	if (typeof(key) === 'object') {
-		for (var k of Object.keys(key)) {
+		for (let k of Object.keys(key)) {
 			value = key[k];
 			if (value)
 				self.cache.css[k] = value;
@@ -399,9 +399,9 @@ HTMLElement.prototype.css = function(key, value) {
 };
 
 HTMLElement.prototype.remove = function() {
-	var self = this;
+	let self = this;
 	if (self.parentNode) {
-		var index = self.parentNode.children.indexOf(self);
+		let index = self.parentNode.children.indexOf(self);
 		if (index !== -1)
 			self.parentNode.children.splice(index, 1);
 	}
@@ -410,10 +410,10 @@ HTMLElement.prototype.remove = function() {
 
 HTMLElement.prototype.append = function(str) {
 
-	var self = this;
-	var dom = parseHTML(str, null, null, self.xml);
+	let self = this;
+	let dom = parseHTML(str, null, null, self.xml);
 
-	for (var item of dom.children)
+	for (let item of dom.children)
 		self.children.push(item);
 
 	return dom.children.length === 1 ? dom.children[0] : dom.children;
@@ -421,10 +421,10 @@ HTMLElement.prototype.append = function(str) {
 
 HTMLElement.prototype.prepend = function(str) {
 
-	var self = this;
-	var dom = parseHTML(str, null, null, self.xml);
+	let self = this;
+	let dom = parseHTML(str, null, null, self.xml);
 
-	for (var item of dom.children)
+	for (let item of dom.children)
 		self.children.unshift(item);
 
 	return dom;
@@ -436,19 +436,19 @@ HTMLElement.prototype.text = function() {
 
 HTMLElement.prototype.toString = HTMLElement.prototype.html = function(formatted) {
 
-	var self = this;
-	var builder = [];
+	let self = this;
+	let builder = [];
 
-	var browse = function(children, level) {
+	let browse = function(children, level) {
 
-		for (var item of children) {
+		for (let item of children) {
 
-			var indent = formatted && level ? ''.padLeft(level, '\t') : '';
-			var tag = item.tagName.toLowerCase();
-			var attrs = [];
+			let indent = formatted && level ? ''.padLeft(level, '\t') : '';
+			let tag = item.tagName.toLowerCase();
+			let attrs = [];
 
-			for (var key in item.attrs) {
-				var val = item.attrs[key];
+			for (let key in item.attrs) {
+				let val = item.attrs[key];
 				if (!val && (key === 'class' || key.substring(0, 5) === 'data-' || key === 'id'))
 					continue;
 				attrs.push(key + (val ? ('="' + (val || '') + '"') : ''));
@@ -480,17 +480,17 @@ HTMLElement.prototype.toString = HTMLElement.prototype.html = function(formatted
 };
 
 function removeComments(html) {
-	var tagBeg = '<!--';
-	var tagEnd = '-->';
-	var beg = html.indexOf(tagBeg);
-	var end = 0;
+	let tagBeg = '<!--';
+	let tagEnd = '-->';
+	let beg = html.indexOf(tagBeg);
+	let end = 0;
 	while (beg !== -1) {
 		end = html.indexOf(tagEnd, beg + 4);
 
 		if (end === -1)
 			break;
 
-		var comment = html.substring(beg, end + 3);
+		let comment = html.substring(beg, end + 3);
 		html = html.replaceAll(comment, '');
 		beg = html.indexOf(tagBeg, beg);
 	}
@@ -500,8 +500,8 @@ function removeComments(html) {
 
 function parseHTML(html, trim, onerror, isxml) {
 
-	var makeText = function(parent, str) {
-		var obj = new HTMLElement();
+	let makeText = function(parent, str) {
+		let obj = new HTMLElement();
 		obj.xml = isxml;
 		obj.tagName = 'TEXT';
 		obj.children = [];
@@ -511,14 +511,14 @@ function parseHTML(html, trim, onerror, isxml) {
 		return obj;
 	};
 
-	var parseAttrs = function(str) {
-		var attrs = str.match(/[a-z-0-9A-Z\:_-]+(=("|').*?("|'))?/g);
-		var obj = {};
+	let parseAttrs = function(str) {
+		let attrs = str.match(/[a-z-0-9A-Z\:_-]+(=("|').*?("|'))?/g);
+		let obj = {};
 		if (attrs) {
-			for (var m of attrs) {
+			for (let m of attrs) {
 				m = m.trim();
-				var index = m.indexOf('=');
-				var key, val;
+				let index = m.indexOf('=');
+				let key, val;
 				key = (index === -1 ? m : m.substring(0, index)).trim();
 				val = index === -1 ? '' : m.substring(m.indexOf('"', index) + 1, m.lastIndexOf('"')).trim();
 				obj[key] = val;
@@ -527,13 +527,13 @@ function parseHTML(html, trim, onerror, isxml) {
 		return obj;
 	};
 
-	var parseElements = function(str, parent) {
+	let parseElements = function(str, parent) {
 
-		var counter = 0;
-		var count = 0;
-		var beg = str.indexOf('<');
-		var end = -1;
-		var tmp;
+		let counter = 0;
+		let count = 0;
+		let beg = str.indexOf('<');
+		let end = -1;
+		let tmp;
 
 		if (beg !== -1)
 			end = str.indexOf('>', beg + 1);
@@ -558,8 +558,8 @@ function parseHTML(html, trim, onerror, isxml) {
 				parent.children.push(makeText(parent, tmp));
 		}
 
-		var node = str.substring(beg + 1, end);
-		var dom = new HTMLElement();
+		let node = str.substring(beg + 1, end);
+		let dom = new HTMLElement();
 
 		dom.xml = isxml;
 
@@ -572,8 +572,8 @@ function parseHTML(html, trim, onerror, isxml) {
 			dom.unpair = true;
 		}
 
-		var tag = node;
-		var index = -1;
+		let tag = node;
+		let index = -1;
 
 		for (let i = 0; i < tag.length; i++) {
 			let c = tag[i];
@@ -624,10 +624,10 @@ function parseHTML(html, trim, onerror, isxml) {
 			}
 		}
 
-		var pos = -1;
-		var tagBeg = '<' + dom.raw;
-		var tagEnd = '</' + dom.raw + '>';
-		var unpair = false;
+		let pos = -1;
+		let tagBeg = '<' + dom.raw;
+		let tagEnd = '</' + dom.raw + '>';
+		let unpair = false;
 
 		// Tries to parse the content of the "dom.raw" element
 		while (true) {
@@ -694,7 +694,7 @@ function parseHTML(html, trim, onerror, isxml) {
 
 		}
 
-		var inner = str.substring(0, pos - tagEnd.length);
+		let inner = str.substring(0, pos - tagEnd.length);
 		if (inner.indexOf('<') === -1 || (!isxml && (/\<(script|style|template)/).test(tag))) {
 			if (trim)
 				inner = inner.trim();
@@ -719,7 +719,7 @@ function parseHTML(html, trim, onerror, isxml) {
 
 	html = removeComments(html);
 
-	var dom = new HTMLElement();
+	let dom = new HTMLElement();
 	dom.xml = isxml;
 
 	while (html)

package/markdown.js

@@ -480,6 +480,17 @@ String.prototype.markdown = function(opt, nested) {
 		lines[i] = lines[i].replace(REG_ENCODETAGS, ENCODE);
 
 		if (!lines[i]) {
+
+			if (opt.emptynewline !== false && !lines[i - 1])
+				builder.push('<br />');
+
+			if (table) {
+				table = null;
+				if (opt.tables !== false)
+					builder.push('</tbody></table>');
+			}
+
+			closeul();
 			builder.push('');
 			continue;
 		}

package/package.json

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

package/querybuilder.js

@@ -929,13 +929,13 @@ QBP.gridfields = function(fields, allowed) {
 // Grid filtering
 QBP.gridfilter = function(name, obj, type, key) {
 
-	var builder = this;
-	var value = obj[name] || '';
+	let builder = this;
+	let value = obj[name] || '';
 
 	if (!value || typeof(value) !== 'string')
 		return builder;
 
-	var arr, val;
+	let arr, val;
 
 	if (!key)
 		key = name;
@@ -966,13 +966,13 @@ QBP.gridfilter = function(name, obj, type, key) {
 	}
 
 	// Between
-	var index = value.indexOf(' - ');
+	let index = value.indexOf(' - ');
 	if (index !== -1) {
 
 		arr = value.split(' - ');
 
-		for (var i = 0, length = arr.length; i < length; i++) {
-			var item = arr[i].trim();
+		for (let i = 0, length = arr.length; i < length; i++) {
+			let item = arr[i].trim();
 			arr[i] = convert(item, type);
 		}
 
@@ -991,28 +991,35 @@ QBP.gridfilter = function(name, obj, type, key) {
 	index = value.indexOf(',');
 	if (index !== -1) {
 
-		var arr = value.split(',');
+		let exact = value[0] === '=';
+		let arr = (exact ? value.substring(1) : value).split(',');
 
 		if (type === undefined || type === String) {
-			builder.or(function() {
-				for (var i = 0; i < arr.length; i++) {
-					var item = arr[i].trim();
-					builder.search(key, item);
-				}
-			});
+			if (exact) {
+				for (let i = 0; i < arr.length; i++)
+					arr[i] = arr[i].trim();
+				builder.in(key, arr);
+			} else {
+				builder.or(function() {
+					for (let i = 0; i < arr.length; i++) {
+						let item = arr[i].trim();
+						builder.search(key, item);
+					}
+				});
+			}
 			return builder;
 		}
 
-		for (var i = 0; i < arr.length; i++)
+		for (let i = 0; i < arr.length; i++)
 			arr[i] = convert(arr[i], type);
 
 		return builder.in(key, arr);
 	}
 
 	if (type === undefined || type === String)
-		return value[0] === '!' ? builder.where(key, '=', value.substring(1)) : builder.search(key, value);
+		return value[0] === '=' ? builder.where(key, '=', value.substring(1)) : builder.search(key, value);
 
-	var comparer = '=';
+	let comparer = '=';
 
 	switch (value[0]) {
 		case '>':

package/routing.js

@@ -150,7 +150,6 @@ function Route(url, action, size) {
 		}
 		t.size = size || 0;
 	}
-
 	t.middleware = [];
 
 	index = t.url.indexOf('*');
@@ -566,24 +565,25 @@ exports.lookup = function(ctrl, auth = 0, skip = false) {
 
 exports.split = function(url, lowercase) {
 
-	if (lowercase)
-		url = url.toLowerCase();
-
 	if (url[0] === '/')
 		url = url.substring(1);
 
 	if (url[url.length - 1] === '/')
 		url = url.substring(0, url.length - 1);
 
-	var count = 0;
-	var end = 0;
-	var arr = [];
+	let count = 0;
+	let end = 0;
+	let arr = [];
+	let tmp;
 
-	for (var i = 0; i < url.length; i++) {
+	for (let i = 0; i < url.length; i++) {
 		switch (url[i]) {
 			case '/':
 				if (count === 0) {
-					arr.push(url.substring(end + (arr.length ? 1 : 0), i));
+					tmp = url.substring(end + (arr.length ? 1 : 0), i);
+					if (lowercase && tmp[0] !== '{')
+						tmp = tmp.toLowerCase();
+					arr.push(tmp);
 					end = i;
 				}
 				break;
@@ -596,8 +596,12 @@ exports.split = function(url, lowercase) {
 		}
 	}
 
-	if (!count)
-		arr.push(url.substring(end + (arr.length ? 1 : 0), url.length));
+	if (!count) {
+		tmp = url.substring(end + (arr.length ? 1 : 0), url.length);
+		if (lowercase && tmp[0] !== '{')
+			tmp = tmp.toLowerCase();
+		arr.push(tmp);
+	}
 
 	if (arr.length === 1 && !arr[0])
 		arr[0] = '/';

package/utils.js

@@ -2160,16 +2160,22 @@ DP.parseDate = function() {
 
 SP.toName = function() {
 
-	var a = '';
-	var p = 0;
-	var space = false;
-	var val = this;
+	let a = '';
+	let p = 0;
+	let space = false;
+	let val = this;
+	let spaces = 0;
+
+	for (let i = 0; i < val.length; i++) {
+
+		let c = val.charCodeAt(i);
 
-	for (var i = 0; i < val.length; i++) {
-		var c = val.charCodeAt(i);
 		if ((c < 65 || (c > 90 && c < 97) || (c > 122 && c < 128)) && c !== 32)
 			continue;
 
+		if (c === 32 && p === 32)
+			continue;
+
 		if (a && p !== 32) {
 
 			if (c === 32) {
@@ -5879,8 +5885,8 @@ exports.connect = function(opt, callback) {
 
 SP.toJSONSchema = SP.parseSchema = function(name, url) {
 
-	var obj = {};
-	var p = (url || F.config.url || 'https://schemas.totaljs.com');
+	let obj = {};
+	let p = (url || F.config.url || 'https://schemas.totaljs.com');
 
 	if (p[p.length - 1] !== '/')
 		p += '/';
@@ -5890,8 +5896,8 @@ SP.toJSONSchema = SP.parseSchema = function(name, url) {
 	obj.type = 'object';
 	obj.properties = {};
 
-	var str = this;
-	var nestedtypes = [];
+	let str = this;
+	let nestedtypes = [];
 
 	str = str.replace(/\[.*?\]/g, function(text) {
 		if (text.substring(1, 2) === '@')
@@ -5905,17 +5911,34 @@ SP.toJSONSchema = SP.parseSchema = function(name, url) {
 		return '{#' + (nestedtypes.push(text.substring(1, text.length - 1)) - 1) + '}';
 	});
 
-	var prop = str.split(/,|\n/);
-	var required = [];
+	let prop = str.split(/,|\n/);
+	let required = [];
+	let errors = null;
+
+	for (let i = 0; i < prop.length; i++) {
 
-	for (var i = 0; i < prop.length; i++) {
+		let line = prop[i].trim();
+		let errindex = line.indexOf('//');
+		let err = null;
+
+		if (errindex != -1) {
+			if (!errors)
+				errors = {};
+			err = line.substring(errindex + 2).trim();
+			line = line.substring(0, errindex).trim();
+		}
 
-		var arr = prop[i].split(':').trim();
-		var tmp = null;
+		let arr = line.split(':').trim();
+		let tmp = null;
 
 		if (arr[0][0] === '@') {
-			let ext = F.jsonschemas[arr[0].substring(1)];
+			tmp = arr[0].substring(1);
+			let ext = F.jsonschemas[tmp];
 			if (ext) {
+
+				if (err)
+					errors[tmp] = err;
+
 				for (let m of ext.required)
 					required.push(m);
 				for (let m in ext.properties)
@@ -5930,15 +5953,18 @@ SP.toJSONSchema = SP.parseSchema = function(name, url) {
 			required.push(arr[0]);
 		}
 
-		var type = (arr[1] || 'string').trim();
-		// var type = typename.toLowerCase().trim();
-		var size = 0;
-		var isarr = type[0] === '[';
+		if (err)
+			errors[arr[0]] = err;
+
+		let type = (arr[1] || 'string').trim();
+		// let type = typename.toLowerCase().trim();
+		let size = 0;
+		let isarr = type[0] === '[';
 		if (isarr)
 			type = type.substring(1, type.length - 1);
 
-		var nestedschema = '';
-		var isenum = type[0] === '{';
+		let nestedschema = '';
+		let isenum = type[0] === '{';
 
 		if (isenum) {
 			tmp = type.substring(2, type.length - 1);
@@ -5954,7 +5980,7 @@ SP.toJSONSchema = SP.parseSchema = function(name, url) {
 			}
 		}
 
-		var index = type.indexOf('(');
+		let index = type.indexOf('(');
 		if (index !== -1) {
 			size = +type.substring(index + 1, type.length - 1).trim();
 			type = type.substring(0, index);
@@ -5989,7 +6015,7 @@ SP.toJSONSchema = SP.parseSchema = function(name, url) {
 			type = 'object';
 		}
 
-		var ltype = type.toLowerCase();
+		let ltype = type.toLowerCase();
 
 		switch (ltype) {
 			case 'string2':
@@ -6100,7 +6126,14 @@ SP.toJSONSchema = SP.parseSchema = function(name, url) {
 	if (required.length)
 		obj.required = required;
 
+	obj.errors = errors;
 	obj.transform = exports.jsonschematransform;
+	obj.validate = function(value, partial, path) {
+		let err = new F.TBuilders.ErrorBuilder();
+		err.throw();
+		let output = this.transform(value, partial, err, path);
+		return output.response;
+	};
 
 	if (name)
 		F.jsonschemas[name] = obj;
@@ -6110,17 +6143,20 @@ SP.toJSONSchema = SP.parseSchema = function(name, url) {
 
 exports.jsonschematransform = function(value, partial, error, path) {
 
-	var self = this;
+	let self = this;
 
 	if (!error)
 		error = new ErrorBuilder();
 
-	var response = F.TJSONSchema.transform(self, error, value, false, path, partial);
+	if (self.errors)
+		error.dictionary = self.errors;
+
+	let response = F.TJSONSchema.transform(self, error, value, false, path, partial);
 	return { error: error.items.length ? error : null, response: response };
 };
 
 exports.set = function(obj, path, value) {
-	var cachekey = 'uset' + path;
+	let cachekey = 'uset' + path;
 
 	if (F.temporary.utils[cachekey])
 		return F.temporary.utils[cachekey](obj, value);
@@ -6128,27 +6164,26 @@ exports.set = function(obj, path, value) {
 	if ((/__proto__|constructor|prototype|eval|function|\*|\+|;|\s|\(|\)|!/).test(path))
 		return value;
 
-	var arr = parsepath(path);
-	var builder = [];
+	let arr = parsepath(path);
+	let builder = [];
 
-	for (var i = 0; i < arr.length - 1; i++) {
-		var type = arr[i + 1] ? (REG_ISARR.test(arr[i + 1]) ? '[]' : '{}') : '{}';
-		var p = 'w' + (arr[i][0] === '[' ? '' : '.') + arr[i];
+	for (let i = 0; i < arr.length - 1; i++) {
+		let type = arr[i + 1] ? (REG_ISARR.test(arr[i + 1]) ? '[]' : '{}') : '{}';
+		let p = 'w' + (arr[i][0] === '[' ? '' : '.') + arr[i];
 		builder.push('if(typeof(' + p + ')!==\'object\'||' + p + '==null)' + p + '=' + type + ';');
 	}
 
-	var v = arr[arr.length - 1];
-	var ispush = v.lastIndexOf('[]') !== -1;
-	var a = builder.join(';') + ';var v=typeof(a)===\'function\'?a(F.TUtils.get(b)):a;w' + (v[0] === '[' ? '' : '.') + (ispush ? v.replace(REG_REPLACEARR, '.push(v)') : (v + '=v')) + ';return v';
-
-	var fn = new Function('w', 'a', 'b', a);
+	let v = arr[arr.length - 1];
+	let ispush = v.lastIndexOf('[]') !== -1;
+	let a = builder.join(';') + ';var v=typeof(a)===\'function\'?a(F.TUtils.get(b)):a;w' + (v[0] === '[' ? '' : '.') + (ispush ? v.replace(REG_REPLACEARR, '.push(v)') : (v + '=v')) + ';return v';
+	let fn = new Function('w', 'a', 'b', a);
 	F.temporary.utils[cachekey] = fn;
 	return fn(obj, value, path);
 };
 
 exports.get = function(obj, path) {
 
-	var cachekey = 'uget' + path;
+	let cachekey = 'uget' + path;
 
 	if (F.temporary.utils[cachekey])
 		return F.temporary.utils[cachekey](obj);
@@ -6156,14 +6191,14 @@ exports.get = function(obj, path) {
 	if ((/__proto__|constructor|prototype|eval|function|\*|\+|;|\s|\(|\)|!/).test(path))
 		return;
 
-	var arr = parsepath(path);
-	var builder = [];
+	let arr = parsepath(path);
+	let builder = [];
 
-	for (var i = 0, length = arr.length - 1; i < length; i++)
+	for (let i = 0, length = arr.length - 1; i < length; i++)
 		builder.push('if(!w' + (!arr[i] || arr[i][0] === '[' ? '' : '.') + arr[i] + ')return');
 
-	var v = arr[arr.length - 1];
-	var fn = (new Function('w', builder.join(';') + ';return w' + (v[0] === '[' ? '' : '.') + v));
+	let v = arr[arr.length - 1];
+	let fn = (new Function('w', builder.join(';') + ';return w' + (v[0] === '[' ? '' : '.') + v));
 	F.temporary.utils[cachekey] = fn;
 	return fn(obj);
 };

package/viewengine.js

@@ -116,7 +116,7 @@ exports.compile = function(name, content, debug = true) {
 
 	while (command) {
 
-		if (!isCookie && command.command.indexOf('cookie') !== -1)
+		if (!isCookie && command.command.includes('cookie'))
 			isCookie = true;
 
 		if (old) {
@@ -186,7 +186,7 @@ exports.compile = function(name, content, debug = true) {
 
 			counter++;
 
-			if (cmd.indexOf('foreach var ') !== -1)
+			if (cmd.includes('foreach var '))
 				cmd = cmd.replace(' var ', SPACE);
 
 			newCommand = (cmd.substring(8, cmd.indexOf(SPACE, 8)) || '').trim();
@@ -378,7 +378,7 @@ function prepare(command, dcommand, functions) {
 			return 'self.hostname';
 
 		case 'href':
-			return command.indexOf('(') === -1 ? 'self.href()' : 'self.' + command;
+			return command.includes('(') ? ('self.' + command) : 'self.href()';
 
 		case 'url':
 			return 'self.' + command;
@@ -387,7 +387,10 @@ function prepare(command, dcommand, functions) {
 		case 'description':
 		case 'keywords':
 		case 'author':
-			return command.indexOf('(') === -1 ? '((repository[\'' + command + '\'] || \'\') + \'\').safehtml()' : 'self.' + command;
+			return command.includes('(') ? ('self.' + command) : '((repository[\'' + command + '\'] || \'\') + \'\').safehtml()';
+
+		case 'meta':
+			return command.includes('(') ? ('self.' + command) : ('self.' + command + '()');
 
 		case 'title2':
 			return 'self.' + command;
@@ -399,10 +402,10 @@ function prepare(command, dcommand, functions) {
 			return '(repository[\'' + command.substring(1) + '\'] || \'\')';
 
 		case 'place':
-			return command.indexOf('(') === -1 ? '(repository[\'' + command + '\'] || \'\')' : 'self.' + command;
+			return command.includes('(') ? ('self.' + command) : ('(repository[\'' + command + '\'] || \'\')');
 
 		case 'import':
-			return 'self.' + command + (command.indexOf('(') === -1 ? '()' : '');
+			return 'self.' + command + (command.includes('(') ? '' : '()');
 
 		case 'index':
 			return '(' + command + ')';
@@ -424,7 +427,7 @@ function prepare(command, dcommand, functions) {
 			return '(new Date()' + command.substring(3) + ')';
 
 		default:
-			return F.def.helpers[name] ? ('F.def.helpers.' + insertcall(command)) : ('self.safehtml(' + (functions.indexOf(name) === -1 ? command[0] === '!' ? command.substring(1) + ')' : command + ', 1)' : command + ')'));
+			return F.def.helpers[name] ? ('F.def.helpers.' + insertcall(command)) : ('self.safehtml(' + (!functions.includes(name) ? command[0] === '!' ? command.substring(1) + ')' : command + ', 1)' : command + ')'));
 	}
 }
 
@@ -668,6 +671,28 @@ View.prototype.keywords = function(value) {
 	return '';
 };
 
+View.prototype.meta = function() {
+
+	let self = this;
+
+	if (!arguments.length)
+		return makehtmlmeta(self);
+
+	if (arguments[0])
+		self.repository.title = arguments[0].encode();
+
+	if (arguments[1])
+		self.repository.description = arguments[1].encode();
+
+	if (arguments[2] && arguments[2].length)
+		self.repository.keywords = (arguments[2] instanceof Array ? arguments[2].join(', ') : arguments[2]).encode();
+
+	if (arguments[3])
+		self.repository.image = arguments[3];
+
+	return '';
+};
+
 // @{href({ key1: 1, key2: 2 })}
 // @{href('key', 'value')}
 // @{href({ key1: 1, key2: 2 })}
@@ -784,12 +809,13 @@ function makehtmlmeta(self) {
 		builder += '<meta name="description" content="' + repo.description.safehtml() + '" />';
 
 	if (repo.keywords)
-		builder += '<meta name="description" content="' + repo.keywords.safehtml() + '" />';
+		builder += '<meta name="keywords" content="' + repo.keywords.safehtml() + '" />';
 
 	if (repo.image) {
 		let tmp = repo.image.substring(0, 6);
-		let src = tmp === 'http:/' || tmp === 'https:' || tmp.substring(0, 2) === '//' ? repo.image : ((self?.controller.host || '') + repo.image);
-		builder += '<meta property="og:image" content="' + src + '" /><meta name="twitter:image" content="' + src + '" />';
+		let src = tmp === 'http:/' || tmp === 'https:' || tmp.substring(0, 2) === '//' ? repo.image : self.controller ? self.controller.hostname(repo.image[0] === '/' ? repo.image : ('/' + repo.image)) : '';
+		if (src)
+			builder += '<meta property="og:image" content="' + src + '" /><meta name="twitter:image" content="' + src + '" />';
 	}
 
 	return builder;
@@ -827,7 +853,7 @@ View.prototype.import = function() {
 					continue;
 				}
 
-				if (m.indexOf('+') === -1) {
+				if (!m.includes('+')) {
 					let absolute = m[0] === '/';
 					let key = absolute ? m : ('/' + m);
 					if (REG_CHECKCSS.test(m)) {
@@ -923,4 +949,4 @@ View.prototype.render = function(name, model, ispartial = false) {
 	return content;
 };
 
-exports.View = View;
+exports.View = View;