whet 0.0.8 → 0.0.9

package/bin/whet/Project.js

@@ -1,6 +1,5 @@
 import {CacheManager} from "./cache/CacheManager.js"
 import {Whet_Fields_} from "./Whet.js"
-import {SourceId_Fields_} from "./SourceId.js"
 import {Log} from "./Log.js"
 import * as Path from "path"
 import {Register} from "../genes/Register.js"
@@ -39,18 +38,30 @@ class Project extends Register.inherits() {
 			file = decodeURI(file);
 			file = StringTools.replace(file, "file:///", "");
 			var s = Path.relative(process.cwd(), file);
-			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 s = this1.substring(0, this1.lastIndexOf("/") + 1);
-			s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-			s = StringTools.replace(s, "\\", "/");
-			this.rootDir = (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;
+			this.rootDir = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 		} else {
 			var s = config.rootDir;
-			s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-			s = StringTools.replace(s, "\\", "/");
-			this.rootDir = (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;
+			this.rootDir = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 		};
 		this.cache = (config.cache == null) ? new CacheManager(this) : config.cache;
 		Project.projects.push(this);

package/bin/whet/Source.d.ts

@@ -26,6 +26,10 @@ export declare class Source {
 export declare class SourceData {
 	protected constructor(id: string, data: Buffer)
 	data: Buffer
+	
+	/**
+	Name relative to the stone that generated it.
+	*/
 	id: string
 	hash: SourceHash
 	source: Source
@@ -43,7 +47,10 @@ export declare class SourceData {
 	protected getFilePath(idOverride?: null | string): Promise<string>
 	
 	/**
-	* `path` is the actual cwd-relative path. `pathId` is the project-relative source Id.
+	* @param id Path id relative to stone that generates it.
+	* @param path Actual path relative to CWD.
+	* @param pathId Path Id relative to project.
+	* @return Promise<SourceData>
 	*/
 	static fromFile(id: string, path: string, pathId: string): Promise<SourceData>
 	static fromString(id: string, s: string): SourceData

package/bin/whet/Source.js

@@ -1,5 +1,5 @@
 import {Utils} from "./Utils.js"
-import {SourceId_Fields_, SourceId, RootDir} from "./SourceId.js"
+import {SourceId, RootDir} from "./SourceId.js"
 import {SourceHash} from "./SourceHash.js"
 import {Log} from "./Log.js"
 import * as Path from "path"
@@ -46,9 +46,13 @@ class Source extends Register.inherits() {
 			return this.data[0];
 		} else {
 			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 sid = (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 sid = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 			return Lambda.find(this.data, function (entry) {
 				return entry.id == sid;
 			});
@@ -113,7 +117,10 @@ class SourceData extends Register.inherits() {
 	}
 	
 	/**
-	* `path` is the actual cwd-relative path. `pathId` is the project-relative source Id.
+	* @param id Path id relative to stone that generates it.
+	* @param path Actual path relative to CWD.
+	* @param pathId Path Id relative to project.
+	* @return Promise<SourceData>
 	*/
 	static fromFile(id, path, pathId) {
 		return new Promise(function (res, rej) {
@@ -125,9 +132,13 @@ class SourceData extends Register.inherits() {
 					var source = SourceData.fromBytes(id, buffer);
 					source.filePath = path;
 					var s = pathId;
-					s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-					s = StringTools.replace(s, "\\", "/");
-					source.filePathId = (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;
+					source.filePathId = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 					res(source);
 				};
 			});
@@ -138,9 +149,13 @@ class SourceData extends Register.inherits() {
 	}
 	static fromBytes(id, data) {
 		var s = id;
-		s = Path.posix.normalize((id.length > 1 && SourceId_Fields_.startsWithSlash(id)) ? HxOverrides.substr(id, 1, null) : id);
-		s = StringTools.replace(s, "\\", "/");
-		return new SourceData((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s, data);
+		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;
+		return new SourceData((HxOverrides.cca(s, 0) == 47) ? s : "/" + s, data);
 	}
 	static get __name__() {
 		return "whet.SourceData"

package/bin/whet/SourceId.d.ts

@@ -9,3 +9,4 @@ export declare class RootDir {
 	static fromProject(p: Project): string
 }
 
+export const fromCwdPath: (s: string, root: string) => string

package/bin/whet/SourceId.js

@@ -8,37 +8,53 @@ const $global = Register.$global
 export const SourceId = Register.global("$hxClasses")["whet._SourceId.SourceId"] = 
 class SourceId {
 	static relativeTo(this1, directory) {
-		if (!SourceId_Fields_.endsWithSlash(directory)) {
+		if (HxOverrides.cca(directory, directory.length - 1) != 47) {
 			throw new Error("\"" + directory + "\" is not a directory.");
 		};
 		var tmp;
 		var s = this1.substring(0, this1.lastIndexOf("/") + 1);
-		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-		s = StringTools.replace(s, "\\", "/");
-		tmp = ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s).indexOf(directory) == 0;
+		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) {
-			return HxOverrides.substr(this1, directory.length - 1, null);
+			return this1.substring(directory.length - 1);
 		} else {
 			return null;
 		};
 	}
 	static getPutInDir(this1, dir) {
-		if (!SourceId_Fields_.endsWithSlash(dir)) {
+		if (HxOverrides.cca(dir, dir.length - 1) != 47) {
 			throw new Error("\"" + dir + "\" is not a directory.");
 		};
 		var s = "/";
-		s = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
-		s = StringTools.replace(s, "\\", "/");
-		if (dir == ((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;
+		if (dir == ((HxOverrides.cca(s, 0) == 47) ? s : "/" + s)) {
 			var s = this1;
-			s = Path.posix.normalize((this1.length > 1 && SourceId_Fields_.startsWithSlash(this1)) ? HxOverrides.substr(this1, 1, null) : this1);
-			s = StringTools.replace(s, "\\", "/");
-			return (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+			var str = (this1.length > 1 && HxOverrides.cca(this1, 0) == 47) ? this1.substring(1) : this1;
+			if (str.length > 0) {
+				str = Path.posix.normalize(str);
+				str = StringTools.replace(str, "\\", "/");
+			};
+			s = str;
+			return (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 		} else {
 			var s = dir + this1;
-			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__() {
@@ -66,11 +82,20 @@ class RootDir {
 
 export const SourceId_Fields_ = Register.global("$hxClasses")["whet._SourceId.SourceId_Fields_"] = 
 class SourceId_Fields_ {
-	static startsWithSlash(str) {
-		return HxOverrides.cca(str, 0) == 47;
-	}
-	static endsWithSlash(str) {
-		return HxOverrides.cca(str, str.length - 1) == 47;
+	static fromCwdPath(s, root) {
+		var s1 = Path.posix;
+		var str = s;
+		if (str.length > 0) {
+			str = Path.posix.normalize(str);
+			str = StringTools.replace(str, "\\", "/");
+		};
+		s = s1.resolve(str);
+		var rootStr = root;
+		if (HxOverrides.cca(rootStr, 0) == 47) {
+			rootStr = rootStr.substring(1);
+		};
+		rootStr = Path.posix.resolve(rootStr);
+		return Path.posix.relative(rootStr, s);
 	}
 	static get __name__() {
 		return "whet._SourceId.SourceId_Fields_"
@@ -81,3 +106,4 @@ class SourceId_Fields_ {
 }
 
 
+export const fromCwdPath = SourceId_Fields_.fromCwdPath

package/bin/whet/Stone.js

@@ -1,7 +1,7 @@
 import {StoneId_Fields_} from "./magic/StoneId.js"
 import {CacheStrategy, CacheDurability} from "./cache/Cache.js"
 import {Utils} from "./Utils.js"
-import {SourceId_Fields_, SourceId, RootDir} from "./SourceId.js"
+import {SourceId, RootDir} from "./SourceId.js"
 import {SourceHash} from "./SourceHash.js"
 import {Source} from "./Source.js"
 import {Project} from "./Project.js"
@@ -141,9 +141,13 @@ class Stone extends Register.inherits() {
 			generate = true;
 		};
 		var s = path;
-		s = Path.posix.normalize((path.length > 1 && SourceId_Fields_.startsWithSlash(path)) ? HxOverrides.substr(path, 1, null) : path);
-		s = StringTools.replace(s, "\\", "/");
-		this.cacheStrategy = CacheStrategy.AbsolutePath((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s, CacheDurability.LimitCountByAge(1));
+		var str = (path.length > 1 && HxOverrides.cca(path, 0) == 47) ? path.substring(1) : path;
+		if (str.length > 0) {
+			str = Path.posix.normalize(str);
+			str = StringTools.replace(str, "\\", "/");
+		};
+		s = str;
+		this.cacheStrategy = CacheStrategy.AbsolutePath((HxOverrides.cca(s, 0) == 47) ? s : "/" + s, CacheDurability.LimitCountByAge(1));
 		if (generate) {
 			return this.getSource();
 		} else {
@@ -160,10 +164,14 @@ class Stone extends Register.inherits() {
 		var _gthis = this;
 		Log.log(30, ...["Exporting file(s).", {"path": path, "stone": this}]);
 		var s = path;
-		s = Path.posix.normalize((path.length > 1 && SourceId_Fields_.startsWithSlash(path)) ? HxOverrides.substr(path, 1, null) : path);
-		s = StringTools.replace(s, "\\", "/");
-		var pathId = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
-		var isDir = SourceId_Fields_.endsWithSlash(pathId);
+		var str = (path.length > 1 && HxOverrides.cca(path, 0) == 47) ? path.substring(1) : path;
+		if (str.length > 0) {
+			str = Path.posix.normalize(str);
+			str = StringTools.replace(str, "\\", "/");
+		};
+		s = str;
+		var pathId = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
+		var isDir = HxOverrides.cca(pathId, pathId.length - 1) == 47;
 		return this.getSource().then(function (src) {
 			if (src.data.length > 1 && !isDir) {
 				throw new Error("Path is not a directory for multiple source export.");

package/bin/whet/Whet.js

@@ -10,7 +10,7 @@ const $global = Register.$global
 export const Whet_Fields_ = Register.global("$hxClasses")["whet._Whet.Whet_Fields_"] = 
 class Whet_Fields_ {
 	static main() {
-		Whet_Fields_.program.enablePositionalOptions().passThroughOptions().description("Project tooling.").usage("[options] [command] [+ [command]...]").version("0.0.8", "-v, --version").allowUnknownOption(true).showSuggestionAfterError(true).option("-p, --project <file>", "project to run", "Project.mjs").option("-l, --log-level <level>", "log level, a string/number", "info");
+		Whet_Fields_.program.enablePositionalOptions().passThroughOptions().description("Project tooling.").usage("[options] [command] [+ [command]...]").version("0.0.9", "-v, --version").allowUnknownOption(true).showSuggestionAfterError(true).option("-p, --project <file>", "project to run", "Project.mjs").option("-l, --log-level <level>", "log level, a string/number", "info");
 		Whet_Fields_.program.parse();
 		var options = Whet_Fields_.program.opts();
 		if (options.logLevel != null) {

package/bin/whet/cache/BaseCache.js

@@ -1,5 +1,5 @@
 import {Cache} from "./Cache.js"
-import {SourceId_Fields_, SourceId} from "../SourceId.js"
+import {SourceId} from "../SourceId.js"
 import {SourceHash} from "../SourceHash.js"
 import {Log} from "../Log.js"
 import * as Path from "path"
@@ -15,7 +15,7 @@ const $global = Register.$global
 export const BaseCache = Register.global("$hxClasses")["whet.cache.BaseCache"] = 
 class BaseCache extends Register.inherits() {
 	new(rootDir, cache) {
-		if (!SourceId_Fields_.endsWithSlash(rootDir)) {
+		if (HxOverrides.cca(rootDir, rootDir.length - 1) != 47) {
 			throw new Error("Root dir is a not a dir.");
 		};
 		this.rootDir = rootDir;
@@ -125,9 +125,13 @@ 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);
-			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 = _gthis.rootDir;
 			if (this1.charAt(0) != "/") {
 				throw new Error("Badly formed SourceId.");
@@ -138,9 +142,13 @@ class BaseCache extends Register.inherits() {
 		}, 0) : 0;
 		++maxNum;
 		var s = "v" + maxNum + "/";
-		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-		s = StringTools.replace(s, "\\", "/");
-		return SourceId.getPutInDir((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s, 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;
+		return SourceId.getPutInDir((HxOverrides.cca(s, 0) == 47) ? s : "/" + s, baseDir);
 	}
 	checkDurability(stone, values, durability, useIndex, ageIndex) {
 		Log.log(20, ...["Checking durability.", {"stone": stone, "durability": Std.string(durability)}]);

package/bin/whet/cache/CacheManager.js

@@ -1,7 +1,7 @@
 import {MemoryCache} from "./MemoryCache.js"
 import {FileCache} from "./FileCache.js"
 import {CacheStrategy, CacheDurability, DurabilityCheck} from "./Cache.js"
-import {RootDir, SourceId_Fields_, SourceId} from "../SourceId.js"
+import {RootDir, SourceId} from "../SourceId.js"
 import {Log} from "../Log.js"
 import * as Path from "path"
 import {Register} from "../../genes/Register.js"
@@ -54,9 +54,13 @@ class CacheManager extends Register.inherits() {
 	*/
 	getDir(stone, hash) {
 		var s = stone.id + "/";
-		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-		s = StringTools.replace(s, "\\", "/");
-		var baseDir = (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 baseDir = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 		var tmp;
 		switch (stone.cacheStrategy._hx_index) {
 			case 0:
@@ -71,14 +75,22 @@ class CacheManager extends Register.inherits() {
 		};
 		if (tmp) {
 			var s = ".temp/";
-			s = Path.posix.normalize((".temp/".length > 1 && SourceId_Fields_.startsWithSlash(".temp/")) ? HxOverrides.substr(".temp/", 1, null) : ".temp/");
-			s = StringTools.replace(s, "\\", "/");
-			baseDir = SourceId.getPutInDir(baseDir, (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s);
+			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, "\\", "/");
+			};
+			s = str;
+			baseDir = SourceId.getPutInDir(baseDir, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
 		};
 		var s = ".whet/";
-		s = Path.posix.normalize((".whet/".length > 1 && SourceId_Fields_.startsWithSlash(".whet/")) ? HxOverrides.substr(".whet/", 1, null) : ".whet/");
-		s = StringTools.replace(s, "\\", "/");
-		baseDir = SourceId.getPutInDir(baseDir, (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s);
+		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, "\\", "/");
+		};
+		s = str;
+		baseDir = SourceId.getPutInDir(baseDir, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
 		var id;
 		var _g = stone.cacheStrategy;
 		switch (_g._hx_index) {
@@ -94,9 +106,13 @@ class CacheManager extends Register.inherits() {
 			case 3:
 				var _g1 = _g.path;
 				var s = _g1.substring(0, _g1.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;
+				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;
 				break
 			
 		};

package/bin/whet/cache/FileCache.js

@@ -1,6 +1,5 @@
 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"
@@ -21,9 +20,13 @@ class FileCache extends Register.inherits(BaseCache) {
 		this.flushQueued = false;
 		super.new(rootDir, new StringMap());
 		var s = ".whet/cache.json";
-		s = Path.posix.normalize((".whet/cache.json".length > 1 && SourceId_Fields_.startsWithSlash(".whet/cache.json")) ? HxOverrides.substr(".whet/cache.json", 1, null) : ".whet/cache.json");
-		s = StringTools.replace(s, "\\", "/");
-		var this1 = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+		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.");
 		};
@@ -44,9 +47,13 @@ class FileCache extends Register.inherits(BaseCache) {
 					var tmp = SourceHash.fromHex(val.hash);
 					var val1 = val.ctime;
 					var s = val.baseDir;
-					s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-					s = StringTools.replace(s, "\\", "/");
-					var tmp1 = (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 tmp1 = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 					var _g2 = [];
 					var _g3 = 0;
 					var _g4 = val.files;
@@ -55,13 +62,21 @@ class FileCache extends Register.inherits(BaseCache) {
 						++_g3;
 						var tmp2 = SourceHash.fromHex(file.fileHash);
 						var s1 = file.filePath;
-						s1 = Path.posix.normalize((s1.length > 1 && SourceId_Fields_.startsWithSlash(s1)) ? HxOverrides.substr(s1, 1, null) : s1);
-						s1 = StringTools.replace(s1, "\\", "/");
-						var tmp3 = (SourceId_Fields_.startsWithSlash(s1)) ? s1 : "/" + s1;
+						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;
-						s2 = Path.posix.normalize((s2.length > 1 && SourceId_Fields_.startsWithSlash(s2)) ? HxOverrides.substr(s2, 1, null) : s2);
-						s2 = StringTools.replace(s2, "\\", "/");
-						_g2.push({"fileHash": tmp2, "filePath": tmp3, "id": (SourceId_Fields_.startsWithSlash(s2)) ? s2 : "/" + s2});
+						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});
 					};
 					_g.push({"hash": tmp, "ctime": val1, "baseDir": tmp1, "files": _g2});
 				};
@@ -80,9 +95,13 @@ class FileCache extends Register.inherits(BaseCache) {
 			var _g1 = _g.path;
 			if (source.data.length == 1) {
 				var s = _g1.substring(_g1.lastIndexOf("/"));
-				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-				s = StringTools.replace(s, "\\", "/");
-				idOverride = (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;
+				idOverride = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 			} else {
 				idOverride = null;
 			};
@@ -111,14 +130,18 @@ class FileCache extends Register.inherits(BaseCache) {
 		if (_g._hx_index == 3) {
 			var _g1 = _g.path;
 			var invalidPath;
-			if (value.files.length == 1 && !SourceId_Fields_.endsWithSlash(_g1)) {
+			if (value.files.length == 1 && HxOverrides.cca(_g1, _g1.length - 1) != 47) {
 				invalidPath = value.files[0].filePath != _g1;
 			} else {
 				var value1 = value.baseDir;
 				var s = _g1.substring(0, _g1.lastIndexOf("/") + 1);
-				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-				s = StringTools.replace(s, "\\", "/");
-				invalidPath = value1 != ((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;
+				invalidPath = value1 != ((HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
 			};
 			if (invalidPath) {
 				return Promise.resolve(null);
@@ -292,9 +315,13 @@ class FileCache extends Register.inherits(BaseCache) {
 					var tmp1 = HxOverrides.dateStr(new Date(val.ctime * 1000));
 					var this2 = val.baseDir;
 					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 (this2.charAt(0) != "/") {
 						throw new Error("Badly formed SourceId.");
 					};
@@ -308,18 +335,26 @@ class FileCache extends Register.inherits(BaseCache) {
 						var tmp3 = SourceHash.toHex(file.fileHash);
 						var this3 = file.filePath;
 						var s1 = "/";
-						s1 = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
-						s1 = StringTools.replace(s1, "\\", "/");
-						var root1 = (SourceId_Fields_.startsWithSlash(s1)) ? s1 : "/" + 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 = "/";
-						s2 = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
-						s2 = StringTools.replace(s2, "\\", "/");
-						var root2 = (SourceId_Fields_.startsWithSlash(s2)) ? s2 : "/" + 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.");
 						};

package/bin/whet/magic/RoutePathType.js

@@ -1,7 +1,6 @@
 import {Router} from "../route/Router.js"
 import {Route} from "../route/Route.js"
 import {RouteType_Fields_} from "./RouteType.js"
-import {SourceId_Fields_} from "../SourceId.js"
 import * as Path from "path"
 import {Register} from "../../genes/Register.js"
 import {StringTools} from "../../StringTools.js"
@@ -34,9 +33,13 @@ class RoutePathType_Fields_ {
 				throw new Error("RoutePath element should have at most 3 entries `[serveId, route, filter]`.");
 			};
 			var s = item[0];
-			s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
-			s = StringTools.replace(s, "\\", "/");
-			var tmp = (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 tmp = (HxOverrides.cca(s, 0) == 47) ? 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])});
 		};