total5 0.0.1-9 → 0.0.2

package/jsonschema.js

@@ -18,7 +18,7 @@ function check_string(meta, error, value, errplus, path) {
 	var type = typeof(value);
 
 	if (type !== 'string')
-		value = value ? (value + '') : null;
+		value = value ? (value + '') : meta.nullable ? null : '';
 
 	if (errplus == null)
 		errplus = '';
@@ -37,7 +37,7 @@ function check_string(meta, error, value, errplus, path) {
 	}
 
 	if (value == null)
-		return;
+		return null;
 
 	var len = value.length;
 
@@ -133,6 +133,14 @@ function check_string(meta, error, value, errplus, path) {
 					return;
 				}
 				break;
+			case 'datauri':
+				value = value.trim();
+				if (value && !value.isBase64(true)) {
+					error.push2(errplus + meta.$$ID, path);
+					return;
+				}
+				value = value ? value.parseDataURI() : null;
+				break;
 			case 'color':
 				value = value.trim();
 				if (value && !REG_COLOR.test(value)) {
@@ -299,7 +307,8 @@ function check_date(meta, error, value, errplus, path) {
 	return value;
 }
 
-function read_def(ref, definitions) {
+function readdef(ref, definitions) {
+
 	if (ref[0] === '#') {
 		var tmp = ref.substring(2).split('/');
 		var def = definitions[tmp[0]];
@@ -421,7 +430,7 @@ function check_array(meta, error, value, stop, definitions, path) {
 			var val = value[i];
 
 			if (meta.items.$ref) {
-				var ref = read_def(meta.items.$ref, definitions);
+				var ref = typeof(meta.items.$ref) === 'object' ? meta.items.$ref :readdef(meta.items.$ref, definitions);
 				if (ref) {
 					var newerror = new F.ErrorBuilder();
 					tmp = transform(ref, newerror, val, false, currentpath + '[' + i + ']');
@@ -554,10 +563,8 @@ function check_object(meta, error, value, response, stop, definitions, path) {
 			case 'boolean':
 			case 'bool':
 				tmp = check_boolean(prop, error, val, null, currentpath);
-				if (tmp != null) {
-					response[key] = tmp;
-					count++;
-				}
+				response[key] = tmp == true;
+				count++;
 				break;
 			case 'date':
 				tmp = check_date(prop, error, val, null, currentpath);
@@ -566,15 +573,12 @@ function check_object(meta, error, value, response, stop, definitions, path) {
 				break;
 			case 'string':
 				tmp = check_string(prop, error, val, null, currentpath);
-				if (tmp != null) {
-
-					if (!tmp && prop.subtype === 'uid')
-						tmp = null;
-
-					response[key] = tmp;
-					count++;
-				}
+				if (tmp == '' && prop.nullable)
+					tmp = null;
+				response[key] = tmp;
+				count++;
 				break;
+
 			case 'object':
 
 				if (prop.properties) {
@@ -587,7 +591,7 @@ function check_object(meta, error, value, response, stop, definitions, path) {
 
 					// check ref
 					if (prop.$ref) {
-						var ref = read_def(prop.$ref, definitions);
+						var ref = typeof(prop.$ref) === 'object' ? prop.$ref : readdef(prop.$ref, definitions);
 						if (ref) {
 							var newerror = new F.ErrorBuilder();
 							tmp = transform(ref, newerror, val, false, currentpath);

package/macros.js

@@ -0,0 +1,222 @@
+// Supported:
+// - condition: IF, ELSE, ELSE IF, FI
+// - custom helpers: HELPERNAME(arg1, arg2)
+// - user defined values: "1" (number), "TEXT" (text), "TRUE" (boolean), "FALSE" boolean, "YES" boolean, "NO" boolean
+// - returning via return keyword
+// - supports lower/upper case (but properties in the model/helpers must be in the lower case)
+// - #temporary
+/*
+	IF something >= 10
+		RETURN something * 10;
+	FI
+*/
+
+const AsyncFunction = async function () {}.constructor;
+
+function findkeywords(line, keywords, replace, allowedbeg, allowedend) {
+
+	var white = [' ', '\t', ';'];
+
+	for (var keyword of keywords) {
+
+		var reg = new RegExp(keyword, 'gi');
+		var match = line.match(reg);
+
+		if (!match)
+			continue;
+
+		var index = 0;
+
+		for (var m of match) {
+
+			index = line.indexOf(m);
+
+			if (index === -1)
+				break;
+
+			var beg = line.substring(index - 1, index);
+
+			if (index === 0 || white.includes(beg) || (allowedbeg && allowedbeg.includes(beg))) {
+				var length = index + m.length;
+				var end = line.substring(length, length + 1);
+
+				if (!end || white.includes(end) || (allowedend && allowedend.includes(end))) {
+					var output = replace(m);
+					line = line.substring(0, index) + output + line.substring(length);
+				}
+			}
+		}
+	}
+	return line;
+}
+
+function prepareline(str, meta, isasync) {
+
+	str = str.trim();
+
+	if (str.substring(0, 2) === '//')
+		return;
+
+	// User defined values
+	str = str.replace(/(".*?")|('.*?')/g, function(text) {
+
+		var key = '@' + meta.indexer + '@';
+
+		text = text.substring(1, text.length - 1);
+		if ((/^[0-9.,]+$/).test(text)) {
+			text = text.parseFloat();
+		} else {
+			var boolean = text.toLowerCase();
+			if (boolean === 'true' || boolean === 'false')
+				text = boolean === 'true';
+			else
+				text = '"' + text + '"';
+		}
+
+		meta.keywords[key] = text;
+		meta.indexer++;
+		return key;
+	});
+
+	if (str.indexOf(';') !== -1) {
+		var lines = str.split(';');
+		for (var m of lines)
+			m = prepareline(m, meta, isasync);
+		return lines.join('\n');
+	}
+
+	// Return
+	str = findkeywords(str, ['return'], function(text) {
+		var key = '@' + meta.indexer + '@';
+		meta.keywords[key] = text.toLowerCase();
+		meta.indexer++;
+		return key;
+	});
+
+	// End condition
+	str = findkeywords(str, ['fi'], function() {
+		return '}';
+	});
+
+	// Boolean
+	str = findkeywords(str, ['true', 'false', 'yes', 'no', 'ok'], function(text) {
+		text = text.toLowerCase();
+		return text === 'yes' || text === 'true' || text === 'ok';
+	}, ['('], [')']);
+
+	// AND OR
+	str = findkeywords(str, ['and', 'or'], function(text) {
+		return text.toLowerCase().replace(/and/g, '&&').replace(/or/g, '||');
+	});
+
+	// Conditions
+	var lower = str.toLowerCase();
+	var index = lower.indexOf('else');
+	if (index !== -1) {
+		var tmp = str.substring(index);
+		var tmplower = tmp.toLowerCase();
+		str = str.substring(0, index) + '}' + tmp + (tmplower.indexOf('else if') === -1 ? '{' : '');
+	}
+
+	if (lower.indexOf('if ') !== -1) {
+		str = str.replace(/.=./g, function(text) {
+			if (text[0] === '>' || text[0] === '<' || text[0] === '=' || (text[1] === '=' && text[2] === '='))
+				return text;
+			if (text[2] === '>' || text[2] === '<')
+				return text[2] + text[1] + text[0];
+			if (text[1] === '=')
+				return text[0] + '=' + text[1] + text[2];
+			return text;
+		}) + '){';
+	}
+
+	// Conditions
+	str = str.replace(/(\s)?(else|else\sif|if)(\s)?/ig, function(text) {
+		var key = '@' + meta.indexer + '@';
+		meta.keywords[key] = text.replace(/if(\s)/i, 'if(').replace(/else/i, 'else');
+		meta.indexer++;
+		return key;
+	});
+
+	// Conditions
+	str = findkeywords(str, ['else', 'else if', 'if'], function(text) {
+		text = text.toLowerCase();
+		var key = '@' + meta.indexer + '@';
+		meta.keywords[key] = text.replace(/if(\s)/i, 'if(').replace(/else/i, 'else');
+		meta.indexer++;
+		return key;
+	});
+
+	// Null
+	str = findkeywords(str, ['null'], function(text) {
+		var key = '@' + meta.indexer + '@';
+		text = text.toLowerCase();
+		meta.keywords[key] = text.replace(/null/i, 'null');
+		meta.indexer++;
+		return key;
+	});
+
+	// Helpers
+	str = str.replace(/[a-z0-9_]+\((\))?/ig, function(text) {
+		var key = '@' + meta.indexer + '@';
+		var index = text.indexOf('(');
+		meta.keywords[key] = (isasync ? 'await ' : '') + 'helpers.' + (text.substring(0, index) + '.call(model' + (text.substring(index) === '()' ? ')' : ',')).toLowerCase();
+		meta.indexer++;
+		return key;
+	});
+
+	// Temporary variables
+	str = str.replace(/#[a-z0-9_.]+./ig, function(text) {
+
+		var last = text[text.length - 1];
+		if (last === '@')
+			text = text.substring(0, text.length - 1);
+		else
+			last = '';
+
+		var key = '@' + meta.indexer + '@';
+		meta.keywords[key] = text.substring(1).toLowerCase().replace(/[a-z]/i, text => 'tmp.' + text);
+		meta.indexer++;
+		return key + last;
+	});
+
+	// Properties & fixed values
+	str = str.replace(/.[a-z0-9_.]+./ig, function(text) {
+
+		if ((/@[0-9]+@|true|false(\))?/).test(text))
+			return text;
+
+		if ((/^[0-9.]+$/i).test(text)) {
+			return text;
+		}
+
+		text = text.toLowerCase().replace(/[a-z]/i, function(text) {
+			return 'model.' + text;
+		});
+
+		return text;
+	});
+
+	if (str)
+		meta.builder.push(str.replace(/(\s)?(=|>|<|\+|-)(\s)?/g, n => n.trim()) + ';');
+
+}
+
+exports.compile = function(str, nocompile, isasync) {
+
+	var meta = {};
+	meta.keywords = {};
+	meta.indexer = 0;
+	meta.builder = [];
+
+	var lines = str.split('\n');
+
+	for (var line of lines)
+		prepareline(line, meta, isasync);
+
+	var compiled = meta.builder.join('\n').replace(/@\d+@/gi, function(text) {
+		return meta.keywords[text];
+	});
+
+	return nocompile ? compiled : new (isasync ? AsyncFunction : Function)('model', 'helpers', 'var tmp={};\n' + compiled);
+};

package/mail.js

@@ -219,17 +219,18 @@ Message.prototype.send2 = function(callback) {
 		return;
 	}
 
-	for (let key in F.temporary.smtp)
-		Mailer.destroy(F.temporary.smtp[key]);
+	for (let key in F.temporary.smtp) {
+		if (!F.config.smtp || F.config.smtp.server !== key)
+			Mailer.destroy(F.temporary.smtp[key]);
+	}
 
 	Mailer.send(F.config.smtp, self, callback);
 };
 
-Message.prototype.send = function(smtp, options, callback, cache) {
+Message.prototype.send = function(options, callback) {
 	var self = this;
 	self.$callback2 = callback;
-	options.server = smtp;
-	Mailer.send(options, self, callback, cache);
+	Mailer.send(options, self, callback);
 	return self;
 };
 
@@ -407,30 +408,13 @@ Mailer.try = function(options, callback) {
 };
 
 Mailer.send2 = function(messages, callback) {
-
-	var opt = F.temporary.mail;
-
-	if (!opt) {
-		var config = CONF.mail_smtp_options;
-		if (config) {
-			if (typeof(config) === 'object')
-				opt = config;
-			else
-				opt = config.toString().parseJSON();
-		}
-
-		if (!opt)
-			opt = {};
-
-		F.temporary.mail = opt;
-	}
-
-	return this.send(CONF.mail_smtp, opt, messages, callback);
+	return this.send(F.config.smtp, messages, callback);
 };
 
-Mailer.send = function(opt, messages, callback, cache) {
+Mailer.send = function(opt, messages, callback) {
 
-	var cached = opt.keepalive != false ? F.temporary.smtp[opt.server] : null;
+	var cache = opt.keepalive;
+	var cached = cache ? F.temporary.smtp[opt.server] : null;
 
 	if (cached) {
 		if (messages instanceof Array) {
@@ -582,7 +566,7 @@ Mailer.$writemessage = function(obj, buffer) {
 
 	message.push('MIME-Version: 1.0');
 	buffer.push('MAIL FROM: <' + msg.email_from + '>');
-	message.push('Message-ID: <total5_' + obj.date.toString(36) + '_' + (INDEXATTACHMENT++) + '_' + (INDEXATTACHMENT) + '>');
+	message.push('Message-ID: <total5X' + dt.toString(36) + 'X' + (INDEXATTACHMENT++) + 'X' + (INDEXATTACHMENT) + '>');
 
 	self.$priority && message.push('X-Priority: ' + self.$priority);
 	self.$confidential && message.push('Sensitivity: Company-Confidential');

package/markdown.js

@@ -1,3 +1,7 @@
+// Total.js Markdown
+// The MIT License
+// Copyright 2018-2023 (c) Peter Širka <petersirka@gmail.com>
+
 const REG_DASH = /-{2,}/g;
 const REG_TAGS = /<[^>]*>/g;
 const REG_EMPTYCHAR = /\s|\W/;
@@ -137,9 +141,9 @@ function markdown_format(value, index, text) {
 	return value;
 }
 
-function markdown_id(value) {
+function markdown_id(prefix, value) {
 	value = value.replace(REG_TAGS, '');
-	return value.slug().replace(REG_DASH, '-');
+	return prefix + value.slug().replace(REG_DASH, '-');
 }
 
 function markdown_icon(value) {
@@ -221,10 +225,10 @@ function parseul(builder) {
 		var arr = ul[key];
 		var lines = [];
 		var tags = [];
-		var prev;
-		var diff;
+		var prev = null;
+		var diff = null;
 		var init = false;
-		var tmp;
+		var tmp = null;
 
 		for (var i = 0; i < arr.length; i++) {
 
@@ -420,12 +424,17 @@ String.prototype.markdown = function(opt, nested) {
 	// opt.urlify = true;
 	// opt.keywords = true;
 	// opt.emptynewline = true;
+	// opt.bookmarks = true;
+	// opt.prefix = '';
 
 	var str = this;
 
 	if (!opt)
 		opt = {};
 
+	if (opt.bookmarks == null)
+		opt.bookmarks = true;
+
 	var lines = str.split('\n');
 	var builder = [];
 	var ul = [];
@@ -434,9 +443,10 @@ String.prototype.markdown = function(opt, nested) {
 	var isblock = false;
 	var ishead = 0;
 	var isprevblock = false;
-	var headline = '<{0} id="{3}" class="markdown-line" data-index="{1}">{2}</{0}>';
+	var headline = '<{0}' + (opt.bookmarks ? ' id="{3}"' : '') + ' class="markdown-line" data-index="{1}">{2}</{0}>';
 	var line;
 	var tmp;
+	var prefix = opt.prefix || '';
 
 	if (opt.wrap == null)
 		opt.wrap = true;
@@ -624,7 +634,7 @@ String.prototype.markdown = function(opt, nested) {
 				if (opt.headlines !== false) {
 					if (opt.html)
 						tmp = opt.html(tmp, '#');
-					builder.push(headline.format('h1', i, tmp, markdown_id(tmp)));
+					builder.push(headline.format('h1', i, tmp, opt.bookmarks ? markdown_id(prefix, tmp) : ''));
 				}
 				continue;
 			}
@@ -634,7 +644,7 @@ String.prototype.markdown = function(opt, nested) {
 				if (opt.headlines !== false) {
 					if (opt.html)
 						tmp = opt.html(tmp, '##');
-					builder.push(headline.format('h2', i, tmp, markdown_id(tmp)));
+					builder.push(headline.format('h2', i, tmp, opt.bookmarks ? markdown_id(prefix, tmp) : ''));
 				}
 				continue;
 			}
@@ -644,7 +654,7 @@ String.prototype.markdown = function(opt, nested) {
 				if (opt.headlines !== false) {
 					if (opt.html)
 						tmp = opt.html(tmp, '###');
-					builder.push(headline.format('h3', i, tmp, markdown_id(tmp)));
+					builder.push(headline.format('h3', i, tmp, opt.bookmarks ? markdown_id(prefix, tmp) : ''));
 				}
 				continue;
 			}
@@ -654,7 +664,7 @@ String.prototype.markdown = function(opt, nested) {
 				if (opt.headlines !== false) {
 					if (opt.html)
 						tmp = opt.html(tmp, '####');
-					builder.push(headline.format('h4', i, tmp, markdown_id(tmp)));
+					builder.push(headline.format('h4', i, tmp, opt.bookmarks ? markdown_id(prefix, tmp) : ''));
 				}
 				continue;
 			}
@@ -664,7 +674,7 @@ String.prototype.markdown = function(opt, nested) {
 				if (opt.headlines !== false) {
 					if (opt.html)
 						tmp = opt.html(tmp, '#####');
-					builder.push(headline.format('h5', i, tmp, markdown_id(tmp)));
+					builder.push(headline.format('h5', i, tmp, opt.bookmarks ? markdown_id(prefix, tmp) : ''));
 				}
 				continue;
 			}

package/minificators.js

@@ -167,7 +167,7 @@ exports.js = function(value) {
 			}
 		}
 
-		if ((c === '}' && last === ';') || ((c === '}' || c === ']') && output[output.length - 1] === ' ' && alpha.test(output[output.length - 2])))
+		if (!scope && (c === '}' && last === ';') || ((c === '}' || c === ']') && output[output.length - 1] === ' ' && alpha.test(output[output.length - 2])))
 			output.pop();
 
 		output.push(c);

package/nosql-querybuilder.js

@@ -260,6 +260,10 @@ function makefilter(db, opt, callback) {
 			}
 			isread = true;
 			break;
+		case 'command':
+			if (opt.command === 'clean')
+				db.clean(callback);
+			break;
 	}
 
 	if (opt.debug)

package/nosql.js

@@ -761,6 +761,14 @@ NoSQLWrapper.prototype.find = function() {
 	return DATA.find('nosql/' + this.filename);
 };
 
+NoSQLWrapper.prototype.clean = function() {
+	return DATA.command('nosql/' + this.filename, 'clean');
+};
+
+NoSQLWrapper.prototype.drop = function() {
+	return DATA.drop('nosql/' + this.filename);
+};
+
 NoSQLWrapper.prototype.read = function() {
 	return DATA.read('nosql/' + this.filename);
 };

package/openclient.js

@@ -197,7 +197,7 @@ exports.create = function(url, id) {
 	opt.ws = F.openclients[url];
 
 	if (!opt.ws) {
-		opt.ws = require('./websocketclient').create();
+		opt.ws = F.websocketclient();
 		setImmediate(() => opt.ws.connect(url));
 		F.openclients[url] = opt.ws;
 		opt.ws.options.reconnectserver = true;

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "total5",
-  "version": "0.0.1-9",
+  "version": "0.0.2",
   "description": "Total.js framework v5",
   "main": "index.js",
   "directories": {
     "test": "test"
   },
   "bin": {
-    "total4": "./bin/total5"
+    "total5": "./bin/total5",
+    "flow5": "./bin/flow5"
   },
   "scripts": {
-    "test": "cd tests && node test-release.js"
+    "test": "cd tests && node run.js"
   },
   "repository": {
     "type": "git",

package/pause.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<title>@(Please wait)</title>
+	<title>Please wait</title>
 	<meta charset="utf-8" />
 	<meta name="format-detection" content="telephone=no" />
 	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />

package/release.js

@@ -93,7 +93,7 @@ function run() {
 		unexpectedexit = false;
 	});
 
-	EMIT('watcher', app);
+	F.emit('watcher', app);
 }
 
 function init() {