Update F.worker() - supports packages routing.

petersirka · petersirka · commit ddb803e7fb85 · 2016-10-27T19:03:21.000+02:00
diff --git a/changes.txt b/changes.txt
@@ -11,6 +11,7 @@
 - updated: `F.redirect()` can contain a relative URL of file
 - updated: NoSQL embedded parser, dates are parsed as date object
 - updated: `Pagination.next()`, `Pagination.prev()`, `Pagination.last()` and `Pagination.first()` supports new arguments `.html([link_inner_html], [class_name])`
+- updated: `F.worker()` supports packages `F.worker('@eshop/myworker-script')`
 
 - improved: `@{href(key, value)}` performance
 - improved: Total Package Manager `$ tpm --help`
diff --git a/index.js b/index.js
@@ -8779,7 +8779,7 @@ Framework.prototype.worker = function(name, id, timeout, args) {
 	}
 
 	if (type === 'string')
-		fork = self.workers[id] || null;
+		fork = self.workers[id];
 
 	if (id instanceof Array) {
 		args = id;
@@ -8795,12 +8795,13 @@ Framework.prototype.worker = function(name, id, timeout, args) {
 	if (fork)
 		return fork;
 
-	var filename = framework_utils.combine(self.config['directory-workers'], name) + '.js';
+	// @TODO: dokončiť
+	var filename = name[0] === '@' ? framework.path.package(name.substring(1)) : framework_utils.combine(self.config['directory-workers'], name);
 
 	if (!args)
 		args = [];
 
-	fork = Child.fork(filename, args, HEADERS.workers);
+	fork = Child.fork(filename[filename.length - 3] === '.' ? filename : filename + '.js', args, HEADERS.workers);
 
 	if (!id)
 		id = name + '_' + new Date().getTime();
diff --git a/test/test-tmp.js b/test/test-tmp.js
@@ -2,4 +2,8 @@ require('../index');
 
 NOSQL('users').count().callback(function(err, count) {
 	console.log(err, count);
+});
+
+F.eval(function() {
+	console.log(Builders.Page);
 });
