whet 0.0.18 → 0.0.20

package/bin/whet/cache/BaseCache.js

@@ -1,11 +1,9 @@
 import {Cache} from "./Cache.js"
-import {SourceId} from "../SourceId.js"
 import {SourceHash} from "../SourceHash.js"
 import {Log} from "../Log.js"
 import * as Path from "path"
 import {Boot} from "../../js/Boot.js"
 import {Register} from "../../genes/Register.js"
-import {StringTools} from "../../StringTools.js"
 import {Std} from "../../Std.js"
 import {Lambda} from "../../Lambda.js"
 import {HxOverrides} from "../../HxOverrides.js"
@@ -15,7 +13,7 @@ const $global = Register.$global
 export const BaseCache = Register.global("$hxClasses")["whet.cache.BaseCache"] = 
 class BaseCache extends Register.inherits() {
 	new(rootDir, cache) {
-		if (HxOverrides.cca(rootDir, rootDir.length - 1) != 47) {
+		if (!(rootDir.length == 0 || rootDir.charCodeAt(rootDir.length - 1) == 47)) {
 			throw new Error("Root dir is a not a dir.");
 		};
 		this.rootDir = rootDir;
@@ -23,74 +21,76 @@ class BaseCache extends Register.inherits() {
 	}
 	get(stone, durability, check) {
 		var _gthis = this;
-		return stone.finalMaybeHash().then(function (hash) {
-			if (hash == null) {
-				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) {
-			var generatedSource = data.generatedSource;
-			var hash = data.hash;
-			var values = _gthis.cache.get(_gthis.key(stone));
-			var ageCount = function (val) {
-				return Lambda.count(values, function (v) {
-					if (v != val) {
-						return v.ctime > val.ctime;
-					} else {
-						return false;
-					};
-				});
-			};
-			var value = null;
-			if (values != null && values.length > 0) {
-				value = Lambda.find(values, function (v) {
-					return SourceHash.equals(v.hash, hash);
-				});
-				if (value != null && check._hx_index == 2 && !_gthis.shouldKeep(stone, value, durability, function (v) {
-					return 0;
-				}, ageCount)) {
-					_gthis.remove(stone, value);
-					value = null;
+		return stone.acquire(function () {
+			return stone.finalMaybeHash().then(function (hash) {
+				if (hash == null) {
+					Log.log(20, ...["Generating source, because it does not supply a hash.", {"stone": stone, "cache": _gthis}]);
 				};
-				if (value != null) {
-					_gthis.setRecentUseOrder(values, value);
+				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});
 				};
-			};
-			return ((value != null) ? _gthis.source(stone, value) : Promise.resolve(null)).then(function (src) {
-				if (src == null) {
-					Log.log(10, ...["Not cached.", {"stone": stone, "cache": _gthis}]);
-					return ((value != null) ? _gthis.remove(stone, value) : Promise.resolve(null)).then(function (_) {
-						if (check._hx_index == 1) {
-							_gthis.checkDurability(stone, values, durability, function (v) {
-								return values.indexOf(v) + 1;
-							}, function (v) {
-								return ageCount(v) + 1;
-							});
+			}).then(function (data) {
+				var generatedSource = data.generatedSource;
+				var hash = data.hash;
+				var values = _gthis.cache.get(_gthis.key(stone));
+				var ageCount = function (val) {
+					return Lambda.count(values, function (v) {
+						if (v != val) {
+							return v.ctime > val.ctime;
+						} else {
+							return false;
 						};
-						return ((generatedSource != null) ? Promise.resolve(generatedSource) : stone.generateSource(hash)).then(function (src) {
-							return _gthis.set(src);
-						}).then(function (val) {
-							return _gthis.source(stone, val);
-						});
 					});
-				} else {
-					Log.log(10, ...["Found in cache", {"stone": stone, "cache": _gthis}]);
-					return Promise.resolve(src);
 				};
-			}).then(function (src) {
-				if ((check == null) ? true : check._hx_index == 0) {
-					_gthis.checkDurability(stone, values, durability, function (v) {
-						return values.indexOf(v);
-					}, ageCount);
+				var value = null;
+				if (values != null && values.length > 0) {
+					value = Lambda.find(values, function (v) {
+						return SourceHash.equals(v.hash, hash);
+					});
+					if (value != null && check._hx_index == 2 && !_gthis.shouldKeep(stone, value, durability, function (v) {
+						return 0;
+					}, ageCount)) {
+						_gthis.remove(stone, value);
+						value = null;
+					};
+					if (value != null) {
+						_gthis.setRecentUseOrder(values, value);
+					};
 				};
-				return src;
+				return ((value != null) ? _gthis.source(stone, value) : Promise.resolve(null)).then(function (src) {
+					if (src == null) {
+						Log.log(10, ...["Not cached.", {"stone": stone, "cache": _gthis}]);
+						return ((value != null) ? _gthis.remove(stone, value) : Promise.resolve(null)).then(function (_) {
+							if (check._hx_index == 1) {
+								_gthis.checkDurability(stone, values, durability, function (v) {
+									return values.indexOf(v) + 1;
+								}, function (v) {
+									return ageCount(v) + 1;
+								});
+							};
+							return ((generatedSource != null) ? Promise.resolve(generatedSource) : stone.generateSource(hash)).then(function (src) {
+								return _gthis.set(src);
+							}).then(function (val) {
+								return _gthis.source(stone, val);
+							});
+						});
+					} else {
+						Log.log(10, ...["Found in cache", {"stone": stone, "cache": _gthis}]);
+						return Promise.resolve(src);
+					};
+				}).then(function (src) {
+					if ((check == null) ? true : check._hx_index == 0) {
+						_gthis.checkDurability(stone, values, durability, function (v) {
+							return values.indexOf(v);
+						}, ageCount);
+					};
+					return src;
+				});
 			});
 		});
 	}
@@ -124,31 +124,16 @@ class BaseCache extends Register.inherits() {
 		};
 		var filenames = this.getExistingDirs(stone);
 		var maxNum = (filenames != null) ? Lambda.fold(filenames, function (fn, num) {
-			var s = fn.substring(0, fn.lastIndexOf("/") + 1);
-			var str = (s.length > 1 && HxOverrides.cca(s, 0) == 47) ? s.substring(1) : s;
-			if (str.length > 0) {
-				str = Path.posix.normalize(str);
-				str = StringTools.replace(str, "\\", "/");
-			};
-			s = str;
-			var this1 = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-			var root = _gthis.rootDir;
-			if (this1.charAt(0) != "/") {
-				throw new Error("Badly formed SourceId.");
-			};
-			var parts = Path.posix.join(".", root, ".", this1).split("/");
+			var dir = fn.substring(0, fn.lastIndexOf("/") + 1);
+			var parts = Path.posix.join(".", _gthis.rootDir, ".", (dir.length == 0) ? "./" : dir).split("/");
 			var name = (parts.length > 1) ? parts[parts.length - 2] : "";
 			return Math.max(num, (name.charAt(0) == "v") ? Std.parseInt(HxOverrides.substr(name, 1, null)) : 0);
 		}, 0) : 0;
 		++maxNum;
-		var s = "v" + maxNum + "/";
-		var str = (s.length > 1 && HxOverrides.cca(s, 0) == 47) ? s.substring(1) : s;
-		if (str.length > 0) {
-			str = Path.posix.normalize(str);
-			str = StringTools.replace(str, "\\", "/");
+		if (!(baseDir.length == 0 || baseDir.charCodeAt(baseDir.length - 1) == 47)) {
+			throw new Error("\"" + baseDir + "\" is not a directory.");
 		};
-		s = str;
-		return SourceId.getPutInDir((HxOverrides.cca(s, 0) == 47) ? s : "/" + s, baseDir);
+		return Path.posix.join(baseDir, "v" + maxNum + "/");
 	}
 	checkDurability(stone, values, durability, useIndex, ageIndex) {
 		Log.log(20, ...["Checking durability.", {"stone": stone, "durability": Std.string(durability)}]);

package/bin/whet/cache/CacheManager.js

@@ -1,12 +1,10 @@
 import {MemoryCache} from "./MemoryCache.js"
 import {FileCache} from "./FileCache.js"
 import {CacheStrategy, CacheDurability, DurabilityCheck} from "./Cache.js"
-import {RootDir, SourceId} from "../SourceId.js"
+import {RootDir} from "../SourceId.js"
 import {Log} from "../Log.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
 
@@ -27,8 +25,10 @@ class CacheManager extends Register.inherits() {
 		var _g = stone.cacheStrategy;
 		switch (_g._hx_index) {
 			case 0:
-				return stone.finalMaybeHash().then(function (hash) {
-					return stone.generateSource(hash);
+				return stone.acquire(function () {
+					return stone.finalMaybeHash().then(function (hash) {
+						return stone.generateSource(hash);
+					});
 				});
 				break
 			case 1:
@@ -54,8 +54,10 @@ class CacheManager extends Register.inherits() {
 		Log.log(10, ...["Re-generating cached stone.", {"stone": stone}]);
 		switch (stone.cacheStrategy._hx_index) {
 			case 0:
-				return stone.finalMaybeHash().then(function (hash) {
-					return stone.generateSource(hash);
+				return stone.acquire(function () {
+					return stone.finalMaybeHash().then(function (hash) {
+						return stone.generateSource(hash);
+					});
 				});
 				break
 			case 1:
@@ -77,14 +79,7 @@ class CacheManager extends Register.inherits() {
 	* The path is not reserved. Caching depends on stone's `cacheStrategy` and success of source generation.
 	*/
 	getDir(stone, hash) {
-		var s = stone.id + "/";
-		var str = (s.length > 1 && HxOverrides.cca(s, 0) == 47) ? s.substring(1) : s;
-		if (str.length > 0) {
-			str = Path.posix.normalize(str);
-			str = StringTools.replace(str, "\\", "/");
-		};
-		s = str;
-		var baseDir = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
+		var baseDir = stone.id + "/";
 		var tmp;
 		switch (stone.cacheStrategy._hx_index) {
 			case 0:
@@ -98,23 +93,15 @@ class CacheManager extends Register.inherits() {
 			
 		};
 		if (tmp) {
-			var s = ".temp/";
-			var str = (".temp/".length > 1 && HxOverrides.cca(".temp/", 0) == 47) ? ".temp/".substring(1) : ".temp/";
-			if (str.length > 0) {
-				str = Path.posix.normalize(str);
-				str = StringTools.replace(str, "\\", "/");
+			if (!(".temp/".length == 0 || ".temp/".charCodeAt(".temp/".length - 1) == 47)) {
+				throw new Error("\"" + ".temp/" + "\" is not a directory.");
 			};
-			s = str;
-			baseDir = SourceId.getPutInDir(baseDir, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
+			baseDir = Path.posix.join(".temp/", baseDir);
 		};
-		var s = ".whet/";
-		var str = (".whet/".length > 1 && HxOverrides.cca(".whet/", 0) == 47) ? ".whet/".substring(1) : ".whet/";
-		if (str.length > 0) {
-			str = Path.posix.normalize(str);
-			str = StringTools.replace(str, "\\", "/");
+		if (!(".whet/".length == 0 || ".whet/".charCodeAt(".whet/".length - 1) == 47)) {
+			throw new Error("\"" + ".whet/" + "\" is not a directory.");
 		};
-		s = str;
-		baseDir = SourceId.getPutInDir(baseDir, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
+		baseDir = Path.posix.join(".whet/", baseDir);
 		var id;
 		var _g = stone.cacheStrategy;
 		switch (_g._hx_index) {
@@ -129,14 +116,8 @@ class CacheManager extends Register.inherits() {
 				break
 			case 3:
 				var _g1 = _g.path;
-				var s = _g1.substring(0, _g1.lastIndexOf("/") + 1);
-				var str = (s.length > 1 && HxOverrides.cca(s, 0) == 47) ? s.substring(1) : s;
-				if (str.length > 0) {
-					str = Path.posix.normalize(str);
-					str = StringTools.replace(str, "\\", "/");
-				};
-				s = str;
-				id = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
+				var dir = _g1.substring(0, _g1.lastIndexOf("/") + 1);
+				id = (dir.length == 0) ? "./" : dir;
 				break
 			
 		};

package/bin/whet/cache/FileCache.js

@@ -7,7 +7,6 @@ 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"
@@ -19,18 +18,7 @@ class FileCache extends Register.inherits(BaseCache) {
 	new(rootDir) {
 		this.flushQueued = false;
 		super.new(rootDir, new StringMap());
-		var s = ".whet/cache.json";
-		var str = (".whet/cache.json".length > 1 && HxOverrides.cca(".whet/cache.json", 0) == 47) ? ".whet/cache.json".substring(1) : ".whet/cache.json";
-		if (str.length > 0) {
-			str = Path.posix.normalize(str);
-			str = StringTools.replace(str, "\\", "/");
-		};
-		s = str;
-		var this1 = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-		if (this1.charAt(0) != "/") {
-			throw new Error("Badly formed SourceId.");
-		};
-		this.dbFile = Path.posix.join(".", rootDir, ".", this1);
+		this.dbFile = Path.posix.join(".", rootDir, ".", ".whet/cache.json");
 		try {
 			var db = JSON.parse(Fs.readFileSync(this.dbFile, {"encoding": "utf-8"}));
 			var _g_keys = Reflect__1.fields(db);
@@ -46,39 +34,16 @@ class FileCache extends Register.inherits(BaseCache) {
 					++_g1;
 					var tmp = SourceHash.fromHex(val.hash);
 					var val1 = val.ctime;
-					var s = val.baseDir;
-					var str = (s.length > 1 && HxOverrides.cca(s, 0) == 47) ? s.substring(1) : s;
-					if (str.length > 0) {
-						str = Path.posix.normalize(str);
-						str = StringTools.replace(str, "\\", "/");
-					};
-					s = str;
-					var tmp1 = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
+					var val2 = val.baseDir;
 					var _g2 = [];
 					var _g3 = 0;
 					var _g4 = val.files;
 					while (_g3 < _g4.length) {
 						var file = _g4[_g3];
 						++_g3;
-						var tmp2 = SourceHash.fromHex(file.fileHash);
-						var s1 = file.filePath;
-						var str1 = (s1.length > 1 && HxOverrides.cca(s1, 0) == 47) ? s1.substring(1) : s1;
-						if (str1.length > 0) {
-							str1 = Path.posix.normalize(str1);
-							str1 = StringTools.replace(str1, "\\", "/");
-						};
-						s1 = str1;
-						var tmp3 = (HxOverrides.cca(s1, 0) == 47) ? s1 : "/" + s1;
-						var s2 = file.id;
-						var str2 = (s2.length > 1 && HxOverrides.cca(s2, 0) == 47) ? s2.substring(1) : s2;
-						if (str2.length > 0) {
-							str2 = Path.posix.normalize(str2);
-							str2 = StringTools.replace(str2, "\\", "/");
-						};
-						s2 = str2;
-						_g2.push({"fileHash": tmp2, "filePath": tmp3, "id": (HxOverrides.cca(s2, 0) == 47) ? s2 : "/" + s2});
+						_g2.push({"fileHash": SourceHash.fromHex(file.fileHash), "filePath": file.filePath, "id": file.id});
 					};
-					_g.push({"hash": tmp, "ctime": val1, "baseDir": tmp1, "files": _g2});
+					_g.push({"hash": tmp, "ctime": val1, "baseDir": val2, "files": _g2});
 				};
 				this1.inst.set(key, _g);
 			};
@@ -93,18 +58,7 @@ class FileCache extends Register.inherits(BaseCache) {
 		var _g = source.origin.cacheStrategy;
 		if (_g._hx_index == 3) {
 			var _g1 = _g.path;
-			if (source.data.length == 1) {
-				var s = _g1.substring(_g1.lastIndexOf("/"));
-				var str = (s.length > 1 && HxOverrides.cca(s, 0) == 47) ? s.substring(1) : s;
-				if (str.length > 0) {
-					str = Path.posix.normalize(str);
-					str = StringTools.replace(str, "\\", "/");
-				};
-				s = str;
-				idOverride = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-			} else {
-				idOverride = null;
-			};
+			idOverride = (source.data.length == 1) ? _g1.substring(_g1.lastIndexOf("/") + 1) : null;
 		} else {
 			idOverride = null;
 		};
@@ -130,18 +84,11 @@ class FileCache extends Register.inherits(BaseCache) {
 		if (_g._hx_index == 3) {
 			var _g1 = _g.path;
 			var invalidPath;
-			if (value.files.length == 1 && HxOverrides.cca(_g1, _g1.length - 1) != 47) {
+			if (value.files.length == 1 && !(_g1.length == 0 || _g1.charCodeAt(_g1.length - 1) == 47)) {
 				invalidPath = value.files[0].filePath != _g1;
 			} else {
-				var value1 = value.baseDir;
-				var s = _g1.substring(0, _g1.lastIndexOf("/") + 1);
-				var str = (s.length > 1 && HxOverrides.cca(s, 0) == 47) ? s.substring(1) : s;
-				if (str.length > 0) {
-					str = Path.posix.normalize(str);
-					str = StringTools.replace(str, "\\", "/");
-				};
-				s = str;
-				invalidPath = value1 != ((HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
+				var dir = _g1.substring(0, _g1.lastIndexOf("/") + 1);
+				invalidPath = value.baseDir != ((dir.length == 0) ? "./" : dir);
 			};
 			if (invalidPath) {
 				return Promise.resolve(null);
@@ -152,27 +99,30 @@ class FileCache extends Register.inherits(BaseCache) {
 		var _g2 = value.files;
 		while (_g1 < _g2.length) _g.push(new Promise((function (file) {
 			return function (res, rej) {
-				var this1 = file[0].filePath;
-				var root = _gthis.rootDir;
-				if (this1.charAt(0) != "/") {
-					throw new Error("Badly formed SourceId.");
-				};
-				var path = Path.posix.join(".", root, ".", this1);
+				var path = Path.posix.join(".", _gthis.rootDir, ".", file[0].filePath);
 				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.");
+							rej("Invalid.");
 						} else {
 							res(sourceData);
 						};
 					};
-				})(file));
+				})(file), (function () {
+					return function (err) {
+						if (((err) instanceof Error) && err.code == "ENOENT") {
+							rej("Invalid.");
+						} else {
+							rej(err);
+						};
+					};
+				})());
 			};
 		})([_g2[_g1++]])));
 		return Promise.all(_g).then(function (data) {
 			return new Source(data, value.hash, stone, value.ctime);
 		}, function (rejected) {
-			if (rejected == "Wrong hash.") {
+			if (rejected == "Invalid.") {
 				return null;
 			} else {
 				throw rejected;
@@ -218,18 +168,8 @@ class FileCache extends Register.inherits(BaseCache) {
 				var _g2 = value.files;
 				while (_g1 < _g2.length) _g.push(new Promise((function (file) {
 					return function (res, rej) {
-						var this1 = file[0].filePath;
-						var root = _gthis.rootDir;
-						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;
-						if (this1.charAt(0) != "/") {
-							throw new Error("Badly formed SourceId.");
-						};
-						Fs.unlink(Path.posix.join(".", root, ".", this1), (function (file) {
+						Log.log(20, ...["Deleting file.", {"path": Path.posix.join(".", _gthis.rootDir, ".", file[0].filePath)}]);
+						Fs.unlink(Path.posix.join(".", _gthis.rootDir, ".", file[0].filePath), (function (file) {
 							return function (err) {
 								if (err != null) {
 									Log.log(50, ...["Error deleting file.", {"file": file[0], "error": err}]);
@@ -243,34 +183,14 @@ class FileCache extends Register.inherits(BaseCache) {
 			};
 		}).then(function (_) {
 			return new Promise(function (res, rej) {
-				var this1 = value.baseDir;
-				var root = _gthis.rootDir;
-				if (this1.charAt(0) != "/") {
-					throw new Error("Badly formed SourceId.");
-				};
-				Fs.readdir(Path.posix.join(".", root, ".", this1), function (err, files) {
+				Fs.readdir(Path.posix.join(".", _gthis.rootDir, ".", value.baseDir), function (err, files) {
 					if (err != null) {
-						var this1 = value.baseDir;
-						var root = _gthis.rootDir;
-						if (this1.charAt(0) != "/") {
-							throw new Error("Badly formed SourceId.");
-						};
-						Log.log(50, ...["Error reading directory", {"dir": Path.posix.join(".", root, ".", this1), "error": err}]);
+						Log.log(50, ...["Error reading directory", {"dir": Path.posix.join(".", _gthis.rootDir, ".", value.baseDir), "error": err}]);
 						res(null);
 					} else if (files.length == 0) {
-						var this1 = value.baseDir;
-						var root = _gthis.rootDir;
-						if (this1.charAt(0) != "/") {
-							throw new Error("Badly formed SourceId.");
-						};
-						Fs.rmdir(Path.posix.join(".", root, ".", this1), function (err) {
+						Fs.rmdir(Path.posix.join(".", _gthis.rootDir, ".", value.baseDir), function (err) {
 							if (err != null) {
-								var this1 = value.baseDir;
-								var root = _gthis.rootDir;
-								if (this1.charAt(0) != "/") {
-									throw new Error("Badly formed SourceId.");
-								};
-								Log.log(50, ...["Error removing directory.", {"dir": Path.posix.join(".", root, ".", this1), "error": err}]);
+								Log.log(50, ...["Error removing directory.", {"dir": Path.posix.join(".", _gthis.rootDir, ".", value.baseDir), "error": err}]);
 							};
 							res(null);
 						});
@@ -313,52 +233,14 @@ class FileCache extends Register.inherits(BaseCache) {
 					var tmp = SourceHash.toHex(val.hash);
 					var val1 = val.ctime;
 					var tmp1 = HxOverrides.dateStr(new Date(val.ctime * 1000));
-					var this2 = val.baseDir;
-					var s = "/";
-					var str = ("/".length > 1 && HxOverrides.cca("/", 0) == 47) ? "/".substring(1) : "/";
-					if (str.length > 0) {
-						str = Path.posix.normalize(str);
-						str = StringTools.replace(str, "\\", "/");
-					};
-					s = str;
-					var root = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-					if (this2.charAt(0) != "/") {
-						throw new Error("Badly formed SourceId.");
-					};
-					var tmp2 = Path.posix.join(".", root, ".", this2);
+					var tmp2 = Path.posix.join(".", "./", ".", val.baseDir);
 					var _g2 = [];
 					var _g3 = 0;
 					var _g4 = val.files;
 					while (_g3 < _g4.length) {
 						var file = _g4[_g3];
 						++_g3;
-						var tmp3 = SourceHash.toHex(file.fileHash);
-						var this3 = file.filePath;
-						var s1 = "/";
-						var str1 = ("/".length > 1 && HxOverrides.cca("/", 0) == 47) ? "/".substring(1) : "/";
-						if (str1.length > 0) {
-							str1 = Path.posix.normalize(str1);
-							str1 = StringTools.replace(str1, "\\", "/");
-						};
-						s1 = str1;
-						var root1 = (HxOverrides.cca(s1, 0) == 47) ? s1 : "/" + s1;
-						if (this3.charAt(0) != "/") {
-							throw new Error("Badly formed SourceId.");
-						};
-						var tmp4 = Path.posix.join(".", root1, ".", this3);
-						var this4 = file.id;
-						var s2 = "/";
-						var str2 = ("/".length > 1 && HxOverrides.cca("/", 0) == 47) ? "/".substring(1) : "/";
-						if (str2.length > 0) {
-							str2 = Path.posix.normalize(str2);
-							str2 = StringTools.replace(str2, "\\", "/");
-						};
-						s2 = str2;
-						var root2 = (HxOverrides.cca(s2, 0) == 47) ? s2 : "/" + s2;
-						if (this4.charAt(0) != "/") {
-							throw new Error("Badly formed SourceId.");
-						};
-						_g2.push({"fileHash": tmp3, "filePath": tmp4, "id": Path.posix.join(".", root2, ".", this4)});
+						_g2.push({"fileHash": SourceHash.toHex(file.fileHash), "filePath": Path.posix.join(".", "./", ".", file.filePath), "id": Path.posix.join(".", "./", ".", file.id)});
 					};
 					_g.push({"hash": tmp, "ctime": val1, "ctimePretty": tmp1, "baseDir": tmp2, "files": _g2});
 				};

package/bin/whet/magic/RoutePathType.js

@@ -2,11 +2,8 @@ import {Files} from "../stones/Files.js"
 import {Router} from "../route/Router.js"
 import {MinimatchType_Fields_} from "./MinimatchType.js"
 import {Stone} from "../Stone.js"
-import * as Path from "path"
 import Minimatch from "minimatch"
 import {Register} from "../../genes/Register.js"
-import {StringTools} from "../../StringTools.js"
-import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -14,14 +11,7 @@ export const RoutePathType_Fields_ = Register.global("$hxClasses")["whet.magic._
 class RoutePathType_Fields_ {
 	static makeRoutePath(routerPathType) {
 		if (((routerPathType) instanceof Router) || ((routerPathType) instanceof Stone) || typeof(routerPathType) == "string") {
-			var s = "/";
-			var str = ("/".length > 1 && HxOverrides.cca("/", 0) == 47) ? "/".substring(1) : "/";
-			if (str.length > 0) {
-				str = Path.posix.normalize(str);
-				str = StringTools.replace(str, "\\", "/");
-			};
-			s = str;
-			return [{"routeUnder": (HxOverrides.cca(s, 0) == 47) ? s : "/" + s, "source": (typeof(routerPathType) == "string") ? new Files({"paths": [routerPathType]}) : routerPathType, "filter": null, "extractDirs": null}];
+			return [{"routeUnder": "", "source": (typeof(routerPathType) == "string") ? new Files({"paths": [routerPathType]}) : routerPathType, "filter": null, "extractDirs": null}];
 		};
 		if (!((routerPathType) instanceof Array)) {
 			throw new Error("RoutePath should be a Stone, Router, or an array.");
@@ -33,14 +23,7 @@ class RoutePathType_Fields_ {
 			var item = _g2[_g1];
 			++_g1;
 			if (((item) instanceof Router) || ((item) instanceof Stone) || typeof(item) == "string") {
-				var s = "/";
-				var str = ("/".length > 1 && HxOverrides.cca("/", 0) == 47) ? "/".substring(1) : "/";
-				if (str.length > 0) {
-					str = Path.posix.normalize(str);
-					str = StringTools.replace(str, "\\", "/");
-				};
-				s = str;
-				_g.push({"routeUnder": (HxOverrides.cca(s, 0) == 47) ? s : "/" + s, "source": (typeof(item) == "string") ? new Files({"paths": [item]}) : item, "filter": null, "extractDirs": null});
+				_g.push({"routeUnder": "", "source": (typeof(item) == "string") ? new Files({"paths": [item]}) : item, "filter": null, "extractDirs": null});
 			} else if (((item) instanceof Array)) {
 				var inner = item;
 				if (typeof(inner[0]) != "string") {
@@ -52,41 +35,20 @@ class RoutePathType_Fields_ {
 				var tmp;
 				switch (inner.length) {
 					case 2:
-						var s1 = inner[0];
-						var str1 = (s1.length > 1 && HxOverrides.cca(s1, 0) == 47) ? s1.substring(1) : s1;
-						if (str1.length > 0) {
-							str1 = Path.posix.normalize(str1);
-							str1 = StringTools.replace(str1, "\\", "/");
-						};
-						s1 = str1;
 						var src = inner[1];
-						tmp = {"routeUnder": (HxOverrides.cca(s1, 0) == 47) ? s1 : "/" + s1, "source": (typeof(src) == "string") ? new Files({"paths": [src]}) : src, "filter": null, "extractDirs": null};
+						var tmp1 = (typeof(src) == "string") ? new Files({"paths": [src]}) : src;
+						tmp = {"routeUnder": inner[0], "source": tmp1, "filter": null, "extractDirs": null};
 						break
 					case 3:
-						var s2 = inner[0];
-						var str2 = (s2.length > 1 && HxOverrides.cca(s2, 0) == 47) ? s2.substring(1) : s2;
-						if (str2.length > 0) {
-							str2 = Path.posix.normalize(str2);
-							str2 = StringTools.replace(str2, "\\", "/");
-						};
-						s2 = str2;
-						var tmp1 = (HxOverrides.cca(s2, 0) == 47) ? s2 : "/" + s2;
 						var src1 = inner[1];
 						var tmp2 = (typeof(src1) == "string") ? new Files({"paths": [src1]}) : src1;
 						if (!(typeof(inner[2]) == "string" || inner[2] instanceof Minimatch)) {
 							throw new Error("Third" + " element of RoutePath array should be a glob pattern (string or `minimatch` object)");
 						};
-						tmp = {"routeUnder": tmp1, "source": tmp2, "filter": MinimatchType_Fields_.makeMinimatch(inner[2]), "extractDirs": null};
+						var tmp3 = MinimatchType_Fields_.makeMinimatch(inner[2]);
+						tmp = {"routeUnder": inner[0], "source": tmp2, "filter": tmp3, "extractDirs": null};
 						break
 					case 4:
-						var s3 = inner[0];
-						var str3 = (s3.length > 1 && HxOverrides.cca(s3, 0) == 47) ? s3.substring(1) : s3;
-						if (str3.length > 0) {
-							str3 = Path.posix.normalize(str3);
-							str3 = StringTools.replace(str3, "\\", "/");
-						};
-						s3 = str3;
-						var tmp3 = (HxOverrides.cca(s3, 0) == 47) ? s3 : "/" + s3;
 						var src2 = inner[1];
 						var tmp4 = (typeof(src2) == "string") ? new Files({"paths": [src2]}) : src2;
 						if (!(typeof(inner[2]) == "string" || inner[2] instanceof Minimatch)) {
@@ -96,7 +58,8 @@ class RoutePathType_Fields_ {
 						if (!(typeof(inner[3]) == "string" || inner[3] instanceof Minimatch)) {
 							throw new Error("Fourth" + " element of RoutePath array should be a glob pattern (string or `minimatch` object)");
 						};
-						tmp = {"routeUnder": tmp3, "source": tmp4, "filter": tmp5, "extractDirs": MinimatchType_Fields_.makeMinimatch(inner[3])};
+						var tmp6 = MinimatchType_Fields_.makeMinimatch(inner[3]);
+						tmp = {"routeUnder": inner[0], "source": tmp4, "filter": tmp5, "extractDirs": tmp6};
 						break
 					default:
 					throw new Error("Invalid array for a RoutePath element.");