whet 0.0.6 → 0.0.9

package/bin/whet/Project.d.ts

@@ -12,7 +12,7 @@ export declare class Project {
 	stones: AnyStone[]
 	onInit: (config: any) => Promise<any>
 	protected options: Option[]
-	addCommand(cmd: Command, stone?: null | AnyStone): void
+	addCommand(name: string, stone?: null | AnyStone): Command
 	toString(): string
 	protected static projects: Project[]
 }
@@ -27,8 +27,10 @@ export type ProjectConfig = {
 	*/
 	onInit?: null | ((config: any) => Promise<any>), 
 	/**
-	* Array of Commander.js options this project supports.
+	* Array of Commander.js options this project supports. Use `addOption` to get Option instance.
 	*/
 	options?: null | Option[], 
 	rootDir?: null | string
 }
+
+export const addOption: (flags: string, description: null | string) => Option

package/bin/whet/Project.js

@@ -1,10 +1,11 @@
 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"
+import {Command, Option} from "commander"
 import {StringTools} from "../StringTools.js"
+import {HxOverrides} from "../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -37,29 +38,43 @@ 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);
-			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);
-			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);
-			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);
 		var this1 = ["New project created.", {"project": this, "projectCount": Project.projects.length}];
 		Log.log(30, ...this1);
 	}
-	addCommand(cmd, stone) {
+	addCommand(name, stone) {
+		var cmd = new Command(name);
 		if (stone != null) {
 			cmd.alias(stone.id + "." + cmd.name());
 		};
 		Whet_Fields_.program.addCommand(cmd);
+		return cmd;
 	}
 	toString() {
 		return "" + this.name + "@" + this.rootDir;
@@ -73,4 +88,19 @@ class Project extends Register.inherits() {
 }
 
 
-Project.projects = []
+Project.projects = []
+export const Project_Fields_ = Register.global("$hxClasses")["whet._Project.Project_Fields_"] = 
+class Project_Fields_ {
+	static get __name__() {
+		return "whet._Project.Project_Fields_"
+	}
+	get __class__() {
+		return Project_Fields_
+	}
+}
+
+
+Project_Fields_.addOption = function (flags, description) {
+	return new Option(flags, description);
+}
+export const addOption = Project_Fields_.addOption

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"
@@ -8,6 +8,7 @@ import * as Fs from "fs"
 import {Buffer} from "buffer"
 import {StringTools} from "../StringTools.js"
 import {Lambda} from "../Lambda.js"
+import {HxOverrides} from "../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -45,9 +46,13 @@ class Source extends Register.inherits() {
 			return this.data[0];
 		} else {
 			var s = id;
-			s = Path.posix.normalize(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;
 			});
@@ -112,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) {
@@ -124,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);
-					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);
 				};
 			});
@@ -137,9 +149,13 @@ class SourceData extends Register.inherits() {
 	}
 	static fromBytes(id, data) {
 		var s = id;
-		s = Path.posix.normalize(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);
-		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("/");
-		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);
-			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);
-			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.d.ts

@@ -4,7 +4,6 @@ import {CacheStrategy} from "./cache/Cache"
 import {SourceHash} from "./SourceHash"
 import {Source, SourceData} from "./Source"
 import {Project} from "./Project"
-import {Command} from "commander"
 
 export declare class Stone<T extends StoneConfig> {
 	constructor(config: T)
@@ -25,9 +24,9 @@ export declare class Stone<T extends StoneConfig> {
 	protected initConfig(): void
 	
 	/**
-	Override this to register commands.
+	Override this to register commands via `this.project.addCommand`.
 	*/
-	protected getCommands(): Command[]
+	protected addCommands(): void
 	
 	/**
 	* **Do not override.**
@@ -77,6 +76,13 @@ export declare class Stone<T extends StoneConfig> {
 	*/
 	setAbsolutePath(path: string, generate?: boolean): Promise<Source>
 	
+	/**
+	* Stores this resource in the supplied path, without changing cache strategy.
+	* @param path Path relative to this stone's project.
+	* Can be a directory or a file path (only if this resource generates single source).
+	*/
+	exportTo(path: string): Promise<any>
+	
 	/**
 	* Convenient function to get CWD-relative path from project-relative one.
 	* Useful for pure JS stones.

package/bin/whet/Stone.js

@@ -1,6 +1,7 @@
 import {StoneId_Fields_} from "./magic/StoneId.js"
 import {CacheStrategy, CacheDurability} from "./cache/Cache.js"
-import {SourceId_Fields_} from "./SourceId.js"
+import {Utils} from "./Utils.js"
+import {SourceId, RootDir} from "./SourceId.js"
 import {SourceHash} from "./SourceHash.js"
 import {Source} from "./Source.js"
 import {Project} from "./Project.js"
@@ -8,6 +9,7 @@ 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
 
@@ -28,9 +30,7 @@ class Stone extends Register.inherits() {
 		this.initConfig();
 		this.id = (config.id != null) ? StoneId_Fields_.makeStoneId(config.id) : StoneId_Fields_.makeStoneId(this);
 		this.cacheStrategy = (config.cacheStrategy == null) ? this.project.cache.defaultStrategy : config.cacheStrategy;
-		var _g = 0;
-		var _g1 = this.getCommands();
-		while (_g < _g1.length) this.project.addCommand(_g1[_g++], this);
+		this.addCommands();
 	}
 	get cache() {
 		return this.get_cache()
@@ -43,10 +43,9 @@ class Stone extends Register.inherits() {
 	}
 	
 	/**
-	Override this to register commands.
+	Override this to register commands via `this.project.addCommand`.
 	*/
-	getCommands() {
-		return [];
+	addCommands() {
 	}
 	
 	/**
@@ -142,9 +141,13 @@ class Stone extends Register.inherits() {
 			generate = true;
 		};
 		var s = path;
-		s = Path.posix.normalize(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 {
@@ -152,6 +155,44 @@ class Stone extends Register.inherits() {
 		};
 	}
 	
+	/**
+	* Stores this resource in the supplied path, without changing cache strategy.
+	* @param path Path relative to this stone's project.
+	* Can be a directory or a file path (only if this resource generates single source).
+	*/
+	exportTo(path) {
+		var _gthis = this;
+		Log.log(30, ...["Exporting file(s).", {"path": path, "stone": this}]);
+		var s = path;
+		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.");
+			};
+			var _g = [];
+			var _g1 = 0;
+			var _g2 = src.data;
+			while (_g1 < _g2.length) {
+				var data = _g2[_g1];
+				++_g1;
+				var id = (isDir) ? SourceId.getPutInDir(data.id, pathId) : pathId;
+				var root = RootDir.fromProject(_gthis.project);
+				if (id.charAt(0) != "/") {
+					throw new Error("Badly formed SourceId.");
+				};
+				_g.push(Utils.saveBytes(Path.posix.join(".", root, ".", id), data.data));
+			};
+			return Promise.all(_g);
+		});
+	}
+	
 	/**
 	* Convenient function to get CWD-relative path from project-relative one.
 	* Useful for pure JS stones.

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.6", "-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);
-			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);
-		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,11 +1,12 @@
 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"
 import {StringTools} from "../../StringTools.js"
+import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -53,9 +54,13 @@ class CacheManager extends Register.inherits() {
 	*/
 	getDir(stone, hash) {
 		var s = stone.id + "/";
-		s = Path.posix.normalize(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:
@@ -70,14 +75,22 @@ class CacheManager extends Register.inherits() {
 		};
 		if (tmp) {
 			var s = ".temp/";
-			s = Path.posix.normalize(".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/");
-		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) {
@@ -93,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);
-				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
 			
 		};