total5 0.0.6-7 → 0.0.6-9

package/builders.js

@@ -1328,9 +1328,11 @@ ActionCaller.prototype.exec = function() {
 		}
 	};
 
-	if (action.user && !$.user) {
-		$.invalid(401);
-		return;
+	if (action.user != null) {
+		if ((action.user && !$.user) || (!action.user && $.user)) {
+			$.invalid(401);
+			return;
+		}
 	}
 
 	if (action.sa) {

package/changelog.txt

@@ -28,6 +28,11 @@
 - fixed parsing unpair XML elements in the `HTMLParser`
 - improved Markdown parser
 - added a test functionality for testing Flow components
+- added `F.extend(prototype, name, fn)` for extending Total.js prototypes
+- fixed assigning the `name` field in FlowStream
+- fixed prerendering UI after manual using `Flow.add()` method
+- added `Array.group(key)` method
+- fixed `HTMLParser` by [Marek Mraz](https://github.com/Mrazbb)
 
 ========================
 0.0.5

package/flow-flowstream.js

@@ -502,8 +502,13 @@ Instance.prototype.add = function(id, body, callback) {
 		if (callback)
 			CALLBACKS[callbackid] = { id: self.flow.id, callback: callback };
 		self.flow.postMessage2({ TYPE: 'stream/add', id: id, data: body, callbackid: callbackid });
-	} else
-		self.flow.add(id, body, callback, ASFILES);
+	} else {
+		self.flow.add(id, body, function(err) {
+			callback && callback(err);
+			self.flow.redraw();
+			self.flow.save();
+		}, ASFILES);
+	}
 	return self;
 };
 
@@ -1006,6 +1011,7 @@ function init_current(meta, callback, nested) {
 		}
 	}
 
+	flow.name = meta.name || meta.id;
 	flow.env = meta.env;
 	flow.origin = meta.origin;
 	flow.proxypath = meta.proxypath || '';
@@ -1221,6 +1227,7 @@ function init_current(meta, callback, nested) {
 						msg.error = err ? err.toString() : null;
 						if (msg.callbackid !== -1)
 							Parent.postMessage(msg);
+						flow.redraw();
 						flow.save();
 					}, ASFILES);
 					break;
@@ -1607,6 +1614,7 @@ function init_worker(meta, type, callback) {
 				break;
 
 			case 'stream/save':
+				worker.$schema.name = msg.data.name;
 				worker.$schema.components = msg.data.components;
 				worker.$schema.design = msg.data.design;
 				worker.$schema.variables = msg.data.variables;
@@ -2707,6 +2715,7 @@ function MAKEFLOWSTREAM(meta) {
 
 	flow.proxy.refreshmeta = function() {
 
+		flow.name = flow.$schema.name || flow.$schema.id;
 		flow.origin = flow.$schema.origin;
 		flow.proxypath = flow.$schema.proxypath || '';
 

package/flowstream.js

@@ -2061,4 +2061,7 @@ exports.create = function(id, errorhandler) {
 	let flowstream = new FlowStream(id, errorhandler);
 	F.flowstreams[id] = flowstream;
 	return flowstream;
-};
+};
+
+exports.Message = Message;
+exports.FlowStream = FlowStream.prototype;

package/htmlparser.js

@@ -485,9 +485,18 @@ function removeComments(html) {
 	return html;
 }
 
+var CC = 0;
+
 function parseHTML(html, trim, onerror, isxml) {
 
 	var makeText = function(parent, str) {
+
+		if (str === 'hello world 5')
+			CC++;
+
+		if (CC === 2)
+			throw new Error('FET');
+
 		var obj = new HTMLElement();
 		obj.xml = isxml;
 		obj.tagName = 'TEXT';
@@ -658,8 +667,9 @@ function parseHTML(html, trim, onerror, isxml) {
 		if (str && str.indexOf('<') === -1) {
 			if (trim)
 				str = str.trim();
-			if (str)
-				parent.children.push(makeText(parent, str));
+
+			// Commented because it inserts the same textContent twice
+			// str && parent.children.push(makeText(parent, str));
 		}
 
 		return str;

package/http.js

@@ -4,8 +4,6 @@
 
 'use strict';
 
-const TController = require('./controller');
-
 exports.listen = function(req, res) {
 
 	// req.ip
@@ -29,7 +27,7 @@ exports.listen = function(req, res) {
 		return;
 	}
 
-	var ctrl = new TController.Controller(req, res);
+	var ctrl = new F.TController.Controller(req, res);
 
 	if (F.paused.length) {
 		ctrl.fallback(999);

package/index.js

@@ -2397,6 +2397,59 @@ F.backup = function(filename, files, callback, filter) {
 	});
 };
 
+F.extend = function(proto, name, fn) {
+
+	let target = null;
+
+	switch(proto.toLowerCase().replace(/\-\_\s/g, '')) {
+		case '$':
+		case 'options':
+			target = F.TBuilders.Options;
+			break;
+		case 'error':
+		case 'errorbuilder':
+			target = F.TBuilders.ErrorBuilder;
+			break;
+		case 'controller':
+			target = [F.TController.Controller, F.TWebSocket.Controller];
+			break;
+		case 'flowstream':
+			target = F.TFlowStream.FlowStream;
+			break;
+		case 'mail':
+		case 'email':
+			target = F.TMail.Message;
+			break;
+		case 'restbuilder':
+			target = F.TBuilders.RESTBuilder;
+			break;
+		case 'message':
+		case 'flowstreammessage':
+			target = F.TFlowStream.Message;
+			break;
+		case 'view':
+		case 'viewengine':
+			target = F.TViewEngine.View;
+			break;
+		case 'querybuilder':
+			target = T.TQueryBuilder.QueryBuilder;
+			break;
+		case 'database':
+			target = T.TQueryBuilder.Controller;
+			break;
+	}
+
+	if (target) {
+		if (target instanceof Array) {
+			for (let m of target)
+				m.prototype[name] = fn;
+		} else
+			target.prototype[name] = fn;
+		return true;
+	}
+
+};
+
 F.restart = function() {
 	process.send && process.send('total:restart');
 };
@@ -2748,6 +2801,7 @@ process.on('message', function(msg, h) {
 	F.TUtils = require('./utils');
 	F.TRouting = require('./routing');
 	F.TBuilders = require('./builders');
+	F.TController = require('./controller');
 	F.TViewEngine = require('./viewengine');
 	F.TMinificators = require('./minificators');
 	F.TWebSocket = require('./websocket');

package/package.json

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

package/utils.js

@@ -4416,6 +4416,36 @@ function filesizehelper(number, count) {
 
 var AP = Array.prototype;
 
+AP.group = function(name) {
+
+	let groups = {};
+
+	for (let m of this) {
+		let key = m[name];
+
+		if (key != null)
+			key = key.toString();
+		else
+			key = '__';
+
+		let tmp = groups[key];
+		if (tmp)
+			tmp.push(m);
+		else
+			groups[key] = [m];
+	}
+
+	let output = [];
+
+	for (let key in groups) {
+		let id = key === '__' ? '' : key;
+		output.push({ name: id, items: groups[key] });
+	}
+
+	output.quicksort('name');
+	return output;
+};
+
 AP.take = function(count) {
 	var arr = [];
 	var self = this;

package/websocket.js

@@ -1960,4 +1960,6 @@ exports.createclient = function(callback) {
 	var client = new WebSocketClient();
 	callback && callback(client);
 	return client;
-};
+};
+
+exports.Controller = Controller;