total5 0.0.1-3 → 0.0.1-5

package/api.js

@@ -132,7 +132,7 @@ APICallProto.error = APICallProto.err = function(err, reverse) {
 
 APICallProto.callback = function($) {
 	var t = this;
-	t.$callback = typeof($) === 'function' ? $ : $.callback;
+	t.$callback = typeof($) === 'function' ? $ : $.callback();
 	return t;
 };
 

package/builders.js

@@ -262,6 +262,11 @@ ErrorBuilder.prototype = {
 	}
 };
 
+ErrorBuilder.prototype.reject = function(language) {
+	var self = this;
+	return new Error(self.toString(language, ''));
+};
+
 ErrorBuilder.prototype.push = function(err, path, index) {
 	var self = this;
 
@@ -333,12 +338,12 @@ ErrorBuilder.prototype.output = function(language = 'default') {
 	return output;
 };
 
-ErrorBuilder.prototype.toString = function(language = 'default') {
+ErrorBuilder.prototype.toString = function(language = 'default', divider = '\n') {
 	var self = this;
 	var output = self.output(language);
 	var str = '';
 	for (let err of output)
-		str += (str ? '\n' : '') + err.error;
+		str += (str ? divider : '') + err.error;
 	return str;
 };
 
@@ -463,7 +468,7 @@ RESTP.promise = function($) {
 				if ($ && $.invalid)
 					$.invalid(err);
 				else
-					reject(err);
+					reject(err.reject());
 			} else
 				resolve(response);
 		});
@@ -1219,7 +1224,7 @@ ActionCaller.prototype.exec = function() {
 	var type = meta.payload || (action.input ? '+' : '-');
 	var $ = self.$;
 
-	$.id = id;
+	$.id = action.id;
 	$.error = self.error;
 	$.controller = self.controller;
 	$.fields = action.fields;
@@ -1363,7 +1368,7 @@ ActionCaller.prototype.promise = function($) {
 				if ($ && $.invalid)
 					$.invalid(err);
 				else
-					reject(err);
+					reject(err.reject());
 			} else
 				resolve(response);
 		};

package/bundles.js

@@ -400,7 +400,7 @@ exports.extract = function(callback, skip) {
 	try {
 
 		if (F.Fs.readFileSync('bundles.debug')) {
-			F.isbundle = true;
+			F.isBundle = true;
 			F.dir(F.path.root('/.src/'));
 			callback();
 			return;
@@ -428,7 +428,7 @@ exports.extract = function(callback, skip) {
 			});
 		}, function() {
 			extract(function() {
-				F.isbundle = true;
+				F.isBundle = true;
 				F.dir(F.path.root('/.src/'));
 				callback();
 			});
@@ -436,21 +436,11 @@ exports.extract = function(callback, skip) {
 	};
 
 	try {
-
 		var files = F.Fs.readdirSync(bundles);
 		if (files.length)
 			extractbundles();
 		else
 			callback();
-
-		/*
-		if (F.$bundling) {
-			makebundle();
-			return;
-		} else {
-			F.isbundle = true;
-			F.dir(F.path.root('/.src/'));
-		}*/
 	} catch(e) {
 		callback();
 	}

package/controller.js

@@ -153,8 +153,32 @@ Controller.prototype = {
 
 };
 
+Controller.prototype.callback = function(err, value) {
+
+	var ctrl = this;
+
+	if (arguments.length == 0) {
+		return function(err, response) {
+			if (err)
+				ctrl.invalid(err);
+			else
+				ctrl.json(response);
+		};
+	}
+
+	if (err)
+		ctrl.invalid(err);
+	else {
+		if (value === undefined)
+			ctrl.success();
+		else
+			ctrl.json(value);
+	}
+
+};
+
 Controller.prototype.csrf = function() {
-	return DEF.onCSRFcreate(this);
+	return F.def.onCSRFcreate(this);
 };
 
 Controller.prototype.redirect = function(value, permanent) {
@@ -777,6 +801,7 @@ Controller.prototype.$route = function() {
 	}
 
 	let route = F.TRouting.lookup(ctrl);
+
 	if (route) {
 
 		ctrl.route = route;
@@ -795,7 +820,7 @@ Controller.prototype.$route = function() {
 
 			ctrl.req.on('data', function(chunk) {
 				ctrl.payloadsize += chunk.length;
-				if (ctrl.payloadsize > ctrl.route.size) {
+				if ((ctrl.payloadsize / 1024) > ctrl.route.size) {
 					if (!ctrl.toolarge) {
 						ctrl.toolarge = true;
 						delete ctrl.payload;
@@ -936,7 +961,7 @@ function multipart(ctrl) {
 }
 
 function authorize(ctrl) {
-	if (DEF.onAuthorize) {
+	if (F.def.onAuthorize) {
 		var opt = new F.TBuilders.Options(ctrl);
 		opt.TYPE = 'auth'; // important
 		opt.next = opt.callback;
@@ -953,7 +978,7 @@ function authorize(ctrl) {
 					ctrl.fallback(401);
 			}
 		};
-		DEF.onAuthorize(opt);
+		F.def.onAuthorize(opt);
 	} else
 		execute(ctrl);
 }
@@ -984,7 +1009,7 @@ function execute(ctrl) {
 					body = body.data;
 					if (!body || typeof(body) === 'object') {
 						ctrl.params = params;
-						F.action(endpoint.actions, body || EMPTYOBJECT, ctrl).autorespond();
+						F.action(endpoint.actions, body || {}, ctrl).autorespond();
 						return;
 					}
 				}