whet 0.0.3 → 0.0.4

package/bin/haxe/Log.d.ts

@@ -0,0 +1,33 @@
+import {PosInfos} from "./PosInfos"
+
+/**
+Log primarily provides the `trace()` method, which is invoked upon a call to
+`trace()` in Haxe code.
+*/
+export declare class Log {
+	
+	/**
+	Format the output of `trace` before printing it.
+	*/
+	static formatOutput(v: any, infos: PosInfos): string
+	
+	/**
+	Outputs `v` in a platform-dependent way.
+	
+	The second parameter `infos` is injected by the compiler and contains
+	information about the position where the `trace()` call was made.
+	
+	This method can be rebound to a custom function:
+	
+	var oldTrace = haxe.Log.trace; // store old function
+	haxe.Log.trace = function(v, ?infos) {
+	// handle trace
+	}
+	...
+	haxe.Log.trace = oldTrace;
+	
+	If it is bound to null, subsequent calls to `trace()` will cause an
+	exception.
+	*/
+	static trace(v: any, infos?: null | PosInfos): void
+}

package/bin/haxe/Log.js

@@ -0,0 +1,61 @@
+import {Register} from "../genes/Register.js"
+import {Std} from "../Std.js"
+
+const $global = Register.$global
+
+/**
+Log primarily provides the `trace()` method, which is invoked upon a call to
+`trace()` in Haxe code.
+*/
+export const Log = Register.global("$hxClasses")["haxe.Log"] = 
+class Log {
+	
+	/**
+	Format the output of `trace` before printing it.
+	*/
+	static formatOutput(v, infos) {
+		var str = Std.string(v);
+		if (infos == null) {
+			return str;
+		};
+		var pstr = infos.fileName + ":" + infos.lineNumber;
+		if (infos.customParams != null) {
+			var _g = 0;
+			var _g1 = infos.customParams;
+			while (_g < _g1.length) str += ", " + Std.string(_g1[_g++]);
+		};
+		return pstr + ": " + str;
+	}
+	
+	/**
+	Outputs `v` in a platform-dependent way.
+	
+	The second parameter `infos` is injected by the compiler and contains
+	information about the position where the `trace()` call was made.
+	
+	This method can be rebound to a custom function:
+	
+	var oldTrace = haxe.Log.trace; // store old function
+	haxe.Log.trace = function(v, ?infos) {
+	// handle trace
+	}
+	...
+	haxe.Log.trace = oldTrace;
+	
+	If it is bound to null, subsequent calls to `trace()` will cause an
+	exception.
+	*/
+	static trace(v, infos) {
+		var str = Log.formatOutput(v, infos);
+		if (typeof(console) != "undefined" && console.log != null) {
+			console.log(str);
+		};
+	}
+	static get __name__() {
+		return "haxe.Log"
+	}
+	get __class__() {
+		return Log
+	}
+}
+

package/bin/whet/Project.js

@@ -34,6 +34,7 @@ class Project extends Register.inherits() {
 			};
 			var file = new Error().stack[3].getFileName();
 			Error.prepareStackTrace = oldValue;
+			file = decodeURI(file);
 			file = StringTools.replace(file, "file:///", "");
 			var s = Path.relative(process.cwd(), file);
 			var norm = "/" + Path__1.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);

package/bin/whet/SourceHash.d.ts

