whet 0.0.8 → 0.0.9

package/bin/whet/magic/RouteType.js

@@ -3,7 +3,7 @@ import {RouteResult} from "../route/RouteResult.js"
 import {Route} from "../route/Route.js"
 import {MaybeArray_Fields_} from "./MaybeArray.js"
 import {Stone} from "../Stone.js"
-import {SourceId_Fields_, SourceId} from "../SourceId.js"
+import {SourceId} from "../SourceId.js"
 import * as Path from "path"
 import {Register} from "../../genes/Register.js"
 import {StringTools} from "../../StringTools.js"
@@ -35,9 +35,13 @@ class RouteType_Fields_ {
 				};
 				var tinner1 = tinner[0];
 				var s = tinner[1];
-				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-				s = StringTools.replace(s, "\\", "/");
-				_g.push(RouteType_Fields_.getRoute(tinner1, (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s));
+				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;
+				_g.push(RouteType_Fields_.getRoute(tinner1, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s));
 			};
 		};
 		return _g;
@@ -50,13 +54,21 @@ class RouteType_Fields_ {
 				tmp1 = path;
 			} else {
 				var s = t;
-				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-				s = StringTools.replace(s, "\\", "/");
-				var p = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+				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 p = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 				var s = p.substring(0, p.lastIndexOf("/") + 1);
-				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-				s = StringTools.replace(s, "\\", "/");
-				tmp1 = SourceId.relativeTo(p, (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s);
+				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;
+				tmp1 = SourceId.relativeTo(p, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
 			};
 			return {"stone": tmp, "path": tmp1};
 		} else if (((t) instanceof Stone)) {
@@ -65,9 +77,13 @@ class RouteType_Fields_ {
 				tmp = path;
 			} else {
 				var s = "/";
-				s = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
-				s = StringTools.replace(s, "\\", "/");
-				tmp = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + 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;
+				tmp = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 			};
 			return {"stone": t, "path": tmp};
 		} else if (((t) instanceof RouteResult)) {

package/bin/whet/route/Route.js

@@ -1,6 +1,6 @@
 import {RouteResult} from "./RouteResult.js"
 import {RouteType_Fields_} from "../magic/RouteType.js"
-import {SourceId_Fields_, SourceId} from "../SourceId.js"
+import {SourceId} from "../SourceId.js"
 import {SourceHash} from "../SourceHash.js"
 import * as Path from "path"
 import {Register} from "../../genes/Register.js"
@@ -43,13 +43,29 @@ class Route extends Register.inherits() {
 			_g.push(r[0].stone.list().then((function (r) {
 				return function (list) {
 					var arr = [];
-					if (SourceId_Fields_.endsWithSlash(r[0].path)) {
+					var this1 = r[0].path;
+					if (HxOverrides.cca(this1, this1.length - 1) == 47) {
 						var _g = 0;
 						while (_g < list.length) {
 							var path = list[_g];
 							++_g;
-							var _g1 = r[0].stone;
-							arr.push(new RouteResult(SourceId.relativeTo(path, r[0].path), path, _g1));
+							var directory = r[0].path;
+							if (HxOverrides.cca(directory, directory.length - 1) != 47) {
+								throw new Error("\"" + directory + "\" is not a directory.");
+							};
+							var tmp;
+							var s = path.substring(0, path.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;
+							tmp = ((HxOverrides.cca(s, 0) == 47) ? s : "/" + s).indexOf(directory) == 0;
+							if (tmp) {
+								var _g1 = r[0].stone;
+								arr.push(new RouteResult(SourceId.relativeTo(path, r[0].path), path, _g1));
+							};
 						};
 					} else {
 						var _g = 0;
@@ -59,9 +75,13 @@ class Route extends Register.inherits() {
 							if (path == r[0].path) {
 								var _g1 = r[0].stone;
 								var s = path.substring(path.lastIndexOf("/"));
-								s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-								s = StringTools.replace(s, "\\", "/");
-								arr.push(new RouteResult((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s, path, _g1));
+								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;
+								arr.push(new RouteResult((HxOverrides.cca(s, 0) == 47) ? s : "/" + s, path, _g1));
 							};
 						};
 					};

package/bin/whet/route/Router.js

@@ -1,6 +1,6 @@
 import {RoutePathType_Fields_} from "../magic/RoutePathType.js"
 import {Utils} from "../Utils.js"
-import {SourceId_Fields_, SourceId} from "../SourceId.js"
+import {SourceId} from "../SourceId.js"
 import {SourceHash} from "../SourceHash.js"
 import * as Path from "path"
 import {Register} from "../../genes/Register.js"
@@ -27,12 +27,16 @@ class Router extends Register.inherits() {
 	find(id, firstOnly) {
 		var _gthis = this;
 		var s = id;
-		s = Path.posix.normalize((id.length > 1 && SourceId_Fields_.startsWithSlash(id)) ? HxOverrides.substr(id, 1, null) : id);
-		s = StringTools.replace(s, "\\", "/");
-		var sourceId = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+		var str = (id.length > 1 && HxOverrides.cca(id, 0) == 47) ? id.substring(1) : id;
+		if (str.length > 0) {
+			str = Path.posix.normalize(str);
+			str = StringTools.replace(str, "\\", "/");
+		};
+		s = str;
+		var sourceId = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 		return new Promise(function (res, rej) {
 			if (firstOnly == null) {
-				firstOnly = !SourceId_Fields_.endsWithSlash(sourceId);
+				firstOnly = HxOverrides.cca(sourceId, sourceId.length - 1) != 47;
 			};
 			var result = [];
 			var _g = [];
@@ -43,13 +47,14 @@ class Router extends Register.inherits() {
 				++_g1;
 				_g.push(path[0].route.list().then((function (path) {
 					return function (list) {
-						if (SourceId_Fields_.endsWithSlash(path[0].routeUnder)) {
+						var this1 = path[0].routeUnder;
+						if (HxOverrides.cca(this1, this1.length - 1) == 47) {
 							var _g = 0;
 							while (_g < list.length) {
 								var item = list[_g];
 								++_g;
 								item.serveId = SourceId.getPutInDir(item.serveId, path[0].routeUnder);
-								if (SourceId_Fields_.endsWithSlash(sourceId)) {
+								if (HxOverrides.cca(sourceId, sourceId.length - 1) == 47) {
 									var rel = SourceId.relativeTo(item.serveId, sourceId);
 									if (rel != null) {
 										item.serveId = rel;
@@ -57,9 +62,13 @@ class Router extends Register.inherits() {
 									};
 								} else if (sourceId == item.serveId) {
 									var s = sourceId.substring(sourceId.lastIndexOf("/"));
-									s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-									s = StringTools.replace(s, "\\", "/");
-									item.serveId = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+									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;
+									item.serveId = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 									result.push(item);
 								};
 							};
@@ -69,7 +78,7 @@ class Router extends Register.inherits() {
 								var item = list[_g];
 								++_g;
 								item.serveId = path[0].routeUnder;
-								if (SourceId_Fields_.endsWithSlash(sourceId)) {
+								if (HxOverrides.cca(sourceId, sourceId.length - 1) == 47) {
 									var rel = SourceId.relativeTo(item.serveId, sourceId);
 									if (rel != null) {
 										item.serveId = rel;
@@ -77,9 +86,13 @@ class Router extends Register.inherits() {
 									};
 								} else if (sourceId == item.serveId) {
 									var s = sourceId.substring(sourceId.lastIndexOf("/"));
-									s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-									s = StringTools.replace(s, "\\", "/");
-									item.serveId = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+									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;
+									item.serveId = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 									result.push(item);
 								};
 							};
@@ -165,9 +178,13 @@ class Router extends Register.inherits() {
 				var saveInto1 = saveInto;
 				var this1 = r.serveId;
 				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;
+				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 (this1.charAt(0) != "/") {
 					throw new Error("Badly formed SourceId.");
 				};

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

@@ -8,6 +8,7 @@ import {Project} from "../Project"
 
 export declare class Files extends Stone<FilesConfig> {
 	constructor(config: FilesConfig)
+	protected initConfig(): void
 	protected generate(hash: SourceHash): Promise<SourceData[]>
 }
 
@@ -18,11 +19,15 @@ export type FilesConfig = {
 	*/
 	id?: null | StoneIdType, 
 	/**
-	Can be either a file, or a directory that won't be recursed.
+	Can be either a file, or a directory.
 	*/
 	paths: MaybeArray<string>, 
 	/**
 	Defaults to the last instanced project.
 	*/
-	project?: null | Project
+	project?: null | Project, 
+	/**
+	Whether to recurse directories. Defaults to `true`.
+	*/
+	recursive?: null | boolean
 }

package/bin/whet/stones/Files.js

@@ -1,10 +1,10 @@
 import {MaybeArray_Fields_} from "../magic/MaybeArray.js"
+import {Utils} from "../Utils.js"
 import {Stone} from "../Stone.js"
 import {SourceId_Fields_, RootDir, SourceId} from "../SourceId.js"
 import {SourceData} from "../Source.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"
 
@@ -15,72 +15,67 @@ class Files extends Register.inherits(Stone) {
 	new(config) {
 		super.new(config);
 	}
+	initConfig() {
+		this.config.recursive = true;
+	}
 	generate(hash) {
 		var _gthis = this;
-		var _g = MaybeArray_Fields_.makeArray(this.config.paths);
-		while (0 < _g.length) {
-			var pathString = _g[0];
+		var _g = [];
+		var _g1 = 0;
+		var _g2 = MaybeArray_Fields_.makeArray(this.config.paths);
+		while (_g1 < _g2.length) {
+			var pathString = _g2[_g1];
+			++_g1;
 			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;
-			if (SourceId_Fields_.endsWithSlash(path[0])) {
-				tmp = new Promise((function (path) {
-					return function (res, rej) {
-						var root = RootDir.fromProject(_gthis.project);
-						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);
-								} else {
-									var res1 = res;
-									var _g = [];
-									var _g1 = 0;
-									while (_g1 < files.length) {
-										var file = files[_g1];
-										++_g1;
-										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);
-								};
+			var str = (pathString.length > 1 && HxOverrides.cca(pathString, 0) == 47) ? pathString.substring(1) : pathString;
+			if (str.length > 0) {
+				str = Path.posix.normalize(str);
+				str = StringTools.replace(str, "\\", "/");
+			};
+			s = str;
+			var path = [(HxOverrides.cca(s, 0) == 47) ? s : "/" + s];
+			if (HxOverrides.cca(path[0], path[0].length - 1) == 47) {
+				_g.push(Utils.listDirectoryFiles(this.cwdPath(pathString), this.config.recursive).then((function (path) {
+					return function (arr) {
+						var _g = [];
+						var _g1 = 0;
+						while (_g1 < arr.length) {
+							var file = arr[_g1];
+							++_g1;
+							var s = SourceId_Fields_.fromCwdPath(file, RootDir.fromProject(_gthis.project));
+							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, "\\", "/");
 							};
-						})(path));
+							s = str;
+							var pathId = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
+							_g.push(SourceData.fromFile(SourceId.relativeTo(pathId, path[0]), file, pathId));
+						};
+						return _g;
+					};
+				})(path)).then((function () {
+					return function (f) {
+						return Promise.all(f);
 					};
-				})(path));
+				})()));
 			} else {
-				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) {
-					var _g = [];
-					var _g1 = 0;
-					while (_g1 < files.length) {
-						var f = files[_g1];
-						++_g1;
-						var f1 = f.id;
-						var this1 = f.pathId;
-						var root = RootDir.fromProject(_gthis.project);
-						if (this1.charAt(0) != "/") {
-							throw new Error("Badly formed SourceId.");
-						};
-						_g.push(SourceData.fromFile(f1, Path.posix.join(".", root, ".", this1), f.pathId));
+				_g.push(SourceData.fromFile(path[0].substring(path[0].lastIndexOf("/")), this.cwdPath(path[0]), path[0]).then((function () {
+					return function (src) {
+						return [src];
 					};
-					return Promise.all(_g);
-				};
-			})());
+				})()));
+			};
 		};
-		return null;
+		return Promise.all(_g).then(function (allSources) {
+			var _g = [];
+			var _g_current = 0;
+			while (_g_current < allSources.length) {
+				var x = Register.iter(allSources[_g_current++]);
+				while (x.hasNext()) _g.push(x.next());
+			};
+			return _g;
+		});
 	}
 	static get __name__() {
 		return "whet.stones.Files"

package/bin/whet/stones/JsonStone.js

@@ -1,7 +1,6 @@
 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 * as Path from "path"
@@ -92,9 +91,13 @@ class JsonStone extends Register.inherits(Stone) {
 	}
 	list() {
 		var s = this.config.name;
-		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]);
+		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;
+		return Promise.resolve([(HxOverrides.cca(s, 0) == 47) ? s : "/" + s]);
 	}
 	initConfig() {
 		if (this.config.name == null) {

package/bin/whet/stones/RemoteFile.js

@@ -1,6 +1,5 @@
 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"
@@ -52,9 +51,13 @@ class RemoteFile extends Register.inherits(Stone) {
 	}
 	getId() {
 		var s = Path.basename(new URL(this.config.url).pathname);
-		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;
+		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;
+		return (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 	}
 	static get __name__() {
 		return "whet.stones.RemoteFile"

package/bin/whet/stones/Server.js

@@ -1,5 +1,4 @@
 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"
@@ -55,23 +54,48 @@ class Server extends Register.inherits(Stone) {
 	handler(req, res) {
 		var _gthis = this;
 		Log.log(30, ...["Handling request.", {"url": req.url, "method": req.method}]);
-		var s = req.url;
-		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;
+		var searchIndex = req.url.indexOf("?");
+		var id;
+		if (searchIndex > 0) {
+			var s = req.url.substring(0, searchIndex);
+			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;
+		} else {
+			var s = req.url;
+			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;
+		};
 		if (req.method == "GET") {
-			if (SourceId_Fields_.endsWithSlash(id)) {
+			if (HxOverrides.cca(id, id.length - 1) == 47) {
 				if ("index.html".length > 0) {
 					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";
+					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) + "index.html";
 				};
 			} else if (Path.posix.extname(id) == "") {
 				var s = "" + id + "/index.html";
-				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;
+				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;
 			};
 			this.config.router.find(id).then(function (routeResult) {
 				var sourcePromise = (routeResult.length > 0) ? routeResult[0].get() : (_gthis.routeDynamic != null) ? _gthis.routeDynamic(id) : null;

package/bin/whet/stones/Zip.js

@@ -1,7 +1,6 @@
 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"
@@ -76,9 +75,13 @@ class ZipStone extends Register.inherits(Stone) {
 						var bytes = Helper.bytesOfBuffer(data.data);
 						var this1 = file[0].serveId;
 						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;
+						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 (this1.charAt(0) != "/") {
 							throw new Error("Badly formed SourceId.");
 						};
@@ -100,9 +103,13 @@ class ZipStone extends Register.inherits(Stone) {
 	}
 	list() {
 		var s = this.config.filename;
-		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]);
+		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;
+		return Promise.resolve([(HxOverrides.cca(s, 0) == 47) ? s : "/" + s]);
 	}
 	static get __name__() {
 		return "whet.stones.ZipStone"

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

@@ -1,7 +1,7 @@
 import {MaybeArray_Fields_} from "../../magic/MaybeArray.js"
 import {Utils} from "../../Utils.js"
 import {Stone} from "../../Stone.js"
-import {SourceId_Fields_, RootDir} from "../../SourceId.js"
+import {RootDir} from "../../SourceId.js"
 import {SourceHash} from "../../SourceHash.js"
 import {SourceData} from "../../Source.js"
 import {Log} from "../../Log.js"
@@ -34,9 +34,13 @@ class HaxeBuild extends Register.inherits(Stone) {
 			var cwd = process.cwd();
 			var this1 = _gthis.project.rootDir;
 			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;
+			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 (this1.charAt(0) != "/") {
 				throw new Error("Badly formed SourceId.");
 			};
@@ -107,9 +111,13 @@ class HaxeBuild extends Register.inherits(Stone) {
 		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 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 = RootDir.fromProject(this.config.hxml.project);
 			if (this1.charAt(0) != "/") {
 				throw new Error("Badly formed SourceId.");