total5 0.0.1-4 → 0.0.1-5

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/flow-flowstream.js

@@ -586,12 +586,12 @@ Instance.prototype.reload = function(data, restart = false) {
 			else
 				flow.kill(9);
 		} else
-			flow.postMessage2({ TYPE: 'stream/replace', data: data });
+			flow.postMessage2({ TYPE: 'stream/rewrite', data: data });
 	} else {
 		for (let key in data)
 			flow.$schema[key] = data[key];
 		flow.variables = data.variables;
-		flow.replace(data, () => flow.proxy.refreshmeta());
+		flow.rewrite(data, () => flow.proxy.refreshmeta());
 	}
 
 	return self;
@@ -1065,11 +1065,11 @@ function init_current(meta, callback, nested) {
 					flow.save();
 					break;
 
-				case 'stream/replace':
+				case 'stream/rewrite':
 					for (var key in msg.data)
 						flow.$schema[key] = msg.data[key];
 
-					flow.replace(msg.data, function() {
+					flow.rewrite(msg.data, function() {
 
 						// @err {Error}
 

package/flowstream.js

@@ -277,7 +277,7 @@ function variables(str, data, encoding) {
 	if (typeof(str) !== 'string' || str.indexOf('{') === -1)
 		return str;
 
-	var main = this.main;
+	var main = this.main ? this.main : this;
 
 	if (data == null || data == true)
 		data = this;
@@ -1276,7 +1276,8 @@ FP.load = function(data, callback) {
 	return self;
 };
 
-FP.replace = function(data, callback) {
+FP.replace = variables;
+FP.rewrite = function(data, callback) {
 
 	var self = this;
 	if (self.loading) {

package/global.js

@@ -23,6 +23,7 @@ global.NEWDB = F.newdb;
 global.REQUIRE = F.require;
 global.CRON = F.cron;
 global.UID = F.uid;
+global.SUCCESS = value => DEF.onSuccess(value);
 global.MEMORIZE = F.memorize;
 global.AUDIT = F.audit;
 global.TRANSLATE = F.translate;

package/index.js

@@ -37,6 +37,7 @@ global.DEF = {};
 	F.id = '';
 	F.clusterid = '';
 	F.is5 = F.version = 5000;
+	F.isBundle = false;
 	F.version_header = '5';
 	F.version_node = process.version + '';
 	F.EMPTYOBJECT = EMPTYOBJECT;
@@ -489,7 +490,7 @@ function unlink(arr, callback) {
 		if (F.errors.push(obj) > 10)
 			F.errors.shift();
 
-		EMIT('error', obj);
+		F.$events.error && F.emit('error', obj);
 		F.stats.error++;
 	};
 
@@ -730,21 +731,35 @@ F.load = async function(types, callback) {
 	}
 
 	if (!types.length || types.includes('env')) {
-		var env = await read(F.path.root('.env'));
+		let env = await read(F.path.root('.env'));
 		env && F.loadenv(env);
 	}
 
 	if (!types.length || types.includes('config')) {
-		var config = await read(F.path.root('config'));
+		let config = await read(F.path.root('config'));
 		config && F.loadconfig(config);
 	}
 
 	if (!types.length || types.includes('resources')) {
-		var resources = await list(F.path.root('resources'), 'resource');
+		let resources = await list(F.path.root('resources'), 'resource');
 		for (let resource of resources)
 			F.loadresource(F.TUtils.getName(resource).replace(/\.resource$/i, ''), await read(resource));
 	}
 
+	if (!types.length || types.includes('jsonschemas')) {
+		let jsonschemas = await list(F.path.root('jsonschemas'), 'json');
+		for (let jsonschema of jsonschemas) {
+			let json = await read(jsonschema);
+			json = json.parseJSON();
+			json && F.newjsonschema(F.TUtils.getName(jsonschema).replace(/\.json$/i, ''), json);
+		}
+		jsonschemas = await list(F.path.root('jsonschemas'), 'txt');
+		for (let jsonschema of jsonschemas) {
+			let txt = await read(jsonschema);
+			txt && F.newjsonschema(F.TUtils.getName(jsonschema).replace(/\.txt$/i, ''), txt);
+		}
+	}
+
 	let loader = ['modules', 'controllers', 'actions', 'schemas', 'models', 'definitions', 'sources', 'middleware'];
 	var files = [];
 	var tmp;
@@ -2274,6 +2289,10 @@ F.backup = function(filename, files, callback, filter) {
 	});
 };
 
+F.restart = function() {
+	process.send && process.send('total:restart');
+};
+
 F.exit = function(signal) {
 
 	if (F.isexited)
@@ -2291,7 +2310,7 @@ F.exit = function(signal) {
 		} catch (e) {}
 	}
 
-	let key = '$exit';
+	let key = 'exit';
 
 	F.$events[key] && F.emit(key, signal);
 
@@ -2425,6 +2444,12 @@ F.mail = function(email, subject, name, model, language, callback) {
 		callback = tmp;
 	}
 
+	// Localization
+	if (typeof(language) === 'string') {
+		if (subject.includes('@('))
+			subject = TRANSLATE(language, subject);
+	}
+
 	let body = F.view(name, model, view => view.language = language || '');
 	return F.def.onMail(email, subject, body, callback);
 };
@@ -2437,14 +2462,15 @@ F.htmlmail = function(email, subject, body, language, callback) {
 		callback = tmp;
 	}
 
-	// Translation
+	// Localization
 	if (typeof(language) === 'string') {
-		subject = subject.indexOf('@(') === -1 ? TRANSLATE(language, subject) : TRANSLATOR(language, subject);
-		if (body.indexOf('@(') !== -1)
-			body = TRANSLATOR(language, body);
+		if (subject.includes('@('))
+			subject = TRANSLATE(language, subject);
+		if (body.includes('@('))
+			body = TRANSLATE(language, body);
 	}
 
-	var body = body.indexOf('<body>') === -1 ? ('<!DOCTYPE html><html><head><title>' + subject + '</title><meta charset="utf-8" /></head><body style="padding:0;margin:0;font-family:Arial;font-size:14px;font-weight:normal">' + body + '</body></html>') : body;
+	body = body.indexOf('<body>') === -1 ? ('<!DOCTYPE html><html><head><title>' + subject + '</title><meta charset="utf-8" /></head><body style="padding:0;margin:0;font-family:Arial;font-size:14px;font-weight:normal">' + body + '</body></html>') : body;
 	return F.def.onMail(email, subject, body, callback);
 };
 

package/package.json

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

package/tms.js

@@ -361,7 +361,7 @@ exports.unsubscribe = function(name, callback) {
 	return false;
 };
 
-F.on('@tms', function() {
+F.on('$tms', function() {
 
 	var endpoint = F.config.$tmsurl;
 	var is = Cache.url !== endpoint;