whet 0.0.19 → 0.0.21

package/README.md

@@ -10,7 +10,7 @@ Project files define a project, its [stones](#Stones). Their content defines wha
 
 Stones (named after _whetstone_) are individual building blocks of a project.
 
-They represent a single logical asset (can be multiple files) or functionality (e.g. a dev web server). Stones can use other stones (via routes), to achieve their objective, forming a dependency tree. E.g. a css file could be made by minifying a file generated from scss source, and each step could be individually cached.
+They represent a single logical asset (can be multiple files) or functionality (e.g. a dev web server). Stones can use other stones (via routes), to achieve their objective, forming a dependency tree. E.g. a CSS file could be made by minifying a file generated from SCSS source, and each step could be individually cached.
 
 ### Stones Configuration
 
@@ -30,7 +30,7 @@ Some stones might provide helper methods to modify the configuration after it wa
 
 ...
 
-## Routes And Routers
+## Routers
 
 ...
 
@@ -40,8 +40,11 @@ Project files should have no side effects, unless some of their commands are exe
 
 <!-- TODO: document configuration handlers -->
 
-All paths are in stored as absolute (starting with `/`), but are actually relative to root project directory. Path that is a directory ends with a `/`, otherwise it's considered a file. That means:
+All file paths should use `/` as directory separator, regardless of platform.
 
-- `/assets/` is a **directory** called `assets` that's in the project root.
-- `assets/` is a **directory** called `assets` that's relative to the structure within the project (routing/stones).
-- `/assets` is a **file** called `assets` in the project root.
+Paths should always be relative, and are considered relative to root project directory, or relative to root of the Router/Stone used. For getting sources from Stones/Routers [minimatch](https://github.com/isaacs/minimatch/) is used.
+
+Path that is a directory ends with a `/`, otherwise it's considered a file. That means:
+
+- `assets/` is a **directory** called `assets`.
+- `assets` is a **file** called `assets`.

package/bin/HxOverrides.d.ts

@@ -1,7 +1,6 @@
 
 export declare class HxOverrides {
 	protected static dateStr(date: Date): string
-	protected static cca(s: string, index: number): null | number
 	protected static substr(s: string, pos: number, len?: null | number): string
 	protected static remove<T>(a: T[], obj: T): boolean
 	protected static now(): number

package/bin/HxOverrides.js

@@ -12,13 +12,6 @@ class HxOverrides {
 		var s = date.getSeconds();
 		return date.getFullYear() + "-" + ((m < 10) ? "0" + m : "" + m) + "-" + ((d < 10) ? "0" + d : "" + d) + " " + ((h < 10) ? "0" + h : "" + h) + ":" + ((mi < 10) ? "0" + mi : "" + mi) + ":" + ((s < 10) ? "0" + s : "" + s);
 	}
-	static cca(s, index) {
-		var x = s.charCodeAt(index);
-		if (x != x) {
-			return undefined;
-		};
-		return x;
-	}
 	static substr(s, pos, len) {
 		if (len == null) {
 			len = s.length;

package/bin/whet/Project.js

@@ -5,7 +5,6 @@ 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,31 +36,11 @@ class Project extends Register.inherits() {
 			Error.prepareStackTrace = oldValue;
 			file = decodeURI(file);
 			file = StringTools.replace(file, "file:///", "");
-			var s = Path.relative(process.cwd(), file);
-			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);
-			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;
+			var id = Path.relative(process.cwd(), file);
+			var dir = id.substring(0, id.lastIndexOf("/") + 1);
+			this.rootDir = (dir.length == 0) ? "./" : dir;
 		} else {
-			var s = config.rootDir;
-			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.rootDir = config.rootDir;
 		};
 		this.cache = (config.cache == null) ? new CacheManager(this) : config.cache;
 		Project.projects.push(this);

package/bin/whet/Source.d.ts

@@ -1,3 +1,4 @@
+import {MinimatchType} from "./magic/MinimatchType"
 import {AnyStone} from "./Stone"
 import {SourceHash} from "./SourceHash"
 import {Buffer} from "buffer"
@@ -18,9 +19,9 @@ export declare class Source {
 	getDirPath(): string
 	
 	/**
-	* Returns first result if `id` is null, or one equals to it.
+	* Returns first result if `pattern` is null, or first one it matches.
 	*/
-	get(id?: null | string): SourceData
+	get(pattern?: null | MinimatchType): SourceData
 }
 
 export declare class SourceData {

package/bin/whet/Source.js

@@ -1,14 +1,13 @@
+import {MinimatchType_Fields_} from "./magic/MinimatchType.js"
 import {Utils} from "./Utils.js"
-import {SourceId, RootDir} from "./SourceId.js"
+import {RootDir} from "./SourceId.js"
 import {SourceHash} from "./SourceHash.js"
 import {Log} from "./Log.js"
 import * as Path from "path"
 import {Register} from "../genes/Register.js"
 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
 
@@ -39,22 +38,15 @@ class Source extends Register.inherits() {
 	}
 	
 	/**
-	* Returns first result if `id` is null, or one equals to it.
+	* Returns first result if `pattern` is null, or first one it matches.
 	*/
-	get(id) {
-		if (id == null) {
+	get(pattern) {
+		if (pattern == null) {
 			return this.data[0];
 		} else {
-			var s = id;
-			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;
+			var filter = MinimatchType_Fields_.makeMinimatch(pattern);
 			return Lambda.find(this.data, function (entry) {
-				return entry.id == sid;
+				return filter.match(entry.id);
 			});
 		};
 	}
@@ -103,13 +95,12 @@ class SourceData extends Register.inherits() {
 				new Error("Data without source.");
 			};
 			var dir = this.source.getDirPath();
-			this.filePathId = SourceId.getPutInDir((idOverride != null && HxOverrides.cca(idOverride, idOverride.length - 1) != 47) ? idOverride : this.id, dir);
-			var this1 = this.filePathId;
-			var root = RootDir.fromProject(this.source.origin.project);
-			if (this1.charAt(0) != "/") {
-				throw new Error("Badly formed SourceId.");
+			var name = (idOverride != null && !(idOverride.length == 0 || idOverride.charCodeAt(idOverride.length - 1) == 47)) ? idOverride : this.id;
+			if (!(dir.length == 0 || dir.charCodeAt(dir.length - 1) == 47)) {
+				throw new Error("\"" + dir + "\" is not a directory.");
 			};
-			this.filePath = Path.posix.join(".", root, ".", this1);
+			this.filePathId = Path.posix.join(dir, name);
+			this.filePath = Path.posix.join(".", RootDir.fromProject(this.source.origin.project), ".", this.filePathId);
 			return Utils.saveBytes(this.filePath, this.data).then(function (_) {
 				return _gthis.filePath;
 			});
@@ -133,14 +124,7 @@ class SourceData extends Register.inherits() {
 				} else {
 					var source = SourceData.fromBytes(id, buffer);
 					source.filePath = path;
-					var s = pathId;
-					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;
+					source.filePathId = pathId;
 					res(source);
 				};
 			});
@@ -150,14 +134,7 @@ class SourceData extends Register.inherits() {
 		return SourceData.fromBytes(id, Buffer.from(s, "utf-8"));
 	}
 	static fromBytes(id, data) {
-		var s = id;
-		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);
+		return new SourceData(id, data);
 	}
 	static get __name__() {
 		return "whet.SourceData"

package/bin/whet/SourceId.d.ts

@@ -1,12 +1,24 @@
 import {Project} from "./Project"
 
-export declare class SourceId {
-	static relativeTo($this: string, directory: string): string
-	static getPutInDir($this: string, dir: string): string
+export declare class IdUtils {
+	static toCwdPath(id: string, root: string): string
+	static isDir(id: string): boolean
+	static isInDir(id: string, directory: string, nested?: boolean): boolean
+	static getRelativeTo(id: string, directory: string): string
+	static getPutInDir(id: string, dir: string): string
+	static compare(a: string, b: string): number
+	static assertDir(directory: string): void
+	static getWithExt(id: string): string
+	static setWithExt(id: string, name: string): string
+	static getExt(id: string): string
+	static setExt(id: string, ext: string): string
+	static getWithoutExt(id: string): string
+	static setWithoutExt(id: string, name: string): string
+	static getDir(id: string): string
+	static setDir(id: string, dir: string): string
+	static fromCwdPath(s: string, root: string): string
 }
 
 export declare class RootDir {
 	static fromProject(p: Project): string
 }
-
-export const fromCwdPath: (s: string, root: string) => string

package/bin/whet/SourceId.js

@@ -1,67 +1,120 @@
 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
 
-export const SourceId = Register.global("$hxClasses")["whet._SourceId.SourceId"] = 
-class SourceId {
-	static relativeTo(this1, directory) {
-		if (HxOverrides.cca(directory, directory.length - 1) != 47) {
+export const IdUtils = Register.global("$hxClasses")["whet.IdUtils"] = 
+class IdUtils {
+	static toCwdPath(id, root) {
+		return Path.posix.join(".", root, ".", id);
+	}
+	static isDir(id) {
+		if (id.length != 0) {
+			return id.charCodeAt(id.length - 1) == 47;
+		} else {
+			return true;
+		};
+	}
+	static isInDir(id, directory, nested) {
+		if (nested == null) {
+			nested = false;
+		};
+		if (!(directory.length == 0 || directory.charCodeAt(directory.length - 1) == 47)) {
 			throw new Error("\"" + directory + "\" is not a directory.");
 		};
-		var tmp;
-		var s = this1.substring(0, this1.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, "\\", "/");
+		if (nested) {
+			var dir = id.substring(0, id.lastIndexOf("/") + 1);
+			return ((dir.length == 0) ? "./" : dir).indexOf(directory) == 0;
+		} else {
+			var dir = id.substring(0, id.lastIndexOf("/") + 1);
+			return ((dir.length == 0) ? "./" : dir) == directory;
+		};
+	}
+	static getRelativeTo(id, directory) {
+		if (!(directory.length == 0 || directory.charCodeAt(directory.length - 1) == 47)) {
+			throw new Error("\"" + directory + "\" is not a directory.");
 		};
-		s = str;
-		tmp = ((HxOverrides.cca(s, 0) == 47) ? s : "/" + s).indexOf(directory) == 0;
+		var tmp;
+		var dir = id.substring(0, id.lastIndexOf("/") + 1);
+		tmp = ((dir.length == 0) ? "./" : dir).indexOf(directory) == 0;
 		if (tmp) {
-			return this1.substring(directory.length - 1);
+			return id.substring(directory.length);
 		} else {
 			return null;
 		};
 	}
-	static getPutInDir(this1, dir) {
-		if (HxOverrides.cca(dir, dir.length - 1) != 47) {
+	static getPutInDir(id, dir) {
+		if (!(dir.length == 0 || dir.charCodeAt(dir.length - 1) == 47)) {
 			throw new Error("\"" + dir + "\" is not a directory.");
 		};
-		var s = "/";
-		var str = ("/".length > 1 && HxOverrides.cca("/", 0) == 47) ? "/".substring(1) : "/";
+		return Path.posix.join(dir, id);
+	}
+	static compare(a, b) {
+		if (a < b) {
+			return -1;
+		} else if (a > b) {
+			return 1;
+		} else {
+			return 0;
+		};
+	}
+	static assertDir(directory) {
+		if (!(directory.length == 0 || directory.charCodeAt(directory.length - 1) == 47)) {
+			throw new Error("\"" + directory + "\" is not a directory.");
+		};
+	}
+	static getWithExt(id) {
+		return id.substring(id.lastIndexOf("/") + 1);
+	}
+	static setWithExt(id, name) {
+		var dir = id.substring(0, id.lastIndexOf("/") + 1);
+		return Path.posix.join((dir.length == 0) ? "./" : dir, name);
+	}
+	static getExt(id) {
+		return Path.posix.extname(id);
+	}
+	static setExt(id, ext) {
+		if (ext.length > 0 && ext.charCodeAt(0) != 46) {
+			ext = "." + ext;
+		};
+		var dir = id.substring(0, id.lastIndexOf("/") + 1);
+		return Path.posix.join((dir.length == 0) ? "./" : dir, Path.posix.parse(id).name) + ext;
+	}
+	static getWithoutExt(id) {
+		return Path.posix.parse(id).name;
+	}
+	static setWithoutExt(id, name) {
+		var dir = id.substring(0, id.lastIndexOf("/") + 1);
+		return Path.posix.join((dir.length == 0) ? "./" : dir, name) + Path.posix.extname(id);
+	}
+	static getDir(id) {
+		var dir = id.substring(0, id.lastIndexOf("/") + 1);
+		if (dir.length == 0) {
+			return "./";
+		} else {
+			return dir;
+		};
+	}
+	static setDir(id, dir) {
+		return Path.posix.join(dir, id.substring(id.lastIndexOf("/") + 1));
+	}
+	static fromCwdPath(s, root) {
+		var absPath = Path.posix;
+		var str = s;
 		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;
-			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;
-			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;
-		};
+		var absPath1 = absPath.resolve(str);
+		var rootStr = Path.posix.resolve(root);
+		return Path.posix.relative(rootStr, absPath1);
 	}
 	static get __name__() {
-		return "whet._SourceId.SourceId_Impl_"
+		return "whet.IdUtils"
 	}
 	get __class__() {
-		return SourceId
+		return IdUtils
 	}
 }
 
@@ -79,31 +132,3 @@ class RootDir {
 	}
 }
 
-
-export const SourceId_Fields_ = Register.global("$hxClasses")["whet._SourceId.SourceId_Fields_"] = 
-class SourceId_Fields_ {
-	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_"
-	}
-	get __class__() {
-		return SourceId_Fields_
-	}
-}
-
-
-export const fromCwdPath = SourceId_Fields_.fromCwdPath

package/bin/whet/Stone.js

@@ -2,15 +2,13 @@ import {StoneId_Fields_} from "./magic/StoneId.js"
 import {MaybeArray_Fields_} from "./magic/MaybeArray.js"
 import {CacheStrategy, CacheDurability} from "./cache/Cache.js"
 import {Utils} from "./Utils.js"
-import {SourceId, RootDir} from "./SourceId.js"
+import {RootDir} from "./SourceId.js"
 import {SourceHash} from "./SourceHash.js"
 import {Source} from "./Source.js"
 import {Project} from "./Project.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
 
@@ -255,14 +253,7 @@ class Stone extends Register.inherits() {
 		if (generate == null) {
 			generate = true;
 		};
-		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;
-		this.cacheStrategy = CacheStrategy.AbsolutePath((HxOverrides.cca(s, 0) == 47) ? s : "/" + s, CacheDurability.LimitCountByAge(1));
+		this.cacheStrategy = CacheStrategy.AbsolutePath(path, CacheDurability.LimitCountByAge(1));
 		if (generate) {
 			return this.getSource();
 		} else {
@@ -278,15 +269,7 @@ class Stone extends Register.inherits() {
 	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;
+		var isDir = path.length == 0 || path.charCodeAt(path.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.");
@@ -297,12 +280,17 @@ class Stone extends Register.inherits() {
 			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.");
+				var id;
+				if (isDir) {
+					var id1 = data.id;
+					if (!(path.length == 0 || path.charCodeAt(path.length - 1) == 47)) {
+						throw new Error("\"" + path + "\" is not a directory.");
+					};
+					id = Path.posix.join(path, id1);
+				} else {
+					id = path;
 				};
-				_g.push(Utils.saveBytes(Path.posix.join(".", root, ".", id), data.data));
+				_g.push(Utils.saveBytes(Path.posix.join(".", RootDir.fromProject(_gthis.project), ".", id), data.data));
 			};
 			return Promise.all(_g);
 		});
@@ -313,7 +301,7 @@ class Stone extends Register.inherits() {
 	* Useful for pure JS stones.
 	*/
 	cwdPath(path) {
-		return Path.join("./", this.project.rootDir, path);
+		return Path.posix.join(".", RootDir.fromProject(this.project), ".", path);
 	}
 	get_cache() {
 		return this.project.cache;

package/bin/whet/Whet.js

@@ -12,7 +12,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.19", "-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").option("--no-pretty", "disable pretty logging").exitOverride();
+		Whet_Fields_.program.enablePositionalOptions().passThroughOptions().description("Project tooling.").usage("[options] [command] [+ [command]...]").version("0.0.21", "-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").option("--no-pretty", "disable pretty logging").exitOverride();
 		try {
 			Whet_Fields_.program.parse();
 		}catch (_g) {

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;
@@ -126,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)}]);