update

Author: ilya-ku

CHANGELOG.md

@@ -1,6 +1,9 @@
 # v0.2.0
 
 - Removed deprecated methods
+- Order for Task `then`/`prepend`/`doFirst`/`doLast` methods
+- Fix task queue builder recursive dependency search
+- `Task.func` utility for creation of simple task with closure
 
 # v0.1.8
 

README.md

@@ -95,4 +95,14 @@ haxelib dev hxmake path/to/hxmake
 - Then do initial rebuild command 
 ```
 haxelib run hxmake _
-```
+```
+
+### Task running details
+Task will be ran in current working directory of associated module.
+
+Default Task / Sub-Tasks / Functions running order:
+1. Sub-Tasks added with `prepend` method.
+2. Functions registered with `doFirst` method.
+3. Task's `run` logic.
+4. Functions registered with `doLast` method.
+5. Sub-Tasks added with `then` method.

run.n

@@ -17,6 +17,10 @@ class Module {
 	public var children(get, never):Array<Module>;
 
 	public var name(default, null):String;
+
+	/**
+		Absolute path to Module folder
+	**/
 	public var path(default, null):String;
 	public var config(get, never):ModuleConfig;
 
@@ -44,9 +48,10 @@ class Module {
 		// Finalization phase
 	}
 
+	@:access(hxmake.Task)
 	public function task(name:String, ?task:Task, ?type:Class<Task>):Task {
 		if (task != null) {
-			@:privateAccess task.module = this;
+			task._module = this;
 			_tasks.set(name, task);
 			return task;
 		}

src/hxmake/Module.hx

@@ -13,14 +13,15 @@ class Project {
 	public var arguments(default, null):Arguments;
 
 	@:access(hxmake.Module)
-	function new(modules:Array<Module>, arguments:Arguments, workingDir:String, logger:Logger) {
+	function new(modules:Array<Module>, arguments:Arguments, runPath:String, logger:Logger) {
 		this.arguments = arguments;
 		this.logger = logger;
-		this.workingDir = Path.directory(workingDir);
 		this.modules = modules;
 		for (module in modules) {
 			module.project = this;
 		}
+
+		workingDir = Path.directory(runPath);
 	}
 
 	/**
@@ -49,4 +50,8 @@ class Project {
 		}
 		return null;
 	}
+
+	public function toString() {
+		return "Project";
+	}
 }

src/hxmake/Project.hx

@@ -1,73 +1,40 @@
 package hxmake;
 
-using hxmake.utils.TaskTools;
-
 class Task {
-	
+
 	public var name:String;
 	public var description:String = "";
 	public var enabled:Bool = true;
 
 	/**
-	* `Module` associated with this Task
+	* `Module` associated with this task node
 	**/
-	public var module(default, null):Module;
+	public var module(get, never):Module;
 
 	/**
 	 * `Project` of associated module
 	 * `null` if task is not linked to any module
 	**/
 	public var project(get, never):Project;
 
-	public var chainBefore(default, null):Array<Task> = [];
-	public var chainAfter(default, null):Array<Task> = [];
-
 	public var parent(default, null):Task;
 
+	/** Task attached directly to this task **/
+	var _module:Module;
+
+	/** Children before run BEFORE parent **/
+	var _childrenBefore:Array<Task> = [];
+
+	/** Children before run AFTER parent **/
+	var _childrenAfter:Array<Task> = [];
+
 	var __after:Map<String, String> = new Map();
 	var __before:Map<String, String> = new Map();
 	var __finalized:Map<String, String> = new Map();
 	var __depends:Map<String, String> = new Map();
 
-	var _doFirst:Array<Task -> Void> = [];
-	var _doLast:Array<Task -> Void> = [];
-
-	function _configure() {
-		this.logStep("Configuration BEGIN");
-		configure();
-		this.logStep("Sub-tasks configuration (BEFORE)");
-		for (chained in chainBefore) {
-			chained._configure();
-		}
-		this.logStep("Sub-tasks configuration (AFTER)");
-		for (chained in chainAfter) {
-			chained._configure();
-		}
-		this.logStep("Configuration END");
-	}
-
-	function _run() {
-		this.logStep("Run BEGIN");
-		this.logStep("Run BEFORE tasks");
-
-		for (chained in chainBefore) {
-			chained._run();
-		}
-		for (cb in _doFirst) {
-			cb(this);
-		}
-		this.logStep("Running");
-		run();
-
-		this.logStep("Run AFTER tasks");
-		for (cb in _doLast) {
-			cb(this);
-		}
-		for (chained in chainAfter) {
-			chained._run();
-		}
-		this.logStep("Run END");
-	}
+	var _doFirst = new Array<Task -> Void>();
+	var _doLast = new Array<Task -> Void>();
 
 	public function runAfter(task:String):Task {
 		__after.set(task, task);
@@ -90,22 +57,30 @@ class Task {
 		return this;
 	}
 
+	public function toString() {
+		return 'Task $name ($description)';
+	}
+
 	public function configure() {}
 
 	public function run() {}
 
-	public function then<T:Task>(task:T):T {
-		chainAfter.push(task);
-		task.parent = this;
-		task.module = module;
-		return task;
+	public function prepend(task:Task):Task {
+		return attachChild(task, _childrenBefore, true);
 	}
 
-	public function prepend<T:Task>(task:T):T {
-		chainBefore.push(task);
-		task.parent = this;
-		task.module = module;
-		return task;
+	public function then(task:Task):Task {
+		return attachChild(task, _childrenAfter, false);
+	}
+
+	public function doFirst(func:Task -> Void):Task {
+		_doFirst.insert(0, func);
+		return this;
+	}
+
+	public function doLast(func:Task -> Void):Task {
+		_doLast.push(func);
+		return this;
 	}
 
 	function fail(description:String = "") {
@@ -117,18 +92,24 @@ class Task {
 		}
 	}
 
-	public function doFirst(func:Task -> Void):Task {
-		_doFirst.push(func);
-		return this;
-	}
+	function attachChild(task:Task, array:Array<Task>, prepend:Bool):Task {
+		if (task.parent != null) project.logger.error("Task is a child already (TODO: info)");
+		task.parent = this;
+
+		if (_childrenBefore.indexOf(task) >= 0 || _childrenAfter.indexOf(task) >= 0) project.logger.error("Task is registered as child already (TODO: info)");
+		if (prepend) array.unshift(task);
+		else array.push(task);
 
-	public function doLast(func:Task -> Void):Task {
-		_doLast.push(func);
 		return this;
 	}
 
 	function get_project():Project {
-		return module != null ? module.project : null;
+		var m = this.module;
+		return m != null ? m.project : null;
+	}
+
+	function get_module():Module {
+		return _module != null ? _module : (parent != null ? parent.module : null);
 	}
 
 	public static function empty(name:String = null, description = ""):Task {
@@ -137,6 +118,12 @@ class Task {
 		task.description = description;
 		return task;
 	}
+
+	public static function func(fn:Void -> Void, name:String = null, description = ""):Task {
+		return empty(name, description).doLast(function(_) {
+			fn();
+		});
+	}
 }
 
 

src/hxmake/Task.hx

@@ -11,11 +11,11 @@ class FileUtil {
 	* 	returns path to created directory `path/dir`
 	**/
 	public static function ensureDirectory(path:String, dir:String):String {
-		if(!FileSystem.exists(path)) throw '$path not found';
-		if(!FileSystem.isDirectory(path)) throw '$path is not directory';
+		if (!FileSystem.exists(path)) throw '$path not found';
+		if (!FileSystem.isDirectory(path)) throw '$path is not directory';
 
 		path = Path.join([path, dir]);
-		if(!FileSystem.exists(path)) FileSystem.createDirectory(path);
+		if (!FileSystem.exists(path)) FileSystem.createDirectory(path);
 
 		return path;
 	}
@@ -83,6 +83,10 @@ class FileUtil {
 		return StringTools.replace(path1, "\\", "/") == StringTools.replace(path2, "\\", "/");
 	}
 
+	public static function normalizeAbsolute(path:String):String {
+		return Path.normalize(FileSystem.absolutePath(path));
+	}
+
 	public static function fileExists(path:String):Bool {
 		return FileSystem.exists(path) && !FileSystem.isDirectory(path);
 	}

src/hxmake/cli/FileUtil.hx

@@ -1,7 +1,5 @@
 package hxmake.core;
 
-import hxmake.cli.FileUtil;
-
 /**
 	Storage for data, which collected during compilation, or manually provided for Project
 **/
@@ -38,10 +36,10 @@ class CompiledProjectData {
 	static function resolveHierarchy(modules:Array<Module>, connections:Iterable<ModuleConnectionData>) {
 		for (connection in connections) {
 			for (parent in modules) {
-				if (FileUtil.pathEquals(parent.path, connection.parentPath)) {
+				if (parent.path == connection.parentPath) {
 					for (childPath in connection.childPath) {
 						for (child in modules) {
-							if (FileUtil.pathEquals(child.path, childPath)) {
+							if (child.path == childPath) {
 								appendChildModule(parent, child);
 							}
 						}

src/hxmake/core/CompiledProjectData.hx

@@ -1,35 +1,37 @@
 package hxmake.core;
 
 import hxmake.cli.CL;
+import hxmake.cli.MakeLog;
 import hxmake.Task;
 
 @:final
 @:access(hxmake.Task)
 class TaskQueue {
 
 	var _queue:Array<TaskNode>;
+	var _runner:TaskRunner;
 
 	public function new(queue:Array<TaskNode>) {
 		_queue = queue;
+		// TODO: as dependency
+		_runner = new TaskRunner(MakeLog.logger);
 	}
 
 	public function configure():Void {
 		var wd = CL.workingDir;
 		for (node in _queue) {
 			wd.with(node.module.path, function() {
-				node.task._configure();
+				_runner.configure(node.task);
 			});
 		}
 	}
 
 	public function run() {
 		var wd = CL.workingDir;
 		for (node in _queue) {
-			if (node.task.enabled) {
-				wd.with(node.module.path, function() {
-					node.task._run();
-				});
-			}
+			wd.with(node.module.path, function() {
+				_runner.run(node.task);
+			});
 		}
 	}
 }