total5 0.0.8-1 → 0.0.8

package/builders.js

@@ -47,6 +47,11 @@ Options.prototype = {
 		this.payload = value;
 	},
 
+	get hostname() {
+		let ctrl = this.controller;
+		return ctrl ? ((ctrl.protocol || 'https') + '://' + ctrl.headers.host) : null;
+	},
+
 	get url() {
 		return (this.controller ? this.controller.url : '') || '';
 	},
@@ -121,6 +126,7 @@ Options.prototype.promisify = function(fn, a, b, c) {
 
 		var callback = function(err, response) {
 			if (err)
+
 				$.invalid(err);
 			else
 				resolve(response);
@@ -941,9 +947,12 @@ function restbuilder_callback(err, response) {
 
 	if (self.options.custom) {
 		if (self.$resolve) {
-			if (err)
-				self.$.invalid(err);
-			else
+			if (err) {
+				if (self.$)
+					self.$.invalid(err);
+				else
+					self.$reject(err);
+			} else
 				self.$resolve(response);
 			self.$ = null;
 			self.$reject = null;
@@ -1042,8 +1051,12 @@ function restbuilder_callback(err, response) {
 
 	if (self.$resolve) {
 
-		if (err)
-			self.$.invalid(err);
+		if (err) {
+			if (self.$)
+				self.$.invalid(err);
+			else
+				self.$reject(err);
+		}
 		else
 			self.$resolve(val);
 
@@ -1339,7 +1352,7 @@ ActionCaller.prototype.exec = function() {
 		}
 	}
 
-	if (action.sa) {
+	if (action.sa || action.su) {
 		if (!$.user || (!$.user.sa && !$.user.su)) {
 			$.invalid(401);
 			return;

package/changelog.txt

@@ -10,6 +10,11 @@
 - added a better support for `*:tagname` prefixes in HTMLParser
 - fixed context in the components
 - fixed URL downloading templates in `TEMPLATE()` method
+- fixed parsing of unpaired elements in HTMLParser
+- added support for `log` extension in static file processing
+- fixed selectors in the HTMLParser
+- added `$.hostname {String}` to the `SchemaOptions`
+- fixed `RESTBuilder.promise()`
 
 ========================
 0.0.7

package/htmlparser.js

@@ -24,23 +24,23 @@ function parseRule(selector, output) {
 	rule.attrs = [];
 	rule.output = output || [];
 
+	// > div
 	// div div[name="Peter Sirka"]
 	// div > div[name="Peter Sirka"]
 
-	// for (var c of selector) {
-	// 	if (c === '>')
-	// 		console.log(c);
-	// }
-
 	var cache = [];
 
-	selector = selector.replace(/\[.*?\]/gi, text => '[' + (cache.push(text) - 1) + ']').replace(/(\s)?>(\s)?/, '>').replace(/\s{2}/g, '');
+	selector = selector.replace(/\[.*?\]/gi, text => '[' + (cache.push(text) - 1) + ']').replace(/(\s)?>(\s)?/, '>').replace(/\s{2}/g, '').trim();
+
+	rule.notravelse = selector[0] === '>';
+
+	if (rule.notravelse)
+		selector = selector.substring(1);
 
 	var m = selector.match(/>|\s/);
 	if (m) {
-		var nested = selector.substring(m.index + 1).trim().replace(/\[\d+\]/g, text => cache[+text.substring(1, text.length - 1)]);
+		var nested = selector.substring(m.index).trim().replace(/\[\d+\]/g, text => cache[+text.substring(1, text.length - 1)]);
 		rule.nested = parseRule(nested, rule.output);
-		rule.direct = m[0] === '>';
 		selector = selector.substring(0, m.index).trim();
 	}
 
@@ -156,6 +156,48 @@ function extendarr(output) {
 	return output;
 }
 
+function compare(rule, node) {
+
+	if (rule.prefix === '*') {
+		var tagName = node.tagName;
+		if (node.prefix)
+			tagName = tagName.substring(node.prefix.length);
+		if (tagName !== rule.tagName)
+			return false;
+	} else {
+		if (rule.tagName && rule.tagName !== node.tagName)
+			return false;
+		if (rule.prefix && rule.prefix !== node.prefix)
+			return false;
+	}
+
+	if (rule.attrs.length) {
+		for (var attr of rule.attrs) {
+			switch (attr.id) {
+				case 'class':
+					var tmp = node.attrs[attr.id];
+					if (tmp) {
+						tmp = tmp.split(' ');
+						if (!tmp.includes(attr.value))
+							return false;
+					} else
+						return false;
+					break;
+				default:
+					if (attr.value) {
+						if (node.attrs[attr.id] !== attr.value)
+							return false;
+					} else if (node.attrs[attr.id] === undefined)
+						return false;
+
+					break;
+			}
+		}
+	}
+
+	return true;
+}
+
 HTMLElement.prototype.find = function(selector, reverse) {
 
 	var self = this;
@@ -166,81 +208,33 @@ HTMLElement.prototype.find = function(selector, reverse) {
 	for (var sel of selectors)
 		rules.push(parseRule(sel.trim()));
 
-	var browse = function(rule, children, parent) {
+	var browse = function(rule, children) {
 
-		for (var node of children) {
+		for (let node of children) {
 
 			if (!node.tagName)
 				continue;
 
-			var skip = false;
-
-			if (rule.prefix === '*') {
-
-				var tagName = node.tagName;
-				if (node.prefix)
-					tagName = tagName.substring(node.prefix.length);
-
-				if (tagName !== rule.tagName)
-					skip = true;
-
-			} else {
-				if (rule.tagName && rule.tagName !== node.tagName)
-					skip = true;
-				if (rule.prefix && rule.prefix !== node.prefix)
-					skip = true;
-			}
-
-			if (rule.attrs.length && !skip) {
-				for (var attr of rule.attrs) {
-					switch (attr.id) {
-
-						case 'class':
-							var tmp = node.attrs[attr.id];
-							if (tmp) {
-								tmp = tmp.split(' ');
-								if (!tmp.includes(attr.value))
-									skip = true;
-							} else
-								skip = true;
-							break;
-
-						default:
-							if (attr.value) {
-								if (node.attrs[attr.id] !== attr.value)
-									skip = true;
-							} else if (node.attrs[attr.id] === undefined)
-								skip = true;
-
-							break;
-					}
+			let children = reverse ? [node.parentNode] : node.children;
 
-					if (skip)
-						break;
-				}
+			if (!compare(rule, node)) {
+				if (!rule.notravelse)
+					browse(rule, children);
+				continue;
 			}
 
-			var next = ((reverse && node.parentNode) || (!reverse && node.children.length));
-
-			if (parent) {
-				if (skip && parent.direct)
-					continue;
-			}
+			// types complexType attribute
+			// types > complexType attribute
+			// types complexType > attribute
 
 			if (rule.nested) {
+				browse(rule.nested, children);
+			} else {
 
-				if (!skip && next)
-					browse(rule.nested, reverse ? [node.parentNode] : node.children, rule);
-
-				// Again same
-				if (!parent)
-					browse(rule, reverse ? [node.parentNode] : node.children);
+				rule.output.push(node);
 
-			} else {
-				if (!skip)
-					rule.output.push(node);
-				if (next)
-					browse(rule, reverse ? [node.parentNode] : node.children);
+				if (!rule.notravelse)
+					browse(rule, children);
 			}
 		}
 	};
@@ -249,7 +243,9 @@ HTMLElement.prototype.find = function(selector, reverse) {
 		return output;
 
 	for (var rule of rules) {
+
 		browse(rule, reverse ? [self.parentNode] : self.children);
+
 		if (rule.output.length)
 			output.push.apply(output, rule.output);
 	}
@@ -550,7 +546,6 @@ function parseHTML(html, trim, onerror, isxml) {
 			return '';
 		}
 
-
 		if (beg > 0) {
 			tmp = str.substring(0, beg);
 
@@ -617,12 +612,6 @@ function parseHTML(html, trim, onerror, isxml) {
 				return str;
 		} else {
 			switch (dom.tagName) {
-				case 'BR':
-				case 'HR':
-				case 'IMG':
-				case 'INPUT':
-				case 'META':
-				case 'LINK':
 				case 'SOURCE':
 				case 'AREA':
 				case 'COL':
@@ -633,17 +622,41 @@ function parseHTML(html, trim, onerror, isxml) {
 			}
 		}
 
-		var pos = 0;
+		var pos = -1;
 		var tagBeg = '<' + dom.raw;
 		var tagEnd = '</' + dom.raw + '>';
+		var unpair = false;
 
 		while (true) {
 
 			if (counter++ > 10000)
 				break;
 
+			if (unpair)
+				unpair = false;
+			else
+				end = str.indexOf(tagEnd, pos);
+
+			// Tries to find the same tag
 			beg = str.indexOf(tagBeg, pos);
-			end = str.indexOf(tagEnd, pos);
+			if (beg !== -1) {
+
+				// another one with the same type
+				// check unpair
+
+				let posend = str.indexOf('>', beg + tagBeg.length);
+				if (posend === -1) {
+					// tag is not closed
+					return '';
+				}
+
+				if (str[posend - 1] === '/') {
+					// unpair
+					pos = posend + 1;
+					unpair = true;
+					continue;
+				}
+			}
 
 			// Fallback for the non-exists end tag
 			if (end === -1) {
@@ -658,20 +671,18 @@ function parseHTML(html, trim, onerror, isxml) {
 			}
 
 			if (beg === -1 || end < beg) {
-
 				pos = end + tagEnd.length;
-
 				if (count) {
 					count--;
 					continue;
 				}
-
 				break;
 			}
+
 		}
 
 		var inner = str.substring(0, pos - tagEnd.length);
-		if (inner.indexOf('<') === -1 || (/\<(script|style|template)/).test(tag)) {
+		if (inner.indexOf('<') === -1 || (!isxml && (/\<(script|style|template)/).test(tag))) {
 			if (trim)
 				inner = inner.trim();
 			if (inner)
@@ -686,7 +697,6 @@ function parseHTML(html, trim, onerror, isxml) {
 		if (str && str.indexOf('<') === -1) {
 			if (trim)
 				str = str.trim();
-
 			// Commented because it inserts the same textContent twice
 			// str && parent.children.push(makeText(parent, str));
 		}

package/index.js

@@ -354,7 +354,7 @@ function unlink(arr, callback) {
 	CONF.$httpmaxsize = 256; // kB
 	CONF.$httprangebuffer = 5120; // 5 MB
 	CONF.$httptimeout = 5; // 5 seconds
-	CONF.$httpfiles = { flac: true, jpg: true, jpeg: true, png: true, gif: true, ico: true, wasm: true, js: true, mjs: true, css: true, txt: true, xml: true, woff: true, woff2: true, otf: true, ttf: true, eot: true, svg: true, zip: true, rar: true, pdf: true, docx: true, xlsx: true, doc: true, xls: true, html: true, htm: true, appcache: true, manifest: true, map: true, ogv: true, ogg: true, mp4: true, mp3: true, webp: true, webm: true, swf: true, package: true, json: true, ui: true, md: true, m4v: true, jsx: true, heif: true, heic: true, ics: true, ts: true, m3u8: true, wav: true, xsd: true, xsl: true, xslt: true, ipynb: true, ijsnb: true };
+	CONF.$httpfiles = { flac: true, jpg: true, jpeg: true, png: true, gif: true, ico: true, wasm: true, js: true, mjs: true, css: true, txt: true, xml: true, woff: true, woff2: true, otf: true, ttf: true, eot: true, svg: true, zip: true, rar: true, pdf: true, docx: true, xlsx: true, doc: true, xls: true, html: true, htm: true, appcache: true, manifest: true, map: true, ogv: true, ogg: true, mp4: true, mp3: true, webp: true, webm: true, swf: true, package: true, json: true, ui: true, md: true, m4v: true, jsx: true, heif: true, heic: true, ics: true, ts: true, m3u8: true, wav: true, xsd: true, xsl: true, xslt: true, ipynb: true, ijsnb: true, log: true };
 	CONF.$httpchecktypes = true; // for multipart data only
 	CONF.$httpmaxage = 60; // in seconds
 	CONF.$httpmaxkeys = 33;

package/package.json

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

package/utils.js

@@ -325,6 +325,7 @@ var CONTENTTYPES = {
 	ui: 'application/json', // UI builder
 	jsx: 'text/jsx',
 	less: 'text/css',
+	log: 'text/plain',
 	m3u8: 'application/x-mpegURL',
 	m4a: 'audio/mp4a-latm',
 	m4v: 'video/x-m4v',