@@ -5,6 +5,7 @@ export declare class SourceHash {
 	protected bytes: Buffer
 	toString(): string
 	static EMPTY: SourceHash
+	static fromFile(path: string): Promise<SourceHash>
 	static fromBytes(data: Buffer): SourceHash
 	static fromString(data: string): SourceHash
 	static add(a: SourceHash, b: SourceHash): SourceHash

package/bin/whet/SourceHash.js

@@ -1,4 +1,5 @@
 import {Register} from "../genes/Register.js"
+import * as Fs from "fs"
 import * as Crypto from "crypto"
 import {Buffer} from "buffer"
 
@@ -12,6 +13,17 @@ class SourceHash extends Register.inherits() {
 	toString() {
 		return this.bytes.toString("hex");
 	}
+	static fromFile(path) {
+		return new Promise(function (res, rej) {
+			Fs.readFile(path, function (err, bytes) {
+				if (err != null) {
+					rej(err);
+				} else {
+					res(SourceHash.fromBytes(bytes));
+				};
+			});
+		});
+	}
 	static fromBytes(data) {
 		return new SourceHash(Crypto.createHash("sha256").update(data).digest());
 	}

package/bin/whet/Utils.d.ts

@@ -13,4 +13,5 @@ export declare class Utils {
 	*/
 	static saveBytes(path: string, bytes: Buffer): Promise<any>
 	static deleteAll(path: string): Promise<any>
+	static listDirectoryRecursively(dir: string): Promise<string[]>
 }

package/bin/whet/Utils.js

@@ -59,6 +59,39 @@ class Utils {
 		return new Promise(function (res, rej) {
 			Fs.rm(path, { recursive : true, force : true}, function(_) {
 	res(null);
+});
+		});
+	}
+	static listDirectoryRecursively(dir) {
+		return new Promise(function (res, rej) {
+			var result = [];
+			Fs.readdir(dir, { withFileTypes : true}, function(err,files) {
+	if(err != null) {
+		rej(err);
+	} else {
+		var otherDirs = [];
+		var _g = 0;
+		while(_g < files.length) {
+			var file = files[_g];
+			++_g;
+			var path = Path.join(dir,file.name);
+			if(file.isDirectory()) {
+				otherDirs.push(Utils.listDirectoryRecursively(path));
+			} else {
+				result.push(path);
+			}
+		}
+		Promise.all(otherDirs).then(function(arr) {
+			var _g = 0;
+			while(_g < arr.length) {
+				var a = arr[_g];
+				++_g;
+				var _g1 = 0;
+				while(_g1 < a.length) result.push(a[_g1++]);
+			}
+			res(result);
+		});
+	}
 });
 		});
 	}

package/bin/whet/Whet.js

@@ -64,6 +64,7 @@ class Whet_Fields_ {
 				var p = _g1[_g];
 				++_g;
 				if (p.onInit != null) {
+					Log.log(10, ...["Initializing project.", {"project": p.id}]);
 					var prom = p.onInit(Whet_Fields_.program.opts());
 					if (prom != null) {
 						promises.push(prom);

package/bin/whet/cache/BaseCache.js

@@ -26,16 +26,16 @@ class BaseCache extends Register.inherits() {
 	}
 	get(stone, durability, check) {
 		var _gthis = this;
-		Log.log(20, ...["Looking for cached source.", {"stone": stone, "cache": this}]);
 		return stone.generateHash().then(function (hash) {
 			if (hash == null) {
-				Log.log(10, ...["Generating source, because it does not supply a hash.", {"stone": stone, "cache": _gthis}]);
+				Log.log(20, ...["Generating source, because it does not supply a hash.", {"stone": stone, "cache": _gthis}]);
 			};
 			if (hash == null) {
 				return stone.generateSource(null).then(function (generatedSource) {
 					return {"generatedSource": generatedSource, "hash": generatedSource.hash};
 				});
 			} else {
+				Log.log(20, ...["Stone provided hash.", {"stone": stone, "hash": SourceHash.toHex(hash)}]);
 				return Promise.resolve({"generatedSource": null, "hash": hash});
 			};
 		}).then(function (data) {
@@ -100,6 +100,7 @@ class BaseCache extends Register.inherits() {
 	}
 	set(source) {
 		var _gthis = this;
+		Log.log(10, ...["Setting source in cache.", {"source": source}]);
 		var k = this.key(source.origin);
 		if (!this.cache.exists(k)) {
 			this.cache.set(k, []);
@@ -141,7 +142,7 @@ class BaseCache extends Register.inherits() {
 		return SourceId.getPutInDir((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm, baseDir);
 	}
 	checkDurability(stone, values, durability, useIndex, ageIndex) {
-		Log.log(10, ...["Checking durability.", {"stone": stone, "durability": Std.string(durability)}]);
+		Log.log(20, ...["Checking durability.", {"stone": stone, "durability": Std.string(durability)}]);
 		if (values == null || values.length == 0) {
 			return;
 		};
@@ -190,6 +191,7 @@ class BaseCache extends Register.inherits() {
 		return true;
 	}
 	remove(stone, value) {
+		Log.log(20, ...["Removing cached value.", {"stone": stone, "valueHash": SourceHash.toHex(value.hash)}]);
 		HxOverrides.remove(this.cache.get(this.key(stone)), value);
 		return Promise.resolve(null);
 	}

package/bin/whet/cache/CacheManager.js

@@ -21,7 +21,7 @@ class CacheManager extends Register.inherits() {
 	}
 	getSource(stone) {
 		var e = stone.cacheStrategy;
-		Log.log(10, ...["Looking for cached value.", {"stone": stone, "strategy": Register.global("$hxEnums")[e.__enum__].__constructs__[e._hx_index]._hx_name}]);
+		Log.log(10, ...["Determining cache status.", {"stone": stone, "strategy": Register.global("$hxEnums")[e.__enum__].__constructs__[e._hx_index]._hx_name}]);
 		var _g = stone.cacheStrategy;
 		switch (_g._hx_index) {
 			case 0:

package/bin/whet/cache/FileCache.js

@@ -99,7 +99,17 @@ class FileCache extends Register.inherits(BaseCache) {
 		if (_g._hx_index == 3) {
 			var _g1 = _g.path;
 			var invalidPath;
+			var invalidPath1;
 			if (value.files.length == 1) {
+				var norm = "/" + Path.normalize((_g1.charAt(0) == "/") ? HxOverrides.substr(_g1, 1, null) : _g1);
+				var invalidPath2 = (_g1.lastIndexOf("/") == _g1.length - 1) ? Path.addTrailingSlash(norm) : norm;
+				var s = Path.addTrailingSlash(Path.directory(_g1));
+				var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
+				invalidPath1 = invalidPath2 != ((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm);
+			} else {
+				invalidPath1 = false;
+			};
+			if (invalidPath1) {
 				invalidPath = value.files[0].filePath != _g1;
 			} else {
 				var value1 = value.baseDir;
@@ -183,14 +193,14 @@ class FileCache extends Register.inherits(BaseCache) {
 						Log.log(20, ...["Deleting file.", {"path": (root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1}]);
 						var this1 = file[0].filePath;
 						var root = _gthis.rootDir;
-						Fs.unlink((root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1, (function () {
+						Fs.unlink((root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1, (function (file) {
 							return function (err) {
 								if (err != null) {
-									Log.log(50, ...[err]);
+									Log.log(50, ...["Error deleting file.", {"file": file[0], "error": err}]);
 								};
 								res(null);
 							};
-						})());
+						})(file));
 					};
 				})([_g2[_g1++]])));
 				return Promise.all(_g);
@@ -201,14 +211,18 @@ class FileCache extends Register.inherits(BaseCache) {
 				var root = _gthis.rootDir;
 				Fs.readdir((root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1, function (err, files) {
 					if (err != null) {
-						Log.log(50, ...[err]);
+						var this1 = value.baseDir;
+						var root = _gthis.rootDir;
+						Log.log(50, ...["Error reading directory", {"dir": (root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1, "error": err}]);
 						res(null);
 					} else if (files.length == 0) {
 						var this1 = value.baseDir;
 						var root = _gthis.rootDir;
 						Fs.rmdir((root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1, function (err) {
 							if (err != null) {
-								Log.log(50, ...[err]);
+								var this1 = value.baseDir;
+								var root = _gthis.rootDir;
+								Log.log(50, ...["Error removing directory.", {"dir": (root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1, "error": err}]);
 							};
 							res(null);
 						});

package/bin/whet/stones/Server.js

@@ -82,6 +82,7 @@ class Server extends Register.inherits(Stone) {
 						res.write(source.data, "binary");
 						res.end();
 					})["catch"](function (e) {
+						Log.log(40, ...["Server error.", {"error": e}]);
 						res.writeHead(500, "Error happened.");
 						res.write(Std.string(e), "utf-8");
 						res.end();
@@ -91,6 +92,7 @@ class Server extends Register.inherits(Stone) {
 					res.end();
 				};
 			})["catch"](function (e) {
+				Log.log(40, ...["Server error.", {"error": e}]);
 				res.writeHead(500, "Error happened.");
 				res.write(Std.string(e), "utf-8");
 				res.end();

package/bin/whet/stones/haxe/HaxeBuild.js

@@ -1,12 +1,16 @@
+import {MaybeArray_Fields_} from "../../magic/MaybeArray.js"
 import {Utils} from "../../Utils.js"
 import {Stone} from "../../Stone.js"
 import {RootDir} from "../../SourceId.js"
+import {SourceHash} from "../../SourceHash.js"
 import {SourceData} from "../../Source.js"
 import {Log} from "../../Log.js"
 import * as Path__1 from "path"
 import {Path, Path as Path__2} from "../../../haxe/io/Path.js"
 import {Register} from "../../../genes/Register.js"
 import * as ChildProcess from "child_process"
+import {StringTools} from "../../../StringTools.js"
+import {Lambda} from "../../../Lambda.js"
 import {HxOverrides} from "../../../HxOverrides.js"
 
 const $global = Register.$global
@@ -35,7 +39,14 @@ class HaxeBuild extends Register.inherits(Stone) {
 				while (x.hasNext()) _g.push(x.next());
 			};
 			_g.unshift((_gthis.config.useNpx) ? "npx haxe" : "haxe");
-			ChildProcess.exec(_g.join(" "), {"cwd": cwd1, "windowsHide": true}, function (err, stdout, stderr) {
+			var result = new Array(_g.length);
+			var _g1 = 0;
+			var _g2 = _g.length;
+			while (_g1 < _g2) {
+				var i = _g1++;
+				result[i] = StringTools.replace(_g[i], "\"", "\\\"");
+			};
+			ChildProcess.exec(result.join(" "), {"cwd": cwd1, "windowsHide": true}, function (err, stdout, stderr) {
 				if (err != null) {
 					rej(err);
 				} else {
@@ -59,7 +70,7 @@ class HaxeBuild extends Register.inherits(Stone) {
 					return [file];
 				});
 			})["catch"](function (err) {
-				Log.log(50, ...[err]);
+				Log.log(50, ...["Error during Haxe build.", {"error": err}]);
 				return null;
 			});
 		} else {
@@ -74,7 +85,57 @@ class HaxeBuild extends Register.inherits(Stone) {
 		};
 	}
 	generateHash() {
-		return this.config.hxml.generateHash();
+		var hxmlHashP = this.config.hxml.generateHash();
+		var _g = [];
+		var _g1 = 0;
+		var _g2 = MaybeArray_Fields_.makeArray(this.config.hxml.config.paths);
+		while (_g1 < _g2.length) {
+			var src = _g2[_g1];
+			++_g1;
+			_g.push(Utils.listDirectoryRecursively(src));
+		};
+		var fileHashesP = Promise.all(_g).then(function (arrFiles) {
+			var result = new Array(arrFiles.length);
+			var _g = 0;
+			var _g1 = arrFiles.length;
+			while (_g < _g1) {
+				var i = _g++;
+				var files = arrFiles[i];
+				files.sort();
+				var result1 = new Array(files.length);
+				var _g2 = 0;
+				var _g3 = files.length;
+				while (_g2 < _g3) {
+					var i1 = _g2++;
+					result1[i1] = SourceHash.fromFile(files[i1]);
+				};
+				result[i] = Promise.all(result1);
+			};
+			return result;
+		}).then(function (proms) {
+			return Promise.all(proms);
+		}).then(function (allHashes) {
+			var _g = [];
+			var _g_current = 0;
+			var _g_array = allHashes;
+			while (_g_current < _g_array.length) {
+				var e = _g_array[_g_current++];
+				var x = Register.iter(e);
+				while (x.hasNext()) {
+					var x1 = x.next();
+					_g.push(x1);
+				};
+			};
+			return _g;
+		});
+		return Promise.all([hxmlHashP, fileHashesP]).then(function (r) {
+			var hxmlHash = r[0];
+			var fileHashes = r[1];
+			var r = Lambda.fold(fileHashes, function (i, r) {
+				return SourceHash.add(r, i);
+			}, hxmlHash);
+			return r;
+		});
 	}
 	static get __name__() {
 		return "whet.stones.haxe.HaxeBuild"

package/bin/whet/stones/haxe/Hxml.js

@@ -88,18 +88,23 @@ class Hxml extends Register.inherits(Stone) {
 		};
 		var args1 = args.concat(result);
 		if (this.config.dce != null) {
+			var _g = this.config.dce;
 			var tmp;
-			switch (this.config.dce._hx_index) {
-				case 0:
-					tmp = "std";
-					break
-				case 1:
-					tmp = "full";
-					break
-				case 2:
-					tmp = "no";
-					break
-				
+			if (_g == null) {
+				throw new Error("Invalid DCE value.");
+			} else {
+				switch (_g._hx_index) {
+					case 0:
+						tmp = "std";
+						break
+					case 1:
+						tmp = "full";
+						break
+					case 2:
+						tmp = "no";
+						break
+					
+				};
 			};
 			args1.push(["-dce", tmp]);
 		};
@@ -142,7 +147,9 @@ class Hxml extends Register.inherits(Stone) {
 		if (this.isSingleFile()) {
 			var filename;
 			if (this.build.config.filename != null) {
-				filename = this.build.config.filename;
+				var s = this.build.config.filename;
+				var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
+				filename = (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm;
 			} else {
 				var norm = "/" + Path.normalize(("build".charAt(0) == "/") ? HxOverrides.substr("build", 1, null) : "build");
 				filename = ("build".lastIndexOf("/") == "build".length - 1) ? Path.addTrailingSlash(norm) : norm;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "whet",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "description": "NodeJS based assets management and project tooling library.",
     "scripts": {
         "devinit": "npx dts2hx commander --modular --noLibWrap",