whet 0.0.4 → 0.0.7

package/bin/whet/stones/Files.js

@@ -1,10 +1,11 @@
 import {MaybeArray_Fields_} from "../magic/MaybeArray.js"
 import {Stone} from "../Stone.js"
-import {RootDir, SourceId} from "../SourceId.js"
+import {SourceId_Fields_, RootDir, SourceId} from "../SourceId.js"
 import {SourceData} from "../Source.js"
-import {Path} from "../../haxe/io/Path.js"
+import * as Path from "path"
 import {Register} from "../../genes/Register.js"
 import * as Fs from "fs"
+import {StringTools} from "../../StringTools.js"
 import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
@@ -19,18 +20,19 @@ class Files extends Register.inherits(Stone) {
 		var _g = MaybeArray_Fields_.makeArray(this.config.paths);
 		while (0 < _g.length) {
 			var pathString = _g[0];
-			var norm = "/" + Path.normalize((pathString.charAt(0) == "/") ? HxOverrides.substr(pathString, 1, null) : pathString);
-			var path = [(pathString.lastIndexOf("/") == pathString.length - 1) ? Path.addTrailingSlash(norm) : norm];
+			var s = pathString;
+			s = Path.posix.normalize((pathString.length > 1 && SourceId_Fields_.startsWithSlash(pathString)) ? HxOverrides.substr(pathString, 1, null) : pathString);
+			s = StringTools.replace(s, "\\", "/");
+			var path = [(SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s];
 			var tmp;
-			var norm1 = "/" + Path.normalize((path[0].charAt(0) == "/") ? HxOverrides.substr(path[0], 1, null) : path[0]);
-			var tmp1 = (path[0].lastIndexOf("/") == path[0].length - 1) ? Path.addTrailingSlash(norm1) : norm1;
-			var s = Path.addTrailingSlash(Path.directory(path[0]));
-			var norm2 = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-			if (tmp1 == ((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm2) : norm2)) {
+			if (SourceId_Fields_.endsWithSlash(path[0])) {
 				tmp = new Promise((function (path) {
 					return function (res, rej) {
 						var root = RootDir.fromProject(_gthis.project);
-						Fs.readdir((root.length == 1) ? path[0].substring(1) : root.substring(1, root.length - 1) + path[0], (function (path) {
+						if (path[0].charAt(0) != "/") {
+							throw new Error("Badly formed SourceId.");
+						};
+						Fs.readdir(Path.posix.join(".", root, ".", path[0]), (function (path) {
 							return function (err, files) {
 								if (err != null) {
 									rej(err);
@@ -41,8 +43,10 @@ class Files extends Register.inherits(Stone) {
 									while (_g1 < files.length) {
 										var file = files[_g1];
 										++_g1;
-										var norm = "/" + Path.normalize((file.charAt(0) == "/") ? HxOverrides.substr(file, 1, null) : file);
-										var filepath = SourceId.getPutInDir((file.lastIndexOf("/") == file.length - 1) ? Path.addTrailingSlash(norm) : norm, path[0]);
+										var s = file;
+										s = Path.posix.normalize((file.length > 1 && SourceId_Fields_.startsWithSlash(file)) ? HxOverrides.substr(file, 1, null) : file);
+										s = StringTools.replace(s, "\\", "/");
+										var filepath = SourceId.getPutInDir((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s, path[0]);
 										_g.push({"id": SourceId.relativeTo(filepath, path[0]), "pathId": filepath});
 									};
 									res1(_g);
@@ -52,9 +56,10 @@ class Files extends Register.inherits(Stone) {
 					};
 				})(path));
 			} else {
-				var s1 = Path.withoutDirectory(path[0]);
-				var norm3 = "/" + Path.normalize((s1.charAt(0) == "/") ? HxOverrides.substr(s1, 1, null) : s1);
-				tmp = Promise.resolve([{"id": (s1.lastIndexOf("/") == s1.length - 1) ? Path.addTrailingSlash(norm3) : norm3, "pathId": path[0]}]);
+				var s1 = path[0].substring(path[0].lastIndexOf("/"));
+				s1 = Path.posix.normalize((s1.length > 1 && SourceId_Fields_.startsWithSlash(s1)) ? HxOverrides.substr(s1, 1, null) : s1);
+				s1 = StringTools.replace(s1, "\\", "/");
+				tmp = Promise.resolve([{"id": (SourceId_Fields_.startsWithSlash(s1)) ? s1 : "/" + s1, "pathId": path[0]}]);
 			};
 			return tmp.then((function () {
 				return function (files) {
@@ -63,9 +68,13 @@ class Files extends Register.inherits(Stone) {
 					while (_g1 < files.length) {
 						var f = files[_g1];
 						++_g1;
+						var f1 = f.id;
 						var this1 = f.pathId;
 						var root = RootDir.fromProject(_gthis.project);
-						_g.push(SourceData.fromFile(f.id, (root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1, f.pathId));
+						if (this1.charAt(0) != "/") {
+							throw new Error("Badly formed SourceId.");
+						};
+						_g.push(SourceData.fromFile(f1, Path.posix.join(".", root, ".", this1), f.pathId));
 					};
 					return Promise.all(_g);
 				};

package/bin/whet/stones/JsonStone.js

@@ -1,10 +1,12 @@
 import {RouteType_Fields_} from "../magic/RouteType.js"
 import {MaybeArray_Fields_} from "../magic/MaybeArray.js"
 import {Stone} from "../Stone.js"
+import {SourceId_Fields_} from "../SourceId.js"
 import {SourceHash} from "../SourceHash.js"
 import {SourceData} from "../Source.js"
-import {Path} from "../../haxe/io/Path.js"
+import * as Path from "path"
 import {Register} from "../../genes/Register.js"
+import {StringTools} from "../../StringTools.js"
 import {Reflect as Reflect__1} from "../../Reflect.js"
 import {HxOverrides} from "../../HxOverrides.js"
 
@@ -60,9 +62,7 @@ class JsonStone extends Register.inherits(Stone) {
 					};
 				};
 			};
-			var s = _gthis.config.name;
-			var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-			return [SourceData.fromString((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm, JSON.stringify(obj, null, "  "))];
+			return [SourceData.fromString(_gthis.config.name, JSON.stringify(obj, null, "  "))];
 		});
 	}
 	generateHash() {
@@ -92,8 +92,9 @@ class JsonStone extends Register.inherits(Stone) {
 	}
 	list() {
 		var s = this.config.name;
-		var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-		return Promise.resolve([(s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm]);
+		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
+		s = StringTools.replace(s, "\\", "/");
+		return Promise.resolve([(SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s]);
 	}
 	initConfig() {
 		if (this.config.name == null) {

package/bin/whet/stones/RemoteFile.js

@@ -1,14 +1,15 @@
 import {CacheStrategy, CacheDurability} from "../cache/Cache.js"
 import {Stone} from "../Stone.js"
+import {SourceId_Fields_} from "../SourceId.js"
 import {SourceHash} from "../SourceHash.js"
 import {SourceData} from "../Source.js"
 import {Log} from "../Log.js"
 import {URL} from "url"
 import * as Path from "path"
 import * as Https from "https"
-import {Path as Path__1} from "../../haxe/io/Path.js"
 import {Register} from "../../genes/Register.js"
 import {Buffer} from "buffer"
+import {StringTools} from "../../StringTools.js"
 import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
@@ -51,12 +52,9 @@ class RemoteFile extends Register.inherits(Stone) {
 	}
 	getId() {
 		var s = Path.basename(new URL(this.config.url).pathname);
-		var norm = "/" + Path__1.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-		if (s.lastIndexOf("/") == s.length - 1) {
-			return Path__1.addTrailingSlash(norm);
-		} else {
-			return norm;
-		};
+		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
+		s = StringTools.replace(s, "\\", "/");
+		return (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 	}
 	static get __name__() {
 		return "whet.stones.RemoteFile"

package/bin/whet/stones/Server.d.ts

@@ -6,7 +6,6 @@ import {SourceHash} from "../SourceHash"
 import {SourceData} from "../Source"
 import {Project} from "../Project"
 import {IncomingMessage, ServerResponse} from "http"
-import {Command} from "commander"
 
 export declare class Server extends Stone<ServerConfig> {
 	constructor(config: ServerConfig)
@@ -20,7 +19,7 @@ export declare class Server extends Stone<ServerConfig> {
 	*/
 	serve(): void
 	protected initConfig(): void
-	protected getCommands(): Command[]
+	protected addCommands(): void
 	protected handler(req: IncomingMessage, res: ServerResponse): void
 }
 

package/bin/whet/stones/Server.js

@@ -1,10 +1,11 @@
 import {Stone} from "../Stone.js"
+import {SourceId_Fields_} from "../SourceId.js"
 import {Log} from "../Log.js"
+import * as Path from "path"
 import Mime from "mime"
 import * as Http from "http"
-import {Path} from "../../haxe/io/Path.js"
 import {Register} from "../../genes/Register.js"
-import {Command} from "commander"
+import {StringTools} from "../../StringTools.js"
 import {Std} from "../../Std.js"
 import {HxOverrides} from "../../HxOverrides.js"
 
@@ -40,51 +41,54 @@ class Server extends Register.inherits(Stone) {
 		if (this.config.port == null) {
 			this.config.port = 7000;
 		};
+		this.project.addCommand("serve", this);
 	}
-	getCommands() {
+	addCommands() {
 		var _gthis = this;
-		return [new Command("serve").option("-p, --port <port>", "server port", "" + this.config.port).action(function (...args) {
+		this.project.addCommand("serve", this).option("-p, --port <port>", "server port", "" + this.config.port).action(function (...args) {
 			if (args[0].port != null) {
 				_gthis.config.port = Std.parseInt(args[0].port);
 			};
 			_gthis.serve();
 			return null;
-		})];
+		});
 	}
 	handler(req, res) {
 		var _gthis = this;
 		Log.log(30, ...["Handling request.", {"url": req.url, "method": req.method}]);
-		var id;
 		var s = req.url;
-		var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-		id = (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm;
+		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
+		s = StringTools.replace(s, "\\", "/");
+		var id = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 		if (req.method == "GET") {
-			var norm = "/" + Path.normalize((id.charAt(0) == "/") ? HxOverrides.substr(id, 1, null) : id);
-			var tmp = (id.lastIndexOf("/") == id.length - 1) ? Path.addTrailingSlash(norm) : norm;
-			var s = Path.addTrailingSlash(Path.directory(id));
-			var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-			if (tmp == ((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm)) {
+			if (SourceId_Fields_.endsWithSlash(id)) {
 				if ("index.html".length > 0) {
-					var s = Path.addTrailingSlash(Path.directory(id));
-					var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-					id = ((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm) + "index.html";
+					var s = id.substring(0, id.lastIndexOf("/") + 1);
+					s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
+					s = StringTools.replace(s, "\\", "/");
+					id = ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s) + "index.html";
 				};
-			} else if (Path.extension(id) == "") {
+			} else if (Path.posix.extname(id) == "") {
 				var s = "" + id + "/index.html";
-				var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-				id = (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm;
+				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
+				s = StringTools.replace(s, "\\", "/");
+				id = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			};
 			this.config.router.find(id).then(function (routeResult) {
 				var sourcePromise = (routeResult.length > 0) ? routeResult[0].get() : (_gthis.routeDynamic != null) ? _gthis.routeDynamic(id) : null;
 				if (sourcePromise != null) {
 					sourcePromise.then(function (source) {
-						res.writeHead(200, {"Content-Type": Mime.getType(Path.extension(id).toLowerCase()), "Last-Modified": new Date(source.source.ctime * 1000).toUTCString(), "Content-Length": Std.string(source.data.length), "Cache-Control": "no-store, no-cache"});
+						res.writeHead(200, {"Content-Type": Mime.getType(Path.posix.extname(id).toLowerCase()), "Last-Modified": new Date(source.source.ctime * 1000).toUTCString(), "Content-Length": Std.string(source.data.length), "Cache-Control": "no-store, no-cache"});
 						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");
+						if (((e) instanceof Error)) {
+							res.write(e.stack, "utf-8");
+						} else {
+							res.write(Std.string(e), "utf-8");
+						};
 						res.end();
 					});
 				} else {
@@ -94,7 +98,11 @@ class Server extends Register.inherits(Stone) {
 			})["catch"](function (e) {
 				Log.log(40, ...["Server error.", {"error": e}]);
 				res.writeHead(500, "Error happened.");
-				res.write(Std.string(e), "utf-8");
+				if (((e) instanceof Error)) {
+					res.write(e.stack, "utf-8");
+				} else {
+					res.write(Std.string(e), "utf-8");
+				};
 				res.end();
 			});
 		} else {

package/bin/whet/stones/Zip.js

@@ -1,17 +1,19 @@
 import {Router} from "../route/Router.js"
 import {CacheStrategy, CacheDurability, DurabilityCheck} from "../cache/Cache.js"
 import {Stone} from "../Stone.js"
+import {SourceId_Fields_} from "../SourceId.js"
 import {SourceHash} from "../SourceHash.js"
 import {SourceData} from "../Source.js"
 import {Log} from "../Log.js"
+import * as Path from "path"
 import {Helper} from "../../js/node/buffer/Buffer.js"
 import {Writer} from "../../haxe/zip/Writer.js"
 import {Tools} from "../../haxe/zip/Tools.js"
-import {Path} from "../../haxe/io/Path.js"
 import {BytesOutput} from "../../haxe/io/BytesOutput.js"
 import {Crc32} from "../../haxe/crypto/Crc32.js"
 import {Register} from "../../genes/Register.js"
 import {Buffer} from "buffer"
+import {StringTools} from "../../StringTools.js"
 import {Lambda} from "../../Lambda.js"
 import {HxOverrides} from "../../HxOverrides.js"
 
@@ -56,7 +58,7 @@ class ZipStone extends Register.inherits(Stone) {
 		return Promise.all(result).then(function (hashes) {
 			return SourceHash.merge(...hashes);
 		}).then(function (hash) {
-			return SourceHash.add(SourceHash.fromString(_gthis.config.filename + _gthis.config.level), hash);
+			return SourceHash.fromString(_gthis.config.filename + _gthis.config.level).add(hash);
 		});
 	}
 	generate(hash) {
@@ -73,9 +75,14 @@ class ZipStone extends Register.inherits(Stone) {
 					return function (data) {
 						var bytes = Helper.bytesOfBuffer(data.data);
 						var this1 = file[0].serveId;
-						var norm = "/" + Path.normalize(("/".charAt(0) == "/") ? HxOverrides.substr("/", 1, null) : "/");
-						var root = ("/".lastIndexOf("/") == "/".length - 1) ? Path.addTrailingSlash(norm) : norm;
-						var entry = {"fileName": (root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1, "fileSize": data.data.length, "fileTime": new Date(data.source.ctime * 1000), "compressed": false, "dataSize": data.data.length, "data": bytes, "crc32": Crc32.make(bytes)};
+						var s = "/";
+						s = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
+						s = StringTools.replace(s, "\\", "/");
+						var root = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+						if (this1.charAt(0) != "/") {
+							throw new Error("Badly formed SourceId.");
+						};
+						var entry = {"fileName": Path.posix.join(".", root, ".", this1), "fileSize": data.data.length, "fileTime": new Date(data.source.ctime * 1000), "compressed": false, "dataSize": data.data.length, "data": bytes, "crc32": Crc32.make(bytes)};
 						Tools.compress(entry, level);
 						return entry;
 					};
@@ -84,19 +91,18 @@ class ZipStone extends Register.inherits(Stone) {
 			return Promise.all(_g).then(function (entries) {
 				var out = new BytesOutput();
 				new Writer(out).write(Lambda.list(entries));
-				var s = _gthis.config.filename;
-				var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-				var tmp = (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm;
+				var _gthis1 = _gthis.config.filename;
 				var b = out.getBytes();
 				var data = b.b;
-				return [SourceData.fromBytes(tmp, Buffer.from(data.buffer, data.byteOffset, b.length))];
+				return [SourceData.fromBytes(_gthis1, Buffer.from(data.buffer, data.byteOffset, b.length))];
 			});
 		});
 	}
 	list() {
 		var s = this.config.filename;
-		var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-		return Promise.resolve([(s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm]);
+		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
+		s = StringTools.replace(s, "\\", "/");
+		return Promise.resolve([(SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s]);
 	}
 	static get __name__() {
 		return "whet.stones.ZipStone"

package/bin/whet/stones/haxe/HaxeBuild.d.ts

@@ -8,12 +8,14 @@ import {Project} from "../../Project"
 
 export declare class HaxeBuild extends Stone<BuildConfig> {
 	constructor(config: BuildConfig)
+	protected initConfig(): void
 	
 	/**
 	Build the given hxml.
 	*/
 	build(): Promise<any>
 	protected generate(hash: SourceHash): Promise<SourceData[]>
+	protected addCommands(): void
 	list(): Promise<string[]>
 	protected generateHash(): Promise<SourceHash>
 }

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

@@ -1,16 +1,14 @@
 import {MaybeArray_Fields_} from "../../magic/MaybeArray.js"
 import {Utils} from "../../Utils.js"
 import {Stone} from "../../Stone.js"
-import {RootDir} from "../../SourceId.js"
+import {SourceId_Fields_, 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 * as Path from "path"
 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
@@ -20,18 +18,29 @@ class HaxeBuild extends Register.inherits(Stone) {
 	new(config) {
 		super.new(config);
 	}
+	initConfig() {
+		if (this.config.cacheStrategy == null) {
+			this.config.cacheStrategy = this.project.cache.defaultFileStrategy;
+		};
+	}
 	
 	/**
 	Build the given hxml.
 	*/
 	build() {
 		var _gthis = this;
+		Log.log(30, ...["Building Haxe project."]);
 		return new Promise(function (res, rej) {
 			var cwd = process.cwd();
 			var this1 = _gthis.project.rootDir;
-			var norm = "/" + Path.normalize(("/".charAt(0) == "/") ? HxOverrides.substr("/", 1, null) : "/");
-			var root = ("/".lastIndexOf("/") == "/".length - 1) ? Path.addTrailingSlash(norm) : norm;
-			var cwd1 = Path__1.join(cwd, (root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1);
+			var s = "/";
+			s = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
+			s = StringTools.replace(s, "\\", "/");
+			var root = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+			if (this1.charAt(0) != "/") {
+				throw new Error("Badly formed SourceId.");
+			};
+			var cwd1 = Path.join(cwd, Path.posix.join(".", root, ".", this1));
 			var _g = [];
 			var e = Register.iter(_gthis.config.hxml.getBuildArgs());
 			while (e.hasNext()) {
@@ -60,23 +69,27 @@ class HaxeBuild extends Register.inherits(Stone) {
 		if (this.config.hxml.isSingleFile()) {
 			var pathId = this.config.hxml.getBuildExportPath();
 			var root = RootDir.fromProject(this.project);
-			var path = (root.length == 1) ? pathId.substring(1) : root.substring(1, root.length - 1) + pathId;
+			if (pathId.charAt(0) != "/") {
+				throw new Error("Badly formed SourceId.");
+			};
+			var path = Path.posix.join(".", root, ".", pathId);
 			return Utils.deleteAll(path).then(function (_) {
 				return _gthis.build();
 			}).then(function (_) {
-				var s = Path.withoutDirectory(pathId);
-				var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-				return SourceData.fromFile((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm, path, pathId).then(function (file) {
+				return SourceData.fromFile(pathId.substring(pathId.lastIndexOf("/")), path, pathId).then(function (file) {
 					return [file];
 				});
-			})["catch"](function (err) {
-				Log.log(50, ...["Error during Haxe build.", {"error": err}]);
-				return null;
 			});
 		} else {
 			throw new Error("Cannot get source of a multi-file build. Not implemented yet.");
 		};
 	}
+	addCommands() {
+		var _gthis = this;
+		this.project.addCommand("build", this).action(function (..._) {
+			return _gthis.build();
+		});
+	}
 	list() {
 		if (this.config.hxml.isSingleFile()) {
 			return Promise.resolve([this.config.hxml.getBuildFilename()]);
@@ -85,56 +98,24 @@ class HaxeBuild extends Register.inherits(Stone) {
 		};
 	}
 	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);
+		var _this = MaybeArray_Fields_.makeArray(this.config.hxml.config.paths);
+		var result = new Array(_this.length);
+		var _g = 0;
+		var _g1 = _this.length;
+		while (_g < _g1) {
+			var i = _g++;
+			var s = _this[i];
+			s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
+			s = StringTools.replace(s, "\\", "/");
+			var this1 = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+			var root = RootDir.fromProject(this.config.hxml.project);
+			if (this1.charAt(0) != "/") {
+				throw new Error("Badly formed SourceId.");
 			};
-			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;
+			result[i] = Path.posix.join(".", root, ".", this1);
+		};
+		return Promise.all([this.config.hxml.generateHash(), SourceHash.fromFiles(result)]).then(function (r) {
+			return SourceHash.merge(...r);
 		});
 	}
 	static get __name__() {

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

@@ -3,12 +3,13 @@ import {StoneId_Fields_} from "../../magic/StoneId.js"
 import {MaybeArray_Fields_} from "../../magic/MaybeArray.js"
 import {CacheStrategy, CacheDurability} from "../../cache/Cache.js"
 import {Stone} from "../../Stone.js"
-import {SourceId} from "../../SourceId.js"
+import {SourceId, SourceId_Fields_} from "../../SourceId.js"
 import {SourceHash} from "../../SourceHash.js"
 import {SourceData} from "../../Source.js"
 import {Log} from "../../Log.js"
-import {Path} from "../../../haxe/io/Path.js"
+import * as Path from "path"
 import {Register} from "../../../genes/Register.js"
+import {StringTools} from "../../../StringTools.js"
 import {HxOverrides} from "../../../HxOverrides.js"
 
 const $global = Register.$global
@@ -26,7 +27,7 @@ class Hxml extends Register.inherits(Stone) {
 	}
 	clone(id) {
 		var configClone = this.cloneConfig(this.config);
-		configClone.id = StoneId_Fields_.makeStoneId(id);
+		configClone.id = StoneId_Fields_.makeStoneId((id == null) ? this.id : id);
 		return new Hxml(configClone);
 	}
 	mergeConfig(additionalConfig) {
@@ -148,19 +149,24 @@ class Hxml extends Register.inherits(Stone) {
 			var filename;
 			if (this.build.config.filename != null) {
 				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;
+				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
+				s = StringTools.replace(s, "\\", "/");
+				filename = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			} else {
-				var norm = "/" + Path.normalize(("build".charAt(0) == "/") ? HxOverrides.substr("build", 1, null) : "build");
-				filename = ("build".lastIndexOf("/") == "build".length - 1) ? Path.addTrailingSlash(norm) : norm;
+				var s = "build";
+				s = Path.posix.normalize(("build".length > 1 && SourceId_Fields_.startsWithSlash("build")) ? HxOverrides.substr("build", 1, null) : "build");
+				s = StringTools.replace(s, "\\", "/");
+				filename = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			};
-			if (Path.extension(filename) == "") {
+			if (Path.posix.extname(filename) == "") {
 				var v = this.getBuildExtension();
-				var p = new Path(filename);
-				p.ext = v;
-				var s = p.toString();
-				var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-				filename = (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm;
+				if (v.length > 0 && HxOverrides.cca(v, 0) != 46) {
+					v = "." + v;
+				};
+				var s = filename.substring(0, filename.lastIndexOf("/") + 1);
+				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
+				s = StringTools.replace(s, "\\", "/");
+				filename = ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s) + Path.posix.parse(filename.substring(filename.lastIndexOf("/"))).name + v;
 			};
 			return filename;
 		} else {
@@ -169,9 +175,14 @@ class Hxml extends Register.inherits(Stone) {
 	}
 	getPlatform() {
 		var this1 = this.getBuildExportPath();
-		var norm = "/" + Path.normalize(("/".charAt(0) == "/") ? HxOverrides.substr("/", 1, null) : "/");
-		var root = ("/".lastIndexOf("/") == "/".length - 1) ? Path.addTrailingSlash(norm) : norm;
-		var path = (root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1;
+		var s = "/";
+		s = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
+		s = StringTools.replace(s, "\\", "/");
+		var root = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+		if (this1.charAt(0) != "/") {
+			throw new Error("Badly formed SourceId.");
+		};
+		var path = Path.posix.join(".", root, ".", this1);
 		var _g = this.config.platform;
 		if (_g == null) {
 			return [];
@@ -271,14 +282,18 @@ class Hxml extends Register.inherits(Stone) {
 	}
 	filename() {
 		var s = this.id;
-		var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-		var fn = (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm;
-		if (Path.extension(fn) == "") {
-			var p = new Path(fn);
-			p.ext = "hxml";
-			var s = p.toString();
-			var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-			fn = (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm;
+		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
+		s = StringTools.replace(s, "\\", "/");
+		var fn = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+		if (Path.posix.extname(fn) == "") {
+			var v = "hxml";
+			if ("hxml".length > 0 && HxOverrides.cca("hxml", 0) != 46) {
+				v = "." + "hxml";
+			};
+			var s = fn.substring(0, fn.lastIndexOf("/") + 1);
+			s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
+			s = StringTools.replace(s, "\\", "/");
+			fn = ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s) + Path.posix.parse(fn.substring(fn.lastIndexOf("/"))).name + v;
 		};
 		return fn;
 	}