whet 0.0.5 → 0.0.6

package/bin/whet/cache/FileCache.js

@@ -1,12 +1,14 @@
 import {BaseCache} from "./BaseCache.js"
 import {Utils} from "../Utils.js"
+import {SourceId_Fields_} from "../SourceId.js"
 import {SourceHash} from "../SourceHash.js"
 import {SourceData, Source} from "../Source.js"
 import {Log} from "../Log.js"
-import {Path} from "../../haxe/io/Path.js"
+import * as Path from "path"
 import {StringMap} from "../../haxe/ds/StringMap.js"
 import {Register} from "../../genes/Register.js"
 import * as Fs from "fs"
+import {StringTools} from "../../StringTools.js"
 import {Reflect as Reflect__1} from "../../Reflect.js"
 import {Lambda} from "../../Lambda.js"
 import {HxOverrides} from "../../HxOverrides.js"
@@ -18,9 +20,14 @@ class FileCache extends Register.inherits(BaseCache) {
 	new(rootDir) {
 		this.flushQueued = false;
 		super.new(rootDir, new StringMap());
-		var norm = "/" + Path.normalize((".whet/cache.json".charAt(0) == "/") ? HxOverrides.substr(".whet/cache.json", 1, null) : ".whet/cache.json");
-		var this1 = (".whet/cache.json".lastIndexOf("/") == ".whet/cache.json".length - 1) ? Path.addTrailingSlash(norm) : norm;
-		this.dbFile = (rootDir.length == 1) ? this1.substring(1) : rootDir.substring(1, rootDir.length - 1) + this1;
+		var s = ".whet/cache.json";
+		s = Path.posix.normalize(".whet/cache.json");
+		s = StringTools.replace(s, "\\", "/");
+		var this1 = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+		if (this1.charAt(0) != "/") {
+			throw new Error("Badly formed SourceId.");
+		};
+		this.dbFile = Path.posix.join(".", rootDir, ".", this1);
 		try {
 			var db = JSON.parse(Fs.readFileSync(this.dbFile, {"encoding": "utf-8"}));
 			var _g_keys = Reflect__1.fields(db);
@@ -37,8 +44,9 @@ class FileCache extends Register.inherits(BaseCache) {
 					var tmp = SourceHash.fromHex(val.hash);
 					var val1 = val.ctime;
 					var s = val.baseDir;
-					var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-					var tmp1 = (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm;
+					s = Path.posix.normalize(s);
+					s = StringTools.replace(s, "\\", "/");
+					var tmp1 = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 					var _g2 = [];
 					var _g3 = 0;
 					var _g4 = val.files;
@@ -47,11 +55,13 @@ class FileCache extends Register.inherits(BaseCache) {
 						++_g3;
 						var tmp2 = SourceHash.fromHex(file.fileHash);
 						var s1 = file.filePath;
-						var norm1 = "/" + Path.normalize((s1.charAt(0) == "/") ? HxOverrides.substr(s1, 1, null) : s1);
-						var tmp3 = (s1.lastIndexOf("/") == s1.length - 1) ? Path.addTrailingSlash(norm1) : norm1;
+						s1 = Path.posix.normalize(s1);
+						s1 = StringTools.replace(s1, "\\", "/");
+						var tmp3 = (SourceId_Fields_.startsWithSlash(s1)) ? s1 : "/" + s1;
 						var s2 = file.id;
-						var norm2 = "/" + Path.normalize((s2.charAt(0) == "/") ? HxOverrides.substr(s2, 1, null) : s2);
-						_g2.push({"fileHash": tmp2, "filePath": tmp3, "id": (s2.lastIndexOf("/") == s2.length - 1) ? Path.addTrailingSlash(norm2) : norm2});
+						s2 = Path.posix.normalize(s2);
+						s2 = StringTools.replace(s2, "\\", "/");
+						_g2.push({"fileHash": tmp2, "filePath": tmp3, "id": (SourceId_Fields_.startsWithSlash(s2)) ? s2 : "/" + s2});
 					};
 					_g.push({"hash": tmp, "ctime": val1, "baseDir": tmp1, "files": _g2});
 				};
@@ -67,10 +77,12 @@ class FileCache extends Register.inherits(BaseCache) {
 		var idOverride;
 		var _g = source.origin.cacheStrategy;
 		if (_g._hx_index == 3) {
+			var _g1 = _g.path;
 			if (source.data.length == 1) {
-				var s = Path.withoutDirectory(_g.path);
-				var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-				idOverride = (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm;
+				var s = _g1.substring(_g1.lastIndexOf("/"));
+				s = Path.posix.normalize(s);
+				s = StringTools.replace(s, "\\", "/");
+				idOverride = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			} else {
 				idOverride = null;
 			};
@@ -99,23 +111,14 @@ 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) {
+			if (value.files.length == 1 && !SourceId_Fields_.endsWithSlash(_g1)) {
 				invalidPath = value.files[0].filePath != _g1;
 			} else {
 				var value1 = value.baseDir;
-				var s = Path.addTrailingSlash(Path.directory(_g1));
-				var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-				invalidPath = value1 != ((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm);
+				var s = _g1.substring(0, _g1.lastIndexOf("/") + 1);
+				s = Path.posix.normalize(s);
+				s = StringTools.replace(s, "\\", "/");
+				invalidPath = value1 != ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s);
 			};
 			if (invalidPath) {
 				return Promise.resolve(null);
@@ -128,7 +131,11 @@ class FileCache extends Register.inherits(BaseCache) {
 			return function (res, rej) {
 				var this1 = file[0].filePath;
 				var root = _gthis.rootDir;
-				SourceData.fromFile(file[0].id, (root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1, file[0].filePath).then((function (file) {
+				if (this1.charAt(0) != "/") {
+					throw new Error("Badly formed SourceId.");
+				};
+				var path = Path.posix.join(".", root, ".", this1);
+				SourceData.fromFile(file[0].id, path, file[0].filePath).then((function (file) {
 					return function (sourceData) {
 						if (sourceData == null || !stone.ignoreFileHash && !SourceHash.equals(sourceData.hash, file[0].fileHash)) {
 							rej("Wrong hash.");
@@ -190,10 +197,16 @@ class FileCache extends Register.inherits(BaseCache) {
 					return function (res, rej) {
 						var this1 = file[0].filePath;
 						var root = _gthis.rootDir;
-						Log.log(20, ...["Deleting file.", {"path": (root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1}]);
+						if (this1.charAt(0) != "/") {
+							throw new Error("Badly formed SourceId.");
+						};
+						Log.log(20, ...["Deleting file.", {"path": Path.posix.join(".", root, ".", 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 (file) {
+						if (this1.charAt(0) != "/") {
+							throw new Error("Badly formed SourceId.");
+						};
+						Fs.unlink(Path.posix.join(".", root, ".", this1), (function (file) {
 							return function (err) {
 								if (err != null) {
 									Log.log(50, ...["Error deleting file.", {"file": file[0], "error": err}]);
@@ -209,20 +222,32 @@ class FileCache extends Register.inherits(BaseCache) {
 			return new Promise(function (res, rej) {
 				var this1 = value.baseDir;
 				var root = _gthis.rootDir;
-				Fs.readdir((root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1, function (err, files) {
+				if (this1.charAt(0) != "/") {
+					throw new Error("Badly formed SourceId.");
+				};
+				Fs.readdir(Path.posix.join(".", root, ".", this1), function (err, files) {
 					if (err != null) {
 						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}]);
+						if (this1.charAt(0) != "/") {
+							throw new Error("Badly formed SourceId.");
+						};
+						Log.log(50, ...["Error reading directory", {"dir": Path.posix.join(".", root, ".", 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 (this1.charAt(0) != "/") {
+							throw new Error("Badly formed SourceId.");
+						};
+						Fs.rmdir(Path.posix.join(".", root, ".", this1), function (err) {
 							if (err != null) {
 								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}]);
+								if (this1.charAt(0) != "/") {
+									throw new Error("Badly formed SourceId.");
+								};
+								Log.log(50, ...["Error removing directory.", {"dir": Path.posix.join(".", root, ".", this1), "error": err}]);
 							};
 							res(null);
 						});
@@ -266,9 +291,14 @@ class FileCache extends Register.inherits(BaseCache) {
 					var val1 = val.ctime;
 					var tmp1 = HxOverrides.dateStr(new Date(val.ctime * 1000));
 					var this2 = val.baseDir;
-					var norm = "/" + Path.normalize(("/".charAt(0) == "/") ? HxOverrides.substr("/", 1, null) : "/");
-					var root = ("/".lastIndexOf("/") == "/".length - 1) ? Path.addTrailingSlash(norm) : norm;
-					var tmp2 = (root.length == 1) ? this2.substring(1) : root.substring(1, root.length - 1) + this2;
+					var s = "/";
+					s = Path.posix.normalize("/");
+					s = StringTools.replace(s, "\\", "/");
+					var root = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+					if (this2.charAt(0) != "/") {
+						throw new Error("Badly formed SourceId.");
+					};
+					var tmp2 = Path.posix.join(".", root, ".", this2);
 					var _g2 = [];
 					var _g3 = 0;
 					var _g4 = val.files;
@@ -277,13 +307,23 @@ class FileCache extends Register.inherits(BaseCache) {
 						++_g3;
 						var tmp3 = SourceHash.toHex(file.fileHash);
 						var this3 = file.filePath;
-						var norm1 = "/" + Path.normalize(("/".charAt(0) == "/") ? HxOverrides.substr("/", 1, null) : "/");
-						var root1 = ("/".lastIndexOf("/") == "/".length - 1) ? Path.addTrailingSlash(norm1) : norm1;
-						var tmp4 = (root1.length == 1) ? this3.substring(1) : root1.substring(1, root1.length - 1) + this3;
+						var s1 = "/";
+						s1 = Path.posix.normalize("/");
+						s1 = StringTools.replace(s1, "\\", "/");
+						var root1 = (SourceId_Fields_.startsWithSlash(s1)) ? s1 : "/" + s1;
+						if (this3.charAt(0) != "/") {
+							throw new Error("Badly formed SourceId.");
+						};
+						var tmp4 = Path.posix.join(".", root1, ".", this3);
 						var this4 = file.id;
-						var norm2 = "/" + Path.normalize(("/".charAt(0) == "/") ? HxOverrides.substr("/", 1, null) : "/");
-						var root2 = ("/".lastIndexOf("/") == "/".length - 1) ? Path.addTrailingSlash(norm2) : norm2;
-						_g2.push({"fileHash": tmp3, "filePath": tmp4, "id": (root2.length == 1) ? this4.substring(1) : root2.substring(1, root2.length - 1) + this4});
+						var s2 = "/";
+						s2 = Path.posix.normalize("/");
+						s2 = StringTools.replace(s2, "\\", "/");
+						var root2 = (SourceId_Fields_.startsWithSlash(s2)) ? s2 : "/" + s2;
+						if (this4.charAt(0) != "/") {
+							throw new Error("Badly formed SourceId.");
+						};
+						_g2.push({"fileHash": tmp3, "filePath": tmp4, "id": Path.posix.join(".", root2, ".", this4)});
 					};
 					_g.push({"hash": tmp, "ctime": val1, "ctimePretty": tmp1, "baseDir": tmp2, "files": _g2});
 				};

package/bin/whet/magic/RoutePathType.js

@@ -1,8 +1,10 @@
 import {Router} from "../route/Router.js"
+import {Route} from "../route/Route.js"
 import {RouteType_Fields_} from "./RouteType.js"
-import {Path} from "../../haxe/io/Path.js"
+import {SourceId_Fields_} from "../SourceId.js"
+import * as Path from "path"
 import {Register} from "../../genes/Register.js"
-import {HxOverrides} from "../../HxOverrides.js"
+import {StringTools} from "../../StringTools.js"
 
 const $global = Register.$global
 
@@ -28,11 +30,14 @@ class RoutePathType_Fields_ {
 				throw new Error("RoutePath element should have at least 2 entries `[serveId, route]`.");
 			};
 			if (item.length > 3) {
-				throw new Error("RoutePath element should have at most 3 entries `[serveId, route, serveAs]`.");
+				throw new Error("RoutePath element should have at most 3 entries `[serveId, route, filter]`.");
 			};
 			var s = item[0];
-			var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-			_g.push({"routeUnder": (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm, "route": RouteType_Fields_.makeRoute([item.slice(1)])});
+			s = Path.posix.normalize(s);
+			s = StringTools.replace(s, "\\", "/");
+			var tmp = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+			var _g3 = item.slice(1);
+			_g.push({"routeUnder": tmp, "route": (_g3.length == 1) ? (((item[1]) instanceof Route)) ? item[1] : RouteType_Fields_.makeRoute([_g3]) : RouteType_Fields_.makeRoute([_g3])});
 		};
 		return _g;
 	}

package/bin/whet/magic/RouteType.d.ts

@@ -1,11 +1,11 @@
-import {Route} from "../route/Route"
+import {Route, RouteData} from "../route/Route"
 import {MaybeArray} from "./MaybeArray"
 import {AnyStone} from "../Stone"
 
 /**
 * Anything that can be transformed into `Route`.
 */
-export type RouteType = MaybeArray<MaybeArray<BaseRouteType>>
+export type RouteType = Route | MaybeArray<MaybeArray<BaseRouteType>>
 
 export type BaseRouteType = string | AnyStone
 

package/bin/whet/magic/RouteType.js

@@ -2,16 +2,24 @@ import {Files} from "../stones/Files.js"
 import {Route} from "../route/Route.js"
 import {MaybeArray_Fields_} from "./MaybeArray.js"
 import {Stone} from "../Stone.js"
-import {SourceId} from "../SourceId.js"
-import {Path} from "../../haxe/io/Path.js"
+import {SourceId_Fields_, SourceId} from "../SourceId.js"
+import * as Path from "path"
 import {Register} from "../../genes/Register.js"
-import {HxOverrides} from "../../HxOverrides.js"
+import {StringTools} from "../../StringTools.js"
+import {Std} from "../../Std.js"
 
 const $global = Register.$global
 
 export const RouteType_Fields_ = Register.global("$hxClasses")["whet.magic._RouteType.RouteType_Fields_"] = 
 class RouteType_Fields_ {
 	static makeRoute(routeType) {
+		if (((routeType) instanceof Route)) {
+			return routeType;
+		} else {
+			return new Route(routeType);
+		};
+	}
+	static makeRouteRoutes(routeType) {
 		var _g = [];
 		var _g1 = 0;
 		var _g2 = MaybeArray_Fields_.makeArray(routeType);
@@ -25,11 +33,12 @@ class RouteType_Fields_ {
 				};
 				var tinner1 = tinner[0];
 				var s = tinner[1];
-				var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-				_g.push(RouteType_Fields_.getRoute(tinner1, (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm));
+				s = Path.posix.normalize(s);
+				s = StringTools.replace(s, "\\", "/");
+				_g.push(RouteType_Fields_.getRoute(tinner1, (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s));
 			};
 		};
-		return new Route(_g);
+		return _g;
 	}
 	static getRoute(t, path) {
 		if (typeof(t) == "string") {
@@ -38,11 +47,14 @@ class RouteType_Fields_ {
 			if (path != null) {
 				tmp1 = path;
 			} else {
-				var norm = "/" + Path.normalize((t.charAt(0) == "/") ? HxOverrides.substr(t, 1, null) : t);
-				var p = (t.lastIndexOf("/") == t.length - 1) ? Path.addTrailingSlash(norm) : norm;
-				var s = Path.addTrailingSlash(Path.directory(p));
-				var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-				tmp1 = SourceId.relativeTo(p, (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm);
+				var s = t;
+				s = Path.posix.normalize(s);
+				s = StringTools.replace(s, "\\", "/");
+				var p = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+				var s = p.substring(0, p.lastIndexOf("/") + 1);
+				s = Path.posix.normalize(s);
+				s = StringTools.replace(s, "\\", "/");
+				tmp1 = SourceId.relativeTo(p, (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s);
 			};
 			return {"stone": tmp, "path": tmp1};
 		} else if (((t) instanceof Stone)) {
@@ -50,12 +62,14 @@ class RouteType_Fields_ {
 			if (path != null) {
 				tmp = path;
 			} else {
-				var norm = "/" + Path.normalize(("/".charAt(0) == "/") ? HxOverrides.substr("/", 1, null) : "/");
-				tmp = ("/".lastIndexOf("/") == "/".length - 1) ? Path.addTrailingSlash(norm) : norm;
+				var s = "/";
+				s = Path.posix.normalize("/");
+				s = StringTools.replace(s, "\\", "/");
+				tmp = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			};
 			return {"stone": t, "path": tmp};
 		} else {
-			throw new Error("Unsupported type for Route.");
+			throw new Error("Unsupported type for Route. Expected String or Stone, but got " + Std.string(t.constructor?.name) + ".");
 		};
 	}
 	static get __name__() {

package/bin/whet/magic/StoneId.d.ts

@@ -3,3 +3,4 @@ import {AnyStone} from "../Stone"
 export type StoneIdType = string | any | AnyStone
 
 export const makeStoneId: (id: StoneIdType) => string
+export const getTypeName: (stone: AnyStone) => string

package/bin/whet/magic/StoneId.js

@@ -12,7 +12,7 @@ class StoneId_Fields_ {
 		} else if (Boot.__instanceof(id, "$hxCoreType__Class")) {
 			return StoneId_Fields_.makeStoneIdFromClass(id);
 		} else if (((id) instanceof Stone)) {
-			return StoneId_Fields_.makeStoneIdFromClass(Boot.getClass(id));
+			return id.constructor.name;
 		} else {
 			throw new Error("Unsupported type for StoneId.");
 		};
@@ -20,6 +20,15 @@ class StoneId_Fields_ {
 	static makeStoneIdFromClass(c) {
 		return c.__name__.split(".").pop();
 	}
+	static getTypeName(stone) {
+		var c = Boot.getClass(stone);
+		var name = c.__name__;
+		if (name != "whet.Stone") {
+			return name;
+		} else {
+			return stone.constructor.name;
+		};
+	}
 	static get __name__() {
 		return "whet.magic._StoneId.StoneId_Fields_"
 	}
@@ -30,3 +39,4 @@ class StoneId_Fields_ {
 
 
 export const makeStoneId = StoneId_Fields_.makeStoneId
+export const getTypeName = StoneId_Fields_.getTypeName

package/bin/whet/route/Route.d.ts

@@ -1,10 +1,14 @@
 import {RouteResult} from "./RouteResult"
+import {RouteType} from "../magic/RouteType"
 import {AnyStone} from "../Stone"
+import {SourceHash} from "../SourceHash"
 import {SourceData} from "../Source"
 
 export declare class Route {
-	constructor(routes: RouteData[])
+	constructor(route: RouteType)
 	protected routes: RouteData[]
+	add(r: RouteType): Route
+	getHash(): Promise<SourceHash>
 	list(): Promise<RouteResult[]>
 	getData(): Promise<SourceData[]>
 }

package/bin/whet/route/Route.js

@@ -1,14 +1,36 @@
 import {RouteResult} from "./RouteResult.js"
-import {Path} from "../../haxe/io/Path.js"
+import {RouteType_Fields_} from "../magic/RouteType.js"
+import {SourceId_Fields_, SourceId} from "../SourceId.js"
+import {SourceHash} from "../SourceHash.js"
+import * as Path from "path"
 import {Register} from "../../genes/Register.js"
-import {HxOverrides} from "../../HxOverrides.js"
+import {StringTools} from "../../StringTools.js"
 
 const $global = Register.$global
 
 export const Route = Register.global("$hxClasses")["whet.route.Route"] = 
 class Route extends Register.inherits() {
-	new(routes) {
-		this.routes = routes;
+	new(route) {
+		this.routes = (((route) instanceof Route)) ? route.routes.slice() : RouteType_Fields_.makeRouteRoutes(route);
+	}
+	add(r) {
+		var _g = 0;
+		var _g1 = RouteType_Fields_.makeRoute(r).routes;
+		while (_g < _g1.length) this.routes.push(_g1[_g++]);
+		return this;
+	}
+	getHash() {
+		var _this = this.routes;
+		var result = new Array(_this.length);
+		var _g = 0;
+		var _g1 = _this.length;
+		while (_g < _g1) {
+			var i = _g++;
+			result[i] = _this[i].stone.getHash();
+		};
+		return Promise.all(result).then(function (hashes) {
+			return SourceHash.merge(...hashes);
+		});
 	}
 	list() {
 		var _g = [];
@@ -20,17 +42,13 @@ class Route extends Register.inherits() {
 			_g.push(r[0].stone.list().then((function (r) {
 				return function (list) {
 					var arr = [];
-					var this1 = r[0].path;
-					var norm = "/" + Path.normalize((this1.charAt(0) == "/") ? HxOverrides.substr(this1, 1, null) : this1);
-					var tmp = (this1.lastIndexOf("/") == this1.length - 1) ? Path.addTrailingSlash(norm) : norm;
-					var s = Path.addTrailingSlash(Path.directory(this1));
-					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(r[0].path)) {
 						var _g = 0;
 						while (_g < list.length) {
 							var path = list[_g];
 							++_g;
-							arr.push(new RouteResult(path, path, r[0].stone));
+							var _g1 = r[0].stone;
+							arr.push(new RouteResult(SourceId.relativeTo(path, r[0].path), path, _g1));
 						};
 					} else {
 						var _g = 0;
@@ -39,9 +57,10 @@ class Route extends Register.inherits() {
 							++_g;
 							if (path == r[0].path) {
 								var _g1 = r[0].stone;
-								var s = Path.withoutDirectory(path);
-								var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-								arr.push(new RouteResult((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm, path, _g1));
+								var s = path.substring(path.lastIndexOf("/"));
+								s = Path.posix.normalize(s);
+								s = StringTools.replace(s, "\\", "/");
+								arr.push(new RouteResult((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s, path, _g1));
 							};
 						};
 					};

package/bin/whet/route/Router.js

@@ -1,11 +1,10 @@
 import {RoutePathType_Fields_} from "../magic/RoutePathType.js"
 import {Utils} from "../Utils.js"
-import {SourceId} from "../SourceId.js"
+import {SourceId_Fields_, SourceId} from "../SourceId.js"
 import {SourceHash} from "../SourceHash.js"
-import * as Path__1 from "path"
-import {Path} from "../../haxe/io/Path.js"
+import * as Path from "path"
 import {Register} from "../../genes/Register.js"
-import {HxOverrides} from "../../HxOverrides.js"
+import {StringTools} from "../../StringTools.js"
 
 const $global = Register.$global
 
@@ -26,16 +25,13 @@ class Router extends Register.inherits() {
 	*/
 	find(id, firstOnly) {
 		var _gthis = this;
-		var sourceId;
-		var norm = "/" + Path.normalize((id.charAt(0) == "/") ? HxOverrides.substr(id, 1, null) : id);
-		sourceId = (id.lastIndexOf("/") == id.length - 1) ? Path.addTrailingSlash(norm) : norm;
+		var s = id;
+		s = Path.posix.normalize(id);
+		s = StringTools.replace(s, "\\", "/");
+		var sourceId = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 		return new Promise(function (res, rej) {
 			if (firstOnly == null) {
-				var norm = "/" + Path.normalize((sourceId.charAt(0) == "/") ? HxOverrides.substr(sourceId, 1, null) : sourceId);
-				var firstOnly1 = (sourceId.lastIndexOf("/") == sourceId.length - 1) ? Path.addTrailingSlash(norm) : norm;
-				var s = Path.addTrailingSlash(Path.directory(sourceId));
-				var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-				firstOnly = firstOnly1 != ((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm);
+				firstOnly = !SourceId_Fields_.endsWithSlash(sourceId);
 			};
 			var result = [];
 			var _g = [];
@@ -46,31 +42,23 @@ class Router extends Register.inherits() {
 				++_g1;
 				_g.push(path[0].route.list().then((function (path) {
 					return function (list) {
-						var this1 = path[0].routeUnder;
-						var norm = "/" + Path.normalize((this1.charAt(0) == "/") ? HxOverrides.substr(this1, 1, null) : this1);
-						var tmp = (this1.lastIndexOf("/") == this1.length - 1) ? Path.addTrailingSlash(norm) : norm;
-						var s = Path.addTrailingSlash(Path.directory(this1));
-						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(path[0].routeUnder)) {
 							var _g = 0;
 							while (_g < list.length) {
 								var item = list[_g];
 								++_g;
 								item.serveId = SourceId.getPutInDir(item.serveId, path[0].routeUnder);
-								var norm = "/" + Path.normalize((sourceId.charAt(0) == "/") ? HxOverrides.substr(sourceId, 1, null) : sourceId);
-								var tmp = (sourceId.lastIndexOf("/") == sourceId.length - 1) ? Path.addTrailingSlash(norm) : norm;
-								var s = Path.addTrailingSlash(Path.directory(sourceId));
-								var norm1 = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-								if (tmp == ((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm1) : norm1)) {
+								if (SourceId_Fields_.endsWithSlash(sourceId)) {
 									var rel = SourceId.relativeTo(item.serveId, sourceId);
 									if (rel != null) {
 										item.serveId = rel;
 										result.push(item);
 									};
 								} else if (sourceId == item.serveId) {
-									var s1 = Path.withoutDirectory(sourceId);
-									var norm2 = "/" + Path.normalize((s1.charAt(0) == "/") ? HxOverrides.substr(s1, 1, null) : s1);
-									item.serveId = (s1.lastIndexOf("/") == s1.length - 1) ? Path.addTrailingSlash(norm2) : norm2;
+									var s = sourceId.substring(sourceId.lastIndexOf("/"));
+									s = Path.posix.normalize(s);
+									s = StringTools.replace(s, "\\", "/");
+									item.serveId = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 									result.push(item);
 								};
 							};
@@ -80,20 +68,17 @@ class Router extends Register.inherits() {
 								var item = list[_g];
 								++_g;
 								item.serveId = path[0].routeUnder;
-								var norm = "/" + Path.normalize((sourceId.charAt(0) == "/") ? HxOverrides.substr(sourceId, 1, null) : sourceId);
-								var tmp = (sourceId.lastIndexOf("/") == sourceId.length - 1) ? Path.addTrailingSlash(norm) : norm;
-								var s = Path.addTrailingSlash(Path.directory(sourceId));
-								var norm1 = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-								if (tmp == ((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm1) : norm1)) {
+								if (SourceId_Fields_.endsWithSlash(sourceId)) {
 									var rel = SourceId.relativeTo(item.serveId, sourceId);
 									if (rel != null) {
 										item.serveId = rel;
 										result.push(item);
 									};
 								} else if (sourceId == item.serveId) {
-									var s1 = Path.withoutDirectory(sourceId);
-									var norm2 = "/" + Path.normalize((s1.charAt(0) == "/") ? HxOverrides.substr(s1, 1, null) : s1);
-									item.serveId = (s1.lastIndexOf("/") == s1.length - 1) ? Path.addTrailingSlash(norm2) : norm2;
+									var s = sourceId.substring(sourceId.lastIndexOf("/"));
+									s = Path.posix.normalize(s);
+									s = StringTools.replace(s, "\\", "/");
+									item.serveId = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 									result.push(item);
 								};
 							};
@@ -178,9 +163,14 @@ class Router extends Register.inherits() {
 				++_g1;
 				var saveInto1 = saveInto;
 				var this1 = r.serveId;
-				var norm = "/" + Path.normalize(("/".charAt(0) == "/") ? HxOverrides.substr("/", 1, null) : "/");
-				var root = ("/".lastIndexOf("/") == "/".length - 1) ? Path.addTrailingSlash(norm) : norm;
-				var p = [Path__1.join(saveInto1, (root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1)];
+				var s = "/";
+				s = Path.posix.normalize("/");
+				s = StringTools.replace(s, "\\", "/");
+				var root = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+				if (this1.charAt(0) != "/") {
+					throw new Error("Badly formed SourceId.");
+				};
+				var p = [Path.join(saveInto1, Path.posix.join(".", root, ".", this1))];
 				_g.push(r.get().then((function (p) {
 					return function (src) {
 						return Utils.saveBytes(p[0], src.data);