total5 0.0.1-2 → 0.0.1-21

package/utils.js

@@ -51,6 +51,7 @@ const REG_KEYWORD2 = /\n/g;
 const REG_KEYWORD3 = /\W|_/g;
 const REG_BASE = /^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$/;
 const REG_BASE2 = /^|,([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$/;
+const REG_NUMBER = /^[0-9,.]$/;
 
 const NEWLINE = '\r\n';
 const DIACRITICSMAP = {};
@@ -71,6 +72,7 @@ const REG_TIME = /am|pm/i;
 const REG_XMLKEY = /\[|\]|:|\.|_/g;
 const REG_HEADERPARSER = /(name|filename)=".*?"|content-type:\s[a-z0-9-./+]+/ig;
 const HEADEREND = Buffer.from('\r\n\r\n', 'ascii');
+const JSCHEMAS_NULLABLE = { json: 1, base64: 1, guid: 1, datauri: 1, uid: 1, string2: 1 };
 
 exports.MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
 exports.DAYS = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
@@ -194,6 +196,12 @@ exports.parseConfig = function(value) {
 				generated.push(key);
 				break;
 			default:
+
+				if (val === 'true' || val === 'false')
+					val = val === 'true';
+				else if (REG_NUMBER.test(val))
+					val = val.parseFloat();
+
 				cfg[key] = val;
 				break;
 		}
@@ -349,6 +357,7 @@ var CONTENTTYPES = {
 	xml: 'application/xml',
 	xpm: 'image/x-xpixmap',
 	xsl: 'application/xml',
+	xsd: 'application/xml',
 	xslt: 'application/xslt+xml',
 	zip: 'application/zip',
 	'7zip': 'application/x-7z-compressed'
@@ -2199,7 +2208,16 @@ SP.hash = function(type, salt) {
 	}
 };
 
-SP.sign = function(key) {
+SP.sign = function(key, check) {
+
+	if (check) {
+		let index = this.lastIndexOf('-');
+		if (index === -1)
+			return null;
+		var id = this.substring(0, index);
+		return id.sign(key) === this ? id : null;
+	}
+
 	return this + '-' + (string_hash(this + (key || '')) >>> 0).toString(36);
 };
 
@@ -2226,17 +2244,6 @@ function string_hash(s, convert) {
 	return hash;
 }
 
-SP.count = function(text) {
-	var index = 0;
-	var count = 0;
-	do {
-		index = this.indexOf(text, index + text.length);
-		if (index > 0)
-			count++;
-	} while (index > 0);
-	return count;
-};
-
 SP.parseComponent = function(tags) {
 
 	var html = this;
@@ -3174,6 +3181,11 @@ SP.parseConfig = function(def, onerr) {
 		} else
 			subtype = '';
 
+		if (value.substring(0, 7) === 'base64 ' && value.length > 8)
+			value = Buffer.from(value.substring(7).trim(), 'base64').toString('utf8');
+		else if (value.substring(0, 4) === 'hex ' && value.length > 6)
+			value = Buffer.from(value.substring(4).trim(), 'hex').toString('utf8');
+
 		switch (subtype) {
 			case 'string':
 				obj[name] = value;
@@ -3243,7 +3255,7 @@ SP.decrypt_uid = function(key) {
 	return exports.decrypt_uid(this, key);
 };
 
-SP.safehtml = function() {
+SP.encode = SP.safehtml = function() {
 	var output = '';
 	for (var i = 0, length = this.length; i < length; i++) {
 		var c = this[i];
@@ -3285,6 +3297,7 @@ SP.arg = SP.args = function(obj, encode, def) {
 		def = encode;
 	var isfn = typeof(encode) === 'function';
 	return this.replace(REG_ARGS, function(text) {
+
 		// Is double bracket?
 		var l = text[1] === '{' ? 2 : 1;
 		var key = text.substring(l, text.length - l).trim();
@@ -3963,6 +3976,12 @@ SP.base64ToBuffer = function() {
 	return Buffer.from(self.substring(index), 'base64');
 };
 
+SP.parseDataURI = function() {
+	var self = this;
+	var index = self.indexOf(';');
+	return index == -1 ? null : { type: self.substring(5, index), buffer: Buffer.from(self.substring(self.indexOf(',', index) + 1), 'base64') };
+};
+
 SP.base64ContentType = function() {
 	var self = this;
 	var index = self.indexOf(';');
@@ -4513,7 +4532,7 @@ AP.findAll = function(cb, value) {
 };
 
 AP.findValue = function(cb, value, path, def) {
-	var index = this.findIndex(cb, value);
+	var index = this.TfindIndex(cb, value);
 	if (index !== -1) {
 		var item = this[index][path];
 		return item == null ? def : item;
@@ -4523,13 +4542,14 @@ AP.findValue = function(cb, value, path, def) {
 
 AP.findItem = function(cb, value) {
 	var self = this;
-	var index = self.findIndex(cb, value);
+	var index = self.TfindIndex(cb, value);
 	if (index === -1)
 		return null;
 	return self[index];
 };
 
-AP.findIndex = function(cb, value) {
+// TfindIndex due to other NPM dependencies
+AP.TfindIndex = AP.findIndex = function(cb, value) {
 
 	var self = this;
 	var isFN = typeof(cb) === 'function';
@@ -4646,6 +4666,8 @@ AP.async = function(thread, callback, tmp) {
 		thread = 1;
 	} else if (thread === undefined)
 		thread = 1;
+	else if (thread > self.length)
+		thread = self.length;
 
 	if (!tmp) {
 		tmp = {};
@@ -5768,13 +5790,17 @@ exports.querify = function(url, obj) {
 	}
 
 	if (url) {
+
+		if (!arg.length)
+			return url;
+
 		let arr = url.split(' ');
 		let index = QUERIFYMETHODS[arr[0]] ? 1 : 0;
 		arr[index] += (arr[index].indexOf('?') === -1 ? '?' : '&') + arg.join('&');
 		return arr.join(' ');
 	}
 
-	return '?' + arg.join('&');
+	return arg.length ? ('?' + arg.join('&')) : '';
 };
 
 exports.connect = function(opt, callback) {
@@ -5865,7 +5891,7 @@ exports.connect = function(opt, callback) {
 	meta.socket1.on('clientError', error);
 };
 
-String.prototype.toJSONSchema = function(name, url) {
+String.prototype.toJSONSchema = String.prototype.parseSchema = function(name, url) {
 
 	var obj = {};
 	var p = (url || CONF.url || 'https://schemas.totaljs.com/');
@@ -5882,10 +5908,14 @@ String.prototype.toJSONSchema = function(name, url) {
 	var nestedtypes = [];
 
 	str = str.replace(/\[.*?\]/g, function(text) {
+		if (text.substring(1, 2) === '@')
+			return text;
 		return '[#' + (nestedtypes.push(text.substring(1, text.length - 1)) - 1) + ']';
 	});
 
 	str = str.replace(/\{.*?\}/g, function(text) {
+		if (text.substring(1, 2) === '@')
+			return text;
 		return '{#' + (nestedtypes.push(text.substring(1, text.length - 1)) - 1) + '}';
 	});
 
@@ -5903,7 +5933,8 @@ String.prototype.toJSONSchema = function(name, url) {
 			required.push(arr[0]);
 		}
 
-		var type = (arr[1] || 'string').toLowerCase().trim();
+		var type = (arr[1] || 'string').trim();
+		// var type = typename.toLowerCase().trim();
 		var size = 0;
 		var isarr = type[0] === '[';
 		if (isarr)
@@ -5957,22 +5988,14 @@ String.prototype.toJSONSchema = function(name, url) {
 				type = type.toLowerCase();
 
 		} else if (type[0] === '@') {
-
-			// other schema
-			var subname = type.substring(1);
-			var schema = GETSCHEMA(subname);
-
-			schema =  schema ? schema.toJSONSchema() : F.jsonschemas[subname];
-
-			if (schema)
-				nestedschema = schema;
-			else
-				throw new Error('Schema "' + subname + '" not found');
-
+			nestedschema = type.substring(1);
 			type = 'object';
 		}
 
-		switch (type) {
+		var ltype = type.toLowerCase();
+
+		switch (ltype) {
+			case 'string2':
 			case 'string':
 			case 'uid':
 			case 'guid':
@@ -5990,19 +6013,21 @@ String.prototype.toJSONSchema = function(name, url) {
 			case 'color':
 			case 'icon':
 			case 'base64':
+			case 'datauri':
 			case 'safestring':
 			case 'search':
 			case 'text':
 				tmp = {};
 				if (isarr) {
 					tmp.type = 'array';
-					tmp.items = { type: 'string', subtype: type === 'text' ? undefined : type };
+					tmp.items = { type: 'string', subtype: ltype === 'text' ? undefined : ltype, nullable: JSCHEMAS_NULLABLE[ltype] };
 					if (size)
 						tmp.items.maxLength = size;
 				} else {
 					tmp.type = 'string';
-					if (type !== tmp.type)
-						tmp.subtype = type;
+					tmp.nullable = JSCHEMAS_NULLABLE[ltype];
+					if (ltype !== tmp.type)
+						tmp.subtype = ltype;
 					if (size)
 						tmp.maxLength = size;
 				}
@@ -6022,11 +6047,11 @@ String.prototype.toJSONSchema = function(name, url) {
 				tmp = {};
 				if (isarr) {
 					tmp.type = 'array';
-					tmp.items = { type: 'number', subtype: type === 'number' ? undefined : type };
+					tmp.items = { type: 'number', subtype: type === 'number' ? undefined : ltype };
 				} else {
 					tmp.type = 'number';
-					if (type !== 'number')
-						tmp.subtype = type;
+					if (ltype !== 'number')
+						tmp.subtype = ltype;
 				}
 
 				break;
@@ -6052,11 +6077,11 @@ String.prototype.toJSONSchema = function(name, url) {
 
 				if (isarr) {
 					tmp.type = 'array';
-					tmp.items = nestedschema || { type: 'object' };
-				} else if (nestedschema)
-					tmp = nestedschema;
-				else
+					tmp.items = { type: 'object', $ref: nestedschema };
+				} else {
 					tmp.type = 'object';
+					tmp.$ref = nestedschema;
+				}
 
 				break;
 			case 'enum':
@@ -6079,6 +6104,10 @@ String.prototype.toJSONSchema = function(name, url) {
 		obj.required = required;
 
 	obj.transform = exports.jsonschematransform;
+
+	if (name)
+		F.jsonschemas[name] = obj;
+
 	return obj;
 };
 
@@ -6348,7 +6377,7 @@ exports.uidr = function() {
 		var c;
 
 		if (i === 9) {
-			c = F.uidc;
+			c = F.internal.uidc;
 		} else {
 			let index = Math.floor(Math.random() * RANDOM_TEXT.length);
 			c = RANDOM_TEXT[index];

package/viewengine.js

@@ -277,7 +277,7 @@ function parseplus(builder) {
 	return c !== '!' && c !== '?' && c !== '+' && c !== '.' && c !== ':';
 }
 
-function prepare(command, dynamicCommand, functions) {
+function prepare(command, dcommand, functions) {
 
 	var a = command.indexOf('.');
 	var b = command.indexOf('(');
@@ -301,10 +301,10 @@ function prepare(command, dynamicCommand, functions) {
 		index = command.length;
 
 	var name = command.substring(0, index);
-	if (name === dynamicCommand)
+	if (name === dcommand)
 		return 'self.safehtml(' + command + ', 1)';
 
-	if (name[0] === '!' && name.substring(1) === dynamicCommand)
+	if (name[0] === '!' && name.substring(1) === dcommand)
 		return 'self.safehtml(' + command.substring(1) + ')';
 
 	switch (name) {
@@ -741,7 +741,7 @@ function makehtmlmeta(self) {
 		title = repo.title.safehtml();
 
 	if (title) {
-		if (!F.config.$customtitle && self?.controller?.url !== '/')
+		if (!F.config.$customtitles && self?.controller?.url !== '/')
 			title += ' - ' + F.config.name;
 	} else if (!title)
 		title = F.config.name;
@@ -796,12 +796,12 @@ View.prototype.import = function() {
 				}
 
 				if (m.indexOf('+') === -1) {
-					let key = '/' + m;
+					let absolute = m[0] === '/';
+					let key = absolute ? m : ('/' + m);
 					if (REG_CHECKCSS.test(m)) {
-						tmp = '<link rel="stylesheet" href="/' + (F.routes.virtual[key] ? '' : 'css/') + m + '" />';
+						tmp = '<link rel="stylesheet" href="' + (absolute ? m : ('/' + (F.routes.virtual[key] ? '' : 'css/') + m)) + '" />';
 					} else {
-
-						tmp = '<scri' + 'pt src="/' + (F.routes.virtual[key] ? '' : 'js/') + m + '"></scr' + 'ipt>';
+						tmp = '<scri' + 'pt src="' + (absolute ? m : ('/' + (F.routes.virtual[key] ? '' : 'js/') + m)) + '"></scr' + 'ipt>';
 					}
 				} else {
 					let iscss = REG_CHECKCSS.test(m);
@@ -858,10 +858,9 @@ View.prototype.render = function(name, model, ispartial = false) {
 	self.model = model;
 
 	if (!fn) {
-
-		content = F.translate(self.language, F.Fs.readFileSync(F.path.directory('views', name + '.html'), 'utf8'));
+		let path = name[0] === '#' ? F.path.plugins(name.substring(1) + '.html') : F.path.directory('views', name + '.html');
+		content = F.translate(self.language, F.Fs.readFileSync(path, 'utf8'));
 		fn = exports.compile(name, content, DEBUG);
-
 		if (!DEBUG)
 			F.temporary.views[key] = fn;
 	}

package/websocket.js

@@ -836,6 +836,7 @@ function authorize(ctrl) {
 	if (F.def.onAuthorize) {
 		var opt = new F.TBuilders.Options(ctrl);
 		opt.TYPE = 'auth'; // important
+		opt.query = ctrl.query;
 		opt.iswebsocket = true;
 		opt.next = opt.callback;
 		opt.$callback = function(err, user) {
@@ -874,7 +875,7 @@ function middleware(ctrl) {
 
 function prepare(ctrl) {
 
-	ctrl.ondata2 = () => websocket.ondata();
+	ctrl.ondata2 = () => ctrl.ondata();
 
 	var compress = (F.config.$wscompress && ctrl.headers['sec-websocket-extensions'] || '').indexOf('permessage-deflate') !== -1;
 	var header = ctrl.route.protocols && ctrl.route.protocols.length ? (compress ? SOCKET_RESPONSE_PROTOCOL_COMPRESS : SOCKET_RESPONSE_PROTOCOL).format(ctrl.sign(ctrl), ctrl.route.protocols.join(', ')) : (compress ? SOCKET_RESPONSE_COMPRESS : SOCKET_RESPONSE).format(ctrl.sign(ctrl));
@@ -960,8 +961,8 @@ function execute(ctrl) {
 		ctrl.params[param.name] = value;
 	}
 
-	if (F.def.onLocale)
-		ctrl.language = F.def.onLocale(ctrl);
+	if (F.def.onLocalize)
+		ctrl.language = F.def.onLocalize(ctrl);
 
 	if (ctrl.route.flags.binary)
 		ctrl.datatype = 'binary';

package/workers.js

@@ -49,7 +49,7 @@ function process_thread() {
 exports.createthread = function(name, data) {
 	if (!name)
 		return process_thread();
-	var filename = name === '~' ? name.substring(1) : F.path.root('workers/' + name + '.js');
+	var filename = name[0] === '~' ? name.substring(1) : F.path.root('workers/' + name + '.js');
 	var worker = new F.Worker.Worker(filename, { workerData: data, cwd: HEADER, argv: ['--worker'] });
 	worker.kill = worker.exit = () => worker.terminate();
 	return worker;
@@ -60,7 +60,7 @@ exports.createfork = function(name) {
 	if (!name)
 		return process_thread();
 
-	var filename = name === '~' ? name.substring(1) : F.path.root('workers/' + name + '.js');
+	var filename = name[0] === '~' ? name.substring(1) : F.path.root('workers/' + name + '.js');
 	var fork = new F.Child.fork(filename, { cwd: HEADER, argv: ['--worker'] });
 	fork.postMessage = fork.send;
 	fork.terminate = () => fork.kill('SIGTERM');

package/CONTRIBUTING.md

@@ -1,55 +0,0 @@
-# Contributing to total.js framework
-
-We love your input! We want to make contributing to this project as easy and transparent as possible, whether it's:
-
-- Reporting a bug
-- Discussing the current state of the code
-- Submitting a fix
-- Proposing new features
-
-## We Develop with Github
-
-We use github to host code, to track issues and feature requests, as well as accept pull requests.
-
-## We Use [Github Flow](https://docs.github.com/en/get-started/quickstart/github-flow), So All Code Changes Happen Through Pull Requests
-
-Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://docs.github.com/en/get-started/quickstart/github-flow)). We actively welcome your pull requests:
-
-1. Fork the repo and create your branch from `master`.
-2. If you've added code that should be tested, add tests.
-3. If you've changed APIs, update the documentation.
-4. Ensure the test suite passes.
-5. Make sure your code lints.
-6. Issue that pull request!
-
-## Any contributions you make will be under the MIT Software License
-
-In short, when you submit code changes, your submissions are understood to be under the same [MIT License](http://choosealicense.com/licenses/mit/) that covers the project. Feel free to contact the maintainers if that's a concern.
-
-## Report bugs using Github's [issues](https://github.com/totaljs/framework5/issues)
-
-We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/totaljs/framework4/issues); it's that easy!
-
-## Write bug reports with detail, background, and sample code
-
-**Great Bug Reports** tend to have:
-
-- A quick summary and/or background
-- Steps to reproduce - be specific!
-- What you expected would happen
-- What actually happens
-- Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)
-
-People *love* thorough bug reports. I'm not even kidding.
-
-## Use a Consistent Coding Style
-
-We use coding styel as described here (https://docs.totaljs.com/welcome/67b47001ty51c/)
-
-## License
-
-By contributing, you agree that your contributions will be licensed under its MIT License.
-
-## References
-
-This document was adapted from (https://gist.github.com/briandk/3d2e8b3ec8daf5a27a62)

package/helpers/index.js

@@ -1,32 +0,0 @@
-// ===================================================
-// Total.js v5 start script
-// https://www.totaljs.com
-// ===================================================
-
-require('total5');
-
-const options = {};
-
-// options.ip = '127.0.0.1';
-// options.port = parseInt(process.argv[2]);
-// options.unixsocket = PATH.join(F.tmpdir, 'app_name.socket');
-// options.unixsocket777 = true;
-// options.config = { name: 'Total.js' };
-// options.sleep = 3000;
-// options.inspector = 9229;
-// options.watch = ['private'];
-// options.livereload = 'https://yourhostname';
-// options.watcher = true; // enables watcher for the release mode only controlled by the app `F.restart()`
-// options.edit = 'wss://www.yourcodeinstance.com/?id=projectname'
-options.release = process.argv.includes('--release');
-
-// Service mode:
-options.servicemode = process.argv.includes('--service') || process.argv.includes('--servicemode');
-// options.servicemode = 'definitions,modules,config';
-
-// Cluster:
-// options.tz = 'utc';
-// options.cluster = 'auto';
-// options.limit = 10; // max 10. threads (works only with "auto" scaling)
-
-F.run(options);

package/templates.json

@@ -1,74 +0,0 @@
-{
-	"empty": {
-		"id": "emptyproject",
-		"name": "Empty",
-		"total": 4,
-		"description": "Empty project without any special setup"
-	},
-	"typescript": {
-		"id": "emptyproject-typescript",
-		"name": "Typescript",
-		"total": 4,
-		"description": "Total.js with typescript"
-	},
-	"website": {
-		"id": "emptyproject-website",
-		"name": "Website",
-		"total": 4,
-		"description": "Website example"
-	},
-	"postgres": {
-		"id": "emptyproject-postgresql",
-		"name": "Postgres template",
-		"total": 4,
-		"description": "Empty project ready to be used with PostgreSQL"
-	},
-	"app-builder": {
-		"id": "emptyproject-builder",
-		"name": "App Builder",
-		"total": 4,
-		"description": "Tool for creating Total.js server-side applications"
-	},
-	"empty-spa": {
-		"id": "emptyproject-emptyspa",
-		"name": "Empty SPA",
-		"total": 4,
-		"description": "Empty single page application project"
-	},
-	"spa": {
-		"id": "emptyproject-spa",
-		"name": "SPA",
-		"total": 4,
-		"description": "Single page application template"
-	},
-	"pwa": {
-		"id": "emptyproject-emptyspa",
-		"name": "PWA",
-		"total": 4,
-		"description": "Progressive web application template"
-	},
-	"flow": {
-		"id": "emptyproject-flow",
-		"name": "Flow",
-		"total": 4,
-		"description": "Visual programming interface for IoT"
-	},
-	"flowstream": {
-		"id": "flowstream",
-		"name": "FlowStream",
-		"total": 4,
-		"description": "Total.js FlowStream"
-	},
-	"tms": {
-		"id": "tms",
-		"name": "TMS",
-		"total": 4,
-		"description": "Total.js Message Service integrator"
-	},
-	"cms": {
-		"id": "cmsbundle",
-		"name": "CMS",
-		"total": 4,
-		"description": "Total.js CMS"
-	}
-}

package/todo.txt

@@ -1,11 +0,0 @@
-- openclient
-- update
-- workers (check)
-- autoquery
-
-- CSRF tokeny
-- encryption/decryption
-
----
-
-CHECK WINDOWS PLUGINS STATIC FILES

package/tools/beta.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd "$DIR"
-cd ..
-npm publish --tag beta

package/tools/release.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd "$DIR"
-cd ..
-npm publish